From e92b43a9b71e18d46df983e5ab45b24b36f9cfd3 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 28 Jul 2023 12:26:57 +0530 Subject: [PATCH 001/450] Allow `settleTrade` when paused or frozen (#876) --- contracts/p1/BackingManager.sol | 7 +------ contracts/p1/RevenueTrader.sol | 7 +------ test/Recollateralization.test.ts | 14 -------------- test/Revenues.test.ts | 14 -------------- 4 files changed, 2 insertions(+), 40 deletions(-) diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index b16d4a1677..6dde9dae27 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -85,12 +85,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) - public - override(ITrading, TradingP1) - notTradingPausedOrFrozen - returns (ITrade trade) - { + function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant // if the settler is the trade contract itself, try chaining with another rebalance() diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 9c7346edef..47123b02e2 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -49,12 +49,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) - public - override(ITrading, TradingP1) - notTradingPausedOrFrozen - returns (ITrade trade) - { + function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant _distributeTokenToBuy(); // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 9f707e1d1a..16ffc14f07 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -1009,20 +1009,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) }) - it('Should not settle trades if trading paused', async () => { - await main.connect(owner).pauseTrading() - await expect(backingManager.settleTrade(token0.address)).to.be.revertedWith( - 'frozen or trading paused' - ) - }) - - it('Should not settle trades if frozen', async () => { - await main.connect(owner).freezeShort() - await expect(backingManager.settleTrade(token0.address)).to.be.revertedWith( - 'frozen or trading paused' - ) - }) - it('Should not recollateralize when switching basket if all assets are UNPRICED', async () => { // Set price to use lot price await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 746815c077..ecf2a581a1 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -428,20 +428,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(balAfter).to.equal(rewardAmt) }) - it('Should not settle trade if paused', async () => { - await main.connect(owner).pauseTrading() - await expect(rTokenTrader.settleTrade(ZERO_ADDRESS)).to.be.revertedWith( - 'frozen or trading paused' - ) - }) - - it('Should not settle trade if frozen', async () => { - await main.connect(owner).freezeShort() - await expect(rTokenTrader.settleTrade(ZERO_ADDRESS)).to.be.revertedWith( - 'frozen or trading paused' - ) - }) - it('Should still launch revenue auction if IFFY', async () => { // Depeg one of the underlying tokens - Reducing price 30% await setOraclePrice(collateral0.address, bn('7e7')) From 3c20f04512938c997ac0c590fe4e2a4166c1f4e1 Mon Sep 17 00:00:00 2001 From: brr Date: Tue, 1 Aug 2023 01:06:12 +0100 Subject: [PATCH 002/450] Morpho - Add missing tokens to deployment and expand unit tests (#874) --- .github/workflows/tests.yml | 8 - common/configuration.ts | 3 + contracts/facade/FacadeRead.sol | 6 +- contracts/p0/BackingManager.sol | 2 +- contracts/p0/BasketHandler.sol | 4 +- contracts/p0/RToken.sol | 4 +- contracts/p1/BasketHandler.sol | 17 +- contracts/plugins/assets/OracleLib.sol | 2 +- .../morpho-aave/MorphoFiatCollateral.sol | 9 +- .../morpho-aave/MorphoNonFiatCollateral.sol | 2 +- hardhat.config.ts | 1 + package.json | 34 +- .../deploy_morpho_aavev2_plugin.ts | 149 +- .../MorphoAAVEFiatCollateral.test.ts | 560 ++-- .../MorphoAAVENonFiatCollateral.test.ts | 379 +-- ...orphoAAVESelfReferentialCollateral.test.ts | 8 +- .../MorphoAaveV2TokenisedDeposit.test.ts | 14 +- yarn.lock | 2815 +++++++++-------- 18 files changed, 2239 insertions(+), 1778 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1f3a2cdc5a..a0215996f0 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,7 +19,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn devchain & env: MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} @@ -37,7 +36,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn lint plugin-tests: @@ -50,7 +48,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn test:plugins - name: 'Cache hardhat network fork' uses: actions/cache@v3 @@ -76,7 +73,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn test:p0 env: NODE_OPTIONS: '--max-old-space-size=8192' @@ -91,7 +87,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn test:p1 env: NODE_OPTIONS: '--max-old-space-size=8192' @@ -106,7 +101,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn test:scenario env: NODE_OPTIONS: '--max-old-space-size=8192' @@ -121,7 +115,6 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - run: yarn test:extreme - name: 'Cache hardhat network fork' uses: actions/cache@v3 @@ -157,7 +150,6 @@ jobs: hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - run: yarn install --immutable - - run: yarn compile - run: yarn test:integration env: NODE_OPTIONS: '--max-old-space-size=8192' diff --git a/common/configuration.ts b/common/configuration.ts index ab3fff947d..5edd69b99f 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -65,6 +65,9 @@ export interface ITokens { maUSDC?: string maUSDT?: string maDAI?: string + maWBTC?: string + maWETH?: string + maStETH?: string } export interface IFeeds { diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 4896b2d756..9c0d0ffa5f 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -348,9 +348,9 @@ contract FacadeRead is IFacadeRead { uint192 uoaHeldInBaskets; // {UoA} { (address[] memory basketERC20s, uint256[] memory quantities) = rToken - .main() - .basketHandler() - .quote(basketsNeeded, FLOOR); + .main() + .basketHandler() + .quote(basketsNeeded, FLOOR); IAssetRegistry reg = rToken.main().assetRegistry(); IBackingManager bm = rToken.main().backingManager(); diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 0bdc2249c7..c22df732c7 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -124,7 +124,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { BasketRange memory basketsHeld = main.basketHandler().basketsHeldBy(address(this)); (bool doTrade, TradeRequest memory req, TradePrices memory prices) = TradingLibP0 - .prepareRecollateralizationTrade(this, basketsHeld); + .prepareRecollateralizationTrade(this, basketsHeld); if (doTrade) { // Seize RSR if needed diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 602ec43339..357b0a7251 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -516,8 +516,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // {tok} = {BU} * {ref/BU} / {ref/tok} quantities[i] = amount - .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR) - .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR); + .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR) + .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR); // marginally more penalizing than its sibling calculation that uses _quantity() // because does not intermediately CEIL as part of the division } diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol index a943324371..2ba631e3a2 100644 --- a/contracts/p0/RToken.sol +++ b/contracts/p0/RToken.sol @@ -214,8 +214,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { } (address[] memory erc20s, uint256[] memory amounts) = main - .basketHandler() - .quoteCustomRedemption(basketNonces, portions, basketsRedeemed); + .basketHandler() + .quoteCustomRedemption(basketNonces, portions, basketsRedeemed); // === Save initial recipient balances === diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index b684b8c3e2..7bcd48028d 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -376,11 +376,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // {qTok} = {tok/BU} * {BU} * {tok} * {qTok/tok} quantities[i] = _quantity(basket.erc20s[i], coll) - .safeMul(amount, rounding) - .shiftl_toUint( - int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), - rounding - ); + .safeMul(amount, rounding) + .shiftl_toUint(int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), rounding); } } @@ -461,8 +458,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // {tok} = {BU} * {ref/BU} / {ref/tok} quantities[i] = amount - .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR) - .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR); + .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR) + .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR); // marginally more penalizing than its sibling calculation that uses _quantity() // because does not intermediately CEIL as part of the division } @@ -608,9 +605,9 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // {tok} = {BU} * {ref/BU} / {ref/tok} quantities[i] = b - .refAmts[erc20s[i]] - .safeDiv(ICollateral(address(asset)).refPerTok(), FLOOR) - .shiftl_toUint(int8(asset.erc20Decimals()), FLOOR); + .refAmts[erc20s[i]] + .safeDiv(ICollateral(address(asset)).refPerTok(), FLOOR) + .shiftl_toUint(int8(asset.erc20Decimals()), FLOOR); } catch (bytes memory errData) { // untested: // OOG pattern tested in other contracts, cost to test here is high diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index e15605f881..b0e2538761 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -17,7 +17,7 @@ library OracleLib { returns (uint192) { (uint80 roundId, int256 p, , uint256 updateTime, uint80 answeredInRound) = chainlinkFeed - .latestRoundData(); + .latestRoundData(); if (updateTime == 0 || answeredInRound < roundId) { revert StalePrice(); diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index bc4debb54e..778725866c 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -18,7 +18,6 @@ import { shiftl_toFix, FIX_ONE } from "../../../libraries/Fixed.sol"; contract MorphoFiatCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; - MorphoTokenisedDeposit public immutable vault; uint256 private immutable oneShare; int8 private immutable refDecimals; @@ -29,13 +28,17 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); - vault = MorphoTokenisedDeposit(address(config.erc20)); + MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20)); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals); + return + shiftl_toFix( + MorphoTokenisedDeposit(address(erc20)).convertToAssets(oneShare), + -refDecimals + ); } } diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 0e39fb12d6..b37db03207 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -48,7 +48,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { uint192 pegPrice ) { - // {tar/ref} Get current market peg ({btc/wbtc}) + // {tar/ref} Get current market peg pegPrice = targetUnitChainlinkFeed.price(targetUnitOracleTimeout); // {UoA/tok} = {UoA/ref} * {ref/tok} diff --git a/hardhat.config.ts b/hardhat.config.ts index f45506c31d..2fa2cc5eed 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -117,6 +117,7 @@ const config: HardhatUserConfig = { mocha: { timeout: TIMEOUT, slow: 1000, + retries: 3 }, contractSizer: { alphaSort: false, diff --git a/package.json b/package.json index 7d9411dee6..a9e2497e3e 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,12 @@ "test:extreme:integration": "FORK=1 EXTREME=1 PROTO_IMPL=1 npx hardhat test test/integration/**/*.test.ts", "test:unit": "yarn test:plugins && yarn test:p0 && yarn test:p1", "test:fast": "bash tools/fast-test.sh", - "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts", - "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts", - "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts", + "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts --parallel", + "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts --parallel", + "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts --parallel", "test:plugins:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", - "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts", - "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts", + "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts --parallel", + "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts --parallel", "test:gas": "yarn test:gas:protocol && yarn test:gas:integration", "test:gas:protocol": "REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts", "test:gas:integration": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/integration/**/*.test.ts", @@ -68,21 +68,21 @@ "@types/lodash": "^4.14.177", "@types/mocha": "^9.0.0", "@types/node": "^12.20.37", - "@typescript-eslint/eslint-plugin": "^5.17.0", - "@typescript-eslint/parser": "^5.17.0", + "@typescript-eslint/eslint-plugin": "5.17.0", + "@typescript-eslint/parser": "5.17.0", "axios": "^0.24.0", "bignumber.js": "^9.1.1", "caip": "^1.1.0", "chai": "^4.3.4", "decimal.js": "^10.4.3", "dotenv": "^16.0.0", - "eslint": "^8.14.0", - "eslint-config-prettier": "^8.5.0", - "eslint-config-standard": "^16.0.3", - "eslint-plugin-import": "^2.25.4", - "eslint-plugin-node": "^11.1.0", - "eslint-plugin-prettier": "^4.0.0", - "eslint-plugin-promise": "^6.0.0", + "eslint": "8.14.0", + "eslint-config-prettier": "8.5.0", + "eslint-config-standard": "16.0.3", + "eslint-plugin-import": "2.25.4", + "eslint-plugin-node": "11.1.0", + "eslint-plugin-prettier": "4.0.0", + "eslint-plugin-promise": "6.0.0", "eth-permit": "^0.2.1", "ethers": "^5.7.2", "fast-check": "^2.24.0", @@ -96,9 +96,9 @@ "lodash.get": "^4.4.2", "mocha-chai-jest-snapshot": "^1.1.3", "prettier": "2.5.1", - "prettier-plugin-solidity": "^1.0.0-beta.13", - "solhint": "^3.3.6", - "solhint-plugin-prettier": "^0.0.5", + "prettier-plugin-solidity": "1.0.0-beta.13", + "solhint": "3.3.6", + "solhint-plugin-prettier": "0.0.5", "solidity-coverage": "^0.8.2", "ts-node": "^10.4.0", "tsconfig-paths": "^4.1.0", diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index 72fa5d3dea..6bc493a48c 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -11,7 +11,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout, oracleTimeout, combinedError } from '../../utils' async function main() { // ==== Read Configuration ==== @@ -36,7 +36,7 @@ async function main() { const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) const deployedCollateral: string[] = [] - const revenueHiding = fp('1e-6').toString() // revenueHiding = 0.0001% + const revenueHiding = fp('1e-6') // revenueHiding = 0.0001% /******** Deploy Morpho - AaveV2 **************************/ @@ -61,6 +61,7 @@ async function main() { poolToken: networkConfig[chainId].tokens.aUSDC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, }) + const maDAI = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, @@ -70,50 +71,85 @@ async function main() { rewardToken: networkConfig[chainId].tokens.MORPHO!, }) + const maWBTC = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, + underlyingERC20: networkConfig[chainId].tokens.WBTC!, + poolToken: networkConfig[chainId].tokens.aWBTC!, + rewardToken: networkConfig[chainId].tokens.MORPHO!, + }) + + const maWETH = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, + underlyingERC20: networkConfig[chainId].tokens.WETH!, + poolToken: networkConfig[chainId].tokens.aWETH!, + rewardToken: networkConfig[chainId].tokens.MORPHO!, + }) + + const maStETH = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, + underlyingERC20: networkConfig[chainId].tokens.stETH!, + poolToken: networkConfig[chainId].tokens.astETH!, + rewardToken: networkConfig[chainId].tokens.MORPHO!, + }) + await maUSDT.deployed() await maUSDC.deployed() await maDAI.deployed() + await maWBTC.deployed() + await maWETH.deployed() + await maStETH.deployed() assetCollDeployments.erc20s.maUSDT = maUSDT.address assetCollDeployments.erc20s.maUSDC = maUSDC.address assetCollDeployments.erc20s.maDAI = maDAI.address + assetCollDeployments.erc20s.maWBTC = maWBTC.address + assetCollDeployments.erc20s.maWETH = maWETH.address + assetCollDeployments.erc20s.maStETH = maStETH.address /******** Morpho collateral **************************/ const FiatCollateralFactory = await hre.ethers.getContractFactory( "MorphoFiatCollateral" ) + const NonFiatCollateralFactory = await hre.ethers.getContractFactory( + "MorphoNonFiatCollateral" + ) + const SelfReferentialFactory = await hre.ethers.getContractFactory( + "MorphoSelfReferentialCollateral" + ) const stablesOracleError = fp('0.0025') // 0.25% + const baseStableConfig = { + priceTimeout: priceTimeout.toString(), + oracleError: stablesOracleError.toString(), + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr + targetName: ethers.utils.formatBytes32String("USD"), + defaultThreshold: stablesOracleError.add(fp("0.01")), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + } + { const collateral = await FiatCollateralFactory.connect(deployer).deploy({ - priceTimeout: priceTimeout.toString(), + ...baseStableConfig, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDT!, - oracleError: stablesOracleError.toString(), erc20: maUSDT.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr - targetName: ethers.utils.formatBytes32String("USD"), - defaultThreshold: stablesOracleError.add(fp("0.01")), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding ); assetCollDeployments.collateral.maUSDT = collateral.address deployedCollateral.push(collateral.address.toString()) - } { - const collateral = await FiatCollateralFactory.connect(deployer).deploy({ - priceTimeout: priceTimeout.toString(), + ...baseStableConfig, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: stablesOracleError.toString(), erc20: maUSDC.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr - targetName: ethers.utils.formatBytes32String("USD"), - defaultThreshold: stablesOracleError.add(fp("0.01")), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding ); @@ -122,15 +158,9 @@ async function main() { } { const collateral = await FiatCollateralFactory.connect(deployer).deploy({ - priceTimeout: priceTimeout.toString(), + ...baseStableConfig, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI!, - oracleError: stablesOracleError.toString(), erc20: maDAI.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: ethers.utils.formatBytes32String("USD"), - defaultThreshold: stablesOracleError.add(fp("0.01")), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding ); @@ -138,6 +168,75 @@ async function main() { deployedCollateral.push(collateral.address.toString()) } + { + const wbtcOracleError = fp('0.02') // 2% + const btcOracleError = fp('0.005') // 0.5% + const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) + const collateral = await NonFiatCollateralFactory.connect(deployer).deploy({ + priceTimeout: priceTimeout, + oracleError: combinedBTCWBTCError, + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String("BTC"), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, + erc20: maWBTC.address, + }, + revenueHiding, + networkConfig[chainId].chainlinkFeeds.wBTCBTC!, + oracleTimeout(chainId, '86400').toString(), // 1 hr + ); + assetCollDeployments.collateral.maWBTC = collateral.address + deployedCollateral.push(collateral.address.toString()) + } + + { + const collateral = await SelfReferentialFactory.connect(deployer).deploy({ + priceTimeout: priceTimeout, + oracleError: fp('0.005'), + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String("ETH"), + defaultThreshold: fp('0.05'), // 5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + erc20: maWBTC.address, + }, + revenueHiding, + ); + assetCollDeployments.collateral.maWETH = collateral.address + deployedCollateral.push(collateral.address.toString()) + } + + { + const ethStEthOracleError = fp('0.005') // 0.5% + const ethOracleError = fp('0.005') // 0.5% + + const combinedOracleErrors = combinedError(ethStEthOracleError, ethOracleError) + + // TAR: ETH + // REF: stETH + // TOK: maETH + const collateral = await NonFiatCollateralFactory.connect(deployer).deploy({ + priceTimeout: priceTimeout, + oracleError: combinedOracleErrors, + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String("ETH"), + defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + erc20: maStETH.address, + }, + revenueHiding, + networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} + oracleTimeout(chainId, '86400').toString(), // 1 hr + ); + assetCollDeployments.collateral.maWBTC = collateral.address + deployedCollateral.push(collateral.address.toString()) + } + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) console.log(`Deployed collateral to ${hre.network.name} (${chainId}) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index f03e2b6c1d..39e467e2d0 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -32,302 +32,332 @@ interface MAFiatCollateralOpts extends CollateralOpts { defaultRefPerTok?: BigNumberish } -export const deployCollateral = async ( - opts: MAFiatCollateralOpts = {} -): Promise => { - opts = { ...defaultCollateralOpts, ...opts } - - const MorphoAAVECollateralFactory: ContractFactory = await ethers.getContractFactory( - 'MorphoFiatCollateral' - ) - if (opts.erc20 == null) { - const MorphoTokenisedDepositFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDepositMock' +const makeAaveFiatCollateralTestSuite = ( + collateralName: string, + defaultCollateralOpts: MAFiatCollateralOpts +) => { + const networkConfigToUse = networkConfig[31337] + const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { + opts = { ...defaultCollateralOpts, ...opts } + + const MorphoAAVECollateralFactory: ContractFactory = await ethers.getContractFactory( + 'MorphoFiatCollateral' ) - const wrapperMock = await MorphoTokenisedDepositFactory.deploy({ - morphoController: networkConfig[1].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[1].MORPHO_AAVE_LENS!, - underlyingERC20: opts.underlyingToken!, - poolToken: opts.poolToken!, - rewardsDistributor: networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR!, - rewardToken: networkConfig[1].tokens.MORPHO!, - }) - opts.erc20 = wrapperMock.address - } + if (opts.erc20 == null) { + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDepositMock' + ) + const wrapperMock = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, + underlyingERC20: opts.underlyingToken!, + poolToken: opts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: networkConfigToUse.tokens.MORPHO!, + }) + opts.erc20 = wrapperMock.address + } - const collateral = await MorphoAAVECollateralFactory.deploy( - { - erc20: opts.erc20, - targetName: opts.targetName, - priceTimeout: opts.priceTimeout, - chainlinkFeed: opts.chainlinkFeed, - oracleError: opts.oracleError, - oracleTimeout: opts.oracleTimeout, - maxTradeVolume: opts.maxTradeVolume, - defaultThreshold: opts.defaultThreshold, - delayUntilDefault: opts.delayUntilDefault, - }, - opts.revenueHiding, - { gasLimit: 2000000000 } - ) - await collateral.deployed() - - await expect(collateral.refresh()) - - return collateral -} + const collateral = await MorphoAAVECollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { gasLimit: 2000000000 } + ) + await collateral.deployed() -type Fixture = () => Promise + await expect(collateral.refresh()) -const makeCollateralFixtureContext = ( - alice: SignerWithAddress, - inOpts: MAFiatCollateralOpts = {} -): Fixture => { - const makeCollateralFixtureContext = async () => { - const opts = { ...defaultCollateralOpts, ...inOpts } + return collateral + } - const MorphoTokenisedDepositFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDepositMock' - ) - const erc20Factory = await ethers.getContractFactory('ERC20Mock') - const underlyingErc20 = await erc20Factory.attach(opts.underlyingToken!) - const wrapperMock = await MorphoTokenisedDepositFactory.deploy({ - morphoController: networkConfig[1].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[1].MORPHO_AAVE_LENS!, - underlyingERC20: opts.underlyingToken!, - poolToken: opts.poolToken!, - rewardsDistributor: networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR!, - rewardToken: networkConfig[1].tokens.MORPHO!, - }) + type Fixture = () => Promise - const MockV3AggregatorFactory = ( - await ethers.getContractFactory('MockV3Aggregator') - ) + const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + inOpts: MAFiatCollateralOpts = {} + ): Fixture => { + const makeCollateralFixtureContext = async () => { + const opts = { ...defaultCollateralOpts, ...inOpts } - const chainlinkFeed = ( - await MockV3AggregatorFactory.deploy(8, opts.defaultPrice!) - ) - const collateralOpts = { - ...opts, - erc20: wrapperMock.address, - chainlinkFeed: chainlinkFeed.address, - } - - const collateral = await deployCollateral(collateralOpts) + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDepositMock' + ) + const erc20Factory = await ethers.getContractFactory('ERC20Mock') + const underlyingErc20 = await erc20Factory.attach(opts.underlyingToken!) + const wrapperMock = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, + underlyingERC20: opts.underlyingToken!, + poolToken: opts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: networkConfigToUse.tokens.MORPHO!, + }) + + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) - return { - alice, - collateral, - underlyingErc20: underlyingErc20, - chainlinkFeed, - tok: wrapperMock as unknown as ERC20Mock, - morphoWrapper: wrapperMock, - } as MorphoAaveCollateralFixtureContext - } + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, opts.defaultPrice!) + ) + const collateralOpts = { + ...opts, + erc20: wrapperMock.address, + chainlinkFeed: chainlinkFeed.address, + } - return makeCollateralFixtureContext -} + const collateral = await deployCollateral(collateralOpts) -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} + return { + alice, + collateral, + underlyingErc20: underlyingErc20, + chainlinkFeed, + tok: wrapperMock as unknown as ERC20Mock, + morphoWrapper: wrapperMock, + } as MorphoAaveCollateralFixtureContext + } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} + return makeCollateralFixtureContext + } -const changeRefPerTok = async ( - ctx: MorphoAaveCollateralFixtureContext, - percentChange: BigNumber -) => { - const rate = await ctx.morphoWrapper.getExchangeRate() - await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) -} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const reduceTargetPerRef = async () => {} -// prettier-ignore -const reduceRefPerTok = async ( - ctx: MorphoAaveCollateralFixtureContext, - pctDecrease: BigNumberish -) => { - await changeRefPerTok( - ctx, - bn(pctDecrease).mul(-1) - ) -} -// prettier-ignore -const increaseRefPerTok = async ( - ctx: MorphoAaveCollateralFixtureContext, - pctIncrease: BigNumberish -) => { - await changeRefPerTok( - ctx, - bn(pctIncrease) - ) -} -const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { - const clData = await ctx.chainlinkFeed.latestRoundData() - const clDecimals = await ctx.chainlinkFeed.decimals() - - const refPerTok = await ctx.collateral.refPerTok() - return clData.answer - .mul(bn(10).pow(18 - clDecimals)) - .mul(refPerTok) - .div(fp('1')) -} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const increaseTargetPerRef = async () => {} -/* - Define collateral-specific tests -*/ + const changeRefPerTok = async ( + ctx: MorphoAaveCollateralFixtureContext, + percentChange: BigNumber + ) => { + const rate = await ctx.morphoWrapper.getExchangeRate() + await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) + } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificConstructorTests = () => { - it('tokenised deposits can correctly claim rewards', async () => { - const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' - const forkBlock = 17574117 - const claimer = '0x05e818959c2Aa4CD05EDAe9A099c38e7Bdc377C6' - const reset = getResetFork(forkBlock) - await reset() - const MorphoTokenisedDepositFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDeposit' + // prettier-ignore + const reduceRefPerTok = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctDecrease: BigNumberish + ) => { + await changeRefPerTok( + ctx, + bn(pctDecrease).mul(-1) ) - const usdtVault = await MorphoTokenisedDepositFactory.deploy({ - morphoController: networkConfig[1].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[1].MORPHO_AAVE_LENS!, - underlyingERC20: networkConfig[1].tokens.USDT!, - poolToken: networkConfig[1].tokens.aUSDT!, - rewardsDistributor: networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR!, - rewardToken: networkConfig[1].tokens.MORPHO!, - }) - const vaultCode = await ethers.provider.getCode(usdtVault.address) - await setCode(claimer, vaultCode) - - const vaultWithClaimableRewards = usdtVault.attach(claimer) - const erc20Factory = await ethers.getContractFactory('ERC20Mock') - const underlyingERC20 = await erc20Factory.attach(networkConfig[1].tokens.USDT!) - const depositAmount = utils.parseUnits('1000', 6) - - const user = hre.ethers.provider.getSigner(0) - const userAddress = await user.getAddress() - - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('0.0') - - await whileImpersonating( - hre, - whales[networkConfig[1].tokens.USDT!.toLowerCase()], - async (whaleSigner) => { - await underlyingERC20.connect(whaleSigner).approve(vaultWithClaimableRewards.address, 0) - await underlyingERC20 - .connect(whaleSigner) - .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) - await vaultWithClaimableRewards.connect(whaleSigner).mint(depositAmount, userAddress) - } + } + // prettier-ignore + const increaseRefPerTok = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctIncrease: BigNumberish + ) => { + await changeRefPerTok( + ctx, + bn(pctIncrease) ) + } + const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() + + const refPerTok = await ctx.collateral.refPerTok() + return clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(refPerTok) + .div(fp('1')) + } - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('8.60295466891613') + /* + Define collateral-specific tests + */ + const collateralSpecificConstructorTests = () => { + it('tokenised deposits can correctly claim rewards', async () => { + const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' + const forkBlock = 17574117 + const claimer = '0x05e818959c2Aa4CD05EDAe9A099c38e7Bdc377C6' + const reset = getResetFork(forkBlock) + await reset() + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDeposit' + ) + const usdtVault = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, + underlyingERC20: defaultCollateralOpts.underlyingToken!, + poolToken: defaultCollateralOpts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: networkConfigToUse.tokens.MORPHO!, + }) + const vaultCode = await ethers.provider.getCode(usdtVault.address) + await setCode(claimer, vaultCode) + + const vaultWithClaimableRewards = usdtVault.attach(claimer) + const erc20Factory = await ethers.getContractFactory('ERC20Mock') + const underlyingERC20 = erc20Factory.attach(defaultCollateralOpts.underlyingToken!) + const depositAmount = utils.parseUnits('1000', 6) + + const user = hre.ethers.provider.getSigner(0) + const userAddress = await user.getAddress() + + expect( + formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) + ).to.be.equal('0.0') + + await whileImpersonating( + hre, + whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], + async (whaleSigner) => { + await underlyingERC20.connect(whaleSigner).approve(vaultWithClaimableRewards.address, 0) + await underlyingERC20 + .connect(whaleSigner) + .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) + await vaultWithClaimableRewards.connect(whaleSigner).mint(depositAmount, userAddress) + } + ) + + expect( + formatEther( + await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) + ).slice(0, '8.60295466891613'.length) + ).to.be.equal('8.60295466891613') + + const morphoRewards = await ethers.getContractAt( + 'IMorphoRewardsDistributor', + networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR! + ) + await morphoRewards.claim(vaultWithClaimableRewards.address, '14162082619942089266', [ + '0x49bb35f20573d5b927c5b5c15c904839cacdf83c6119450ccb6c2ed0647aa71b', + '0xfb9f4530177774effb7af9c1723c7087f60cd135a0cb5f409ec7bbc792a79235', + '0x16dcb8d895b9520c20f476bfc23125aa8f47b800a3bea63b63f89abe158a16fe', + '0x70b3bcf266272051262da958e86efb68a3621977aab0fa0205a5e47a83f3b129', + '0xc06f6781c002b96e5860094fec5ac0692e6e39b3aafa0e02a2c9f87a993a55cb', + '0x679aafaa2e4772160288874aa86f2f1baf6ab7409109da7ad96d3b6d5cf2c3ee', + '0x5b9f1e5d9dfbdc65ec0166a6f1e2fe4a31396fa31739cce54962f1ed43638ff1', + '0xb2db22839637b4c40c7ecc800df0ed8a205c9c31d7d49c41c3d105a62d1c5526', + '0xa26071ec1b113e9033dcbccd7680617d3e75fa626b9f1c43dbc778f641f162da', + '0x53eb58db4c07b67b3bce54b530c950a4ef0c229a3ed2506c53d7c4e31ecc6bfc', + '0x14c512bd39f8b1d13d4cfaad2b4473c4022d01577249ecc97fbf0a64244378ee', + '0xea8c2ee8d43e37ceb7b0c04d59106eff88afbe3e911b656dec7caebd415ea696', + ]) + + expect( + formatEther( + await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) + ).slice(0, '14.162082619942089'.length) + ).to.be.equal('14.162082619942089') + + // MORPHO is not a transferable token. + // POST Launch we could ask the Morpho team if our TokenVaults could get permission to transfer the MORPHO tokens. + // Otherwise owners of the TokenVault shares need to wait until the protocol enables the transfer function on the MORPHO token. + + await whileImpersonating(hre, morphoTokenOwner, async (signer) => { + const morphoTokenInst = await ethers.getContractAt( + 'IMorphoToken', + networkConfigToUse.tokens.MORPHO!, + signer + ) + + await morphoTokenInst + .connect(signer) + .setUserRole(vaultWithClaimableRewards.address, 0, true) + }) - const morphoRewards = await ethers.getContractAt( - 'IMorphoRewardsDistributor', - networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR! - ) - await morphoRewards.claim(vaultWithClaimableRewards.address, '14162082619942089266', [ - '0x49bb35f20573d5b927c5b5c15c904839cacdf83c6119450ccb6c2ed0647aa71b', - '0xfb9f4530177774effb7af9c1723c7087f60cd135a0cb5f409ec7bbc792a79235', - '0x16dcb8d895b9520c20f476bfc23125aa8f47b800a3bea63b63f89abe158a16fe', - '0x70b3bcf266272051262da958e86efb68a3621977aab0fa0205a5e47a83f3b129', - '0xc06f6781c002b96e5860094fec5ac0692e6e39b3aafa0e02a2c9f87a993a55cb', - '0x679aafaa2e4772160288874aa86f2f1baf6ab7409109da7ad96d3b6d5cf2c3ee', - '0x5b9f1e5d9dfbdc65ec0166a6f1e2fe4a31396fa31739cce54962f1ed43638ff1', - '0xb2db22839637b4c40c7ecc800df0ed8a205c9c31d7d49c41c3d105a62d1c5526', - '0xa26071ec1b113e9033dcbccd7680617d3e75fa626b9f1c43dbc778f641f162da', - '0x53eb58db4c07b67b3bce54b530c950a4ef0c229a3ed2506c53d7c4e31ecc6bfc', - '0x14c512bd39f8b1d13d4cfaad2b4473c4022d01577249ecc97fbf0a64244378ee', - '0xea8c2ee8d43e37ceb7b0c04d59106eff88afbe3e911b656dec7caebd415ea696', - ]) - - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('14.162082619942089') - - // MORPHO is not a transferable token. - // POST Launch we could ask the Morpho team if our TokenVaults could get permission to transfer the MORPHO tokens. - // Otherwise owners of the TokenVault shares need to wait until the protocol enables the transfer function on the MORPHO token. - - await whileImpersonating(hre, morphoTokenOwner, async (signer) => { const morphoTokenInst = await ethers.getContractAt( 'IMorphoToken', - networkConfig[1].tokens.MORPHO!, - signer + networkConfigToUse.tokens.MORPHO!, + user ) + expect(formatEther(await morphoTokenInst.balanceOf(userAddress))).to.be.equal('0.0') - await morphoTokenInst.connect(signer).setUserRole(vaultWithClaimableRewards.address, 0, true) - }) + await vaultWithClaimableRewards.claimRewards() - const morphoTokenInst = await ethers.getContractAt( - 'IMorphoToken', - networkConfig[1].tokens.MORPHO!, - user - ) - expect(formatEther(await morphoTokenInst.balanceOf(userAddress))).to.be.equal('0.0') + expect( + formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) + ).to.be.equal('0.0') - await vaultWithClaimableRewards.claimRewards() + expect( + formatEther(await morphoTokenInst.balanceOf(userAddress)).slice( + 0, + '14.162082619942089'.length + ) + ).to.be.equal('14.162082619942089') + }) + } - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('0.0') + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificStatusTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const beforeEachRewardsTest = async () => {} + + const opts = { + deployCollateral, + collateralSpecificConstructorTests: collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it.skip, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itHasRevenueHiding: it, + resetFork: getResetFork(FORK_BLOCK), + collateralName, + chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, + } - expect(formatEther(await morphoTokenInst.balanceOf(userAddress))).to.be.equal( - '14.162082619942089' - ) - }) + collateralTests(opts) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificStatusTests = () => {} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const beforeEachRewardsTest = async () => {} - -export const defaultCollateralOpts: MAFiatCollateralOpts = { - targetName: ethers.utils.formatBytes32String('USDT'), - underlyingToken: networkConfig[1].tokens.USDT!, - poolToken: networkConfig[1].tokens.aUSDT!, - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: networkConfig[1].chainlinkFeeds.USDT!, - oracleTimeout: ORACLE_TIMEOUT, - oracleError: ORACLE_ERROR, - maxTradeVolume: bn(1000000), - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - revenueHiding: fp('0'), - defaultPrice: bn('1e8'), - defaultRefPerTok: fp('1'), +const makeOpts = ( + underlyingToken: string, + poolToken: string, + chainlinkFeed: string +): MAFiatCollateralOpts => { + return { + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, + oracleError: ORACLE_ERROR, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + maxTradeVolume: bn(1000000), + revenueHiding: fp('0'), + defaultPrice: bn('1e8'), + defaultRefPerTok: fp('1'), + underlyingToken, + poolToken, + chainlinkFeed, + } } /* Run the test suite */ - -const opts = { - deployCollateral, - collateralSpecificConstructorTests, - collateralSpecificStatusTests, - beforeEachRewardsTest, - makeCollateralFixtureContext, - mintCollateralTo, - reduceTargetPerRef, - increaseTargetPerRef, - reduceRefPerTok, - increaseRefPerTok, - getExpectedPrice, - itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, - itChecksRefPerTokDefault: it, - itChecksPriceChanges: it, - itHasRevenueHiding: it, - resetFork: getResetFork(FORK_BLOCK), - collateralName: 'MorphoAAVEV2FiatCollateral', - chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, -} - -collateralTests(opts) +const { tokens, chainlinkFeeds } = networkConfig[31337] +makeAaveFiatCollateralTestSuite( + 'MorphoAAVEV2FiatCollateral - USDT', + makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!) +) +makeAaveFiatCollateralTestSuite( + 'MorphoAAVEV2FiatCollateral - USDC', + makeOpts(tokens.USDC!, tokens.aUSDC!, chainlinkFeeds.USDC!) +) +makeAaveFiatCollateralTestSuite( + 'MorphoAAVEV2FiatCollateral - DAI', + makeOpts(tokens.DAI!, tokens.aDAI!, chainlinkFeeds.DAI!) +) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 77a2a56e20..0e902705fd 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -10,7 +10,7 @@ import { } from '@typechain/index' import { expect } from 'chai' import { BigNumber, BigNumberish } from 'ethers' -import { parseEther, parseUnits } from 'ethers/lib/utils' +import { parseUnits } from 'ethers/lib/utils' import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' @@ -24,6 +24,7 @@ import { PRICE_TIMEOUT, } from './constants' import { MorphoAaveCollateralFixtureContext, mintCollateralTo } from './mintCollateralTo' +const configToUse = networkConfig[31337] interface MAFiatCollateralOpts extends CollateralOpts { underlyingToken?: string @@ -34,227 +35,233 @@ interface MAFiatCollateralOpts extends CollateralOpts { targetPrRefFeed?: string refPerTokChainlinkTimeout?: BigNumberish } +const makeAaveNonFiatCollateralTestSuite = ( + collateralName: string, + defaultCollateralOpts: MAFiatCollateralOpts +) => { + const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { + opts = { ...defaultCollateralOpts, ...opts } -export const deployCollateral = async ( - opts: MAFiatCollateralOpts = {} -): Promise => { - opts = { ...defaultCollateralOpts, ...opts } + const MorphoAAVECollateralFactory: MorphoNonFiatCollateral__factory = + await ethers.getContractFactory('MorphoNonFiatCollateral') + if (opts.erc20 == null) { + const MorphoTokenisedDepositMockFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDepositMock' + ) + const wrapperMock = await MorphoTokenisedDepositMockFactory.deploy({ + morphoController: configToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: configToUse.MORPHO_AAVE_LENS!, + underlyingERC20: opts.underlyingToken!, + poolToken: opts.poolToken!, + rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: configToUse.tokens.MORPHO!, + }) + opts.erc20 = wrapperMock.address + } + const collateral = (await MorphoAAVECollateralFactory.deploy( + { + erc20: opts.erc20!, + targetName: opts.targetName!, + priceTimeout: opts.priceTimeout!, + chainlinkFeed: opts.chainlinkFeed!, + oracleError: opts.oracleError!, + oracleTimeout: opts.oracleTimeout!, + maxTradeVolume: opts.maxTradeVolume!, + defaultThreshold: opts.defaultThreshold!, + delayUntilDefault: opts.delayUntilDefault!, + }, + opts.revenueHiding!, + opts.targetPrRefFeed!, + opts.refPerTokChainlinkTimeout!, + { gasLimit: 2000000000 } + )) as unknown as TestICollateral + await collateral.deployed() - const MorphoAAVECollateralFactory: MorphoNonFiatCollateral__factory = - await ethers.getContractFactory('MorphoNonFiatCollateral') - if (opts.erc20 == null) { - const MorphoTokenisedDepositMockFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDepositMock' - ) - const wrapperMock = await MorphoTokenisedDepositMockFactory.deploy({ - morphoController: networkConfig[1].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[1].MORPHO_AAVE_LENS!, - underlyingERC20: opts.underlyingToken!, - poolToken: opts.poolToken!, - rewardsDistributor: networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR!, - rewardToken: networkConfig[1].tokens.MORPHO!, - }) - opts.erc20 = wrapperMock.address - } - const collateral = (await MorphoAAVECollateralFactory.deploy( - { - erc20: opts.erc20!, - targetName: opts.targetName!, - priceTimeout: opts.priceTimeout!, - chainlinkFeed: opts.chainlinkFeed!, - oracleError: opts.oracleError!, - oracleTimeout: opts.oracleTimeout!, - maxTradeVolume: opts.maxTradeVolume!, - defaultThreshold: opts.defaultThreshold!, - delayUntilDefault: opts.delayUntilDefault!, - }, - opts.revenueHiding!, - opts.targetPrRefFeed!, - opts.refPerTokChainlinkTimeout!, - { gasLimit: 2000000000 } - )) as unknown as TestICollateral - await collateral.deployed() + await expect(collateral.refresh()) - await expect(collateral.refresh()) + return collateral + } - return collateral -} + type Fixture = () => Promise -type Fixture = () => Promise + const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + inOpts: MAFiatCollateralOpts = {} + ): Fixture => { + const makeCollateralFixtureContext = async () => { + const opts = { ...defaultCollateralOpts, ...inOpts } + const MorphoTokenisedDepositMockFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDepositMock' + ) + const erc20Factory = await ethers.getContractFactory('ERC20Mock') + const underlyingErc20 = erc20Factory.attach(opts.underlyingToken!) + const wrapperMock = await MorphoTokenisedDepositMockFactory.deploy({ + morphoController: configToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: configToUse.MORPHO_AAVE_LENS!, + underlyingERC20: opts.underlyingToken!, + poolToken: opts.poolToken!, + rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: configToUse.tokens.MORPHO!, + }) -const makeCollateralFixtureContext = ( - alice: SignerWithAddress, - inOpts: MAFiatCollateralOpts = {} -): Fixture => { - const makeCollateralFixtureContext = async () => { - const opts = { ...defaultCollateralOpts, ...inOpts } - const MorphoTokenisedDepositMockFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDepositMock' - ) - const erc20Factory = await ethers.getContractFactory('ERC20Mock') - const underlyingErc20 = erc20Factory.attach(opts.underlyingToken!) - const wrapperMock = await MorphoTokenisedDepositMockFactory.deploy({ - morphoController: networkConfig[1].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[1].MORPHO_AAVE_LENS!, - underlyingERC20: opts.underlyingToken!, - poolToken: opts.poolToken!, - rewardsDistributor: networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR!, - rewardToken: networkConfig[1].tokens.MORPHO!, - }) + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) - const MockV3AggregatorFactory = ( - await ethers.getContractFactory('MockV3Aggregator') - ) + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, opts.defaultPrice!) + ) - const chainlinkFeed = ( - await MockV3AggregatorFactory.deploy(8, opts.defaultPrice!) - ) + const targetPrRefFeed = ( + await MockV3AggregatorFactory.deploy(8, opts.defaultRefPerTok!) + ) - const targetPrRefFeed = ( - await MockV3AggregatorFactory.deploy(8, opts.defaultRefPerTok!) - ) + const collateralOpts = { + ...opts, + erc20: wrapperMock.address, + chainlinkFeed: chainlinkFeed.address, + targetPrRefFeed: targetPrRefFeed.address, + } + const collateral = await deployCollateral(collateralOpts) - const collateralOpts = { - ...opts, - erc20: wrapperMock.address, - chainlinkFeed: chainlinkFeed.address, - targetPrRefFeed: targetPrRefFeed.address, + return { + alice, + collateral, + chainlinkFeed, + targetPrRefFeed, + tok: wrapperMock as unknown as ERC20Mock, + morphoWrapper: wrapperMock, + underlyingErc20: underlyingErc20, + } as MorphoAaveCollateralFixtureContext } - const collateral = await deployCollateral(collateralOpts) - return { - alice, - collateral, - chainlinkFeed, - targetPrRefFeed, - tok: wrapperMock as unknown as ERC20Mock, - morphoWrapper: wrapperMock, - underlyingErc20: underlyingErc20, - } as MorphoAaveCollateralFixtureContext + return makeCollateralFixtureContext } - return makeCollateralFixtureContext -} + /* + Define helper functions + */ -/* - Define helper functions -*/ + // eslint-disable-next-line @typescript-eslint/no-empty-function + const reduceTargetPerRef = async () => {} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const increaseTargetPerRef = async () => {} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} + const changeRefPerTok = async ( + ctx: MorphoAaveCollateralFixtureContext, + percentChange: BigNumber + ) => { + const rate = await ctx.morphoWrapper.getExchangeRate() + await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) + } -const changeRefPerTok = async ( - ctx: MorphoAaveCollateralFixtureContext, - percentChange: BigNumber -) => { - const rate = await ctx.morphoWrapper.getExchangeRate() - await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) + // prettier-ignore + const reduceRefPerTok = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctDecrease: BigNumberish + ) => { + await changeRefPerTok( + ctx, + bn(pctDecrease).mul(-1) + ) + } + // prettier-ignore + const increaseRefPerTok = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctIncrease: BigNumberish + ) => { + await changeRefPerTok( + ctx, + bn(pctIncrease) + ) + } - // { - // const lastRound = await ctx.targetPrRefFeed!.latestRoundData() - // const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) - // await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) - // } + const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() - // { - // const lastRound = await ctx.chainlinkFeed.latestRoundData() - // const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) - // await ctx.chainlinkFeed.updateAnswer(nextAnswer) - // } -} + const clRptData = await ctx.targetPrRefFeed!.latestRoundData() + const clRptDecimals = await ctx.targetPrRefFeed!.decimals() -// prettier-ignore -const reduceRefPerTok = async ( - ctx: MorphoAaveCollateralFixtureContext, - pctDecrease: BigNumberish -) => { - await changeRefPerTok( - ctx, - bn(pctDecrease).mul(-1) - ) -} -// prettier-ignore -const increaseRefPerTok = async ( - ctx: MorphoAaveCollateralFixtureContext, - pctIncrease: BigNumberish -) => { - await changeRefPerTok( - ctx, - bn(pctIncrease) - ) -} + const expctPrice = clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) + .div(fp('1')) + return expctPrice + } + + /* + Define collateral-specific tests + */ -const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { - const clData = await ctx.chainlinkFeed.latestRoundData() - const clDecimals = await ctx.chainlinkFeed.decimals() + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificConstructorTests = () => {} - const clRptData = await ctx.targetPrRefFeed!.latestRoundData() - const clRptDecimals = await ctx.targetPrRefFeed!.decimals() + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificStatusTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const beforeEachRewardsTest = async () => {} + const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it.skip, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itHasRevenueHiding: it, + resetFork: getResetFork(FORK_BLOCK), + collateralName, + chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, + } - const expctPrice = clData.answer - .mul(bn(10).pow(18 - clDecimals)) - .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) - .div(fp('1')) - return expctPrice + collateralTests(opts) } /* - Define collateral-specific tests + Run the test suite */ - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificConstructorTests = () => {} - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificStatusTests = () => {} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const beforeEachRewardsTest = async () => {} - -export const defaultCollateralOpts: MAFiatCollateralOpts = { +makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - WBTC', { targetName: ethers.utils.formatBytes32String('BTC'), - underlyingToken: networkConfig[1].tokens.WBTC!, - poolToken: networkConfig[1].tokens.aWBTC!, + underlyingToken: configToUse.tokens.WBTC!, + poolToken: configToUse.tokens.aWBTC!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: networkConfig[1].chainlinkFeeds.WBTC!, - targetPrRefFeed: networkConfig[1].chainlinkFeeds.wBTCBTC!, + chainlinkFeed: configToUse.chainlinkFeeds.WBTC!, + targetPrRefFeed: configToUse.chainlinkFeeds.wBTCBTC!, oracleTimeout: ORACLE_TIMEOUT, oracleError: ORACLE_ERROR, - maxTradeVolume: parseEther('100'), + maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), defaultPrice: parseUnits('30000', 8), defaultRefPerTok: parseUnits('1', 8), refPerTokChainlinkTimeout: PRICE_TIMEOUT, -} +}) -/* - Run the test suite -*/ - -const opts = { - deployCollateral, - collateralSpecificConstructorTests, - collateralSpecificStatusTests, - beforeEachRewardsTest, - makeCollateralFixtureContext, - mintCollateralTo, - reduceTargetPerRef, - increaseTargetPerRef, - reduceRefPerTok, - increaseRefPerTok, - getExpectedPrice, - itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, - itChecksRefPerTokDefault: it, - itChecksPriceChanges: it, - itHasRevenueHiding: it, - resetFork: getResetFork(FORK_BLOCK), - collateralName: 'MorphoAAVEV2NonFiatCollateral', - chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, -} - -collateralTests(opts) +makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { + targetName: ethers.utils.formatBytes32String('ETH'), + underlyingToken: configToUse.tokens.stETH!, + poolToken: configToUse.tokens.astETH!, + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: configToUse.chainlinkFeeds.ETH!, + targetPrRefFeed: configToUse.chainlinkFeeds.stETHETH!, + oracleTimeout: ORACLE_TIMEOUT, + oracleError: ORACLE_ERROR, + maxTradeVolume: fp('1e6'), + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: fp('0'), + defaultPrice: parseUnits('1800', 8), + defaultRefPerTok: parseUnits('1', 8), + refPerTokChainlinkTimeout: PRICE_TIMEOUT, +}) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 1544f99966..16dd346ae7 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -31,9 +31,7 @@ interface MAFiatCollateralOpts extends CollateralOpts { defaultRefPerTok?: BigNumberish } -export const deployCollateral = async ( - opts: MAFiatCollateralOpts = {} -): Promise => { +const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { if (opts.defaultThreshold == null && opts.delayUntilDefault === 0) { opts.defaultThreshold = fp('0.001') } @@ -191,7 +189,7 @@ const collateralSpecificStatusTests = () => {} // eslint-disable-next-line @typescript-eslint/no-empty-function const beforeEachRewardsTest = async () => {} -export const defaultCollateralOpts: MAFiatCollateralOpts = { +const defaultCollateralOpts: MAFiatCollateralOpts = { targetName: ethers.utils.formatBytes32String('ETH'), underlyingToken: networkConfig[1].tokens.stETH!, poolToken: networkConfig[1].tokens.astETH!, @@ -229,7 +227,7 @@ const opts = { itChecksPriceChanges: it, itHasRevenueHiding: it, resetFork: getResetFork(FORK_BLOCK), - collateralName: 'MorphoAAVEV2SelfReferentialCollateral', + collateralName: 'MorphoAAVEV2SelfReferentialCollateral - WETH', chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, } diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index 1b4122b604..c529655694 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -8,9 +8,10 @@ import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' type ITokenSymbol = keyof ITokens +const networkConfigToUse = networkConfig[31337] const mkToken = (symbol: ITokenSymbol) => ({ - address: networkConfig[1].tokens[symbol]! as string, + address: networkConfigToUse.tokens[symbol]! as string, symbol: symbol, }) const mkTestCase = (symbol: T, amount: string) => ({ @@ -20,6 +21,7 @@ const mkTestCase = (symbol: T, amount: string) => ({ }) const TOKENS_TO_TEST = [ + mkTestCase('USDC', '1000.0'), mkTestCase('USDT', '1000.0'), mkTestCase('DAI', '1000.0'), mkTestCase('WETH', '1.0'), @@ -37,14 +39,14 @@ const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { } const instances = { underlying: factories.ERC20Mock.attach(token.address), - morpho: factories.ERC20Mock.attach(networkConfig[1].tokens.MORPHO!), + morpho: factories.ERC20Mock.attach(networkConfigToUse.tokens.MORPHO!), tokenVault: await factories.MorphoTokenisedDeposit.deploy({ underlyingERC20: token.address, poolToken: poolToken.address, - morphoController: networkConfig[1].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[1].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[1].MORPHO_REWARDS_DISTRIBUTOR!, - rewardToken: networkConfig[1].tokens.MORPHO!, + morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: networkConfigToUse.tokens.MORPHO!, }), } const underlyingDecimals = await instances.underlying.decimals() diff --git a/yarn.lock b/yarn.lock index b3f0942254..cd38842265 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5,6 +5,13 @@ __metadata: version: 6 cacheKey: 8 +"@aashutoshrathi/word-wrap@npm:^1.2.3": + version: 1.2.6 + resolution: "@aashutoshrathi/word-wrap@npm:1.2.6" + checksum: ada901b9e7c680d190f1d012c84217ce0063d8f5c5a7725bb91ec3c5ed99bb7572680eb2d2938a531ccbaec39a95422fcd8a6b4a13110c7d98dd75402f66a0cd + languageName: node + linkType: hard + "@aave/protocol-v2@npm:^1.0.1": version: 1.0.1 resolution: "@aave/protocol-v2@npm:1.0.1" @@ -14,13 +21,13 @@ __metadata: languageName: node linkType: hard -"@ampproject/remapping@npm:^2.1.0": - version: 2.2.0 - resolution: "@ampproject/remapping@npm:2.2.0" +"@ampproject/remapping@npm:^2.2.0": + version: 2.2.1 + resolution: "@ampproject/remapping@npm:2.2.1" dependencies: - "@jridgewell/gen-mapping": ^0.1.0 + "@jridgewell/gen-mapping": ^0.3.0 "@jridgewell/trace-mapping": ^0.3.9 - checksum: d74d170d06468913921d72430259424b7e4c826b5a7d39ff839a29d547efb97dc577caa8ba3fb5cf023624e9af9d09651afc3d4112a45e2050328abc9b3a2292 + checksum: 03c04fd526acc64a1f4df22651186f3e5ef0a9d6d6530ce4482ec9841269cf7a11dbb8af79237c282d721c5312024ff17529cd72cc4768c11e999b58e2302079 languageName: node linkType: hard @@ -47,11 +54,12 @@ __metadata: linkType: hard "@aws-sdk/types@npm:^3.1.0": - version: 3.329.0 - resolution: "@aws-sdk/types@npm:3.329.0" + version: 3.378.0 + resolution: "@aws-sdk/types@npm:3.378.0" dependencies: + "@smithy/types": ^2.0.2 tslib: ^2.5.0 - checksum: 2bbcd8e6ba2f813dc220c60e7ac0fa0d0990d49f88030fd8235479586716016c8f9d7aeaf1f4c1a64694275f33690bd1dd4ed46e127983201061e063da73f426 + checksum: c4c7ebb48a625cb990a1288466f2dd8f0d770078cc77b60d5ee4a803b473ff41df474271dff26d3dadad151d5a016b398167738dd4926266ff1cd04585d4d8e8 languageName: node linkType: hard @@ -64,188 +72,196 @@ __metadata: languageName: node linkType: hard -"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/code-frame@npm:7.18.6" +"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/code-frame@npm:7.22.5" dependencies: - "@babel/highlight": ^7.18.6 - checksum: 195e2be3172d7684bf95cff69ae3b7a15a9841ea9d27d3c843662d50cdd7d6470fd9c8e64be84d031117e4a4083486effba39f9aef6bbb2c89f7f21bcfba33ba + "@babel/highlight": ^7.22.5 + checksum: cfe804f518f53faaf9a1d3e0f9f74127ab9a004912c3a16fda07fb6a633393ecb9918a053cb71804204c1b7ec3d49e1699604715e2cfb0c9f7bc4933d324ebb6 languageName: node linkType: hard -"@babel/compat-data@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/compat-data@npm:7.18.6" - checksum: fd73a1bd7bc29be5528d2ef78248929ed3ee72e0edb69cef6051e0aad0bf8087594db6cd9e981f0d7f5bfc274fdbb77306d8abea8ceb71e95c18afc3ebd81828 +"@babel/compat-data@npm:^7.22.9": + version: 7.22.9 + resolution: "@babel/compat-data@npm:7.22.9" + checksum: bed77d9044ce948b4327b30dd0de0779fa9f3a7ed1f2d31638714ed00229fa71fc4d1617ae0eb1fad419338d3658d0e9a5a083297451e09e73e078d0347ff808 languageName: node linkType: hard "@babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3": - version: 7.18.6 - resolution: "@babel/core@npm:7.18.6" - dependencies: - "@ampproject/remapping": ^2.1.0 - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.18.6 - "@babel/helper-compilation-targets": ^7.18.6 - "@babel/helper-module-transforms": ^7.18.6 - "@babel/helpers": ^7.18.6 - "@babel/parser": ^7.18.6 - "@babel/template": ^7.18.6 - "@babel/traverse": ^7.18.6 - "@babel/types": ^7.18.6 + version: 7.22.9 + resolution: "@babel/core@npm:7.22.9" + dependencies: + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.22.5 + "@babel/generator": ^7.22.9 + "@babel/helper-compilation-targets": ^7.22.9 + "@babel/helper-module-transforms": ^7.22.9 + "@babel/helpers": ^7.22.6 + "@babel/parser": ^7.22.7 + "@babel/template": ^7.22.5 + "@babel/traverse": ^7.22.8 + "@babel/types": ^7.22.5 convert-source-map: ^1.7.0 debug: ^4.1.0 gensync: ^1.0.0-beta.2 - json5: ^2.2.1 - semver: ^6.3.0 - checksum: 711459ebf7afab7b8eff88b7155c3f4a62690545f1c8c2eb6ba5ebaed01abeecb984cf9657847a2151ad24a5645efce765832aa343ce0f0386f311b67b59589a + json5: ^2.2.2 + semver: ^6.3.1 + checksum: 7bf069aeceb417902c4efdaefab1f7b94adb7dea694a9aed1bda2edf4135348a080820529b1a300c6f8605740a00ca00c19b2d5e74b5dd489d99d8c11d5e56d1 languageName: node linkType: hard -"@babel/generator@npm:^7.18.6, @babel/generator@npm:^7.7.2": - version: 7.18.7 - resolution: "@babel/generator@npm:7.18.7" +"@babel/generator@npm:^7.22.7, @babel/generator@npm:^7.22.9, @babel/generator@npm:^7.7.2": + version: 7.22.9 + resolution: "@babel/generator@npm:7.22.9" dependencies: - "@babel/types": ^7.18.7 + "@babel/types": ^7.22.5 "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 jsesc: ^2.5.1 - checksum: aad4b6873130165e9483af2888bce5a3a5ad9cca0757fc90ae11a0396757d0b295a3bff49282c8df8ab01b31972cc855ae88fd9ddc9ab00d9427dc0e01caeea9 + checksum: 7c9d2c58b8d5ac5e047421a6ab03ec2ff5d9a5ff2c2212130a0055e063ac349e0b19d435537d6886c999771aef394832e4f54cd9fc810100a7f23d982f6af06b languageName: node linkType: hard -"@babel/helper-compilation-targets@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-compilation-targets@npm:7.18.6" +"@babel/helper-compilation-targets@npm:^7.22.9": + version: 7.22.9 + resolution: "@babel/helper-compilation-targets@npm:7.22.9" dependencies: - "@babel/compat-data": ^7.18.6 - "@babel/helper-validator-option": ^7.18.6 - browserslist: ^4.20.2 - semver: ^6.3.0 + "@babel/compat-data": ^7.22.9 + "@babel/helper-validator-option": ^7.22.5 + browserslist: ^4.21.9 + lru-cache: ^5.1.1 + semver: ^6.3.1 peerDependencies: "@babel/core": ^7.0.0 - checksum: f09ddaddc83c241cb7a040025e2ba558daa1c950ce878604d91230aed8d8a90f10dfd5bb0b67bc5b3db8af1576a0d0dac1d65959a06a17259243dbb5730d0ed1 + checksum: ea0006c6a93759025f4a35a25228ae260538c9f15023e8aac2a6d45ca68aef4cf86cfc429b19af9a402cbdd54d5de74ad3fbcf6baa7e48184dc079f1a791e178 languageName: node linkType: hard -"@babel/helper-environment-visitor@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-environment-visitor@npm:7.18.6" - checksum: 64fce65a26efb50d2496061ab2de669dc4c42175a8e05c82279497127e5c542538ed22b38194f6f5a4e86bed6ef5a4890aed23408480db0555728b4ca660fc9c +"@babel/helper-environment-visitor@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-environment-visitor@npm:7.22.5" + checksum: 248532077d732a34cd0844eb7b078ff917c3a8ec81a7f133593f71a860a582f05b60f818dc5049c2212e5baa12289c27889a4b81d56ef409b4863db49646c4b1 languageName: node linkType: hard -"@babel/helper-function-name@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-function-name@npm:7.18.6" +"@babel/helper-function-name@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-function-name@npm:7.22.5" dependencies: - "@babel/template": ^7.18.6 - "@babel/types": ^7.18.6 - checksum: bf84c2e0699aa07c3559d4262d199d4a9d0320037c2932efe3246866c3e01ce042c9c2131b5db32ba2409a9af01fb468171052819af759babc8ca93bdc6c9aeb + "@babel/template": ^7.22.5 + "@babel/types": ^7.22.5 + checksum: 6b1f6ce1b1f4e513bf2c8385a557ea0dd7fa37971b9002ad19268ca4384bbe90c09681fe4c076013f33deabc63a53b341ed91e792de741b4b35e01c00238177a languageName: node linkType: hard -"@babel/helper-hoist-variables@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-hoist-variables@npm:7.18.6" +"@babel/helper-hoist-variables@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-hoist-variables@npm:7.22.5" dependencies: - "@babel/types": ^7.18.6 - checksum: fd9c35bb435fda802bf9ff7b6f2df06308a21277c6dec2120a35b09f9de68f68a33972e2c15505c1a1a04b36ec64c9ace97d4a9e26d6097b76b4396b7c5fa20f + "@babel/types": ^7.22.5 + checksum: 394ca191b4ac908a76e7c50ab52102669efe3a1c277033e49467913c7ed6f7c64d7eacbeabf3bed39ea1f41731e22993f763b1edce0f74ff8563fd1f380d92cc languageName: node linkType: hard -"@babel/helper-module-imports@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-module-imports@npm:7.18.6" +"@babel/helper-module-imports@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-module-imports@npm:7.22.5" dependencies: - "@babel/types": ^7.18.6 - checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def + "@babel/types": ^7.22.5 + checksum: 9ac2b0404fa38b80bdf2653fbeaf8e8a43ccb41bd505f9741d820ed95d3c4e037c62a1bcdcb6c9527d7798d2e595924c4d025daed73283badc180ada2c9c49ad languageName: node linkType: hard -"@babel/helper-module-transforms@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-module-transforms@npm:7.18.6" +"@babel/helper-module-transforms@npm:^7.22.9": + version: 7.22.9 + resolution: "@babel/helper-module-transforms@npm:7.22.9" dependencies: - "@babel/helper-environment-visitor": ^7.18.6 - "@babel/helper-module-imports": ^7.18.6 - "@babel/helper-simple-access": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/helper-validator-identifier": ^7.18.6 - "@babel/template": ^7.18.6 - "@babel/traverse": ^7.18.6 - "@babel/types": ^7.18.6 - checksum: 75d90be9ecd314fe2f1b668ce065d7e8b3dff82eddea88480259c5d4bd54f73a909d0998909ffe734a44ba8be85ba233359033071cc800db209d37173bd26db2 + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-module-imports": ^7.22.5 + "@babel/helper-simple-access": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/helper-validator-identifier": ^7.22.5 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 2751f77660518cf4ff027514d6f4794f04598c6393be7b04b8e46c6e21606e11c19f3f57ab6129a9c21bacdf8b3ffe3af87bb401d972f34af2d0ffde02ac3001 languageName: node linkType: hard -"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.8.0": - version: 7.18.6 - resolution: "@babel/helper-plugin-utils@npm:7.18.6" - checksum: 3dbfceb6c10fdf6c78a0e57f24e991ff8967b8a0bd45fe0314fb4a8ccf7c8ad4c3778c319a32286e7b1f63d507173df56b4e69fb31b71e1b447a73efa1ca723e +"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0": + version: 7.22.5 + resolution: "@babel/helper-plugin-utils@npm:7.22.5" + checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5 languageName: node linkType: hard -"@babel/helper-simple-access@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-simple-access@npm:7.18.6" +"@babel/helper-simple-access@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-simple-access@npm:7.22.5" dependencies: - "@babel/types": ^7.18.6 - checksum: 37cd36eef199e0517845763c1e6ff6ea5e7876d6d707a6f59c9267c547a50aa0e84260ba9285d49acfaf2cfa0a74a772d92967f32ac1024c961517d40b6c16a5 + "@babel/types": ^7.22.5 + checksum: fe9686714caf7d70aedb46c3cce090f8b915b206e09225f1e4dbc416786c2fdbbee40b38b23c268b7ccef749dd2db35f255338fb4f2444429874d900dede5ad2 languageName: node linkType: hard -"@babel/helper-split-export-declaration@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-split-export-declaration@npm:7.18.6" +"@babel/helper-split-export-declaration@npm:^7.22.6": + version: 7.22.6 + resolution: "@babel/helper-split-export-declaration@npm:7.22.6" dependencies: - "@babel/types": ^7.18.6 - checksum: c6d3dede53878f6be1d869e03e9ffbbb36f4897c7cc1527dc96c56d127d834ffe4520a6f7e467f5b6f3c2843ea0e81a7819d66ae02f707f6ac057f3d57943a2b + "@babel/types": ^7.22.5 + checksum: e141cace583b19d9195f9c2b8e17a3ae913b7ee9b8120246d0f9ca349ca6f03cb2c001fd5ec57488c544347c0bb584afec66c936511e447fd20a360e591ac921 + languageName: node + linkType: hard + +"@babel/helper-string-parser@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-string-parser@npm:7.22.5" + checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467 languageName: node linkType: hard -"@babel/helper-validator-identifier@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-validator-identifier@npm:7.18.6" - checksum: e295254d616bbe26e48c196a198476ab4d42a73b90478c9842536cf910ead887f5af6b5c4df544d3052a25ccb3614866fa808dc1e3a5a4291acd444e243c0648 +"@babel/helper-validator-identifier@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-validator-identifier@npm:7.22.5" + checksum: 7f0f30113474a28298c12161763b49de5018732290ca4de13cdaefd4fd0d635a6fe3f6686c37a02905fb1e64f21a5ee2b55140cf7b070e729f1bd66866506aea languageName: node linkType: hard -"@babel/helper-validator-option@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helper-validator-option@npm:7.18.6" - checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf +"@babel/helper-validator-option@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/helper-validator-option@npm:7.22.5" + checksum: bbeca8a85ee86990215c0424997438b388b8d642d69b9f86c375a174d3cdeb270efafd1ff128bc7a1d370923d13b6e45829ba8581c027620e83e3a80c5c414b3 languageName: node linkType: hard -"@babel/helpers@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/helpers@npm:7.18.6" +"@babel/helpers@npm:^7.22.6": + version: 7.22.6 + resolution: "@babel/helpers@npm:7.22.6" dependencies: - "@babel/template": ^7.18.6 - "@babel/traverse": ^7.18.6 - "@babel/types": ^7.18.6 - checksum: 5dea4fa53776703ae4190cacd3f81464e6e00cf0b6908ea9b0af2b3d9992153f3746dd8c33d22ec198f77a8eaf13a273d83cd8847f7aef983801e7bfafa856ec + "@babel/template": ^7.22.5 + "@babel/traverse": ^7.22.6 + "@babel/types": ^7.22.5 + checksum: 5c1f33241fe7bf7709868c2105134a0a86dca26a0fbd508af10a89312b1f77ca38ebae43e50be3b208613c5eacca1559618af4ca236f0abc55d294800faeff30 languageName: node linkType: hard -"@babel/highlight@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/highlight@npm:7.18.6" +"@babel/highlight@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/highlight@npm:7.22.5" dependencies: - "@babel/helper-validator-identifier": ^7.18.6 + "@babel/helper-validator-identifier": ^7.22.5 chalk: ^2.0.0 js-tokens: ^4.0.0 - checksum: 92d8ee61549de5ff5120e945e774728e5ccd57fd3b2ed6eace020ec744823d4a98e242be1453d21764a30a14769ecd62170fba28539b211799bbaf232bbb2789 + checksum: f61ae6de6ee0ea8d9b5bcf2a532faec5ab0a1dc0f7c640e5047fc61630a0edb88b18d8c92eb06566d30da7a27db841aca11820ecd3ebe9ce514c9350fbed39c4 languageName: node linkType: hard -"@babel/parser@npm:^7.14.7, @babel/parser@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/parser@npm:7.18.6" +"@babel/parser@npm:^7.14.7, @babel/parser@npm:^7.22.5, @babel/parser@npm:^7.22.7": + version: 7.22.7 + resolution: "@babel/parser@npm:7.22.7" bin: parser: ./bin/babel-parser.js - checksum: 533ffc26667b7e2e0d87ae11368d90b6a3a468734d6dfe9c4697c24f48373cf9cc35ee08e416728f087fc56531b68022f752097941feddc60e0223d69a4d4cad + checksum: 02209ddbd445831ee8bf966fdf7c29d189ed4b14343a68eb2479d940e7e3846340d7cc6bd654a5f3d87d19dc84f49f50a58cf9363bee249dc5409ff3ba3dab54 languageName: node linkType: hard @@ -382,52 +398,53 @@ __metadata: linkType: hard "@babel/plugin-syntax-typescript@npm:^7.7.2": - version: 7.18.6 - resolution: "@babel/plugin-syntax-typescript@npm:7.18.6" + version: 7.22.5 + resolution: "@babel/plugin-syntax-typescript@npm:7.22.5" dependencies: - "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-plugin-utils": ^7.22.5 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 2cde73725ec51118ebf410bf02d78781c03fa4d3185993fcc9d253b97443381b621c44810084c5dd68b92eb8bdfae0e5b163e91b32bebbb33852383d1815c05d + checksum: 8ab7718fbb026d64da93681a57797d60326097fd7cb930380c8bffd9eb101689e90142c760a14b51e8e69c88a73ba3da956cb4520a3b0c65743aee5c71ef360a languageName: node linkType: hard -"@babel/template@npm:^7.18.6": - version: 7.18.6 - resolution: "@babel/template@npm:7.18.6" +"@babel/template@npm:^7.22.5": + version: 7.22.5 + resolution: "@babel/template@npm:7.22.5" dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/parser": ^7.18.6 - "@babel/types": ^7.18.6 - checksum: cb02ed804b7b1938dbecef4e01562013b80681843dd391933315b3dd9880820def3b5b1bff6320d6e4c6a1d63d1d5799630d658ec6b0369c5505e7e4029c38fb + "@babel/code-frame": ^7.22.5 + "@babel/parser": ^7.22.5 + "@babel/types": ^7.22.5 + checksum: c5746410164039aca61829cdb42e9a55410f43cace6f51ca443313f3d0bdfa9a5a330d0b0df73dc17ef885c72104234ae05efede37c1cc8a72dc9f93425977a3 languageName: node linkType: hard -"@babel/traverse@npm:^7.18.6, @babel/traverse@npm:^7.7.2": - version: 7.18.6 - resolution: "@babel/traverse@npm:7.18.6" +"@babel/traverse@npm:^7.22.6, @babel/traverse@npm:^7.22.8, @babel/traverse@npm:^7.7.2": + version: 7.22.8 + resolution: "@babel/traverse@npm:7.22.8" dependencies: - "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.18.6 - "@babel/helper-environment-visitor": ^7.18.6 - "@babel/helper-function-name": ^7.18.6 - "@babel/helper-hoist-variables": ^7.18.6 - "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.18.6 - "@babel/types": ^7.18.6 + "@babel/code-frame": ^7.22.5 + "@babel/generator": ^7.22.7 + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-function-name": ^7.22.5 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/parser": ^7.22.7 + "@babel/types": ^7.22.5 debug: ^4.1.0 globals: ^11.1.0 - checksum: 5427a9db63984b2600f62b257dab18e3fc057997b69d708573bfc88eb5eacd6678fb24fddba082d6ac050734b8846ce110960be841ea1e461d66e2cde72b6b07 + checksum: a381369bc3eedfd13ed5fef7b884657f1c29024ea7388198149f0edc34bd69ce3966e9f40188d15f56490a5e12ba250ccc485f2882b53d41b054fccefb233e33 languageName: node linkType: hard -"@babel/types@npm:^7.18.6, @babel/types@npm:^7.18.7, @babel/types@npm:^7.3.0, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": - version: 7.18.7 - resolution: "@babel/types@npm:7.18.7" +"@babel/types@npm:^7.20.7, @babel/types@npm:^7.22.5, @babel/types@npm:^7.3.3, @babel/types@npm:^7.8.3": + version: 7.22.5 + resolution: "@babel/types@npm:7.22.5" dependencies: - "@babel/helper-validator-identifier": ^7.18.6 + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.5 to-fast-properties: ^2.0.0 - checksum: 3114ce161c4ebcb70271e168aa5af5cecedf3278209161d5ba6124bd3f9cb02e3f3ace587ad1b53f7baa153b6b3714720721c72a9ef3ec451663862f9cc1f014 + checksum: c13a9c1dc7d2d1a241a2f8363540cb9af1d66e978e8984b400a20c4f38ba38ca29f06e26a0f2d49a70bad9e57615dac09c35accfddf1bb90d23cd3e0a0bab892 languageName: node linkType: hard @@ -504,20 +521,20 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^1.3.0": - version: 1.3.0 - resolution: "@eslint/eslintrc@npm:1.3.0" +"@eslint/eslintrc@npm:^1.2.2": + version: 1.4.1 + resolution: "@eslint/eslintrc@npm:1.4.1" dependencies: ajv: ^6.12.4 debug: ^4.3.2 - espree: ^9.3.2 - globals: ^13.15.0 + espree: ^9.4.0 + globals: ^13.19.0 ignore: ^5.2.0 import-fresh: ^3.2.1 js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: a1e734ad31a8b5328dce9f479f185fd4fc83dd7f06c538e1fa457fd8226b89602a55cc6458cd52b29573b01cdfaf42331be8cfc1fec732570086b591f4ed6515 + checksum: cd3e5a8683db604739938b1c1c8b77927dc04fce3e28e0c88e7f2cd4900b89466baf83dfbad76b2b9e4d2746abdd00dd3f9da544d3e311633d8693f327d04cd7 languageName: node linkType: hard @@ -960,19 +977,12 @@ __metadata: languageName: node linkType: hard -"@gar/promisify@npm:^1.1.3": - version: 1.1.3 - resolution: "@gar/promisify@npm:1.1.3" - checksum: 4059f790e2d07bf3c3ff3e0fec0daa8144fe35c1f6e0111c9921bd32106adaa97a4ab096ad7dab1e28ee6a9060083c4d1a4ada42a7f5f3f7a96b8812e2b757c1 - languageName: node - linkType: hard - "@graphql-typed-document-node/core@npm:^3.1.1": - version: 3.1.2 - resolution: "@graphql-typed-document-node/core@npm:3.1.2" + version: 3.2.0 + resolution: "@graphql-typed-document-node/core@npm:3.2.0" peerDependencies: graphql: ^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0 - checksum: a61afa025acdabd7833e4f654a5802fc1a526171f81e0c435c8e651050a5a0682499a2c7a51304ceb61fde36cd69fc7975ce5e1b16b9ba7ea474c649f33eea8b + checksum: fa44443accd28c8cf4cb96aaaf39d144a22e8b091b13366843f4e97d19c7bfeaf609ce3c7603a4aeffe385081eaf8ea245d078633a7324c11c5ec4b2011bb76d languageName: node linkType: hard @@ -994,6 +1004,20 @@ __metadata: languageName: node linkType: hard +"@isaacs/cliui@npm:^8.0.2": + version: 8.0.2 + resolution: "@isaacs/cliui@npm:8.0.2" + dependencies: + string-width: ^5.1.2 + string-width-cjs: "npm:string-width@^4.2.0" + strip-ansi: ^7.0.1 + strip-ansi-cjs: "npm:strip-ansi@^6.0.1" + wrap-ansi: ^8.1.0 + wrap-ansi-cjs: "npm:wrap-ansi@^7.0.0" + checksum: 4a473b9b32a7d4d3cfb7a614226e555091ff0c5a29a1734c28c72a182c2f6699b26fc6b5c2131dfd841e86b185aea714c72201d7c98c2fba5f17709333a67aeb + languageName: node + linkType: hard + "@istanbuljs/load-nyc-config@npm:^1.0.0": version: 1.1.0 resolution: "@istanbuljs/load-nyc-config@npm:1.1.0" @@ -1014,129 +1038,133 @@ __metadata: languageName: node linkType: hard -"@jest/console@npm:^28.1.1": - version: 28.1.1 - resolution: "@jest/console@npm:28.1.1" +"@jest/console@npm:^28.1.3": + version: 28.1.3 + resolution: "@jest/console@npm:28.1.3" dependencies: - "@jest/types": ^28.1.1 + "@jest/types": ^28.1.3 "@types/node": "*" chalk: ^4.0.0 - jest-message-util: ^28.1.1 - jest-util: ^28.1.1 + jest-message-util: ^28.1.3 + jest-util: ^28.1.3 slash: ^3.0.0 - checksum: ddf3b9e9b003a99d6686ecd89c263fda8f81303277f64cca6e434106fa3556c456df6023cdba962851df16880e044bfbae264daa5f67f7ac28712144b5f1007e + checksum: fe50d98d26d02ce2901c76dff4bd5429a33c13affb692c9ebf8a578ca2f38a5dd854363d40d6c394f215150791fd1f692afd8e730a4178dda24107c8dfd9750a languageName: node linkType: hard -"@jest/expect-utils@npm:^28.1.1": - version: 28.1.1 - resolution: "@jest/expect-utils@npm:28.1.1" +"@jest/expect-utils@npm:^28.1.3": + version: 28.1.3 + resolution: "@jest/expect-utils@npm:28.1.3" dependencies: jest-get-type: ^28.0.2 - checksum: 46a2ad754b10bc649c36a5914f887bea33a43bb868946508892a73f1da99065b17167dc3c0e3e299c7cea82c6be1e9d816986e120d7ae3e1be511f64cfc1d3d3 + checksum: 808ea3a68292a7e0b95490fdd55605c430b4cf209ea76b5b61bfb2a1badcb41bc046810fe4e364bd5fe04663978aa2bd73d8f8465a761dd7c655aeb44cf22987 languageName: node linkType: hard -"@jest/schemas@npm:^28.0.2": - version: 28.0.2 - resolution: "@jest/schemas@npm:28.0.2" +"@jest/schemas@npm:^28.1.3": + version: 28.1.3 + resolution: "@jest/schemas@npm:28.1.3" dependencies: - "@sinclair/typebox": ^0.23.3 - checksum: 6a177e97b112c99f377697fe803a34f4489b92cd07949876250c69edc9029c7cbda771fcbb03caebd20ffbcfa89b9c22b4dc9d1e9a7fbc9873185459b48ba780 + "@sinclair/typebox": ^0.24.1 + checksum: 3cf1d4b66c9c4ffda58b246de1ddcba8e6ad085af63dccdf07922511f13b68c0cc480a7bc620cb4f3099a6f134801c747e1df7bfc7a4ef4dceefbdea3e31e1de languageName: node linkType: hard "@jest/test-result@npm:^28.1.1": - version: 28.1.1 - resolution: "@jest/test-result@npm:28.1.1" + version: 28.1.3 + resolution: "@jest/test-result@npm:28.1.3" dependencies: - "@jest/console": ^28.1.1 - "@jest/types": ^28.1.1 + "@jest/console": ^28.1.3 + "@jest/types": ^28.1.3 "@types/istanbul-lib-coverage": ^2.0.0 collect-v8-coverage: ^1.0.0 - checksum: 8812db2649a09ed423ccb33cf76162a996fc781156a489d4fd86e22615b523d72ca026c68b3699a1ea1ea274146234e09db636c49d7ea2516e0e1bb229f3013d + checksum: 957a5dd2fd2e84aabe86698f93c0825e96128ccaa23abf548b159a9b08ac74e4bde7acf4bec48479243dbdb27e4ea1b68c171846d21fb64855c6b55cead9ef27 languageName: node linkType: hard -"@jest/transform@npm:^28.1.2": - version: 28.1.2 - resolution: "@jest/transform@npm:28.1.2" +"@jest/transform@npm:^28.1.3": + version: 28.1.3 + resolution: "@jest/transform@npm:28.1.3" dependencies: "@babel/core": ^7.11.6 - "@jest/types": ^28.1.1 + "@jest/types": ^28.1.3 "@jridgewell/trace-mapping": ^0.3.13 babel-plugin-istanbul: ^6.1.1 chalk: ^4.0.0 convert-source-map: ^1.4.0 fast-json-stable-stringify: ^2.0.0 graceful-fs: ^4.2.9 - jest-haste-map: ^28.1.1 + jest-haste-map: ^28.1.3 jest-regex-util: ^28.0.2 - jest-util: ^28.1.1 + jest-util: ^28.1.3 micromatch: ^4.0.4 pirates: ^4.0.4 slash: ^3.0.0 write-file-atomic: ^4.0.1 - checksum: cd8d1bdf1a5831cdf91934dd0af1d29d4d2bcad92feb9bf7555fc0e1152cb01a9206410380af0f6221a623ffc9b6f6e6dded429d01d87b85b0777cf9d4425127 + checksum: dadf618936e0aa84342f07f532801d5bed43cdf95d1417b929e4f8782c872cff1adc84096d5a287a796d0039a2691c06d8450cce5a713a8b52fbb9f872a1e760 languageName: node linkType: hard -"@jest/types@npm:^28.1.1": - version: 28.1.1 - resolution: "@jest/types@npm:28.1.1" +"@jest/types@npm:^28.1.3": + version: 28.1.3 + resolution: "@jest/types@npm:28.1.3" dependencies: - "@jest/schemas": ^28.0.2 + "@jest/schemas": ^28.1.3 "@types/istanbul-lib-coverage": ^2.0.0 "@types/istanbul-reports": ^3.0.0 "@types/node": "*" "@types/yargs": ^17.0.8 chalk: ^4.0.0 - checksum: 3c35d3674e08da1e4bb27b8303a59c71fd19a852ff7c7827305462f48ef224b5334aa50e0d547470e1cca1f2dd15a0cff51b46618b8e61e7196908504b29f08f - languageName: node - linkType: hard - -"@jridgewell/gen-mapping@npm:^0.1.0": - version: 0.1.1 - resolution: "@jridgewell/gen-mapping@npm:0.1.1" - dependencies: - "@jridgewell/set-array": ^1.0.0 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: 3bcc21fe786de6ffbf35c399a174faab05eb23ce6a03e8769569de28abbf4facc2db36a9ddb0150545ae23a8d35a7cf7237b2aa9e9356a7c626fb4698287d5cc + checksum: 1e258d9c063fcf59ebc91e46d5ea5984674ac7ae6cae3e50aa780d22b4405bf2c925f40350bf30013839eb5d4b5e521d956ddf8f3b7c78debef0e75a07f57350 languageName: node linkType: hard -"@jridgewell/gen-mapping@npm:^0.3.2": - version: 0.3.2 - resolution: "@jridgewell/gen-mapping@npm:0.3.2" +"@jridgewell/gen-mapping@npm:^0.3.0, @jridgewell/gen-mapping@npm:^0.3.2": + version: 0.3.3 + resolution: "@jridgewell/gen-mapping@npm:0.3.3" dependencies: "@jridgewell/set-array": ^1.0.1 "@jridgewell/sourcemap-codec": ^1.4.10 "@jridgewell/trace-mapping": ^0.3.9 - checksum: 1832707a1c476afebe4d0fbbd4b9434fdb51a4c3e009ab1e9938648e21b7a97049fa6009393bdf05cab7504108413441df26d8a3c12193996e65493a4efb6882 + checksum: 4a74944bd31f22354fc01c3da32e83c19e519e3bbadafa114f6da4522ea77dd0c2842607e923a591d60a76699d819a2fbb6f3552e277efdb9b58b081390b60ab languageName: node linkType: hard -"@jridgewell/resolve-uri@npm:^3.0.3": +"@jridgewell/resolve-uri@npm:3.1.0": version: 3.1.0 resolution: "@jridgewell/resolve-uri@npm:3.1.0" checksum: b5ceaaf9a110fcb2780d1d8f8d4a0bfd216702f31c988d8042e5f8fbe353c55d9b0f55a1733afdc64806f8e79c485d2464680ac48a0d9fcadb9548ee6b81d267 languageName: node linkType: hard -"@jridgewell/set-array@npm:^1.0.0, @jridgewell/set-array@npm:^1.0.1": +"@jridgewell/resolve-uri@npm:^3.0.3": + version: 3.1.1 + resolution: "@jridgewell/resolve-uri@npm:3.1.1" + checksum: f5b441fe7900eab4f9155b3b93f9800a916257f4e8563afbcd3b5a5337b55e52bd8ae6735453b1b745457d9f6cdb16d74cd6220bbdd98cf153239e13f6cbb653 + languageName: node + linkType: hard + +"@jridgewell/set-array@npm:^1.0.1": version: 1.1.2 resolution: "@jridgewell/set-array@npm:1.1.2" checksum: 69a84d5980385f396ff60a175f7177af0b8da4ddb81824cb7016a9ef914eee9806c72b6b65942003c63f7983d4f39a5c6c27185bbca88eb4690b62075602e28e languageName: node linkType: hard -"@jridgewell/sourcemap-codec@npm:^1.4.10": +"@jridgewell/sourcemap-codec@npm:1.4.14": version: 1.4.14 resolution: "@jridgewell/sourcemap-codec@npm:1.4.14" checksum: 61100637b6d173d3ba786a5dff019e1a74b1f394f323c1fee337ff390239f053b87266c7a948777f4b1ee68c01a8ad0ab61e5ff4abb5a012a0b091bec391ab97 languageName: node linkType: hard +"@jridgewell/sourcemap-codec@npm:^1.4.10": + version: 1.4.15 + resolution: "@jridgewell/sourcemap-codec@npm:1.4.15" + checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8 + languageName: node + linkType: hard + "@jridgewell/trace-mapping@npm:0.3.9": version: 0.3.9 resolution: "@jridgewell/trace-mapping@npm:0.3.9" @@ -1147,13 +1175,13 @@ __metadata: languageName: node linkType: hard -"@jridgewell/trace-mapping@npm:^0.3.13, @jridgewell/trace-mapping@npm:^0.3.9": - version: 0.3.14 - resolution: "@jridgewell/trace-mapping@npm:0.3.14" +"@jridgewell/trace-mapping@npm:^0.3.13, @jridgewell/trace-mapping@npm:^0.3.17, @jridgewell/trace-mapping@npm:^0.3.9": + version: 0.3.18 + resolution: "@jridgewell/trace-mapping@npm:0.3.18" dependencies: - "@jridgewell/resolve-uri": ^3.0.3 - "@jridgewell/sourcemap-codec": ^1.4.10 - checksum: b9537b9630ffb631aef9651a085fe361881cde1772cd482c257fe3c78c8fd5388d681f504a9c9fe1081b1c05e8f75edf55ee10fdb58d92bbaa8dbf6a7bd6b18c + "@jridgewell/resolve-uri": 3.1.0 + "@jridgewell/sourcemap-codec": 1.4.14 + checksum: 0572669f855260808c16fe8f78f5f1b4356463b11d3f2c7c0b5580c8ba1cbf4ae53efe9f627595830856e57dbac2325ac17eb0c3dd0ec42102e6f227cc289c02 languageName: node linkType: hard @@ -1170,24 +1198,17 @@ __metadata: languageName: node linkType: hard -"@noble/hashes@npm:1.1.1": - version: 1.1.1 - resolution: "@noble/hashes@npm:1.1.1" - checksum: 3bd98d7a6dcc01c5e72478975073e12c79639636f4eb5710b665dd8ac462fcdff5b235d0c3b113ac83e7e56c43eee5ccba3759f9262964edc123bd1713dd2180 - languageName: node - linkType: hard - -"@noble/hashes@npm:~1.1.1": - version: 1.1.2 - resolution: "@noble/hashes@npm:1.1.2" - checksum: 3c2a8cb7c2e053811032f242155d870c5eb98844d924d69702244d48804cb03b42d4a666c49c2b71164420d8229cb9a6f242b972d50d5bb2f1d673b98b041de2 +"@noble/hashes@npm:1.2.0, @noble/hashes@npm:~1.2.0": + version: 1.2.0 + resolution: "@noble/hashes@npm:1.2.0" + checksum: 8ca080ce557b8f40fb2f78d3aedffd95825a415ac8e13d7ffe3643f8626a8c2d99a3e5975b555027ac24316d8b3c02a35b8358567c0c23af681e6573602aa434 languageName: node linkType: hard -"@noble/secp256k1@npm:1.6.0, @noble/secp256k1@npm:~1.6.0": - version: 1.6.0 - resolution: "@noble/secp256k1@npm:1.6.0" - checksum: e99df3b776515e6a8b3193870e69ff3a7d22c6a4733245dceb9d1d229d5b0859bd478b7213f31d556ba3745647ec07262d0f9df845d79204b7ce4ae1648b27c7 +"@noble/secp256k1@npm:1.7.1, @noble/secp256k1@npm:~1.7.0": + version: 1.7.1 + resolution: "@noble/secp256k1@npm:1.7.1" + checksum: d2301f1f7690368d8409a3152450458f27e54df47e3f917292de3de82c298770890c2de7c967d237eff9c95b70af485389a9695f73eb05a43e2bd562d18b18cb languageName: node linkType: hard @@ -1406,8 +1427,8 @@ __metadata: linkType: hard "@nomicfoundation/hardhat-toolbox@npm:^2.0.1": - version: 2.0.1 - resolution: "@nomicfoundation/hardhat-toolbox@npm:2.0.1" + version: 2.0.2 + resolution: "@nomicfoundation/hardhat-toolbox@npm:2.0.2" peerDependencies: "@ethersproject/abi": ^5.4.7 "@ethersproject/providers": ^5.4.7 @@ -1428,94 +1449,94 @@ __metadata: ts-node: ">=8.0.0" typechain: ^8.1.0 typescript: ">=4.5.0" - checksum: 053236c47745c65f0fb79a34e2570a193dc99aee972c8ec667503fd0a8a5da20f21cf060cf85af8c72fba7a601a604fc36828c791bf21239aafb9e7031bbfe1d + checksum: a2eafb709acbabe40de4871c4e8684a03098f045dba4fc6c6e9281358d072f386a668488c109e2a36b8eade01dc4c4f9e8a76fa45c92591857c590c6e19f1ae7 languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-darwin-arm64@npm:0.1.1" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-darwin-x64@npm:0.1.1" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-freebsd-x64@npm:0.1.1" conditions: os=freebsd & cpu=x64 languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-gnu@npm:0.1.1" conditions: os=linux & cpu=arm64 & libc=glibc languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-linux-arm64-musl@npm:0.1.1" conditions: os=linux & cpu=arm64 & libc=musl languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-linux-x64-gnu@npm:0.1.1" conditions: os=linux & cpu=x64 & libc=glibc languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-linux-x64-musl@npm:0.1.1" conditions: os=linux & cpu=x64 & libc=musl languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-win32-arm64-msvc@npm:0.1.1" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-win32-ia32-msvc@npm:0.1.1" conditions: os=win32 & cpu=ia32 languageName: node linkType: hard -"@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.0" +"@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.1": + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer-win32-x64-msvc@npm:0.1.1" conditions: os=win32 & cpu=x64 languageName: node linkType: hard "@nomicfoundation/solidity-analyzer@npm:^0.1.0": - version: 0.1.0 - resolution: "@nomicfoundation/solidity-analyzer@npm:0.1.0" - dependencies: - "@nomicfoundation/solidity-analyzer-darwin-arm64": 0.1.0 - "@nomicfoundation/solidity-analyzer-darwin-x64": 0.1.0 - "@nomicfoundation/solidity-analyzer-freebsd-x64": 0.1.0 - "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": 0.1.0 - "@nomicfoundation/solidity-analyzer-linux-arm64-musl": 0.1.0 - "@nomicfoundation/solidity-analyzer-linux-x64-gnu": 0.1.0 - "@nomicfoundation/solidity-analyzer-linux-x64-musl": 0.1.0 - "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": 0.1.0 - "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": 0.1.0 - "@nomicfoundation/solidity-analyzer-win32-x64-msvc": 0.1.0 + version: 0.1.1 + resolution: "@nomicfoundation/solidity-analyzer@npm:0.1.1" + dependencies: + "@nomicfoundation/solidity-analyzer-darwin-arm64": 0.1.1 + "@nomicfoundation/solidity-analyzer-darwin-x64": 0.1.1 + "@nomicfoundation/solidity-analyzer-freebsd-x64": 0.1.1 + "@nomicfoundation/solidity-analyzer-linux-arm64-gnu": 0.1.1 + "@nomicfoundation/solidity-analyzer-linux-arm64-musl": 0.1.1 + "@nomicfoundation/solidity-analyzer-linux-x64-gnu": 0.1.1 + "@nomicfoundation/solidity-analyzer-linux-x64-musl": 0.1.1 + "@nomicfoundation/solidity-analyzer-win32-arm64-msvc": 0.1.1 + "@nomicfoundation/solidity-analyzer-win32-ia32-msvc": 0.1.1 + "@nomicfoundation/solidity-analyzer-win32-x64-msvc": 0.1.1 dependenciesMeta: "@nomicfoundation/solidity-analyzer-darwin-arm64": optional: true @@ -1537,7 +1558,7 @@ __metadata: optional: true "@nomicfoundation/solidity-analyzer-win32-x64-msvc": optional: true - checksum: 42dc5ba40e76bf14945fb6a423554bbbc6c99596675065d7d6f3c9a49ec39e37f3f77ecfedcf906fdb1bb33b033a5d92a90c645c886d6ff23334c8af8b14ff67 + checksum: 038cffafd5769e25256b5b8bef88d95cc1c021274a65c020cf84aceb3237752a3b51645fdb0687f5516a2bdfebf166fcf50b08ab64857925100213e0654b266b languageName: node linkType: hard @@ -1552,42 +1573,31 @@ __metadata: linkType: hard "@nomiclabs/hardhat-etherscan@npm:^3.1.0": - version: 3.1.0 - resolution: "@nomiclabs/hardhat-etherscan@npm:3.1.0" + version: 3.1.7 + resolution: "@nomiclabs/hardhat-etherscan@npm:3.1.7" dependencies: "@ethersproject/abi": ^5.1.2 "@ethersproject/address": ^5.0.2 - cbor: ^5.0.2 + cbor: ^8.1.0 chalk: ^2.4.2 debug: ^4.1.1 fs-extra: ^7.0.1 lodash: ^4.17.11 semver: ^6.3.0 table: ^6.8.0 - undici: ^5.4.0 + undici: ^5.14.0 peerDependencies: hardhat: ^2.0.4 - checksum: 3f28abc39edce2936226b6d0087c3be78bffcba68b6935f3f60767f0e10233e940ddc74803dff91f7ddf9464a7199aab00fba08d8b3865dbc2f8936f53a7a5a5 + checksum: 32d74e567e78a940a79cbe49c5dee0eb5cda0a4c0c34a9badfaf13d45e6054d9e717c28b8d2b0b20f29721a484af15a52d391fb60768222c4b13de92ef0f72b3 languageName: node linkType: hard -"@npmcli/fs@npm:^2.1.0": - version: 2.1.0 - resolution: "@npmcli/fs@npm:2.1.0" +"@npmcli/fs@npm:^3.1.0": + version: 3.1.0 + resolution: "@npmcli/fs@npm:3.1.0" dependencies: - "@gar/promisify": ^1.1.3 semver: ^7.3.5 - checksum: 6ec6d678af6da49f9dac50cd882d7f661934dd278972ffbaacde40d9eaa2871292d634000a0cca9510f6fc29855fbd4af433e1adbff90a524ec3eaf140f1219b - languageName: node - linkType: hard - -"@npmcli/move-file@npm:^2.0.0": - version: 2.0.0 - resolution: "@npmcli/move-file@npm:2.0.0" - dependencies: - mkdirp: ^1.0.4 - rimraf: ^3.0.2 - checksum: 1388777b507b0c592d53f41b9d182e1a8de7763bc625fc07999b8edbc22325f074e5b3ec90af79c89d6987fdb2325bc66d59f483258543c14a43661621f841b0 + checksum: a50a6818de5fc557d0b0e6f50ec780a7a02ab8ad07e5ac8b16bf519e0ad60a144ac64f97d05c443c3367235d337182e1d012bbac0eb8dbae8dc7b40b193efd0e languageName: node linkType: hard @@ -1606,9 +1616,9 @@ __metadata: linkType: hard "@openzeppelin/contracts@npm:^4.3.3": - version: 4.8.2 - resolution: "@openzeppelin/contracts@npm:4.8.2" - checksum: 1d362f0b9c880549cb82544e23fb70270fbbbe24a69e10bd5aa07649fd82347686173998ae484defafdc473d04004d519f839e3cd3d3e7733d0895b950622243 + version: 4.9.2 + resolution: "@openzeppelin/contracts@npm:4.9.2" + checksum: 0538b18fe222e5414a5a539c240b155e0bef2a23c5182fb8e137d71a0c390fe899160f2d55701f75b127f54cc61aee4375370acc832475f19829368ac65c1fc6 languageName: node linkType: hard @@ -1619,15 +1629,28 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/defender-base-client@npm:^1.46.0": + version: 1.47.0 + resolution: "@openzeppelin/defender-base-client@npm:1.47.0" + dependencies: + amazon-cognito-identity-js: ^6.0.1 + async-retry: ^1.3.3 + axios: ^1.4.0 + lodash: ^4.17.19 + node-fetch: ^2.6.0 + checksum: 7fcba4417805aa3920cc2870e4dcd74d3c6874e6f38ce6c1a3e370c140daf253a1cd5baab5204ec40730aaf3ed052e2129c64bbd5f1daacf3838339d06b559ab + languageName: node + linkType: hard + "@openzeppelin/hardhat-upgrades@npm:^1.23.0": - version: 1.25.0 - resolution: "@openzeppelin/hardhat-upgrades@npm:1.25.0" + version: 1.28.0 + resolution: "@openzeppelin/hardhat-upgrades@npm:1.28.0" dependencies: - "@openzeppelin/upgrades-core": ^1.26.0 + "@openzeppelin/defender-base-client": ^1.46.0 + "@openzeppelin/platform-deploy-client": ^0.8.0 + "@openzeppelin/upgrades-core": ^1.27.0 chalk: ^4.1.0 debug: ^4.1.1 - defender-admin-client: ^1.39.0 - platform-deploy-client: ^0.3.2 proper-lockfile: ^4.1.1 peerDependencies: "@nomiclabs/hardhat-ethers": ^2.0.0 @@ -1639,22 +1662,45 @@ __metadata: optional: true bin: migrate-oz-cli-project: dist/scripts/migrate-oz-cli-project.js - checksum: 1647917371d2a4316287940f12e471200c0d143f01ddf485aacc309531d6597e0377243f5c7463d56167c0eefbc983964c15fd7228b7852cc1e47545b1a78e87 + checksum: b37a5eb7c3a5c1fb4ae6754f5fe1d6e93eb6bc143861f57babf5c7d66706ee3e44ca7d57db17ce2ec6c7014f09c269d506f62b3b116897407fdb0d1ff68f4925 languageName: node linkType: hard -"@openzeppelin/upgrades-core@npm:^1.26.0": - version: 1.26.0 - resolution: "@openzeppelin/upgrades-core@npm:1.26.0" +"@openzeppelin/platform-deploy-client@npm:^0.8.0": + version: 0.8.0 + resolution: "@openzeppelin/platform-deploy-client@npm:0.8.0" + dependencies: + "@ethersproject/abi": ^5.6.3 + "@openzeppelin/defender-base-client": ^1.46.0 + axios: ^0.21.2 + lodash: ^4.17.19 + node-fetch: ^2.6.0 + checksum: 0ce050e185a812c366ceef7dcfce526815babab9396275d9724f324a548ddfdca92ea9913ce61356dcd8c014fc495890c8e21afab4a197e0e14e761c698cce68 + languageName: node + linkType: hard + +"@openzeppelin/upgrades-core@npm:^1.27.0": + version: 1.27.3 + resolution: "@openzeppelin/upgrades-core@npm:1.27.3" dependencies: cbor: ^8.0.0 chalk: ^4.1.0 - compare-versions: ^5.0.0 + compare-versions: ^6.0.0 debug: ^4.1.1 ethereumjs-util: ^7.0.3 + minimist: ^1.2.7 proper-lockfile: ^4.1.1 solidity-ast: ^0.4.15 - checksum: 7bc90d2157fc887be24f1351ca00904203f28bca138f89ff9f7ac6ac18910feca889f0b59766bd9ff4a8698ec58aec35348c504fd37fe48a4311156b81802d00 + bin: + openzeppelin-upgrades-core: dist/cli/cli.js + checksum: fd6a6624adbd81cce42afa6da9bd670bcf718fa42e72d8bae2195e6784dc31f75b1915bf2c5d1689c65587ef6f19c3d4e2f81222ca289718bc107647648d69c7 + languageName: node + linkType: hard + +"@pkgjs/parseargs@npm:^0.11.0": + version: 0.11.0 + resolution: "@pkgjs/parseargs@npm:0.11.0" + checksum: 6ad6a00fc4f2f2cfc6bff76fb1d88b8ee20bc0601e18ebb01b6d4be583733a860239a521a7fbca73b612e66705078809483549d2b18f370eb346c5155c8e4a0f languageName: node linkType: hard @@ -1665,24 +1711,24 @@ __metadata: languageName: node linkType: hard -"@scure/bip32@npm:1.1.0": - version: 1.1.0 - resolution: "@scure/bip32@npm:1.1.0" +"@scure/bip32@npm:1.1.5": + version: 1.1.5 + resolution: "@scure/bip32@npm:1.1.5" dependencies: - "@noble/hashes": ~1.1.1 - "@noble/secp256k1": ~1.6.0 + "@noble/hashes": ~1.2.0 + "@noble/secp256k1": ~1.7.0 "@scure/base": ~1.1.0 - checksum: e6102ab9038896861fca5628b8a97f3c4cb24a073cc9f333c71c747037d82e4423d1d111fd282ba212efaf73cbc5875702567fb4cf13b5f0eb23a5bab402e37e + checksum: b08494ab0d2b1efee7226d1b5100db5157ebea22a78bb87126982a76a186cb3048413e8be0ba2622d00d048a20acbba527af730de86c132a77de616eb9907a3b languageName: node linkType: hard -"@scure/bip39@npm:1.1.0": - version: 1.1.0 - resolution: "@scure/bip39@npm:1.1.0" +"@scure/bip39@npm:1.1.1": + version: 1.1.1 + resolution: "@scure/bip39@npm:1.1.1" dependencies: - "@noble/hashes": ~1.1.1 + "@noble/hashes": ~1.2.0 "@scure/base": ~1.1.0 - checksum: c4361406f092a45e511dc572c89f497af6665ad81cb3fd7bf78e6772f357f7ae885e129ef0b985cb3496a460b4811318f77bc61634d9b0a8446079a801b6003c + checksum: fbb594c50696fa9c14e891d872f382e50a3f919b6c96c55ef2fb10c7102c546dafb8f099a62bd114c12a00525b595dcf7381846f383f0ddcedeaa6e210747d2f languageName: node linkType: hard @@ -1768,10 +1814,19 @@ __metadata: languageName: node linkType: hard -"@sinclair/typebox@npm:^0.23.3": - version: 0.23.5 - resolution: "@sinclair/typebox@npm:0.23.5" - checksum: c96056d35d9cb862aeb635ff8873e2e7633e668dd544e162aee2690a82c970d0b3f90aa2b3501fe374dfa8e792388559a3e3a86712b23ebaef10061add534f47 +"@sinclair/typebox@npm:^0.24.1": + version: 0.24.51 + resolution: "@sinclair/typebox@npm:0.24.51" + checksum: fd0d855e748ef767eb19da1a60ed0ab928e91e0f358c1dd198d600762c0015440b15755e96d1176e2a0db7e09c6a64ed487828ee10dd0c3e22f61eb09c478cd0 + languageName: node + linkType: hard + +"@smithy/types@npm:^2.0.2": + version: 2.0.2 + resolution: "@smithy/types@npm:2.0.2" + dependencies: + tslib: ^2.5.0 + checksum: 4afdd7c77b212abd9e0770a1489057aa0470f8a59061c4fb2175b1f12e02180db3d85e16f2cd870a95c17bd28a5a4b8ef1dff1ade6852f85eafea12872d9588e languageName: node linkType: hard @@ -1832,9 +1887,9 @@ __metadata: linkType: hard "@tsconfig/node16@npm:^1.0.2": - version: 1.0.3 - resolution: "@tsconfig/node16@npm:1.0.3" - checksum: 3a8b657dd047495b7ad23437d6afd20297ce90380ff0bdee93fc7d39a900dbd8d9e26e53ff6b465e7967ce2adf0b218782590ce9013285121e6a5928fbd6819f + version: 1.0.4 + resolution: "@tsconfig/node16@npm:1.0.4" + checksum: 202319785901f942a6e1e476b872d421baec20cf09f4b266a1854060efbf78cde16a4d256e8bc949d31e6cd9a90f1e8ef8fb06af96a65e98338a2b6b0de0a0ff languageName: node linkType: hard @@ -1869,11 +1924,11 @@ __metadata: linkType: hard "@types/babel__traverse@npm:^7.0.6": - version: 7.17.1 - resolution: "@types/babel__traverse@npm:7.17.1" + version: 7.20.1 + resolution: "@types/babel__traverse@npm:7.20.1" dependencies: - "@babel/types": ^7.3.0 - checksum: 8992d8c1eaaf1c793e9184b930767883446939d2744c40ea4e9591086e79b631189dc519931ed8864f1e016742a189703c217db59b800aca84870b865009d8b4 + "@babel/types": ^7.20.7 + checksum: 58341e23c649c0eba134a1682d4f20d027fad290d92e5740faa1279978f6ed476fc467ae51ce17a877e2566d805aeac64eae541168994367761ec883a4150221 languageName: node linkType: hard @@ -1887,11 +1942,11 @@ __metadata: linkType: hard "@types/bn.js@npm:^5.1.0": - version: 5.1.0 - resolution: "@types/bn.js@npm:5.1.0" + version: 5.1.1 + resolution: "@types/bn.js@npm:5.1.1" dependencies: "@types/node": "*" - checksum: 1dc1cbbd7a1e8bf3614752e9602f558762a901031f499f3055828b5e3e2bba16e5b88c27b3c4152ad795248fbe4086c731a5c4b0f29bb243f1875beeeabee59c + checksum: e50ed2dd3abe997e047caf90e0352c71e54fc388679735217978b4ceb7e336e51477791b715f49fd77195ac26dd296c7bad08a3be9750e235f9b2e1edb1b51c2 languageName: node linkType: hard @@ -1905,9 +1960,9 @@ __metadata: linkType: hard "@types/chai@npm:*, @types/chai@npm:^4.3.0": - version: 4.3.1 - resolution: "@types/chai@npm:4.3.1" - checksum: 2ee246b76c469cd620a7a1876a73bc597074361b67d547b4bd96a0c1adb43597ede2d8589ab626192e14349d83cbb646cc11e2c179eeeb43ff11596de94d82c4 + version: 4.3.5 + resolution: "@types/chai@npm:4.3.5" + checksum: c8f26a88c6b5b53a3275c7f5ff8f107028e3cbb9ff26795fff5f3d9dea07106a54ce9e2dce5e40347f7c4cc35657900aaf0c83934a25a1ae12e61e0f5516e431 languageName: node linkType: hard @@ -1940,11 +1995,11 @@ __metadata: linkType: hard "@types/graceful-fs@npm:^4.1.3": - version: 4.1.5 - resolution: "@types/graceful-fs@npm:4.1.5" + version: 4.1.6 + resolution: "@types/graceful-fs@npm:4.1.6" dependencies: "@types/node": "*" - checksum: d076bb61f45d0fc42dee496ef8b1c2f8742e15d5e47e90e20d0243386e426c04d4efd408a48875ab432f7960b4ce3414db20ed0fbbfc7bcc89d84e574f6e045a + checksum: c3070ccdc9ca0f40df747bced1c96c71a61992d6f7c767e8fd24bb6a3c2de26e8b84135ede000b7e79db530a23e7e88dcd9db60eee6395d0f4ce1dae91369dd4 languageName: node linkType: hard @@ -1981,9 +2036,9 @@ __metadata: linkType: hard "@types/json-schema@npm:^7.0.9": - version: 7.0.11 - resolution: "@types/json-schema@npm:7.0.11" - checksum: 527bddfe62db9012fccd7627794bd4c71beb77601861055d87e3ee464f2217c85fca7a4b56ae677478367bbd248dbde13553312b7d4dbc702a2f2bbf60c4018d + version: 7.0.12 + resolution: "@types/json-schema@npm:7.0.12" + checksum: 00239e97234eeb5ceefb0c1875d98ade6e922bfec39dd365ec6bd360b5c2f825e612ac4f6e5f1d13601b8b30f378f15e6faa805a3a732f4a1bbe61915163d293 languageName: node linkType: hard @@ -1995,9 +2050,9 @@ __metadata: linkType: hard "@types/lodash@npm:^4.14.177": - version: 4.14.182 - resolution: "@types/lodash@npm:4.14.182" - checksum: 7dd137aa9dbabd632408bd37009d984655164fa1ecc3f2b6eb94afe35bf0a5852cbab6183148d883e9c73a958b7fec9a9bcf7c8e45d41195add6a18c34958209 + version: 4.14.196 + resolution: "@types/lodash@npm:4.14.196" + checksum: 201d17c3e62ae02a93c99ec78e024b2be9bd75564dd8fd8c26f6ac51a985ab280d28ce2688c3bcdfe785b0991cd9814edff19ee000234c7b45d9a697f09feb6a languageName: node linkType: hard @@ -2009,9 +2064,9 @@ __metadata: linkType: hard "@types/minimatch@npm:*": - version: 3.0.5 - resolution: "@types/minimatch@npm:3.0.5" - checksum: c41d136f67231c3131cf1d4ca0b06687f4a322918a3a5adddc87ce90ed9dbd175a3610adee36b106ae68c0b92c637c35e02b58c8a56c424f71d30993ea220b92 + version: 5.1.2 + resolution: "@types/minimatch@npm:5.1.2" + checksum: 0391a282860c7cb6fe262c12b99564732401bdaa5e395bee9ca323c312c1a0f45efbf34dce974682036e857db59a5c9b1da522f3d6055aeead7097264c8705a8 languageName: node linkType: hard @@ -2023,9 +2078,9 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 18.0.3 - resolution: "@types/node@npm:18.0.3" - checksum: 5dec59fbbc1186c808b53df1ca717dad034dbd6a901c75f5b052c845618b531b05f27217122c6254db99529a68618e4cfc534ae3dbf4e88754e9e572df80defa + version: 20.4.5 + resolution: "@types/node@npm:20.4.5" + checksum: 36a0304a8dc346a1b2d2edac4c4633eecf70875793d61a5274d0df052d7a7af7a8e34f29884eac4fbd094c4f0201477dcb39c0ecd3307ca141688806538d1138 languageName: node linkType: hard @@ -2060,9 +2115,9 @@ __metadata: linkType: hard "@types/prettier@npm:^2.1.1, @types/prettier@npm:^2.1.5": - version: 2.6.3 - resolution: "@types/prettier@npm:2.6.3" - checksum: e1836699ca189fff6d2a73dc22e028b6a6f693ed1180d5998ac29fa197caf8f85aa92cb38db642e4a370e616b451cb5722ad2395dab11c78e025a1455f37d1f0 + version: 2.7.3 + resolution: "@types/prettier@npm:2.7.3" + checksum: 705384209cea6d1433ff6c187c80dcc0b95d99d5c5ce21a46a9a58060c527973506822e428789d842761e0280d25e3359300f017fbe77b9755bc772ab3dc2f83 languageName: node linkType: hard @@ -2107,26 +2162,26 @@ __metadata: linkType: hard "@types/yargs@npm:^17.0.8": - version: 17.0.10 - resolution: "@types/yargs@npm:17.0.10" + version: 17.0.24 + resolution: "@types/yargs@npm:17.0.24" dependencies: "@types/yargs-parser": "*" - checksum: f0673cbfc08e17239dc58952a88350d6c4db04a027a28a06fbad27d87b670e909f9cd9e66f9c64cebdd5071d1096261e33454a55868395f125297e5c50992ca8 + checksum: 5f3ac4dc4f6e211c1627340160fbe2fd247ceba002190da6cf9155af1798450501d628c9165a183f30a224fc68fa5e700490d740ff4c73e2cdef95bc4e8ba7bf languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^5.17.0": - version: 5.30.5 - resolution: "@typescript-eslint/eslint-plugin@npm:5.30.5" +"@typescript-eslint/eslint-plugin@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/eslint-plugin@npm:5.17.0" dependencies: - "@typescript-eslint/scope-manager": 5.30.5 - "@typescript-eslint/type-utils": 5.30.5 - "@typescript-eslint/utils": 5.30.5 - debug: ^4.3.4 + "@typescript-eslint/scope-manager": 5.17.0 + "@typescript-eslint/type-utils": 5.17.0 + "@typescript-eslint/utils": 5.17.0 + debug: ^4.3.2 functional-red-black-tree: ^1.0.1 - ignore: ^5.2.0 + ignore: ^5.1.8 regexpp: ^3.2.0 - semver: ^7.3.7 + semver: ^7.3.5 tsutils: ^3.21.0 peerDependencies: "@typescript-eslint/parser": ^5.0.0 @@ -2134,105 +2189,105 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: cf763fb091dcdfd6c25843251a220b654ca83968b17266e0f343771f489085c6afc4e41fcf2187b4c72c4d12a787070c64b5e5367069460f95a8174573f48905 + checksum: 62ec611fb384f27fc5b101fc8a0642ae94b2975618d37d3157c2f887cf89b389624e9d476bff303073d038076c05e6c00f3b205af3b2302967e720e99cd18d38 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.17.0": - version: 5.30.5 - resolution: "@typescript-eslint/parser@npm:5.30.5" +"@typescript-eslint/parser@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/parser@npm:5.17.0" dependencies: - "@typescript-eslint/scope-manager": 5.30.5 - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/typescript-estree": 5.30.5 - debug: ^4.3.4 + "@typescript-eslint/scope-manager": 5.17.0 + "@typescript-eslint/types": 5.17.0 + "@typescript-eslint/typescript-estree": 5.17.0 + debug: ^4.3.2 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 6c16821e122b891420a538f200f6e576ad1167855a67e87f9a7d3a08c0513fe26006f6411b8ba6f4662a81526bd0339ae37c47dd88fa5943e6f27ff70da9f989 + checksum: 15b855ea84e44371366d44b5add87ed0dc34b856ca8a6949ecc4066faaf3ea3d7e016ea92db06ab97a637530148c472c38c19cc5eff68b691701ff89dc5c1abc languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/scope-manager@npm:5.30.5" +"@typescript-eslint/scope-manager@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/scope-manager@npm:5.17.0" dependencies: - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/visitor-keys": 5.30.5 - checksum: 509bee6d62cca1716e8f4792d9180c189974992ba13d8103ca04423a64006cf184c4b2c606d55c776305458140c798a3a9a414d07a60790b83dd714f56c457b0 + "@typescript-eslint/types": 5.17.0 + "@typescript-eslint/visitor-keys": 5.17.0 + checksum: 8fc28d5742f36994ce05f09b0000f696a600d6f757f39ccae7875c08398b266f21d48ed1dfb027549d9c6692255a1fb3e8482ef94d765bb134371824da7d5ba7 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/type-utils@npm:5.30.5" +"@typescript-eslint/type-utils@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/type-utils@npm:5.17.0" dependencies: - "@typescript-eslint/utils": 5.30.5 - debug: ^4.3.4 + "@typescript-eslint/utils": 5.17.0 + debug: ^4.3.2 tsutils: ^3.21.0 peerDependencies: eslint: "*" peerDependenciesMeta: typescript: optional: true - checksum: 080cc1231729c34b778395658374e32d034474056f9b777dbc89d20d15eb93d93d0959328ad47c2a6623d40c6552364ababadce439842a944bce001f55b731b3 + checksum: 9aad46ea7a757ec4584b9d9c995e94543bf40af7d85b2f502d66db08d7f03468c858320fccb4942238b0bb9e2d432df3d9861cf21624b0c57660c88b1d91a7d4 languageName: node linkType: hard -"@typescript-eslint/types@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/types@npm:5.30.5" - checksum: c70420618cb875d4e964a20a3fa4cf40cb97a8ad3123e24860e3d829edf3b081c77fa1fe25644700499d27e44aee5783abc7765deee61e2ef59a928db96b2175 +"@typescript-eslint/types@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/types@npm:5.17.0" + checksum: 06ed4c3c3f0a05bee9c23b6cb5eb679336c0f4769beb28848e8ce674f726fec88adba059f20e0b0f7271685d7f5480931b3bcafcf6b60044b93da162e29f3f68 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/typescript-estree@npm:5.30.5" +"@typescript-eslint/typescript-estree@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.17.0" dependencies: - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/visitor-keys": 5.30.5 - debug: ^4.3.4 - globby: ^11.1.0 + "@typescript-eslint/types": 5.17.0 + "@typescript-eslint/visitor-keys": 5.17.0 + debug: ^4.3.2 + globby: ^11.0.4 is-glob: ^4.0.3 - semver: ^7.3.7 + semver: ^7.3.5 tsutils: ^3.21.0 peerDependenciesMeta: typescript: optional: true - checksum: 19dce426c826cddd4aadf2fa15be943c6ad7d2038685cc2665749486a5f44a47819aab5d260b54f8a4babf6acf2500e9f62e709d61fce337b12d5468ff285277 + checksum: 589829b1bb1d7e704de6a35dd9a39c70a3ca54b0885b68aad54a864bc5e5a11ce43f917c3f15f0afe9bc734a250288efdf03dfbed70b8fe0cc12f759e2e1f8ef languageName: node linkType: hard -"@typescript-eslint/utils@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/utils@npm:5.30.5" +"@typescript-eslint/utils@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/utils@npm:5.17.0" dependencies: "@types/json-schema": ^7.0.9 - "@typescript-eslint/scope-manager": 5.30.5 - "@typescript-eslint/types": 5.30.5 - "@typescript-eslint/typescript-estree": 5.30.5 + "@typescript-eslint/scope-manager": 5.17.0 + "@typescript-eslint/types": 5.17.0 + "@typescript-eslint/typescript-estree": 5.17.0 eslint-scope: ^5.1.1 eslint-utils: ^3.0.0 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 - checksum: 12f68cb34a150d39708f4e09a54964360f29589885cd50f119a2061660011752ec72eff3d90111f0e597575d32aae7250a6e2c730a84963e5e30352759d5f1f4 + checksum: 88de02eafb7d39950c520c53aa07ffe63c95ca7ef2262c39d2afd3c6aabcd5d717ba61f74314f5bc9c27588b721ff016b45af6fc1de88801c6ac4bf5ebaf8775 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.30.5": - version: 5.30.5 - resolution: "@typescript-eslint/visitor-keys@npm:5.30.5" +"@typescript-eslint/visitor-keys@npm:5.17.0": + version: 5.17.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.17.0" dependencies: - "@typescript-eslint/types": 5.30.5 - eslint-visitor-keys: ^3.3.0 - checksum: c0de9ae48378eec2682b860a059518bed213ea29575aad538d8d2f8137875e7279e375a7f23d38c1c183466fdd9cf1ca1db4ed5a1d374968f9460d83e48b2437 + "@typescript-eslint/types": 5.17.0 + eslint-visitor-keys: ^3.0.0 + checksum: 333468277b50e2fc381ba1b99ccb410046c422e0329c791c51bea62e705edd16ba97f75b668c6945a3ea3dc43b89a1739693ea60bfa241c67ce42e8b474e5048 languageName: node linkType: hard -"abbrev@npm:1": +"abbrev@npm:1, abbrev@npm:^1.0.0": version: 1.1.1 resolution: "abbrev@npm:1.1.1" checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17 @@ -2305,19 +2360,19 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.7.1": - version: 8.7.1 - resolution: "acorn@npm:8.7.1" +"acorn@npm:^8.4.1, acorn@npm:^8.9.0": + version: 8.10.0 + resolution: "acorn@npm:8.10.0" bin: acorn: bin/acorn - checksum: aca0aabf98826717920ac2583fdcad0a6fbe4e583fdb6e843af2594e907455aeafe30b1e14f1757cd83ce1776773cf8296ffc3a4acf13f0bd3dfebcf1db6ae80 + checksum: 538ba38af0cc9e5ef983aee196c4b8b4d87c0c94532334fa7e065b2c8a1f85863467bb774231aae91613fcda5e68740c15d97b1967ae3394d20faddddd8af61d languageName: node linkType: hard "address@npm:^1.0.1": - version: 1.2.0 - resolution: "address@npm:1.2.0" - checksum: 2ef3aa9d23bbe0f9f2745a634b16f3a2f2b18c43146c0913c7b26c8be410e20d59b8c3808d0bb7fe94d50fc2448b4b91e65dd9f33deb4aed53c14f0dedc3ddd8 + version: 1.2.2 + resolution: "address@npm:1.2.2" + checksum: ace439960c1e3564d8f523aff23a841904bf33a2a7c2e064f7f60a064194075758b9690e65bd9785692a4ef698a998c57eb74d145881a1cecab8ba658ddb1607 languageName: node linkType: hard @@ -2345,13 +2400,13 @@ __metadata: linkType: hard "agentkeepalive@npm:^4.2.1": - version: 4.2.1 - resolution: "agentkeepalive@npm:4.2.1" + version: 4.3.0 + resolution: "agentkeepalive@npm:4.3.0" dependencies: debug: ^4.1.0 - depd: ^1.1.2 + depd: ^2.0.0 humanize-ms: ^1.2.1 - checksum: 39cb49ed8cf217fd6da058a92828a0a84e0b74c35550f82ee0a10e1ee403c4b78ade7948be2279b188b7a7303f5d396ea2738b134731e464bf28de00a4f72a18 + checksum: 982453aa44c11a06826c836025e5162c846e1200adb56f2d075400da7d32d87021b3b0a58768d949d824811f5654223d5a8a3dad120921a2439625eb847c6260 languageName: node linkType: hard @@ -2378,27 +2433,27 @@ __metadata: linkType: hard "ajv@npm:^8.0.1": - version: 8.11.0 - resolution: "ajv@npm:8.11.0" + version: 8.12.0 + resolution: "ajv@npm:8.12.0" dependencies: fast-deep-equal: ^3.1.1 json-schema-traverse: ^1.0.0 require-from-string: ^2.0.2 uri-js: ^4.2.2 - checksum: 5e0ff226806763be73e93dd7805b634f6f5921e3e90ca04acdf8db81eed9d8d3f0d4c5f1213047f45ebbf8047ffe0c840fa1ef2ec42c3a644899f69aa72b5bef + checksum: 4dc13714e316e67537c8b31bc063f99a1d9d9a497eb4bbd55191ac0dcd5e4985bbb71570352ad6f1e76684fb6d790928f96ba3b2d4fd6e10024be9612fe3f001 languageName: node linkType: hard "amazon-cognito-identity-js@npm:^6.0.1": - version: 6.2.0 - resolution: "amazon-cognito-identity-js@npm:6.2.0" + version: 6.3.1 + resolution: "amazon-cognito-identity-js@npm:6.3.1" dependencies: "@aws-crypto/sha256-js": 1.2.2 buffer: 4.9.2 fast-base64-decode: ^1.0.0 isomorphic-unfetch: ^3.0.0 js-cookie: ^2.2.1 - checksum: 9b976ceac2a2648bfa707190d683214168cf1a70083152355b36e5b87b1aedbbb38dab8b71904ee968de25e90ebcf1e86ffaa21d809373d31acd73f62b6c7c1c + checksum: a38d1c809417d2894613a2fba896434cad3514ed2a16ec6be8084b14788440a4829b50c0dd0ecae3c878ff76bcd1f8df1a862b545eeeb0ca219c6e28cdf598fc languageName: node linkType: hard @@ -2467,6 +2522,13 @@ __metadata: languageName: node linkType: hard +"ansi-regex@npm:^6.0.1": + version: 6.0.1 + resolution: "ansi-regex@npm:6.0.1" + checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169 + languageName: node + linkType: hard + "ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" @@ -2492,6 +2554,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^6.1.0": + version: 6.2.1 + resolution: "ansi-styles@npm:6.2.1" + checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9 + languageName: node + linkType: hard + "antlr4@npm:4.7.1": version: 4.7.1 resolution: "antlr4@npm:4.7.1" @@ -2509,12 +2578,12 @@ __metadata: linkType: hard "anymatch@npm:^3.0.3, anymatch@npm:~3.1.1, anymatch@npm:~3.1.2": - version: 3.1.2 - resolution: "anymatch@npm:3.1.2" + version: 3.1.3 + resolution: "anymatch@npm:3.1.3" dependencies: normalize-path: ^3.0.0 picomatch: ^2.0.4 - checksum: 985163db2292fac9e5a1e072bf99f1b5baccf196e4de25a0b0b81865ebddeb3b3eb4480734ef0a2ac8c002845396b91aa89121f5b84f93981a4658164a9ec6e9 + checksum: 3e044fd6d1d26545f235a9fe4d7a534e2029d8e59fa7fd9f2a6eb21230f6b5380ea1eaf55136e60cbf8e613544b3b766e7a6fa2102e2a3a117505466e3025dc2 languageName: node linkType: hard @@ -2526,12 +2595,12 @@ __metadata: linkType: hard "are-we-there-yet@npm:^3.0.0": - version: 3.0.0 - resolution: "are-we-there-yet@npm:3.0.0" + version: 3.0.1 + resolution: "are-we-there-yet@npm:3.0.1" dependencies: delegates: ^1.0.0 readable-stream: ^3.6.0 - checksum: 348edfdd931b0b50868b55402c01c3f64df1d4c229ab6f063539a5025fd6c5f5bb8a0cab409bbed8d75d34762d22aa91b7c20b4204eb8177063158d9ba792981 + checksum: 52590c24860fa7173bedeb69a4c05fb573473e860197f618b9a28432ee4379049336727ae3a1f9c4cb083114601c1140cee578376164d0e651217a9843f9fe83 languageName: node linkType: hard @@ -2576,6 +2645,16 @@ __metadata: languageName: node linkType: hard +"array-buffer-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "array-buffer-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + is-array-buffer: ^3.0.1 + checksum: 044e101ce150f4804ad19c51d6c4d4cfa505c5b2577bd179256e4aa3f3f6a0a5e9874c78cd428ee566ac574c8a04d7ce21af9fe52e844abfdccb82b33035a7c3 + languageName: node + linkType: hard + "array-flatten@npm:1.1.1": version: 1.1.1 resolution: "array-flatten@npm:1.1.1" @@ -2584,15 +2663,15 @@ __metadata: linkType: hard "array-includes@npm:^3.1.4": - version: 3.1.5 - resolution: "array-includes@npm:3.1.5" + version: 3.1.6 + resolution: "array-includes@npm:3.1.6" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - get-intrinsic: ^1.1.1 + es-abstract: ^1.20.4 + get-intrinsic: ^1.1.3 is-string: ^1.0.7 - checksum: f6f24d834179604656b7bec3e047251d5cc87e9e87fab7c175c61af48e80e75acd296017abcde21fb52292ab6a2a449ab2ee37213ee48c8709f004d75983f9c5 + checksum: f22f8cd8ba8a6448d91eebdc69f04e4e55085d09232b5216ee2d476dab3ef59984e8d1889e662c6a0ed939dcb1b57fd05b2c0209c3370942fc41b752c82a2ca5 languageName: node linkType: hard @@ -2611,27 +2690,41 @@ __metadata: linkType: hard "array.prototype.flat@npm:^1.2.5": - version: 1.3.0 - resolution: "array.prototype.flat@npm:1.3.0" + version: 1.3.1 + resolution: "array.prototype.flat@npm:1.3.1" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-shim-unscopables: ^1.0.0 - checksum: 2a652b3e8dc0bebb6117e42a5ab5738af0203a14c27341d7bb2431467bdb4b348e2c5dc555dfcda8af0a5e4075c400b85311ded73861c87290a71a17c3e0a257 + checksum: 5a8415949df79bf6e01afd7e8839bbde5a3581300e8ad5d8449dea52639e9e59b26a467665622783697917b43bf39940a6e621877c7dd9b3d1c1f97484b9b88b languageName: node linkType: hard -"array.prototype.reduce@npm:^1.0.4": - version: 1.0.4 - resolution: "array.prototype.reduce@npm:1.0.4" +"array.prototype.reduce@npm:^1.0.5": + version: 1.0.5 + resolution: "array.prototype.reduce@npm:1.0.5" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 es-array-method-boxes-properly: ^1.0.0 is-string: ^1.0.7 - checksum: 6a57a1a2d3b77a9543db139cd52211f43a5af8e8271cb3c173be802076e3a6f71204ba8f090f5937ebc0842d5876db282f0f63dffd0e86b153e6e5a45681e4a5 + checksum: f44691395f9202aba5ec2446468d4c27209bfa81464f342ae024b7157dbf05b164e47cca01250b8c7c2a8219953fb57651cca16aab3d16f43b85c0d92c26eef3 + languageName: node + linkType: hard + +"arraybuffer.prototype.slice@npm:^1.0.1": + version: 1.0.1 + resolution: "arraybuffer.prototype.slice@npm:1.0.1" + dependencies: + array-buffer-byte-length: ^1.0.0 + call-bind: ^1.0.2 + define-properties: ^1.2.0 + get-intrinsic: ^1.2.1 + is-array-buffer: ^3.0.2 + is-shared-array-buffer: ^1.0.2 + checksum: e3e9b2a3e988ebfeddce4c7e8f69df730c9e48cb04b0d40ff0874ce3d86b3d1339dd520ffde5e39c02610bc172ecfbd4bc93324b1cabd9554c44a56b131ce0ce languageName: node linkType: hard @@ -2716,6 +2809,13 @@ __metadata: languageName: node linkType: hard +"available-typed-arrays@npm:^1.0.5": + version: 1.0.5 + resolution: "available-typed-arrays@npm:1.0.5" + checksum: 20eb47b3cefd7db027b9bbb993c658abd36d4edd3fe1060e83699a03ee275b0c9b216cc076ff3f2db29073225fb70e7613987af14269ac1fe2a19803ccc97f1a + languageName: node + linkType: hard + "aws-sign2@npm:~0.7.0": version: 0.7.0 resolution: "aws-sign2@npm:0.7.0" @@ -2724,9 +2824,9 @@ __metadata: linkType: hard "aws4@npm:^1.8.0": - version: 1.11.0 - resolution: "aws4@npm:1.11.0" - checksum: 5a00d045fd0385926d20ebebcfba5ec79d4482fe706f63c27b324d489a04c68edb0db99ed991e19eda09cb8c97dc2452059a34d97545cebf591d7a2b5a10999f + version: 1.12.0 + resolution: "aws4@npm:1.12.0" + checksum: 68f79708ac7c335992730bf638286a3ee0a645cf12575d557860100767c500c08b30e24726b9f03265d74116417f628af78509e1333575e9f8d52a80edfe8cbc languageName: node linkType: hard @@ -2758,6 +2858,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.4.0": + version: 1.4.0 + resolution: "axios@npm:1.4.0" + dependencies: + follow-redirects: ^1.15.0 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: 7fb6a4313bae7f45e89d62c70a800913c303df653f19eafec88e56cea2e3821066b8409bc68be1930ecca80e861c52aa787659df0ffec6ad4d451c7816b9386b + languageName: node + linkType: hard + "babel-plugin-istanbul@npm:^6.1.1": version: 6.1.1 resolution: "babel-plugin-istanbul@npm:6.1.1" @@ -2833,22 +2944,13 @@ __metadata: linkType: hard "bigint-crypto-utils@npm:^3.0.23": - version: 3.1.7 - resolution: "bigint-crypto-utils@npm:3.1.7" - dependencies: - bigint-mod-arith: ^3.1.0 - checksum: 10fa35d3e3d37639c8d501f45e0044c9062e7aa60783ae514e4d4ed3235ac24ac180e0dd0c77dad8cb5410ef24de42e1ea12527a997fec4c59f15fa83ea477ba - languageName: node - linkType: hard - -"bigint-mod-arith@npm:^3.1.0": - version: 3.1.2 - resolution: "bigint-mod-arith@npm:3.1.2" - checksum: badddd745f6e6c45674b22335d26a9ea83250e749abde20c5f84b24afbc747e259bc36798530953332349ed898f38ec39125b326cae8b8ee2dddfaea7ddf8448 + version: 3.3.0 + resolution: "bigint-crypto-utils@npm:3.3.0" + checksum: 9598ce57b23f776c8936d44114c9f051e62b5fa654915b664784cbcbacc5aa0485f4479571c51ff58008abb1210c0d6a234853742f07cf84bda890f2a1e01000 languageName: node linkType: hard -"bignumber.js@npm:^9.0.1, bignumber.js@npm:^9.1.1": +"bignumber.js@npm:^9.1.1": version: 9.1.1 resolution: "bignumber.js@npm:9.1.1" checksum: ad243b7e2f9120b112d670bb3d674128f0bd2ca1745b0a6c9df0433bd2c0252c43e6315d944c2ac07b4c639e7496b425e46842773cf89c6a2dcd4f31e5c4b11e @@ -2978,17 +3080,17 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.20.2": - version: 4.21.1 - resolution: "browserslist@npm:4.21.1" +"browserslist@npm:^4.21.9": + version: 4.21.9 + resolution: "browserslist@npm:4.21.9" dependencies: - caniuse-lite: ^1.0.30001359 - electron-to-chromium: ^1.4.172 - node-releases: ^2.0.5 - update-browserslist-db: ^1.0.4 + caniuse-lite: ^1.0.30001503 + electron-to-chromium: ^1.4.431 + node-releases: ^2.0.12 + update-browserslist-db: ^1.0.11 bin: browserslist: cli.js - checksum: 4904a9ded0702381adc495e003e7f77970abb7f8c8b8edd9e54f026354b5a96b1bddc26e6d9a7df9f043e468ecd2fcff2c8f40fc489909a042880117c2aca8ff + checksum: 80d3820584e211484ad1b1a5cfdeca1dd00442f47be87e117e1dda34b628c87e18b81ae7986fa5977b3e6a03154f6d13cd763baa6b8bf5dd9dd19f4926603698 languageName: node linkType: hard @@ -3079,29 +3181,23 @@ __metadata: languageName: node linkType: hard -"cacache@npm:^16.1.0": - version: 16.1.1 - resolution: "cacache@npm:16.1.1" +"cacache@npm:^17.0.0": + version: 17.1.3 + resolution: "cacache@npm:17.1.3" dependencies: - "@npmcli/fs": ^2.1.0 - "@npmcli/move-file": ^2.0.0 - chownr: ^2.0.0 - fs-minipass: ^2.1.0 - glob: ^8.0.1 - infer-owner: ^1.0.4 + "@npmcli/fs": ^3.1.0 + fs-minipass: ^3.0.0 + glob: ^10.2.2 lru-cache: ^7.7.1 - minipass: ^3.1.6 + minipass: ^5.0.0 minipass-collect: ^1.0.2 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 - mkdirp: ^1.0.4 p-map: ^4.0.0 - promise-inflight: ^1.0.1 - rimraf: ^3.0.2 - ssri: ^9.0.0 + ssri: ^10.0.0 tar: ^6.1.11 - unique-filename: ^1.1.1 - checksum: 488524617008b793f0249b0c4ea2c330c710ca997921376e15650cc2415a8054491ae2dee9f01382c2015602c0641f3f977faf2fa7361aa33d2637dcfb03907a + unique-filename: ^3.0.0 + checksum: 385756781e1e21af089160d89d7462b7ed9883c978e848c7075b90b73cb823680e66092d61513050164588387d2ca87dd6d910e28d64bc13a9ac82cd8580c796 languageName: node linkType: hard @@ -3168,10 +3264,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001359": - version: 1.0.30001363 - resolution: "caniuse-lite@npm:1.0.30001363" - checksum: 8dfcb2fa97724349cbbe61d988810bd90bfb40106a289ed6613188fa96dd1f5885c7e9924e46bb30a641bd1579ec34096fdc2b21b47d8500f8a2bfb0db069323 +"caniuse-lite@npm:^1.0.30001503": + version: 1.0.30001517 + resolution: "caniuse-lite@npm:1.0.30001517" + checksum: e4e87436ae1c4408cf4438aac22902b31eb03f3f5bad7f33bc518d12ffb35f3fd9395ccf7efc608ee046f90ce324ec6f7f26f8a8172b8c43c26a06ecee612a29 languageName: node linkType: hard @@ -3196,17 +3292,7 @@ __metadata: languageName: node linkType: hard -"cbor@npm:^5.0.2": - version: 5.2.0 - resolution: "cbor@npm:5.2.0" - dependencies: - bignumber.js: ^9.0.1 - nofilter: ^1.0.4 - checksum: b3c39dae64370f361526dbec88f51d0f1b47027224cdd21dbd64c228f0fe7eaa945932d349ec5324068a6c6dcdbb1e3b46242852524fd53c526d14cb60514bdc - languageName: node - linkType: hard - -"cbor@npm:^8.0.0": +"cbor@npm:^8.0.0, cbor@npm:^8.1.0": version: 8.1.0 resolution: "cbor@npm:8.1.0" dependencies: @@ -3227,17 +3313,17 @@ __metadata: linkType: hard "chai@npm:^4.3.4": - version: 4.3.6 - resolution: "chai@npm:4.3.6" + version: 4.3.7 + resolution: "chai@npm:4.3.7" dependencies: assertion-error: ^1.1.0 check-error: ^1.0.2 - deep-eql: ^3.0.1 + deep-eql: ^4.1.2 get-func-name: ^2.0.0 loupe: ^2.3.1 pathval: ^1.1.1 type-detect: ^4.0.5 - checksum: acff93fd537f96d4a4d62dd83810285dffcfccb5089e1bf2a1205b28ec82d93dff551368722893cf85004282df10ee68802737c33c90c5493957ed449ed7ce71 + checksum: 0bba7d267848015246a66995f044ce3f0ebc35e530da3cbdf171db744e14cbe301ab913a8d07caf7952b430257ccbb1a4a983c570a7c5748dc537897e5131f7c languageName: node linkType: hard @@ -3336,9 +3422,9 @@ __metadata: linkType: hard "ci-info@npm:^3.2.0": - version: 3.3.2 - resolution: "ci-info@npm:3.3.2" - checksum: fd81f1edd2d3b0f6cb077b2e84365136d87b9db8c055928c1ad69da8a76c2c2f19cba8ea51b90238302157ca927f91f92b653e933f2398dde4867500f08d6e62 + version: 3.8.0 + resolution: "ci-info@npm:3.8.0" + checksum: d0a4d3160497cae54294974a7246202244fff031b0a6ea20dd57b10ec510aa17399c41a1b0982142c105f3255aff2173e5c0dd7302ee1b2f28ba3debda375098 languageName: node linkType: hard @@ -3353,16 +3439,16 @@ __metadata: linkType: hard "classic-level@npm:^1.2.0": - version: 1.2.0 - resolution: "classic-level@npm:1.2.0" + version: 1.3.0 + resolution: "classic-level@npm:1.3.0" dependencies: abstract-level: ^1.0.2 catering: ^2.1.0 module-error: ^1.0.1 - napi-macros: ~2.0.0 + napi-macros: ^2.2.2 node-gyp: latest node-gyp-build: ^4.3.0 - checksum: 88ddd12f2192c2775107d5e462998ac01095cb0222ca01dc2be77d8dcbbf9883c4c0a0248529cceee40a2f1232c68027b1aca731da9f767ad8e9483cbd61dd37 + checksum: 773da48aef52a041115d413fee8340b357a4da2eb505764f327183b155edd7cc9d24819eb4f707c83dbdae8588024f5dddeb322125567c59d5d1f6f16334cdb9 languageName: node linkType: hard @@ -3438,10 +3524,21 @@ __metadata: languageName: node linkType: hard +"cliui@npm:^8.0.1": + version: 8.0.1 + resolution: "cliui@npm:8.0.1" + dependencies: + string-width: ^4.2.0 + strip-ansi: ^6.0.1 + wrap-ansi: ^7.0.0 + checksum: 79648b3b0045f2e285b76fb2e24e207c6db44323581e421c3acbd0e86454cba1b37aea976ab50195a49e7384b871e6dfb2247ad7dec53c02454ac6497394cb56 + languageName: node + linkType: hard + "collect-v8-coverage@npm:^1.0.0": - version: 1.0.1 - resolution: "collect-v8-coverage@npm:1.0.1" - checksum: 4efe0a1fccd517b65478a2364b33dadd0a43fc92a56f59aaece9b6186fe5177b2de471253587de7c91516f07c7268c2f6770b6cbcffc0e0ece353b766ec87e55 + version: 1.0.2 + resolution: "collect-v8-coverage@npm:1.0.2" + checksum: c10f41c39ab84629d16f9f6137bc8a63d332244383fc368caf2d2052b5e04c20cd1fd70f66fcf4e2422b84c8226598b776d39d5f2d2a51867cc1ed5d1982b4da languageName: node linkType: hard @@ -3543,10 +3640,10 @@ __metadata: languageName: node linkType: hard -"compare-versions@npm:^5.0.0": - version: 5.0.1 - resolution: "compare-versions@npm:5.0.1" - checksum: 302a4e46224b47b9280cf894c6c87d8df912671fa391dcdbf0e63438d9b0a69fe20dd747fb439e8d54c43af016ff4eaaf0a4c9d8e7ca358bcd12dadf4ad2935e +"compare-versions@npm:^6.0.0": + version: 6.0.0 + resolution: "compare-versions@npm:6.0.0" + checksum: bf2fa355b2139cbdb0576f2f0328c112dd3c2eb808eff8b70b808b3ed05f8a40b8317c323ff4797a6a5a7ab32d508876749584c626ee5840dc0119361afffc4d languageName: node linkType: hard @@ -3593,11 +3690,9 @@ __metadata: linkType: hard "convert-source-map@npm:^1.4.0, convert-source-map@npm:^1.7.0": - version: 1.8.0 - resolution: "convert-source-map@npm:1.8.0" - dependencies: - safe-buffer: ~5.1.1 - checksum: 985d974a2d33e1a2543ada51c93e1ba2f73eaed608dc39f229afc78f71dcc4c8b7d7c684aa647e3c6a3a204027444d69e53e169ce94e8d1fa8d7dee80c9c8fed + version: 1.9.0 + resolution: "convert-source-map@npm:1.9.0" + checksum: dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8 languageName: node linkType: hard @@ -3692,11 +3787,11 @@ __metadata: linkType: hard "cross-fetch@npm:^3.1.5": - version: 3.1.5 - resolution: "cross-fetch@npm:3.1.5" + version: 3.1.8 + resolution: "cross-fetch@npm:3.1.8" dependencies: - node-fetch: 2.6.7 - checksum: f6b8c6ee3ef993ace6277fd789c71b6acf1b504fd5f5c7128df4ef2f125a429e29cd62dc8c127523f04a5f2fa4771ed80e3f3d9695617f441425045f505cf3bb + node-fetch: ^2.6.12 + checksum: 78f993fa099eaaa041122ab037fe9503ecbbcb9daef234d1d2e0b9230a983f64d645d088c464e21a247b825a08dc444a6e7064adfa93536d3a9454b4745b3632 languageName: node linkType: hard @@ -3713,7 +3808,7 @@ __metadata: languageName: node linkType: hard -"cross-spawn@npm:^7.0.2": +"cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2": version: 7.0.3 resolution: "cross-spawn@npm:7.0.3" dependencies: @@ -3747,7 +3842,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9, debug@npm:^2.6.0, debug@npm:^2.6.9": +"debug@npm:2.6.9, debug@npm:^2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -3765,7 +3860,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3, debug@npm:^4.3.4": +"debug@npm:4, debug@npm:4.3.4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.2, debug@npm:^4.3.3": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -3807,21 +3902,12 @@ __metadata: languageName: node linkType: hard -"deep-eql@npm:^3.0.1": - version: 3.0.1 - resolution: "deep-eql@npm:3.0.1" - dependencies: - type-detect: ^4.0.0 - checksum: 4f4c9fb79eb994fb6e81d4aa8b063adc40c00f831588aa65e20857d5d52f15fb23034a6576ecf886f7ff6222d5ae42e71e9b7d57113e0715b1df7ea1e812b125 - languageName: node - linkType: hard - -"deep-eql@npm:^4.0.1": - version: 4.1.0 - resolution: "deep-eql@npm:4.1.0" +"deep-eql@npm:^4.0.1, deep-eql@npm:^4.1.2": + version: 4.1.3 + resolution: "deep-eql@npm:4.1.3" dependencies: type-detect: ^4.0.0 - checksum: 2fccd527df9a70a92a1dfa8c771d139753625938e137b09fc946af8577d22360ef28d3c74f0e9c5aaa399bab20542d0899da1529c71db76f280a30147cd2a110 + checksum: 7f6d30cb41c713973dc07eaadded848b2ab0b835e518a88b91bea72f34e08c4c71d167a722a6f302d3a6108f05afd8e6d7650689a84d5d29ec7fe6220420397f languageName: node linkType: hard @@ -3832,32 +3918,6 @@ __metadata: languageName: node linkType: hard -"defender-admin-client@npm:^1.39.0": - version: 1.43.0 - resolution: "defender-admin-client@npm:1.43.0" - dependencies: - axios: ^0.21.2 - defender-base-client: 1.43.0 - ethers: ^5.7.2 - lodash: ^4.17.19 - node-fetch: ^2.6.0 - checksum: 489e1f9822d5f36d04b2668eee411f7b46747a88128e4184ac4b6c9fd2fc6caacfac3541429ffa086b3639c3aeb4fc5b87f53bc0e151790c27de5db5804dca61 - languageName: node - linkType: hard - -"defender-base-client@npm:1.43.0, defender-base-client@npm:^1.40.0": - version: 1.43.0 - resolution: "defender-base-client@npm:1.43.0" - dependencies: - amazon-cognito-identity-js: ^6.0.1 - async-retry: ^1.3.3 - axios: ^0.21.2 - lodash: ^4.17.19 - node-fetch: ^2.6.0 - checksum: e0862837112fd8e00252e11dc32b7f7afa1e25b48ca0ad0cd8b2d443024fa3bf17b683bc0922e8464251b7919378925ce36e8227f7355a7978ef303db7b2ba77 - languageName: node - linkType: hard - "define-lazy-prop@npm:^2.0.0": version: 2.0.0 resolution: "define-lazy-prop@npm:2.0.0" @@ -3865,13 +3925,13 @@ __metadata: languageName: node linkType: hard -"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.1.4": - version: 1.1.4 - resolution: "define-properties@npm:1.1.4" +"define-properties@npm:^1.1.2, define-properties@npm:^1.1.3, define-properties@npm:^1.1.4, define-properties@npm:^1.2.0": + version: 1.2.0 + resolution: "define-properties@npm:1.2.0" dependencies: has-property-descriptors: ^1.0.0 object-keys: ^1.1.1 - checksum: ce0aef3f9eb193562b5cfb79b2d2c86b6a109dfc9fdcb5f45d680631a1a908c06824ddcdb72b7573b54e26ace07f0a23420aaba0d5c627b34d2c1de8ef527e2b + checksum: e60aee6a19b102df4e2b1f301816804e81ab48bb91f00d0d935f269bf4b3f79c88b39e4f89eaa132890d23267335fd1140dfcd8d5ccd61031a0a2c41a54e33a6 languageName: node linkType: hard @@ -3889,20 +3949,13 @@ __metadata: languageName: node linkType: hard -"depd@npm:2.0.0": +"depd@npm:2.0.0, depd@npm:^2.0.0": version: 2.0.0 resolution: "depd@npm:2.0.0" checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a languageName: node linkType: hard -"depd@npm:^1.1.2": - version: 1.1.2 - resolution: "depd@npm:1.1.2" - checksum: 6b406620d269619852885ce15965272b829df6f409724415e0002c8632ab6a8c0a08ec1f0bd2add05dc7bd7507606f7e2cc034fa24224ab829580040b835ecd9 - languageName: node - linkType: hard - "destroy@npm:1.2.0": version: 1.2.0 resolution: "destroy@npm:1.2.0" @@ -3911,15 +3964,15 @@ __metadata: linkType: hard "detect-port@npm:^1.3.0": - version: 1.3.0 - resolution: "detect-port@npm:1.3.0" + version: 1.5.1 + resolution: "detect-port@npm:1.5.1" dependencies: address: ^1.0.1 - debug: ^2.6.0 + debug: 4 bin: - detect: ./bin/detect-port - detect-port: ./bin/detect-port - checksum: 93c40febe714f56711d1fedc2b7a9cc4cbaa0fcddec0509876c46b9dd6099ed6bfd6662a4f35e5fa0301660f48ed516829253ab0fc90b9e79b823dd77786b379 + detect: bin/detect-port.js + detect-port: bin/detect-port.js + checksum: b48da9340481742547263d5d985e65d078592557863402ecf538511735e83575867e94f91fe74405ea19b61351feb99efccae7e55de9a151d5654e3417cea05b languageName: node linkType: hard @@ -3988,9 +4041,16 @@ __metadata: linkType: hard "dotenv@npm:^16.0.0": - version: 16.0.3 - resolution: "dotenv@npm:16.0.3" - checksum: afcf03f373d7a6d62c7e9afea6328e62851d627a4e73f2e12d0a8deae1cd375892004f3021883f8aec85932cd2834b091f568ced92b4774625b321db83b827f8 + version: 16.3.1 + resolution: "dotenv@npm:16.3.1" + checksum: 15d75e7279018f4bafd0ee9706593dd14455ddb71b3bcba9c52574460b7ccaf67d5cf8b2c08a5af1a9da6db36c956a04a1192b101ee102a3e0cf8817bbcf3dfd + languageName: node + linkType: hard + +"eastasianwidth@npm:^0.2.0": + version: 0.2.0 + resolution: "eastasianwidth@npm:0.2.0" + checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed languageName: node linkType: hard @@ -4011,10 +4071,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.172": - version: 1.4.180 - resolution: "electron-to-chromium@npm:1.4.180" - checksum: 98df07cfb0f67c383aa124ffc12fd9e9d3fd50e1c79548fc3d1524f3dbc3ac92c41f145a97e4e434d3d959f31e8ceab1e7426a6a5ef846af19e5b30e60bb7e98 +"electron-to-chromium@npm:^1.4.431": + version: 1.4.474 + resolution: "electron-to-chromium@npm:1.4.474" + checksum: 16e55823064dfa6f64088a3d5124c0c5c2a577c981a35e58199a2baa6a237b4d9505ddf406d4c8761cabdf6f7b347013a57a887883781dfb04d1940f8be379b0 languageName: node linkType: hard @@ -4033,13 +4093,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^10.0.0": - version: 10.1.0 - resolution: "emoji-regex@npm:10.1.0" - checksum: 5bc780fc4d75f89369155a87c55f7e83a0bf72bcccda7df7f2c570cde4738d8b17d112d12afdadfec16647d1faef6501307b4304f81d35c823a938fe6547df0f - languageName: node - linkType: hard - "emoji-regex@npm:^7.0.1": version: 7.0.3 resolution: "emoji-regex@npm:7.0.3" @@ -4054,6 +4107,13 @@ __metadata: languageName: node linkType: hard +"emoji-regex@npm:^9.2.2": + version: 9.2.2 + resolution: "emoji-regex@npm:9.2.2" + checksum: 8487182da74aabd810ac6d6f1994111dfc0e331b01271ae01ec1eb0ad7b5ecc2bbbbd2f053c05cb55a1ac30449527d819bbfbf0e3de1023db308cbcb47f86601 + languageName: node + linkType: hard + "encode-utf8@npm:^1.0.2": version: 1.0.3 resolution: "encode-utf8@npm:1.0.3" @@ -4078,11 +4138,12 @@ __metadata: linkType: hard "enquirer@npm:^2.3.0, enquirer@npm:^2.3.6": - version: 2.3.6 - resolution: "enquirer@npm:2.3.6" + version: 2.4.0 + resolution: "enquirer@npm:2.4.0" dependencies: ansi-colors: ^4.1.1 - checksum: 1c0911e14a6f8d26721c91e01db06092a5f7675159f0261d69c403396a385afd13dd76825e7678f66daffa930cfaa8d45f506fb35f818a2788463d022af1b884 + strip-ansi: ^6.0.1 + checksum: bbdecde92679ed847c751dc5337ff39ce0c32d85e76fb2e47245e831e9cc7f84c12bd35b70f7b1de9b9e1c730d90cccd04201e69f1ecf7986a7a70d8d39349db languageName: node linkType: hard @@ -4109,34 +4170,50 @@ __metadata: languageName: node linkType: hard -"es-abstract@npm:^1.19.0, es-abstract@npm:^1.19.1, es-abstract@npm:^1.19.2, es-abstract@npm:^1.19.5, es-abstract@npm:^1.20.1": - version: 1.20.1 - resolution: "es-abstract@npm:1.20.1" +"es-abstract@npm:^1.19.0, es-abstract@npm:^1.20.4, es-abstract@npm:^1.21.2": + version: 1.22.1 + resolution: "es-abstract@npm:1.22.1" dependencies: + array-buffer-byte-length: ^1.0.0 + arraybuffer.prototype.slice: ^1.0.1 + available-typed-arrays: ^1.0.5 call-bind: ^1.0.2 + es-set-tostringtag: ^2.0.1 es-to-primitive: ^1.2.1 - function-bind: ^1.1.1 function.prototype.name: ^1.1.5 - get-intrinsic: ^1.1.1 + get-intrinsic: ^1.2.1 get-symbol-description: ^1.0.0 + globalthis: ^1.0.3 + gopd: ^1.0.1 has: ^1.0.3 has-property-descriptors: ^1.0.0 + has-proto: ^1.0.1 has-symbols: ^1.0.3 - internal-slot: ^1.0.3 - is-callable: ^1.2.4 + internal-slot: ^1.0.5 + is-array-buffer: ^3.0.2 + is-callable: ^1.2.7 is-negative-zero: ^2.0.2 is-regex: ^1.1.4 is-shared-array-buffer: ^1.0.2 is-string: ^1.0.7 + is-typed-array: ^1.1.10 is-weakref: ^1.0.2 - object-inspect: ^1.12.0 + object-inspect: ^1.12.3 object-keys: ^1.1.1 - object.assign: ^4.1.2 - regexp.prototype.flags: ^1.4.3 - string.prototype.trimend: ^1.0.5 - string.prototype.trimstart: ^1.0.5 + object.assign: ^4.1.4 + regexp.prototype.flags: ^1.5.0 + safe-array-concat: ^1.0.0 + safe-regex-test: ^1.0.0 + string.prototype.trim: ^1.2.7 + string.prototype.trimend: ^1.0.6 + string.prototype.trimstart: ^1.0.6 + typed-array-buffer: ^1.0.0 + typed-array-byte-length: ^1.0.0 + typed-array-byte-offset: ^1.0.0 + typed-array-length: ^1.0.4 unbox-primitive: ^1.0.2 - checksum: 28da27ae0ed9c76df7ee8ef5c278df79dcfdb554415faf7068bb7c58f8ba8e2a16bfb59e586844be6429ab4c302ca7748979d48442224cb1140b051866d74b7f + which-typed-array: ^1.1.10 + checksum: 614e2c1c3717cb8d30b6128ef12ea110e06fd7d75ad77091ca1c5dbfb00da130e62e4bbbbbdda190eada098a22b27fe0f99ae5a1171dac2c8663b1e8be8a3a9b languageName: node linkType: hard @@ -4147,6 +4224,17 @@ __metadata: languageName: node linkType: hard +"es-set-tostringtag@npm:^2.0.1": + version: 2.0.1 + resolution: "es-set-tostringtag@npm:2.0.1" + dependencies: + get-intrinsic: ^1.1.3 + has: ^1.0.3 + has-tostringtag: ^1.0.0 + checksum: ec416a12948cefb4b2a5932e62093a7cf36ddc3efd58d6c58ca7ae7064475ace556434b869b0bbeb0c365f1032a8ccd577211101234b69837ad83ad204fff884 + languageName: node + linkType: hard + "es-shim-unscopables@npm:^1.0.0": version: 1.0.0 resolution: "es-shim-unscopables@npm:1.0.0" @@ -4221,7 +4309,7 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.5.0": +"eslint-config-prettier@npm:8.5.0": version: 8.5.0 resolution: "eslint-config-prettier@npm:8.5.0" peerDependencies: @@ -4232,7 +4320,7 @@ __metadata: languageName: node linkType: hard -"eslint-config-standard@npm:^16.0.3": +"eslint-config-standard@npm:16.0.3": version: 16.0.3 resolution: "eslint-config-standard@npm:16.0.3" peerDependencies: @@ -4245,22 +4333,25 @@ __metadata: linkType: hard "eslint-import-resolver-node@npm:^0.3.6": - version: 0.3.6 - resolution: "eslint-import-resolver-node@npm:0.3.6" + version: 0.3.7 + resolution: "eslint-import-resolver-node@npm:0.3.7" dependencies: debug: ^3.2.7 - resolve: ^1.20.0 - checksum: 6266733af1e112970e855a5bcc2d2058fb5ae16ad2a6d400705a86b29552b36131ffc5581b744c23d550de844206fb55e9193691619ee4dbf225c4bde526b1c8 + is-core-module: ^2.11.0 + resolve: ^1.22.1 + checksum: 3379aacf1d2c6952c1b9666c6fa5982c3023df695430b0d391c0029f6403a7775414873d90f397e98ba6245372b6c8960e16e74d9e4a3b0c0a4582f3bdbe3d6e languageName: node linkType: hard -"eslint-module-utils@npm:^2.7.3": - version: 2.7.3 - resolution: "eslint-module-utils@npm:2.7.3" +"eslint-module-utils@npm:^2.7.2": + version: 2.8.0 + resolution: "eslint-module-utils@npm:2.8.0" dependencies: debug: ^3.2.7 - find-up: ^2.1.0 - checksum: 77048263f309167a1e6a1e1b896bfb5ddd1d3859b2e2abbd9c32c432aee13d610d46e6820b1ca81b37fba437cf423a404bc6649be64ace9148a3062d1886a678 + peerDependenciesMeta: + eslint: + optional: true + checksum: 74c6dfea7641ebcfe174be61168541a11a14aa8d72e515f5f09af55cd0d0862686104b0524aa4b8e0ce66418a44aa38a94d2588743db5fd07a6b49ffd16921d2 languageName: node linkType: hard @@ -4276,30 +4367,30 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-import@npm:^2.25.4": - version: 2.26.0 - resolution: "eslint-plugin-import@npm:2.26.0" +"eslint-plugin-import@npm:2.25.4": + version: 2.25.4 + resolution: "eslint-plugin-import@npm:2.25.4" dependencies: array-includes: ^3.1.4 array.prototype.flat: ^1.2.5 debug: ^2.6.9 doctrine: ^2.1.0 eslint-import-resolver-node: ^0.3.6 - eslint-module-utils: ^2.7.3 + eslint-module-utils: ^2.7.2 has: ^1.0.3 - is-core-module: ^2.8.1 + is-core-module: ^2.8.0 is-glob: ^4.0.3 - minimatch: ^3.1.2 + minimatch: ^3.0.4 object.values: ^1.1.5 - resolve: ^1.22.0 - tsconfig-paths: ^3.14.1 + resolve: ^1.20.0 + tsconfig-paths: ^3.12.0 peerDependencies: eslint: ^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 - checksum: 0bf77ad80339554481eafa2b1967449e1f816b94c7a6f9614ce33fb4083c4e6c050f10d241dd50b4975d47922880a34de1e42ea9d8e6fd663ebb768baa67e655 + checksum: 0af24f5c7c6ca692f42e3947127f0ae7dfe44f1e02740f7cbe988b510a9c52bab0065d7df04e2d953dcc88a4595a00cbdcf14018acf8cd75cfd47b72efcbb734 languageName: node linkType: hard -"eslint-plugin-node@npm:^11.1.0": +"eslint-plugin-node@npm:11.1.0": version: 11.1.0 resolution: "eslint-plugin-node@npm:11.1.0" dependencies: @@ -4315,9 +4406,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-prettier@npm:^4.0.0": - version: 4.2.1 - resolution: "eslint-plugin-prettier@npm:4.2.1" +"eslint-plugin-prettier@npm:4.0.0": + version: 4.0.0 + resolution: "eslint-plugin-prettier@npm:4.0.0" dependencies: prettier-linter-helpers: ^1.0.0 peerDependencies: @@ -4326,11 +4417,11 @@ __metadata: peerDependenciesMeta: eslint-config-prettier: optional: true - checksum: b9e839d2334ad8ec7a5589c5cb0f219bded260839a857d7a486997f9870e95106aa59b8756ff3f37202085ebab658de382b0267cae44c3a7f0eb0bcc03a4f6d6 + checksum: 03d69177a3c21fa2229c7e427ce604429f0b20ab7f411e2e824912f572a207c7f5a41fd1f0a95b9b8afe121e291c1b1f1dc1d44c7aad4b0837487f9c19f5210d languageName: node linkType: hard -"eslint-plugin-promise@npm:^6.0.0": +"eslint-plugin-promise@npm:6.0.0": version: 6.0.0 resolution: "eslint-plugin-promise@npm:6.0.0" peerDependencies: @@ -4360,12 +4451,12 @@ __metadata: linkType: hard "eslint-scope@npm:^7.1.1": - version: 7.1.1 - resolution: "eslint-scope@npm:7.1.1" + version: 7.2.1 + resolution: "eslint-scope@npm:7.2.1" dependencies: esrecurse: ^4.3.0 estraverse: ^5.2.0 - checksum: 9f6e974ab2db641ca8ab13508c405b7b859e72afe9f254e8131ff154d2f40c99ad4545ce326fd9fde3212ff29707102562a4834f1c48617b35d98c71a97fbf3e + checksum: dccda5c8909216f6261969b72c77b95e385f9086bed4bc09d8a6276df8439d8f986810fd9ac3bd02c94c0572cefc7fdbeae392c69df2e60712ab8263986522c5 languageName: node linkType: hard @@ -4412,10 +4503,55 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.3.0": - version: 3.3.0 - resolution: "eslint-visitor-keys@npm:3.3.0" - checksum: d59e68a7c5a6d0146526b0eec16ce87fbf97fe46b8281e0d41384224375c4e52f5ffb9e16d48f4ea50785cde93f766b0c898e31ab89978d88b0e1720fbfb7808 +"eslint-visitor-keys@npm:^3.0.0, eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1": + version: 3.4.1 + resolution: "eslint-visitor-keys@npm:3.4.1" + checksum: f05121d868202736b97de7d750847a328fcfa8593b031c95ea89425333db59676ac087fa905eba438d0a3c5769632f828187e0c1a0d271832a2153c1d3661c2c + languageName: node + linkType: hard + +"eslint@npm:8.14.0": + version: 8.14.0 + resolution: "eslint@npm:8.14.0" + dependencies: + "@eslint/eslintrc": ^1.2.2 + "@humanwhocodes/config-array": ^0.9.2 + ajv: ^6.10.0 + chalk: ^4.0.0 + cross-spawn: ^7.0.2 + debug: ^4.3.2 + doctrine: ^3.0.0 + escape-string-regexp: ^4.0.0 + eslint-scope: ^7.1.1 + eslint-utils: ^3.0.0 + eslint-visitor-keys: ^3.3.0 + espree: ^9.3.1 + esquery: ^1.4.0 + esutils: ^2.0.2 + fast-deep-equal: ^3.1.3 + file-entry-cache: ^6.0.1 + functional-red-black-tree: ^1.0.1 + glob-parent: ^6.0.1 + globals: ^13.6.0 + ignore: ^5.2.0 + import-fresh: ^3.0.0 + imurmurhash: ^0.1.4 + is-glob: ^4.0.0 + js-yaml: ^4.1.0 + json-stable-stringify-without-jsonify: ^1.0.1 + levn: ^0.4.1 + lodash.merge: ^4.6.2 + minimatch: ^3.0.4 + natural-compare: ^1.4.0 + optionator: ^0.9.1 + regexpp: ^3.2.0 + strip-ansi: ^6.0.1 + strip-json-comments: ^3.1.0 + text-table: ^0.2.0 + v8-compile-cache: ^2.0.3 + bin: + eslint: bin/eslint.js + checksum: 87d2e3e5eb93216d4ab36006e7b8c0bfad02f40b0a0f193f1d42754512cd3a9d8244152f1c69df5db2e135b3c4f1c10d0ed2f0881fe8a8c01af55465968174c1 languageName: node linkType: hard @@ -4465,51 +4601,6 @@ __metadata: languageName: node linkType: hard -"eslint@npm:^8.14.0": - version: 8.19.0 - resolution: "eslint@npm:8.19.0" - dependencies: - "@eslint/eslintrc": ^1.3.0 - "@humanwhocodes/config-array": ^0.9.2 - ajv: ^6.10.0 - chalk: ^4.0.0 - cross-spawn: ^7.0.2 - debug: ^4.3.2 - doctrine: ^3.0.0 - escape-string-regexp: ^4.0.0 - eslint-scope: ^7.1.1 - eslint-utils: ^3.0.0 - eslint-visitor-keys: ^3.3.0 - espree: ^9.3.2 - esquery: ^1.4.0 - esutils: ^2.0.2 - fast-deep-equal: ^3.1.3 - file-entry-cache: ^6.0.1 - functional-red-black-tree: ^1.0.1 - glob-parent: ^6.0.1 - globals: ^13.15.0 - ignore: ^5.2.0 - import-fresh: ^3.0.0 - imurmurhash: ^0.1.4 - is-glob: ^4.0.0 - js-yaml: ^4.1.0 - json-stable-stringify-without-jsonify: ^1.0.1 - levn: ^0.4.1 - lodash.merge: ^4.6.2 - minimatch: ^3.1.2 - natural-compare: ^1.4.0 - optionator: ^0.9.1 - regexpp: ^3.2.0 - strip-ansi: ^6.0.1 - strip-json-comments: ^3.1.0 - text-table: ^0.2.0 - v8-compile-cache: ^2.0.3 - bin: - eslint: bin/eslint.js - checksum: 0bc9df1a3a09dcd5a781ec728f280aa8af3ab19c2d1f14e2668b5ee5b8b1fb0e72dde5c3acf738e7f4281685fb24ec149b6154255470b06cf41de76350bca7a4 - languageName: node - linkType: hard - "espree@npm:^5.0.1": version: 5.0.1 resolution: "espree@npm:5.0.1" @@ -4521,14 +4612,14 @@ __metadata: languageName: node linkType: hard -"espree@npm:^9.3.2": - version: 9.3.2 - resolution: "espree@npm:9.3.2" +"espree@npm:^9.3.1, espree@npm:^9.4.0": + version: 9.6.1 + resolution: "espree@npm:9.6.1" dependencies: - acorn: ^8.7.1 + acorn: ^8.9.0 acorn-jsx: ^5.3.2 - eslint-visitor-keys: ^3.3.0 - checksum: 9a790d6779847051e87f70d720a0f6981899a722419e80c92ab6dee01e1ab83b8ce52d11b4dc96c2c490182efb5a4c138b8b0d569205bfe1cd4629e658e58c30 + eslint-visitor-keys: ^3.4.1 + checksum: eb8c149c7a2a77b3f33a5af80c10875c3abd65450f60b8af6db1bfcfa8f101e21c1e56a561c6dc13b848e18148d43469e7cd208506238554fb5395a9ea5a1ab9 languageName: node linkType: hard @@ -4553,11 +4644,11 @@ __metadata: linkType: hard "esquery@npm:^1.0.1, esquery@npm:^1.4.0": - version: 1.4.0 - resolution: "esquery@npm:1.4.0" + version: 1.5.0 + resolution: "esquery@npm:1.5.0" dependencies: estraverse: ^5.1.0 - checksum: a0807e17abd7fbe5fbd4fab673038d6d8a50675cdae6b04fbaa520c34581be0c5fa24582990e8acd8854f671dd291c78bb2efb9e0ed5b62f33bac4f9cf820210 + checksum: aefb0d2596c230118656cd4ec7532d447333a410a48834d80ea648b1e7b5c9bc9ed8b5e33a89cb04e487b60d622f44cf5713bf4abed7c97343edefdc84a35900 languageName: node linkType: hard @@ -4605,7 +4696,7 @@ __metadata: languageName: node linkType: hard -"eth-gas-reporter@npm:^0.2.24": +"eth-gas-reporter@npm:^0.2.25": version: 0.2.25 resolution: "eth-gas-reporter@npm:0.2.25" dependencies: @@ -4634,11 +4725,11 @@ __metadata: linkType: hard "eth-permit@npm:^0.2.1": - version: 0.2.1 - resolution: "eth-permit@npm:0.2.1" + version: 0.2.3 + resolution: "eth-permit@npm:0.2.3" dependencies: utf8: ^3.0.0 - checksum: 8ffd51659cbd33ccf50abccd1e0fd2abd4067de328af0bfe32b251f298b9daea40bafed995dfe40d78a28b9af4863e5d2eb69fd3b91dfe405643e8c7e7da3359 + checksum: 9bf3eed8ecb8c914aadfff97d6c3d19fc432928c72fbe205075153e84289ea95f3a101f77e2dae78ad629e09682700241f207b5436b575ca7d4fbae68eacd3f6 languageName: node linkType: hard @@ -4675,14 +4766,14 @@ __metadata: linkType: hard "ethereum-cryptography@npm:^1.0.3": - version: 1.1.0 - resolution: "ethereum-cryptography@npm:1.1.0" + version: 1.2.0 + resolution: "ethereum-cryptography@npm:1.2.0" dependencies: - "@noble/hashes": 1.1.1 - "@noble/secp256k1": 1.6.0 - "@scure/bip32": 1.1.0 - "@scure/bip39": 1.1.0 - checksum: cba0bc58272ccc9eca4cf045bd4b6edb083486069ae0a62fba0fea5385a8c4257ea0faf135868440044fb37047bc0d7f39090c21ea409be106a9f9004a3792b5 + "@noble/hashes": 1.2.0 + "@noble/secp256k1": 1.7.1 + "@scure/bip32": 1.1.5 + "@scure/bip39": 1.1.1 + checksum: 97e8e8253cb9f5a9271bd0201c37609c451c890eb85883b9c564f14743c3d7c673287406c93bf5604307593ee298ad9a03983388b85c11ca61461b9fc1a4f2c7 languageName: node linkType: hard @@ -4817,16 +4908,23 @@ __metadata: languageName: node linkType: hard -"expect@npm:^28.1.1": - version: 28.1.1 - resolution: "expect@npm:28.1.1" +"expect@npm:^28.1.3": + version: 28.1.3 + resolution: "expect@npm:28.1.3" dependencies: - "@jest/expect-utils": ^28.1.1 + "@jest/expect-utils": ^28.1.3 jest-get-type: ^28.0.2 - jest-matcher-utils: ^28.1.1 - jest-message-util: ^28.1.1 - jest-util: ^28.1.1 - checksum: 6e557b681f4cfb0bf61efad50c5787cc6eb4596a3c299be69adc83fcad0265b5f329b997c2bb7ec92290e609681485616e51e16301a7f0ba3c57139b337c9351 + jest-matcher-utils: ^28.1.3 + jest-message-util: ^28.1.3 + jest-util: ^28.1.3 + checksum: 101e0090de300bcafedb7dbfd19223368a2251ce5fe0105bbb6de5720100b89fb6b64290ebfb42febc048324c76d6a4979cdc4b61eb77747857daf7a5de9b03d + languageName: node + linkType: hard + +"exponential-backoff@npm:^3.1.1": + version: 3.1.1 + resolution: "exponential-backoff@npm:3.1.1" + checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48 languageName: node linkType: hard @@ -4932,22 +5030,22 @@ __metadata: linkType: hard "fast-diff@npm:^1.1.2": - version: 1.2.0 - resolution: "fast-diff@npm:1.2.0" - checksum: 1b5306eaa9e826564d9e5ffcd6ebd881eb5f770b3f977fcbf38f05c824e42172b53c79920e8429c54eb742ce15a0caf268b0fdd5b38f6de52234c4a8368131ae + version: 1.3.0 + resolution: "fast-diff@npm:1.3.0" + checksum: d22d371b994fdc8cce9ff510d7b8dc4da70ac327bcba20df607dd5b9cae9f908f4d1028f5fe467650f058d1e7270235ae0b8230809a262b4df587a3b3aa216c3 languageName: node linkType: hard "fast-glob@npm:^3.0.3, fast-glob@npm:^3.2.9": - version: 3.2.11 - resolution: "fast-glob@npm:3.2.11" + version: 3.3.1 + resolution: "fast-glob@npm:3.3.1" dependencies: "@nodelib/fs.stat": ^2.0.2 "@nodelib/fs.walk": ^1.2.3 glob-parent: ^5.1.2 merge2: ^1.3.0 micromatch: ^4.0.4 - checksum: f473105324a7780a20c06de842e15ddbb41d3cb7e71d1e4fe6e8373204f22245d54f5ab9e2061e6a1c613047345954d29b022e0e76f5c28b1df9858179a0e6d7 + checksum: b6f3add6403e02cf3a798bfbb1183d0f6da2afd368f27456010c0bc1f9640aea308243d4cb2c0ab142f618276e65ecb8be1661d7c62a7b4e5ba774b9ce5432e5 languageName: node linkType: hard @@ -4966,20 +5064,20 @@ __metadata: linkType: hard "fastq@npm:^1.6.0": - version: 1.13.0 - resolution: "fastq@npm:1.13.0" + version: 1.15.0 + resolution: "fastq@npm:1.15.0" dependencies: reusify: ^1.0.4 - checksum: 32cf15c29afe622af187d12fc9cd93e160a0cb7c31a3bb6ace86b7dea3b28e7b72acde89c882663f307b2184e14782c6c664fa315973c03626c7d4bff070bb0b + checksum: 0170e6bfcd5d57a70412440b8ef600da6de3b2a6c5966aeaf0a852d542daff506a0ee92d6de7679d1de82e644bce69d7a574a6c93f0b03964b5337eed75ada1a languageName: node linkType: hard "fb-watchman@npm:^2.0.0": - version: 2.0.1 - resolution: "fb-watchman@npm:2.0.1" + version: 2.0.2 + resolution: "fb-watchman@npm:2.0.2" dependencies: bser: 2.1.1 - checksum: 8510230778ab3a51c27dffb1b76ef2c24fab672a42742d3c0a45c2e9d1e5f20210b1fbca33486088da4a9a3958bde96b5aec0a63aac9894b4e9df65c88b2cbd6 + checksum: b15a124cef28916fe07b400eb87cbc73ca082c142abf7ca8e8de6af43eca79ca7bd13eb4d4d48240b3bd3136eaac40d16e42d6edf87a8e5d1dd8070626860c78 languageName: node linkType: hard @@ -5138,9 +5236,9 @@ __metadata: linkType: hard "flatted@npm:^3.1.0": - version: 3.2.6 - resolution: "flatted@npm:3.2.6" - checksum: 33b87aa88dfa40ca6ee31d7df61712bbbad3d3c05c132c23e59b9b61d34631b337a18ff2b8dc5553acdc871ec72b741e485f78969cf006124a3f57174de29a0e + version: 3.2.7 + resolution: "flatted@npm:3.2.7" + checksum: 427633049d55bdb80201c68f7eb1cbd533e03eac541f97d3aecab8c5526f12a20ccecaeede08b57503e772c769e7f8680b37e8d482d1e5f8d7e2194687f9ea35 languageName: node linkType: hard @@ -5153,7 +5251,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.9": +"follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -5163,6 +5261,25 @@ __metadata: languageName: node linkType: hard +"for-each@npm:^0.3.3": + version: 0.3.3 + resolution: "for-each@npm:0.3.3" + dependencies: + is-callable: ^1.1.3 + checksum: 6c48ff2bc63362319c65e2edca4a8e1e3483a2fabc72fbe7feaf8c73db94fc7861bd53bc02c8a66a0c1dd709da6b04eec42e0abdd6b40ce47305ae92a25e5d28 + languageName: node + linkType: hard + +"foreground-child@npm:^3.1.0": + version: 3.1.1 + resolution: "foreground-child@npm:3.1.1" + dependencies: + cross-spawn: ^7.0.0 + signal-exit: ^4.0.1 + checksum: 139d270bc82dc9e6f8bc045fe2aae4001dc2472157044fdfad376d0a3457f77857fa883c1c8b21b491c6caade9a926a4bed3d3d2e8d3c9202b151a4cbbd0bcd5 + languageName: node + linkType: hard + "forever-agent@npm:~0.6.1": version: 0.6.1 resolution: "forever-agent@npm:0.6.1" @@ -5300,7 +5417,7 @@ __metadata: languageName: node linkType: hard -"fs-minipass@npm:^2.0.0, fs-minipass@npm:^2.1.0": +"fs-minipass@npm:^2.0.0": version: 2.1.0 resolution: "fs-minipass@npm:2.1.0" dependencies: @@ -5309,6 +5426,15 @@ __metadata: languageName: node linkType: hard +"fs-minipass@npm:^3.0.0": + version: 3.0.2 + resolution: "fs-minipass@npm:3.0.2" + dependencies: + minipass: ^5.0.0 + checksum: e9cc0e1f2d01c6f6f62f567aee59530aba65c6c7b2ae88c5027bc34c711ebcfcfaefd0caf254afa6adfe7d1fba16bc2537508a6235196bac7276747d078aef0a + languageName: node + linkType: hard + "fs-readdir-recursive@npm:^1.1.0": version: 1.1.0 resolution: "fs-readdir-recursive@npm:1.1.0" @@ -5323,7 +5449,7 @@ __metadata: languageName: node linkType: hard -"fsevents@^2.3.2, fsevents@~2.3.2": +"fsevents@npm:^2.3.2, fsevents@npm:~2.3.2": version: 2.3.2 resolution: "fsevents@npm:2.3.2" dependencies: @@ -5333,30 +5459,30 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin": - version: 2.3.2 - resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=df0bf1" +"fsevents@npm:~2.1.1": + version: 2.1.3 + resolution: "fsevents@npm:2.1.3" dependencies: node-gyp: latest + checksum: b5ec0516b44d75b60af5c01ff80a80cd995d175e4640d2a92fbabd02991dd664d76b241b65feef0775c23d531c3c74742c0fbacd6205af812a9c3cef59f04292 conditions: os=darwin languageName: node linkType: hard -"fsevents@patch:fsevents@~2.1.1#~builtin": - version: 2.1.3 - resolution: "fsevents@patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=31d12a" +"fsevents@patch:fsevents@^2.3.2#~builtin, fsevents@patch:fsevents@~2.3.2#~builtin": + version: 2.3.2 + resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin::version=2.3.2&hash=df0bf1" dependencies: node-gyp: latest conditions: os=darwin languageName: node linkType: hard -fsevents@~2.1.1: +"fsevents@patch:fsevents@~2.1.1#~builtin": version: 2.1.3 - resolution: "fsevents@npm:2.1.3" + resolution: "fsevents@patch:fsevents@npm%3A2.1.3#~builtin::version=2.1.3&hash=31d12a" dependencies: node-gyp: latest - checksum: b5ec0516b44d75b60af5c01ff80a80cd995d175e4640d2a92fbabd02991dd664d76b241b65feef0775c23d531c3c74742c0fbacd6205af812a9c3cef59f04292 conditions: os=darwin languageName: node linkType: hard @@ -5387,7 +5513,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"functions-have-names@npm:^1.2.2": +"functions-have-names@npm:^1.2.2, functions-have-names@npm:^1.2.3": version: 1.2.3 resolution: "functions-have-names@npm:1.2.3" checksum: c3f1f5ba20f4e962efb71344ce0a40722163e85bee2101ce25f88214e78182d2d2476aa85ef37950c579eb6cf6ee811c17b3101bb84004bb75655f3e33f3fdb5 @@ -5431,14 +5557,15 @@ fsevents@~2.1.1: languageName: node linkType: hard -"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.0, get-intrinsic@npm:^1.1.1": - version: 1.1.2 - resolution: "get-intrinsic@npm:1.1.2" +"get-intrinsic@npm:^1.0.2, get-intrinsic@npm:^1.1.1, get-intrinsic@npm:^1.1.3, get-intrinsic@npm:^1.2.0, get-intrinsic@npm:^1.2.1": + version: 1.2.1 + resolution: "get-intrinsic@npm:1.2.1" dependencies: function-bind: ^1.1.1 has: ^1.0.3 + has-proto: ^1.0.1 has-symbols: ^1.0.3 - checksum: 252f45491f2ba88ebf5b38018020c7cc3279de54b1d67ffb70c0cdf1dfa8ab31cd56467b5d117a8b4275b7a4dde91f86766b163a17a850f036528a7b2faafb2b + checksum: 5b61d88552c24b0cf6fa2d1b3bc5459d7306f699de060d76442cce49a4721f52b8c560a33ab392cf5575b7810277d54ded9d4d39a1ea61855619ebc005aa7e5f languageName: node linkType: hard @@ -5533,6 +5660,21 @@ fsevents@~2.1.1: languageName: node linkType: hard +"glob@npm:^10.2.2": + version: 10.3.3 + resolution: "glob@npm:10.3.3" + dependencies: + foreground-child: ^3.1.0 + jackspeak: ^2.0.3 + minimatch: ^9.0.1 + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + path-scurry: ^1.10.1 + bin: + glob: dist/cjs/src/bin.js + checksum: 29190d3291f422da0cb40b77a72fc8d2c51a36524e99b8bf412548b7676a6627489528b57250429612b6eec2e6fe7826d328451d3e694a9d15e575389308ec53 + languageName: node + linkType: hard + "glob@npm:^5.0.15": version: 5.0.15 resolution: "glob@npm:5.0.15" @@ -5560,19 +5702,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"glob@npm:^8.0.1": - version: 8.0.3 - resolution: "glob@npm:8.0.3" - dependencies: - fs.realpath: ^1.0.0 - inflight: ^1.0.4 - inherits: 2 - minimatch: ^5.0.1 - once: ^1.3.0 - checksum: 50bcdea19d8e79d8de5f460b1939ffc2b3299eac28deb502093fdca22a78efebc03e66bf54f0abc3d3d07d8134d19a32850288b7440d77e072aa55f9d33b18c5 - languageName: node - linkType: hard - "global-modules@npm:^2.0.0": version: 2.0.0 resolution: "global-modules@npm:2.0.0" @@ -5600,12 +5729,21 @@ fsevents@~2.1.1: languageName: node linkType: hard -"globals@npm:^13.15.0": - version: 13.16.0 - resolution: "globals@npm:13.16.0" +"globals@npm:^13.19.0, globals@npm:^13.6.0": + version: 13.20.0 + resolution: "globals@npm:13.20.0" dependencies: type-fest: ^0.20.2 - checksum: e571b28462b8922a29ac78c8df89848cfd5dc9bdd5d8077440c022864f512a4aae82e7561a2f366337daa86fd4b366aec16fd3f08686de387e4089b01be6cb14 + checksum: ad1ecf914bd051325faad281d02ea2c0b1df5d01bd94d368dcc5513340eac41d14b3c61af325768e3c7f8d44576e72780ec0b6f2d366121f8eec6e03c3a3b97a + languageName: node + linkType: hard + +"globalthis@npm:^1.0.3": + version: 1.0.3 + resolution: "globalthis@npm:1.0.3" + dependencies: + define-properties: ^1.1.3 + checksum: fbd7d760dc464c886d0196166d92e5ffb4c84d0730846d6621a39fbbc068aeeb9c8d1421ad330e94b7bca4bb4ea092f5f21f3d36077812af5d098b4dc006c998 languageName: node linkType: hard @@ -5625,7 +5763,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"globby@npm:^11.1.0": +"globby@npm:^11.0.4": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -5639,10 +5777,19 @@ fsevents@~2.1.1: languageName: node linkType: hard +"gopd@npm:^1.0.1": + version: 1.0.1 + resolution: "gopd@npm:1.0.1" + dependencies: + get-intrinsic: ^1.1.3 + checksum: a5ccfb8806e0917a94e0b3de2af2ea4979c1da920bc381667c260e00e7cafdbe844e2cb9c5bcfef4e5412e8bf73bab837285bc35c7ba73aaaf0134d4583393a6 + languageName: node + linkType: hard + "graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": - version: 4.2.10 - resolution: "graceful-fs@npm:4.2.10" - checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da + version: 4.2.11 + resolution: "graceful-fs@npm:4.2.11" + checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7 languageName: node linkType: hard @@ -5661,9 +5808,9 @@ fsevents@~2.1.1: linkType: hard "graphql@npm:^16.6.0": - version: 16.6.0 - resolution: "graphql@npm:16.6.0" - checksum: bf1d9e3c1938ce3c1a81e909bd3ead1ae4707c577f91cff1ca2eca474bfbc7873d5d7b942e1e9777ff5a8304421dba57a4b76d7a29eb19de8711cb70e3c2415e + version: 16.7.1 + resolution: "graphql@npm:16.7.1" + checksum: c924d8428daf0e96a5ea43e9bc3cd1b6802899907d284478ac8f705c8fd233a0a51eef915f7569fb5de8acb2e85b802ccc6c85c2b157ad805c1e9adba5a299bd languageName: node linkType: hard @@ -5710,20 +5857,21 @@ fsevents@~2.1.1: linkType: hard "hardhat-contract-sizer@npm:^2.4.0": - version: 2.6.1 - resolution: "hardhat-contract-sizer@npm:2.6.1" + version: 2.10.0 + resolution: "hardhat-contract-sizer@npm:2.10.0" dependencies: chalk: ^4.0.0 cli-table3: ^0.6.0 + strip-ansi: ^6.0.0 peerDependencies: hardhat: ^2.0.0 - checksum: a82ae2405a8571e8b0cd0a21dea9a10946b342f1ada04c72c9cbe28fca955f9a2b1394c70400003f388182298dc1de00e80bf56dbfa5e36833d3c93ab1f50c0c + checksum: 870e7cad5d96ad7288b64da0faec7962a9a18e1eaaa02ed474e4f9285cd4b1a0fc6f66326e6a7476f7063fdf99aee57f227084519b1fb3723700a2d65fc65cfa languageName: node linkType: hard "hardhat-deploy@npm:^0.11.14": - version: 0.11.30 - resolution: "hardhat-deploy@npm:0.11.30" + version: 0.11.34 + resolution: "hardhat-deploy@npm:0.11.34" dependencies: "@ethersproject/abi": ^5.7.0 "@ethersproject/abstract-signer": ^5.7.0 @@ -5749,26 +5897,26 @@ fsevents@~2.1.1: murmur-128: ^0.2.1 qs: ^6.9.4 zksync-web3: ^0.14.3 - checksum: 7b9ac9d856097be1df88ed86cbec88e5bdeb6258c7167c097d6ad4e80a1131b9288fc7704ff6457253f293f57c9992d83383f15ce8f22190d94966b8bb05d832 + checksum: 3c4bcd657a80e4f22c1f8bcee021e5277060849ce4180cbc721e0c2d625f2f98de8ebbfad23875d32eeaf06d88bdba06cb43ab29359cb9531e8bb7851a98ead1 languageName: node linkType: hard "hardhat-gas-reporter@npm:^1.0.8": - version: 1.0.8 - resolution: "hardhat-gas-reporter@npm:1.0.8" + version: 1.0.9 + resolution: "hardhat-gas-reporter@npm:1.0.9" dependencies: array-uniq: 1.0.3 - eth-gas-reporter: ^0.2.24 + eth-gas-reporter: ^0.2.25 sha1: ^1.1.1 peerDependencies: hardhat: ^2.0.2 - checksum: bf18aacd08e0bdef81b180f3c97f76fcab885de3e92ed2dc014712e671c83ee7f77755c0e6c0f923a95f8372714cfcb7cdaa019afc42984c159603f8a8d724cf + checksum: 77f8f8d085ff3d9d7787f0227e5355e1800f7d6707bc70171e0567bf69706703ae7f6f53dce1be1d409e7e71e3629a434c94b546bdbbc1e4c1af47cd5d0c6776 languageName: node linkType: hard "hardhat@npm:^2.12.3": - version: 2.14.0 - resolution: "hardhat@npm:2.14.0" + version: 2.17.0 + resolution: "hardhat@npm:2.17.0" dependencies: "@ethersproject/abi": ^5.1.2 "@metamask/eth-sig-util": ^4.0.0 @@ -5809,7 +5957,6 @@ fsevents@~2.1.1: mnemonist: ^0.38.0 mocha: ^10.0.0 p-map: ^4.0.0 - qs: ^6.7.0 raw-body: ^2.4.1 resolve: 1.17.0 semver: ^6.3.0 @@ -5830,7 +5977,7 @@ fsevents@~2.1.1: optional: true bin: hardhat: internal/cli/bootstrap.js - checksum: 7a11ad4650759851306d65c30252ccffa2aca9cb461c66f3fcef5f29d38fe66402d6bc295d293670fa0a72bf3572cc95029c5cd0b0fd45f45edd99d6eb5b7586 + checksum: fcbbee245069a9c3fd0b7f015bc7b99529d3b2be6b8c0c9a61d6a68e5eb2bece8d4f7a9a206808af8fa46a3f3f05df51571caa4e88d3ebbc977c0f16fdb0aafe languageName: node linkType: hard @@ -5871,7 +6018,14 @@ fsevents@~2.1.1: languageName: node linkType: hard -"has-symbols@npm:^1.0.0, has-symbols@npm:^1.0.1, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": +"has-proto@npm:^1.0.1": + version: 1.0.1 + resolution: "has-proto@npm:1.0.1" + checksum: febc5b5b531de8022806ad7407935e2135f1cc9e64636c3916c6842bd7995994ca3b29871ecd7954bd35f9e2986c17b3b227880484d22259e2f8e6ce63fd383e + languageName: node + linkType: hard + +"has-symbols@npm:^1.0.0, has-symbols@npm:^1.0.2, has-symbols@npm:^1.0.3": version: 1.0.3 resolution: "has-symbols@npm:1.0.3" checksum: a054c40c631c0d5741a8285010a0777ea0c068f99ed43e5d6eb12972da223f8af553a455132fdb0801bdcfa0e0f443c0c03a68d8555aa529b3144b446c3f2410 @@ -5973,10 +6127,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"http-cache-semantics@npm:^4.1.0": - version: 4.1.0 - resolution: "http-cache-semantics@npm:4.1.0" - checksum: 974de94a81c5474be07f269f9fd8383e92ebb5a448208223bfb39e172a9dbc26feff250192ecc23b9593b3f92098e010406b0f24bd4d588d631f80214648ed42 +"http-cache-semantics@npm:^4.1.1": + version: 4.1.1 + resolution: "http-cache-semantics@npm:4.1.1" + checksum: 83ac0bc60b17a3a36f9953e7be55e5c8f41acc61b22583060e8dedc9dd5e3607c823a88d0926f9150e571f90946835c7fe150732801010845c72cd8bbff1a236 languageName: node linkType: hard @@ -6091,17 +6245,17 @@ fsevents@~2.1.1: languageName: node linkType: hard -"ignore@npm:^5.1.1, ignore@npm:^5.2.0": - version: 5.2.0 - resolution: "ignore@npm:5.2.0" - checksum: 6b1f926792d614f64c6c83da3a1f9c83f6196c2839aa41e1e32dd7b8d174cef2e329d75caabb62cb61ce9dc432f75e67d07d122a037312db7caa73166a1bdb77 +"ignore@npm:^5.1.1, ignore@npm:^5.1.8, ignore@npm:^5.2.0": + version: 5.2.4 + resolution: "ignore@npm:5.2.4" + checksum: 3d4c309c6006e2621659311783eaea7ebcd41fe4ca1d78c91c473157ad6666a57a2df790fe0d07a12300d9aac2888204d7be8d59f9aaf665b1c7fcdb432517ef languageName: node linkType: hard "immutable@npm:^4.0.0-rc.12": - version: 4.1.0 - resolution: "immutable@npm:4.1.0" - checksum: b9bc1f14fb18eb382d48339c064b24a1f97ae4cf43102e0906c0a6e186a27afcd18b55ca4a0b63c98eefb58143e2b5ebc7755a5fb4da4a7ad84b7a6096ac5b13 + version: 4.3.1 + resolution: "immutable@npm:4.3.1" + checksum: a3a5ba29bd43f3f9a2e4d599763d7455d11a0ea57e50bf43f2836672fc80003e90d69f2a4f5b589f1f3d6986faf97f08ce1e253583740dd33c00adebab88b217 languageName: node linkType: hard @@ -6146,13 +6300,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"infer-owner@npm:^1.0.4": - version: 1.0.4 - resolution: "infer-owner@npm:1.0.4" - checksum: 181e732764e4a0611576466b4b87dac338972b839920b2a8cde43642e4ed6bd54dc1fb0b40874728f2a2df9a1b097b8ff83b56d5f8f8e3927f837fdcb47d8a89 - languageName: node - linkType: hard - "inflight@npm:^1.0.4": version: 1.0.6 resolution: "inflight@npm:1.0.6" @@ -6198,14 +6345,14 @@ fsevents@~2.1.1: languageName: node linkType: hard -"internal-slot@npm:^1.0.3": - version: 1.0.3 - resolution: "internal-slot@npm:1.0.3" +"internal-slot@npm:^1.0.5": + version: 1.0.5 + resolution: "internal-slot@npm:1.0.5" dependencies: - get-intrinsic: ^1.1.0 + get-intrinsic: ^1.2.0 has: ^1.0.3 side-channel: ^1.0.4 - checksum: 1944f92e981e47aebc98a88ff0db579fd90543d937806104d0b96557b10c1f170c51fb777b97740a8b6ddeec585fca8c39ae99fd08a8e058dfc8ab70937238bf + checksum: 97e84046bf9e7574d0956bd98d7162313ce7057883b6db6c5c7b5e5f05688864b0978ba07610c726d15d66544ffe4b1050107d93f8a39ebc59b15d8b429b497a languageName: node linkType: hard @@ -6225,10 +6372,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"ip@npm:^1.1.5": - version: 1.1.8 - resolution: "ip@npm:1.1.8" - checksum: a2ade53eb339fb0cbe9e69a44caab10d6e3784662285eb5d2677117ee4facc33a64679051c35e0dfdb1a3983a51ce2f5d2cb36446d52e10d01881789b76e28fb +"ip@npm:^2.0.0": + version: 2.0.0 + resolution: "ip@npm:2.0.0" + checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349 languageName: node linkType: hard @@ -6239,6 +6386,17 @@ fsevents@~2.1.1: languageName: node linkType: hard +"is-array-buffer@npm:^3.0.1, is-array-buffer@npm:^3.0.2": + version: 3.0.2 + resolution: "is-array-buffer@npm:3.0.2" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.0 + is-typed-array: ^1.1.10 + checksum: dcac9dda66ff17df9cabdc58214172bf41082f956eab30bb0d86bc0fab1e44b690fc8e1f855cf2481245caf4e8a5a006a982a71ddccec84032ed41f9d8da8c14 + languageName: node + linkType: hard + "is-arrayish@npm:^0.2.1": version: 0.2.1 resolution: "is-arrayish@npm:0.2.1" @@ -6281,19 +6439,19 @@ fsevents@~2.1.1: languageName: node linkType: hard -"is-callable@npm:^1.1.4, is-callable@npm:^1.2.4": - version: 1.2.4 - resolution: "is-callable@npm:1.2.4" - checksum: 1a28d57dc435797dae04b173b65d6d1e77d4f16276e9eff973f994eadcfdc30a017e6a597f092752a083c1103cceb56c91e3dadc6692fedb9898dfaba701575f +"is-callable@npm:^1.1.3, is-callable@npm:^1.1.4, is-callable@npm:^1.2.7": + version: 1.2.7 + resolution: "is-callable@npm:1.2.7" + checksum: 61fd57d03b0d984e2ed3720fb1c7a897827ea174bd44402878e059542ea8c4aeedee0ea0985998aa5cc2736b2fa6e271c08587addb5b3959ac52cf665173d1ac languageName: node linkType: hard -"is-core-module@npm:^2.8.1, is-core-module@npm:^2.9.0": - version: 2.9.0 - resolution: "is-core-module@npm:2.9.0" +"is-core-module@npm:^2.11.0, is-core-module@npm:^2.12.0, is-core-module@npm:^2.8.0": + version: 2.12.1 + resolution: "is-core-module@npm:2.12.1" dependencies: has: ^1.0.3 - checksum: b27034318b4b462f1c8f1dfb1b32baecd651d891a4e2d1922135daeff4141dfced2b82b07aef83ef54275c4a3526aa38da859223664d0868ca24182badb784ce + checksum: f04ea30533b5e62764e7b2e049d3157dc0abd95ef44275b32489ea2081176ac9746ffb1cdb107445cf1ff0e0dfcad522726ca27c27ece64dadf3795428b8e468 languageName: node linkType: hard @@ -6428,8 +6586,17 @@ fsevents@~2.1.1: version: 1.0.4 resolution: "is-symbol@npm:1.0.4" dependencies: - has-symbols: ^1.0.2 - checksum: 92805812ef590738d9de49d677cd17dfd486794773fb6fa0032d16452af46e9b91bb43ffe82c983570f015b37136f4b53b28b8523bfb10b0ece7a66c31a54510 + has-symbols: ^1.0.2 + checksum: 92805812ef590738d9de49d677cd17dfd486794773fb6fa0032d16452af46e9b91bb43ffe82c983570f015b37136f4b53b28b8523bfb10b0ece7a66c31a54510 + languageName: node + linkType: hard + +"is-typed-array@npm:^1.1.10, is-typed-array@npm:^1.1.9": + version: 1.1.12 + resolution: "is-typed-array@npm:1.1.12" + dependencies: + which-typed-array: ^1.1.11 + checksum: 4c89c4a3be07186caddadf92197b17fda663a9d259ea0d44a85f171558270d36059d1c386d34a12cba22dfade5aba497ce22778e866adc9406098c8fc4771796 languageName: node linkType: hard @@ -6472,6 +6639,13 @@ fsevents@~2.1.1: languageName: node linkType: hard +"isarray@npm:^2.0.5": + version: 2.0.5 + resolution: "isarray@npm:2.0.5" + checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a + languageName: node + linkType: hard + "isexe@npm:^2.0.0": version: 2.0.0 resolution: "isexe@npm:2.0.0" @@ -6514,27 +6688,40 @@ fsevents@~2.1.1: linkType: hard "istanbul-lib-instrument@npm:^5.0.4": - version: 5.2.0 - resolution: "istanbul-lib-instrument@npm:5.2.0" + version: 5.2.1 + resolution: "istanbul-lib-instrument@npm:5.2.1" dependencies: "@babel/core": ^7.12.3 "@babel/parser": ^7.14.7 "@istanbuljs/schema": ^0.1.2 istanbul-lib-coverage: ^3.2.0 semver: ^6.3.0 - checksum: 7c242ed782b6bf7b655656576afae8b6bd23dcc020e5fdc1472cca3dfb6ddb196a478385206d0df5219b9babf46ac4f21fea5d8ea9a431848b6cca6007012353 + checksum: bf16f1803ba5e51b28bbd49ed955a736488381e09375d830e42ddeb403855b2006f850711d95ad726f2ba3f1ae8e7366de7e51d2b9ac67dc4d80191ef7ddf272 languageName: node linkType: hard -"jest-diff@npm:^28.1.1": - version: 28.1.1 - resolution: "jest-diff@npm:28.1.1" +"jackspeak@npm:^2.0.3": + version: 2.2.2 + resolution: "jackspeak@npm:2.2.2" + dependencies: + "@isaacs/cliui": ^8.0.2 + "@pkgjs/parseargs": ^0.11.0 + dependenciesMeta: + "@pkgjs/parseargs": + optional: true + checksum: 7b1468dd910afc00642db87448f24b062346570b8b47531409aa9012bcb95fdf7ec2b1c48edbb8b57a938c08391f8cc01b5034fc335aa3a2e74dbcc0ee5c555a + languageName: node + linkType: hard + +"jest-diff@npm:^28.1.3": + version: 28.1.3 + resolution: "jest-diff@npm:28.1.3" dependencies: chalk: ^4.0.0 diff-sequences: ^28.1.1 jest-get-type: ^28.0.2 - pretty-format: ^28.1.1 - checksum: d9e0355880bee8728f7615ac0f03c66dcd4e93113935cca056a5f5a2f20ac2c7812aca6ad68e79bd1b11f2428748bd9123e6b1c7e51c93b4da3dfa5a875339f7 + pretty-format: ^28.1.3 + checksum: fa8583e0ccbe775714ce850b009be1b0f6b17a4b6759f33ff47adef27942ebc610dbbcc8a5f7cfb7f12b3b3b05afc9fb41d5f766674616025032ff1e4f9866e0 languageName: node linkType: hard @@ -6545,11 +6732,11 @@ fsevents@~2.1.1: languageName: node linkType: hard -"jest-haste-map@npm:^28.1.1": - version: 28.1.1 - resolution: "jest-haste-map@npm:28.1.1" +"jest-haste-map@npm:^28.1.3": + version: 28.1.3 + resolution: "jest-haste-map@npm:28.1.3" dependencies: - "@jest/types": ^28.1.1 + "@jest/types": ^28.1.3 "@types/graceful-fs": ^4.1.3 "@types/node": "*" anymatch: ^3.0.3 @@ -6557,43 +6744,43 @@ fsevents@~2.1.1: fsevents: ^2.3.2 graceful-fs: ^4.2.9 jest-regex-util: ^28.0.2 - jest-util: ^28.1.1 - jest-worker: ^28.1.1 + jest-util: ^28.1.3 + jest-worker: ^28.1.3 micromatch: ^4.0.4 walker: ^1.0.8 dependenciesMeta: fsevents: optional: true - checksum: db31a2a83906277d96b79017742c433c1573b322d061632a011fb1e184cf6f151f94134da09da7366e4477e8716f280efa676b4cc04a8544c13ce466a44102e8 + checksum: d05fdc108645fc2b39fcd4001952cc7a8cb550e93494e98c1e9ab1fc542686f6ac67177c132e564cf94fe8f81503f3f8db8b825b9b713dc8c5748aec63ba4688 languageName: node linkType: hard -"jest-matcher-utils@npm:^28.1.1": - version: 28.1.1 - resolution: "jest-matcher-utils@npm:28.1.1" +"jest-matcher-utils@npm:^28.1.3": + version: 28.1.3 + resolution: "jest-matcher-utils@npm:28.1.3" dependencies: chalk: ^4.0.0 - jest-diff: ^28.1.1 + jest-diff: ^28.1.3 jest-get-type: ^28.0.2 - pretty-format: ^28.1.1 - checksum: cb73ccd347638cd761ef7e0b606fbd71c115bd8febe29413f7b105fff6855d4356b8094c6b72393c5457db253b9c163498f188f25f9b6308c39c510e4c2886ee + pretty-format: ^28.1.3 + checksum: 6b34f0cf66f6781e92e3bec97bf27796bd2ba31121e5c5997218d9adba6deea38a30df5203937d6785b68023ed95cbad73663cc9aad6fb0cb59aeb5813a58daf languageName: node linkType: hard -"jest-message-util@npm:^28.1.1": - version: 28.1.1 - resolution: "jest-message-util@npm:28.1.1" +"jest-message-util@npm:^28.1.3": + version: 28.1.3 + resolution: "jest-message-util@npm:28.1.3" dependencies: "@babel/code-frame": ^7.12.13 - "@jest/types": ^28.1.1 + "@jest/types": ^28.1.3 "@types/stack-utils": ^2.0.0 chalk: ^4.0.0 graceful-fs: ^4.2.9 micromatch: ^4.0.4 - pretty-format: ^28.1.1 + pretty-format: ^28.1.3 slash: ^3.0.0 stack-utils: ^2.0.3 - checksum: cca23b9a0103c8fb7006a6d21e67a204fcac4289e1a3961450a4a1ad62eb37087c2a19a26337d3c0ea9f82c030a80dda79ac8ec34a18bf3fd5eca3fd55bef957 + checksum: 1f266854166dcc6900d75a88b54a25225a2f3710d463063ff1c99021569045c35c7d58557b25447a17eb3a65ce763b2f9b25550248b468a9d4657db365f39e96 languageName: node linkType: hard @@ -6605,58 +6792,58 @@ fsevents@~2.1.1: linkType: hard "jest-snapshot@npm:^28.1.1": - version: 28.1.2 - resolution: "jest-snapshot@npm:28.1.2" + version: 28.1.3 + resolution: "jest-snapshot@npm:28.1.3" dependencies: "@babel/core": ^7.11.6 "@babel/generator": ^7.7.2 "@babel/plugin-syntax-typescript": ^7.7.2 "@babel/traverse": ^7.7.2 "@babel/types": ^7.3.3 - "@jest/expect-utils": ^28.1.1 - "@jest/transform": ^28.1.2 - "@jest/types": ^28.1.1 + "@jest/expect-utils": ^28.1.3 + "@jest/transform": ^28.1.3 + "@jest/types": ^28.1.3 "@types/babel__traverse": ^7.0.6 "@types/prettier": ^2.1.5 babel-preset-current-node-syntax: ^1.0.0 chalk: ^4.0.0 - expect: ^28.1.1 + expect: ^28.1.3 graceful-fs: ^4.2.9 - jest-diff: ^28.1.1 + jest-diff: ^28.1.3 jest-get-type: ^28.0.2 - jest-haste-map: ^28.1.1 - jest-matcher-utils: ^28.1.1 - jest-message-util: ^28.1.1 - jest-util: ^28.1.1 + jest-haste-map: ^28.1.3 + jest-matcher-utils: ^28.1.3 + jest-message-util: ^28.1.3 + jest-util: ^28.1.3 natural-compare: ^1.4.0 - pretty-format: ^28.1.1 + pretty-format: ^28.1.3 semver: ^7.3.5 - checksum: 5c33c8b05d387d4fa4516556dc6fdeca4d7c0a1d48bfb31d05d5bf182988713800a35b0f7d4d9e40e3646edbde095aba36bb1b64a8d9bac40e34f76e90ddb482 + checksum: 2a46a5493f1fb50b0a236a21f25045e7f46a244f9f3ae37ef4fbcd40249d0d68bb20c950ce77439e4e2cac985b05c3061c90b34739bf6069913a1199c8c716e1 languageName: node linkType: hard -"jest-util@npm:^28.1.1": - version: 28.1.1 - resolution: "jest-util@npm:28.1.1" +"jest-util@npm:^28.1.1, jest-util@npm:^28.1.3": + version: 28.1.3 + resolution: "jest-util@npm:28.1.3" dependencies: - "@jest/types": ^28.1.1 + "@jest/types": ^28.1.3 "@types/node": "*" chalk: ^4.0.0 ci-info: ^3.2.0 graceful-fs: ^4.2.9 picomatch: ^2.2.3 - checksum: bca1601099d6a4c3c4ba997b8c035a698f23b9b04a0a284a427113f7d0399f7402ba9f4d73812328e6777bf952bf93dfe3d3edda6380a6ca27cdc02768d601e0 + checksum: fd6459742c941f070223f25e38a2ac0719aad92561591e9fb2a50d602a5d19d754750b79b4074327a42b00055662b95da3b006542ceb8b54309da44d4a62e721 languageName: node linkType: hard -"jest-worker@npm:^28.1.1": - version: 28.1.1 - resolution: "jest-worker@npm:28.1.1" +"jest-worker@npm:^28.1.3": + version: 28.1.3 + resolution: "jest-worker@npm:28.1.3" dependencies: "@types/node": "*" merge-stream: ^2.0.0 supports-color: ^8.0.0 - checksum: 28519c43b4007e60a3756d27f1e7884192ee9161b6a9587383a64b6535f820cc4868e351a67775e0feada41465f48ccf323a8db34ae87e15a512ddac5d1424b2 + checksum: e921c9a1b8f0909da9ea07dbf3592f95b653aef3a8bb0cbcd20fc7f9a795a1304adecac31eecb308992c167e8d7e75c522061fec38a5928ace0f9571c90169ca languageName: node linkType: hard @@ -6668,9 +6855,9 @@ fsevents@~2.1.1: linkType: hard "js-sdsl@npm:^4.1.4": - version: 4.4.0 - resolution: "js-sdsl@npm:4.4.0" - checksum: 7bb08a2d746ab7ff742720339aa006c631afe05e77d11eda988c1c35fae8e03e492e4e347e883e786e3ce6170685d4780c125619111f0730c11fdb41b04059c7 + version: 4.4.2 + resolution: "js-sdsl@npm:4.4.2" + checksum: ba705adc1788bf3c6f6c8e5077824f2bb4f0acab5a984420ce5cc492c7fff3daddc26335ad2c9a67d4f5e3241ec790f9e5b72a625adcf20cf321d2fd85e62b8b languageName: node linkType: hard @@ -6788,23 +6975,23 @@ fsevents@~2.1.1: languageName: node linkType: hard -"json5@npm:^1.0.1": - version: 1.0.1 - resolution: "json5@npm:1.0.1" +"json5@npm:^1.0.2": + version: 1.0.2 + resolution: "json5@npm:1.0.2" dependencies: minimist: ^1.2.0 bin: json5: lib/cli.js - checksum: e76ea23dbb8fc1348c143da628134a98adf4c5a4e8ea2adaa74a80c455fc2cdf0e2e13e6398ef819bfe92306b610ebb2002668ed9fc1af386d593691ef346fc3 + checksum: 866458a8c58a95a49bef3adba929c625e82532bcff1fe93f01d29cb02cac7c3fe1f4b79951b7792c2da9de0b32871a8401a6e3c5b36778ad852bf5b8a61165d7 languageName: node linkType: hard -"json5@npm:^2.2.1": - version: 2.2.1 - resolution: "json5@npm:2.2.1" +"json5@npm:^2.2.2": + version: 2.2.3 + resolution: "json5@npm:2.2.3" bin: json5: lib/cli.js - checksum: 74b8a23b102a6f2bf2d224797ae553a75488b5adbaee9c9b6e5ab8b510a2fc6e38f876d4c77dea672d4014a44b2399e15f2051ac2b37b87f74c0c7602003543b + checksum: 2a7436a93393830bce797d4626275152e37e877b265e94ca69c99e3d20c2b9dab021279146a39cdb700e71b2dd32a4cebd1514cd57cee102b1af906ce5040349 languageName: node linkType: hard @@ -6865,14 +7052,14 @@ fsevents@~2.1.1: linkType: hard "keccak@npm:^3.0.0, keccak@npm:^3.0.2": - version: 3.0.2 - resolution: "keccak@npm:3.0.2" + version: 3.0.3 + resolution: "keccak@npm:3.0.3" dependencies: node-addon-api: ^2.0.0 node-gyp: latest node-gyp-build: ^4.2.0 readable-stream: ^3.6.0 - checksum: 39a7d6128b8ee4cb7dcd186fc7e20c6087cc39f573a0f81b147c323f688f1f7c2b34f62c4ae189fe9b81c6730b2d1228d8a399cdc1f3d8a4c8f030cdc4f20272 + checksum: f08f04f5cc87013a3fc9e87262f761daff38945c86dd09c01a7f7930a15ae3e14f93b310ef821dcc83675a7b814eb1c983222399a2f263ad980251201d1b9a99 languageName: node linkType: hard @@ -7035,11 +7222,11 @@ fsevents@~2.1.1: linkType: hard "loupe@npm:^2.3.1": - version: 2.3.4 - resolution: "loupe@npm:2.3.4" + version: 2.3.6 + resolution: "loupe@npm:2.3.6" dependencies: get-func-name: ^2.0.0 - checksum: 5af91db61aa18530f1749a64735ee194ac263e65e9f4d1562bf3036c591f1baa948289c193e0e34c7b5e2c1b75d3c1dc4fce87f5edb3cee10b0c0df46bc9ffb3 + checksum: cc83f1b124a1df7384601d72d8d1f5fe95fd7a8185469fec48bb2e4027e45243949e7a013e8d91051a138451ff0552310c32aa9786e60b6a30d1e801bdc2163f languageName: node linkType: hard @@ -7062,9 +7249,16 @@ fsevents@~2.1.1: linkType: hard "lru-cache@npm:^7.7.1": - version: 7.12.0 - resolution: "lru-cache@npm:7.12.0" - checksum: fdb62262978393df7a4bd46a072bc5c3808c50ca5a347a82bb9459410efd841b7bae50655c3cf9004c70d12c756cf6d018f6bff155a16cdde9eba9a82899b5eb + version: 7.18.3 + resolution: "lru-cache@npm:7.18.3" + checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356 + languageName: node + linkType: hard + +"lru-cache@npm:^9.1.1 || ^10.0.0": + version: 10.0.0 + resolution: "lru-cache@npm:10.0.0" + checksum: 18f101675fe283bc09cda0ef1e3cc83781aeb8373b439f086f758d1d91b28730950db785999cd060d3c825a8571c03073e8c14512b6655af2188d623031baf50 languageName: node linkType: hard @@ -7082,27 +7276,26 @@ fsevents@~2.1.1: languageName: node linkType: hard -"make-fetch-happen@npm:^10.0.3": - version: 10.1.8 - resolution: "make-fetch-happen@npm:10.1.8" +"make-fetch-happen@npm:^11.0.3": + version: 11.1.1 + resolution: "make-fetch-happen@npm:11.1.1" dependencies: agentkeepalive: ^4.2.1 - cacache: ^16.1.0 - http-cache-semantics: ^4.1.0 + cacache: ^17.0.0 + http-cache-semantics: ^4.1.1 http-proxy-agent: ^5.0.0 https-proxy-agent: ^5.0.0 is-lambda: ^1.0.1 lru-cache: ^7.7.1 - minipass: ^3.1.6 - minipass-collect: ^1.0.2 - minipass-fetch: ^2.0.3 + minipass: ^5.0.0 + minipass-fetch: ^3.0.0 minipass-flush: ^1.0.5 minipass-pipeline: ^1.2.4 negotiator: ^0.6.3 promise-retry: ^2.0.1 socks-proxy-agent: ^7.0.0 - ssri: ^9.0.0 - checksum: 5fe9fd9da5368a8a4fe9a3ea5b9aa15f1e91c9ab703cd9027a6b33840ecc8a57c182fbe1c767c139330a88c46a448b1f00da5e32065cec373aff2450b3da54ee + ssri: ^10.0.0 + checksum: 7268bf274a0f6dcf0343829489a4506603ff34bd0649c12058753900b0eb29191dce5dba12680719a5d0a983d3e57810f594a12f3c18494e93a1fbc6348a4540 languageName: node linkType: hard @@ -7256,7 +7449,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"minimatch@npm:2 || 3, minimatch@npm:^3.0.4, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": +"minimatch@npm:2 || 3, minimatch@npm:^3.0.4, minimatch@npm:^3.0.5, minimatch@npm:^3.1.1, minimatch@npm:^3.1.2": version: 3.1.2 resolution: "minimatch@npm:3.1.2" dependencies: @@ -7283,19 +7476,19 @@ fsevents@~2.1.1: languageName: node linkType: hard -"minimatch@npm:^5.0.1": - version: 5.1.0 - resolution: "minimatch@npm:5.1.0" +"minimatch@npm:^9.0.1": + version: 9.0.3 + resolution: "minimatch@npm:9.0.3" dependencies: brace-expansion: ^2.0.1 - checksum: 15ce53d31a06361e8b7a629501b5c75491bc2b59712d53e802b1987121d91b433d73fcc5be92974fde66b2b51d8fb28d75a9ae900d249feb792bb1ba2a4f0a90 + checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5 languageName: node linkType: hard -"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6": - version: 1.2.6 - resolution: "minimist@npm:1.2.6" - checksum: d15428cd1e11eb14e1233bcfb88ae07ed7a147de251441d61158619dfb32c4d7e9061d09cab4825fdee18ecd6fce323228c8c47b5ba7cd20af378ca4048fb3fb +"minimist@npm:^1.2.0, minimist@npm:^1.2.5, minimist@npm:^1.2.6, minimist@npm:^1.2.7": + version: 1.2.8 + resolution: "minimist@npm:1.2.8" + checksum: 75a6d645fb122dad29c06a7597bddea977258957ed88d7a6df59b5cd3fe4a527e253e9bbf2e783e4b73657f9098b96a5fe96ab8a113655d4109108577ecf85b0 languageName: node linkType: hard @@ -7308,18 +7501,18 @@ fsevents@~2.1.1: languageName: node linkType: hard -"minipass-fetch@npm:^2.0.3": - version: 2.1.0 - resolution: "minipass-fetch@npm:2.1.0" +"minipass-fetch@npm:^3.0.0": + version: 3.0.3 + resolution: "minipass-fetch@npm:3.0.3" dependencies: encoding: ^0.1.13 - minipass: ^3.1.6 + minipass: ^5.0.0 minipass-sized: ^1.0.3 minizlib: ^2.1.2 dependenciesMeta: encoding: optional: true - checksum: 1334732859a3f7959ed22589bafd9c40384b885aebb5932328071c33f86b3eb181d54c86919675d1825ab5f1c8e4f328878c863873258d113c29d79a4b0c9c9f + checksum: af5ab2552a16fcf505d35fd7ffb84b57f4a0eeb269e6e1d9a2a75824dda48b36e527083250b7cca4a4def21d9544e2ade441e4730e233c0bc2133f6abda31e18 languageName: node linkType: hard @@ -7350,12 +7543,26 @@ fsevents@~2.1.1: languageName: node linkType: hard -"minipass@npm:^3.0.0, minipass@npm:^3.1.1, minipass@npm:^3.1.6": - version: 3.3.4 - resolution: "minipass@npm:3.3.4" +"minipass@npm:^3.0.0": + version: 3.3.6 + resolution: "minipass@npm:3.3.6" dependencies: yallist: ^4.0.0 - checksum: 5d95a7738c54852ba78d484141e850c792e062666a2d0c681a5ac1021275beb7e1acb077e59f9523ff1defb80901aea4e30fac10ded9a20a25d819a42916ef1b + checksum: a30d083c8054cee83cdcdc97f97e4641a3f58ae743970457b1489ce38ee1167b3aaf7d815cd39ec7a99b9c40397fd4f686e83750e73e652b21cb516f6d845e48 + languageName: node + linkType: hard + +"minipass@npm:^5.0.0": + version: 5.0.0 + resolution: "minipass@npm:5.0.0" + checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea + languageName: node + linkType: hard + +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0": + version: 7.0.2 + resolution: "minipass@npm:7.0.2" + checksum: 46776de732eb7cef2c7404a15fb28c41f5c54a22be50d47b03c605bf21f5c18d61a173c0a20b49a97e7a65f78d887245066410642551e45fffe04e9ac9e325bc languageName: node linkType: hard @@ -7462,8 +7669,8 @@ fsevents@~2.1.1: linkType: hard "mocha@npm:^10.0.0": - version: 10.1.0 - resolution: "mocha@npm:10.1.0" + version: 10.2.0 + resolution: "mocha@npm:10.2.0" dependencies: ansi-colors: 4.1.1 browser-stdout: 1.3.1 @@ -7489,7 +7696,7 @@ fsevents@~2.1.1: bin: _mocha: bin/_mocha mocha: bin/mocha.js - checksum: c64c7305769e09ae5559c1cd31eae8b4c7c0e19e328cf54d1374e5555a0f01e3d5dced99882911d927e0a9d0c613d0644a1750b848a2848fb7dcf4684f97f65f + checksum: 406c45eab122ffd6ea2003c2f108b2bc35ba036225eee78e0c784b6fa2c7f34e2b13f1dbacef55a4fdf523255d76e4f22d1b5aacda2394bd11666febec17c719 languageName: node linkType: hard @@ -7590,10 +7797,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"napi-macros@npm:~2.0.0": - version: 2.0.0 - resolution: "napi-macros@npm:2.0.0" - checksum: 30384819386977c1f82034757014163fa60ab3c5a538094f778d38788bebb52534966279956f796a92ea771c7f8ae072b975df65de910d051ffbdc927f62320c +"napi-macros@npm:^2.2.2": + version: 2.2.2 + resolution: "napi-macros@npm:2.2.2" + checksum: c6f9bd71cdbbc37ddc3535aa5be481238641d89585b8a3f4d301cb89abf459e2d294810432bb7d12056d1f9350b1a0899a5afcf460237a3da6c398cf0fec7629 languageName: node linkType: hard @@ -7653,21 +7860,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"node-fetch@npm:2.6.7": - version: 2.6.7 - resolution: "node-fetch@npm:2.6.7" - dependencies: - whatwg-url: ^5.0.0 - peerDependencies: - encoding: ^0.1.0 - peerDependenciesMeta: - encoding: - optional: true - checksum: 8d816ffd1ee22cab8301c7756ef04f3437f18dace86a1dae22cf81db8ef29c0bf6655f3215cb0cdb22b420b6fe141e64b26905e7f33f9377a7fa59135ea3e10b - languageName: node - linkType: hard - -"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1": +"node-fetch@npm:^2.6.0, node-fetch@npm:^2.6.1, node-fetch@npm:^2.6.12": version: 2.6.12 resolution: "node-fetch@npm:2.6.12" dependencies: @@ -7682,25 +7875,26 @@ fsevents@~2.1.1: linkType: hard "node-gyp-build@npm:^4.2.0, node-gyp-build@npm:^4.3.0": - version: 4.5.0 - resolution: "node-gyp-build@npm:4.5.0" + version: 4.6.0 + resolution: "node-gyp-build@npm:4.6.0" bin: node-gyp-build: bin.js node-gyp-build-optional: optional.js node-gyp-build-test: build-test.js - checksum: d888bae0fb88335f69af1b57a2294a931c5042f36e413d8d364c992c9ebfa0b96ffe773179a5a2c8f04b73856e8634e09cce108dbb9804396d3cc8c5455ff2db + checksum: 25d78c5ef1f8c24291f4a370c47ba52fcea14f39272041a90a7894cd50d766f7c8cb8fb06c0f42bf6f69b204b49d9be3c8fc344aac09714d5bdb95965499eb15 languageName: node linkType: hard "node-gyp@npm:latest": - version: 9.0.0 - resolution: "node-gyp@npm:9.0.0" + version: 9.4.0 + resolution: "node-gyp@npm:9.4.0" dependencies: env-paths: ^2.2.0 + exponential-backoff: ^3.1.1 glob: ^7.1.4 graceful-fs: ^4.2.6 - make-fetch-happen: ^10.0.3 - nopt: ^5.0.0 + make-fetch-happen: ^11.0.3 + nopt: ^6.0.0 npmlog: ^6.0.0 rimraf: ^3.0.2 semver: ^7.3.5 @@ -7708,7 +7902,7 @@ fsevents@~2.1.1: which: ^2.0.2 bin: node-gyp: bin/node-gyp.js - checksum: 4d8ef8860f7e4f4d86c91db3f519d26ed5cc23b48fe54543e2afd86162b4acbd14f21de42a5db344525efb69a991e021b96a68c70c6e2d5f4a5cb770793da6d3 + checksum: 78b404e2e0639d64e145845f7f5a3cb20c0520cdaf6dda2f6e025e9b644077202ea7de1232396ba5bde3fee84cdc79604feebe6ba3ec84d464c85d407bb5da99 languageName: node linkType: hard @@ -7719,17 +7913,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"node-releases@npm:^2.0.5": - version: 2.0.5 - resolution: "node-releases@npm:2.0.5" - checksum: e85d949addd19f8827f32569d2be5751e7812ccf6cc47879d49f79b5234ff4982225e39a3929315f96370823b070640fb04d79fc0ddec8b515a969a03493a42f - languageName: node - linkType: hard - -"nofilter@npm:^1.0.4": - version: 1.0.4 - resolution: "nofilter@npm:1.0.4" - checksum: 54d864f745de5c3312994e880cf2d4f55e34830d6adc8275dce3731507ca380d21040336e4a277a4901551c07f04c452fbeffd57fad1dc8f68a2943eaf894a04 +"node-releases@npm:^2.0.12": + version: 2.0.13 + resolution: "node-releases@npm:2.0.13" + checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3 languageName: node linkType: hard @@ -7751,14 +7938,14 @@ fsevents@~2.1.1: languageName: node linkType: hard -"nopt@npm:^5.0.0": - version: 5.0.0 - resolution: "nopt@npm:5.0.0" +"nopt@npm:^6.0.0": + version: 6.0.0 + resolution: "nopt@npm:6.0.0" dependencies: - abbrev: 1 + abbrev: ^1.0.0 bin: nopt: bin/nopt.js - checksum: d35fdec187269503843924e0114c0c6533fb54bbf1620d0f28b4b60ba01712d6687f62565c55cc20a504eff0fbe5c63e22340c3fad549ad40469ffb611b04f2f + checksum: 82149371f8be0c4b9ec2f863cc6509a7fd0fa729929c009f3a58e4eb0c9e4cae9920e8f1f8eb46e7d032fec8fb01bede7f0f41a67eb3553b7b8e14fa53de1dac languageName: node linkType: hard @@ -7805,10 +7992,10 @@ fsevents@~2.1.1: languageName: node linkType: hard -"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0": - version: 1.12.2 - resolution: "object-inspect@npm:1.12.2" - checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 +"object-inspect@npm:^1.12.3, object-inspect@npm:^1.9.0": + version: 1.12.3 + resolution: "object-inspect@npm:1.12.3" + checksum: dabfd824d97a5f407e6d5d24810d888859f6be394d8b733a77442b277e0808860555176719c5905e765e3743a7cada6b8b0a3b85e5331c530fd418cc8ae991db languageName: node linkType: hard @@ -7831,38 +8018,39 @@ fsevents@~2.1.1: languageName: node linkType: hard -"object.assign@npm:^4.1.2": - version: 4.1.2 - resolution: "object.assign@npm:4.1.2" +"object.assign@npm:^4.1.4": + version: 4.1.4 + resolution: "object.assign@npm:4.1.4" dependencies: - call-bind: ^1.0.0 - define-properties: ^1.1.3 - has-symbols: ^1.0.1 + call-bind: ^1.0.2 + define-properties: ^1.1.4 + has-symbols: ^1.0.3 object-keys: ^1.1.1 - checksum: d621d832ed7b16ac74027adb87196804a500d80d9aca536fccb7ba48d33a7e9306a75f94c1d29cbfa324bc091bfc530bc24789568efdaee6a47fcfa298993814 + checksum: 76cab513a5999acbfe0ff355f15a6a125e71805fcf53de4e9d4e082e1989bdb81d1e329291e1e4e0ae7719f0e4ef80e88fb2d367ae60500d79d25a6224ac8864 languageName: node linkType: hard "object.getownpropertydescriptors@npm:^2.0.3": - version: 2.1.4 - resolution: "object.getownpropertydescriptors@npm:2.1.4" + version: 2.1.6 + resolution: "object.getownpropertydescriptors@npm:2.1.6" dependencies: - array.prototype.reduce: ^1.0.4 + array.prototype.reduce: ^1.0.5 call-bind: ^1.0.2 - define-properties: ^1.1.4 - es-abstract: ^1.20.1 - checksum: 988c466fe49fc4f19a28d2d1d894c95c6abfe33c94674ec0b14d96eed71f453c7ad16873d430dc2acbb1760de6d3d2affac4b81237a306012cc4dc49f7539e7f + define-properties: ^1.2.0 + es-abstract: ^1.21.2 + safe-array-concat: ^1.0.0 + checksum: 7757ce0ef61c8bee7f8043f8980fd3d46fc1ab3faf0795bd1f9f836781143b4afc91f7219a3eed4675fbd0b562f3708f7e736d679ebfd43ea37ab6077d9f5004 languageName: node linkType: hard "object.values@npm:^1.1.5": - version: 1.1.5 - resolution: "object.values@npm:1.1.5" + version: 1.1.6 + resolution: "object.values@npm:1.1.6" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - es-abstract: ^1.19.1 - checksum: 0f17e99741ebfbd0fa55ce942f6184743d3070c61bd39221afc929c8422c4907618c8da694c6915bc04a83ab3224260c779ba37fc07bb668bdc5f33b66a902a4 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: f6fff9fd817c24cfd8107f50fb33061d81cd11bacc4e3dbb3852e9ff7692fde4dbce823d4333ea27cd9637ef1b6690df5fbb61f1ed314fa2959598dc3ae23d8e languageName: node linkType: hard @@ -7926,16 +8114,16 @@ fsevents@~2.1.1: linkType: hard "optionator@npm:^0.9.1": - version: 0.9.1 - resolution: "optionator@npm:0.9.1" + version: 0.9.3 + resolution: "optionator@npm:0.9.3" dependencies: + "@aashutoshrathi/word-wrap": ^1.2.3 deep-is: ^0.1.3 fast-levenshtein: ^2.0.6 levn: ^0.4.1 prelude-ls: ^1.2.1 type-check: ^0.4.0 - word-wrap: ^1.2.3 - checksum: dbc6fa065604b24ea57d734261914e697bd73b69eff7f18e967e8912aa2a40a19a9f599a507fa805be6c13c24c4eae8c71306c239d517d42d4c041c942f508a0 + checksum: 09281999441f2fe9c33a5eeab76700795365a061563d66b098923eb719251a42bdbe432790d35064d0816ead9296dbeb1ad51a733edf4167c96bd5d0882e428a languageName: node linkType: hard @@ -8121,6 +8309,16 @@ fsevents@~2.1.1: languageName: node linkType: hard +"path-scurry@npm:^1.10.1": + version: 1.10.1 + resolution: "path-scurry@npm:1.10.1" + dependencies: + lru-cache: ^9.1.1 || ^10.0.0 + minipass: ^5.0.0 || ^6.0.2 || ^7.0.0 + checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90 + languageName: node + linkType: hard + "path-to-regexp@npm:0.1.7": version: 0.1.7 resolution: "path-to-regexp@npm:0.1.7" @@ -8184,22 +8382,9 @@ fsevents@~2.1.1: linkType: hard "pirates@npm:^4.0.4": - version: 4.0.5 - resolution: "pirates@npm:4.0.5" - checksum: c9994e61b85260bec6c4fc0307016340d9b0c4f4b6550a957afaaff0c9b1ad58fbbea5cfcf083860a25cb27a375442e2b0edf52e2e1e40e69934e08dcc52d227 - languageName: node - linkType: hard - -"platform-deploy-client@npm:^0.3.2": - version: 0.3.3 - resolution: "platform-deploy-client@npm:0.3.3" - dependencies: - "@ethersproject/abi": ^5.6.3 - axios: ^0.21.2 - defender-base-client: ^1.40.0 - lodash: ^4.17.19 - node-fetch: ^2.6.0 - checksum: 2e3385497e009e74633eac9755d492d1372ed4cf54141949959812c6c3c793bab2dbdb494524c520d3886d201107c4227f0aa10300fa5db2914e3ea1425b3121 + version: 4.0.6 + resolution: "pirates@npm:4.0.6" + checksum: 46a65fefaf19c6f57460388a5af9ab81e3d7fd0e7bc44ca59d753cb5c4d0df97c6c6e583674869762101836d68675f027d60f841c105d72734df9dfca97cbcc6 languageName: node linkType: hard @@ -8226,19 +8411,19 @@ fsevents@~2.1.1: languageName: node linkType: hard -"prettier-plugin-solidity@npm:^1.0.0-beta.13": - version: 1.0.0-dev.21 - resolution: "prettier-plugin-solidity@npm:1.0.0-dev.21" +"prettier-plugin-solidity@npm:1.0.0-beta.13": + version: 1.0.0-beta.13 + resolution: "prettier-plugin-solidity@npm:1.0.0-beta.13" dependencies: - "@solidity-parser/parser": ^0.14.1 - emoji-regex: ^10.0.0 + "@solidity-parser/parser": ^0.13.2 + emoji-regex: ^9.2.2 escape-string-regexp: ^4.0.0 semver: ^7.3.5 solidity-comments-extractor: ^0.0.7 - string-width: ^4.2.3 + string-width: ^4.2.2 peerDependencies: prettier: ^2.3.0 - checksum: 3c43bb7404c380091310e59be718ec0161d268e4674e5e658723f7a7bc9b0f541df9816a8e7bd93b9e73a289f1e13ea1eab58027d4ee51d25460ea6e63c0c99e + checksum: 253de4255f3e9f64b88dbc2a2d8de595090ff10eb9dca845b58632d9ce71d23f5e1954864d0e5542a34d103aa0f4d1a1a9267a7a7dea3e5dfbe41f1f7bf9cbcf languageName: node linkType: hard @@ -8261,23 +8446,23 @@ fsevents@~2.1.1: linkType: hard "prettier@npm:^2.1.2": - version: 2.7.1 - resolution: "prettier@npm:2.7.1" + version: 2.8.8 + resolution: "prettier@npm:2.8.8" bin: prettier: bin-prettier.js - checksum: 55a4409182260866ab31284d929b3cb961e5fdb91fe0d2e099dac92eaecec890f36e524b4c19e6ceae839c99c6d7195817579cdffc8e2c80da0cb794463a748b + checksum: b49e409431bf129dd89238d64299ba80717b57ff5a6d1c1a8b1a28b590d998a34e083fa13573bc732bb8d2305becb4c9a4407f8486c81fa7d55100eb08263cf8 languageName: node linkType: hard -"pretty-format@npm:^28.1.1": - version: 28.1.1 - resolution: "pretty-format@npm:28.1.1" +"pretty-format@npm:^28.1.3": + version: 28.1.3 + resolution: "pretty-format@npm:28.1.3" dependencies: - "@jest/schemas": ^28.0.2 + "@jest/schemas": ^28.1.3 ansi-regex: ^5.0.1 ansi-styles: ^5.0.0 react-is: ^18.0.0 - checksum: 7fde4e2d6fd57cef8cf2fa9d5560cc62126de481f09c65dccfe89a3e6158a04355cff278853ace07fdf7f2f48c3d77877c00c47d7d3c1c028dcff5c322300d79 + checksum: e69f857358a3e03d271252d7524bec758c35e44680287f36c1cb905187fbc82da9981a6eb07edfd8a03bc3cbeebfa6f5234c13a3d5b59f2bbdf9b4c4053e0a7f languageName: node linkType: hard @@ -8295,13 +8480,6 @@ fsevents@~2.1.1: languageName: node linkType: hard -"promise-inflight@npm:^1.0.1": - version: 1.0.1 - resolution: "promise-inflight@npm:1.0.1" - checksum: 22749483091d2c594261517f4f80e05226d4d5ecc1fc917e1886929da56e22b5718b7f2a75f3807e7a7d471bc3be2907fe92e6e8f373ddf5c64bae35b5af3981 - languageName: node - linkType: hard - "promise-retry@npm:^2.0.1": version: 2.0.1 resolution: "promise-retry@npm:2.0.1" @@ -8313,11 +8491,11 @@ fsevents@~2.1.1: linkType: hard "promise@npm:^8.0.0": - version: 8.1.0 - resolution: "promise@npm:8.1.0" + version: 8.3.0 + resolution: "promise@npm:8.3.0" dependencies: asap: ~2.0.6 - checksum: 89b71a56154ed7d66a73236d8e8351a9c59adddba3929ecc845f75421ff37fc08ea0c67ad76cd5c0b0d81812c7d07a32bed27e7df5fcc960c6d68b0c1cd771f7 + checksum: a69f0ddbddf78ffc529cffee7ad950d307347615970564b17988ce43fbe767af5c738a9439660b24a9a8cbea106c0dcbb6c2b20e23b7e96a8e89e5c2679e94d5 languageName: node linkType: hard @@ -8352,6 +8530,13 @@ fsevents@~2.1.1: languageName: node linkType: hard +"proxy-from-env@npm:^1.1.0": + version: 1.1.0 + resolution: "proxy-from-env@npm:1.1.0" + checksum: ed7fcc2ba0a33404958e34d95d18638249a68c430e30fcb6c478497d72739ba64ce9810a24f53a7d921d0c065e5b78e3822759800698167256b04659366ca4d4 + languageName: node + linkType: hard + "psl@npm:^1.1.28": version: 1.9.0 resolution: "psl@npm:1.9.0" @@ -8360,16 +8545,16 @@ fsevents@~2.1.1: linkType: hard "punycode@npm:^2.1.0, punycode@npm:^2.1.1": - version: 2.1.1 - resolution: "punycode@npm:2.1.1" - checksum: 823bf443c6dd14f669984dea25757b37993f67e8d94698996064035edd43bed8a5a17a9f12e439c2b35df1078c6bec05a6c86e336209eb1061e8025c481168e8 + version: 2.3.0 + resolution: "punycode@npm:2.3.0" + checksum: 39f760e09a2a3bbfe8f5287cf733ecdad69d6af2fe6f97ca95f24b8921858b91e9ea3c9eeec6e08cede96181b3bb33f95c6ffd8c77e63986508aa2e8159fa200 languageName: node linkType: hard "pure-rand@npm:^5.0.1": - version: 5.0.1 - resolution: "pure-rand@npm:5.0.1" - checksum: 2b05a6d80163308583a013fab8d7f7f2958a6f77895680c99d8c3ea1f3e49ac273716a59cb1777cfc370540df53e6dc017e46c70a869da81fe490b2e6703d77d + version: 5.0.5 + resolution: "pure-rand@npm:5.0.5" + checksum: 824b906f7f66695c15ed9a898ff650e925723515e999de0360b0726ebad924ce41a74cc2ac60409dc6c55f5781008855f32ecd0fe0a1f40fbce293d48bd11dd1 languageName: node linkType: hard @@ -8382,7 +8567,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"qs@npm:^6.4.0, qs@npm:^6.7.0, qs@npm:^6.9.4": +"qs@npm:^6.4.0, qs@npm:^6.9.4": version: 6.11.2 resolution: "qs@npm:6.11.2" dependencies: @@ -8421,7 +8606,7 @@ fsevents@~2.1.1: languageName: node linkType: hard -"raw-body@npm:2.5.1, raw-body@npm:^2.4.1": +"raw-body@npm:2.5.1": version: 2.5.1 resolution: "raw-body@npm:2.5.1" dependencies: @@ -8433,6 +8618,18 @@ fsevents@~2.1.1: languageName: node linkType: hard +"raw-body@npm:^2.4.1": + version: 2.5.2 + resolution: "raw-body@npm:2.5.2" + dependencies: + bytes: 3.1.2 + http-errors: 2.0.0 + iconv-lite: 0.4.24 + unpipe: 1.0.0 + checksum: ba1583c8d8a48e8fbb7a873fdbb2df66ea4ff83775421bfe21ee120140949ab048200668c47d9ae3880012f6e217052690628cf679ddfbd82c9fc9358d574676 + languageName: node + linkType: hard + "react-is@npm:^18.0.0": version: 18.2.0 resolution: "react-is@npm:18.2.0" @@ -8441,8 +8638,8 @@ fsevents@~2.1.1: linkType: hard "readable-stream@npm:^2.2.2": - version: 2.3.7 - resolution: "readable-stream@npm:2.3.7" + version: 2.3.8 + resolution: "readable-stream@npm:2.3.8" dependencies: core-util-is: ~1.0.0 inherits: ~2.0.3 @@ -8451,18 +8648,18 @@ fsevents@~2.1.1: safe-buffer: ~5.1.1 string_decoder: ~1.1.1 util-deprecate: ~1.0.1 - checksum: e4920cf7549a60f8aaf694d483a0e61b2a878b969d224f89b3bc788b8d920075132c4b55a7494ee944c7b6a9a0eada28a7f6220d80b0312ece70bbf08eeca755 + checksum: 65645467038704f0c8aaf026a72fbb588a9e2ef7a75cd57a01702ee9db1c4a1e4b03aaad36861a6a0926546a74d174149c8c207527963e0c2d3eee2f37678a42 languageName: node linkType: hard "readable-stream@npm:^3.6.0": - version: 3.6.0 - resolution: "readable-stream@npm:3.6.0" + version: 3.6.2 + resolution: "readable-stream@npm:3.6.2" dependencies: inherits: ^2.0.3 string_decoder: ^1.1.1 util-deprecate: ^1.0.1 - checksum: d4ea81502d3799439bb955a3a5d1d808592cf3133350ed352aeaa499647858b27b1c4013984900238b0873ec8d0d8defce72469fb7a83e61d53f5ad61cb80dc8 + checksum: bdcbe6c22e846b6af075e32cf8f4751c2576238c5043169a1c221c92ee2878458a816a4ea33f4c67623c0b6827c8a400409bfb3cf0bf3381392d0b1dfb52ac8d languageName: node linkType: hard @@ -8494,22 +8691,22 @@ fsevents@~2.1.1: linkType: hard "recursive-readdir@npm:^2.2.2": - version: 2.2.2 - resolution: "recursive-readdir@npm:2.2.2" + version: 2.2.3 + resolution: "recursive-readdir@npm:2.2.3" dependencies: - minimatch: 3.0.4 - checksum: a6b22994d76458443d4a27f5fd7147ac63ad31bba972666a291d511d4d819ee40ff71ba7524c14f6a565b8cfaf7f48b318f971804b913cf538d58f04e25d1fee + minimatch: ^3.0.5 + checksum: 88ec96e276237290607edc0872b4f9842837b95cfde0cdbb1e00ba9623dfdf3514d44cdd14496ab60a0c2dd180a6ef8a3f1c34599e6cf2273afac9b72a6fb2b5 languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.4.3": - version: 1.4.3 - resolution: "regexp.prototype.flags@npm:1.4.3" +"regexp.prototype.flags@npm:^1.5.0": + version: 1.5.0 + resolution: "regexp.prototype.flags@npm:1.5.0" dependencies: call-bind: ^1.0.2 - define-properties: ^1.1.3 - functions-have-names: ^1.2.2 - checksum: 51228bae732592adb3ededd5e15426be25f289e9c4ef15212f4da73f4ec3919b6140806374b8894036a86020d054a8d2657d3fee6bb9b4d35d8939c20030b7a6 + define-properties: ^1.2.0 + functions-have-names: ^1.2.3 + checksum: c541687cdbdfff1b9a07f6e44879f82c66bbf07665f9a7544c5fd16acdb3ec8d1436caab01662d2fbcad403f3499d49ab0b77fbc7ef29ef961d98cc4bc9755b4 languageName: node linkType: hard @@ -8641,21 +8838,21 @@ fsevents@~2.1.1: "@types/lodash": ^4.14.177 "@types/mocha": ^9.0.0 "@types/node": ^12.20.37 - "@typescript-eslint/eslint-plugin": ^5.17.0 - "@typescript-eslint/parser": ^5.17.0 + "@typescript-eslint/eslint-plugin": 5.17.0 + "@typescript-eslint/parser": 5.17.0 axios: ^0.24.0 bignumber.js: ^9.1.1 caip: ^1.1.0 chai: ^4.3.4 decimal.js: ^10.4.3 dotenv: ^16.0.0 - eslint: ^8.14.0 - eslint-config-prettier: ^8.5.0 - eslint-config-standard: ^16.0.3 - eslint-plugin-import: ^2.25.4 - eslint-plugin-node: ^11.1.0 - eslint-plugin-prettier: ^4.0.0 - eslint-plugin-promise: ^6.0.0 + eslint: 8.14.0 + eslint-config-prettier: 8.5.0 + eslint-config-standard: 16.0.3 + eslint-plugin-import: 2.25.4 + eslint-plugin-node: 11.1.0 + eslint-plugin-prettier: 4.0.0 + eslint-plugin-promise: 6.0.0 eth-permit: ^0.2.1 ethers: ^5.7.2 fast-check: ^2.24.0 @@ -8670,9 +8867,9 @@ fsevents@~2.1.1: lodash.get: ^4.4.2 mocha-chai-jest-snapshot: ^1.1.3 prettier: 2.5.1 - prettier-plugin-solidity: ^1.0.0-beta.13 - solhint: ^3.3.6 - solhint-plugin-prettier: ^0.0.5 + prettier-plugin-solidity: 1.0.0-beta.13 + solhint: 3.3.6 + solhint-plugin-prettier: 0.0.5 solidity-coverage: ^0.8.2 ts-node: ^10.4.0 tsconfig-paths: ^4.1.0 @@ -8703,14 +8900,14 @@ fsevents@~2.1.1: languageName: node linkType: hard -resolve@1.1.x: +"resolve@npm:1.1.x": version: 1.1.7 resolution: "resolve@npm:1.1.7" checksum: afd20873fbde7641c9125efe3f940c2a99f6b1f90f1b7b743e744bdaac1cb105b2e4e0317bcc052ed7e31d57afa86b394a4dc9a1b33a297977be134fdf0250ab languageName: node linkType: hard -resolve@1.17.0: +"resolve@npm:1.17.0": version: 1.17.0 resolution: "resolve@npm:1.17.0" dependencies: @@ -8719,16 +8916,16 @@ resolve@1.17.0: languageName: node linkType: hard -"resolve@^1.1.6, resolve@^1.10.1, resolve@^1.20.0, resolve@^1.22.0": - version: 1.22.1 - resolution: "resolve@npm:1.22.1" +"resolve@npm:^1.1.6, resolve@npm:^1.10.1, resolve@npm:^1.20.0, resolve@npm:^1.22.1": + version: 1.22.3 + resolution: "resolve@npm:1.22.3" dependencies: - is-core-module: ^2.9.0 + is-core-module: ^2.12.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: 07af5fc1e81aa1d866cbc9e9460fbb67318a10fa3c4deadc35c3ad8a898ee9a71a86a65e4755ac3195e0ea0cfbe201eb323ebe655ce90526fd61917313a34e4e + checksum: fb834b81348428cb545ff1b828a72ea28feb5a97c026a1cf40aa1008352c72811ff4d4e71f2035273dc536dcfcae20c13604ba6283c612d70fa0b6e44519c374 languageName: node linkType: hard @@ -8748,16 +8945,16 @@ resolve@1.17.0: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.1#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.0#~builtin": - version: 1.22.1 - resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin::version=1.22.1&hash=c3c19d" +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.10.1#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.22.1#~builtin": + version: 1.22.3 + resolution: "resolve@patch:resolve@npm%3A1.22.3#~builtin::version=1.22.3&hash=c3c19d" dependencies: - is-core-module: ^2.9.0 + is-core-module: ^2.12.0 path-parse: ^1.0.7 supports-preserve-symlinks-flag: ^1.0.0 bin: resolve: bin/resolve - checksum: 5656f4d0bedcf8eb52685c1abdf8fbe73a1603bb1160a24d716e27a57f6cecbe2432ff9c89c2bd57542c3a7b9d14b1882b73bfe2e9d7849c9a4c0b8b39f02b8b + checksum: ad59734723b596d0891321c951592ed9015a77ce84907f89c9d9307dd0c06e11a67906a3e628c4cae143d3e44898603478af0ddeb2bba3f229a9373efe342665 languageName: node linkType: hard @@ -8887,6 +9084,18 @@ resolve@1.17.0: languageName: node linkType: hard +"safe-array-concat@npm:^1.0.0": + version: 1.0.0 + resolution: "safe-array-concat@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.0 + has-symbols: ^1.0.3 + isarray: ^2.0.5 + checksum: f43cb98fe3b566327d0c09284de2b15fb85ae964a89495c1b1a5d50c7c8ed484190f4e5e71aacc167e16231940079b326f2c0807aea633d47cc7322f40a6b57f + languageName: node + linkType: hard + "safe-buffer@npm:5.2.1, safe-buffer@npm:^5.0.1, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:^5.1.2, safe-buffer@npm:^5.2.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" @@ -8901,6 +9110,17 @@ resolve@1.17.0: languageName: node linkType: hard +"safe-regex-test@npm:^1.0.0": + version: 1.0.0 + resolution: "safe-regex-test@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.1.3 + is-regex: ^1.1.4 + checksum: bc566d8beb8b43c01b94e67de3f070fd2781685e835959bbbaaec91cc53381145ca91f69bd837ce6ec244817afa0a5e974fc4e40a2957f0aca68ac3add1ddd34 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0, safer-buffer@npm:^2.0.2, safer-buffer@npm:^2.1.0, safer-buffer@npm:~2.1.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -8959,31 +9179,31 @@ resolve@1.17.0: linkType: hard "semver@npm:^5.5.0, semver@npm:^5.5.1, semver@npm:^5.7.0": - version: 5.7.1 - resolution: "semver@npm:5.7.1" + version: 5.7.2 + resolution: "semver@npm:5.7.2" bin: - semver: ./bin/semver - checksum: 57fd0acfd0bac382ee87cd52cd0aaa5af086a7dc8d60379dfe65fea491fb2489b6016400813930ecd61fd0952dae75c115287a1b16c234b1550887117744dfaf + semver: bin/semver + checksum: fb4ab5e0dd1c22ce0c937ea390b4a822147a9c53dbd2a9a0132f12fe382902beef4fbf12cf51bb955248d8d15874ce8cd89532569756384f994309825f10b686 languageName: node linkType: hard -"semver@npm:^6.1.0, semver@npm:^6.3.0": - version: 6.3.0 - resolution: "semver@npm:6.3.0" +"semver@npm:^6.1.0, semver@npm:^6.3.0, semver@npm:^6.3.1": + version: 6.3.1 + resolution: "semver@npm:6.3.1" bin: - semver: ./bin/semver.js - checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9 + semver: bin/semver.js + checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2 languageName: node linkType: hard -"semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.3.7": - version: 7.3.7 - resolution: "semver@npm:7.3.7" +"semver@npm:^7.3.4, semver@npm:^7.3.5": + version: 7.5.4 + resolution: "semver@npm:7.5.4" dependencies: lru-cache: ^6.0.0 bin: semver: bin/semver.js - checksum: 2fa3e877568cd6ce769c75c211beaed1f9fce80b28338cadd9d0b6c40f2e2862bafd62c19a6cff42f3d54292b7c623277bcab8816a2b5521cf15210d43e75232 + checksum: 12d8ad952fa353b0995bf180cdac205a4068b759a140e5d3c608317098b3575ac2f1e09182206bf2eb26120e1c0ed8fb92c48c592f6099680de56bb071423ca3 languageName: node linkType: hard @@ -9142,6 +9362,13 @@ resolve@1.17.0: languageName: node linkType: hard +"signal-exit@npm:^4.0.1": + version: 4.0.2 + resolution: "signal-exit@npm:4.0.2" + checksum: 41f5928431cc6e91087bf0343db786a6313dd7c6fd7e551dbc141c95bb5fb26663444fd9df8ea47c5d7fc202f60aa7468c3162a9365cbb0615fc5e1b1328fe31 + languageName: node + linkType: hard + "sisteransi@npm:^1.0.5": version: 1.0.5 resolution: "sisteransi@npm:1.0.5" @@ -9197,12 +9424,12 @@ resolve@1.17.0: linkType: hard "socks@npm:^2.6.2": - version: 2.6.2 - resolution: "socks@npm:2.6.2" + version: 2.7.1 + resolution: "socks@npm:2.7.1" dependencies: - ip: ^1.1.5 + ip: ^2.0.0 smart-buffer: ^4.2.0 - checksum: dd9194293059d737759d5c69273850ad4149f448426249325c4bea0e340d1cf3d266c3b022694b0dcf5d31f759de23657244c481fc1e8322add80b7985c36b5e + checksum: 259d9e3e8e1c9809a7f5c32238c3d4d2a36b39b83851d0f573bfde5f21c4b1288417ce1af06af1452569cd1eb0841169afd4998f0e04ba04656f6b7f0e46d748 languageName: node linkType: hard @@ -9225,7 +9452,7 @@ resolve@1.17.0: languageName: node linkType: hard -"solhint-plugin-prettier@npm:^0.0.5": +"solhint-plugin-prettier@npm:0.0.5": version: 0.0.5 resolution: "solhint-plugin-prettier@npm:0.0.5" dependencies: @@ -9237,11 +9464,11 @@ resolve@1.17.0: languageName: node linkType: hard -"solhint@npm:^3.3.6": - version: 3.3.7 - resolution: "solhint@npm:3.3.7" +"solhint@npm:3.3.6": + version: 3.3.6 + resolution: "solhint@npm:3.3.6" dependencies: - "@solidity-parser/parser": ^0.14.1 + "@solidity-parser/parser": ^0.13.2 ajv: ^6.6.1 antlr4: 4.7.1 ast-parents: 0.0.1 @@ -9261,14 +9488,14 @@ resolve@1.17.0: optional: true bin: solhint: solhint.js - checksum: 140a4660b691ea78aa7de19aca2123991fb4f9bc7be574e1573ae428b356e12919805df56c2892ddbdd031a4a4db477a81425ad85aac6672f3fb73f4887c2abb + checksum: 0ea5c96540adbc33e3c0305dacf270bcdfdbfb6f64652eb3584de2770b98dc1383bd65faf8506fbee95d773e359fe7f3b0a15c492a0596fcc14de0d609a0a335 languageName: node linkType: hard "solidity-ast@npm:^0.4.15": - version: 0.4.35 - resolution: "solidity-ast@npm:0.4.35" - checksum: 6cde9e656dee814fa3d7ce9ef42f1cd0344162515d0d215dbd7d18bf931ed9cd6ce4093aed0a8abbcfb5a4a6faf6638f615aaad479e4657054c6a4ae2cb5092e + version: 0.4.49 + resolution: "solidity-ast@npm:0.4.49" + checksum: f5b0354ddfa882346cf12d33f79c6123796a07637b248ceb9cfeec9f81540e270407f6fca660cf75666e1ba1866270319ab3fbe54b01491dbd35adffd1405243 languageName: node linkType: hard @@ -9280,11 +9507,11 @@ resolve@1.17.0: linkType: hard "solidity-coverage@npm:^0.8.2": - version: 0.8.2 - resolution: "solidity-coverage@npm:0.8.2" + version: 0.8.4 + resolution: "solidity-coverage@npm:0.8.4" dependencies: "@ethersproject/abi": ^5.0.9 - "@solidity-parser/parser": ^0.14.1 + "@solidity-parser/parser": ^0.16.0 chalk: ^2.4.2 death: ^1.1.0 detect-port: ^1.3.0 @@ -9307,7 +9534,7 @@ resolve@1.17.0: hardhat: ^2.11.0 bin: solidity-coverage: plugins/bin.js - checksum: 489f73d56a1279f2394b7a14db315532884895baa00a4016e68a4e5be0eddca90a95cb3322e6a0b15e67f2d9003b9413ee24c1c61d78f558f5a2e1e233840825 + checksum: 263089376d05f572350a2e47b61b2c604b3b5deedf4547cb0334342ecf6b732f823c069790e21063a56502a0d1fb9051a6f7bae1b990e2917af56fc94ac96759 languageName: node linkType: hard @@ -9365,21 +9592,21 @@ resolve@1.17.0: languageName: node linkType: hard -"ssri@npm:^9.0.0": - version: 9.0.1 - resolution: "ssri@npm:9.0.1" +"ssri@npm:^10.0.0": + version: 10.0.4 + resolution: "ssri@npm:10.0.4" dependencies: - minipass: ^3.1.1 - checksum: fb58f5e46b6923ae67b87ad5ef1c5ab6d427a17db0bead84570c2df3cd50b4ceb880ebdba2d60726588272890bae842a744e1ecce5bd2a2a582fccd5068309eb + minipass: ^5.0.0 + checksum: fb14da9f8a72b04eab163eb13a9dda11d5962cd2317f85457c4e0b575e9a6e0e3a6a87b5bf122c75cb36565830cd5f263fb457571bf6f1587eb5f95d095d6165 languageName: node linkType: hard "stack-utils@npm:^2.0.3": - version: 2.0.5 - resolution: "stack-utils@npm:2.0.5" + version: 2.0.6 + resolution: "stack-utils@npm:2.0.6" dependencies: escape-string-regexp: ^2.0.0 - checksum: 76b69da0f5b48a34a0f93c98ee2a96544d2c4ca2557f7eef5ddb961d3bdc33870b46f498a84a7c4f4ffb781df639840e7ebf6639164ed4da5e1aeb659615b9c7 + checksum: 052bf4d25bbf5f78e06c1d5e67de2e088b06871fa04107ca8d3f0e9d9263326e2942c8bedee3545795fc77d787d443a538345eef74db2f8e35db3558c6f91ff7 languageName: node linkType: hard @@ -9413,7 +9640,7 @@ resolve@1.17.0: languageName: node linkType: hard -"string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": +"string-width-cjs@npm:string-width@^4.2.0, string-width@npm:^1.0.2 || 2 || 3 || 4, string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.2, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" dependencies: @@ -9445,25 +9672,47 @@ resolve@1.17.0: languageName: node linkType: hard -"string.prototype.trimend@npm:^1.0.5": - version: 1.0.5 - resolution: "string.prototype.trimend@npm:1.0.5" +"string-width@npm:^5.0.1, string-width@npm:^5.1.2": + version: 5.1.2 + resolution: "string-width@npm:5.1.2" + dependencies: + eastasianwidth: ^0.2.0 + emoji-regex: ^9.2.2 + strip-ansi: ^7.0.1 + checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193 + languageName: node + linkType: hard + +"string.prototype.trim@npm:^1.2.7": + version: 1.2.7 + resolution: "string.prototype.trim@npm:1.2.7" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: d44f543833112f57224e79182debadc9f4f3bf9d48a0414d6f0cbd2a86f2b3e8c0ca1f95c3f8e5b32ae83e91554d79d932fc746b411895f03f93d89ed3dfb6bc + es-abstract: ^1.20.4 + checksum: 05b7b2d6af63648e70e44c4a8d10d8cc457536df78b55b9d6230918bde75c5987f6b8604438c4c8652eb55e4fc9725d2912789eb4ec457d6995f3495af190c09 languageName: node linkType: hard -"string.prototype.trimstart@npm:^1.0.5": - version: 1.0.5 - resolution: "string.prototype.trimstart@npm:1.0.5" +"string.prototype.trimend@npm:^1.0.6": + version: 1.0.6 + resolution: "string.prototype.trimend@npm:1.0.6" + dependencies: + call-bind: ^1.0.2 + define-properties: ^1.1.4 + es-abstract: ^1.20.4 + checksum: 0fdc34645a639bd35179b5a08227a353b88dc089adf438f46be8a7c197fc3f22f8514c1c9be4629b3cd29c281582730a8cbbad6466c60f76b5f99cf2addb132e + languageName: node + linkType: hard + +"string.prototype.trimstart@npm:^1.0.6": + version: 1.0.6 + resolution: "string.prototype.trimstart@npm:1.0.6" dependencies: call-bind: ^1.0.2 define-properties: ^1.1.4 - es-abstract: ^1.19.5 - checksum: a4857c5399ad709d159a77371eeaa8f9cc284469a0b5e1bfe405de16f1fd4166a8ea6f4180e55032f348d1b679b1599fd4301fbc7a8b72bdb3e795e43f7b1048 + es-abstract: ^1.20.4 + checksum: 89080feef416621e6ef1279588994305477a7a91648d9436490d56010a1f7adc39167cddac7ce0b9884b8cdbef086987c4dcb2960209f2af8bac0d23ceff4f41 languageName: node linkType: hard @@ -9485,6 +9734,15 @@ resolve@1.17.0: languageName: node linkType: hard +"strip-ansi-cjs@npm:strip-ansi@^6.0.1, strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": + version: 6.0.1 + resolution: "strip-ansi@npm:6.0.1" + dependencies: + ansi-regex: ^5.0.1 + checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c + languageName: node + linkType: hard + "strip-ansi@npm:^4.0.0": version: 4.0.0 resolution: "strip-ansi@npm:4.0.0" @@ -9503,12 +9761,12 @@ resolve@1.17.0: languageName: node linkType: hard -"strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": - version: 6.0.1 - resolution: "strip-ansi@npm:6.0.1" +"strip-ansi@npm:^7.0.1": + version: 7.1.0 + resolution: "strip-ansi@npm:7.1.0" dependencies: - ansi-regex: ^5.0.1 - checksum: f3cd25890aef3ba6e1a74e20896c21a46f482e93df4a06567cebf2b57edabb15133f1f94e57434e0a958d61186087b1008e89c94875d019910a213181a14fc8c + ansi-regex: ^6.0.1 + checksum: 859c73fcf27869c22a4e4d8c6acfe690064659e84bef9458aa6d13719d09ca88dcfd40cbf31fd0be63518ea1a643fe070b4827d353e09533a5b0b9fd4553d64d languageName: node linkType: hard @@ -9627,29 +9885,29 @@ resolve@1.17.0: linkType: hard "table@npm:^6.8.0": - version: 6.8.0 - resolution: "table@npm:6.8.0" + version: 6.8.1 + resolution: "table@npm:6.8.1" dependencies: ajv: ^8.0.1 lodash.truncate: ^4.4.2 slice-ansi: ^4.0.0 string-width: ^4.2.3 strip-ansi: ^6.0.1 - checksum: 5b07fe462ee03d2e1fac02cbb578efd2e0b55ac07e3d3db2e950aa9570ade5a4a2b8d3c15e9f25c89e4e50b646bc4269934601ee1eef4ca7968ad31960977690 + checksum: 08249c7046125d9d0a944a6e96cfe9ec66908d6b8a9db125531be6eb05fa0de047fd5542e9d43b4f987057f00a093b276b8d3e19af162a9c40db2681058fd306 languageName: node linkType: hard "tar@npm:^6.1.11, tar@npm:^6.1.2": - version: 6.1.11 - resolution: "tar@npm:6.1.11" + version: 6.1.15 + resolution: "tar@npm:6.1.15" dependencies: chownr: ^2.0.0 fs-minipass: ^2.0.0 - minipass: ^3.0.0 + minipass: ^5.0.0 minizlib: ^2.1.1 mkdirp: ^1.0.3 yallist: ^4.0.0 - checksum: a04c07bb9e2d8f46776517d4618f2406fb977a74d914ad98b264fc3db0fe8224da5bec11e5f8902c5b9bcb8ace22d95fbe3c7b36b8593b7dfc8391a25898f32f + checksum: f23832fceeba7578bf31907aac744ae21e74a66f4a17a9e94507acf460e48f6db598c7023882db33bab75b80e027c21f276d405e4a0322d58f51c7088d428268 languageName: node linkType: hard @@ -9816,8 +10074,8 @@ resolve@1.17.0: linkType: hard "ts-node@npm:^10.4.0": - version: 10.8.2 - resolution: "ts-node@npm:10.8.2" + version: 10.9.1 + resolution: "ts-node@npm:10.9.1" dependencies: "@cspotcode/source-map-support": ^0.8.0 "@tsconfig/node10": ^1.0.7 @@ -9849,30 +10107,30 @@ resolve@1.17.0: ts-node-script: dist/bin-script.js ts-node-transpile-only: dist/bin-transpile.js ts-script: dist/bin-script-deprecated.js - checksum: 1eede939beed9f4db35bcc88d78ef803815b99dcdbed1ecac728d861d74dc694918a7f0f437aa08d026193743a31e7e00e2ee34f875f909b5879981c1808e2a7 + checksum: 090adff1302ab20bd3486e6b4799e90f97726ed39e02b39e566f8ab674fd5bd5f727f43615debbfc580d33c6d9d1c6b1b3ce7d8e3cca3e20530a145ffa232c35 languageName: node linkType: hard -"tsconfig-paths@npm:^3.14.1": - version: 3.14.1 - resolution: "tsconfig-paths@npm:3.14.1" +"tsconfig-paths@npm:^3.12.0": + version: 3.14.2 + resolution: "tsconfig-paths@npm:3.14.2" dependencies: "@types/json5": ^0.0.29 - json5: ^1.0.1 + json5: ^1.0.2 minimist: ^1.2.6 strip-bom: ^3.0.0 - checksum: 8afa01c673ebb4782ba53d3a12df97fa837ce524f8ad38ee4e2b2fd57f5ac79abc21c574e9e9eb014d93efe7fe8214001b96233b5c6ea75bd1ea82afe17a4c6d + checksum: a6162eaa1aed680537f93621b82399c7856afd10ec299867b13a0675e981acac4e0ec00896860480efc59fc10fd0b16fdc928c0b885865b52be62cadac692447 languageName: node linkType: hard "tsconfig-paths@npm:^4.1.0": - version: 4.1.0 - resolution: "tsconfig-paths@npm:4.1.0" + version: 4.2.0 + resolution: "tsconfig-paths@npm:4.2.0" dependencies: - json5: ^2.2.1 + json5: ^2.2.2 minimist: ^1.2.6 strip-bom: ^3.0.0 - checksum: e4b101f81b2abd95499d8145e0aa73144e857c2c359191058486cef101b7accae22a69114e5d5814a13d5ab3b0bae70dd0c85bcdb7e829bbe1bfda5c9067c9b1 + checksum: 28c5f7bbbcabc9dabd4117e8fdc61483f6872a1c6b02a4b1c4d68c5b79d06896c3cc9547610c4c3ba64658531caa2de13ead1ea1bf321c7b53e969c4752b98c7 languageName: node linkType: hard @@ -9884,9 +10142,9 @@ resolve@1.17.0: linkType: hard "tslib@npm:^2.3.1, tslib@npm:^2.5.0": - version: 2.5.0 - resolution: "tslib@npm:2.5.0" - checksum: ae3ed5f9ce29932d049908ebfdf21b3a003a85653a9a140d614da6b767a93ef94f460e52c3d787f0e4f383546981713f165037dc2274df212ea9f8a4541004e1 + version: 2.6.1 + resolution: "tslib@npm:2.6.1" + checksum: b0d176d176487905b66ae4d5856647df50e37beea7571c53b8d10ba9222c074b81f1410fb91da13debaf2cbc970663609068bdebafa844ea9d69b146527c38fe languageName: node linkType: hard @@ -10023,6 +10281,53 @@ resolve@1.17.0: languageName: node linkType: hard +"typed-array-buffer@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-buffer@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + get-intrinsic: ^1.2.1 + is-typed-array: ^1.1.10 + checksum: 3e0281c79b2a40cd97fe715db803884301993f4e8c18e8d79d75fd18f796e8cd203310fec8c7fdb5e6c09bedf0af4f6ab8b75eb3d3a85da69328f28a80456bd3 + languageName: node + linkType: hard + +"typed-array-byte-length@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-length@npm:1.0.0" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: b03db16458322b263d87a702ff25388293f1356326c8a678d7515767ef563ef80e1e67ce648b821ec13178dd628eb2afdc19f97001ceae7a31acf674c849af94 + languageName: node + linkType: hard + +"typed-array-byte-offset@npm:^1.0.0": + version: 1.0.0 + resolution: "typed-array-byte-offset@npm:1.0.0" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.2 + for-each: ^0.3.3 + has-proto: ^1.0.1 + is-typed-array: ^1.1.10 + checksum: 04f6f02d0e9a948a95fbfe0d5a70b002191fae0b8fe0fe3130a9b2336f043daf7a3dda56a31333c35a067a97e13f539949ab261ca0f3692c41603a46a94e960b + languageName: node + linkType: hard + +"typed-array-length@npm:^1.0.4": + version: 1.0.4 + resolution: "typed-array-length@npm:1.0.4" + dependencies: + call-bind: ^1.0.2 + for-each: ^0.3.3 + is-typed-array: ^1.1.9 + checksum: 2228febc93c7feff142b8c96a58d4a0d7623ecde6c7a24b2b98eb3170e99f7c7eff8c114f9b283085cd59dcd2bd43aadf20e25bba4b034a53c5bb292f71f8956 + languageName: node + linkType: hard + "typedarray@npm:^0.0.6": version: 0.0.6 resolution: "typedarray@npm:0.0.6" @@ -10030,23 +10335,23 @@ resolve@1.17.0: languageName: node linkType: hard -typescript@^4.4.2: - version: 4.7.4 - resolution: "typescript@npm:4.7.4" +"typescript@npm:^4.4.2": + version: 4.9.5 + resolution: "typescript@npm:4.9.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 5750181b1cd7e6482c4195825547e70f944114fb47e58e4aa7553e62f11b3f3173766aef9c281783edfd881f7b8299cf35e3ca8caebe73d8464528c907a164df + checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db languageName: node linkType: hard "typescript@patch:typescript@^4.4.2#~builtin": - version: 4.7.4 - resolution: "typescript@patch:typescript@npm%3A4.7.4#~builtin::version=4.7.4&hash=65a307" + version: 4.9.5 + resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin::version=4.9.5&hash=ad5954" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 9096d8f6c16cb80ef3bf96fcbbd055bf1c4a43bd14f3b7be45a9fbe7ada46ec977f604d5feed3263b4f2aa7d4c7477ce5f9cd87de0d6feedec69a983f3a4f93e + checksum: 8f6260acc86b56bfdda6004bc53f32ea548f543e8baef7071c8e34d29d292f3e375c8416556c8de10b24deef6933cd1c16a8233dc84a3dd43a13a13265d0faab languageName: node linkType: hard @@ -10058,11 +10363,11 @@ typescript@^4.4.2: linkType: hard "uglify-js@npm:^3.1.4": - version: 3.16.2 - resolution: "uglify-js@npm:3.16.2" + version: 3.17.4 + resolution: "uglify-js@npm:3.17.4" bin: uglifyjs: bin/uglifyjs - checksum: 5b62e748b7fa1d982f0949ed1876b9367dcde4782f74159f4ea0b3d130835336eb0245e090456ec057468d937eb016114677bb38a7a4fdc7f68c3d002ca760ee + checksum: 7b3897df38b6fc7d7d9f4dcd658599d81aa2b1fb0d074829dd4e5290f7318dbca1f4af2f45acb833b95b1fe0ed4698662ab61b87e94328eb4c0a0d3435baf924 languageName: node linkType: hard @@ -10078,12 +10383,12 @@ typescript@^4.4.2: languageName: node linkType: hard -"undici@npm:^5.14.0, undici@npm:^5.4.0": - version: 5.22.0 - resolution: "undici@npm:5.22.0" +"undici@npm:^5.14.0": + version: 5.22.1 + resolution: "undici@npm:5.22.1" dependencies: busboy: ^1.6.0 - checksum: 8dc55240a60ae7680798df344e8f46ad0f872ed0fa434fb94cc4fd2b5b2f8053bdf11994d15902999d3880f9bf7cd875a2e90883d2702bf0f366dacd9cbf3fc6 + checksum: 048a3365f622be44fb319316cedfaa241c59cf7f3368ae7667a12323447e1822e8cc3d00f6956c852d1478a6fde1cbbe753f49e05f2fdaed229693e716ebaf35 languageName: node linkType: hard @@ -10094,21 +10399,21 @@ typescript@^4.4.2: languageName: node linkType: hard -"unique-filename@npm:^1.1.1": - version: 1.1.1 - resolution: "unique-filename@npm:1.1.1" +"unique-filename@npm:^3.0.0": + version: 3.0.0 + resolution: "unique-filename@npm:3.0.0" dependencies: - unique-slug: ^2.0.0 - checksum: cf4998c9228cc7647ba7814e255dec51be43673903897b1786eff2ac2d670f54d4d733357eb08dea969aa5e6875d0e1bd391d668fbdb5a179744e7c7551a6f80 + unique-slug: ^4.0.0 + checksum: 8e2f59b356cb2e54aab14ff98a51ac6c45781d15ceaab6d4f1c2228b780193dc70fae4463ce9e1df4479cb9d3304d7c2043a3fb905bdeca71cc7e8ce27e063df languageName: node linkType: hard -"unique-slug@npm:^2.0.0": - version: 2.0.2 - resolution: "unique-slug@npm:2.0.2" +"unique-slug@npm:^4.0.0": + version: 4.0.0 + resolution: "unique-slug@npm:4.0.0" dependencies: imurmurhash: ^0.1.4 - checksum: 5b6876a645da08d505dedb970d1571f6cebdf87044cb6b740c8dbb24f0d6e1dc8bdbf46825fd09f994d7cf50760e6f6e063cfa197d51c5902c00a861702eb75a + checksum: 0884b58365af59f89739e6f71e3feacb5b1b41f2df2d842d0757933620e6de08eff347d27e9d499b43c40476cbaf7988638d3acb2ffbcb9d35fd035591adfd15 languageName: node linkType: hard @@ -10133,17 +10438,17 @@ typescript@^4.4.2: languageName: node linkType: hard -"update-browserslist-db@npm:^1.0.4": - version: 1.0.4 - resolution: "update-browserslist-db@npm:1.0.4" +"update-browserslist-db@npm:^1.0.11": + version: 1.0.11 + resolution: "update-browserslist-db@npm:1.0.11" dependencies: escalade: ^3.1.1 picocolors: ^1.0.0 peerDependencies: browserslist: ">= 4.21.0" bin: - browserslist-lint: cli.js - checksum: 7c7da28d0fc733b17e01c8fa9385ab909eadce64b8ea644e9603867dc368c2e2a6611af8247e72612b23f9e7cb87ac7c7585a05ff94e1759e9d646cbe9bf49a7 + update-browserslist-db: cli.js + checksum: b98327518f9a345c7cad5437afae4d2ae7d865f9779554baf2a200fdf4bac4969076b679b1115434bd6557376bdd37ca7583d0f9b8f8e302d7d4cc1e91b5f231 languageName: node linkType: hard @@ -10244,8 +10549,8 @@ typescript@^4.4.2: linkType: hard "web3-utils@npm:^1.3.6": - version: 1.8.1 - resolution: "web3-utils@npm:1.8.1" + version: 1.10.0 + resolution: "web3-utils@npm:1.10.0" dependencies: bn.js: ^5.2.1 ethereum-bloom-filters: ^1.0.6 @@ -10254,7 +10559,7 @@ typescript@^4.4.2: number-to-bn: 1.7.0 randombytes: ^2.1.0 utf8: 3.0.0 - checksum: 08bb2df9cd19672f034bb82a27b857e0571b836a620f83de2214377457c6e52446e8dedcf916f8f10a13c86b5a02674dd4f45c60c45698b388368601cce9cf5e + checksum: c6b7662359c0513b5cbfe02cdcb312ce9152778bb19d94d413d44f74cfaa93b7de97190ab6ba11af25a40855c949d2427dcb751929c6d0f257da268c55a3ba2a languageName: node linkType: hard @@ -10266,9 +10571,9 @@ typescript@^4.4.2: linkType: hard "whatwg-fetch@npm:^3.4.1": - version: 3.6.2 - resolution: "whatwg-fetch@npm:3.6.2" - checksum: ee976b7249e7791edb0d0a62cd806b29006ad7ec3a3d89145921ad8c00a3a67e4be8f3fb3ec6bc7b58498724fd568d11aeeeea1f7827e7e1e5eae6c8a275afed + version: 3.6.17 + resolution: "whatwg-fetch@npm:3.6.17" + checksum: 0a8785dc2d1515c17ee9365d3f6438cf8fd281567426652fc6c55fc99e58cc6287ae5d1add5b8b1dd665f149e38d3de4ebe3812fd7170438ba0681d03b88b4dd languageName: node linkType: hard @@ -10296,9 +10601,22 @@ typescript@^4.4.2: linkType: hard "which-module@npm:^2.0.0": - version: 2.0.0 - resolution: "which-module@npm:2.0.0" - checksum: 809f7fd3dfcb2cdbe0180b60d68100c88785084f8f9492b0998c051d7a8efe56784492609d3f09ac161635b78ea29219eb1418a98c15ce87d085bce905705c9c + version: 2.0.1 + resolution: "which-module@npm:2.0.1" + checksum: 1967b7ce17a2485544a4fdd9063599f0f773959cca24176dbe8f405e55472d748b7c549cd7920ff6abb8f1ab7db0b0f1b36de1a21c57a8ff741f4f1e792c52be + languageName: node + linkType: hard + +"which-typed-array@npm:^1.1.10, which-typed-array@npm:^1.1.11": + version: 1.1.11 + resolution: "which-typed-array@npm:1.1.11" + dependencies: + available-typed-arrays: ^1.0.5 + call-bind: ^1.0.2 + for-each: ^0.3.3 + gopd: ^1.0.1 + has-tostringtag: ^1.0.0 + checksum: 711ffc8ef891ca6597b19539075ec3e08bb9b4c2ca1f78887e3c07a977ab91ac1421940505a197758fb5939aa9524976d0a5bbcac34d07ed6faa75cedbb17206 languageName: node linkType: hard @@ -10342,10 +10660,10 @@ typescript@^4.4.2: languageName: node linkType: hard -"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3": - version: 1.2.3 - resolution: "word-wrap@npm:1.2.3" - checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f +"word-wrap@npm:~1.2.3": + version: 1.2.5 + resolution: "word-wrap@npm:1.2.5" + checksum: f93ba3586fc181f94afdaff3a6fef27920b4b6d9eaefed0f428f8e07adea2a7f54a5f2830ce59406c8416f033f86902b91eb824072354645eea687dff3691ccb languageName: node linkType: hard @@ -10363,6 +10681,17 @@ typescript@^4.4.2: languageName: node linkType: hard +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0, wrap-ansi@npm:^7.0.0": + version: 7.0.0 + resolution: "wrap-ansi@npm:7.0.0" + dependencies: + ansi-styles: ^4.0.0 + string-width: ^4.1.0 + strip-ansi: ^6.0.0 + checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b + languageName: node + linkType: hard + "wrap-ansi@npm:^5.1.0": version: 5.1.0 resolution: "wrap-ansi@npm:5.1.0" @@ -10374,14 +10703,14 @@ typescript@^4.4.2: languageName: node linkType: hard -"wrap-ansi@npm:^7.0.0": - version: 7.0.0 - resolution: "wrap-ansi@npm:7.0.0" +"wrap-ansi@npm:^8.1.0": + version: 8.1.0 + resolution: "wrap-ansi@npm:8.1.0" dependencies: - ansi-styles: ^4.0.0 - string-width: ^4.1.0 - strip-ansi: ^6.0.0 - checksum: a790b846fd4505de962ba728a21aaeda189b8ee1c7568ca5e817d85930e06ef8d1689d49dbf0e881e8ef84436af3a88bc49115c2e2788d841ff1b8b5b51a608b + ansi-styles: ^6.1.0 + string-width: ^5.0.1 + strip-ansi: ^7.0.1 + checksum: 371733296dc2d616900ce15a0049dca0ef67597d6394c57347ba334393599e800bab03c41d4d45221b6bc967b8c453ec3ae4749eff3894202d16800fdfe0e238 languageName: node linkType: hard @@ -10393,19 +10722,19 @@ typescript@^4.4.2: linkType: hard "wretch@npm:^2.0.4": - version: 2.0.4 - resolution: "wretch@npm:2.0.4" - checksum: 27278ca4f239dc26af2fb8da0221ba1a6373005343ed0e66d4f8c3227710d39e5e4f4323ed8f81996f5fe62a7343722bf0076f5f6e4930c18815e27a6680917e + version: 2.6.0 + resolution: "wretch@npm:2.6.0" + checksum: 90f583c6673628f248f5517c25b40e0a2d459ea3bb5e7b952fc76a6d61f5c6c1785c9e943ed3e954ef99a476b610c02cca18189db3d4328a00fa17ed376c0da5 languageName: node linkType: hard "write-file-atomic@npm:^4.0.1": - version: 4.0.1 - resolution: "write-file-atomic@npm:4.0.1" + version: 4.0.2 + resolution: "write-file-atomic@npm:4.0.2" dependencies: imurmurhash: ^0.1.4 signal-exit: ^3.0.7 - checksum: 8f780232533ca6223c63c9b9c01c4386ca8c625ebe5017a9ed17d037aec19462ae17109e0aa155bff5966ee4ae7a27b67a99f55caf3f32ffd84155e9da3929fc + checksum: 5da60bd4eeeb935eec97ead3df6e28e5917a6bd317478e4a85a5285e8480b8ed96032bbcc6ecd07b236142a24f3ca871c924ec4a6575e623ec1b11bf8c1c253c languageName: node linkType: hard @@ -10434,8 +10763,8 @@ typescript@^4.4.2: linkType: hard "ws@npm:^7.4.6": - version: 7.5.8 - resolution: "ws@npm:7.5.8" + version: 7.5.9 + resolution: "ws@npm:7.5.9" peerDependencies: bufferutil: ^4.0.1 utf-8-validate: ^5.0.2 @@ -10444,7 +10773,7 @@ typescript@^4.4.2: optional: true utf-8-validate: optional: true - checksum: 49479ccf3ddab6500c5906fbcc316e9c8cd44b0ffb3903a6c1caf9b38cb9e06691685722a4c642cfa7d4c6eb390424fc3142cd4f8b940cfc7a9ce9761b1cd65b + checksum: c3c100a181b731f40b7f2fddf004aa023f79d64f489706a28bc23ff88e87f6a64b3c6651fbec3a84a53960b75159574d7a7385709847a62ddb7ad6af76f49138 languageName: node linkType: hard @@ -10507,10 +10836,10 @@ typescript@^4.4.2: languageName: node linkType: hard -"yargs-parser@npm:^21.0.0": - version: 21.0.1 - resolution: "yargs-parser@npm:21.0.1" - checksum: c3ea2ed12cad0377ce3096b3f138df8267edf7b1aa7d710cd502fe16af417bafe4443dd71b28158c22fcd1be5dfd0e86319597e47badf42ff83815485887323a +"yargs-parser@npm:^21.1.1": + version: 21.1.1 + resolution: "yargs-parser@npm:21.1.1" + checksum: ed2d96a616a9e3e1cc7d204c62ecc61f7aaab633dcbfab2c6df50f7f87b393993fe6640d017759fe112d0cb1e0119f2b4150a87305cc873fd90831c6a58ccf1c languageName: node linkType: hard @@ -10571,17 +10900,17 @@ typescript@^4.4.2: linkType: hard "yargs@npm:^17.5.1": - version: 17.5.1 - resolution: "yargs@npm:17.5.1" + version: 17.7.2 + resolution: "yargs@npm:17.7.2" dependencies: - cliui: ^7.0.2 + cliui: ^8.0.1 escalade: ^3.1.1 get-caller-file: ^2.0.5 require-directory: ^2.1.1 string-width: ^4.2.3 y18n: ^5.0.5 - yargs-parser: ^21.0.0 - checksum: 00d58a2c052937fa044834313f07910fd0a115dec5ee35919e857eeee3736b21a4eafa8264535800ba8bac312991ce785ecb8a51f4d2cc8c4676d865af1cfbde + yargs-parser: ^21.1.1 + checksum: 73b572e863aa4a8cbef323dd911d79d193b772defd5a51aab0aca2d446655216f5002c42c5306033968193bdbf892a7a4c110b0d77954a7fdf563e653967b56a languageName: node linkType: hard From e85ed27d8cae87119d6746fe9c1cd8ce44254552 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 2 Aug 2023 18:28:43 +0200 Subject: [PATCH 003/450] Zero distribution (#878) --- contracts/interfaces/IRevenueTrader.sol | 4 + contracts/p0/RevenueTrader.sol | 20 ++++ contracts/p1/RevenueTrader.sol | 25 ++++- .../plugins/mocks/InvalidRevTraderP1Mock.sol | 24 +++- test/Revenues.test.ts | 106 ++++++++++++++++++ 5 files changed, 177 insertions(+), 2 deletions(-) diff --git a/contracts/interfaces/IRevenueTrader.sol b/contracts/interfaces/IRevenueTrader.sol index 4b07ff70bc..8ab78078e1 100644 --- a/contracts/interfaces/IRevenueTrader.sol +++ b/contracts/interfaces/IRevenueTrader.sol @@ -25,6 +25,10 @@ interface IRevenueTrader is IComponent, ITrading { /// @custom:interaction function distributeTokenToBuy() external; + /// Return registered ERC20s to the BackingManager if distribution for tokenToBuy is 0 + /// @custom:interaction + function returnTokens(IERC20[] memory erc20s) external; + /// Process some number of tokens /// If the tokenToBuy is included in erc20s, RevenueTrader will distribute it at end of the tx /// @param erc20s The ERC20s to manage; can be tokenToBuy or anything registered diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 4196cc7916..2f380927fe 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -50,6 +50,26 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { _distributeTokenToBuy(); } + /// Return registered ERC20s to the BackingManager if distribution for tokenToBuy is 0 + /// @custom:interaction + function returnTokens(IERC20[] memory erc20s) external notTradingPausedOrFrozen { + RevenueTotals memory revTotals = main.distributor().totals(); + if (tokenToBuy == main.rsr()) { + require(revTotals.rsrTotal == 0, "rsrTotal > 0"); + } else if (address(tokenToBuy) == address(main.rToken())) { + require(revTotals.rTokenTotal == 0, "rTokenTotal > 0"); + } else { + revert("invalid tokenToBuy"); + } + + // Return ERC20s to the BackingManager + for (uint256 i = 0; i < erc20s.length; i++) { + require(main.assetRegistry().isRegistered(erc20s[i]), "unregistered erc20"); + address backingManager = address(main.backingManager()); + erc20s[i].safeTransfer(backingManager, erc20s[i].balanceOf(address(this))); + } + } + /// Process some number of tokens /// @param erc20s The ERC20s to manage; can be tokenToBuy or anything registered /// @param kinds The kinds of auctions to launch: DUTCH_AUCTION | BATCH_AUCTION diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 47123b02e2..fe7b409b50 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -22,6 +22,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { IBackingManager private backingManager; IFurnace private furnace; IRToken private rToken; + IERC20 private rsr; function init( IMain main_, @@ -43,6 +44,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { backingManager = main.backingManager(); furnace = main.furnace(); rToken = main.rToken(); + rsr = main.rsr(); } /// Settle a single trade + distribute revenue @@ -62,6 +64,27 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { _distributeTokenToBuy(); } + /// Return registered ERC20s to the BackingManager if distribution for tokenToBuy is 0 + /// @custom:interaction + function returnTokens(IERC20[] memory erc20s) external notTradingPausedOrFrozen { + RevenueTotals memory revTotals = distributor.totals(); + if (tokenToBuy == rsr) { + require(revTotals.rsrTotal == 0, "rsrTotal > 0"); + } else if (address(tokenToBuy) == address(rToken)) { + require(revTotals.rTokenTotal == 0, "rTokenTotal > 0"); + } else { + // untestable: tokenToBuy is always the RSR or RToken + revert("invalid tokenToBuy"); + } + + // Return ERC20s to the BackingManager + uint256 len = erc20s.length; + for (uint256 i = 0; i < len; ++i) { + require(assetRegistry.isRegistered(erc20s[i]), "unregistered erc20"); + erc20s[i].safeTransfer(address(backingManager), erc20s[i].balanceOf(address(this))); + } + } + /// Process some number of tokens /// If the tokenToBuy is included in erc20s, RevenueTrader will distribute it at end of the tx /// @param erc20s The ERC20s to manage; can be tokenToBuy or anything registered @@ -164,5 +187,5 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[44] private __gap; + uint256[43] private __gap; } diff --git a/contracts/plugins/mocks/InvalidRevTraderP1Mock.sol b/contracts/plugins/mocks/InvalidRevTraderP1Mock.sol index 64b3904230..ccb2b0f31e 100644 --- a/contracts/plugins/mocks/InvalidRevTraderP1Mock.sol +++ b/contracts/plugins/mocks/InvalidRevTraderP1Mock.sol @@ -20,6 +20,7 @@ contract RevenueTraderP1InvalidReverts is TradingP1, IRevenueTrader { IBackingManager private backingManager; IFurnace private furnace; IRToken private rToken; + IERC20 private rsr; function init( IMain main_, @@ -35,13 +36,33 @@ contract RevenueTraderP1InvalidReverts is TradingP1, IRevenueTrader { } /// Distribute tokenToBuy to its destinations - function distributeTokenToBuy() public { + function distributeTokenToBuy() public notTradingPausedOrFrozen { uint256 bal = tokenToBuy.balanceOf(address(this)); tokenToBuy.safeApprove(address(main.distributor()), 0); tokenToBuy.safeApprove(address(main.distributor()), bal); main.distributor().distribute(tokenToBuy, bal); } + /// Return registered ERC20s to the BackingManager if distribution for tokenToBuy is 0 + /// @custom:interaction + function returnTokens(IERC20[] memory erc20s) external notTradingPausedOrFrozen { + RevenueTotals memory revTotals = distributor.totals(); + if (tokenToBuy == rsr) { + require(revTotals.rsrTotal == 0, "rsrTotal > 0"); + } else if (address(tokenToBuy) == address(rToken)) { + require(revTotals.rTokenTotal == 0, "rTokenTotal > 0"); + } else { + revert("invalid tokenToBuy"); + } + + // Return ERC20s to the BackingManager + uint256 len = erc20s.length; + for (uint256 i = 0; i < len; ++i) { + require(assetRegistry.isRegistered(erc20s[i]), "erc20 unregistered"); + erc20s[i].safeTransfer(address(backingManager), erc20s[i].balanceOf(address(this))); + } + } + /// Processes a single token; unpermissioned /// Reverts for testing purposes function manageTokens(IERC20[] memory, TradeKind[] memory) external notTradingPausedOrFrozen { @@ -55,5 +76,6 @@ contract RevenueTraderP1InvalidReverts is TradingP1, IRevenueTrader { backingManager = main.backingManager(); furnace = main.furnace(); rToken = main.rToken(); + rsr = main.rsr(); } } diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index ecf2a581a1..f95ee4a894 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -636,6 +636,112 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) }) + it('Should return tokens to BackingManager correctly - rsrTrader.returnTokens()', async () => { + // Mint tokens + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + await token0.connect(owner).mint(rsrTrader.address, issueAmount.add(1)) + await token1.connect(owner).mint(rsrTrader.address, issueAmount.add(2)) + + // Should fail when trading paused or frozen + await main.connect(owner).pauseIssuance() + await main.connect(owner).pauseTrading() + await main.connect(owner).freezeForever() + await expect( + rsrTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('frozen or trading paused') + await main.connect(owner).unfreeze() + await expect( + rsrTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('frozen or trading paused') + await main.connect(owner).unpauseTrading() + + // Should fail when distribution is nonzero + await expect( + rsrTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('rsrTotal > 0') + await distributor.setDistribution(STRSR_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) + + // Should fail for unregistered token + await assetRegistry.connect(owner).unregister(collateral1.address) + await expect( + rsrTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('unregistered erc20') + + // Succeed on just token0 + rsr + await expectEvents(rsrTrader.returnTokens([rsr.address, token0.address]), [ + { + contract: rsr, + name: 'Transfer', + args: [rsrTrader.address, backingManager.address, issueAmount], + emitted: true, + }, + { + contract: token0, + name: 'Transfer', + args: [rsrTrader.address, backingManager.address, issueAmount.add(1)], + emitted: true, + }, + { + contract: token1, + name: 'Transfer', + emitted: false, + }, + ]) + }) + + it('Should return tokens to BackingManager correctly - rTokenTrader.returnTokens()', async () => { + // Mint tokens + await rsr.connect(owner).mint(rTokenTrader.address, issueAmount) + await token0.connect(owner).mint(rTokenTrader.address, issueAmount.add(1)) + await token1.connect(owner).mint(rTokenTrader.address, issueAmount.add(2)) + + // Should fail when trading paused or frozen + await main.connect(owner).pauseIssuance() + await main.connect(owner).pauseTrading() + await main.connect(owner).freezeForever() + await expect( + rTokenTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('frozen or trading paused') + await main.connect(owner).unfreeze() + await expect( + rTokenTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('frozen or trading paused') + await main.connect(owner).unpauseTrading() + + // Should fail when distribution is nonzero + await expect( + rTokenTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('rTokenTotal > 0') + await distributor.setDistribution(FURNACE_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) + + // Should fail for unregistered token + await assetRegistry.connect(owner).unregister(collateral1.address) + await expect( + rTokenTrader.returnTokens([rsr.address, token0.address, token1.address]) + ).to.be.revertedWith('unregistered erc20') + + // Succeed on just token0 + rsr + await expectEvents(rTokenTrader.returnTokens([rsr.address, token0.address]), [ + { + contract: rsr, + name: 'Transfer', + args: [rTokenTrader.address, backingManager.address, issueAmount], + emitted: true, + }, + { + contract: token0, + name: 'Transfer', + args: [rTokenTrader.address, backingManager.address, issueAmount.add(1)], + emitted: true, + }, + { + contract: token1, + name: 'Transfer', + emitted: false, + }, + ]) + }) + it('Should launch multiple auctions -- has tokenToBuy', async () => { // Mint AAVE, token0, and RSR to the RSRTrader await aaveToken.connect(owner).mint(rsrTrader.address, issueAmount) From 12c81a0e03f74384fffcd010e5de93c43f3f1455 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Thu, 3 Aug 2023 02:08:40 +0530 Subject: [PATCH 004/450] Bunch of small changes (#877) --- contracts/p0/AssetRegistry.sol | 7 +++++++ contracts/p0/Broker.sol | 5 +++-- contracts/p0/Deployer.sol | 6 ++++-- contracts/p1/AssetRegistry.sol | 9 +++++++++ contracts/p1/BackingManager.sol | 4 ++++ contracts/p1/mixins/Trading.sol | 1 - .../plugins/mocks/InvalidRefPerTokCollateral.sol | 12 +++++++++--- contracts/plugins/trading/DutchTrade.sol | 2 ++ contracts/plugins/trading/GnosisTrade.sol | 4 ++++ docs/system-design.md | 5 ++--- test/Broker.test.ts | 6 +++++- test/Main.test.ts | 15 +++++++++++++++ test/integration/EasyAuction.test.ts | 8 ++++++-- 13 files changed, 70 insertions(+), 14 deletions(-) diff --git a/contracts/p0/AssetRegistry.sol b/contracts/p0/AssetRegistry.sol index 223c691154..ebdf5fd8b1 100644 --- a/contracts/p0/AssetRegistry.sol +++ b/contracts/p0/AssetRegistry.sol @@ -144,6 +144,13 @@ contract AssetRegistryP0 is ComponentP0, IAssetRegistry { /// Register an asset, unregistering any previous asset with the same ERC20. function _registerIgnoringCollisions(IAsset asset) private returns (bool swapped) { + if (asset.isCollateral()) { + require( + ICollateral(address(asset)).status() == CollateralStatus.SOUND, + "collateral not sound" + ); + } + if (_erc20s.contains(address(asset.erc20())) && assets[asset.erc20()] == asset) return false; diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index c1c7da1452..9cf00da1f0 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -4,6 +4,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; +import "@openzeppelin/contracts/proxy/Clones.sol"; import "../plugins/trading/DutchTrade.sol"; import "../plugins/trading/GnosisTrade.sol"; import "../interfaces/IBroker.sol"; @@ -174,7 +175,7 @@ contract BrokerP0 is ComponentP0, IBroker { function newBatchAuction(TradeRequest memory req, address caller) private returns (ITrade) { require(batchAuctionLength > 0, "batch auctions not enabled"); - GnosisTrade trade = new GnosisTrade(); + GnosisTrade trade = GnosisTrade(Clones.clone(address(batchTradeImplementation))); trades[address(trade)] = true; // Apply Gnosis EasyAuction-specific resizing of req, if needed: Ensure that @@ -202,7 +203,7 @@ contract BrokerP0 is ComponentP0, IBroker { ITrading caller ) private returns (ITrade) { require(dutchAuctionLength > 0, "dutch auctions not enabled"); - DutchTrade trade = new DutchTrade(); + DutchTrade trade = DutchTrade(Clones.clone(address(dutchTradeImplementation))); trades[address(trade)] = true; IERC20Metadata(address(req.sell.erc20())).safeTransferFrom( diff --git a/contracts/p0/Deployer.sol b/contracts/p0/Deployer.sol index 8c8d124d2e..0b1ff0324a 100644 --- a/contracts/p0/Deployer.sol +++ b/contracts/p0/Deployer.sol @@ -4,6 +4,8 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "../plugins/assets/Asset.sol"; import "../plugins/assets/RTokenAsset.sol"; +import "../plugins/trading/DutchTrade.sol"; +import "../plugins/trading/GnosisTrade.sol"; import "./AssetRegistry.sol"; import "./BackingManager.sol"; import "./BasketHandler.sol"; @@ -113,9 +115,9 @@ contract DeployerP0 is IDeployer, Versioned { main.broker().init( main, gnosis, - ITrade(address(1)), + ITrade(address(new GnosisTrade())), params.batchAuctionLength, - ITrade(address(1)), + ITrade(address(new DutchTrade())), params.dutchAuctionLength ); diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 3474d171f8..098e47f93a 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -98,6 +98,8 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { } /// Unregister an asset, requiring that it is already registered + /// Rewards are NOT claimed by default when unregistering due to security concerns. + /// If the collateral is secure, governance should claim rewards before unregistering. /// @custom:governance // checks: assets[asset.erc20()] == asset // effects: assets' = assets - {asset.erc20():_} + {asset.erc20(), asset} @@ -186,6 +188,13 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { // effects: assets' = assets.set(asset.erc20(), asset) // returns: assets[asset.erc20()] != asset function _registerIgnoringCollisions(IAsset asset) private returns (bool swapped) { + if (asset.isCollateral()) { + require( + ICollateral(address(asset)).status() == CollateralStatus.SOUND, + "collateral not sound" + ); + } + IERC20Metadata erc20 = asset.erc20(); if (_erc20s.contains(address(erc20))) { if (assets[erc20] == asset) return false; diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 6dde9dae27..a64ff3f412 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -82,6 +82,10 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// Settle a single trade. If the caller is the trade, try chaining into rebalance() /// While this function is not nonReentrant, its two subsets each individually are + /// If the caller is a trade contract, initiate the next trade. + /// This is done in order to better align incentives, + /// and have the last bidder be the one to start the next auction. + /// This behaviour currently only happens for Dutch Trade. /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 1cfa49c191..863f7ab113 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -117,7 +117,6 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl TradeRequest memory req, TradePrices memory prices ) internal returns (ITrade trade) { - /* */ IERC20 sell = req.sell.erc20(); assert(address(trades[sell]) == address(0)); diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index 3ad165f9ab..3ce9386c9e 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -18,9 +18,10 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { // solhint-disable no-empty-blocks - constructor(CollateralConfig memory config, uint192 revenueHiding) - AppreciatingFiatCollateral(config, revenueHiding) - {} + constructor( + CollateralConfig memory config, + uint192 revenueHiding + ) AppreciatingFiatCollateral(config, revenueHiding) {} // solhint-enable no-empty-blocks @@ -68,6 +69,11 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { refPerTokRevert = on; } + // Setter for status + function setStatus(CollateralStatus _status) external { + markStatus(_status); + } + function refPerTok() public view virtual override returns (uint192) { if (refPerTokRevert) revert(); // Revert with no reason return rateMock; diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 86160bcedc..d73777e094 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -98,6 +98,8 @@ contract DutchTrade is ITrade { constructor() { ONE_BLOCK = NetworkConfigLib.blocktime(); + + status = TradeStatus.CLOSED; } // === External === diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index ab954dbe8a..d3256be6ce 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -58,6 +58,10 @@ contract GnosisTrade is ITrade { status = end; } + constructor() { + status = TradeStatus.CLOSED; + } + /// Constructor function, can only be called once /// @dev Expects sell tokens to already be present /// @custom:interaction reentrancy-safe b/c state-locking diff --git a/docs/system-design.md b/docs/system-design.md index 23d3c0491b..8e8ba41292 100644 --- a/docs/system-design.md +++ b/docs/system-design.md @@ -33,9 +33,8 @@ Some of the core contracts in our system regularly own ERC20 tokens. In each cas ### RToken Lifecycle -1. During SlowIssuance, the `RToken` transfers collateral tokens from the caller's address into itself. -2. At vesting time, the `RToken` contract mints new RToken to the recipient and transfers the held collateral to the `BackingManager`. If the `BasketHandler` has updated the basket since issuance began, then the collateral is instead returned to the recipient and no RToken is minted. -3. During redemption, RToken is burnt from the redeemer's account and they are transferred a prorata share of backing collateral from the `BackingManager`. +1. During minting, the `RToken` transfers collateral tokens from the caller's address into itself and mints new RToken to the caller's address. Minting amount must be less than the current throttle limit, or the transaction will revert. +2. During redemption, RToken is burnt from the redeemer's account and they are transferred a prorata share of backing collateral from the `BackingManager`. ## Protocol Assumptions diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 4c47b54176..d920ec3d4f 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1,4 +1,4 @@ -import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' @@ -505,6 +505,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const TradeFactory: ContractFactory = await ethers.getContractFactory('GnosisTrade') trade = await TradeFactory.deploy() + await setStorageAt(trade.address, 0, 0) + // Check state expect(await trade.status()).to.equal(TradeStatus.NOT_STARTED) expect(await trade.canSettle()).to.equal(false) @@ -948,6 +950,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const TradeFactory: ContractFactory = await ethers.getContractFactory('DutchTrade') trade = await TradeFactory.deploy() + await setStorageAt(trade.address, 0, 0) + // Check state expect(await trade.status()).to.equal(TradeStatus.NOT_STARTED) expect(await trade.canSettle()).to.equal(false) diff --git a/test/Main.test.ts b/test/Main.test.ts index 591fe6d095..b8613d40a0 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -1668,6 +1668,21 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Basket is now disabled expect(await basketHandler.status()).to.equal(CollateralStatus.DISABLED) }) + + it('Recognizes Sound Collateral', async () => { + expect(await collateral1.status()).to.equal(CollateralStatus.SOUND) + await expect(assetRegistry.register(collateral1.address)).not.be.reverted + + await revertCollateral.setStatus(CollateralStatus.DISABLED) + expect(await revertCollateral.status()).to.equal(CollateralStatus.DISABLED) + + await expect( + assetRegistry.connect(owner).register(revertCollateral.address) + ).be.revertedWith('collateral not sound') + await expect( + assetRegistry.connect(owner).swapRegistered(revertCollateral.address) + ).be.revertedWith('collateral not sound') + }) }) }) diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 808a21eca9..877effc053 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -715,10 +715,14 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function const CollFactory = await ethers.getContractFactory('FiatCollateral') const MainFactory = await ethers.getContractFactory('MainP0') const BrokerFactory = await ethers.getContractFactory('BrokerP0') + const GnosisTradeFactory = await ethers.getContractFactory('GnosisTrade') + const DutchTradeFactory = await ethers.getContractFactory('DutchTrade') // Deployments const main = await MainFactory.deploy() const broker = await BrokerFactory.deploy() + const gnosisTradeImpl = await GnosisTradeFactory.deploy() + const dutchTradeImpl = await DutchTradeFactory.deploy() await main.init( { rToken: ONE_ADDRESS, @@ -743,9 +747,9 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function await broker.init( main.address, easyAuction.address, - ONE_ADDRESS, + gnosisTradeImpl.address, config.batchAuctionLength, - ONE_ADDRESS, + dutchTradeImpl.address, config.dutchAuctionLength ) const sellTok = await ERC20Factory.deploy('Sell Token', 'SELL', sellTokDecimals) From 809a8d2cbcd8c787591659eea52e2bc50e6996d3 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Thu, 3 Aug 2023 09:39:17 -0400 Subject: [PATCH 005/450] useAvailable when setting throttles. (#872) --- contracts/p0/RToken.sol | 2 ++ contracts/p1/RToken.sol | 2 ++ test/RToken.test.ts | 52 +++++++++++++++++++++++++++++++++++ test/ZTradingExtremes.test.ts | 6 ++++ 4 files changed, 62 insertions(+) diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol index 2ba631e3a2..e7ce86a0b2 100644 --- a/contracts/p0/RToken.sol +++ b/contracts/p0/RToken.sol @@ -337,6 +337,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { require(params.amtRate >= MIN_THROTTLE_RATE_AMT, "issuance amtRate too small"); require(params.amtRate <= MAX_THROTTLE_RATE_AMT, "issuance amtRate too big"); require(params.pctRate <= MAX_THROTTLE_PCT_AMT, "issuance pctRate too big"); + issuanceThrottle.useAvailable(totalSupply(), 0); emit IssuanceThrottleSet(issuanceThrottle.params, params); issuanceThrottle.params = params; } @@ -346,6 +347,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { require(params.amtRate >= MIN_THROTTLE_RATE_AMT, "redemption amtRate too small"); require(params.amtRate <= MAX_THROTTLE_RATE_AMT, "redemption amtRate too big"); require(params.pctRate <= MAX_THROTTLE_PCT_AMT, "redemption pctRate too big"); + redemptionThrottle.useAvailable(totalSupply(), 0); emit RedemptionThrottleSet(redemptionThrottle.params, params); redemptionThrottle.params = params; } diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 942e2d2501..f68a43a53e 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -442,6 +442,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { require(params.amtRate >= MIN_THROTTLE_RATE_AMT, "issuance amtRate too small"); require(params.amtRate <= MAX_THROTTLE_RATE_AMT, "issuance amtRate too big"); require(params.pctRate <= MAX_THROTTLE_PCT_AMT, "issuance pctRate too big"); + issuanceThrottle.useAvailable(totalSupply(), 0); emit IssuanceThrottleSet(issuanceThrottle.params, params); issuanceThrottle.params = params; } @@ -451,6 +452,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { require(params.amtRate >= MIN_THROTTLE_RATE_AMT, "redemption amtRate too small"); require(params.amtRate <= MAX_THROTTLE_RATE_AMT, "redemption amtRate too big"); require(params.pctRate <= MAX_THROTTLE_PCT_AMT, "redemption pctRate too big"); + redemptionThrottle.useAvailable(totalSupply(), 0); emit RedemptionThrottleSet(redemptionThrottle.params, params); redemptionThrottle.params = params; } diff --git a/test/RToken.test.ts b/test/RToken.test.ts index c13c235db7..4652dec1c9 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -224,6 +224,26 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('issuance pctRate too big') }) + it('Should account for accrued value when updating issuance throttle parameters', async () => { + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully + const issuanceThrottleParams = { amtRate: fp('60'), pctRate: fp('0.1') } + + await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) + const params = await rToken.issuanceThrottleParams() + expect(params[0]).to.equal(issuanceThrottleParams.amtRate) + expect(params[1]).to.equal(issuanceThrottleParams.pctRate) + + await Promise.all(tokens.map((t) => t.connect(addr1).approve(rToken.address, initialBal))) + await rToken.connect(addr1).issue(fp('20')) + expect(await rToken.issuanceAvailable()).to.equal(fp('40')) + + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12 * 5 * 10) // 10 minutes + + issuanceThrottleParams.amtRate = fp('100') + await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) + expect(await rToken.issuanceAvailable()).to.equal(fp('50')) + }) + it('Should allow to update redemption throttle if Owner and perform validations', async () => { const redemptionThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } await expect( @@ -262,6 +282,30 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('redemption pctRate too big') }) + it('Should account for accrued value when updating redemption throttle parameters', async () => { + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully + const issuanceThrottleParams = { amtRate: fp('100'), pctRate: fp('0.1') } + const redemptionThrottleParams = { amtRate: fp('60'), pctRate: fp('0.1') } + + await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) + await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + const params = await rToken.redemptionThrottleParams() + expect(params[0]).to.equal(redemptionThrottleParams.amtRate) + expect(params[1]).to.equal(redemptionThrottleParams.pctRate) + + await Promise.all(tokens.map((t) => t.connect(addr1).approve(rToken.address, initialBal))) + await rToken.connect(addr1).issue(fp('100')) + expect(await rToken.redemptionAvailable()).to.equal(fp('60')) + await rToken.connect(addr1).redeem(fp('30')) + expect(await rToken.redemptionAvailable()).to.equal(fp('30')) + + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12 * 5 * 10) // 10 minutes + + redemptionThrottleParams.amtRate = fp('100') + await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + expect(await rToken.redemptionAvailable()).to.equal(fp('40')) + }) + it('Should return a price of 0 if the assets become unregistered', async () => { const startPrice = await basketHandler.price() @@ -367,6 +411,8 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { await Promise.all( tokens.map((t) => t.connect(addr1).approve(rToken.address, MAX_THROTTLE_AMT_RATE)) ) + // advance time + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully await rToken.connect(addr1).issue(MAX_THROTTLE_AMT_RATE) expect(await rToken.totalSupply()).to.equal(MAX_THROTTLE_AMT_RATE) expect(await rToken.basketsNeeded()).to.equal(MAX_THROTTLE_AMT_RATE) @@ -1370,6 +1416,9 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { redemptionThrottleParams.pctRate = bn(0) await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + // advance time + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully + // Check redemption throttle expect(await rToken.redemptionAvailable()).to.equal(redemptionThrottleParams.amtRate) @@ -2183,6 +2232,9 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { redemptionThrottleParams.pctRate = bn(0) await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + // advance time + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully + // Check redemption throttle expect(await rToken.redemptionAvailable()).to.equal(redemptionThrottleParams.amtRate) diff --git a/test/ZTradingExtremes.test.ts b/test/ZTradingExtremes.test.ts index 537ba81761..77ca05227d 100644 --- a/test/ZTradingExtremes.test.ts +++ b/test/ZTradingExtremes.test.ts @@ -480,6 +480,9 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, const noThrottle = { amtRate: MAX_THROTTLE_AMT_RATE, pctRate: 0 } await rToken.setIssuanceThrottleParams(noThrottle) await rToken.setRedemptionThrottleParams(noThrottle) + + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully + await rToken.connect(addr1).issue(rTokenSupply) expect(await rToken.balanceOf(addr1.address)).to.equal(rTokenSupply) @@ -651,6 +654,9 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, const noThrottle = { amtRate: MAX_THROTTLE_AMT_RATE, pctRate: 0 } await rToken.setIssuanceThrottleParams(noThrottle) await rToken.setRedemptionThrottleParams(noThrottle) + + await advanceTime(12 * 5 * 60) // 60 minutes, charge fully + await rToken.connect(addr1).issue(rTokenSupply) expect(await rToken.balanceOf(addr1.address)).to.equal(rTokenSupply) From 64ed2a9e82fb33031fb3c53bf87c658ed869e529 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 4 Aug 2023 01:10:42 +0200 Subject: [PATCH 006/450] Disable dutch auctions per-collateral (#873) Co-authored-by: Akshat Mittal --- contracts/facade/FacadeTest.sol | 24 +- contracts/interfaces/IBroker.sol | 18 +- contracts/p0/Broker.sol | 45 ++- contracts/p0/mixins/Trading.sol | 1 - contracts/p1/Broker.sol | 55 ++- contracts/plugins/mocks/InvalidBrokerMock.sol | 12 +- contracts/plugins/trading/DutchTrade.sol | 194 ++++++---- test/Broker.test.ts | 211 ++++++----- test/Facade.test.ts | 12 +- test/Recollateralization.test.ts | 47 +-- test/Revenues.test.ts | 332 ++++++++++++++---- test/Upgradeability.test.ts | 8 +- test/integration/EasyAuction.test.ts | 8 +- test/utils/trades.ts | 32 +- 14 files changed, 690 insertions(+), 309 deletions(-) diff --git a/contracts/facade/FacadeTest.sol b/contracts/facade/FacadeTest.sol index e0683265fe..d16c6ab6d3 100644 --- a/contracts/facade/FacadeTest.sol +++ b/contracts/facade/FacadeTest.sol @@ -24,6 +24,11 @@ contract FacadeTest is IFacadeTest { /// Prompt all traders to run auctions /// Relatively gas-inefficient, shouldn't be used in production. Use multicall instead function runAuctionsForAllTraders(IRToken rToken) external { + runAuctionsForAllTradersForKind(rToken, TradeKind.BATCH_AUCTION); + } + + // Prompt all traders to run auctions of a specific kind + function runAuctionsForAllTradersForKind(IRToken rToken, TradeKind kind) public { IMain main = rToken.main(); IBackingManager backingManager = main.backingManager(); IRevenueTrader rsrTrader = main.rsrTrader(); @@ -55,12 +60,17 @@ contract FacadeTest is IFacadeTest { try main.backingManager().forwardRevenue(erc20s) {} catch {} // Start exact RSR auctions - (IERC20[] memory rsrERC20s, TradeKind[] memory rsrKinds) = traderERC20s(rsrTrader, erc20s); + (IERC20[] memory rsrERC20s, TradeKind[] memory rsrKinds) = traderERC20s( + rsrTrader, + kind, + erc20s + ); try main.rsrTrader().manageTokens(rsrERC20s, rsrKinds) {} catch {} // Start exact RToken auctions (IERC20[] memory rTokenERC20s, TradeKind[] memory rTokenKinds) = traderERC20s( rTokenTrader, + kind, erc20s ); try main.rTokenTrader().manageTokens(rTokenERC20s, rTokenKinds) {} catch {} @@ -115,11 +125,11 @@ contract FacadeTest is IFacadeTest { // === Private === - function traderERC20s(IRevenueTrader trader, IERC20[] memory erc20sAll) - private - view - returns (IERC20[] memory erc20s, TradeKind[] memory kinds) - { + function traderERC20s( + IRevenueTrader trader, + TradeKind kind, + IERC20[] memory erc20sAll + ) private view returns (IERC20[] memory erc20s, TradeKind[] memory kinds) { uint256 len; IERC20[] memory traderERC20sAll = new IERC20[](erc20sAll.length); for (uint256 i = 0; i < erc20sAll.length; ++i) { @@ -136,7 +146,7 @@ contract FacadeTest is IFacadeTest { kinds = new TradeKind[](len); for (uint256 i = 0; i < len; ++i) { erc20s[i] = traderERC20sAll[i]; - kinds[i] = TradeKind.BATCH_AUCTION; + kinds[i] = kind; } } } diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index cbb2f9cbdf..c0496801a0 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -38,7 +38,12 @@ interface IBroker is IComponent { event DutchTradeImplementationSet(ITrade indexed oldVal, ITrade indexed newVal); event BatchAuctionLengthSet(uint48 indexed oldVal, uint48 indexed newVal); event DutchAuctionLengthSet(uint48 indexed oldVal, uint48 indexed newVal); - event DisabledSet(bool indexed prevVal, bool indexed newVal); + event BatchTradeDisabledSet(bool indexed prevVal, bool indexed newVal); + event DutchTradeDisabledSet( + IERC20Metadata indexed erc20, + bool indexed prevVal, + bool indexed newVal + ); // Initialization function init( @@ -62,7 +67,9 @@ interface IBroker is IComponent { /// Only callable by one of the trading contracts the broker deploys function reportViolation() external; - function disabled() external view returns (bool); + function batchTradeDisabled() external view returns (bool); + + function dutchTradeDisabled(IERC20Metadata erc20) external view returns (bool); } interface TestIBroker is IBroker { @@ -86,5 +93,10 @@ interface TestIBroker is IBroker { function setDutchAuctionLength(uint48 newAuctionLength) external; - function setDisabled(bool disabled_) external; + function setBatchTradeDisabled(bool disabled) external; + + function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external; + + // only present on pre-3.0.0 Brokers; used by EasyAuction regression test + function disabled() external view returns (bool); } diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 9cf00da1f0..41584907d2 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -25,7 +25,7 @@ contract BrokerP0 is ComponentP0, IBroker { uint48 public constant MAX_AUCTION_LENGTH = 604800; // {s} max valid duration -1 week // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_AUCTION_LENGTH; // {s} 2 blocks based on network + uint48 public immutable MIN_AUCTION_LENGTH; // {s} 20 blocks, based on network // Added for interface compatibility with P1 ITrade public batchTradeImplementation; @@ -38,10 +38,12 @@ contract BrokerP0 is ComponentP0, IBroker { uint48 public batchAuctionLength; // {s} the length of a Gnosis EasyAuction uint48 public dutchAuctionLength; // {s} the length of a Dutch Auction - bool public disabled; + bool public batchTradeDisabled; + + mapping(IERC20Metadata => bool) public dutchTradeDisabled; constructor() { - MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 2; + MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 20; } function init( @@ -69,7 +71,6 @@ contract BrokerP0 is ComponentP0, IBroker { TradeRequest memory req, TradePrices memory prices ) external returns (ITrade) { - require(!disabled, "broker disabled"); assert(req.sellAmount > 0); address caller = _msgSender(); @@ -93,8 +94,23 @@ contract BrokerP0 is ComponentP0, IBroker { /// @custom:protected function reportViolation() external notTradingPausedOrFrozen { require(trades[_msgSender()], "unrecognized trade contract"); - emit DisabledSet(disabled, true); - disabled = true; + ITrade trade = ITrade(_msgSender()); + TradeKind kind = trade.KIND(); + + if (kind == TradeKind.BATCH_AUCTION) { + emit BatchTradeDisabledSet(batchTradeDisabled, true); + batchTradeDisabled = true; + } else if (kind == TradeKind.DUTCH_AUCTION) { + IERC20Metadata sell = trade.sell(); + emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); + dutchTradeDisabled[sell] = true; + + IERC20Metadata buy = trade.buy(); + emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); + dutchTradeDisabled[buy] = true; + } else { + revert("unrecognized trade kind"); + } } /// @param maxTokensAllowed {qTok} The max number of sell tokens allowed by the trading platform @@ -174,6 +190,7 @@ contract BrokerP0 is ComponentP0, IBroker { // === Private === function newBatchAuction(TradeRequest memory req, address caller) private returns (ITrade) { + require(!batchTradeDisabled, "batch auctions disabled"); require(batchAuctionLength > 0, "batch auctions not enabled"); GnosisTrade trade = GnosisTrade(Clones.clone(address(batchTradeImplementation))); trades[address(trade)] = true; @@ -202,6 +219,10 @@ contract BrokerP0 is ComponentP0, IBroker { TradePrices memory prices, ITrading caller ) private returns (ITrade) { + require( + !dutchTradeDisabled[req.sell.erc20()] && !dutchTradeDisabled[req.buy.erc20()], + "dutch auctions disabled for token pair" + ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); DutchTrade trade = DutchTrade(Clones.clone(address(dutchTradeImplementation))); trades[address(trade)] = true; @@ -217,8 +238,14 @@ contract BrokerP0 is ComponentP0, IBroker { } /// @custom:governance - function setDisabled(bool disabled_) external governance { - emit DisabledSet(disabled, disabled_); - disabled = disabled_; + function setBatchTradeDisabled(bool disabled) external governance { + emit BatchTradeDisabledSet(batchTradeDisabled, disabled); + batchTradeDisabled = disabled; + } + + /// @custom:governance + function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance { + emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); + dutchTradeDisabled[erc20] = disabled; } } diff --git a/contracts/p0/mixins/Trading.sol b/contracts/p0/mixins/Trading.sol index 4df64445c8..b49aee3f11 100644 --- a/contracts/p0/mixins/Trading.sol +++ b/contracts/p0/mixins/Trading.sol @@ -67,7 +67,6 @@ abstract contract TradingP0 is RewardableP0, ITrading { ) internal returns (ITrade trade) { IBroker broker = main.broker(); assert(address(trades[req.sell.erc20()]) == address(0)); - require(!broker.disabled(), "broker disabled"); req.sell.erc20().safeApprove(address(broker), 0); req.sell.erc20().safeApprove(address(broker), req.sellAmount); diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index f248cb3fcd..98e52120e4 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -26,7 +26,7 @@ contract BrokerP1 is ComponentP1, IBroker { uint48 public constant MAX_AUCTION_LENGTH = 604800; // {s} max valid duration - 1 week /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_AUCTION_LENGTH; // {s} 2 blocks based on network + uint48 public immutable MIN_AUCTION_LENGTH; // {s} 20 blocks, based on network IBackingManager private backingManager; IRevenueTrader private rsrTrader; @@ -43,9 +43,10 @@ contract BrokerP1 is ComponentP1, IBroker { // {s} the length of a Gnosis EasyAuction. Governance parameter. uint48 public batchAuctionLength; - // Whether trading is disabled. - // Initially false. Settable by OWNER. A trade clone can set it to true via reportViolation() - bool public disabled; + // Whether Batch Auctions are disabled. + // Initially false. Settable by OWNER. + // A GnosisTrade clone can set it to true via reportViolation() + bool public batchTradeDisabled; // The set of ITrade (clone) addresses this contract has created mapping(address => bool) private trades; @@ -58,12 +59,15 @@ contract BrokerP1 is ComponentP1, IBroker { // {s} the length of a Dutch Auction. Governance parameter. uint48 public dutchAuctionLength; + // Whether Dutch Auctions are currently disabled, per ERC20 + mapping(IERC20Metadata => bool) public dutchTradeDisabled; + // ==== Invariant ==== // (trades[addr] == true) iff this contract has created an ITrade clone at addr /// @custom:oz-upgrades-unsafe-allow constructor constructor() { - MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 2; + MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 20; } // effects: initial parameters are set @@ -93,7 +97,6 @@ contract BrokerP1 is ComponentP1, IBroker { /// @dev Requires setting an allowance in advance /// @custom:protected and @custom:interaction CEI // checks: - // not disabled, paused (trading), or frozen // caller is a system Trader // effects: // Deploys a new trade clone, `trade` @@ -106,8 +109,6 @@ contract BrokerP1 is ComponentP1, IBroker { TradeRequest memory req, TradePrices memory prices ) external returns (ITrade) { - require(!disabled, "broker disabled"); - address caller = _msgSender(); require( caller == address(backingManager) || @@ -129,8 +130,23 @@ contract BrokerP1 is ComponentP1, IBroker { // effects: disabled' = true function reportViolation() external notTradingPausedOrFrozen { require(trades[_msgSender()], "unrecognized trade contract"); - emit DisabledSet(disabled, true); - disabled = true; + ITrade trade = ITrade(_msgSender()); + TradeKind kind = trade.KIND(); + + if (kind == TradeKind.BATCH_AUCTION) { + emit BatchTradeDisabledSet(batchTradeDisabled, true); + batchTradeDisabled = true; + } else if (kind == TradeKind.DUTCH_AUCTION) { + IERC20Metadata sell = trade.sell(); + emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); + dutchTradeDisabled[sell] = true; + + IERC20Metadata buy = trade.buy(); + emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); + dutchTradeDisabled[buy] = true; + } else { + revert("unrecognized trade kind"); + } } // === Setters === @@ -188,14 +204,21 @@ contract BrokerP1 is ComponentP1, IBroker { } /// @custom:governance - function setDisabled(bool disabled_) external governance { - emit DisabledSet(disabled, disabled_); - disabled = disabled_; + function setBatchTradeDisabled(bool disabled) external governance { + emit BatchTradeDisabledSet(batchTradeDisabled, disabled); + batchTradeDisabled = disabled; + } + + /// @custom:governance + function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance { + emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); + dutchTradeDisabled[erc20] = disabled; } // === Private === function newBatchAuction(TradeRequest memory req, address caller) private returns (ITrade) { + require(!batchTradeDisabled, "batch auctions disabled"); require(batchAuctionLength > 0, "batch auctions not enabled"); GnosisTrade trade = GnosisTrade(address(batchTradeImplementation).clone()); trades[address(trade)] = true; @@ -224,6 +247,10 @@ contract BrokerP1 is ComponentP1, IBroker { TradePrices memory prices, ITrading caller ) private returns (ITrade) { + require( + !dutchTradeDisabled[req.sell.erc20()] && !dutchTradeDisabled[req.buy.erc20()], + "dutch auctions disabled for token pair" + ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); DutchTrade trade = DutchTrade(address(dutchTradeImplementation).clone()); trades[address(trade)] = true; @@ -244,5 +271,5 @@ contract BrokerP1 is ComponentP1, IBroker { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[43] private __gap; + uint256[42] private __gap; } diff --git a/contracts/plugins/mocks/InvalidBrokerMock.sol b/contracts/plugins/mocks/InvalidBrokerMock.sol index 525d1f7559..7b19993c94 100644 --- a/contracts/plugins/mocks/InvalidBrokerMock.sol +++ b/contracts/plugins/mocks/InvalidBrokerMock.sol @@ -22,7 +22,9 @@ contract InvalidBrokerMock is ComponentP0, IBroker { uint48 public batchAuctionLength; // {s} the length of a batch auction uint48 public dutchAuctionLength; // {s} the length of a dutch auction - bool public disabled = false; + bool public batchTradeDisabled = false; + + mapping(IERC20Metadata => bool) public dutchTradeDisabled; function init( IMain main_, @@ -44,8 +46,6 @@ contract InvalidBrokerMock is ComponentP0, IBroker { TradeRequest memory, TradePrices memory ) external view notTradingPausedOrFrozen returns (ITrade) { - require(!disabled, "broker disabled"); - // Revert when opening trades revert("Failure opening trade"); } @@ -64,5 +64,9 @@ contract InvalidBrokerMock is ComponentP0, IBroker { /// Dummy implementation /* solhint-disable no-empty-blocks */ - function setDisabled(bool disabled_) external governance {} + function setBatchTradeDisabled(bool disabled) external governance {} + + /// Dummy implementation + /* solhint-disable no-empty-blocks */ + function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance {} } diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index d73777e094..98eecfeb96 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -9,36 +9,65 @@ import "../../interfaces/IAsset.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/ITrade.sol"; -uint192 constant FORTY_PERCENT = 4e17; // {1} 0.4 -uint192 constant SIXTY_PERCENT = 6e17; // {1} 0.6 - -// Exponential price decay with base (999999/1000000). Price starts at 1000x and decays to <1x -// A 30-minute auction on a chain with a 12-second blocktime has a ~10.87% price drop per block -// during the geometric/exponential period and a 0.05% drop per block during the linear period. -// 30-minutes is the recommended length of auction for a chain with 12-second blocktimes, but -// longer and shorter times can be used as well. The pricing method does not degrade -// beyond the degree to which less overall blocktime means necessarily larger price drops. -uint192 constant MAX_EXP = 6907752 * FIX_ONE; // {1} (1000000/999999)^6907752 = ~1000x +// A dutch auction in 4 parts: +// 1. 0% - 20%: Geometric decay from 1000x the bestPrice to ~1.5x the bestPrice +// 2. 20% - 45%: Linear decay from ~1.5x the bestPrice to the bestPrice +// 3. 45% - 95%: Linear decay from the bestPrice to the worstPrice +// 4. 95% - 100%: Constant at the worstPrice +// +// For a trade between 2 assets with 1% oracleError: +// A 30-minute auction on a chain with a 12-second blocktime has a ~20% price drop per block +// during the 1st period, ~0.8% during the 2nd period, and ~0.065% during the 3rd period. +// +// 30-minutes is the recommended length of auction for a chain with 12-second blocktimes. +// 6 minutes, 7.5 minutes, 15 minutes, 1.5 minutes for each pariod respectively. +// +// Longer and shorter times can be used as well. The pricing method does not degrade +// beyond the degree to which less overall blocktime means less overall precision. + +uint192 constant FIVE_PERCENT = 5e16; // {1} 0.05 +uint192 constant TWENTY_PERCENT = 20e16; // {1} 0.2 +uint192 constant TWENTY_FIVE_PERCENT = 25e16; // {1} 0.25 +uint192 constant FORTY_FIVE_PERCENT = 45e16; // {1} 0.45 +uint192 constant FIFTY_PERCENT = 50e16; // {1} 0.5 +uint192 constant NINETY_FIVE_PERCENT = 95e16; // {1} 0.95 + +uint192 constant MAX_EXP = 6502287e18; // {1} (1000000/999999)^6502287 = ~666.6667 uint192 constant BASE = 999999e12; // {1} (999999/1000000) +uint192 constant ONE_POINT_FIVE = 150e16; // {1} 1.5 /** * @title DutchTrade - * @notice Implements a wholesale dutch auction via a piecewise falling-price mechansim. - * Over the first 40% of the auction the price falls from ~1000x the best plausible price - * down to the best plausible price in a geometric series. The price decreases by the same % - * each time. At 30 minutes the decreases are 10.87% per block. Longer auctions have - * smaller price decreases, and shorter auctions have larger price decreases. + * @notice Implements a wholesale dutch auction via a 4-piecewise falling-price mechansim. + * The overall idea is to handle 4 cases: + * 1. Price manipulation of the exchange rate up to 1000x (eg: via a read-only reentrancy) + * 2. Price movement of up to 50% during the auction + * 3. Typical case: no significant price movement; clearing price within expected range + * 4. No bots online; manual human doing bidding; additional time for tx clearing + * + * Case 1: Over the first 20% of the auction the price falls from ~1000x the best plausible + * price down to 1.5x the best plausible price in a geometric series. * This period DOES NOT expect to receive a bid; it just defends against manipulated prices. + * If a bid occurs during this period, a violation is reported to the Broker. + * This is still safe for the protocol since other trades, with price discovery, can occur. + * + * Case 2: Over the next 20% of the auction the price falls from 1.5x the best plausible price + * to the best plausible price, linearly. No violation is reported if a bid occurs. This case + * exists to handle cases where prices change after the auction is started, naturally. * - * Over the last 60% of the auction the price falls from the best plausible price to the worst - * price, linearly. The worst price is further discounted by the maxTradeSlippage as a fraction - * of how far from minTradeVolume to maxTradeVolume the trade lies. + * Case 3: Over the next 50% of the auction the price falls from the best plausible price to the + * worst price, linearly. The worst price is further discounted by the maxTradeSlippage as a + * fraction of how far from minTradeVolume to maxTradeVolume the trade lies. * At maxTradeVolume, no additonal discount beyond the oracle errors is applied. + * This is the phase of the auction where bids will typically occur. + * + * Case 4: Lastly the price stays at the worst price for the final 5% of the auction to allow + * a bid to occur if no bots are online and the only bidders are humans. * * To bid: - * 1. Call `bidAmount()` view to check prices at various timestamps + * 1. Call `bidAmount()` view to check prices at various blocks. * 2. Provide approval of sell tokens for precisely the `bidAmount()` desired - * 3. Wait until a desirable block is reached (hopefully not in the first 40% of the auction) + * 3. Wait until the desired block is reached (hopefully not in the first 20% of the auction) * 4. Call bid() */ contract DutchTrade is ITrade { @@ -52,6 +81,7 @@ contract DutchTrade is ITrade { TradeStatus public status; // reentrancy protection + IBroker public broker; // The Broker that cloned this contract into existence ITrading public origin; // the address that initialized the contract // === Auction === @@ -59,13 +89,14 @@ contract DutchTrade is ITrade { IERC20Metadata public buy; uint192 public sellAmount; // {sellTok} - // The auction runs from [startTime, endTime], inclusive - uint48 public startTime; // {s} when the dutch auction begins (one block after init()) - uint48 public endTime; // {s} when the dutch auction ends if no bids are received + // The auction runs from [startBlock, endTime], inclusive + uint256 public startBlock; // {block} when the dutch auction begins (one block after init()) + uint256 public endBlock; // {block} when the dutch auction ends if no bids are received + uint48 public endTime; // {s} not used in this contract; needed on interface - // highPrice is always 1000x the middlePrice, so we don't need to track it explicitly - uint192 public middlePrice; // {buyTok/sellTok} The price at which the function is piecewise - uint192 public lowPrice; // {buyTok/sellTok} The price the auction ends at + uint192 public bestPrice; // {buyTok/sellTok} The best plausible price based on oracle data + uint192 public worstPrice; // {buyTok/sellTok} The worst plausible price based on oracle data + // and further discounted by a fraction of maxTradeSlippage based on auction volume. // === Bid === address public bidder; @@ -80,20 +111,13 @@ contract DutchTrade is ITrade { status = end; } - // === Public Bid Helper === + // === External Bid Helper === - /// Calculates how much buy token is needed to purchase the lot, at a particular timestamp - /// @param timestamp {s} The block timestamp to get price for + /// Calculates how much buy token is needed to purchase the lot at a particular block + /// @param blockNumber {block} The block number of the bid /// @return {qBuyTok} The amount of buy tokens required to purchase the lot - function bidAmount(uint48 timestamp) public view returns (uint256) { - require(timestamp >= startTime, "auction not started"); - require(timestamp <= endTime, "auction over"); - - // {buyTok/sellTok} - uint192 price = _price(timestamp); - - // {qBuyTok} = {sellTok} * {buyTok/sellTok} * {qBuyTok/buyTok} - return sellAmount.mul(price, CEIL).shiftl_toUint(int8(buy.decimals()), CEIL); + function bidAmount(uint256 blockNumber) external view returns (uint256) { + return _bidAmount(_price(blockNumber)); } constructor() { @@ -120,21 +144,23 @@ contract DutchTrade is ITrade { assert( address(sell_) != address(0) && address(buy_) != address(0) && - auctionLength >= 2 * ONE_BLOCK + auctionLength >= 20 * ONE_BLOCK ); // misuse by caller // Only start dutch auctions under well-defined prices - require(prices.sellLow > 0 && prices.sellHigh < FIX_MAX, "bad sell pricing"); - require(prices.buyLow > 0 && prices.buyHigh < FIX_MAX, "bad buy pricing"); + require(prices.sellLow > 0 && prices.sellHigh < FIX_MAX / 1000, "bad sell pricing"); + require(prices.buyLow > 0 && prices.buyHigh < FIX_MAX / 1000, "bad buy pricing"); + broker = IBroker(msg.sender); origin = origin_; sell = sell_.erc20(); buy = buy_.erc20(); require(sellAmount_ <= sell.balanceOf(address(this)), "unfunded trade"); sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals())); // {sellTok} - startTime = uint48(block.timestamp) + ONE_BLOCK; // start in the next block - endTime = startTime + auctionLength; + startBlock = block.number + 1; // start in the next block + endBlock = startBlock + auctionLength / ONE_BLOCK; // FLOOR, since endBlock is inclusive + endTime = uint48(block.timestamp + ONE_BLOCK * (endBlock - startBlock)); // {1} uint192 slippage = _slippage( @@ -144,11 +170,9 @@ contract DutchTrade is ITrade { ); // {buyTok/sellTok} = {UoA/sellTok} * {1} / {UoA/buyTok} - lowPrice = prices.sellLow.mulDiv(FIX_ONE - slippage, prices.buyHigh, FLOOR); - middlePrice = prices.sellHigh.div(prices.buyLow, CEIL); // no additional slippage - // highPrice = 1000 * middlePrice - - assert(lowPrice <= middlePrice); + worstPrice = prices.sellLow.mulDiv(FIX_ONE - slippage, prices.buyHigh, FLOOR); + bestPrice = prices.sellHigh.div(prices.buyLow, CEIL); // no additional slippage + assert(worstPrice <= bestPrice); } /// Bid for the auction lot at the current price; settling atomically via a callback @@ -157,8 +181,11 @@ contract DutchTrade is ITrade { function bid() external returns (uint256 amountIn) { require(bidder == address(0), "bid already received"); + // {buyTok/sellTok} + uint192 price = _price(block.number); // enforces auction ongoing + // {qBuyTok} - amountIn = bidAmount(uint48(block.timestamp)); // enforces auction ongoing + amountIn = _bidAmount(price); // Transfer in buy tokens bidder = msg.sender; @@ -167,6 +194,11 @@ contract DutchTrade is ITrade { // status must begin OPEN assert(status == TradeStatus.OPEN); + // reportViolation if auction cleared in geometric phase + if (price > bestPrice.mul(ONE_POINT_FIVE, CEIL)) { + broker.reportViolation(); + } + // settle() via callback origin.settleTrade(sell); @@ -188,7 +220,7 @@ contract DutchTrade is ITrade { if (bidder != address(0)) { sell.safeTransfer(bidder, sellAmount); } else { - require(block.timestamp >= endTime, "auction not over"); + require(block.number > endBlock, "auction not over"); } uint256 sellBal = sell.balanceOf(address(this)); @@ -211,7 +243,7 @@ contract DutchTrade is ITrade { /// @return true iff the trade can be settled. // Guaranteed to be true some time after init(), until settle() is called function canSettle() external view returns (bool) { - return status == TradeStatus.OPEN && (bidder != address(0) || block.timestamp > endTime); + return status == TradeStatus.OPEN && (bidder != address(0) || block.number > endBlock); } /// @return {qSellTok} The size of the lot being sold, in token quanta @@ -246,29 +278,57 @@ contract DutchTrade is ITrade { } /// Return the price of the auction at a particular timestamp - /// @param timestamp {s} The block timestamp + /// @param blockNumber {block} The block number to get price for /// @return {buyTok/sellTok} - function _price(uint48 timestamp) private view returns (uint192) { + function _price(uint256 blockNumber) private view returns (uint192) { + require(blockNumber >= startBlock, "auction not started"); + require(blockNumber <= endBlock, "auction over"); + /// Price Curve: - /// - first 40%: geometrically decrease the price from 1000x the middlePrice to 1x - /// - last 60: decrease linearly from middlePrice to lowPrice + /// - first 20%: geometrically decrease the price from 1000x the bestPrice to 1.5x it + /// - next 25%: linearly decrease the price from 1.5x the bestPrice to 1x it + /// - next 50%: linearly decrease the price from bestPrice to worstPrice + /// - last 5%: constant at worstPrice - uint192 progression = divuu(timestamp - startTime, endTime - startTime); // {1} + uint192 progression = divuu(blockNumber - startBlock, endBlock - startBlock); // {1} - // Fast geometric decay -- 0%-40% of auction - if (progression < FORTY_PERCENT) { - uint192 exp = MAX_EXP.mulDiv(FORTY_PERCENT - progression, FORTY_PERCENT, ROUND); + // Fast geometric decay -- 0%-20% of auction + if (progression < TWENTY_PERCENT) { + uint192 exp = MAX_EXP.mulDiv(TWENTY_PERCENT - progression, TWENTY_PERCENT, ROUND); - // middlePrice * ((1000000/999999) ^ exp) = middlePrice / ((999999/1000000) ^ exp) - // safe uint48 downcast: exp is at-most 6907752 + // bestPrice * ((1000000/999999) ^ exp) = bestPrice / ((999999/1000000) ^ exp) + // safe uint48 downcast: exp is at-most 6502287 // {buyTok/sellTok} = {buyTok/sellTok} / {1} ^ {1} - return middlePrice.div(BASE.powu(uint48(exp.toUint(ROUND))), CEIL); - // this reverts for middlePrice >= 6.21654046e36 * FIX_ONE + return bestPrice.mulDiv(ONE_POINT_FIVE, BASE.powu(uint48(exp.toUint(ROUND))), CEIL); + // this reverts for bestPrice >= 6.21654046e36 * FIX_ONE + } else if (progression < FORTY_FIVE_PERCENT) { + // First linear decay -- 20%-45% of auction + // 1.5x -> 1x the bestPrice + + // {buyTok/sellTok} = {buyTok/sellTok} * {1} + uint192 highPrice = bestPrice.mul(ONE_POINT_FIVE, CEIL); + return + highPrice - + (highPrice - bestPrice).mulDiv(progression - TWENTY_PERCENT, TWENTY_FIVE_PERCENT); + } else if (progression < NINETY_FIVE_PERCENT) { + // Second linear decay -- 45%-95% of auction + // bestPrice -> worstPrice + + // {buyTok/sellTok} = {buyTok/sellTok} * {1} + return + bestPrice - + (bestPrice - worstPrice).mulDiv(progression - FORTY_FIVE_PERCENT, FIFTY_PERCENT); } - // Slow linear decay -- 40%-100% of auction - return - middlePrice - - (middlePrice - lowPrice).mulDiv(progression - FORTY_PERCENT, SIXTY_PERCENT); + // Constant price -- 95%-100% of auction + return worstPrice; + } + + /// Calculates how much buy token is needed to purchase the lot at a particular price + /// @param price {buyTok/sellTok} + /// @return {qBuyTok} The amount of buy tokens required to purchase the lot + function _bidAmount(uint192 price) public view returns (uint256) { + // {qBuyTok} = {sellTok} * {buyTok/sellTok} * {qBuyTok/buyTok} + return sellAmount.mul(price, CEIL).shiftl_toUint(int8(buy.decimals()), CEIL); } } diff --git a/test/Broker.test.ts b/test/Broker.test.ts index d920ec3d4f..a484b2d5e6 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -41,7 +41,13 @@ import { PRICE_TIMEOUT, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' -import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp } from './utils/time' +import { + advanceBlocks, + advanceTime, + advanceToTimestamp, + getLatestBlockTimestamp, + getLatestBlockNumber, +} from './utils/time' import { ITradeRequest } from './utils/trades' import { useEnv } from '#/utils/env' @@ -116,7 +122,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { it('Should setup Broker correctly', async () => { expect(await broker.gnosis()).to.equal(gnosis.address) expect(await broker.batchAuctionLength()).to.equal(config.batchAuctionLength) - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) expect(await broker.main()).to.equal(main.address) }) @@ -142,9 +149,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { main.address, gnosis.address, ZERO_ADDRESS, - bn('100'), + bn('1000'), ZERO_ADDRESS, - bn('100') + bn('1000') ) ).to.be.revertedWith('invalid batchTradeImplementation address') await expect( @@ -152,9 +159,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { main.address, gnosis.address, ONE_ADDRESS, - bn('100'), + bn('1000'), ZERO_ADDRESS, - bn('100') + bn('1000') ) ).to.be.revertedWith('invalid dutchTradeImplementation address') }) @@ -351,42 +358,70 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchAuctionLength()).to.equal(bn(0)) }) - it('Should allow to update disabled if Owner', async () => { + it('Should allow to update batchTradeDisabled/dutchTradeDisabled if Owner', async () => { // Check existing value - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // If not owner cannot update - await expect(broker.connect(other).setDisabled(true)).to.be.revertedWith('governance only') + await expect(broker.connect(other).setBatchTradeDisabled(true)).to.be.revertedWith( + 'governance only' + ) + await expect( + broker.connect(other).setDutchTradeDisabled(token0.address, true) + ).to.be.revertedWith('governance only') // Check value did not change - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update with owner - await expect(broker.connect(owner).setDisabled(true)) - .to.emit(broker, 'DisabledSet') + // Update batchTradeDisabled with owner + await expect(broker.connect(owner).setBatchTradeDisabled(true)) + .to.emit(broker, 'BatchTradeDisabledSet') .withArgs(false, true) // Check value was updated - expect(await broker.disabled()).to.equal(true) + expect(await broker.batchTradeDisabled()).to.equal(true) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Update back to false - await expect(broker.connect(owner).setDisabled(false)) - .to.emit(broker, 'DisabledSet') + await expect(broker.connect(owner).setBatchTradeDisabled(false)) + .to.emit(broker, 'BatchTradeDisabledSet') .withArgs(true, false) // Check value was updated - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) + + // Update dutchTradeDisabled with owner + await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, true)) + .to.emit(broker, 'DutchTradeDisabledSet') + .withArgs(token0.address, false, true) + + // Check value was updated + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(true) + expect(await broker.dutchTradeDisabled(token1.address)).to.equal(false) + + // Update back to false + await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, false)) + .to.emit(broker, 'DutchTradeDisabledSet') + .withArgs(token0.address, true, false) + + // Check value was updated + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(token1.address)).to.equal(false) }) }) describe('Trade Management', () => { - it('Should not allow to open trade if Disabled', async () => { - // Disable Broker - await expect(broker.connect(owner).setDisabled(true)) - .to.emit(broker, 'DisabledSet') + it('Should not allow to open Batch trade if Disabled', async () => { + // Disable Broker Batch Auctions + await expect(broker.connect(owner).setBatchTradeDisabled(true)) + .to.emit(broker, 'BatchTradeDisabledSet') .withArgs(false, true) - // Attempt to open trade const tradeRequest: ITradeRequest = { sell: collateral0.address, buy: collateral1.address, @@ -394,13 +429,59 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { minBuyAmount: bn('0'), } + // Batch Auction openTrade should fail await whileImpersonating(backingManager.address, async (bmSigner) => { await expect( broker.connect(bmSigner).openTrade(TradeKind.BATCH_AUCTION, tradeRequest, prices) - ).to.be.revertedWith('broker disabled') + ).to.be.revertedWith('batch auctions disabled') + }) + }) + + it('Should not allow to open Dutch trade if Disabled for either token', async () => { + const tradeRequest: ITradeRequest = { + sell: collateral0.address, + buy: collateral1.address, + sellAmount: bn('100e18'), + minBuyAmount: bn('0'), + } + await whileImpersonating(backingManager.address, async (bmSigner) => { + await token0.mint(backingManager.address, tradeRequest.sellAmount) + await token0.connect(bmSigner).approve(broker.address, tradeRequest.sellAmount) + + // Should succeed in callStatic + await broker + .connect(bmSigner) + .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) + + // Disable Broker Dutch Auctions for token0 + await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, true)) + .to.emit(broker, 'DutchTradeDisabledSet') + .withArgs(token0.address, false, true) + + // Dutch Auction openTrade should fail now + await expect( + broker.connect(bmSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) + ).to.be.revertedWith('dutch auctions disabled for token pair') + + // Re-enable Dutch Auctions for token0 + await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, false)) + .to.emit(broker, 'DutchTradeDisabledSet') + .withArgs(token0.address, true, false) + + // Should succeed in callStatic + await broker + .connect(bmSigner) + .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) + + // Disable Broker Dutch Auctions for token1 + await expect(broker.connect(owner).setDutchTradeDisabled(token1.address, true)) + .to.emit(broker, 'DutchTradeDisabledSet') + .withArgs(token1.address, false, true) + + // Dutch Auction openTrade should fail now await expect( broker.connect(bmSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) - ).to.be.revertedWith('broker disabled') + ).to.be.revertedWith('dutch auctions disabled for token pair') }) }) @@ -454,7 +535,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { it('Should not allow to report violation if not trade contract', async () => { // Check not disabled - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) // Should not allow to report violation from any address await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( @@ -469,12 +550,12 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { }) // Check nothing changed - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) }) it('Should not allow to report violation if paused or frozen', async () => { // Check not disabled - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) await main.connect(owner).pauseTrading() @@ -491,7 +572,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ) // Check nothing changed - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) }) }) @@ -937,6 +1018,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await token0.balanceOf(trade.address)).to.equal(0) expect(await token0.balanceOf(backingManager.address)).to.equal(amount.add(newFunds)) }) + + // There is no test here for the reportViolation case; that is in Revenues.test.ts }) context('DutchTrade', () => { @@ -978,14 +1061,15 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.sell()).to.equal(token0.address) expect(await trade.buy()).to.equal(token1.address) expect(await trade.sellAmount()).to.equal(amount) - expect(await trade.startTime()).to.equal((await getLatestBlockTimestamp()) + 12) + expect(await trade.startBlock()).to.equal((await getLatestBlockNumber()) + 1) + const tradeLen = (await trade.endBlock()).sub(await trade.startBlock()) expect(await trade.endTime()).to.equal( - (await trade.startTime()) + config.dutchAuctionLength.toNumber() + tradeLen.mul(12).add(await getLatestBlockTimestamp()) ) - expect(await trade.middlePrice()).to.equal( + expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) - expect(await trade.lowPrice()).to.equal(prices.sellLow.mul(fp('1')).div(prices.buyHigh)) + expect(await trade.worstPrice()).to.equal(prices.sellLow.mul(fp('1')).div(prices.buyHigh)) expect(await trade.canSettle()).to.equal(false) // Attempt to initialize again @@ -1050,14 +1134,14 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ).to.not.be.reverted // Check trade values - expect(await trade.middlePrice()).to.equal( + expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) const withoutSlippage = prices.sellLow.mul(fp('1')).div(prices.buyHigh) const withSlippage = withoutSlippage.sub( withoutSlippage.mul(config.maxTradeSlippage).div(fp('1')) ) - expect(await trade.lowPrice()).to.be.closeTo(withSlippage, withSlippage.div(bn('1e9'))) + expect(await trade.worstPrice()).to.be.closeTo(withSlippage, withSlippage.div(bn('1e9'))) }) it('Should apply full maxTradeSlippage with low maxTradeVolume', async () => { @@ -1093,57 +1177,14 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ).to.not.be.reverted // Check trade values - expect(await trade.middlePrice()).to.equal( + expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) const withoutSlippage = prices.sellLow.mul(fp('1')).div(prices.buyHigh) const withSlippage = withoutSlippage.sub( withoutSlippage.mul(config.maxTradeSlippage).div(fp('1')) ) - expect(await trade.lowPrice()).to.be.closeTo(withSlippage, withSlippage.div(bn('1e9'))) - }) - - it('Should apply full maxTradeSlippage with low maxTradeVolume', async () => { - // Set low maxTradeVolume for collateral - const FiatCollateralFactory = await ethers.getContractFactory('FiatCollateral') - const newCollateral0: FiatCollateral = await FiatCollateralFactory.deploy({ - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: await collateral0.chainlinkFeed(), - oracleError: ORACLE_ERROR, - erc20: token0.address, - maxTradeVolume: bn(500), - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }) - - // Refresh and swap collateral - await newCollateral0.refresh() - await assetRegistry.connect(owner).swapRegistered(newCollateral0.address) - - // Fund trade and initialize - await token0.connect(owner).mint(trade.address, amount) - await expect( - trade.init( - backingManager.address, - newCollateral0.address, - collateral1.address, - amount, - config.dutchAuctionLength, - prices - ) - ).to.not.be.reverted - - // Check trade values - expect(await trade.middlePrice()).to.equal( - divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) - ) - const withoutSlippage = prices.sellLow.mul(fp('1')).div(prices.buyHigh) - const withSlippage = withoutSlippage.sub( - withoutSlippage.mul(config.maxTradeSlippage).div(fp('1')) - ) - expect(await trade.lowPrice()).to.be.closeTo(withSlippage, withSlippage.div(bn('1e9'))) + expect(await trade.worstPrice()).to.be.closeTo(withSlippage, withSlippage.div(bn('1e9'))) }) it('Should not allow to initialize an unfunded trade', async () => { @@ -1180,8 +1221,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await expect(trade.connect(bmSigner).settle()).to.be.revertedWith('auction not over') }) - // Advance time till trade can be settled - await advanceTime(config.dutchAuctionLength.add(100).toString()) + // Advance blocks til trade can be settled + const tradeLen = (await trade.endBlock()).sub(await getLatestBlockNumber()) + await advanceBlocks(tradeLen.add(1)) // Settle trade expect(await trade.canSettle()).to.equal(true) @@ -1218,8 +1260,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { 'only after trade is closed' ) - // Advance time till trade can be settled - await advanceTime(config.dutchAuctionLength.add(100).toString()) + // Advance blocks til trade can be settled + const tradeLen = (await trade.endBlock()).sub(await getLatestBlockNumber()) + await advanceBlocks(tradeLen.add(1)) // Settle trade await whileImpersonating(backingManager.address, async (bmSigner) => { @@ -1250,6 +1293,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await token0.balanceOf(trade.address)).to.equal(0) expect(await token0.balanceOf(backingManager.address)).to.equal(amount.add(newFunds)) }) + + // There is no test here for the reportViolation case; that is in Revenues.test.ts }) }) diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 1ebc9145e4..5415dd39d6 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -46,7 +46,7 @@ import { defaultFixture, ORACLE_ERROR, } from './fixtures' -import { getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' +import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' import { CollateralStatus, TradeKind, MAX_UINT256, ZERO_ADDRESS } from '#/common/constants' import { expectTrade } from './utils/trades' import { mintCollaterals } from './utils/tokens' @@ -605,8 +605,8 @@ describe('FacadeRead + FacadeAct contracts', () => { // Nothing should be settleable expect((await facade.auctionsSettleable(trader.address)).length).to.equal(0) - // Advance time till auction ended - await advanceTime(auctionLength + 13) + // Advance time till auction is over + await advanceBlocks(2 + auctionLength / 12) // Now should be settleable const settleable = await facade.auctionsSettleable(trader.address) @@ -1097,7 +1097,7 @@ describe('FacadeRead + FacadeAct contracts', () => { expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) // Advance time till auction ended - await advanceTime(auctionLength + 13) + await advanceBlocks(1 + auctionLength / 12) // Settle and start new auction - Will retry await expectEvents( @@ -1161,7 +1161,7 @@ describe('FacadeRead + FacadeAct contracts', () => { expect((await facade.auctionsSettleable(rTokenTrader.address)).length).to.equal(0) // Advance time till auction ended - await advanceTime(auctionLength + 13) + await advanceBlocks(1 + auctionLength / 12) // Upgrade components to V2 await backingManager.connect(owner).upgradeTo(backingManagerV2.address) @@ -1196,7 +1196,7 @@ describe('FacadeRead + FacadeAct contracts', () => { await rTokenTrader.connect(owner).upgradeTo(revTraderV1.address) // Advance time till auction ended - await advanceTime(auctionLength + 13) + await advanceBlocks(1 + auctionLength / 12) // Settle and start new auction - Will retry again await expectEvents( diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 16ffc14f07..c6f62c1cc9 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -37,7 +37,13 @@ import { TestIStRSR, USDCMock, } from '../typechain' -import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp } from './utils/time' +import { + advanceTime, + advanceBlocks, + advanceToTimestamp, + getLatestBlockTimestamp, + getLatestBlockNumber, +} from './utils/time' import { Collateral, defaultFixture, @@ -3279,7 +3285,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) // Check the empty buffer block as well - await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 12) + await advanceBlocks(1) await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.be.revertedWith( 'already rebalancing' ) @@ -3296,29 +3302,30 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) await token1.connect(addr1).approve(trade.address, initialBal) - const start = await trade.startTime() - const end = await trade.endTime() - await advanceToTimestamp(start) + const start = await trade.startBlock() + const end = await trade.endBlock() // Simulate 30 minutes of blocks, should swap at right price each time - for (let now = await getLatestBlockTimestamp(); now <= end; now += 12) { + let now = bn(await getLatestBlockNumber()) + while (now.lt(end)) { const actual = await trade.connect(addr1).bidAmount(now) const expected = divCeil( await dutchBuyAmount( - fp(now - start).div(end - start), - rTokenAsset.address, + fp(now.sub(start)).div(end.sub(start)), + collateral1.address, collateral0.address, issueAmount, config.minTradeVolume, config.maxTradeSlippage ), - bn('1e12') // fix for decimals + bn('1e12') ) expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) const staticResult = await trade.connect(addr1).callStatic.bid() - expect(staticResult).to.equal(expected) - await advanceToTimestamp((await getLatestBlockTimestamp()) + 12) + expect(staticResult).to.equal(actual) + await advanceBlocks(1) + now = bn(await getLatestBlockNumber()) } }) @@ -3329,9 +3336,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await backingManager.trades(token0.address) ) await token1.connect(addr1).approve(trade.address, initialBal) - await advanceToTimestamp((await trade.endTime()) + 1) + + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) await expect( - trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) + trade.connect(addr1).bidAmount(await getLatestBlockNumber()) ).to.be.revertedWith('auction over') await expect(trade.connect(addr1).bid()).be.revertedWith('auction over') @@ -3358,7 +3366,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await token1.connect(addr1).approve(trade1.address, initialBal) // Snipe auction at 0s left - await advanceToTimestamp((await trade1.endTime()) - 1) + await advanceBlocks((await trade1.endBlock()).sub(await getLatestBlockNumber()).sub(1)) await trade1.connect(addr1).bid() expect(await trade1.canSettle()).to.equal(false) expect(await trade1.status()).to.equal(2) // Status.CLOSED @@ -3367,7 +3375,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { const expected = divCeil( await dutchBuyAmount( - fp(auctionLength).div(auctionLength), // last possible second + fp('1'), // last block collateral0.address, collateral1.address, issueAmount, @@ -3397,8 +3405,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { it('even under worst-possible bids', async () => { await token1.connect(addr1).approve(trade2.address, initialBal) - // Advance to final second of auction - await advanceToTimestamp((await trade2.endTime()) - 1) + // Advance to final block of auction + await advanceBlocks((await trade2.endBlock()).sub(await getLatestBlockNumber()).sub(1)) expect(await trade2.status()).to.equal(1) // TradeStatus.OPEN expect(await trade2.canSettle()).to.equal(false) @@ -3407,8 +3415,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('via fallback to Batch Auction', async () => { - // Advance past auction timeout - await advanceToTimestamp((await trade2.endTime()) + 1) + // Advance past auction end block + await advanceBlocks((await trade2.endBlock()).sub(await getLatestBlockNumber()).add(1)) expect(await trade2.status()).to.equal(1) // TradeStatus.OPEN expect(await trade2.canSettle()).to.equal(true) @@ -5193,7 +5201,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { tradeAddr = await backingManager.trades(rsr.address) trade = await ethers.getContractAt('DutchTrade', tradeAddr) await backupToken1.connect(addr1).approve(trade.address, initialBal) - await advanceToTimestamp((await trade.startTime()) - 1) await snapshotGasCost(trade.connect(addr1).bid()) // No new trade diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index f95ee4a894..6b4dad02c8 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -46,9 +46,9 @@ import { whileImpersonating } from './utils/impersonation' import snapshotGasCost from './utils/snapshotGasCost' import { advanceTime, - advanceToTimestamp, + advanceBlocks, + getLatestBlockNumber, getLatestBlockTimestamp, - setNextBlockTimestamp, } from './utils/time' import { withinQuad } from './utils/matchers' import { @@ -2087,7 +2087,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal(expectedToTrader) }) - it('Should report violation when auction behaves incorrectly', async () => { + it('Should report violation when Batch Auction behaves incorrectly', async () => { + // This test needs to be in this file and not Broker.test.ts because settleTrade() + // requires the BackingManager _actually_ started the trade + rewardAmountAAVE = bn('0.5e18') // AAVE Rewards @@ -2186,7 +2189,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: broker, - name: 'DisabledSet', + name: 'BatchTradeDisabledSet', args: [false, true], emitted: true, }, @@ -2225,7 +2228,233 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) }) - it('Should not perform auction if Broker is disabled', async () => { + it('Should report violation when Dutch Auction clears in geometric phase', async () => { + // This test needs to be in this file and not Broker.test.ts because settleTrade() + // requires the BackingManager _actually_ started the trade + + rewardAmountAAVE = bn('0.5e18') + + // AAVE Rewards + await token2.setRewards(backingManager.address, rewardAmountAAVE) + + // Collect revenue + // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + // Claim rewards + + await expectEvents(facadeTest.claimRewards(rToken.address), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, bn(0)], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, rewardAmountAAVE], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Run auctions + await expectEvents( + facadeTest.runAuctionsForAllTradersForKind(rToken.address, TradeKind.DUTCH_AUCTION), + [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ] + ) + + // Check auctions registered + // AAVE -> RSR Auction + const rsrTrade = await ethers.getContractAt( + 'DutchTrade', + ( + await getTrade(rsrTrader, aaveToken.address) + ).address + ) + expect(await rsrTrade.sell()).to.equal(aaveToken.address) + expect(await rsrTrade.buy()).to.equal(rsr.address) + expect(await rsrTrade.sellAmount()).to.equal(sellAmt) + + // AAVE -> RToken Auction + const rTokenTrade = await ethers.getContractAt( + 'DutchTrade', + ( + await getTrade(rTokenTrader, aaveToken.address) + ).address + ) + expect(await rTokenTrade.sell()).to.equal(aaveToken.address) + expect(await rTokenTrade.buy()).to.equal(rToken.address) + expect(await rTokenTrade.sellAmount()).to.equal(sellAmtRToken) + + // Should not be disabled to start + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) + + // Advance time near end of geometric phase + await advanceBlocks(config.dutchAuctionLength.div(12).div(5).sub(5)) + + // Should settle RSR auction + await rsr.connect(addr1).approve(rsrTrade.address, sellAmt.mul(10)) + await expect(rsrTrade.connect(addr1).bid()) + .to.emit(rsrTrader, 'TradeSettled') + .withArgs(anyValue, aaveToken.address, rsr.address, sellAmt, anyValue) + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(true) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(true) + + // Should still be able to settle RToken auction, even though aaveToken is now disabled + await rToken.connect(addr1).approve(rTokenTrade.address, sellAmtRToken.mul(10)) + await expect(rTokenTrade.connect(addr1).bid()) + .to.emit(rTokenTrader, 'TradeSettled') + .withArgs(anyValue, aaveToken.address, rToken.address, sellAmtRToken, anyValue) + + // Check all 3 tokens are disabled for dutch auctions + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(true) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(true) + expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(true) + }) + + it('Should not report violation when Dutch Auction clears in first linear phase', async () => { + // This test needs to be in this file and not Broker.test.ts because settleTrade() + // requires the BackingManager _actually_ started the trade + + rewardAmountAAVE = bn('0.5e18') + + // AAVE Rewards + await token2.setRewards(backingManager.address, rewardAmountAAVE) + + // Collect revenue + // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + // Claim rewards + + await expectEvents(facadeTest.claimRewards(rToken.address), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, bn(0)], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, rewardAmountAAVE], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Run auctions + await expectEvents( + facadeTest.runAuctionsForAllTradersForKind(rToken.address, TradeKind.DUTCH_AUCTION), + [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ] + ) + + // Check auctions registered + // AAVE -> RSR Auction + const rsrTrade = await ethers.getContractAt( + 'DutchTrade', + ( + await getTrade(rsrTrader, aaveToken.address) + ).address + ) + expect(await rsrTrade.sell()).to.equal(aaveToken.address) + expect(await rsrTrade.buy()).to.equal(rsr.address) + expect(await rsrTrade.sellAmount()).to.equal(sellAmt) + + // AAVE -> RToken Auction + const rTokenTrade = await ethers.getContractAt( + 'DutchTrade', + ( + await getTrade(rTokenTrader, aaveToken.address) + ).address + ) + expect(await rTokenTrade.sell()).to.equal(aaveToken.address) + expect(await rTokenTrade.buy()).to.equal(rToken.address) + expect(await rTokenTrade.sellAmount()).to.equal(sellAmtRToken) + + // Should not be disabled to start + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) + + // Advance time to middle of first linear phase + await advanceBlocks(config.dutchAuctionLength.div(12).div(3)) + + // Should settle RSR auction + await rsr.connect(addr1).approve(rsrTrade.address, sellAmt.mul(10)) + await expect(rsrTrade.connect(addr1).bid()) + .to.emit(rsrTrader, 'TradeSettled') + .withArgs(anyValue, aaveToken.address, rsr.address, sellAmt, anyValue) + + // Should settle RToken auction + await rToken.connect(addr1).approve(rTokenTrade.address, sellAmtRToken.mul(10)) + await expect(rTokenTrade.connect(addr1).bid()) + .to.emit(rTokenTrader, 'TradeSettled') + .withArgs(anyValue, aaveToken.address, rToken.address, sellAmtRToken, anyValue) + + // Should not have disabled anything + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) + }) + + it('Should not perform auction if Batch Trades are disabled', async () => { rewardAmountAAVE = bn('0.5e18') // AAVE Rewards @@ -2255,7 +2484,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal(0) // Disable broker - await broker.connect(owner).setDisabled(true) + await broker.connect(owner).setBatchTradeDisabled(true) // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% @@ -2265,10 +2494,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await backingManager.forwardRevenue([aaveToken.address]) await expect( rsrTrader.manageTokens([aaveToken.address], [TradeKind.BATCH_AUCTION]) - ).to.be.revertedWith('broker disabled') + ).to.be.revertedWith('batch auctions disabled') await expect( rTokenTrader.manageTokens([aaveToken.address], [TradeKind.BATCH_AUCTION]) - ).to.be.revertedWith('broker disabled') + ).to.be.revertedWith('batch auctions disabled') // Check funds - remain in traders expect(await rsr.balanceOf(stRSR.address)).to.equal(0) @@ -2655,64 +2884,17 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Cannot get bid amount yet await expect( - trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) + trade.connect(addr1).bidAmount(await getLatestBlockNumber()) ).to.be.revertedWith('auction not started') - // Advance to start time - const start = await trade.startTime() - await advanceToTimestamp(start) - - // Now we can get bid amount - const actual = await trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) - expect(actual).to.be.gt(bn(0)) - }) - - it('Should allow one bidder', async () => { - await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2)) - await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - - const trade = await ethers.getContractAt( - 'DutchTrade', - await rTokenTrader.trades(token0.address) - ) - - // Advance to auction on-going - await advanceToTimestamp((await trade.endTime()) - 1000) - - // Bid - await rToken.connect(addr1).approve(trade.address, initialBal) - await trade.connect(addr1).bid() - expect(await trade.bidder()).to.equal(addr1.address) - - // Cannot bid once is settled - await expect(trade.connect(addr1).bid()).to.be.revertedWith('bid already received') - }) - - it('Should not return bid amount before auction starts', async () => { - await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) - await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - - const trade = await ethers.getContractAt( - 'DutchTrade', - await rTokenTrader.trades(token0.address) - ) - - // Cannot get bid amount yet - await expect( - trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) - ).to.be.revertedWith('auction not started') - - // Advance to start time - const start = await trade.startTime() - await advanceToTimestamp(start) - - // Now we can get bid amount - const actual = await trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) + // Can get bid amount in following block + await advanceBlocks(1) + const actual = await trade.connect(addr1).bidAmount(await getLatestBlockNumber()) expect(actual).to.be.gt(bn(0)) }) it('Should allow one bidder', async () => { - await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2)) + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) const trade = await ethers.getContractAt( @@ -2720,11 +2902,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rTokenTrader.trades(token0.address) ) - // Advance to auction on-going - await advanceToTimestamp((await trade.endTime()) - 1000) - // Bid - await rToken.connect(addr1).approve(trade.address, initialBal) + await rToken.connect(addr1).approve(trade.address, issueAmount) await trade.connect(addr1).bid() expect(await trade.bidder()).to.equal(addr1.address) @@ -2742,15 +2921,15 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) await rToken.connect(addr1).approve(trade.address, initialBal) - const start = await trade.startTime() - const end = await trade.endTime() - await advanceToTimestamp(start) + const start = await trade.startBlock() + const end = await trade.endBlock() // Simulate 30 minutes of blocks, should swap at right price each time - for (let now = await getLatestBlockTimestamp(); now <= end; now += 12) { + let now = bn(await getLatestBlockNumber()) + while (now.lt(end)) { const actual = await trade.connect(addr1).bidAmount(now) const expected = await dutchBuyAmount( - fp(now - start).div(end - start), + fp(now.sub(start)).div(end.sub(start)), rTokenAsset.address, collateral0.address, issueAmount, @@ -2761,7 +2940,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const staticResult = await trade.connect(addr1).callStatic.bid() expect(staticResult).to.equal(actual) - await advanceToTimestamp((await getLatestBlockTimestamp()) + 12) + await advanceBlocks(1) + now = bn(await getLatestBlockNumber()) } }) @@ -2774,9 +2954,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) await rToken.connect(addr1).approve(trade.address, initialBal) - await advanceToTimestamp((await trade.endTime()) + 1) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) await expect( - trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) + trade.connect(addr1).bidAmount(await getLatestBlockNumber()) ).to.be.revertedWith('auction over') await expect(trade.connect(addr1).bid()).be.revertedWith('auction over') @@ -2790,7 +2970,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await backingManager.tradesOpen()).to.equal(0) }) - it('Should bid at exactly endTime() and not launch another auction', async () => { + it('Should bid at exactly endBlock() and not launch another auction', async () => { await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) const trade = await ethers.getContractAt( @@ -2798,12 +2978,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rTokenTrader.trades(token0.address) ) await rToken.connect(addr1).approve(trade.address, initialBal) + await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted // Snipe auction at 0s left - await advanceToTimestamp((await trade.endTime()) - 1) - await expect(trade.bidAmount(await trade.endTime())).to.not.be.reverted - // Set timestamp to be exactly endTime() - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) await trade.connect(addr1).bid() expect(await trade.canSettle()).to.equal(false) expect(await trade.status()).to.equal(2) // Status.CLOSED diff --git a/test/Upgradeability.test.ts b/test/Upgradeability.test.ts index 3a6e62135c..0c94eec20c 100644 --- a/test/Upgradeability.test.ts +++ b/test/Upgradeability.test.ts @@ -284,7 +284,9 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { expect(await newBroker.gnosis()).to.equal(gnosis.address) expect(await newBroker.batchAuctionLength()).to.equal(config.batchAuctionLength) expect(await newBroker.dutchAuctionLength()).to.equal(config.dutchAuctionLength) - expect(await newBroker.disabled()).to.equal(false) + expect(await newBroker.batchTradeDisabled()).to.equal(false) + expect(await newBroker.dutchTradeDisabled(rToken.address)).to.equal(false) + expect(await newBroker.dutchTradeDisabled(rsr.address)).to.equal(false) expect(await newBroker.main()).to.equal(main.address) }) @@ -553,7 +555,9 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { // Check state is preserved expect(await brokerV2.gnosis()).to.equal(gnosis.address) expect(await brokerV2.batchAuctionLength()).to.equal(config.batchAuctionLength) - expect(await brokerV2.disabled()).to.equal(false) + expect(await brokerV2.batchTradeDisabled()).to.equal(false) + expect(await brokerV2.dutchTradeDisabled(rToken.address)).to.equal(false) + expect(await brokerV2.dutchTradeDisabled(rsr.address)).to.equal(false) expect(await brokerV2.main()).to.equal(main.address) // Check new version is implemented diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 877effc053..16798523be 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -188,7 +188,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function afterEach(async () => { // Should not trigger a de-listing of the auction platform - expect(await broker.disabled()).to.equal(false) + expect(await broker.batchTradeDisabled()).to.equal(false) // Should not be able to re-bid in auction await token0.connect(addr2).approve(easyAuction.address, buyAmt) @@ -840,8 +840,8 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function await advanceTime(config.batchAuctionLength.add(100).toString()) // End Auction - await expect(trade.connect(addr1).settle()).to.not.emit(broker, 'DisabledSet') - expect(await broker.disabled()).to.equal(false) + await expect(trade.connect(addr1).settle()).to.not.emit(broker, 'BatchTradeDisabledSet') + expect(await broker.batchTradeDisabled()).to.equal(false) } // ==== Generate the tests ==== @@ -887,7 +887,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function }) describe('Regression Tests', () => { - it('Passes Test: 12/03/2023 - Broker Disabled on Trade Settlement with one less token', async () => { + it('Passes Test: 12/03/2023 - Batch Auctions on Trade Settlement with one less token', async () => { // TX: 0xb5fc3d61d46e41b79bd333583448e6d4c186ca49206f8a0e7dde05f2700e0965 // This set the broker to false since it was one token short. // This test is to make sure that the broker is not disabled in this case. diff --git a/test/utils/trades.ts b/test/utils/trades.ts index 7302e0489f..7c7e75d394 100644 --- a/test/utils/trades.ts +++ b/test/utils/trades.ts @@ -104,21 +104,29 @@ export const dutchBuyAmount = async ( const leftover = slippage1e18.mod(fp('1')) const slippage = slippage1e18.div(fp('1')).add(leftover.gte(fp('0.5')) ? 1 : 0) - const lowPrice = sellLow.mul(fp('1').sub(slippage)).div(buyHigh) - const middlePrice = divCeil(sellHigh.mul(fp('1')), buyLow) - - const FORTY_PERCENT = fp('0.4') // 40% - const SIXTY_PERCENT = fp('0.6') // 60% + const worstPrice = sellLow.mul(fp('1').sub(slippage)).div(buyHigh) + const bestPrice = divCeil(sellHigh.mul(fp('1')), buyLow) + const highPrice = divCeil(sellHigh.mul(fp('1.5')), buyLow) let price: BigNumber - if (progression.lt(FORTY_PERCENT)) { - const exp = divRound(bn('6907752').mul(FORTY_PERCENT.sub(progression)), FORTY_PERCENT) + if (progression.lt(fp('0.2'))) { + const exp = divRound(bn('6502287').mul(fp('0.2').sub(progression)), fp('0.2')) const divisor = new Decimal('999999').div('1000000').pow(exp.toString()) - price = divCeil(middlePrice.mul(fp('1')), fp(divisor.toString())) - } else { - price = middlePrice.sub( - middlePrice.sub(lowPrice).mul(progression.sub(FORTY_PERCENT)).div(SIXTY_PERCENT) + price = divCeil(highPrice.mul(fp('1')), fp(divisor.toString())) + } else if (progression.lt(fp('0.45'))) { + price = highPrice.sub( + highPrice + .sub(bestPrice) + .mul(progression.sub(fp('0.2'))) + .div(fp('0.25')) + ) + } else if (progression.lt(fp('0.95'))) { + price = bestPrice.sub( + bestPrice + .sub(worstPrice) + .mul(progression.sub(fp('0.45'))) + .div(fp('0.5')) ) - } + } else price = worstPrice return divCeil(outAmount.mul(price), fp('1')) } From ef66344390994daae2c222bda1ce83a6b1b6dfbc Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Thu, 3 Aug 2023 19:11:01 -0400 Subject: [PATCH 007/450] c4 #51 (#871) --- contracts/facade/FacadeRead.sol | 2 ++ contracts/p1/BasketHandler.sol | 1 + contracts/p1/RToken.sol | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 9c0d0ffa5f..694ae839c6 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -49,6 +49,8 @@ contract FacadeRead is IFacadeRead { return basketsHeld.bottom.mulDiv(totalSupply, needed).shiftl_toUint(decimals); } + /// Do no use inifite approvals. Instead, use BasketHandler.quote() to determine the amount + /// of backing tokens to approve. /// @return tokens The erc20 needed for the issuance /// @return deposits {qTok} The deposits necessary to issue `amount` RToken /// @return depositsUoA {UoA} The UoA value of the deposits necessary to issue `amount` RToken diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 7bcd48028d..441007d763 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -356,6 +356,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } /// Return the current issuance/redemption value of `amount` BUs + /// Any approvals needed to issue RTokens should be set to the values returned by this function /// @dev Subset of logic of quoteCustomRedemption; more gas efficient for current nonce /// @param amount {BU} /// @return erc20s The backing collateral erc20s diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index f68a43a53e..dd5b1790a9 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -87,6 +87,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { } /// Issue an RToken on the current basket + /// Do no use inifite approvals. Instead, use BasketHandler.quote() to determine the amount + /// of backing tokens to approve. /// @param amount {qTok} The quantity of RToken to issue /// @custom:interaction nearly CEI, but see comments around handling of refunds function issue(uint256 amount) public { @@ -94,6 +96,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { } /// Issue an RToken on the current basket, to a particular recipient + /// Do no use inifite approvals. Instead, use BasketHandler.quote() to determine the amount + /// of backing tokens to approve. /// @param recipient The address to receive the issued RTokens /// @param amount {qRTok} The quantity of RToken to issue /// @custom:interaction RCEI From 117f63eba95ade0df342dc629c276917e3248db8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 4 Aug 2023 23:26:22 +0200 Subject: [PATCH 008/450] gas test asset.refresh() for all tests (#880) --- test/plugins/Asset.test.ts | 40 +++- test/plugins/Collateral.test.ts | 92 +++++--- .../aave/ATokenFiatCollateral.test.ts | 211 ++++++++++++++++-- .../ATokenFiatCollateral.test.ts.snap | 25 +++ .../AnkrEthCollateralTestSuite.test.ts.snap | 17 ++ .../CBETHCollateral.test.ts.snap | 17 ++ .../individual-collateral/collateralTests.ts | 49 ++++ .../compoundv2/CTokenFiatCollateral.test.ts | 175 ++++++++++++++- .../CTokenFiatCollateral.test.ts.snap | 25 +++ .../__snapshots__/CometTestSuite.test.ts.snap | 25 +++ .../curve/collateralTests.ts | 54 +++++ .../CrvStableMetapoolSuite.test.ts.snap | 25 +++ ...StableRTokenMetapoolTestSuite.test.ts.snap | 25 +++ .../CrvStableTestSuite.test.ts.snap | 25 +++ .../CrvVolatileTestSuite.test.ts.snap | 25 +++ .../CvxStableMetapoolSuite.test.ts.snap | 25 +++ ...StableRTokenMetapoolTestSuite.test.ts.snap | 25 +++ .../CvxStableTestSuite.test.ts.snap | 25 +++ .../CvxVolatileTestSuite.test.ts.snap | 25 +++ .../SDaiCollateralTestSuite.test.ts.snap | 17 ++ .../FTokenFiatCollateral.test.ts.snap | 49 ++++ .../SFrxEthTestSuite.test.ts.snap | 13 ++ .../LidoStakedEthTestSuite.test.ts.snap | 25 +++ .../MorphoAAVEFiatCollateral.test.ts.snap | 49 ++++ .../MorphoAAVENonFiatCollateral.test.ts.snap | 33 +++ ...AAVESelfReferentialCollateral.test.ts.snap | 17 ++ .../RethCollateralTestSuite.test.ts.snap | 17 ++ .../StargateETHTestSuite.test.ts.snap | 49 ++++ 28 files changed, 1140 insertions(+), 59 deletions(-) create mode 100644 test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 2a6f946314..3d9661263f 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -3,7 +3,12 @@ import { expect } from 'chai' import { Wallet, ContractFactory } from 'ethers' import { ethers } from 'hardhat' import { IConfig } from '../../common/configuration' -import { advanceBlocks, advanceTime, getLatestBlockTimestamp } from '../utils/time' +import { + advanceBlocks, + advanceTime, + getLatestBlockTimestamp, + setNextBlockTimestamp, +} from '../utils/time' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../common/constants' import { bn, fp } from '../../common/numbers' import { @@ -34,11 +39,18 @@ import { import { Collateral, defaultFixture, + IMPLEMENTATION, + Implementation, ORACLE_TIMEOUT, ORACLE_ERROR, PRICE_TIMEOUT, VERSION, } from '../fixtures' +import { useEnv } from '#/utils/env' +import snapshotGasCost from '../utils/snapshotGasCost' + +const describeGas = + IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip const DEFAULT_THRESHOLD = fp('0.01') // 1% const DELAY_UNTIL_DEFAULT = bn('86400') // 24h @@ -664,4 +676,30 @@ describe('Assets contracts #fast', () => { ) }) }) + + describeGas('Gas Reporting', () => { + context('refresh()', () => { + afterEach(async () => { + await snapshotGasCost(rsrAsset.refresh()) + await snapshotGasCost(rsrAsset.refresh()) // 2nd refresh can be different than 1st + }) + + it('refresh() during SOUND', async () => { + // pass + }) + + it('refresh() after oracle timeout', async () => { + const oracleTimeout = await rsrAsset.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(bn(oracleTimeout).div(12)) + }) + + it('refresh() after full price timeout', async () => { + await advanceTime((await rsrAsset.priceTimeout()) + (await rsrAsset.oracleTimeout())) + const lotP = await rsrAsset.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) + }) + }) + }) }) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index d2fdbc0177..69225d900b 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -29,9 +29,13 @@ import { UnpricedAppreciatingFiatCollateralMock, USDCMock, WETH9, - UnpricedAppreciatingFiatCollateralMock, } from '../../typechain' -import { advanceTime, getLatestBlockTimestamp, setNextBlockTimestamp } from '../utils/time' +import { + advanceBlocks, + advanceTime, + getLatestBlockTimestamp, + setNextBlockTimestamp, +} from '../utils/time' import snapshotGasCost from '../utils/snapshotGasCost' import { expectPrice, @@ -2164,45 +2168,69 @@ describe('Collateral contracts', () => { }) describeGas('Gas Reporting', () => { - it('Force Updates - Soft Default', async function () { - const delayUntilDefault: BigNumber = bn(await tokenCollateral.delayUntilDefault()) + context('refresh()', () => { + it('during SOUND', async () => { + await snapshotGasCost(tokenCollateral.refresh()) + await snapshotGasCost(usdcCollateral.refresh()) + }) - // Depeg one of the underlying tokens - Reducing price 20% - // Should also impact on the aToken and cToken - await setOraclePrice(tokenCollateral.address, bn('7e7')) + it('during + after soft default', async function () { + const delayUntilDefault: BigNumber = bn(await tokenCollateral.delayUntilDefault()) - // Force updates - Should update whenDefault and status - await snapshotGasCost(tokenCollateral.refresh()) - expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) + // Depeg one of the underlying tokens - Reducing price 20% + // Should also impact on the aToken and cToken + await setOraclePrice(tokenCollateral.address, bn('7e7')) - // Adance half the delay - await advanceTime(Number(delayUntilDefault.div(2)) + 1) + // Force updates - Should update whenDefault and status + await snapshotGasCost(tokenCollateral.refresh()) + expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) - // Force updates - Nothing occurs - await snapshotGasCost(tokenCollateral.refresh()) - await snapshotGasCost(usdcCollateral.refresh()) - expect(await usdcCollateral.status()).to.equal(CollateralStatus.SOUND) - expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) + // Adance half the delay + await advanceTime(Number(delayUntilDefault.div(2)) + 1) - // Adance the other half - await advanceTime(Number(delayUntilDefault.div(2)) + 1) + // Force updates - Nothing occurs + await snapshotGasCost(tokenCollateral.refresh()) + await snapshotGasCost(usdcCollateral.refresh()) + expect(await usdcCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) - // Move time forward past delayUntilDefault - expect(await tokenCollateral.status()).to.equal(CollateralStatus.DISABLED) - expect(await usdcCollateral.status()).to.equal(CollateralStatus.SOUND) - }) + // Adance the other half + await advanceTime(Number(delayUntilDefault.div(2)) + 1) - it('Force Updates - Hard Default - ATokens/CTokens', async function () { - // Decrease rate for AToken and CToken, will disable collateral immediately - await aToken.setExchangeRate(fp('0.99')) - await cToken.setExchangeRate(fp('0.95')) + // Move time forward past delayUntilDefault + expect(await tokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await usdcCollateral.status()).to.equal(CollateralStatus.SOUND) + await snapshotGasCost(tokenCollateral.refresh()) + await snapshotGasCost(usdcCollateral.refresh()) + }) - // Force updates - Should update whenDefault and status for Atokens/CTokens - await snapshotGasCost(aTokenCollateral.refresh()) - expect(await aTokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + it('after hard default', async function () { + // Decrease rate for AToken and CToken, will disable collateral immediately + await aToken.setExchangeRate(fp('0.99')) + await cToken.setExchangeRate(fp('0.95')) - await snapshotGasCost(cTokenCollateral.refresh()) - expect(await cTokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + // Force updates - Should update whenDefault and status for Atokens/CTokens + await snapshotGasCost(aTokenCollateral.refresh()) + expect(await aTokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + + await snapshotGasCost(cTokenCollateral.refresh()) + expect(await cTokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + }) + + it('after oracle timeout', async () => { + const oracleTimeout = await tokenCollateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(oracleTimeout / 12) + }) + + it('after full price timeout', async () => { + await advanceTime( + (await tokenCollateral.priceTimeout()) + (await tokenCollateral.oracleTimeout()) + ) + const lotP = await tokenCollateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) + }) }) }) }) diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 38853a79c9..b74fda69de 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -3,7 +3,13 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' import hre, { ethers } from 'hardhat' -import { IMPLEMENTATION, ORACLE_ERROR, PRICE_TIMEOUT, REVENUE_HIDING } from '../../../fixtures' +import { + IMPLEMENTATION, + Implementation, + ORACLE_ERROR, + PRICE_TIMEOUT, + REVENUE_HIDING, +} from '../../../fixtures' import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' @@ -26,7 +32,12 @@ import { expectUnpriced, setOraclePrice, } from '../../../utils/oracles' -import { advanceBlocks, advanceTime, getLatestBlockTimestamp } from '../../../utils/time' +import { + advanceBlocks, + advanceTime, + getLatestBlockTimestamp, + setNextBlockTimestamp, +} from '../../../utils/time' import { Asset, ATokenFiatCollateral, @@ -50,6 +61,10 @@ import { } from '../../../../typechain' import { useEnv } from '#/utils/env' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import snapshotGasCost from '../../../utils/snapshotGasCost' + +const describeGas = + IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip // Setup test environment const setup = async (blockNumber: number) => { @@ -709,7 +724,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Test for soft default it('Updates status in case of soft default', async () => { // Redeploy plugin using a Chainlink mock feed where we can change the price - const newCDaiCollateral: ATokenFiatCollateral = await ( + const newADaiCollateral: ATokenFiatCollateral = await ( await ethers.getContractFactory('ATokenFiatCollateral') ).deploy( { @@ -727,36 +742,36 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ) // Check initial state - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) - expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newADaiCollateral.whenDefault()).to.equal(MAX_UINT48) // Depeg one of the underlying tokens - Reducing price 20% - await setOraclePrice(newCDaiCollateral.address, bn('8e7')) // -20% + await setOraclePrice(newADaiCollateral.address, bn('8e7')) // -20% // Force updates - Should update whenDefault and status - await expect(newCDaiCollateral.refresh()) - .to.emit(newCDaiCollateral, 'CollateralStatusChanged') + await expect(newADaiCollateral.refresh()) + .to.emit(newADaiCollateral, 'CollateralStatusChanged') .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.IFFY) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.IFFY) const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()).add( delayUntilDefault ) - expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + expect(await newADaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) // Move time forward past delayUntilDefault await advanceTime(Number(delayUntilDefault)) - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.DISABLED) // Nothing changes if attempt to refresh after default // CToken - const prevWhenDefault: BigNumber = await newCDaiCollateral.whenDefault() - await expect(newCDaiCollateral.refresh()).to.not.emit( - newCDaiCollateral, + const prevWhenDefault: BigNumber = await newADaiCollateral.whenDefault() + await expect(newADaiCollateral.refresh()).to.not.emit( + newADaiCollateral, 'CollateralStatusChanged' ) - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) - expect(await newCDaiCollateral.whenDefault()).to.equal(prevWhenDefault) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await newADaiCollateral.whenDefault()).to.equal(prevWhenDefault) }) // Test for hard default @@ -774,7 +789,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await saDaiMock.setExchangeRate(fp('0.02')) // Redeploy plugin using the new aDai mock - const newCDaiCollateral: ATokenFiatCollateral = await ( + const newADaiCollateral: ATokenFiatCollateral = await ( await ethers.getContractFactory('ATokenFiatCollateral') ).deploy( { @@ -790,23 +805,23 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi }, REVENUE_HIDING ) - await newCDaiCollateral.refresh() + await newADaiCollateral.refresh() // Check initial state - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) - expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newADaiCollateral.whenDefault()).to.equal(MAX_UINT48) // Decrease rate for aDAI, will disable collateral immediately await saDaiMock.setExchangeRate(fp('0.019')) // Force updates - Should update whenDefault and status for Atokens/aTokens - await expect(newCDaiCollateral.refresh()) - .to.emit(newCDaiCollateral, 'CollateralStatusChanged') + await expect(newADaiCollateral.refresh()) + .to.emit(newADaiCollateral, 'CollateralStatusChanged') .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.DISABLED) const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + expect(await newADaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) }) it('Reverts if oracle reverts or runs out of gas, maintains status', async () => { @@ -845,4 +860,152 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await invalidCTokenCollateral.status()).to.equal(CollateralStatus.SOUND) }) }) + + describeGas('Gas Reporting', () => { + context('refresh()', () => { + it('during SOUND', async () => { + await snapshotGasCost(aDaiCollateral.refresh()) + await snapshotGasCost(aDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after hard default', async () => { + const sATokenMockFactory: ContractFactory = await ethers.getContractFactory( + 'StaticATokenMock' + ) + const aDaiErc20 = await ethers.getContractAt('ERC20Mock', aDai.address) + const symbol = await aDaiErc20.symbol() + const saDaiMock: StaticATokenMock = ( + await sATokenMockFactory.deploy(symbol + ' Token', symbol, dai.address) + ) + // Set initial exchange rate to the new aDai Mock + await saDaiMock.setExchangeRate(fp('0.02')) + + // Redeploy plugin using the new aDai mock + const newADaiCollateral: ATokenFiatCollateral = await ( + await ethers.getContractFactory('ATokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await aDaiCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: saDaiMock.address, + maxTradeVolume: await aDaiCollateral.maxTradeVolume(), + oracleTimeout: await aDaiCollateral.oracleTimeout(), + targetName: await aDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await aDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + await newADaiCollateral.refresh() + + // Decrease rate for aDAI, will disable collateral immediately + await saDaiMock.setExchangeRate(fp('0.019')) + await snapshotGasCost(newADaiCollateral.refresh()) + await snapshotGasCost(newADaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('during soft default', async () => { + // Redeploy plugin using a Chainlink mock feed where we can change the price + const newADaiCollateral: ATokenFiatCollateral = await ( + await ethers.getContractFactory('ATokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: mockChainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: await aDaiCollateral.erc20(), + maxTradeVolume: await aDaiCollateral.maxTradeVolume(), + oracleTimeout: await aDaiCollateral.oracleTimeout(), + targetName: await aDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await aDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + + // Check initial state + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newADaiCollateral.whenDefault()).to.equal(MAX_UINT48) + + // Depeg one of the underlying tokens - Reducing price 20% + await setOraclePrice(newADaiCollateral.address, bn('8e7')) // -20% + await snapshotGasCost(newADaiCollateral.refresh()) + await snapshotGasCost(newADaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after soft default', async () => { + // Redeploy plugin using a Chainlink mock feed where we can change the price + const newADaiCollateral: ATokenFiatCollateral = await ( + await ethers.getContractFactory('ATokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: mockChainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: await aDaiCollateral.erc20(), + maxTradeVolume: await aDaiCollateral.maxTradeVolume(), + oracleTimeout: await aDaiCollateral.oracleTimeout(), + targetName: await aDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await aDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + + // Check initial state + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newADaiCollateral.whenDefault()).to.equal(MAX_UINT48) + + // Depeg one of the underlying tokens - Reducing price 20% + await setOraclePrice(newADaiCollateral.address, bn('8e7')) // -20% + + // Force updates - Should update whenDefault and status + await expect(newADaiCollateral.refresh()) + .to.emit(newADaiCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.IFFY) + + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()).add( + delayUntilDefault + ) + expect(await newADaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Move time forward past delayUntilDefault + await advanceTime(Number(delayUntilDefault)) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + + // Nothing changes if attempt to refresh after default + // CToken + const prevWhenDefault: BigNumber = await newADaiCollateral.whenDefault() + await expect(newADaiCollateral.refresh()).to.not.emit( + newADaiCollateral, + 'CollateralStatusChanged' + ) + expect(await newADaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await newADaiCollateral.whenDefault()).to.equal(prevWhenDefault) + await snapshotGasCost(newADaiCollateral.refresh()) + await snapshotGasCost(newADaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after oracle timeout', async () => { + const oracleTimeout = await aDaiCollateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(bn(oracleTimeout).div(12)) + await snapshotGasCost(aDaiCollateral.refresh()) + await snapshotGasCost(aDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after full price timeout', async () => { + await advanceTime( + (await aDaiCollateral.priceTimeout()) + (await aDaiCollateral.oracleTimeout()) + ) + const lotP = await aDaiCollateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) + await snapshotGasCost(aDaiCollateral.refresh()) + await snapshotGasCost(aDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + }) + }) }) diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap new file mode 100644 index 0000000000..e505e04797 --- /dev/null +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74518`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72850`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73073`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `30918`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74518`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72850`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `51728`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `51728`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92420`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92346`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `125132`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `89264`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap new file mode 100644 index 0000000000..b2a094843f --- /dev/null +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58262`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `53793`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `76400`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `37508`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `58262`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `53793`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `68714`; + +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `68714`; diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap new file mode 100644 index 0000000000..3551302c16 --- /dev/null +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `57750`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `53281`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `91861`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `36971`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `75731`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `71262`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `84175`; + +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `84175`; diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 55052779fc..653af6dc07 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -26,9 +26,14 @@ import { CollateralStatus, } from './pluginTestTypes' import { expectPrice } from '../../utils/oracles' +import snapshotGasCost from '../../utils/snapshotGasCost' +import { IMPLEMENTATION, Implementation } from '../../fixtures' const describeFork = useEnv('FORK') ? describe : describe.skip +const describeGas = + IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip + export default function fn( fixtures: CollateralTestSuiteFixtures ) { @@ -490,6 +495,50 @@ export default function fn( }) describe('collateral-specific tests', collateralSpecificStatusTests) + + describeGas('Gas Reporting', () => { + context('refresh()', () => { + afterEach(async () => { + await snapshotGasCost(collateral.refresh()) + await snapshotGasCost(collateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('during SOUND', async () => { + // pass + }) + + itChecksRefPerTokDefault('after hard default', async () => { + await reduceRefPerTok(ctx, 5) + }) + + itChecksTargetPerRefDefault('during soft default', async () => { + await reduceTargetPerRef(ctx, 20) + }) + + itChecksTargetPerRefDefault('after soft default', async () => { + await reduceTargetPerRef(ctx, 20) + await expect(collateral.refresh()) + .to.emit(collateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) + await advanceTime(await collateral.delayUntilDefault()) + }) + + it('after oracle timeout', async () => { + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(oracleTimeout / 12) + }) + + it('after full price timeout', async () => { + await advanceTime( + (await collateral.priceTimeout()) + (await collateral.oracleTimeout()) + ) + const lotP = await collateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) + }) + }) + }) }) }) } diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 2170b61b45..2a16daceb9 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -3,7 +3,13 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' import hre, { ethers } from 'hardhat' -import { IMPLEMENTATION, ORACLE_ERROR, PRICE_TIMEOUT, REVENUE_HIDING } from '../../../fixtures' +import { + IMPLEMENTATION, + Implementation, + ORACLE_ERROR, + PRICE_TIMEOUT, + REVENUE_HIDING, +} from '../../../fixtures' import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' @@ -26,7 +32,12 @@ import { expectUnpriced, setOraclePrice, } from '../../../utils/oracles' -import { advanceBlocks, advanceTime, getLatestBlockTimestamp } from '../../../utils/time' +import { + advanceBlocks, + advanceTime, + getLatestBlockTimestamp, + setNextBlockTimestamp, +} from '../../../utils/time' import { Asset, BadERC20, @@ -51,6 +62,10 @@ import { } from '../../../../typechain' import { useEnv } from '#/utils/env' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import snapshotGasCost from '../../../utils/snapshotGasCost' + +const describeGas = + IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip // Setup test environment const setup = async (blockNumber: number) => { @@ -865,4 +880,160 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await invalidCTokenCollateral.status()).to.equal(CollateralStatus.SOUND) }) }) + + describeGas('Gas Reporting', () => { + context('refresh()', () => { + it('during SOUND', async () => { + await snapshotGasCost(cDaiCollateral.refresh()) + await snapshotGasCost(cDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after hard default', async () => { + // Note: In this case requires to use a CToken mock to be able to change the rate + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') + const symbol = await cDai.symbol() + const cDaiMock: CTokenMock = ( + await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address) + ) + // Set initial exchange rate to the new cDai Mock + await cDaiMock.setExchangeRate(fp('0.02')) + + const cDaiVaultFactory: ContractFactory = await ethers.getContractFactory('CTokenWrapper') + cDaiVault = ( + await cDaiVaultFactory.deploy( + cDaiMock.address, + 'cDAI RToken Vault', + 'rv_cDAI', + comptroller.address + ) + ) + + // Redeploy plugin using the new cDai mock + const newCDaiCollateral: CTokenFiatCollateral = await ( + await ethers.getContractFactory('CTokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await cDaiCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: cDaiVault.address, + maxTradeVolume: await cDaiCollateral.maxTradeVolume(), + oracleTimeout: await cDaiCollateral.oracleTimeout(), + targetName: await cDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await cDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + await newCDaiCollateral.refresh() + + // Decrease rate for aDAI, will disable collateral immediately + await cDaiMock.setExchangeRate(fp('0.019')) + await snapshotGasCost(newCDaiCollateral.refresh()) + await snapshotGasCost(newCDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('during soft default', async () => { + // Redeploy plugin using a Chainlink mock feed where we can change the price + const newCDaiCollateral: CTokenFiatCollateral = await ( + await ethers.getContractFactory('CTokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: mockChainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: await cDaiCollateral.erc20(), + maxTradeVolume: await cDaiCollateral.maxTradeVolume(), + oracleTimeout: await cDaiCollateral.oracleTimeout(), + targetName: await cDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await cDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + + // Check initial state + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + + // Depeg one of the underlying tokens - Reducing price 20% + await setOraclePrice(newCDaiCollateral.address, bn('8e7')) // -20% + await snapshotGasCost(newCDaiCollateral.refresh()) + await snapshotGasCost(newCDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after soft default', async () => { + // Redeploy plugin using a Chainlink mock feed where we can change the price + const newCDaiCollateral: CTokenFiatCollateral = await ( + await ethers.getContractFactory('CTokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: mockChainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: await cDaiCollateral.erc20(), + maxTradeVolume: await cDaiCollateral.maxTradeVolume(), + oracleTimeout: await cDaiCollateral.oracleTimeout(), + targetName: await cDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await cDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + + // Check initial state + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + + // Depeg one of the underlying tokens - Reducing price 20% + await setOraclePrice(newCDaiCollateral.address, bn('8e7')) // -20% + + // Force updates - Should update whenDefault and status + await expect(newCDaiCollateral.refresh()) + .to.emit(newCDaiCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.IFFY) + + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()).add( + delayUntilDefault + ) + expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Move time forward past delayUntilDefault + await advanceTime(Number(delayUntilDefault)) + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + + // Nothing changes if attempt to refresh after default + // CToken + const prevWhenDefault: BigNumber = await newCDaiCollateral.whenDefault() + await expect(newCDaiCollateral.refresh()).to.not.emit( + newCDaiCollateral, + 'CollateralStatusChanged' + ) + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await newCDaiCollateral.whenDefault()).to.equal(prevWhenDefault) + await snapshotGasCost(newCDaiCollateral.refresh()) + await snapshotGasCost(newCDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after oracle timeout', async () => { + const oracleTimeout = await cDaiCollateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(bn(oracleTimeout).div(12)) + await snapshotGasCost(cDaiCollateral.refresh()) + await snapshotGasCost(cDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('after full price timeout', async () => { + await advanceTime( + (await cDaiCollateral.priceTimeout()) + (await cDaiCollateral.oracleTimeout()) + ) + const lotP = await cDaiCollateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) + await snapshotGasCost(cDaiCollateral.refresh()) + await snapshotGasCost(cDaiCollateral.refresh()) // 2nd refresh can be different than 1st + }) + }) + }) }) diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap new file mode 100644 index 0000000000..b1bf29c3a9 --- /dev/null +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119481`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117813`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `74209`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `31842`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119481`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117813`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `96669`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `96669`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139939`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139939`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `172725`; + +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `136857`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap new file mode 100644 index 0000000000..57d6205291 --- /dev/null +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `107007`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `102270`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `132320`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `70661`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `107007`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `102270`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `73461`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `70661`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `124634`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `124634`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `132185`; + +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `124916`; diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 17cb3f6881..55af313bd8 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -19,6 +19,11 @@ import { getLatestBlockTimestamp, setNextBlockTimestamp, } from '#/test/utils/time' +import snapshotGasCost from '../../../utils/snapshotGasCost' +import { IMPLEMENTATION, Implementation } from '../../../fixtures' + +const describeGas = + IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip const describeFork = useEnv('FORK') ? describe : describe.skip @@ -636,6 +641,55 @@ export default function fn( describe('collateral-specific tests', collateralSpecificStatusTests) }) + + describeGas('Gas Reporting', () => { + context('refresh()', () => { + afterEach(async () => { + await snapshotGasCost(ctx.collateral.refresh()) + await snapshotGasCost(ctx.collateral.refresh()) // 2nd refresh can be different than 1st + }) + + it('during SOUND', async () => { + // pass + }) + + it('after hard default', async () => { + const currentExchangeRate = await ctx.curvePool.get_virtual_price() + await ctx.curvePool.setVirtualPrice(currentExchangeRate.sub(1e3)).then((e) => e.wait()) + }) + + it('during soft default', async () => { + // Depeg first feed - Reducing price by 20% from 1 to 0.8 + const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) + await updateAnswerTx.wait() + }) + + it('after soft default', async () => { + // Depeg first feed - Reducing price by 20% from 1 to 0.8 + const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) + await updateAnswerTx.wait() + await expect(ctx.collateral.refresh()) + .to.emit(ctx.collateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) + await advanceTime(await ctx.collateral.delayUntilDefault()) + }) + + it('after oracle timeout', async () => { + const oracleTimeout = await ctx.collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(oracleTimeout / 12) + }) + + it('after full price timeout', async () => { + await advanceTime( + (await ctx.collateral.priceTimeout()) + (await ctx.collateral.oracleTimeout()) + ) + const lotP = await ctx.collateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) + }) + }) + }) }) }) } diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap new file mode 100644 index 0000000000..a4b3141f3a --- /dev/null +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `75961`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `71493`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `242158`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `75961`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `71493`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `237273`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `237273`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `244851`; + +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `237583`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap new file mode 100644 index 0000000000..82de3742f2 --- /dev/null +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `92858`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `88390`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `220114`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `97863`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `93395`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `215229`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `215229`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `203246`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `195978`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap new file mode 100644 index 0000000000..28185554e3 --- /dev/null +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59818`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55350`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `192331`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59818`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55350`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `187446`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `187446`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `175071`; + +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `167803`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap new file mode 100644 index 0000000000..de32617273 --- /dev/null +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62266`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57798`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `224290`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62266`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57798`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `219405`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `219405`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `225659`; + +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `218391`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap new file mode 100644 index 0000000000..8e747784bc --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `75961`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `71493`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `242158`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `75961`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `71493`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `237273`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `237273`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `244851`; + +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `237583`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap new file mode 100644 index 0000000000..c5192687d0 --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `92858`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `88390`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `220114`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `97863`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `93395`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `215229`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `215229`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `203246`; + +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `195978`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap new file mode 100644 index 0000000000..18f069f0e4 --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59818`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55350`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `192331`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59818`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55350`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `187446`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `187446`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `175071`; + +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `167803`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap new file mode 100644 index 0000000000..71f287f75d --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62266`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57798`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `224290`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62266`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57798`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `219405`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `219405`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `225659`; + +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `218391`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap new file mode 100644 index 0000000000..4fb7c27a86 --- /dev/null +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `114677`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `106365`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `129111`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90061`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `114496`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `106365`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `121148`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `121148`; diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap new file mode 100644 index 0000000000..74ec91a258 --- /dev/null +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -0,0 +1,49 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `115251`; + +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `113583`; + +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `115251`; + +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `113583`; + +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `136973`; + +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `136973`; + +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `115443`; + +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `113775`; + +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `115443`; + +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `113775`; + +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `137229`; + +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `137229`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `123733`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `122065`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `123733`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `122065`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `146011`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `146011`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118381`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116713`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118381`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116713`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140375`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140305`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap new file mode 100644 index 0000000000..e0a213d4e2 --- /dev/null +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -0,0 +1,13 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56918`; + +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `52181`; + +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `57618`; + +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55949`; + +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `71659`; + +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `71659`; diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap new file mode 100644 index 0000000000..759ebc8430 --- /dev/null +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `85967`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `81498`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `128420`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `65149`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `85967`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `81498`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `65149`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `65149`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `120734`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `120734`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `125485`; + +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `121016`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap new file mode 100644 index 0000000000..7bb8adbe2a --- /dev/null +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -0,0 +1,49 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `131942`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `127473`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `177256`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `111194`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `131942`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `127473`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `169570`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `169570`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `132145`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `127676`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `177662`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `111397`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `132145`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `127676`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `169976`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `169976`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `131298`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `126829`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `175968`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `110550`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `131298`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `126829`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `168282`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `168282`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap new file mode 100644 index 0000000000..7d3645000a --- /dev/null +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -0,0 +1,33 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `131365`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `126896`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `194216`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `110550`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `178094`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `173625`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `186530`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `186530`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `164997`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `160528`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `233480`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `144182`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `217358`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `212889`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `225794`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `225794`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap new file mode 100644 index 0000000000..0bb7fec1de --- /dev/null +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `199080`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `194611`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `215207`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `144160`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `199080`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `194611`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `207521`; + +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `207521`; diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap new file mode 100644 index 0000000000..54fc867521 --- /dev/null +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -0,0 +1,17 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `68835`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `64366`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `102946`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `48056`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `68835`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `64366`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `95260`; + +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `95260`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap new file mode 100644 index 0000000000..5757607e08 --- /dev/null +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap @@ -0,0 +1,49 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `53187`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48719`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `66829`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `23429`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `53187`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48719`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `23429`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `23429`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `64090`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `64090`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `71640`; + +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `64372`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `53187`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48719`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `66829`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `23429`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `53187`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48719`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `23429`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `23429`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `64090`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `64090`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `71640`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `64372`; From a6871ac57c0a68eb31249006c0491f165b1d5de4 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Mon, 7 Aug 2023 21:01:20 +0530 Subject: [PATCH 009/450] Fix 4byte Integration (#879) --- .github/workflows/{4bytes.yml => 4byte.yml} | 11 +- package.json | 4 +- scripts/4byte.ts | 51 + scripts/4bytes-syncced.json | 1126 ----------------- scripts/4bytes.ts | 105 -- .../upgrade-checker-utils/constants.ts | 2 +- 6 files changed, 57 insertions(+), 1242 deletions(-) rename .github/workflows/{4bytes.yml => 4byte.yml} (59%) create mode 100644 scripts/4byte.ts delete mode 100644 scripts/4bytes-syncced.json delete mode 100644 scripts/4bytes.ts diff --git a/.github/workflows/4bytes.yml b/.github/workflows/4byte.yml similarity index 59% rename from .github/workflows/4bytes.yml rename to .github/workflows/4byte.yml index 72ce1fb622..3e456ddbae 100644 --- a/.github/workflows/4bytes.yml +++ b/.github/workflows/4byte.yml @@ -4,6 +4,7 @@ on: push: branches: - master + - main pull_request: types: - closed @@ -13,7 +14,7 @@ jobs: name: '4byte Sync' runs-on: ubuntu-latest permissions: - contents: write + contents: read steps: - uses: actions/checkout@v3 with: @@ -23,10 +24,4 @@ jobs: node-version: 16.x cache: 'yarn' - run: yarn install --immutable - - run: yarn compile - - run: yarn run:4bytes - - uses: stefanzweifel/git-auto-commit-action@v4 - with: - commit_message: 4bytes-syncced.json - commit_options: '--no-verify --signoff' - file_pattern: 'scripts/4bytes-syncced.json' + - run: yarn run:4byte diff --git a/package.json b/package.json index a9e2497e3e..616de80010 100644 --- a/package.json +++ b/package.json @@ -36,8 +36,8 @@ "size": "hardhat size-contracts", "slither": "python3 tools/slither.py", "prepare": "husky install", - "run:backtests": "npx hardhat run scripts/ci_backtest_plugin.ts", - "run:4bytes": "npx hardhat run scripts/4bytes.ts" + "run:backtests": "hardhat run scripts/ci_backtest_plugin.ts", + "run:4byte": "hardhat run scripts/4byte.ts" }, "repository": { "type": "git", diff --git a/scripts/4byte.ts b/scripts/4byte.ts new file mode 100644 index 0000000000..aef7bee418 --- /dev/null +++ b/scripts/4byte.ts @@ -0,0 +1,51 @@ +import axios from 'axios' +import hre from 'hardhat' + +async function main() { + await hre.run('compile') + + const allArtifactNames = await hre.artifacts.getAllFullyQualifiedNames() + const fullComposite = await Promise.all( + allArtifactNames.map((fullName) => hre.artifacts.readArtifact(fullName).then((e) => e.abi)) + ) + .then((e) => e.flat()) + .then((e) => e.map((v) => [JSON.stringify(v), v] as const)) + .then((e) => [...new Map(e).values()]) + + const parsedComposite = fullComposite + .filter((e) => ['function', 'event', 'error'].includes(e.type)) + .map((e) => { + if (e.type === 'error') { + // errors are same as functions + e.type = 'function' + e.outputs = [] + } + + return e + }) + + if (parsedComposite.length === 0) { + return console.log('Nothing to sync!') + } + + await axios + .post('https://www.4byte.directory/api/v1/import-abi/', { + contract_abi: JSON.stringify(parsedComposite), + }) + .then(({ data }) => { + console.log( + `Processed ${data.num_processed} unique items from ${allArtifactNames.length} individual ABIs adding ${data.num_imported} new selectors to database with ${data.num_duplicates} duplicates and ${data.num_ignored} ignored items.` + ) + }) + .catch((error) => { + throw Error(`Sync failed with code ${error.response.status}!`) + }) + + console.log('Done!') +} + +main().catch((error) => { + console.error(error) + + process.exitCode = 1 +}) diff --git a/scripts/4bytes-syncced.json b/scripts/4bytes-syncced.json deleted file mode 100644 index ccb75c42d6..0000000000 --- a/scripts/4bytes-syncced.json +++ /dev/null @@ -1,1126 +0,0 @@ -{ - "functions": [ - "allowance(address,address)", - "approve(address,uint256)", - "balanceOf(address)", - "totalSupply()", - "transfer(address,uint256)", - "transferFrom(address,address,uint256)", - "decimals()", - "name()", - "symbol()", - "burn(address,address,uint256,uint256)", - "getScaledUserBalanceAndSupply(address)", - "mint(address,uint256,uint256)", - "mintToTreasury(uint256,uint256)", - "scaledBalanceOf(address)", - "scaledTotalSupply()", - "transferOnLiquidation(address,address,uint256)", - "transferUnderlyingTo(address,uint256)", - "handleAction(address,uint256,uint256)", - "borrow(address,uint256,uint256,uint16,address)", - "deposit(address,uint256,address,uint16)", - "finalizeTransfer(address,address,address,uint256,uint256,uint256)", - "flashLoan(address,address[],uint256[],uint256[],address,bytes,uint16)", - "getAddressesProvider()", - "getConfiguration(address)", - "getReserveData(address)", - "getReserveNormalizedIncome(address)", - "getReserveNormalizedVariableDebt(address)", - "getReservesList()", - "getUserAccountData(address)", - "getUserConfiguration(address)", - "initReserve(address,address,address,address,address)", - "liquidationCall(address,address,address,uint256,bool)", - "paused()", - "rebalanceStableBorrowRate(address,address)", - "repay(address,uint256,uint256,address)", - "setConfiguration(address,uint256)", - "setPause(bool)", - "setReserveInterestRateStrategyAddress(address,address)", - "setUserUseReserveAsCollateral(address,bool)", - "swapBorrowRateMode(address,uint256)", - "withdraw(address,uint256,address)", - "getAddress(bytes32)", - "getEmergencyAdmin()", - "getLendingPool()", - "getLendingPoolCollateralManager()", - "getLendingPoolConfigurator()", - "getLendingRateOracle()", - "getMarketId()", - "getPoolAdmin()", - "getPriceOracle()", - "setAddress(bytes32,address)", - "setAddressAsProxy(bytes32,address)", - "setEmergencyAdmin(address)", - "setLendingPoolCollateralManager(address)", - "setLendingPoolConfiguratorImpl(address)", - "setLendingPoolImpl(address)", - "setLendingRateOracle(address)", - "setMarketId(string)", - "setPoolAdmin(address)", - "setPriceOracle(address)", - "BORROW_ALLOWANCE_NOT_ENOUGH()", - "CALLER_NOT_POOL_ADMIN()", - "CT_CALLER_MUST_BE_LENDING_POOL()", - "CT_CANNOT_GIVE_ALLOWANCE_TO_HIMSELF()", - "CT_INVALID_BURN_AMOUNT()", - "CT_INVALID_MINT_AMOUNT()", - "CT_TRANSFER_AMOUNT_NOT_GT_0()", - "LPAPR_INVALID_ADDRESSES_PROVIDER_ID()", - "LPAPR_PROVIDER_NOT_REGISTERED()", - "LPCM_COLLATERAL_CANNOT_BE_LIQUIDATED()", - "LPCM_HEALTH_FACTOR_NOT_BELOW_THRESHOLD()", - "LPCM_NOT_ENOUGH_LIQUIDITY_TO_LIQUIDATE()", - "LPCM_NO_ERRORS()", - "LPCM_SPECIFIED_CURRENCY_NOT_BORROWED_BY_USER()", - "LPC_CALLER_NOT_EMERGENCY_ADMIN()", - "LPC_INVALID_ADDRESSES_PROVIDER_ID()", - "LPC_INVALID_ATOKEN_POOL_ADDRESS()", - "LPC_INVALID_CONFIGURATION()", - "LPC_INVALID_STABLE_DEBT_TOKEN_POOL_ADDRESS()", - "LPC_INVALID_STABLE_DEBT_TOKEN_UNDERLYING_ADDRESS()", - "LPC_INVALID_VARIABLE_DEBT_TOKEN_POOL_ADDRESS()", - "LPC_INVALID_VARIABLE_DEBT_TOKEN_UNDERLYING_ADDRESS()", - "LPC_RESERVE_LIQUIDITY_NOT_0()", - "LP_CALLER_MUST_BE_AN_ATOKEN()", - "LP_CALLER_NOT_LENDING_POOL_CONFIGURATOR()", - "LP_FAILED_COLLATERAL_SWAP()", - "LP_FAILED_REPAY_WITH_COLLATERAL()", - "LP_INCONSISTENT_FLASHLOAN_PARAMS()", - "LP_INCONSISTENT_PARAMS_LENGTH()", - "LP_INCONSISTENT_PROTOCOL_ACTUAL_BALANCE()", - "LP_INTEREST_RATE_REBALANCE_CONDITIONS_NOT_MET()", - "LP_INVALID_EQUAL_ASSETS_TO_SWAP()", - "LP_INVALID_FLASHLOAN_MODE()", - "LP_INVALID_FLASH_LOAN_EXECUTOR_RETURN()", - "LP_IS_PAUSED()", - "LP_LIQUIDATION_CALL_FAILED()", - "LP_NOT_CONTRACT()", - "LP_NOT_ENOUGH_LIQUIDITY_TO_BORROW()", - "LP_NOT_ENOUGH_STABLE_BORROW_BALANCE()", - "LP_NO_MORE_RESERVES_ALLOWED()", - "LP_REENTRANCY_NOT_ALLOWED()", - "LP_REQUESTED_AMOUNT_TOO_SMALL()", - "MATH_ADDITION_OVERFLOW()", - "MATH_DIVISION_BY_ZERO()", - "MATH_MULTIPLICATION_OVERFLOW()", - "RC_INVALID_DECIMALS()", - "RC_INVALID_LIQ_BONUS()", - "RC_INVALID_LIQ_THRESHOLD()", - "RC_INVALID_LTV()", - "RC_INVALID_RESERVE_FACTOR()", - "RL_LIQUIDITY_INDEX_OVERFLOW()", - "RL_LIQUIDITY_RATE_OVERFLOW()", - "RL_RESERVE_ALREADY_INITIALIZED()", - "RL_STABLE_BORROW_RATE_OVERFLOW()", - "RL_VARIABLE_BORROW_INDEX_OVERFLOW()", - "RL_VARIABLE_BORROW_RATE_OVERFLOW()", - "SDT_BURN_EXCEEDS_BALANCE()", - "SDT_STABLE_DEBT_OVERFLOW()", - "UL_INVALID_INDEX()", - "VL_AMOUNT_BIGGER_THAN_MAX_LOAN_SIZE_STABLE()", - "VL_BORROWING_NOT_ENABLED()", - "VL_COLLATERAL_BALANCE_IS_0()", - "VL_COLLATERAL_CANNOT_COVER_NEW_BORROW()", - "VL_COLLATERAL_SAME_AS_BORROWING_CURRENCY()", - "VL_CURRENT_AVAILABLE_LIQUIDITY_NOT_ENOUGH()", - "VL_DEPOSIT_ALREADY_IN_USE()", - "VL_HEALTH_FACTOR_LOWER_THAN_LIQUIDATION_THRESHOLD()", - "VL_INCONSISTENT_FLASHLOAN_PARAMS()", - "VL_INVALID_AMOUNT()", - "VL_INVALID_INTEREST_RATE_MODE_SELECTED()", - "VL_NOT_ENOUGH_AVAILABLE_USER_BALANCE()", - "VL_NO_ACTIVE_RESERVE()", - "VL_NO_DEBT_OF_SELECTED_TYPE()", - "VL_NO_EXPLICIT_AMOUNT_TO_REPAY_ON_BEHALF()", - "VL_NO_STABLE_RATE_LOAN_IN_RESERVE()", - "VL_NO_VARIABLE_RATE_LOAN_IN_RESERVE()", - "VL_RESERVE_FROZEN()", - "VL_STABLE_BORROWING_NOT_ENABLED()", - "VL_TRANSFER_NOT_ALLOWED()", - "VL_UNDERLYING_BALANCE_NOT_GREATER_THAN_0()", - "ATOKEN_REVISION()", - "DOMAIN_SEPARATOR()", - "EIP712_REVISION()", - "PERMIT_TYPEHASH()", - "POOL()", - "RESERVE_TREASURY_ADDRESS()", - "UINT_MAX_VALUE()", - "UNDERLYING_ASSET_ADDRESS()", - "_nonces(address)", - "decreaseAllowance(address,uint256)", - "increaseAllowance(address,uint256)", - "initialize(uint8,string,string)", - "permit(address,address,uint256,uint256,uint8,bytes32,bytes32)", - "description()", - "getRoundData(uint80)", - "latestRoundData()", - "version()", - "DEFAULT_ADMIN_ROLE()", - "getRoleAdmin(bytes32)", - "grantRole(bytes32,address)", - "hasRole(bytes32,address)", - "renounceRole(bytes32,address)", - "revokeRole(bytes32,address)", - "supportsInterface(bytes4)", - "owner()", - "renounceOwnership()", - "transferOwnership(address)", - "delegate(address)", - "delegateBySig(address,uint256,uint256,uint8,bytes32,bytes32)", - "delegates(address)", - "getPastTotalSupply(uint256)", - "getPastVotes(address,uint256)", - "getVotes(address)", - "isValidSignature(bytes32,bytes)", - "proxiableUUID()", - "implementation()", - "upgradeTo(address)", - "upgradeToAndCall(address,bytes)", - "nonces(address)", - "BALLOT_TYPEHASH()", - "COUNTING_MODE()", - "EXTENDED_BALLOT_TYPEHASH()", - "castVote(uint256,uint8)", - "castVoteBySig(uint256,uint8,uint8,bytes32,bytes32)", - "castVoteWithReason(uint256,uint8,string)", - "castVoteWithReasonAndParams(uint256,uint8,string,bytes)", - "castVoteWithReasonAndParamsBySig(uint256,uint8,string,bytes,uint8,bytes32,bytes32)", - "execute(address[],uint256[],bytes[],bytes32)", - "getVotes(address,uint256)", - "getVotesWithParams(address,uint256,bytes)", - "hasVoted(uint256,address)", - "hashProposal(address[],uint256[],bytes[],bytes32)", - "onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)", - "onERC1155Received(address,address,uint256,uint256,bytes)", - "onERC721Received(address,address,uint256,bytes)", - "proposalDeadline(uint256)", - "proposalSnapshot(uint256)", - "proposalThreshold()", - "propose(address[],uint256[],bytes[],string)", - "quorum(uint256)", - "relay(address,uint256,bytes)", - "state(uint256)", - "votingDelay()", - "votingPeriod()", - "CANCELLER_ROLE()", - "EXECUTOR_ROLE()", - "PROPOSER_ROLE()", - "TIMELOCK_ADMIN_ROLE()", - "cancel(bytes32)", - "execute(address,uint256,bytes,bytes32,bytes32)", - "executeBatch(address[],uint256[],bytes[],bytes32,bytes32)", - "getMinDelay()", - "getTimestamp(bytes32)", - "hashOperation(address,uint256,bytes,bytes32,bytes32)", - "hashOperationBatch(address[],uint256[],bytes[],bytes32,bytes32)", - "isOperation(bytes32)", - "isOperationDone(bytes32)", - "isOperationPending(bytes32)", - "isOperationReady(bytes32)", - "schedule(address,uint256,bytes,bytes32,bytes32,uint256)", - "scheduleBatch(address[],uint256[],bytes[],bytes32,bytes32,uint256)", - "updateDelay(uint256)", - "proposalVotes(uint256)", - "setProposalThreshold(uint256)", - "setVotingDelay(uint256)", - "setVotingPeriod(uint256)", - "proposalEta(uint256)", - "queue(address[],uint256[],bytes[],bytes32)", - "timelock()", - "updateTimelock(address)", - "token()", - "quorumDenominator()", - "quorumNumerator(uint256)", - "quorumNumerator()", - "updateQuorumNumerator(uint256)", - "admin()", - "changeAdmin(address)", - "multicall(bytes[])", - "ENS()", - "deployments(string)", - "latestDeployment()", - "register(string,address,bool)", - "unregister(string)", - "canRunRecollateralizationAuctions(address)", - "claimRewards(address)", - "getActCalldata(address)", - "getRevenueAuctionERC20s(address)", - "runRevenueAuctions(address,address[],address[])", - "getTradesForBackingManager(address)", - "getTradesForRevenueTraders(address)", - "auctionsSettleable(address)", - "backingOverview(address)", - "backupConfig(address,bytes32)", - "basketBreakdown(address)", - "basketTokens(address)", - "issue(address,uint256)", - "maxIssuable(address,address)", - "pendingUnstakings(address,address)", - "price(address)", - "primeBasket(address)", - "redeem(address,uint256,uint48)", - "stToken(address)", - "traderBalances(address,address)", - "runAuctionsForAllTraders(address)", - "totalAssetValue(address)", - "wholeBasketsHeldBy(address,address)", - "deployRToken((string,string,string,((uint16,uint16),uint192,uint192,uint48,uint48,uint192,uint48,uint48,uint48,uint192,uint192,(uint256,uint192),(uint256,uint192))),(address[],address[],uint192[],(bytes32,uint256,address[])[],(address,(uint16,uint16))[]))", - "deployer()", - "setupGovernance(address,bool,bool,(uint256,uint256,uint256,uint256,uint256),address,address,address)", - "bal(address)", - "claimRewards()", - "erc20()", - "erc20Decimals()", - "isCollateral()", - "lotPrice()", - "maxTradeVolume()", - "price()", - "refresh()", - "refPerTok()", - "status()", - "targetName()", - "targetPerRef()", - "chainlinkFeed()", - "oracleError()", - "oracleTimeout()", - "priceTimeout()", - "delayUntilDefault()", - "whenDefault()", - "erc20s()", - "getRegistry()", - "init(address,address[])", - "isRegistered(address)", - "main()", - "register(address)", - "swapRegistered(address)", - "toAsset(address)", - "toColl(address)", - "unregister(address)", - "claimRewardsSingle(address)", - "grantRTokenAllowance(address)", - "init(address,uint48,uint192,uint192,uint192)", - "manageTokens(address[])", - "manageTokensSortedOrder(address[])", - "maxTradeSlippage()", - "minTradeVolume()", - "mulDivCeil(uint192,uint192,uint192)", - "settleTrade(address)", - "trades(address)", - "tradesOpen()", - "backingBuffer()", - "setBackingBuffer(uint192)", - "setMaxTradeSlippage(uint192)", - "setMinTradeVolume(uint192)", - "setTradingDelay(uint48)", - "tradingDelay()", - "basketsHeldBy(address)", - "disableBasket()", - "fullyCollateralized()", - "init(address)", - "nonce()", - "quantity(address)", - "quantityUnsafe(address,address)", - "quote(uint192,uint8)", - "refreshBasket()", - "setBackupConfig(bytes32,uint256,address[])", - "setPrimeBasket(address[],uint192[])", - "timestamp()", - "disabled()", - "init(address,address,address,uint48)", - "openTrade((address,address,uint256,uint256))", - "reportViolation()", - "auctionLength()", - "gnosis()", - "setAuctionLength(uint48)", - "setDisabled(bool)", - "setGnosis(address)", - "setTradeImplementation(address)", - "tradeImplementation()", - "deploy(string,string,string,address,((uint16,uint16),uint192,uint192,uint48,uint48,uint192,uint48,uint48,uint48,uint192,uint192,(uint256,uint192),(uint256,uint192)))", - "rsr()", - "rsrAsset()", - "distribute(address,uint256)", - "init(address,(uint16,uint16))", - "setDistribution(address,(uint16,uint16))", - "totals()", - "FURNACE()", - "ST_RSR()", - "distribution(address)", - "init(address,uint192)", - "melt()", - "ratio()", - "setRatio(uint192)", - "lastPayout()", - "lastPayoutBal()", - "auctionData(uint256)", - "feeNumerator()", - "initiateAuction(address,address,uint256,uint256,uint96,uint96,uint256,uint256,bool,address,bytes)", - "settleAuction(uint256)", - "freezeForever()", - "freezeLong()", - "freezeShort()", - "frozen()", - "longFreeze()", - "pause()", - "pausedOrFrozen()", - "shortFreeze()", - "unfreeze()", - "unpause()", - "assetRegistry()", - "backingManager()", - "basketHandler()", - "broker()", - "distributor()", - "furnace()", - "rToken()", - "rTokenTrader()", - "rsrTrader()", - "stRSR()", - "init((address,address,address,address,address,address,address,address,address,address),address,uint48,uint48)", - "poke()", - "longFreezes(address)", - "setLongFreeze(uint48)", - "setShortFreeze(uint48)", - "basketsNeeded()", - "init(address,string,string,string,(uint256,uint192),(uint256,uint192))", - "issuanceAvailable()", - "issue(uint256)", - "issueTo(address,uint256)", - "melt(uint256)", - "mint(address,uint256)", - "redeem(uint256,uint48)", - "redeemTo(address,uint256,uint48)", - "redemptionAvailable()", - "setBasketsNeeded(uint192)", - "issuanceThrottleParams()", - "monetizeDonations(address)", - "redemptionThrottleParams()", - "setIssuanceThrottleParams((uint256,uint192))", - "setRedemptionThrottleParams((uint256,uint192))", - "init(address,address,uint192,uint192)", - "manageToken(address)", - "tokenToBuy()", - "endIdForWithdraw(address)", - "exchangeRate()", - "init(address,string,string,uint48,uint192)", - "payoutRewards()", - "seizeRSR(uint256)", - "stake(uint256)", - "unstake(uint256)", - "withdraw(address,uint256)", - "rewardRatio()", - "setRewardRatio(uint192)", - "setUnstakingDelay(uint48)", - "unstakingDelay()", - "currentEra()", - "getPastEra(uint256)", - "buy()", - "canSettle()", - "endTime()", - "sell()", - "settle()", - "allUnique(address[])", - "sortedAndAllUnique(address[])", - "abs_(int256)", - "div(uint192,uint192)", - "divFix_(uint256,uint192)", - "divRnd(uint192,uint192,uint8)", - "divrnd_(uint256,uint256,uint8)", - "divu(uint192,uint256)", - "divuRnd(uint192,uint256,uint8)", - "divuu_(uint256,uint256)", - "eq(uint192,uint192)", - "fixMax_(uint192,uint192)", - "fixMin_(uint192,uint192)", - "fullMul_(uint256,uint256)", - "gt(uint192,uint192)", - "gte(uint192,uint192)", - "lt(uint192,uint192)", - "lte(uint192,uint192)", - "minus(uint192,uint192)", - "minusu(uint192,uint256)", - "mul(uint192,uint192)", - "mulDiv(uint192,uint192,uint192)", - "mulDiv256Rnd_(uint256,uint256,uint256,uint8)", - "mulDiv256_(uint256,uint256,uint256)", - "mulDivRnd(uint192,uint192,uint192,uint8)", - "mulRnd(uint192,uint192,uint8)", - "mul_toUint(uint192,uint192)", - "mul_toUintRnd(uint192,uint192,uint8)", - "mulu(uint192,uint256)", - "muluDivu(uint192,uint256,uint256)", - "muluDivuRnd(uint192,uint256,uint256,uint8)", - "mulu_toUint(uint192,uint256)", - "mulu_toUintRnd(uint192,uint256,uint8)", - "near(uint192,uint192,uint192)", - "neq(uint192,uint192)", - "plus(uint192,uint192)", - "plusu(uint192,uint256)", - "powu(uint192,uint48)", - "safeMul_(uint192,uint192,uint8)", - "shiftl(uint192,int8)", - "shiftlRnd(uint192,int8,uint8)", - "shiftl_toFix_(uint256,int8)", - "shiftl_toFix_Rnd(uint256,int8,uint8)", - "shiftl_toUint(uint192,int8)", - "shiftl_toUintRnd(uint192,int8,uint8)", - "toFix_(uint256)", - "toUint(uint192)", - "toUintRnd(uint192,uint8)", - "toLower(string)", - "LONG_FREEZER_ROLE()", - "OWNER_ROLE()", - "PAUSER_ROLE()", - "SHORT_FREEZER_ROLE()", - "unfreezeAt()", - "GAS_TO_RESERVE()", - "MAX_BACKING_BUFFER()", - "MAX_TRADE_SLIPPAGE()", - "MAX_TRADE_VOLUME()", - "MAX_TRADING_DELAY()", - "MAX_TARGET_AMT()", - "MAX_AUCTION_LENGTH()", - "MIN_BID_SHARE_OF_TOTAL_SUPPLY()", - "MAX_DESTINATIONS_ALLOWED()", - "MAX_RATIO()", - "PERIOD()", - "MAX_EXCHANGE_RATE()", - "MAX_THROTTLE_PCT_AMT()", - "MAX_THROTTLE_RATE_AMT()", - "MIN_EXCHANGE_RATE()", - "MIN_THROTTLE_RATE_AMT()", - "mandate()", - "MAX_REWARD_RATIO()", - "MAX_UNSTAKING_DELAY()", - "MIN_UNSTAKING_DELAY()", - "withdrawals(address,uint256)", - "prepareRecollateralizationTrade(IBackingManager,(uint192,uint192))", - "getBackupConfig(bytes32)", - "getPrimeBasket()", - "implementations()", - "delegationNonces(address)", - "draftQueueLen(uint256,address)", - "draftQueues(uint256,address,uint256)", - "draftRate()", - "firstRemainingDraft(uint256,address)", - "getDraftRSR()", - "getStakeRSR()", - "getTotalDrafts()", - "payoutLastPaid()", - "stakeRate()", - "checkpoints(address,uint48)", - "numCheckpoints(address)", - "exposedReferencePrice()", - "lastSave()", - "pegBottom()", - "pegTop()", - "revenueShowing()", - "savedHighPrice()", - "savedLowPrice()", - "tryPrice()", - "targetUnitChainlinkFeed()", - "targetUnitOracleTimeout()", - "REWARD_TOKEN()", - "claimRewardsToSelf(bool)", - "rate()", - "getIncentivesController()", - "handleRepayment(address,uint256)", - "PRECISION()", - "claimRewards(address[],uint256,address)", - "claimRewardsOnBehalf(address[],uint256,address,address)", - "configureAssets(address[],uint256[])", - "getAssetData(address)", - "getClaimer(address)", - "getRewardsBalance(address[],address)", - "getUserAssetData(address,address)", - "getUserUnclaimedRewards(address)", - "setClaimer(address,address)", - "ASSET()", - "ATOKEN()", - "INCENTIVES_CONTROLLER()", - "LENDING_POOL()", - "claimRewards(address,bool)", - "claimRewardsOnBehalf(address,address,bool)", - "collectAndUpdateRewards()", - "deposit(address,uint256,uint16,bool)", - "dynamicBalanceOf(address)", - "dynamicToStaticAmount(uint256)", - "getAccRewardsPerToken()", - "getClaimableRewards(address)", - "getDomainSeparator()", - "getLastRewardBlock()", - "getLifetimeRewards()", - "getLifetimeRewardsClaimed()", - "getTotalClaimableRewards()", - "getUnclaimedRewards(address)", - "metaDeposit(address,address,uint256,uint16,bool,uint256,(uint8,bytes32,bytes32))", - "metaWithdraw(address,address,uint256,uint256,bool,uint256,(uint8,bytes32,bytes32))", - "staticToDynamicAmount(uint256)", - "withdraw(address,uint256,bool)", - "withdrawDynamicAmount(address,uint256,bool)", - "INVALID_CLAIMER()", - "INVALID_DEPOSITOR()", - "INVALID_EXPIRATION()", - "INVALID_OWNER()", - "INVALID_RECIPIENT()", - "INVALID_SIGNATURE()", - "ONLY_ONE_AMOUNT_FORMAT_ALLOWED()", - "METADEPOSIT_TYPEHASH()", - "METAWITHDRAWAL_TYPEHASH()", - "STATIC_ATOKEN_LM_REVISION()", - "updateRatio(uint256)", - "comptroller()", - "referenceERC20Decimals()", - "exchangeRateCurrent()", - "exchangeRateStored()", - "mint(uint256)", - "redeem(uint256)", - "underlying()", - "claimComp(address)", - "getCompAddress()", - "comet()", - "reservesThresholdIffy()", - "rewardERC20()", - "BASE_SCALE()", - "EXP_SCALE()", - "RESCALE_FACTOR()", - "TRACKING_INDEX_SCALE()", - "accrue()", - "accrueAccount(address)", - "allow(address,bool)", - "baseTrackingAccrued(address)", - "baseTrackingIndex(address)", - "claimTo(address,address)", - "convertDynamicToStatic(uint256)", - "convertStaticToDynamic(uint104)", - "deposit(uint256)", - "depositFrom(address,address,uint256)", - "depositTo(address,uint256)", - "getRewardOwed(address)", - "hasPermission(address,address)", - "isAllowed(address,address)", - "rewardsAddr()", - "rewardsClaimed(address)", - "underlyingBalanceOf(address)", - "underlyingComet()", - "withdraw(uint256)", - "withdrawFrom(address,address,uint256)", - "withdrawTo(address,uint256)", - "allowBySig(address,address,bool,uint256,uint256,uint8,bytes32,bytes32)", - "baseAccrualScale()", - "baseIndexScale()", - "collateralBalanceOf(address,address)", - "factorScale()", - "maxAssets()", - "priceScale()", - "totalsBasic()", - "absorb(address,address[])", - "approveThis(address,address,uint256)", - "baseBorrowMin()", - "baseMinForRewards()", - "baseScale()", - "baseToken()", - "baseTokenPriceFeed()", - "baseTrackingBorrowSpeed()", - "baseTrackingSupplySpeed()", - "borrowBalanceOf(address)", - "borrowPerSecondInterestRateBase()", - "borrowPerSecondInterestRateSlopeHigh()", - "borrowPerSecondInterestRateSlopeLow()", - "buyCollateral(address,uint256,uint256,address)", - "extensionDelegate()", - "getAssetInfo(uint8)", - "getAssetInfoByAddress(address)", - "getBorrowRate(uint256)", - "getPrice(address)", - "getReserves()", - "getSupplyRate(uint256)", - "getUtilization()", - "governor()", - "initializeStorage()", - "isAbsorbPaused()", - "isBorrowCollateralized(address)", - "isBuyPaused()", - "isLiquidatable(address)", - "isSupplyPaused()", - "isTransferPaused()", - "isWithdrawPaused()", - "numAssets()", - "pause(bool,bool,bool,bool,bool)", - "pauseGuardian()", - "quoteCollateral(address,uint256)", - "storeFrontPriceFactor()", - "supply(address,uint256)", - "supplyFrom(address,address,address,uint256)", - "supplyKink()", - "supplyPerSecondInterestRateBase()", - "supplyPerSecondInterestRateSlopeHigh()", - "supplyPerSecondInterestRateSlopeLow()", - "supplyTo(address,address,uint256)", - "targetReserves()", - "totalBorrow()", - "trackingIndexScale()", - "transferAsset(address,address,uint256)", - "transferAssetFrom(address,address,address,uint256)", - "userBasic(address)", - "withdrawFrom(address,address,address,uint256)", - "withdrawReserves(address,uint256)", - "withdrawTo(address,address,uint256)", - "setBaseTrackingSupplySpeed(address,uint64)", - "deploy(address)", - "deployAndUpgradeTo(address,address)", - "claim(address,address,bool)", - "claimTo(address,address,address,bool)", - "getRewardOwed(address,address)", - "rewardConfig(address)", - "curvePool()", - "lpToken()", - "tokenPrice(uint8)", - "metapoolToken()", - "pairedToken()", - "pairedTokenPegBottom()", - "pairedTokenPegTop()", - "tryPairedPrice()", - "balances(uint256)", - "base_coins(uint256)", - "coins(uint256)", - "exchange(int128,int128,uint256,uint256)", - "get_virtual_price()", - "underlying_coins(uint256)", - "deposit(uint256,bool)", - "lockIncentive()", - "claim_rewards()", - "lp_token()", - "reward_tokens(uint256)", - "rewarded_token()", - "create_lock(uint256,uint256)", - "increase_amount(uint256)", - "increase_unlock_time(uint256)", - "smart_wallet_checker()", - "withdraw()", - "claimRewards(uint256,address)", - "isShutdown()", - "poolInfo(uint256)", - "rewardArbitrator()", - "rewardClaimed(uint256,address,uint256)", - "setGaugeRedirect(uint256)", - "withdrawTo(uint256,uint256,address)", - "claim()", - "mint(address)", - "addPool(address,address,uint256)", - "forceAddPool(address,address,uint256)", - "gaugeMap(address)", - "poolLength()", - "setPoolManager(address)", - "shutdownPool(uint256)", - "gauge_controller()", - "get_address(uint256)", - "get_gauges(address)", - "get_lp_token(address)", - "get_registry()", - "CreateCrvRewards(uint256,address)", - "CreateTokenRewards(address,address,address)", - "activeRewardCount(address)", - "addActiveReward(address,uint256)", - "removeActiveReward(address,uint256)", - "setAccess(address,bool)", - "addExtraReward(address)", - "earned(address)", - "exit(address)", - "getReward(address)", - "notifyRewardAmount(uint256)", - "queueNewRewards(uint256)", - "rewardToken()", - "stake(address,uint256)", - "stakeFor(address,uint256)", - "stakingToken()", - "balanceOfPool(address)", - "claimCrv(address)", - "claimFees(address,address)", - "createLock(uint256,uint256)", - "deposit(address,address)", - "execute(address,uint256,bytes)", - "increaseAmount(uint256)", - "increaseTime(uint256)", - "operator()", - "release()", - "setStashAccess(address,bool)", - "vote(uint256,address,bool)", - "voteGaugeWeight(address,uint256)", - "withdraw(address)", - "withdraw(address,address,uint256)", - "withdrawAll(address,address)", - "initialize(uint256,address,address,address,address)", - "processStash()", - "stashRewards()", - "CreateStash(uint256,address,address,uint256)", - "CreateDepositToken(address)", - "burn(address,uint256)", - "fund(address[],uint256[])", - "getVote(uint256)", - "vote(uint256,bool,bool)", - "vote_for_gauge_weights(address,uint256)", - "check(address)", - "addRewards()", - "collateralVault()", - "convexBooster()", - "convexPool()", - "convexPoolId()", - "convexToken()", - "crv()", - "curveToken()", - "cvx()", - "deposit(uint256,address)", - "earnedView(address)", - "getReward(address,address)", - "initialize(uint256)", - "isInit()", - "registeredRewards(address)", - "rewardLength()", - "rewards(uint256)", - "setApprovals()", - "shutdown()", - "stake(uint256,address)", - "totalBalanceOf(address)", - "user_checkpoint(address)", - "withdrawAndUnwrap(uint256)", - "deposit(uint256,uint256,bool)", - "deposit(uint256,bool,address)", - "ConvertCrvToCvx(uint256)", - "maxSupply()", - "reductionPerCliff()", - "totalCliffs()", - "extraRewards(uint256)", - "extraRewardsLength()", - "getReward()", - "getReward(address,bool)", - "withdrawAndUnwrap(uint256,bool)", - "submit()", - "submitAndDeposit(address)", - "convertToAssets(uint256)", - "pricePerShare()", - "rewardsCycleEnd()", - "syncRewards()", - "getBeaconStat()", - "handleOracleReport(uint256,uint256)", - "stEthPerToken()", - "targetPerRefChainlinkFeed()", - "targetPerRefChainlinkTimeout()", - "getExchangeRate()", - "getTotalETHBalance()", - "setUint(bytes32,uint256)", - "refPerTokChainlinkFeed()", - "refPerTokChainlinkTimeout()", - "ONE_HUNDRED_PERCENT()", - "cancel(address[],uint256[],bytes[],bytes32)", - "adminApprove(address,address,uint256)", - "aaveBalances(address)", - "aaveToken()", - "setAaveToken(address)", - "setExchangeRate(uint192)", - "setRewards(address,uint256)", - "setNormalizedIncome(address,uint256)", - "WETH()", - "getAssetPrice(address)", - "checkHardDefault()", - "checkSoftDefault()", - "setHardDefaultCheck(bool)", - "setSoftDefaultCheck(bool)", - "censored(address)", - "revertDecimals()", - "setCensored(address,bool)", - "borrowKink()", - "withdraw(uint256,bool)", - "setRevertDecimals(bool)", - "setTransferFee(uint192)", - "transferFee()", - "getAnswer(uint256)", - "getTimestamp(uint256)", - "latestAnswer()", - "latestAnsweredRound()", - "latestRound()", - "latestTimestamp()", - "setInvalidAnsweredRound()", - "setInvalidTimestamp()", - "updateAnswer(int256)", - "updateRoundData(uint80,int256,uint256,uint256)", - "externalDelegate()", - "setReserves(int256)", - "compBalances(address)", - "compToken()", - "setCompToken(address)", - "setBalances(uint256[])", - "setVirtualPrice(uint256)", - "setMockExchangeRate(bool,uint256)", - "hasAccess(address,bytes)", - "acceptOwnership()", - "aggregator()", - "confirmAggregator(address)", - "phaseAggregators(uint16)", - "phaseId()", - "proposeAggregator(address)", - "proposedAggregator()", - "proposedGetRoundData(uint80)", - "proposedLatestRoundData()", - "accessController()", - "setController(address)", - "__getAnswer(uint256)", - "__getTimestamp(uint256)", - "__latestAnswer()", - "__latestAnsweredRound()", - "__latestRound()", - "__latestTimestamp()", - "counter()", - "approvalsOn()", - "disableApprovals()", - "enableApprovals()", - "FEE_DENOMINATOR()", - "auctionAccessData(uint256)", - "auctionAccessManager(uint256)", - "auctionCounter()", - "cancelSellOrders(uint256,bytes32[])", - "claimFromParticipantOrder(uint256,bytes32[])", - "containsOrder(uint256,bytes32)", - "feeReceiverUserId()", - "getSecondsRemainingInBatch(uint256)", - "getUserId(address)", - "numUsers()", - "placeSellOrders(uint256,uint96[],uint96[],bytes32[],bytes)", - "placeSellOrdersOnBehalf(uint256,uint96[],uint96[],bytes32[],bytes,address)", - "precalculateSellAmountSum(uint256,uint256)", - "registerUser(address)", - "setFeeParameters(uint256,address)", - "settleAuctionAtomically(uint256,uint96[],uint96[],bytes32[],bytes)", - "infiniteLoop()", - "revertRefPerTok()", - "setRevertRefPerTok(bool)", - "auctions(uint256)", - "bids(uint256)", - "numAuctions()", - "placeBid(uint256,(address,uint256,uint256))", - "reenterOnInit()", - "reenterOnSettle()", - "setReenterOnInit(bool)", - "setReenterOnSettle(bool)", - "setSimplyRevert(bool)", - "simplyRevert()", - "rateMock()", - "refPerTokRevert()", - "setRate(uint192)", - "setRefPerTokRevert(bool)", - "setTargetPerRef(uint192)", - "priceable()", - "destroyAndTransfer(address)", - "setPricePerShare(uint256)", - "mockRefPerTok()", - "setUnpriced(bool)", - "unpriced()", - "deposit()", - "newValue()", - "setNewValue(uint256)", - "isAllowed(address,uint256,bytes)", - "contains(bytes32)", - "decodeOrder(bytes32)", - "encodeOrder(uint64,uint96,uint96)", - "first()", - "initializeEmptyList()", - "insert(bytes32)", - "insertAt(bytes32,bytes32)", - "isEmpty()", - "next(bytes32)", - "nextMap(bytes32)", - "prevMap(bytes32)", - "remove(bytes32)", - "removeKeepHistory(bytes32)", - "smallerThan(bytes32,bytes32)", - "DEFAULT_MIN_BID()", - "MAX_ORDERS()", - "auctionId()", - "init(address,address,address,uint48,(address,address,uint256,uint256))", - "initBal()", - "origin()", - "transferToOriginAfterTradeComplete(address)", - "worstCasePrice()" - ], - "events": [ - "Approval(address,address,uint256)", - "Transfer(address,address,uint256)", - "BalanceTransfer(address,address,uint256,uint256)", - "Burn(address,address,uint256,uint256)", - "Mint(address,uint256,uint256)", - "Borrow(address,address,address,uint256,uint256,uint256,uint16)", - "Deposit(address,address,address,uint256,uint16)", - "FlashLoan(address,address,address,uint256,uint256,uint16)", - "LiquidationCall(address,address,address,uint256,uint256,address,bool)", - "Paused()", - "RebalanceStableBorrowRate(address,address)", - "Repay(address,address,address,uint256)", - "ReserveDataUpdated(address,uint256,uint256,uint256,uint256,uint256)", - "ReserveUsedAsCollateralDisabled(address,address)", - "ReserveUsedAsCollateralEnabled(address,address)", - "Swap(address,address,uint256)", - "Unpaused()", - "Withdraw(address,address,address,uint256)", - "AddressSet(bytes32,address,bool)", - "ConfigurationAdminUpdated(address)", - "EmergencyAdminUpdated(address)", - "LendingPoolCollateralManagerUpdated(address)", - "LendingPoolConfiguratorUpdated(address)", - "LendingPoolUpdated(address)", - "LendingRateOracleUpdated(address)", - "MarketIdSet(string)", - "PriceOracleUpdated(address)", - "ProxyCreated(bytes32,address)", - "Initialized(uint8)", - "RoleAdminChanged(bytes32,bytes32,bytes32)", - "RoleGranted(bytes32,address,address)", - "RoleRevoked(bytes32,address,address)", - "OwnershipTransferred(address,address)", - "DelegateChanged(address,address,address)", - "DelegateVotesChanged(address,uint256,uint256)", - "AdminChanged(address,address)", - "BeaconUpgraded(address)", - "Upgraded(address)", - "ProposalCanceled(uint256)", - "ProposalCreated(uint256,address,address[],uint256[],string[],bytes[],uint256,uint256,string)", - "ProposalExecuted(uint256)", - "VoteCast(address,uint256,uint8,uint256,string)", - "VoteCastWithParams(address,uint256,uint8,uint256,string,bytes)", - "CallExecuted(bytes32,uint256,address,uint256,bytes)", - "CallScheduled(bytes32,uint256,address,uint256,bytes,bytes32,uint256)", - "Cancelled(bytes32)", - "MinDelayChange(uint256,uint256)", - "ProposalThresholdSet(uint256,uint256)", - "VotingDelaySet(uint256,uint256)", - "VotingPeriodSet(uint256,uint256)", - "ProposalQueued(uint256,uint256)", - "TimelockChange(address,address)", - "QuorumNumeratorUpdated(uint256,uint256)", - "DeploymentRegistered(string,address)", - "DeploymentUnregistered(string,address)", - "LatestChanged(string,address)", - "GovernanceCreated(address,address,address)", - "RewardsClaimed(address,uint256)", - "CollateralStatusChanged(uint8,uint8)", - "AssetRegistered(address,address)", - "AssetUnregistered(address,address)", - "BackingBufferSet(uint192,uint192)", - "MaxTradeSlippageSet(uint192,uint192)", - "MinTradeVolumeSet(uint192,uint192)", - "TradeSettled(address,address,address,uint256,uint256)", - "TradeStarted(address,address,address,uint256,uint256)", - "TradingDelaySet(uint48,uint48)", - "BackupConfigSet(bytes32,uint256,address[])", - "BasketSet(uint256,address[],uint192[],bool)", - "PrimeBasketSet(address[],uint192[],bytes32[])", - "AuctionLengthSet(uint48,uint48)", - "DisabledSet(bool,bool)", - "GnosisSet(address,address)", - "TradeImplementationSet(address,address)", - "RTokenCreated(address,address,address,address,string)", - "DistributionSet(address,uint16,uint16)", - "RevenueDistributed(address,address,uint256)", - "RatioSet(uint192,uint192)", - "LongFreezeDurationSet(uint48,uint48)", - "PausedSet(bool,bool)", - "ShortFreezeDurationSet(uint48,uint48)", - "UnfreezeAtSet(uint48,uint48)", - "AssetRegistrySet(address,address)", - "BackingManagerSet(address,address)", - "BasketHandlerSet(address,address)", - "BrokerSet(address,address)", - "DistributorSet(address,address)", - "FurnaceSet(address,address)", - "RSRTraderSet(address,address)", - "RTokenSet(address,address)", - "RTokenTraderSet(address,address)", - "StRSRSet(address,address)", - "MainInitialized()", - "BasketsNeededChanged(uint192,uint192)", - "Issuance(address,address,uint256,uint192)", - "IssuanceThrottleSet((uint256,uint192),(uint256,uint192))", - "Melted(uint256)", - "Redemption(address,address,uint256,uint192)", - "RedemptionThrottleSet((uint256,uint192),(uint256,uint192))", - "AllBalancesReset(uint256)", - "AllUnstakingReset(uint256)", - "ExchangeRateSet(uint192,uint192)", - "RewardRatioSet(uint192,uint192)", - "RewardsPaid(uint256)", - "Staked(uint256,address,uint256,uint256)", - "UnstakingCompleted(uint256,uint256,uint256,address,uint256)", - "UnstakingDelaySet(uint48,uint48)", - "UnstakingStarted(uint256,uint256,address,uint256,uint256,uint256)", - "ClaimerSet(address,address)", - "RewardsAccrued(address,uint256)", - "RewardsClaimed(address,address,uint256)", - "RewardsClaimed(address,address,address,uint256)", - "RewardClaimed(address,address,address,uint256)", - "AbsorbCollateral(address,address,address,uint256,uint256)", - "AbsorbDebt(address,address,uint256,uint256)", - "BuyCollateral(address,address,uint256,uint256)", - "PauseAction(bool,bool,bool,bool,bool)", - "Supply(address,address,uint256)", - "SupplyCollateral(address,address,address,uint256)", - "TransferCollateral(address,address,address,uint256)", - "Withdraw(address,address,uint256)", - "WithdrawCollateral(address,address,address,uint256)", - "WithdrawReserves(address,uint256)", - "Deposited(address,address,uint256,bool)", - "Withdrawn(address,uint256,bool)", - "AnswerUpdated(int256,uint256,uint256)", - "NewRound(uint256,address,uint256)", - "OwnershipTransferRequested(address,address)", - "AuctionCleared(uint256,uint96,uint96,bytes32)", - "CancellationSellOrder(uint256,uint64,uint96,uint96)", - "ClaimedFromOrder(uint256,uint64,uint96,uint96)", - "NewAuction(uint256,address,address,uint256,uint256,uint64,uint96,uint96,uint256,uint256,address,bytes)", - "NewSellOrder(uint256,uint64,uint96,uint96)", - "NewUser(uint64,address)", - "UserRegistration(address,uint64)", - "Deposit(address,uint256)", - "Withdrawal(address,uint256)", - "Empty()", - "OutOfBounds()", - "UIntOutOfBounds()", - "StalePrice()", - "InvalidInt256()", - "InvalidUInt104()", - "InvalidUInt64()", - "NegativeNumber()", - "BadAmount()", - "ExceedsBalance(uint256)", - "Unauthorized()", - "ZeroAddress()", - "BadNonce()", - "BadSignatory()", - "InvalidValueS()", - "InvalidValueV()", - "SignatureExpired()", - "Absurd()", - "AlreadyInitialized()", - "BadAsset()", - "BadDecimals()", - "BadDiscount()", - "BadMinimum()", - "BadPrice()", - "BorrowCFTooLarge()", - "BorrowTooSmall()", - "InsufficientReserves()", - "LiquidateCFTooLarge()", - "NoSelfTransfer()", - "NotCollateralized()", - "NotForSale()", - "NotLiquidatable()", - "SupplyCapExceeded()", - "TimestampTooLarge()", - "TooManyAssets()", - "TooMuchSlippage()", - "TransferInFailed()", - "TransferOutFailed()", - "NoToken(uint8)", - "WrongIndex(uint8)" - ] -} diff --git a/scripts/4bytes.ts b/scripts/4bytes.ts deleted file mode 100644 index e0bdc74421..0000000000 --- a/scripts/4bytes.ts +++ /dev/null @@ -1,105 +0,0 @@ -import hre from 'hardhat' -import fs from 'fs' -import fetch from 'isomorphic-fetch' -import previousSync from './4bytes-syncced.json' -/** - * This script will sync any event and function we have with www.4byte.directory - * The script saves all processed signatures with 4bytes-syncced.json as it succcesses - * this way we avoid syncing the same signature twice. - * */ - -const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms)) - -async function main() { - const artifacts = await hre.artifacts.getAllFullyQualifiedNames() - const artifactsWithAbi = ( - await Promise.all(artifacts.map((name) => hre.artifacts.readArtifact(name))) - ).filter((artifact) => artifact.abi.length !== 0) - const prevFunctions = new Set(previousSync.functions) - const prevEvents = new Set(previousSync.events) - const newErrorSignatures = new Set() - const newFunctionSignatures = new Set() - const newEventSignatures = new Set() - for (const { abi } of artifactsWithAbi) { - const abiInterface = new hre.ethers.utils.Interface(abi) - // Events and Errors seem to be the same thing for 4bytes - Object.keys(abiInterface.events) - .filter((e) => !prevEvents.has(e)) - .forEach((e) => newEventSignatures.add(e)) - Object.keys(abiInterface.errors) - .filter((e) => !prevEvents.has(e)) - .forEach((e) => newEventSignatures.add(e)) - - Object.keys(abiInterface.functions) - .filter((e) => !prevFunctions.has(e)) - .forEach((e) => newFunctionSignatures.add(e)) - } - const total = newErrorSignatures.size + newFunctionSignatures.size + newEventSignatures.size - if (total === 0) { - console.log('All up to date!') - return - } - - console.log('Will sync ' + total + ' signatures with 4bytes...') - - const save = () => { - fs.writeFileSync('./scripts/4bytes-syncced.json', JSON.stringify(previousSync, null, 2)) - } - console.log('----- Synccing functions ----- ') - for (const sig of newFunctionSignatures) { - for (let i = 0; i < 3; i++) { - const resp = await fetch('https://www.4byte.directory/api/v1/signatures/', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - text_signature: sig, - }), - }) - if (resp.status === 400 || resp.status === 201) { - console.log('function', sig, resp.status, await resp.text()) - previousSync.functions.push(sig) - save() - break - } - if (i === 2) { - console.log('Failed to sync function', sig, 'after 3 attempts') - } else { - await sleep(1000) - } - } - } - console.log('----- Synccing events ----- ') - for (const sig of newEventSignatures) { - for (let i = 0; i < 3; i++) { - const resp = await fetch('https://www.4byte.directory/api/v1/event-signatures/', { - method: 'POST', - headers: { - 'Content-Type': 'application/json', - }, - body: JSON.stringify({ - text_signature: sig, - }), - }) - if (resp.status === 400 || resp.status === 201) { - console.log('event', sig, resp.status, await resp.text()) - previousSync.events.push(sig) - save() - break - } - - if (i === 2) { - console.log('Failed to sync event', sig, 'after 3 attempts') - } else { - await sleep(1000) - } - } - } - console.log('Done!') -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/tasks/testing/upgrade-checker-utils/constants.ts b/tasks/testing/upgrade-checker-utils/constants.ts index fe5640245c..a58d60a7fe 100644 --- a/tasks/testing/upgrade-checker-utils/constants.ts +++ b/tasks/testing/upgrade-checker-utils/constants.ts @@ -17,7 +17,7 @@ export const whales: { [key: string]: string } = { [networkConfig['1'].tokens.stETH!.toLowerCase()]: '0x176F3DAb24a159341c0509bB36B833E7fdd0a132', [networkConfig['1'].tokens.WETH!.toLowerCase()]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28', [networkConfig['1'].tokens.DAI!.toLowerCase()]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28', - [networkConfig['1'].tokens.CRV!.toLowerCase()]: "0xf977814e90da44bfa03b6295a0616a897441acec" + [networkConfig['1'].tokens.CRV!.toLowerCase()]: '0xf977814e90da44bfa03b6295a0616a897441acec', } export const collateralToUnderlying: { [key: string]: string } = { From 949b0be9f492974e2603bc50bb0ed2fc5fcb8022 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 8 Aug 2023 15:23:55 +0200 Subject: [PATCH 010/450] Dutch trade decimals (#883) --- contracts/plugins/trading/DutchTrade.sol | 28 ++-- package.json | 2 +- test/Broker.test.ts | 155 ++++++++++++++++++++++- 3 files changed, 169 insertions(+), 16 deletions(-) diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 98eecfeb96..b6373b32a6 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -111,7 +111,12 @@ contract DutchTrade is ITrade { status = end; } - // === External Bid Helper === + // === Auction Sizing Views === + + /// @return {qSellTok} The size of the lot being sold, in token quanta + function lot() public view returns (uint256) { + return sellAmount.shiftl_toUint(int8(sell.decimals())); + } /// Calculates how much buy token is needed to purchase the lot at a particular block /// @param blockNumber {block} The block number of the bid @@ -120,6 +125,8 @@ contract DutchTrade is ITrade { return _bidAmount(_price(blockNumber)); } + // ==== Constructor === + constructor() { ONE_BLOCK = NetworkConfigLib.blocktime(); @@ -218,18 +225,16 @@ contract DutchTrade is ITrade { // Received bid if (bidder != address(0)) { - sell.safeTransfer(bidder, sellAmount); + soldAmt = lot(); // {qSellTok} + sell.safeTransfer(bidder, soldAmt); // {qSellTok} } else { require(block.number > endBlock, "auction not over"); } - uint256 sellBal = sell.balanceOf(address(this)); - soldAmt = sellAmount > sellBal ? sellAmount - sellBal : 0; - boughtAmt = buy.balanceOf(address(this)); - - // Transfer balances back to origin - buy.safeTransfer(address(origin), boughtAmt); - sell.safeTransfer(address(origin), sellBal); + // Transfer remaining balances back to origin + boughtAmt = buy.balanceOf(address(this)); // {qBuyTok} + buy.safeTransfer(address(origin), boughtAmt); // {qBuyTok} + sell.safeTransfer(address(origin), sell.balanceOf(address(this))); // {qSellTok} } /// Anyone can transfer any ERC20 back to the origin after the trade has been closed @@ -246,11 +251,6 @@ contract DutchTrade is ITrade { return status == TradeStatus.OPEN && (bidder != address(0) || block.number > endBlock); } - /// @return {qSellTok} The size of the lot being sold, in token quanta - function lot() external view returns (uint256) { - return sellAmount.shiftl_toUint(int8(sell.decimals())); - } - // === Private === /// Return a sliding % from 0 (at maxTradeVolume) to maxTradeSlippage (at minTradeVolume) diff --git a/package.json b/package.json index 616de80010..9afb749c90 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "deploy:run": "hardhat run scripts/deploy.ts", "deploy:confirm": "hardhat run scripts/confirm.ts", "deploy:verify_etherscan": "hardhat run scripts/verify_etherscan.ts", - "test:extreme": "EXTREME=1 PROTO_IMPL=1 npx hardhat test test/{Furnace,RTokenExtremes,ZTradingExtremes,ZZStRSR}.test.ts", + "test:extreme": "EXTREME=1 PROTO_IMPL=1 npx hardhat test test/{Broker,Furnace,RTokenExtremes,ZTradingExtremes,ZZStRSR}.test.ts", "test:extreme:integration": "FORK=1 EXTREME=1 PROTO_IMPL=1 npx hardhat test test/integration/**/*.test.ts", "test:unit": "yarn test:plugins && yarn test:p0 && yarn test:p1", "test:fast": "bash tools/fast-test.sh", diff --git a/test/Broker.test.ts b/test/Broker.test.ts index a484b2d5e6..6f86dc61f4 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -6,6 +6,7 @@ import { BigNumber, ContractFactory } from 'ethers' import { ethers, upgrades } from 'hardhat' import { IConfig, MAX_AUCTION_LENGTH } from '../common/configuration' import { + MAX_UINT48, MAX_UINT96, MAX_UINT192, TradeKind, @@ -13,7 +14,7 @@ import { ZERO_ADDRESS, ONE_ADDRESS, } from '../common/constants' -import { bn, fp, divCeil, toBNDecimals } from '../common/numbers' +import { bn, fp, divCeil, shortString, toBNDecimals } from '../common/numbers' import { DutchTrade, ERC20Mock, @@ -23,13 +24,16 @@ import { GnosisTrade, IAssetRegistry, TestIBackingManager, + TestIBasketHandler, TestIBroker, TestIMain, TestIRevenueTrader, + TestIRToken, USDCMock, ZeroDecimalMock, } from '../typechain' import { whileImpersonating } from './utils/impersonation' +import { cartesianProduct } from './utils/cases' import { Collateral, DefaultFixture, @@ -39,6 +43,7 @@ import { ORACLE_ERROR, ORACLE_TIMEOUT, PRICE_TIMEOUT, + SLOW, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' import { @@ -54,6 +59,9 @@ import { useEnv } from '#/utils/env' const DEFAULT_THRESHOLD = fp('0.01') // 1% const DELAY_UNTIL_DEFAULT = bn('86400') // 24h +const describeExtreme = + IMPLEMENTATION == Implementation.P1 && useEnv('EXTREME') ? describe.only : describe.skip + const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip @@ -82,8 +90,10 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { let main: TestIMain let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler let rsrTrader: TestIRevenueTrader let rTokenTrader: TestIRevenueTrader + let rToken: TestIRToken let basket: Collateral[] let collateral: Collateral[] @@ -99,10 +109,12 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { main, assetRegistry, backingManager, + basketHandler, broker, gnosis, rsrTrader, rTokenTrader, + rToken, collateral, } = await loadFixture(defaultFixture)) @@ -1298,6 +1310,147 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { }) }) + describeExtreme(`Extreme Values ${SLOW ? 'slow mode' : 'fast mode'}`, () => { + if (!(Implementation.P1 && useEnv('EXTREME'))) return // prevents bunch of skipped tests + + async function runScenario([ + sellTokDecimals, + buyTokDecimals, + auctionSellAmt, + progression, + ]: BigNumber[]) { + // Factories + const ERC20Factory = await ethers.getContractFactory('ERC20MockDecimals') + const CollFactory = await ethers.getContractFactory('FiatCollateral') + const sellTok = await ERC20Factory.deploy('Sell Token', 'SELL', sellTokDecimals) + const buyTok = await ERC20Factory.deploy('Buy Token', 'BUY', buyTokDecimals) + const sellColl = await CollFactory.deploy({ + priceTimeout: MAX_UINT48, + chainlinkFeed: await collateral0.chainlinkFeed(), + oracleError: bn('1'), // minimize + erc20: sellTok.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: MAX_UINT48, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), // shouldn't matter + delayUntilDefault: bn('604800'), // shouldn't matter + }) + await assetRegistry.connect(owner).register(sellColl.address) + const buyColl = await CollFactory.deploy({ + priceTimeout: MAX_UINT48, + chainlinkFeed: await collateral0.chainlinkFeed(), + oracleError: bn('1'), // minimize + erc20: buyTok.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: MAX_UINT48, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), // shouldn't matter + delayUntilDefault: bn('604800'), // shouldn't matter + }) + await assetRegistry.connect(owner).register(buyColl.address) + + // Set basket + await basketHandler + .connect(owner) + .setPrimeBasket([sellTok.address, buyTok.address], [fp('0.5'), fp('0.5')]) + await basketHandler.connect(owner).refreshBasket() + + const MAX_ERC20_SUPPLY = bn('1e48') // from docs/solidity-style.md + + // Max out throttles + const issuanceThrottleParams = { amtRate: MAX_ERC20_SUPPLY, pctRate: 0 } + const redemptionThrottleParams = { amtRate: MAX_ERC20_SUPPLY, pctRate: 0 } + await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) + await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + await advanceTime(3600) + + // Mint coll tokens to addr1 + await buyTok.connect(owner).mint(addr1.address, MAX_ERC20_SUPPLY) + await sellTok.connect(owner).mint(addr1.address, MAX_ERC20_SUPPLY) + + // Issue RToken + await buyTok.connect(addr1).approve(rToken.address, MAX_ERC20_SUPPLY) + await sellTok.connect(addr1).approve(rToken.address, MAX_ERC20_SUPPLY) + await rToken.connect(addr1).issue(MAX_ERC20_SUPPLY.div(2)) + + // Burn buyTok from backingManager and send extra sellTok + const burnAmount = divCeil( + auctionSellAmt.mul(bn(10).pow(buyTokDecimals)), + bn(10).pow(sellTokDecimals) + ) + await buyTok.burn(backingManager.address, burnAmount) + await sellTok.connect(addr1).transfer(backingManager.address, auctionSellAmt.mul(10)) + + // Rebalance should cause backingManager to trade about auctionSellAmt, though not exactly + await backingManager.setMaxTradeSlippage(bn('0')) + await backingManager.setMinTradeVolume(bn('0')) + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) + .to.emit(backingManager, 'TradeStarted') + .withArgs(anyValue, sellTok.address, buyTok.address, anyValue, anyValue) + + // Get Trade + const tradeAddr = await backingManager.trades(sellTok.address) + await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + const currentBlock = bn(await getLatestBlockNumber()) + const toAdvance = progression + .mul((await trade.endBlock()).sub(currentBlock)) + .div(fp('1')) + .sub(1) + if (toAdvance.gt(0)) await advanceBlocks(toAdvance) + + // Bid + const sellAmt = await trade.lot() + const bidBlock = bn('1').add(await getLatestBlockNumber()) + const bidAmt = await trade.bidAmount(bidBlock) + expect(bidAmt).to.be.gt(0) + const buyBalBefore = await buyTok.balanceOf(backingManager.address) + const sellBalBefore = await sellTok.balanceOf(addr1.address) + await expect(trade.connect(addr1).bid()) + .to.emit(backingManager, 'TradeSettled') + .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + + // Check balances + expect(await sellTok.balanceOf(addr1.address)).to.equal(sellBalBefore.add(sellAmt)) + expect(await buyTok.balanceOf(backingManager.address)).to.equal(buyBalBefore.add(bidAmt)) + expect(await sellTok.balanceOf(trade.address)).to.equal(0) + expect(await buyTok.balanceOf(trade.address)).to.equal(0) + + // Check disabled status + const shouldDisable = progression.lt(fp('0.2')) + expect(await broker.dutchTradeDisabled(sellTok.address)).to.equal(shouldDisable) + expect(await broker.dutchTradeDisabled(buyTok.address)).to.equal(shouldDisable) + } + + // ==== Generate the tests ==== + + // applied to both buy and sell tokens + const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18')] + + // auction sell amount + const auctionSellAmts = [bn('2'), bn('1595439874635'), bn('987321984732198435645846513')] + + // auction progression %: these will get rounded to blocks later + const progression = [fp('0'), fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1')] + + // total cases is 5 * 5 * 3 * 4 = 300 + + if (SLOW) { + progression.push(fp('0.176334768961354965'), fp('0.523449931646439834')) + + // total cases is 5 * 5 * 3 * 6 = 450 + } + + const paramList = cartesianProduct(decimals, decimals, auctionSellAmts, progression) + + const numCases = paramList.length.toString() + paramList.forEach((params, index) => { + it(`case ${index + 1} of ${numCases}: ${params.map(shortString).join(' ')}`, async () => { + await runScenario(params) + }) + }) + }) + describeGas('Gas Reporting', () => { context('GnosisTrade', () => { let amount: BigNumber From 9655b3494f32aba5937599c1c67a98823fce2e02 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 8 Aug 2023 15:31:59 -0400 Subject: [PATCH 011/450] add new tenderly fork with different chain id --- .openzeppelin/ropsten.json | 3155 ++++++++++++++++++++++ common/configuration.ts | 104 +- contracts/libraries/NetworkConfigLib.sol | 2 +- hardhat.config.ts | 6 +- 4 files changed, 3257 insertions(+), 10 deletions(-) create mode 100644 .openzeppelin/ropsten.json diff --git a/.openzeppelin/ropsten.json b/.openzeppelin/ropsten.json new file mode 100644 index 0000000000..8370c99c6f --- /dev/null +++ b/.openzeppelin/ropsten.json @@ -0,0 +1,3155 @@ +{ + "manifestVersion": "3.2", + "proxies": [], + "impls": { + "387f5c1d576149b40bc0e5061719ad027b6edbb10b7c3cc32ae96a49ca2ddd6d": { + "address": "0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450", + "txHash": "0xfb5f15c28821dc69c191b1de79f54ac0eb95944c80d6cb601a3f944434d84218", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41" + }, + { + "label": "_roles", + "offset": 0, + "slot": "101", + "type": "t_mapping(t_bytes32,t_struct(RoleData)80_storage)", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:61" + }, + { + "label": "__gap", + "offset": 0, + "slot": "102", + "type": "t_array(t_uint256)49_storage", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:259" + }, + { + "label": "longFreezes", + "offset": 0, + "slot": "151", + "type": "t_mapping(t_address,t_uint256)", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:36" + }, + { + "label": "unfreezeAt", + "offset": 0, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:38" + }, + { + "label": "shortFreeze", + "offset": 6, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:39" + }, + { + "label": "longFreeze", + "offset": 12, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:40" + }, + { + "label": "tradingPaused", + "offset": 18, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:45", + "renamedFrom": "paused" + }, + { + "label": "issuancePaused", + "offset": 19, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "153", + "type": "t_array(t_uint256)48_storage", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:225" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)9273", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "202", + "type": "t_contract(IStRSR)9610", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:42" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "203", + "type": "t_contract(IAssetRegistry)7781", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:50" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "204", + "type": "t_contract(IBasketHandler)8090", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:58" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "205", + "type": "t_contract(IBackingManager)7843", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:66" + }, + { + "label": "distributor", + "offset": 0, + "slot": "206", + "type": "t_contract(IDistributor)8548", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:74" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "207", + "type": "t_contract(IRevenueTrader)9402", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:82" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_contract(IRevenueTrader)9402", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:90" + }, + { + "label": "furnace", + "offset": 0, + "slot": "209", + "type": "t_contract(IFurnace)8609", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:98" + }, + { + "label": "broker", + "offset": 0, + "slot": "210", + "type": "t_contract(IBroker)8239", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:106" + }, + { + "label": "__gap", + "offset": 0, + "slot": "211", + "type": "t_array(t_uint256)40_storage", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:119" + }, + { + "label": "__gap", + "offset": 0, + "slot": "251", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "301", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "rsr", + "offset": 0, + "slot": "351", + "type": "t_contract(IERC20)4390", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:19" + }, + { + "label": "__gap", + "offset": 0, + "slot": "352", + "type": "t_array(t_uint256)49_storage", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:71" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)40_storage": { + "label": "uint256[40]", + "numberOfBytes": "1280" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)7781": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)7843": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)8090": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)8239": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)8548": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)4390": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)8609": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IRToken)9273": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)9402": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)9610": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(RoleData)80_storage)": { + "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)", + "numberOfBytes": "32" + }, + "t_struct(RoleData)80_storage": { + "label": "struct AccessControlUpgradeable.RoleData", + "members": [ + { + "label": "members", + "type": "t_mapping(t_address,t_bool)", + "offset": 0, + "slot": "0" + }, + { + "label": "adminRole", + "type": "t_bytes32", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "fe0f2dec194b882efa0d8220d324cba3ec32136c7c6322c221bd90103690d736": { + "address": "0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C", + "txHash": "0x8450c16d3aaf3b9ebcb9879d39c8bc62c0717a6ddc38530804ac13f59b95b70d", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)22719", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "201", + "type": "t_contract(IBasketHandler)21243", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:19" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)20996", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:20" + }, + { + "label": "_erc20s", + "offset": 0, + "slot": "203", + "type": "t_struct(AddressSet)17778_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:23" + }, + { + "label": "assets", + "offset": 0, + "slot": "205", + "type": "t_mapping(t_contract(IERC20)11530,t_contract(IAsset)20691)", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:26" + }, + { + "label": "lastRefresh", + "offset": 0, + "slot": "206", + "type": "t_uint48", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:30" + }, + { + "label": "__gap", + "offset": 0, + "slot": "207", + "type": "t_array(t_uint256)46_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:233" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAsset)20691": { + "label": "contract IAsset", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)20996": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)21243": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11530": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)22719": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)11530,t_contract(IAsset)20691)": { + "label": "mapping(contract IERC20 => contract IAsset)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)17778_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)17477_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Set)17477_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "75937c367e73897978ccbb283109f2c51fa3d603982f50cba839720fd5494c6f": { + "address": "0x1BD20253c49515D348dad1Af70ff2c0473FEa358", + "txHash": "0x6280f33e907da360d6ef84c181626cddcc4595ba685c3bf881ee9dc43e10bbc0", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)12158", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)11036", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:27" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)6264,t_contract(ITrade)12850)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:155" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)10578", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)10887", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)11345", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)12378", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:33" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)6264", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)12715", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:35" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)12507", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)12507", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:42" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)11714", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:45" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)10909,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "312", + "type": "t_array(t_uint256)39_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:310" + } + ], + "types": { + "t_array(t_uint256)39_storage": { + "label": "uint256[39]", + "numberOfBytes": "1248" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)10578": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)10887": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)11036": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)11345": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)6264": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)11714": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)12158": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)12378": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)12507": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)12715": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)12850": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)10909": { + "label": "enum TradeKind", + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)6264,t_contract(ITrade)12850)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)10909,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "bbf9dd201f53ccf79786486dfa2cd67b1e7bd910977c30dfc96ef0ba62009025": { + "address": "0x0776Ad71Ae99D759354B3f06fe17454b94837B0D", + "txHash": "0xefc0dd100e291ebe15d63ad9d67ae1be0763329f4dcd1306074bca1a38c928fe", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)22719", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "201", + "type": "t_contract(IAssetRegistry)20934", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:34" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)20996", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:35" + }, + { + "label": "rsr", + "offset": 0, + "slot": "203", + "type": "t_contract(IERC20)11530", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "204", + "type": "t_contract(IRToken)22939", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:37" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "205", + "type": "t_contract(IStRSR)23276", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:38" + }, + { + "label": "config", + "offset": 0, + "slot": "206", + "type": "t_struct(BasketConfig)49596_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:42" + }, + { + "label": "basket", + "offset": 0, + "slot": "210", + "type": "t_struct(Basket)49606_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:46" + }, + { + "label": "nonce", + "offset": 0, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:48" + }, + { + "label": "timestamp", + "offset": 6, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:49" + }, + { + "label": "disabled", + "offset": 12, + "slot": "212", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:53" + }, + { + "label": "_targetNames", + "offset": 0, + "slot": "213", + "type": "t_struct(Bytes32Set)17671_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:59" + }, + { + "label": "_newBasket", + "offset": 0, + "slot": "215", + "type": "t_struct(Basket)49606_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:60" + }, + { + "label": "warmupPeriod", + "offset": 0, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:66" + }, + { + "label": "lastStatusTimestamp", + "offset": 6, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:70" + }, + { + "label": "lastStatus", + "offset": 12, + "slot": "217", + "type": "t_enum(CollateralStatus)20723", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:71" + }, + { + "label": "basketHistory", + "offset": 0, + "slot": "218", + "type": "t_mapping(t_uint48,t_struct(Basket)49606_storage)", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:77" + }, + { + "label": "_targetAmts", + "offset": 0, + "slot": "219", + "type": "t_struct(Bytes32ToUintMap)17283_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:80" + }, + { + "label": "__gap", + "offset": 0, + "slot": "222", + "type": "t_array(t_uint256)37_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:670" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_contract(IERC20)11530)dyn_storage": { + "label": "contract IERC20[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)37_storage": { + "label": "uint256[37]", + "numberOfBytes": "1184" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)20934": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)20996": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11530": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)22719": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)22939": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)23276": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_enum(CollateralStatus)20723": { + "label": "enum CollateralStatus", + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_bytes32,t_bytes32)": { + "label": "mapping(bytes32 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(BackupConfig)49576_storage)": { + "label": "mapping(bytes32 => struct BackupConfig)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)11530,t_bytes32)": { + "label": "mapping(contract IERC20 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)11530,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint48,t_struct(Basket)49606_storage)": { + "label": "mapping(uint48 => struct Basket)", + "numberOfBytes": "32" + }, + "t_struct(BackupConfig)49576_storage": { + "label": "struct BackupConfig", + "members": [ + { + "label": "max", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)11530)dyn_storage", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Basket)49606_storage": { + "label": "struct Basket", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)11530)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "refAmts", + "type": "t_mapping(t_contract(IERC20)11530,t_uint192)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(BasketConfig)49596_storage": { + "label": "struct BasketConfig", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)11530)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "targetAmts", + "type": "t_mapping(t_contract(IERC20)11530,t_uint192)", + "offset": 0, + "slot": "1" + }, + { + "label": "targetNames", + "type": "t_mapping(t_contract(IERC20)11530,t_bytes32)", + "offset": 0, + "slot": "2" + }, + { + "label": "backups", + "type": "t_mapping(t_bytes32,t_struct(BackupConfig)49576_storage)", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(Bytes32Set)17671_storage": { + "label": "struct EnumerableSet.Bytes32Set", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)17477_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32ToBytes32Map)16360_storage": { + "label": "struct EnumerableMap.Bytes32ToBytes32Map", + "members": [ + { + "label": "_keys", + "type": "t_struct(Bytes32Set)17671_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_values", + "type": "t_mapping(t_bytes32,t_bytes32)", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Bytes32ToUintMap)17283_storage": { + "label": "struct EnumerableMap.Bytes32ToUintMap", + "members": [ + { + "label": "_inner", + "type": "t_struct(Bytes32ToBytes32Map)16360_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Set)17477_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "25acc9f9e0863580ed5e42b5b697f5c8de88f433a7369fd0b823c5535d615b73": { + "address": "0xDAacEE75C863a79f07699b094DB07793D3A52D6D", + "txHash": "0x226d1a61e9836ab01be911e23b0d1e6e34d9d20ecce6a5a0a1bddea14431b84f", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)12158", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "201", + "type": "t_contract(IBackingManager)10640", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:31" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "202", + "type": "t_contract(IRevenueTrader)12507", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:32" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "203", + "type": "t_contract(IRevenueTrader)12507", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:33" + }, + { + "label": "batchTradeImplementation", + "offset": 0, + "slot": "204", + "type": "t_contract(ITrade)12850", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:37", + "renamedFrom": "tradeImplementation" + }, + { + "label": "gnosis", + "offset": 0, + "slot": "205", + "type": "t_contract(IGnosis)11814", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:40" + }, + { + "label": "batchAuctionLength", + "offset": 20, + "slot": "205", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:44", + "renamedFrom": "auctionLength" + }, + { + "label": "batchTradeDisabled", + "offset": 26, + "slot": "205", + "type": "t_bool", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:49" + }, + { + "label": "trades", + "offset": 0, + "slot": "206", + "type": "t_mapping(t_address,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:52" + }, + { + "label": "dutchTradeImplementation", + "offset": 0, + "slot": "207", + "type": "t_contract(ITrade)12850", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:57" + }, + { + "label": "dutchAuctionLength", + "offset": 20, + "slot": "207", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:60" + }, + { + "label": "dutchTradeDisabled", + "offset": 0, + "slot": "208", + "type": "t_mapping(t_contract(IERC20Metadata)6289,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:63" + }, + { + "label": "__gap", + "offset": 0, + "slot": "209", + "type": "t_array(t_uint256)42_storage", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:274" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IBackingManager)10640": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20Metadata)6289": { + "label": "contract IERC20Metadata", + "numberOfBytes": "20" + }, + "t_contract(IGnosis)11814": { + "label": "contract IGnosis", + "numberOfBytes": "20" + }, + "t_contract(IMain)12158": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)12507": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(ITrade)12850": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20Metadata)6289,t_bool)": { + "label": "mapping(contract IERC20Metadata => bool)", + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "8bb3ef847ff4554ef7b76887a6e564f582e88926ce12f3a30993a52dd8e5417d": { + "address": "0xc3E9E42DE399F50C5Fc2BC971f0b8D10A631688D", + "txHash": "0x869f513695166f606c3a9aa21a5629345ede8e3b2d8b8bb33f6c8ee3b8243342", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)22719", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "destinations", + "offset": 0, + "slot": "201", + "type": "t_struct(AddressSet)17778_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:17" + }, + { + "label": "distribution", + "offset": 0, + "slot": "203", + "type": "t_mapping(t_address,t_struct(RevenueShare)21688_storage)", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:18" + }, + { + "label": "rsr", + "offset": 0, + "slot": "204", + "type": "t_contract(IERC20)11530", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "205", + "type": "t_contract(IERC20)11530", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:37" + }, + { + "label": "furnace", + "offset": 0, + "slot": "206", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:38" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "207", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:39" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:40" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "209", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:41" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)44_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:203" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)44_storage": { + "label": "uint256[44]", + "numberOfBytes": "1408" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IERC20)11530": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)22719": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_struct(RevenueShare)21688_storage)": { + "label": "mapping(address => struct RevenueShare)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)17778_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)17477_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(RevenueShare)21688_storage": { + "label": "struct RevenueShare", + "members": [ + { + "label": "rTokenDist", + "type": "t_uint16", + "offset": 0, + "slot": "0" + }, + { + "label": "rsrDist", + "type": "t_uint16", + "offset": 2, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Set)17477_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "4c00631ae462a60fb290aeb6dffd7b15c289fa8cd5f5821368d41a9ab59a3db1": { + "address": "0x6647c880Eb8F57948AF50aB45fca8FE86C154D24", + "txHash": "0xb0fb3a3ade3ccea4131e82db2c2af3d7f492e36d8fd96aeb51a9c7cb852694aa", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)12158", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)12378", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:21" + }, + { + "label": "ratio", + "offset": 0, + "slot": "202", + "type": "t_uint192", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:24" + }, + { + "label": "lastPayout", + "offset": 24, + "slot": "202", + "type": "t_uint48", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:27" + }, + { + "label": "lastPayoutBal", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:28" + }, + { + "label": "__gap", + "offset": 0, + "slot": "204", + "type": "t_array(t_uint256)47_storage", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:106" + } + ], + "types": { + "t_array(t_uint256)47_storage": { + "label": "uint256[47]", + "numberOfBytes": "1504" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IMain)12158": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)12378": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "aeb2026b6b8a8117d4f6d9e7dd9ae207d11090a9c7cb204f34cf5d73ae6d6783": { + "address": "0x089848C5228ADe0DF18883197Cd82628b32E95BA", + "txHash": "0x9f9d9c08d2398ee71df5ee642dba3ef748159941bb3bc00b61d98b588378ff31", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)9053", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)8239", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:27" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)4390,t_contract(ITrade)9717)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:155" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)4390", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)7781", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)8548", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)7843", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)8609", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)9273", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)4390", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:190" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)7781": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)7843": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)8239": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)8548": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)4390": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)8609": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)9053": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)9273": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)9717": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)4390,t_contract(ITrade)9717)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "38cc110882c73c48f9ef431eca3acd80c3851cbda1a1de240447152cf30f88f7": { + "address": "0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1", + "txHash": "0xf8fe997d4c24db6cb10f8a1931f741844fa5562ca56f97d9060642d3df81565a", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)12158", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_balances", + "offset": 0, + "slot": "201", + "type": "t_mapping(t_address,t_uint256)", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:37" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "202", + "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:39" + }, + { + "label": "_totalSupply", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:41" + }, + { + "label": "_name", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:43" + }, + { + "label": "_symbol", + "offset": 0, + "slot": "205", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" + }, + { + "label": "__gap", + "offset": 0, + "slot": "206", + "type": "t_array(t_uint256)45_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:394" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "251", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "252", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "253", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "303", + "type": "t_mapping(t_address,t_struct(Counter)2607_storage)", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:37" + }, + { + "label": "_PERMIT_TYPEHASH_DEPRECATED_SLOT", + "offset": 0, + "slot": "304", + "type": "t_bytes32", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:51", + "renamedFrom": "_PERMIT_TYPEHASH" + }, + { + "label": "__gap", + "offset": 0, + "slot": "305", + "type": "t_array(t_uint256)48_storage", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:129" + }, + { + "label": "mandate", + "offset": 0, + "slot": "353", + "type": "t_string_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:44" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "354", + "type": "t_contract(IAssetRegistry)10578", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:47" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "355", + "type": "t_contract(IBasketHandler)10887", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:48" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "356", + "type": "t_contract(IBackingManager)10640", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:49" + }, + { + "label": "furnace", + "offset": 0, + "slot": "357", + "type": "t_contract(IFurnace)11714", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:50" + }, + { + "label": "basketsNeeded", + "offset": 0, + "slot": "358", + "type": "t_uint192", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:55" + }, + { + "label": "issuanceThrottle", + "offset": 0, + "slot": "359", + "type": "t_struct(Throttle)15183_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:58" + }, + { + "label": "redemptionThrottle", + "offset": 0, + "slot": "363", + "type": "t_struct(Throttle)15183_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:59" + }, + { + "label": "__gap", + "offset": 0, + "slot": "367", + "type": "t_array(t_uint256)42_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:535" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)10578": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)10640": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)10887": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)11714": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)12158": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)2607_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Counter)2607_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Params)15175_storage": { + "label": "struct ThrottleLib.Params", + "members": [ + { + "label": "amtRate", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "pctRate", + "type": "t_uint192", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Throttle)15183_storage": { + "label": "struct ThrottleLib.Throttle", + "members": [ + { + "label": "params", + "type": "t_struct(Params)15175_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "lastTimestamp", + "type": "t_uint48", + "offset": 0, + "slot": "2" + }, + { + "label": "lastAvailable", + "type": "t_uint256", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "397f5b1d44ab33f58c1c65d3016c7c7cfeb66dde054e9935b80d41f66f4f316a": { + "address": "0x5a5eb5d26871e26645bD6d006671ec0887aeca69", + "txHash": "0x724bba93e8c6297fd00ec195f10155802d5c06d81918cdf8b8cdf1c13c759278", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)12158", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "201", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "202", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "203", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "name", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:48" + }, + { + "label": "symbol", + "offset": 0, + "slot": "254", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:49" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "255", + "type": "t_contract(IAssetRegistry)10578", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:54" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "256", + "type": "t_contract(IBackingManager)10640", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:55" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "257", + "type": "t_contract(IBasketHandler)10887", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:56" + }, + { + "label": "rsr", + "offset": 0, + "slot": "258", + "type": "t_contract(IERC20)6264", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:57" + }, + { + "label": "era", + "offset": 0, + "slot": "259", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:62" + }, + { + "label": "stakes", + "offset": 0, + "slot": "260", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:66" + }, + { + "label": "totalStakes", + "offset": 0, + "slot": "261", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:67" + }, + { + "label": "stakeRSR", + "offset": 0, + "slot": "262", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:68" + }, + { + "label": "stakeRate", + "offset": 0, + "slot": "263", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:69" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "264", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:74" + }, + { + "label": "draftEra", + "offset": 0, + "slot": "265", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:79" + }, + { + "label": "draftQueues", + "offset": 0, + "slot": "266", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)31147_storage)dyn_storage))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:87" + }, + { + "label": "firstRemainingDraft", + "offset": 0, + "slot": "267", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:88" + }, + { + "label": "totalDrafts", + "offset": 0, + "slot": "268", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:89" + }, + { + "label": "draftRSR", + "offset": 0, + "slot": "269", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:90" + }, + { + "label": "draftRate", + "offset": 0, + "slot": "270", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:91" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "271", + "type": "t_mapping(t_address,t_struct(Counter)2607_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:129" + }, + { + "label": "_delegationNonces", + "offset": 0, + "slot": "272", + "type": "t_mapping(t_address,t_struct(Counter)2607_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:131" + }, + { + "label": "unstakingDelay", + "offset": 0, + "slot": "273", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:141" + }, + { + "label": "rewardRatio", + "offset": 6, + "slot": "273", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:142" + }, + { + "label": "payoutLastPaid", + "offset": 0, + "slot": "274", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:153" + }, + { + "label": "rsrRewardsAtLastPayout", + "offset": 0, + "slot": "275", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:156" + }, + { + "label": "leaked", + "offset": 0, + "slot": "276", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:162" + }, + { + "label": "lastWithdrawRefresh", + "offset": 24, + "slot": "276", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:163" + }, + { + "label": "withdrawalLeak", + "offset": 0, + "slot": "277", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:164" + }, + { + "label": "__gap", + "offset": 0, + "slot": "278", + "type": "t_array(t_uint256)28_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:976" + }, + { + "label": "_delegates", + "offset": 0, + "slot": "306", + "type": "t_mapping(t_address,t_address)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:31" + }, + { + "label": "_eras", + "offset": 0, + "slot": "307", + "type": "t_array(t_struct(Checkpoint)33345_storage)dyn_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:34" + }, + { + "label": "_checkpoints", + "offset": 0, + "slot": "308", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)33345_storage)dyn_storage))", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:38" + }, + { + "label": "_totalSupplyCheckpoints", + "offset": 0, + "slot": "309", + "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)33345_storage)dyn_storage)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "310", + "type": "t_array(t_uint256)46_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:243" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_struct(Checkpoint)33345_storage)dyn_storage": { + "label": "struct StRSRP1Votes.Checkpoint[]", + "numberOfBytes": "32" + }, + "t_array(t_struct(CumulativeDraft)31147_storage)dyn_storage": { + "label": "struct StRSRP1.CumulativeDraft[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)28_storage": { + "label": "uint256[28]", + "numberOfBytes": "896" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)10578": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)10640": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)10887": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)6264": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)12158": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_address)": { + "label": "mapping(address => address)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(Checkpoint)33345_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(CumulativeDraft)31147_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1.CumulativeDraft[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)2607_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_array(t_struct(Checkpoint)33345_storage)dyn_storage)": { + "label": "mapping(uint256 => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)33345_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1Votes.Checkpoint[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)31147_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1.CumulativeDraft[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))": { + "label": "mapping(uint256 => mapping(address => mapping(address => uint256)))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Checkpoint)33345_storage": { + "label": "struct StRSRP1Votes.Checkpoint", + "members": [ + { + "label": "fromBlock", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "val", + "type": "t_uint224", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Counter)2607_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(CumulativeDraft)31147_storage": { + "label": "struct StRSRP1.CumulativeDraft", + "members": [ + { + "label": "drafts", + "type": "t_uint176", + "offset": 0, + "slot": "0" + }, + { + "label": "availableAt", + "type": "t_uint64", + "offset": 22, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint176": { + "label": "uint176", + "numberOfBytes": "22" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint224": { + "label": "uint224", + "numberOfBytes": "28" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + } + } +} diff --git a/common/configuration.ts b/common/configuration.ts index 5edd69b99f..c12edfa2ce 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -166,7 +166,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sUSDT: '0x38EA452219524Bb87e18dE1C24D3bB59510BD783', sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', - astETH: "0x1982b2F5814301d4e9a8b0201555376e62F82428" + astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', @@ -192,7 +192,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - wBTCBTC: "0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23", // "WBTC/BTC" + wBTCBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', // "WBTC/BTC" }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', @@ -204,7 +204,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { EASY_AUCTION_OWNER: '0x0da0c3e52c977ed3cbc641ff02dd271c3ed55afe', MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', - MORPHO_REWARDS_DISTRIBUTOR: "0x3b14e5c73e0a56d607a8688098326fd4b4292135" + MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', }, '3': { name: 'ropsten', @@ -269,7 +269,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sUSDC: '0xdf0770dF86a8034b3EFEf0A1Bb3c889B8332FF56', sUSDT: '0x38EA452219524Bb87e18dE1C24D3bB59510BD783', sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', - astETH: "0x1982b2F5814301d4e9a8b0201555376e62F82428", + astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', }, chainlinkFeeds: { @@ -296,7 +296,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - wBTCBTC: "0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23" // "WBTC/BTC" + wBTCBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', // "WBTC/BTC" }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -305,7 +305,99 @@ export const networkConfig: { [key: string]: INetworkConfig } = { GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', - MORPHO_REWARDS_DISTRIBUTOR: "0x3b14e5c73e0a56d607a8688098326fd4b4292135" + MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', + }, + '3': { + name: 'tenderly', + tokens: { + DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', + USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', + BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53', + USDP: '0x8E870D67F660D95d5be530380D0eC0bd388289E1', + TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376', + sUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51', + FRAX: '0x853d955aCEf822Db058eb8505911ED77F175b99e', + MIM: '0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3', + eUSD: '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F', + aDAI: '0x028171bCA77440897B824Ca71D1c56caC55b68A3', + aUSDC: '0xBcca60bB61934080951369a648Fb03DF4F96263C', + aUSDT: '0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811', + aBUSD: '0xA361718326c15715591c299427c62086F69923D9', + aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', + aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', + cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', + cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', + cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', + cUSDP: '0x041171993284df560249B57358F931D9eB7b925D', + cETH: '0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5', + cWBTC: '0xccF4429DB6322D5C611ee964527D42E5d685DD6a', + fUSDC: '0x465a5a630482f3abD6d3b84B39B29b07214d19e5', + fUSDT: '0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7', + fFRAX: '0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B', + fDAI: '0xe2bA8693cE7474900A045757fe0efCa900F6530b', + AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9', + stkAAVE: '0x4da27a545c0c5B758a6BA100e3a049001de870f5', + COMP: '0xc00e94Cb662C3520282E6f5717214004A7f26888', + WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', + aWBTC: '0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656', + aCRV: '0x8dae6cb04688c62d939ed9b68d32bc62e49970b1', + WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', + EURT: '0xC581b735A1688071A1746c968e0798D642EDE491', + RSR: '0x320623b8e4ff03373931769a31fc52a4e78b5d70', + CRV: '0xD533a949740bb3306d119CC777fa900bA034cd52', + CVX: '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B', + ankrETH: '0xE95A203B1a91a908F9B9CE46459d101078c2c3cb', + frxETH: '0x5E8422345238F34275888049021821E8E08CAa1f', + sfrxETH: '0xac3E018457B222d93114458476f3E3416Abbe38F', + stETH: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', + wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', + rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', + cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', + ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', + sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', + cbETH: '0xBe9895146f7AF43049ca1c1AE358B0541Ea49704', + STG: '0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6', + sUSDC: '0xdf0770dF86a8034b3EFEf0A1Bb3c889B8332FF56', + sUSDT: '0x38EA452219524Bb87e18dE1C24D3bB59510BD783', + sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', + astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', + MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', + }, + chainlinkFeeds: { + RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', + AAVE: '0x547a514d5e3769680Ce22B2361c10Ea13619e8a9', + COMP: '0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5', + DAI: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9', + USDC: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6', + USDT: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D', + BUSD: '0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A', + USDP: '0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3', + TUSD: '0xec746eCF986E2927Abd291a2A1716c940100f8Ba', + sUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', + FRAX: '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', + MIM: '0x7A364e8770418566e3eb2001A96116E6138Eb32F', + ETH: '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', + WBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', + BTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', + EURT: '0x01D391A48f4F7339aC64CA2c83a07C22F95F587a', + EUR: '0xb49f677943BC038e9857d61E7d053CaA2C1734C1', + CVX: '0xd962fC30A72A84cE50161031391756Bf2876Af5D', + CRV: '0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f', + stETHETH: '0x86392dc19c0b719886221c78ab11eb8cf5c52812', // stETH/ETH + stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD + rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH + cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + wBTCBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', // "WBTC/BTC" + }, + AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', + AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', + COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', + GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', + MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', + MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', + MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', }, '5': { name: 'goerli', diff --git a/contracts/libraries/NetworkConfigLib.sol b/contracts/libraries/NetworkConfigLib.sol index b347bec484..c07aa392c0 100644 --- a/contracts/libraries/NetworkConfigLib.sol +++ b/contracts/libraries/NetworkConfigLib.sol @@ -15,7 +15,7 @@ library NetworkConfigLib { // untestable: // most of the branches will be shown as uncovered, because we only run coverage // on local Ethereum PoS network (31337). Manual testing was performed. - if (chainId == 1 || chainId == 5 || chainId == 31337) { + if (chainId == 1 || chainId == 3 || chainId == 5 || chainId == 31337) { return 12; // Ethereum PoS, Goerli, HH (tests) } else if (chainId == 8453 || chainId == 84531) { return 2; // Base, Base Goerli diff --git a/hardhat.config.ts b/hardhat.config.ts index 2fa2cc5eed..e9364399e1 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -79,13 +79,13 @@ const config: HardhatUserConfig = { gasMultiplier: 1.05, // 5% buffer; seen failures on RToken deployment and asset refreshes otherwise }, tenderly: { - chainId: 1, + chainId: 3, url: TENDERLY_RPC_URL, accounts: { mnemonic: MNEMONIC, }, // gasPrice: 10_000_000_000, - gasMultiplier: 1.015, // 1.5% buffer; seen failures on RToken deployment and asset refreshes + gasMultiplier: 1.05, // 5% buffer; seen failures on RToken deployment and asset refreshes otherwise }, }, solidity: { @@ -117,7 +117,7 @@ const config: HardhatUserConfig = { mocha: { timeout: TIMEOUT, slow: 1000, - retries: 3 + retries: 3, }, contractSizer: { alphaSort: false, From 9d8b7e26beb31a1257b73316a36b8a7c4927c6f4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 8 Aug 2023 15:32:09 -0400 Subject: [PATCH 012/450] tenderly fork addresses --- .../addresses/3-tmp-assets-collateral.json | 85 +++++++++++++++++++ scripts/addresses/3-tmp-deployments.json | 35 ++++++++ 2 files changed, 120 insertions(+) create mode 100644 scripts/addresses/3-tmp-assets-collateral.json create mode 100644 scripts/addresses/3-tmp-deployments.json diff --git a/scripts/addresses/3-tmp-assets-collateral.json b/scripts/addresses/3-tmp-assets-collateral.json new file mode 100644 index 0000000000..ff5d1dac64 --- /dev/null +++ b/scripts/addresses/3-tmp-assets-collateral.json @@ -0,0 +1,85 @@ +{ + "assets": { + "stkAAVE": "0x72BA23683CBc1a3Fa5b3129b1335327A32c2CE8C", + "COMP": "0x70c635Bf4972259F2358Db5e431DB9592a2745a2", + "CRV": "0x66a3b432F77123E418cDbeD35fBaDdB0Eb9576B0", + "CVX": "0x0F53Aba2a7354C86B64dcaEe0ab9BF852846bAa5" + }, + "collateral": { + "DAI": "0x97C75046CE7Ea5253d20A35B3138699865E8813f", + "USDC": "0x256b89658bD831CC40283F42e85B1fa8973Db0c9", + "USDT": "0x743063E627d375f0A21bB92D07598Edc7D6F3a2d", + "USDP": "0x22d28452B506eFD909E9FC1d446a27061C4BDA7B", + "TUSD": "0xAd76B12aeEe90B745F0C62110cf1E261Fc5a06bb", + "BUSD": "0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D", + "aDAI": "0x80A574cC2B369dc496af6655f57a16a4f180BfAF", + "aUSDC": "0x3043be171e846c33D5f06864Cc045d9Fc799aF52", + "aUSDT": "0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022", + "aBUSD": "0x4Be33630F92661afD646081BC29079A38b879aA0", + "aUSDP": "0xF69c995129CC16d0F577C303091a400cC1879fFa", + "cDAI": "0xF2A309bc36A504c772B416a4950d5d0021219745", + "cUSDC": "0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F", + "cUSDT": "0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4", + "cUSDP": "0x11C9ca7a43B76a5d9604e7441EB41a49e2084723", + "cWBTC": "0xC1E16AD7844Da1AEFFa6c3932AD02b823DE12d3F", + "cETH": "0x3700b22C742980be9D22740933d4a041A64f7314", + "WBTC": "0x1FFA5955D64Ee32cB1BF7104167b81bb085b0c8d", + "WETH": "0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7", + "EURT": "0x5c83CA710E72D130E3B74aEC5b739676ef5737c2", + "wstETH": "0xE1fcCf8e23713Ed0497ED1a0E6Ae2b19ED443eCd", + "rETH": "0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13", + "fUSDC": "0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab", + "fUSDT": "0xaBd7E7a5C846eD497681a590feBED99e7157B6a3", + "fDAI": "0x3C8cD9FCa9925780598eB097D9718dF3da482C2F", + "fFRAX": "0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122", + "cUSDCv3": "0xc9291eF2f81dBc9B412381aBe83b28954220565E", + "cvx3Pool": "0xdEBe74dc2A415e00bE8B4b9d1e6e0007153D006a", + "cvxeUSDFRAXBP": "0x0240E29Be6cBbB178543fF27EA4AaC8F8b870b44", + "cvxMIM3Pool": "0xe8461dB45A7430AA7aB40346E68821284980FdFD", + "crveUSDFRAXBP": "0xa9F0eca90B5d4f213f8119834E0920785bb70F46", + "crvMIM3Pool": "0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2", + "sDAI": "0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb", + "cbETH": "0x291ed25eB61fcc074156eE79c5Da87e5DA94198F" + }, + "erc20s": { + "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B", + "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7", + "USDP": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", + "TUSD": "0x0000000000085d4780B73119b644AE5ecd22b376", + "BUSD": "0x4Fabb145d64652a948d72533023f6E7A623C7C53", + "aDAI": "0x2a00A95Dc311EB96fEf922B8418c998f86D2c464", + "aUSDC": "0x9E8C96d86F1c85BC43200B8093159cf47e0CB921", + "aUSDT": "0x6356F6876D781795660cD2F6410b5a78636Df5C1", + "aBUSD": "0xfa21CD6EEde080Fdb1C79c1bdBC0C593c8CD08A5", + "aUSDP": "0x6446189FD250D96517C119DD9929c24bF825fb4e", + "cDAI": "0x22018D85BFdA9e2673FB4101e957562a1e952Cdf", + "cUSDC": "0x1142Ad5E5A082077A7d79d211726c1bd39b0D5FA", + "cUSDT": "0x35E6756B92daf6aE2CF2156d479e8a806898971B", + "cUSDP": "0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3", + "cWBTC": "0xe352b0aE3114c57f56258F73277F825E643268d0", + "cETH": "0x0E6D6cBdA4629Fb2D82b4b4Af0D5c887f21F3BC7", + "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", + "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "EURT": "0xC581b735A1688071A1746c968e0798D642EDE491", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "fUSDC": "0xb3dCcEf35647A8821C76f796bE8B5426Cc953412", + "fUSDT": "0x7906238833Bb9e4Fec24a1735C94f47cb194f678", + "fDAI": "0x62C394620f674e85768a7618a6C202baE7fB8Dd1", + "fFRAX": "0x5A4f2FfC4aD066152B344Ceb2fc2275275b1a9C7", + "cUSDCv3": "0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F", + "cvx3Pool": "0xAdfB9BCdA981136c83076a52Ef8fE4D8B2b520e7", + "cvxeUSDFRAXBP": "0xFdb9F465C56933ab91f341C966DB517f975de5c1", + "cvxMIM3Pool": "0xC87CDFFD680D57BF50De4C364BF4277B8A90098E", + "crv3Pool": "0x1bc463270b8d3D797F59Fe639eDF5ae130f35FF3", + "crveUSDFRAXBP": "0xDe0e2F0c9792617D3908D92A024cAa846354CEa2", + "crvMIM3Pool": "0x9b2A9bAeB8F1930fC2AF9b7Fa473edF2B8c3B549", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704" + } +} \ No newline at end of file diff --git a/scripts/addresses/3-tmp-deployments.json b/scripts/addresses/3-tmp-deployments.json new file mode 100644 index 0000000000..92393dde70 --- /dev/null +++ b/scripts/addresses/3-tmp-deployments.json @@ -0,0 +1,35 @@ +{ + "prerequisites": { + "RSR": "0x320623b8e4ff03373931769a31fc52a4e78b5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "0x1cCa3FBB11C4b734183f997679d52DeFA74b613A", + "cvxMiningLib": "0xC98eaFc9F249D90e3E35E729e3679DD75A899c10", + "facadeRead": "0x4024c00bBD0C420E719527D88781bc1543e63dd5", + "facadeAct": "0xBE9D23040fe22E8Bd8A88BF5101061557355cA04", + "facadeWriteLib": "0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833", + "basketLib": "0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F", + "facadeWrite": "0xb3Be23A0cEFfd1814DC4F1FdcDc1200b39922bCc", + "deployer": "0xDeC1B73754449166cB270AC83F4b536e738b1351", + "rsrAsset": "0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA", + "implementations": { + "main": "0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450", + "trading": { + "gnosisTrade": "0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6", + "dutchTrade": "0x339c1509b980D80A0b50858518531eDbe2940dA1" + }, + "components": { + "assetRegistry": "0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C", + "backingManager": "0x1BD20253c49515D348dad1Af70ff2c0473FEa358", + "basketHandler": "0x0776Ad71Ae99D759354B3f06fe17454b94837B0D", + "broker": "0xDAacEE75C863a79f07699b094DB07793D3A52D6D", + "distributor": "0xc3E9E42DE399F50C5Fc2BC971f0b8D10A631688D", + "furnace": "0x6647c880Eb8F57948AF50aB45fca8FE86C154D24", + "rsrTrader": "0x089848C5228ADe0DF18883197Cd82628b32E95BA", + "rTokenTrader": "0x089848C5228ADe0DF18883197Cd82628b32E95BA", + "rToken": "0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1", + "stRSR": "0x5a5eb5d26871e26645bD6d006671ec0887aeca69" + } + } +} \ No newline at end of file From 7aa062800e65ef376f5e4a4309c05702bf44f31a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 8 Aug 2023 17:06:52 -0400 Subject: [PATCH 013/450] init readme doc for building on top --- README.md | 1 + docs/build-on-top.md | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 docs/build-on-top.md diff --git a/README.md b/README.md index ae48bf253d..488763237e 100644 --- a/README.md +++ b/README.md @@ -24,6 +24,7 @@ For a much more detailed explanation of the economic design, including an hour-l - [System Design](docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. - [Our Solidity Style](docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. - [Writing Collateral Plugins](docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. +- [Building on Top](docs/build-on-top.md): How to build on top of Reserve, including information about long-lived fork environments. - [MEV](docs/mev.md): A resource for MEV searchers and others looking to interact with the deployed protocol programatically. - [Rebalancing Algorithm](docs/recollateralization.md): Description of our trading algorithm during the recollateralization process - [Changelog](CHANGELOG.md): Release changelog diff --git a/docs/build-on-top.md b/docs/build-on-top.md new file mode 100644 index 0000000000..8a777f5168 --- /dev/null +++ b/docs/build-on-top.md @@ -0,0 +1,17 @@ +# Building on Top of Reserve + +TODO -- this document is a work in progress. + +## Overview + +Reserve uses a long-lived Tenderly fork as the main testing environment. Since the Reserve Protocol is a meta-protocol it relies on functional building blocks that are not all present on testnets such as Goerli or Sepolia. For this reason it makes the most sense to use a fork of mainnet. + +Unfortunately it would be bad practice to share the RPC publicly. Please reach out at protocol.eng@reserve.org to request we share the RPC privately with you. + +## Chain + +We re-use the chain ID of 3 (previously: ropsten) for the Tenderly fork in order to separate book-keeping between mainnet and the fork environment. + +- [Core Contracts](../scripts/addresses/3-tmp-deployments.json) +- [Collateral Plugins](../scripts/addresses/3-tmp-assets-collateral.json) + - Note that oracles require special logic in order to be refreshed and for these plugins to function correctly. From fe5d38df8a1816d411ab81565fbef3ce210aea9a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 8 Aug 2023 17:07:10 -0400 Subject: [PATCH 014/450] README: add responsible disclosure section while we're at it --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 488763237e..2ff52fa10b 100644 --- a/README.md +++ b/README.md @@ -157,6 +157,10 @@ Usage: `https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }}` To get setup with tenderly, install the [tenderly cli](https://github.com/Tenderly/tenderly-cli). and login with `tenderly login --authentication-method access-key --access-key {your_access_key} --force`. +## Responsible Disclosure + +[Immunifi](https://immunefi.com/bounty/reserve/) + ## External Documentation [Video overview](https://youtu.be/341MhkOWsJE) From e8f5568d35502bc8e0d7ebf5597976b5205be0c7 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 9 Aug 2023 16:56:59 -0400 Subject: [PATCH 015/450] C4 #29 (#885) --- contracts/p0/Furnace.sol | 10 ++++++++-- contracts/p1/Furnace.sol | 10 ++++++++-- test/Furnace.test.ts | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/contracts/p0/Furnace.sol b/contracts/p0/Furnace.sol index 869a3eff76..aa99a8140c 100644 --- a/contracts/p0/Furnace.sol +++ b/contracts/p0/Furnace.sol @@ -58,8 +58,14 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { - // solhint-disable-next-line no-empty-blocks - try this.melt() {} catch {} + if (lastPayout > 0) { + // solhint-disable-next-line no-empty-blocks + try this.melt() {} catch { + uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; + lastPayout += numPeriods * PERIOD; + lastPayoutBal = main.rToken().balanceOf(address(this)); + } + } require(ratio_ <= MAX_RATIO, "invalid ratio"); // The ratio can safely be set to 0, though it is not recommended emit RatioSet(ratio, ratio_); diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 3259e48fd2..923ba33737 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -90,8 +90,14 @@ contract FurnaceP1 is ComponentP1, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { - // solhint-disable-next-line no-empty-blocks - if (lastPayout > 0) try this.melt() {} catch {} + if (lastPayout > 0) { + // solhint-disable-next-line no-empty-blocks + try this.melt() {} catch { + uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; + lastPayout += numPeriods * PERIOD; + lastPayoutBal = rToken.balanceOf(address(this)); + } + } require(ratio_ <= MAX_RATIO, "invalid ratio"); // The ratio can safely be set to 0 to turn off payouts, though it is not recommended emit RatioSet(ratio, ratio_); diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index de3a602612..15776210be 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -446,6 +446,45 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(diff).to.be.lte(expectedDiff) }) + + it('Regression test -- C4 June 2023 Issue #29', async () => { + // https://github.com/code-423n4/2023-06-reserve-findings/issues/29 + + // Transfer to Furnace and do first melt + await rToken.connect(addr1).transfer(furnace.address, bn('10e18')) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await furnace.melt() + + // Should have updated lastPayout + lastPayoutBal + expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) + expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) + expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) + + // Advance 99 periods -- should melt at old ratio + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 99 * Number(ONE_PERIOD)) + + // Freeze and change ratio + await main.connect(owner).freezeForever() + const maxRatio = bn('1e14') + await expect(furnace.connect(owner).setRatio(maxRatio)) + .to.emit(furnace, 'RatioSet') + .withArgs(config.rewardRatio, maxRatio) + + // Should have updated lastPayout + lastPayoutBal + expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) + expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) + expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) // no change + + // Unfreeze and advance 1 period + await main.connect(owner).unfreeze() + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await expect(furnace.melt()).to.emit(rToken, 'Melted') + + // Should have updated lastPayout + lastPayoutBal + expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) + expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) + expect(await furnace.lastPayoutBal()).to.equal(bn('9.999e18')) + }) }) describeExtreme('Extreme Bounds', () => { From 30d5bfc888ccfa7fbd23466c208996624cd76fe3 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 11 Aug 2023 00:43:31 +0530 Subject: [PATCH 016/450] [docs] Positive Token Redemption Value (#887) --- docs/recollateralization.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/recollateralization.md b/docs/recollateralization.md index 67c9067592..aecb345c94 100644 --- a/docs/recollateralization.md +++ b/docs/recollateralization.md @@ -8,6 +8,8 @@ Recollateralization takes place in the central loop of [`BackingManager.rebalanc The trading algorithm is isolated in [RecollateralizationLib.sol](../contracts/p1/mixins/RecollateralizationLib.sol). This document describes the algorithm implemented by the library at a high-level, as well as the concepts required to evaluate the correctness of the implementation. +Note: In case of an upwards default, as in a token is worth _more_ than what it is supposed to be, the token redemption is worth more than the peg during recollateralization process. This will continue to be the case until the rebalancing process is complete. This is a good thing, and the protocol should be able to take advantage of this. + ## High-level overview ```solidity From 4ce086ff0869a4e00d4a3ac3f68ff91f808922c3 Mon Sep 17 00:00:00 2001 From: brr Date: Thu, 10 Aug 2023 22:53:20 +0100 Subject: [PATCH 017/450] C4: handle Chainlink oracle deprecation (#886) --- contracts/plugins/assets/OracleLib.sol | 9 ++++ contracts/plugins/mocks/ChainlinkMock.sol | 18 +++++++ test/fixtures.ts | 32 ++++++++---- test/plugins/OracleDeprecation.test.ts | 64 +++++++++++++++++++++++ 4 files changed, 112 insertions(+), 11 deletions(-) create mode 100644 test/plugins/OracleDeprecation.test.ts diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index b0e2538761..495186e36c 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -6,6 +6,10 @@ import "../../libraries/Fixed.sol"; error StalePrice(); +interface EACAggregatorProxy { + function aggregator() external view returns (address); +} + /// Used by asset plugins to price their collateral library OracleLib { /// @dev Use for on-the-fly calculations that should revert @@ -16,6 +20,11 @@ library OracleLib { view returns (uint192) { + // If the aggregator is not set, the chainlink feed has been deprecated + if (EACAggregatorProxy(address(chainlinkFeed)).aggregator() == address(0)) { + revert StalePrice(); + } + (uint80 roundId, int256 p, , uint256 updateTime, uint80 answeredInRound) = chainlinkFeed .latestRoundData(); diff --git a/contracts/plugins/mocks/ChainlinkMock.sol b/contracts/plugins/mocks/ChainlinkMock.sol index db794d7ec6..6e0fee6785 100644 --- a/contracts/plugins/mocks/ChainlinkMock.sol +++ b/contracts/plugins/mocks/ChainlinkMock.sol @@ -23,6 +23,7 @@ contract MockV3Aggregator is AggregatorV3Interface { // Additional variable to be able to test invalid behavior uint256 public latestAnsweredRound; + address public aggregator; mapping(uint256 => int256) public getAnswer; mapping(uint256 => uint256) public getTimestamp; @@ -30,9 +31,14 @@ contract MockV3Aggregator is AggregatorV3Interface { constructor(uint8 _decimals, int256 _initialAnswer) { decimals = _decimals; + aggregator = address(this); updateAnswer(_initialAnswer); } + function deprecate() external { + aggregator = address(0); + } + function updateAnswer(int256 _answer) public { latestAnswer = _answer; latestTimestamp = block.timestamp; @@ -80,6 +86,12 @@ contract MockV3Aggregator is AggregatorV3Interface { uint80 answeredInRound ) { + if (aggregator == address(0)) { + // solhint-disable-next-line no-inline-assembly + assembly { + revert(0, 0) + } + } return ( _roundId, getAnswer[_roundId], @@ -102,6 +114,12 @@ contract MockV3Aggregator is AggregatorV3Interface { uint80 answeredInRound ) { + if (aggregator == address(0)) { + // solhint-disable-next-line no-inline-assembly + assembly { + revert(0, 0) + } + } return ( uint80(latestRound), getAnswer[latestRound], diff --git a/test/fixtures.ts b/test/fixtures.ts index 2f20d2a669..15944a43b8 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -1,4 +1,4 @@ -import { BigNumber, ContractFactory } from 'ethers' +import { ContractFactory } from 'ethers' import { expect } from 'chai' import hre, { ethers } from 'hardhat' import { getChainId } from '../common/blockchain-utils' @@ -149,19 +149,12 @@ async function gnosisFixture(): Promise { } } -interface CollateralFixture { - erc20s: ERC20Mock[] // all erc20 addresses - collateral: Collateral[] // all collateral - basket: Collateral[] // only the collateral actively backing the RToken - basketsNeededAmts: BigNumber[] // reference amounts -} - async function collateralFixture( compToken: ERC20Mock, comptroller: ComptrollerMock, aaveToken: ERC20Mock, config: IConfig -): Promise { +) { const ERC20: ContractFactory = await ethers.getContractFactory('ERC20Mock') const USDC: ContractFactory = await ethers.getContractFactory('USDCMock') const ATokenMockFactory: ContractFactory = await ethers.getContractFactory('StaticATokenMock') @@ -349,7 +342,7 @@ async function collateralFixture( ausdt[0], abusd[0], zcoin[0], - ] + ] as ERC20Mock[] const collateral = [ dai[1], usdc[1], @@ -374,9 +367,25 @@ async function collateralFixture( collateral, basket, basketsNeededAmts, + bySymbol: { + dai, + usdc, + usdt, + busd, + cdai, + cusdc, + cusdt, + adai, + ausdc, + ausdt, + abusd, + zcoin, + }, } } +type CollateralFixture = Awaited> + type RSRAndCompAaveAndCollateralAndModuleFixture = RSRFixture & COMPAAVEFixture & CollateralFixture & @@ -663,7 +672,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const stRSR: TestIStRSR = await ethers.getContractAt('TestIStRSR', await main.stRSR()) // Deploy collateral for Main - const { erc20s, collateral, basket, basketsNeededAmts } = await collateralFixture( + const { erc20s, collateral, basket, basketsNeededAmts, bySymbol } = await collateralFixture( compToken, compoundMock, aaveToken, @@ -742,5 +751,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facadeTest, rsrTrader, rTokenTrader, + bySymbol, } } diff --git a/test/plugins/OracleDeprecation.test.ts b/test/plugins/OracleDeprecation.test.ts new file mode 100644 index 0000000000..d76d16df0e --- /dev/null +++ b/test/plugins/OracleDeprecation.test.ts @@ -0,0 +1,64 @@ +import { Wallet } from 'ethers' +import { ethers } from 'hardhat' +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { fp } from '../../common/numbers' +import { ERC20Mock, TestIRToken } from '../../typechain' +import { Collateral, DefaultFixture, defaultFixture } from '../fixtures' +import { expect } from 'chai' + +describe('Chainlink Oracle', () => { + // Tokens + let rsr: ERC20Mock + let compToken: ERC20Mock + let aaveToken: ERC20Mock + let rToken: TestIRToken + + // Assets + let basket: Collateral[] + + let wallet: Wallet + + const amt = fp('1e4') + let fixture: DefaultFixture + + before('create fixture loader', async () => { + ;[wallet] = (await ethers.getSigners()) as unknown as Wallet[] + }) + + beforeEach(async () => { + // Deploy fixture + fixture = await loadFixture(defaultFixture) + ;({ rsr, compToken, aaveToken, basket, rToken } = fixture) + + // Get collateral tokens + await rsr.connect(wallet).mint(wallet.address, amt) + await compToken.connect(wallet).mint(wallet.address, amt) + await aaveToken.connect(wallet).mint(wallet.address, amt) + + // Issue RToken to enable RToken.price + for (let i = 0; i < basket.length; i++) { + const tok = await ethers.getContractAt('ERC20Mock', await basket[i].erc20()) + await tok.connect(wallet).mint(wallet.address, amt) + await tok.connect(wallet).approve(rToken.address, amt) + } + await rToken.connect(wallet).issue(amt) + }) + + describe('Chainlink deprecates an asset', () => { + it('Refresh should mark the asset as IFFY', async () => { + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const [, aUSDCCollateral] = fixture.bySymbol.ausdc + const chainLinkOracle = MockV3AggregatorFactory.attach(await aUSDCCollateral.chainlinkFeed()) + await aUSDCCollateral.refresh() + await aUSDCCollateral.tryPrice() + expect(await aUSDCCollateral.status()).to.equal(0) + await chainLinkOracle.deprecate() + await aUSDCCollateral.refresh() + expect(await aUSDCCollateral.status()).to.equal(1) + await expect(aUSDCCollateral.tryPrice()).to.be.revertedWithCustomError( + aUSDCCollateral, + 'StalePrice' + ) + }) + }) +}) From 20bedef7fd2173d814e2b87f6592aa0bb1f3d34d Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 10 Aug 2023 19:13:01 -0300 Subject: [PATCH 018/450] C4: StRSR reset stakes functionality (#888) --- contracts/interfaces/IStRSR.sol | 4 ++ contracts/p0/StRSR.sol | 18 +++++ contracts/p1/StRSR.sol | 17 +++++ test/ZZStRSR.test.ts | 120 ++++++++++++++++++++++++++++++++ 4 files changed, 159 insertions(+) diff --git a/contracts/interfaces/IStRSR.sol b/contracts/interfaces/IStRSR.sol index 45b7db9227..efdb937f32 100644 --- a/contracts/interfaces/IStRSR.sol +++ b/contracts/interfaces/IStRSR.sol @@ -134,6 +134,10 @@ interface IStRSR is IERC20MetadataUpgradeable, IERC20PermitUpgradeable, ICompone /// @custom:protected function seizeRSR(uint256 amount) external; + /// Reset all stakes and advance era + /// @custom:governance + function resetStakes() external; + /// Return the maximum valid value of endId such that withdraw(endId) should immediately work function endIdForWithdraw(address account) external view returns (uint256 endId); diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index aca576a471..fe3676dcef 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -98,6 +98,10 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // Min exchange rate {qRSR/qStRSR} (compile-time constant) uint192 private constant MIN_EXCHANGE_RATE = uint192(1e9); // 1e-9 + // stake rate under/over which governance can reset all stakes + uint192 private constant MAX_SAFE_STAKE_RATE = 1e6 * FIX_ONE; // 1e6 + uint192 private constant MIN_SAFE_STAKE_RATE = uint192(1e12); // 1e-6 + // Withdrawal Leak uint192 private leaked; // {1} stake fraction that has withdrawn without a refresh uint48 private lastWithdrawRefresh; // {s} timestamp of last refresh() during withdraw() @@ -378,6 +382,20 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address account = accounts.at(i); delete withdrawals[account]; } + emit AllUnstakingReset(era); + } + + /// @custom:governance + /// Reset all stakes and advance era + function resetStakes() external governance { + uint192 stakeRate = divuu(totalStaked, rsrBacking); + require( + stakeRate <= MIN_SAFE_STAKE_RATE || stakeRate >= MAX_SAFE_STAKE_RATE, + "rate still safe" + ); + + bankruptStakers(); + bankruptWithdrawals(); } /// Refresh if too much RSR has exited since the last refresh occurred diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index f6babc8eb6..ffe8d0669f 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -163,6 +163,10 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint48 private lastWithdrawRefresh; // {s} timestamp of last refresh() during withdraw() uint192 public withdrawalLeak; // {1} gov param -- % RSR that can be withdrawn without refresh + // stake rate under/over which governance can reset all stakes + uint192 private constant MAX_SAFE_STAKE_RATE = 1e6 * FIX_ONE; // 1e6 D18{qStRSR/qRSR} + uint192 private constant MIN_SAFE_STAKE_RATE = uint192(1e12); // 1e-6 D18{qStRSR/qRSR} + // ====================== /// @custom:oz-upgrades-unsafe-allow constructor @@ -482,6 +486,19 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab IERC20Upgradeable(address(rsr)).safeTransfer(_msgSender(), seizedRSR); } + /// @custom:governance + /// Reset all stakes and advance era + function resetStakes() external { + requireGovernanceOnly(); + require( + stakeRate <= MIN_SAFE_STAKE_RATE || stakeRate >= MAX_SAFE_STAKE_RATE, + "rate still safe" + ); + + beginEra(); + beginDraftEra(); + } + /// @return D18{qRSR/qStRSR} The exchange rate between RSR and StRSR function exchangeRate() public view returns (uint192) { // D18{qRSR/qStRSR} = D18 * D18 / D18{qStRSR/qRSR} diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 30444cd379..927858718f 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -2145,6 +2145,126 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) }) + describe('Reset Stakes - Governance', () => { + it('Should not allow to reset stakes if not governance', async () => { + await expect(stRSR.connect(other).resetStakes()).to.be.revertedWith('governance only') + }) + + it('Should reset stakes and perform validations on rate - MAX', async () => { + const stakeAmt: BigNumber = bn('100e18') + const seizeAmt: BigNumber = bn('1e18') + + // Stake + await rsr.connect(addr1).approve(stRSR.address, stakeAmt) + await stRSR.connect(addr1).stake(stakeAmt) + + expect(await stRSR.exchangeRate()).to.equal(fp('1')) + expect(await stRSR.totalSupply()).to.equal(stakeAmt) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmt) + + // Cannot reset stakes with this rate + await expect(stRSR.connect(owner).resetStakes()).to.be.revertedWith('rate still safe') + + // Seize small portion of RSR to increase stake rate - still safe + await whileImpersonating(backingManager.address, async (signer) => { + await expect(stRSR.connect(signer).seizeRSR(seizeAmt)).to.emit(stRSR, 'ExchangeRateSet') + }) + + // new rate: new strsr supply / RSR backing that strsr supply + let expectedRate = fp(stakeAmt.sub(seizeAmt)).div(stakeAmt) + expect(await stRSR.exchangeRate()).to.be.closeTo(expectedRate, 1) + expect(await stRSR.totalSupply()).to.equal(stakeAmt) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmt) + + // Attempt to reset stakes, still not possible + await expect(stRSR.connect(owner).resetStakes()).to.be.revertedWith('rate still safe') + + // New Seizure - rate will be unsafe + const rsrRemaining = stakeAmt.sub(seizeAmt) + const seizeAmt2 = rsrRemaining.sub(1e13) + await whileImpersonating(backingManager.address, async (signer) => { + await expect(stRSR.connect(signer).seizeRSR(seizeAmt2)).to.emit(stRSR, 'ExchangeRateSet') + }) + + // check new rate + expectedRate = fp(stakeAmt.sub(seizeAmt).sub(seizeAmt2)).div(stakeAmt) + expect(await stRSR.exchangeRate()).to.be.closeTo(expectedRate, 1) + expect(await stRSR.exchangeRate()).to.be.lte(fp('1e-6')) + expect(await stRSR.exchangeRate()).to.be.gte(fp('1e-9')) + + // Now governance can reset stakes + await expect(stRSR.connect(owner).resetStakes()).to.emit(stRSR, 'AllBalancesReset') + + // All stakes reset + expect(await stRSR.exchangeRate()).to.equal(fp('1')) + expect(await stRSR.totalSupply()).to.equal(bn(0)) + expect(await stRSR.balanceOf(addr1.address)).to.equal(bn(0)) + }) + + it('Should reset stakes and perform validations on rate - MIN', async () => { + const stakeAmt: BigNumber = bn('1000e18') + const addAmt1: BigNumber = bn('100e18') + const addAmt2: BigNumber = bn('10e30') + + // Stake + await rsr.connect(addr1).approve(stRSR.address, stakeAmt) + await stRSR.connect(addr1).stake(stakeAmt) + + expect(await stRSR.exchangeRate()).to.equal(fp('1')) + expect(await stRSR.totalSupply()).to.equal(stakeAmt) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmt) + + // Cannot reset stakes with this rate + await expect(stRSR.connect(owner).resetStakes()).to.be.revertedWith('rate still safe') + + // Add RSR to decrease stake rate - still safe + await rsr.connect(owner).transfer(stRSR.address, addAmt1) + + // Advance to the end of noop period + await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await stRSR.payoutRewards() + + // Calculate payout amount + const decayFn = makeDecayFn(await stRSR.rewardRatio()) + const addedRSRStake = addAmt1.sub(decayFn(addAmt1, 1)) // 1 round + const newRate: BigNumber = fp(stakeAmt.add(addedRSRStake)).div(stakeAmt) + + // Payout rewards - Advance to get 1 round of rewards + await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') + expect(await stRSR.exchangeRate()).to.be.closeTo(newRate, 1) + expect(await stRSR.totalSupply()).to.equal(stakeAmt) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmt) + + // Attempt to reset stakes, still not possible + await expect(stRSR.connect(owner).resetStakes()).to.be.revertedWith('rate still safe') + + // Add a large amount of funds - rate will be unsafe + await rsr.connect(owner).mint(owner.address, addAmt2) + await rsr.connect(owner).transfer(stRSR.address, addAmt2) + + // Advance to the end of noop period + await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await stRSR.payoutRewards() + + // Payout rewards - Advance time - rate will be unsafe + await setNextBlockTimestamp(Number(ONE_PERIOD.mul(100).add(await getLatestBlockTimestamp()))) + await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') + expect(await stRSR.exchangeRate()).to.be.gte(fp('1e6')) + expect(await stRSR.exchangeRate()).to.be.lte(fp('1e9')) + expect(await stRSR.totalSupply()).to.equal(stakeAmt) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmt) + + // Now governance can reset stakes + await expect(stRSR.connect(owner).resetStakes()).to.emit(stRSR, 'AllBalancesReset') + + // All stakes reset + expect(await stRSR.exchangeRate()).to.equal(fp('1')) + expect(await stRSR.totalSupply()).to.equal(bn(0)) + expect(await stRSR.balanceOf(addr1.address)).to.equal(bn(0)) + }) + }) + describe('Transfers #fast', () => { let amount: BigNumber From 809b4a88750fdb560a7f567e5e2b1b01065c9b57 Mon Sep 17 00:00:00 2001 From: brr Date: Fri, 11 Aug 2023 16:23:07 +0100 Subject: [PATCH 019/450] C4: add test to show effect of someone frontrunning a gnosis trade (#884) --- contracts/plugins/trading/GnosisTrade.sol | 9 ++- test/Broker.test.ts | 96 ++++++++++++++++++++++- 2 files changed, 103 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index d3256be6ce..e8413c5fea 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -184,11 +184,18 @@ contract GnosisTrade is ITrade { // Transfer balances to origin uint256 sellBal = sell.balanceOf(address(this)); + + // As raised in C4's review, this balance can be manupulated by a frontrunner + // It won't really affect the outcome of the trade, as protocol still gets paid + // and it just gets a better clearing price than expected. + // Fixing it would require some complex logic, as SimpleAuction does not expose + // the amount of tokens bought by the auction after the tokens are settled. + // So we will live with this for now. Worst case, there will be a mismatch between + // the trades recorded by the IDO contracts and on our side. boughtAmt = buy.balanceOf(address(this)); if (sellBal > 0) IERC20Upgradeable(address(sell)).safeTransfer(origin, sellBal); if (boughtAmt > 0) IERC20Upgradeable(address(buy)).safeTransfer(origin, boughtAmt); - // Check clearing prices if (sellBal < initBal) { soldAmt = initBal - sellBal; diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 6f86dc61f4..6d7bd621e2 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -22,6 +22,7 @@ import { GnosisMock, GnosisMockReentrant, GnosisTrade, + GnosisTrade__factory, IAssetRegistry, TestIBackingManager, TestIBasketHandler, @@ -55,6 +56,7 @@ import { } from './utils/time' import { ITradeRequest } from './utils/trades' import { useEnv } from '#/utils/env' +import { parseUnits } from 'ethers/lib/utils' const DEFAULT_THRESHOLD = fp('0.01') // 1% const DELAY_UNTIL_DEFAULT = bn('86400') // 24h @@ -590,7 +592,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { describe('Trades', () => { context('GnosisTrade', () => { - const amount = bn('100e18') + const amount = fp('100.0') let trade: GnosisTrade beforeEach(async () => { @@ -854,6 +856,98 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.canSettle()).to.equal(false) }) + it('Settle frontrun regression check - should be OK', async () => { + // Initialize trade - simulate from backingManager + // token0 18 decimals + // token1 6 decimals + const tradeRequest: ITradeRequest = { + sell: collateral0.address, + buy: collateral1.address, + sellAmount: fp('100.0'), + minBuyAmount: parseUnits('95.0', 6), + } + + // Fund trade and initialize + await token0.connect(owner).mint(backingManager.address, tradeRequest.sellAmount) + + let newTradeAddress = '' + await whileImpersonating(backingManager.address, async (bmSigner) => { + await token0.connect(bmSigner).approve(broker.address, tradeRequest.sellAmount) + const brokerWithBM = broker.connect(bmSigner) + newTradeAddress = await brokerWithBM.callStatic.openTrade( + TradeKind.BATCH_AUCTION, + tradeRequest, + prices + ) + await brokerWithBM.openTrade(TradeKind.BATCH_AUCTION, tradeRequest, prices) + }) + trade = GnosisTrade__factory.connect(newTradeAddress, owner) + + await advanceTime(config.batchAuctionLength.div(10).toString()) + + // Place minimum bid + const bid = { + bidder: addr1.address, + sellAmount: tradeRequest.sellAmount, + buyAmount: tradeRequest.minBuyAmount, + } + await token1.connect(owner).mint(addr1.address, bid.buyAmount) + await token1.connect(addr1).approve(gnosis.address, bid.buyAmount) + await gnosis.placeBid(0, bid) + + // Advance time till trade can be settled + await advanceTime(config.batchAuctionLength.add(100).toString()) + + await whileImpersonating(backingManager.address, async (bmSigner) => { + const tradeWithBm = GnosisTrade__factory.connect(newTradeAddress, bmSigner) + + const normalValues = await tradeWithBm.callStatic.settle() + + expect(normalValues.boughtAmt).to.eq(tradeRequest.minBuyAmount) + expect(normalValues.soldAmt).to.eq(tradeRequest.sellAmount) + + // Simulate someone frontrunning settlement and adding more funds to the trade + await token0.connect(owner).mint(tradeWithBm.address, fp('10')) + await token1.connect(owner).mint(tradeWithBm.address, parseUnits('1', 6)) + + // Simulate settlement after manipulating the trade + let frontRunnedValues = await tradeWithBm.callStatic.settle() + expect(frontRunnedValues.boughtAmt).to.eq( + tradeRequest.minBuyAmount.add(parseUnits('1', 6)) + ) + expect(frontRunnedValues.soldAmt).to.eq(tradeRequest.sellAmount.sub(fp('10'))) + // We can manipulate boughtAmt up and soldAmt down. + // So we're unable to manipualte the clearing price down and force a violation. + + // uint192 clearingPrice = shiftl_toFix(adjustedBuyAmt, -int8(buy.decimals())).div( + // shiftl_toFix(adjustedSoldAmt, -int8(sell.decimals())) + // ); + // if (clearingPrice.lt(worstCasePrice)) { + // broker.reportViolation(); + // } + await token0.connect(owner).mint(tradeWithBm.address, fp('10')) + await token1.connect(owner).mint(tradeWithBm.address, parseUnits('1', 6)) + frontRunnedValues = await tradeWithBm.callStatic.settle() + expect(frontRunnedValues.boughtAmt).to.eq( + tradeRequest.minBuyAmount.add(parseUnits('2', 6)) + ) + expect(frontRunnedValues.soldAmt).to.eq(tradeRequest.sellAmount.sub(fp('20'))) + + expect(await broker.batchTradeDisabled()).to.be.false + await tradeWithBm.settle() + expect(await broker.batchTradeDisabled()).to.be.false + }) + + // Check status + expect(await trade.status()).to.equal(TradeStatus.CLOSED) + expect(await trade.canSettle()).to.equal(false) + + // It's potentially possible to prevent the reportViolation call to be called + // if (sellBal < initBal) { + // if sellBal get's set to initBal, then the GnosisTrade will ignore the boughtAmt + // But it's unknown if this could be exploited + }) + it('Should protect against reentrancy when settling GnosisTrade', async () => { // Create a Reetrant Gnosis const GnosisReentrantFactory: ContractFactory = await ethers.getContractFactory( From e5f0a361e119cd1b3622bd51499290d7b58e3305 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 11 Aug 2023 13:03:28 -0400 Subject: [PATCH 020/450] remove --parallel from all package.json targets (#893) --- package.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 9afb749c90..3382d563b4 100644 --- a/package.json +++ b/package.json @@ -19,12 +19,12 @@ "test:extreme:integration": "FORK=1 EXTREME=1 PROTO_IMPL=1 npx hardhat test test/integration/**/*.test.ts", "test:unit": "yarn test:plugins && yarn test:p0 && yarn test:p1", "test:fast": "bash tools/fast-test.sh", - "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts --parallel", - "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts --parallel", - "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts --parallel", + "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts", + "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts ", + "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts", "test:plugins:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", - "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts --parallel", - "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts --parallel", + "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts", + "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts", "test:gas": "yarn test:gas:protocol && yarn test:gas:integration", "test:gas:protocol": "REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts", "test:gas:integration": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/integration/**/*.test.ts", From 08212ffbd227368af2adabbbdc2e5407541d7160 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 11 Aug 2023 15:57:35 -0400 Subject: [PATCH 021/450] RecollateralizationLib gas optimization (#890) --- .../p1/mixins/RecollateralizationLib.sol | 28 ++++++++++--------- test/Recollateralization.test.ts | 4 +-- .../Recollateralization.test.ts.snap | 18 ++++++------ 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index 8a9e0990f3..dd86e45ca1 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -181,6 +181,9 @@ library RecollateralizationLibP1 { int256 deltaTop; // D18{BU} even though this is int256, it is D18 // not required for range.bottom + // to minimize total operations, range.bottom is calculated from a summed UoA + uint192 uoaBottom; // {UoA} pessimistic UoA estimate of balances above basketsHeld.bottom + // (no space on the stack to cache erc20s.length) for (uint256 i = 0; i < reg.erc20s.length; ++i) { // Exclude RToken balances to avoid double counting value @@ -193,15 +196,14 @@ library RecollateralizationLibP1 { bal = bal.plus(reg.assets[i].bal(address(ctx.stRSR))); } - { + if (ctx.quantities[i] == 0) { // Skip over dust-balance assets not in the basket (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} // Intentionally include value of IFFY/DISABLED collateral - if ( - ctx.quantities[i] == 0 && - !TradeLib.isEnoughToSell(reg.assets[i], bal, lotLow, ctx.minTradeVolume) - ) continue; + if (!TradeLib.isEnoughToSell(reg.assets[i], bal, lotLow, ctx.minTradeVolume)) { + continue; + } } (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} @@ -238,7 +240,7 @@ library RecollateralizationLibP1 { // {tok} = {tok/BU} * {BU} uint192 anchor = ctx.quantities[i].mul(ctx.basketsHeld.bottom, FLOOR); - // (1) Sell tokens at low price + // (1) Sum token value at low price // {UoA} = {UoA/tok} * {tok} uint192 val = low.mul(bal - anchor, FLOOR); @@ -249,12 +251,7 @@ library RecollateralizationLibP1 { // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up // to straightforwardly deduct the minTradeVolume before trying to buy BUs. - val = (val < ctx.minTradeVolume) ? 0 : val - ctx.minTradeVolume; - - // (3) Buy BUs at their high price with the remaining value - // (4) Assume maximum slippage in trade - // {BU} = {UoA} * {1} / {UoA/BU} - range.bottom += val.mulDiv(FIX_ONE.minus(ctx.maxTradeSlippage), buPriceHigh, FLOOR); + uoaBottom += (val < ctx.minTradeVolume) ? 0 : val - ctx.minTradeVolume; } } @@ -271,7 +268,12 @@ library RecollateralizationLibP1 { } // range.bottom - range.bottom += ctx.basketsHeld.bottom; + // (3) Buy BUs at their high price with the remaining value + // (4) Assume maximum slippage in trade + // {BU} = {UoA} * {1} / {UoA/BU} + range.bottom = + ctx.basketsHeld.bottom + + uoaBottom.mulDiv(FIX_ONE.minus(ctx.maxTradeSlippage), buPriceHigh, FLOOR); // reverting on overflow is appropriate here // ==== (3/3) Enforce (range.bottom <= range.top <= basketsNeeded) ==== diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index c6f62c1cc9..0d2208c113 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -5191,10 +5191,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { let tradeAddr = await backingManager.trades(token2.address) let trade = await ethers.getContractAt('DutchTrade', tradeAddr) await backupToken1.connect(addr1).approve(trade.address, initialBal) - await advanceToTimestamp((await trade.endTime()) - 1) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) await snapshotGasCost(trade.connect(addr1).bid()) - // Expect new trade started -- bid in first block at ~1000x price + // Expect new trade started -- bid in last block expect(await backingManager.tradesOpen()).to.equal(1) expect(await backingManager.trades(token2.address)).to.equal(ZERO_ADDRESS) expect(await backingManager.trades(rsr.address)).to.not.equal(ZERO_ADDRESS) diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index b48be609f9..ee29ea21d7 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1305108`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1390986`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1445319`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1517200`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `649717`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `745259`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1675046`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1685173`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `184816`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1624723`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1616603`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `184816`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1714111`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1704814`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `212916`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; From 6d4cf57d3c4eb74109e9a0260ca2d6ddba0ea131 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 14 Aug 2023 17:03:08 -0400 Subject: [PATCH 022/450] Gas tests (#895) --- package.json | 3 +- test/Broker.test.ts | 8 +- test/Recollateralization.test.ts | 1 - test/__snapshots__/Broker.test.ts.snap | 16 +- test/__snapshots__/FacadeWrite.test.ts.snap | 4 +- test/__snapshots__/Furnace.test.ts.snap | 34 ++--- test/__snapshots__/Main.test.ts.snap | 12 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 2 +- test/__snapshots__/Revenues.test.ts.snap | 26 ++-- test/__snapshots__/ZZStRSR.test.ts.snap | 14 +- test/plugins/Collateral.test.ts | 2 +- test/plugins/__snapshots__/Asset.test.ts.snap | 13 ++ .../__snapshots__/Collateral.test.ts.snap | 18 ++- .../RewardableERC20.test.ts.snap | 25 ++++ .../RewardableERC20Vault.test.ts.snap | 13 -- .../ATokenFiatCollateral.test.ts.snap | 18 +-- .../AnkrEthCollateralTestSuite.test.ts.snap | 14 +- .../CBETHCollateral.test.ts.snap | 14 +- .../CTokenFiatCollateral.test.ts.snap | 18 +-- .../__snapshots__/CometTestSuite.test.ts.snap | 18 +-- .../CrvStableMetapoolSuite.test.ts.snap | 18 +-- ...StableRTokenMetapoolTestSuite.test.ts.snap | 18 +-- .../CrvStableTestSuite.test.ts.snap | 18 +-- .../CrvVolatileTestSuite.test.ts.snap | 18 +-- .../CvxStableMetapoolSuite.test.ts.snap | 18 +-- ...StableRTokenMetapoolTestSuite.test.ts.snap | 18 +-- .../CvxStableTestSuite.test.ts.snap | 18 +-- .../CvxVolatileTestSuite.test.ts.snap | 18 +-- .../dsr/SDaiCollateralTestSuite.test.ts | 16 +- .../SDaiCollateralTestSuite.test.ts.snap | 22 ++- .../flux-finance/FTokenFiatCollateral.test.ts | 141 ++++++------------ .../FTokenFiatCollateral.test.ts.snap | 96 +++++++++--- .../SFrxEthTestSuite.test.ts.snap | 12 +- .../LidoStakedEthTestSuite.test.ts.snap | 18 +-- .../MorphoAAVEFiatCollateral.test.ts | 23 ++- .../MorphoAAVENonFiatCollateral.test.ts | 22 ++- .../MorphoAAVEFiatCollateral.test.ts.snap | 66 +++++--- .../MorphoAAVENonFiatCollateral.test.ts.snap | 44 ++++-- ...AAVESelfReferentialCollateral.test.ts.snap | 14 +- .../RethCollateralTestSuite.test.ts.snap | 14 +- .../StargateETHTestSuite.test.ts.snap | 36 ++--- .../__snapshots__/MaxBasketSize.test.ts.snap | 18 +-- 43 files changed, 538 insertions(+), 427 deletions(-) create mode 100644 test/plugins/__snapshots__/Asset.test.ts.snap create mode 100644 test/plugins/__snapshots__/RewardableERC20.test.ts.snap delete mode 100644 test/plugins/__snapshots__/RewardableERC20Vault.test.ts.snap diff --git a/package.json b/package.json index 3382d563b4..79032da344 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,9 @@ "test:plugins:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts", "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts", - "test:gas": "yarn test:gas:protocol && yarn test:gas:integration", + "test:gas": "yarn test:gas:protocol && yarn test:gas:collateral && yarn test:gas:integration", "test:gas:protocol": "REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts", + "test:gas:collateral": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", "test:gas:integration": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/integration/**/*.test.ts", "test:coverage": "PROTO_IMPL=1 hardhat coverage --testfiles 'test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts'", "test:unit:coverage": "PROTO_IMPL=1 SLOW= hardhat coverage --testfiles 'test/*.test.ts test/libraries/*.test.ts test/plugins/*.test.ts'", diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 6d7bd621e2..61398dba6f 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1571,6 +1571,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Create a new trade TradeFactory = await ethers.getContractFactory('GnosisTrade') newTrade = await TradeFactory.deploy() + await setStorageAt(newTrade.address, 0, 0) }) it('Open Trade ', async () => { @@ -1614,6 +1615,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ) }) + // Bidding tested in Revenues.test.ts + it('Settle Trade ', async () => { // Fund trade and initialize await token0.connect(owner).mint(newTrade.address, amount) @@ -1664,6 +1667,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Create a new trade TradeFactory = await ethers.getContractFactory('DutchTrade') newTrade = await TradeFactory.deploy() + await setStorageAt(newTrade.address, 0, 0) }) it('Open Trade ', async () => { @@ -1708,6 +1712,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ) }) + // Bidding tested in Revenues.test.ts + it('Settle Trade ', async () => { // Fund trade and initialize await token0.connect(owner).mint(newTrade.address, amount) @@ -1721,7 +1727,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ) // Advance time till trade can be settled - await advanceTime(config.dutchAuctionLength.add(100).toString()) + await advanceBlocks((await newTrade.endBlock()).sub(await getLatestBlockNumber())) // Settle trade await whileImpersonating(backingManager.address, async (bmSigner) => { diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 0d2208c113..5b7718a225 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -40,7 +40,6 @@ import { import { advanceTime, advanceBlocks, - advanceToTimestamp, getLatestBlockTimestamp, getLatestBlockNumber, } from './utils/time' diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index 8189fb7987..9c02711719 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -1,21 +1,21 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `233492`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `259737`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `338119`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `368979`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `340233`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `371094`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `342371`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `373232`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63421`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `451427`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `539971`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `541418`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `527809`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `529256`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `529947`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `531394`; exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113056`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 63df8acefd..cfc4b24738 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `9070064`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8367047`; -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464714`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464633`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Without governance 1`] = `114895`; diff --git a/test/__snapshots__/Furnace.test.ts.snap b/test/__snapshots__/Furnace.test.ts.snap index fbfe5b16dd..af06969a2f 100644 --- a/test/__snapshots__/Furnace.test.ts.snap +++ b/test/__snapshots__/Furnace.test.ts.snap @@ -1,35 +1,35 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `83925`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `83931`; -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `89814`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `89820`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `83925`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `83931`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `64025`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `64031`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `80657`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `80663`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `78297`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `40755`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `40761`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 1861862025..40f226bf7b 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `341625`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `361898`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `192993`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `196758`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `192993`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `196758`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `164144`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167914`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80416`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80532`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `69928`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70044`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index 45f7c82958..0ffc6842b6 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `770967`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791756`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `597971`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618760`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `573851`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `594756`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index ee29ea21d7..585e4bef18 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -4,7 +4,7 @@ exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1517200`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `745259`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `732257`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1685173`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 3408dca024..c5ac463af2 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -1,27 +1,27 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `165168`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `165190`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165110`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165243`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165110`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165243`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208818`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208840`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229460`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229593`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212360`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212493`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `916913`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1034629`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `748182`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `777373`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1141155`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1188577`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `319722`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `309815`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `274788`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `264881`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `731082`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `743173`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `250582`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `240675`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index d3c38d5241..629cb7687c 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `152134`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139830`; -exports[`StRSRP1 contract Gas Reporting Stake 2`] = `147334`; +exports[`StRSRP1 contract Gas Reporting Stake 2`] = `135030`; -exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63389`; +exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63409`; -exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41489`; +exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41509`; -exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58601`; +exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58621`; exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `555617`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `576204`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `509621`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `530208`; diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 69225d900b..ea5db3b17e 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -2220,7 +2220,7 @@ describe('Collateral contracts', () => { it('after oracle timeout', async () => { const oracleTimeout = await tokenCollateral.oracleTimeout() await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(oracleTimeout / 12) + await advanceBlocks(bn(oracleTimeout).div(12)) }) it('after full price timeout', async () => { diff --git a/test/plugins/__snapshots__/Asset.test.ts.snap b/test/plugins/__snapshots__/Asset.test.ts.snap new file mode 100644 index 0000000000..95905a05a0 --- /dev/null +++ b/test/plugins/__snapshots__/Asset.test.ts.snap @@ -0,0 +1,13 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Assets contracts #fast Gas Reporting refresh() refresh() after full price timeout 1`] = `39474`; + +exports[`Assets contracts #fast Gas Reporting refresh() refresh() after full price timeout 2`] = `39474`; + +exports[`Assets contracts #fast Gas Reporting refresh() refresh() after oracle timeout 1`] = `39474`; + +exports[`Assets contracts #fast Gas Reporting refresh() refresh() after oracle timeout 2`] = `39474`; + +exports[`Assets contracts #fast Gas Reporting refresh() refresh() during SOUND 1`] = `51879`; + +exports[`Assets contracts #fast Gas Reporting refresh() refresh() during SOUND 2`] = `51879`; diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index cc9cc3ac12..9c98a9ffd2 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,11 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting Force Updates - Hard Default - ATokens/CTokens 1`] = `69709`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `72844`; -exports[`Collateral contracts Gas Reporting Force Updates - Hard Default - ATokens/CTokens 2`] = `70845`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `73980`; -exports[`Collateral contracts Gas Reporting Force Updates - Soft Default 1`] = `59399`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `62534`; -exports[`Collateral contracts Gas Reporting Force Updates - Soft Default 2`] = `52131`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 2`] = `55266`; -exports[`Collateral contracts Gas Reporting Force Updates - Soft Default 3`] = `51849`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 3`] = `54984`; + +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 4`] = `23429`; + +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 5`] = `54984`; + +exports[`Collateral contracts Gas Reporting refresh() during SOUND 1`] = `54984`; + +exports[`Collateral contracts Gas Reporting refresh() during SOUND 2`] = `54984`; diff --git a/test/plugins/__snapshots__/RewardableERC20.test.ts.snap b/test/plugins/__snapshots__/RewardableERC20.test.ts.snap new file mode 100644 index 0000000000..3f3231f06b --- /dev/null +++ b/test/plugins/__snapshots__/RewardableERC20.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Gas Reporting RewardableERC20WrapperTest claimRewards 1`] = `174149`; + +exports[`Gas Reporting RewardableERC20WrapperTest claimRewards 2`] = `105749`; + +exports[`Gas Reporting RewardableERC20WrapperTest deposit 1`] = `119303`; + +exports[`Gas Reporting RewardableERC20WrapperTest deposit 2`] = `86643`; + +exports[`Gas Reporting RewardableERC20WrapperTest withdraw 1`] = `96090`; + +exports[`Gas Reporting RewardableERC20WrapperTest withdraw 2`] = `64590`; + +exports[`Gas Reporting RewardableERC4626VaultTest claimRewards 1`] = `174118`; + +exports[`Gas Reporting RewardableERC4626VaultTest claimRewards 2`] = `105718`; + +exports[`Gas Reporting RewardableERC4626VaultTest deposit 1`] = `121596`; + +exports[`Gas Reporting RewardableERC4626VaultTest deposit 2`] = `88936`; + +exports[`Gas Reporting RewardableERC4626VaultTest withdraw 1`] = `101629`; + +exports[`Gas Reporting RewardableERC4626VaultTest withdraw 2`] = `70129`; diff --git a/test/plugins/__snapshots__/RewardableERC20Vault.test.ts.snap b/test/plugins/__snapshots__/RewardableERC20Vault.test.ts.snap deleted file mode 100644 index 5d104c5e65..0000000000 --- a/test/plugins/__snapshots__/RewardableERC20Vault.test.ts.snap +++ /dev/null @@ -1,13 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Gas Reporting RewardableERC4626Vault claimRewards 1`] = `159832`; - -exports[`Gas Reporting RewardableERC4626Vault claimRewards 2`] = `83066`; - -exports[`Gas Reporting RewardableERC4626Vault deposit 1`] = `119033`; - -exports[`Gas Reporting RewardableERC4626Vault deposit 2`] = `85387`; - -exports[`Gas Reporting RewardableERC4626Vault withdraw 1`] = `98068`; - -exports[`Gas Reporting RewardableERC4626Vault withdraw 2`] = `66568`; diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index e505e04797..1976652900 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74518`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `75367`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72850`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `73699`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73073`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73922`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `30918`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74518`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `75367`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72850`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `73699`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `51728`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `51728`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92420`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `93195`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92346`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `93269`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `125132`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128267`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `89264`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `92399`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index b2a094843f..efb00072cb 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58262`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61342`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `53793`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56873`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `76400`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `79535`; exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `37508`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `58262`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61342`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `53793`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `56873`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `68714`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `71849`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `68714`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `71849`; diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index 3551302c16..67c84c6cc5 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `57750`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60830`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `53281`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56361`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `91861`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98131`; exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `36971`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `75731`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81946`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `71262`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77477`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `84175`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90445`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `84175`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90445`; diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index b1bf29c3a9..00de61ac71 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119481`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `120330`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117813`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `118662`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `74209`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `75058`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `31842`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119481`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `120330`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117813`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `118662`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `96669`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `96669`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139939`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `140788`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139939`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `140788`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `172725`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175860`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `136857`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139992`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index 57d6205291..c760e4bbb0 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `107007`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `110087`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `102270`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `105350`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `132320`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `135455`; exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `70661`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `107007`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `110087`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `102270`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `105350`; exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `73461`; exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `70661`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `124634`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `127769`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `124634`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `127769`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `132185`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `135320`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `124916`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `128051`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index a4b3141f3a..6aaba60bdb 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `75961`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `82121`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `71493`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77653`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `242158`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259238`; exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `75961`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `82121`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `71493`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77653`; exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `237273`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254353`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `237273`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254353`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `244851`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261931`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `237583`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254663`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 82de3742f2..2b5d33eea0 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `92858`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `99018`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `88390`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94550`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `220114`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232924`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `97863`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `104078`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `93395`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99610`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `215229`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `228039`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `215229`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `228039`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `203246`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213786`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `195978`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206518`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index 28185554e3..ffe45ebe78 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59818`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62898`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55350`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58430`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `192331`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205141`; exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59818`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62898`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55350`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58430`; exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `187446`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200256`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `187446`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200256`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `175071`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185611`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `167803`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178343`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap index de32617273..cf655d93a7 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62266`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65346`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57798`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60878`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `224290`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241371`; exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62266`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65346`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57798`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60878`; exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `219405`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236486`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `219405`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236486`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `225659`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242740`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `218391`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235472`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 8e747784bc..6a295e365d 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `75961`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `82121`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `71493`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77653`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `242158`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259238`; exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `75961`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `82121`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `71493`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77653`; exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `237273`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254353`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `237273`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254353`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `244851`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261931`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `237583`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254663`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index c5192687d0..49b74a184d 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `92858`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `99018`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `88390`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94550`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `220114`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232924`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `97863`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `104078`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `93395`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99610`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `215229`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `228039`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `215229`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `228039`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `203246`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213786`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `195978`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206518`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index 18f069f0e4..53d7c649fe 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59818`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62898`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55350`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58430`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `192331`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205141`; exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59818`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62898`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55350`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58430`; exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `187446`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200256`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `187446`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200256`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `175071`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185611`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `167803`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178343`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap index 71f287f75d..562706cdba 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62266`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65346`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57798`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60878`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `224290`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241371`; exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62266`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65346`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57798`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60878`; exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `219405`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236486`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `219405`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236486`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `225659`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242740`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `218391`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235472`; diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 4b50a53796..a6070353d4 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -123,11 +123,17 @@ const mintCollateralTo: MintCollateralFunc = async ( await mintSDAI(ctx.tok, user, amount, recipient) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} +const reduceTargetPerRef = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} +const increaseTargetPerRef = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} // prettier-ignore const reduceRefPerTok = async ( @@ -199,7 +205,7 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index 4fb7c27a86..0d82e1ea60 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -1,17 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `114677`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117757`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `106365`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `109445`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `129111`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `132246`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90061`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `114496`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117576`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `106365`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `109445`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `121148`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `93388`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `121148`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `90061`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `124283`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `124283`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `132111`; + +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `124565`; diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index 9367ee577c..8b51724dcc 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -1,16 +1,10 @@ +import { setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import collateralTests from '../collateralTests' -import { - CollateralFixtureContext, - CollateralStatus, - CollateralOpts, - MintCollateralFunc, -} from '../pluginTestTypes' +import { CollateralFixtureContext, CollateralOpts, MintCollateralFunc } from '../pluginTestTypes' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { CTokenWrapper, - CTokenWrapperMock, - ICToken, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -20,7 +14,6 @@ import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { advanceBlocks } from '../../../utils/time' import { USDC_HOLDER, USDT_HOLDER, @@ -192,59 +185,6 @@ all.forEach((curr: FTokenEnumeration) => { return makeCollateralFixtureContext } - const deployCollateralMockContext = async ( - opts: FTokenCollateralOpts = {} - ): Promise => { - const collateralOpts = { ...defaultCollateralOpts, ...opts } - - const MockV3AggregatorFactory = ( - await ethers.getContractFactory('MockV3Aggregator') - ) - - const comptroller = await ethers.getContractAt('ComptrollerMock', collateralOpts.comptroller!) - - const chainlinkFeed = await MockV3AggregatorFactory.deploy(6, bn('1e6')) - collateralOpts.chainlinkFeed = chainlinkFeed.address - - const FTokenMockFactory = await ethers.getContractFactory('CTokenMock') - - const underlyingFToken = await FTokenMockFactory.deploy( - 'Mock FToken', - 'Mock Ftk', - curr.underlying - ) - - const CTokenWrapperMockFactory: ContractFactory = await ethers.getContractFactory( - 'CTokenWrapperMock' - ) - - let compAddress = ZERO_ADDRESS - try { - compAddress = await comptroller.getCompAddress() - // eslint-disable-next-line no-empty - } catch {} - - const fTokenVault = ( - await CTokenWrapperMockFactory.deploy( - await underlyingFToken.name(), - await underlyingFToken.symbol(), - underlyingFToken.address, - compAddress, - collateralOpts.comptroller! - ) - ) - - collateralOpts.erc20 = fTokenVault.address - - const collateral = await deployCollateral(collateralOpts) - - return { - collateral, - chainlinkFeed, - tok: fTokenVault, - } - } - /* Define helper functions */ @@ -261,41 +201,45 @@ all.forEach((curr: FTokenEnumeration) => { await mintFToken(underlying, curr.holderUnderlying, fToken, tok, amount, recipient) } - const increaseRefPerTok = async (ctx: CollateralFixtureContext) => { - await advanceBlocks(1) - await (ctx.tok as ICToken).exchangeRateCurrent() + const reduceTargetPerRef = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const increaseTargetPerRef = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const increaseRefPerTok = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const tok = ctx.tok as CTokenWrapper + const fToken = await ethers.getContractAt('ICToken', await tok.underlying()) + const totalSupply = await fToken.totalSupply() + await setStorageAt( + fToken.address, + 13, // interesting, the storage slot is 13 for fTokens and 14 for cTokens + totalSupply.sub(totalSupply.mul(pctIncrease).div(100)) + ) // expand supply by pctDecrease, since it's denominator of exchange rate calculation + } + + const reduceRefPerTok = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const tok = ctx.tok as CTokenWrapper + const fToken = await ethers.getContractAt('ICToken', await tok.underlying()) + const totalSupply = await fToken.totalSupply() + await setStorageAt( + fToken.address, + 13, // interesting, the storage slot is 13 for fTokens and 14 for cTokens + totalSupply.add(totalSupply.mul(pctDecrease).div(100)) + ) // expand supply by pctDecrease, since it's denominator of exchange rate calculation } // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificConstructorTests = () => {} - const collateralSpecificStatusTests = () => { - it('does revenue hiding correctly', async () => { - const { collateral, tok } = await deployCollateralMockContext({ revenueHiding: fp('0.01') }) - - const rate = fp('2') - const rateAsRefPerTok = rate.div(50) - await (tok as CTokenWrapperMock).setExchangeRate(rate) // above current - await collateral.refresh() - const before = await collateral.refPerTok() - expect(before).to.equal(rateAsRefPerTok.mul(fp('0.99')).div(fp('1'))) - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - // Should be SOUND if drops just under 1% - await (tok as CTokenWrapperMock).setExchangeRate(rate.mul(fp('0.99001')).div(fp('1'))) - await collateral.refresh() - let after = await collateral.refPerTok() - expect(before).to.eq(after) - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - // Should be DISABLED if drops just over 1% - await (tok as CTokenWrapperMock).setExchangeRate(before.mul(fp('0.98999')).div(fp('1'))) - await collateral.refresh() - after = await collateral.refPerTok() - expect(before).to.be.gt(after) - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - }) - } + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificStatusTests = () => {} const getExpectedPrice = async (ctx: CollateralFixtureContext) => { const initRefPerTok = await ctx.collateral.refPerTok() @@ -324,19 +268,20 @@ all.forEach((curr: FTokenEnumeration) => { beforeEachRewardsTest: emptyFn, makeCollateralFixtureContext, mintCollateralTo, - reduceTargetPerRef: emptyFn, - increaseTargetPerRef: emptyFn, - reduceRefPerTok: emptyFn, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, - itChecksRefPerTokDefault: it.skip, + itChecksTargetPerRefDefault: it, + itChecksRefPerTokDefault: it, itChecksPriceChanges: it, - itHasRevenueHiding: it.skip, // in this file + itHasRevenueHiding: it, resetFork, collateralName: curr.testName, chainlinkDefaultAnswer: bn('1e8'), + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index 74ec91a258..ed9963c4ca 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -1,49 +1,97 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `115251`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118331`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `113583`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116663`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `115251`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140108`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `113583`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140108`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `136973`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118331`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `136973`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116663`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `115443`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `97011`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `113775`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `97011`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `115443`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140108`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `113775`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140108`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `137229`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142058`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `137229`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140390`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `123733`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118523`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `122065`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116855`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `123733`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140364`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `122065`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140294`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `146011`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118523`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `146011`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116855`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118381`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `97203`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116713`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `97203`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118381`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140364`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116713`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140364`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140375`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142314`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140305`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140720`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `126813`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `125145`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149076`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `149146`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `126813`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `125145`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `105493`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `105493`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `149146`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `149146`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `151096`; + +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `149428`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `121461`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `119793`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `143510`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `143440`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `121461`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `119793`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `100141`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `100141`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `143510`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `143440`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `145460`; + +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `143792`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index e0a213d4e2..40c07ca09a 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56918`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59998`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `52181`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55261`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `57618`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60698`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55949`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `59029`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `71659`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `74794`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `71659`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `74794`; diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index 759ebc8430..9764e5e036 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `85967`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `89047`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `81498`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `84578`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `128420`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `134690`; exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `65149`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `85967`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `89047`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `81498`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `84578`; exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `65149`; exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `65149`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `120734`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `127004`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `120734`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `127004`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `125485`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `131755`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `121016`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `127286`; diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index 39e467e2d0..6ecee49770 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -131,11 +131,23 @@ const makeAaveFiatCollateralTestSuite = ( return makeCollateralFixtureContext } - // eslint-disable-next-line @typescript-eslint/no-empty-function - const reduceTargetPerRef = async () => {} + const reduceTargetPerRef = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctDecrease: BigNumberish + ) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } - // eslint-disable-next-line @typescript-eslint/no-empty-function - const increaseTargetPerRef = async () => {} + const increaseTargetPerRef = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctIncrease: BigNumberish + ) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } const changeRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, @@ -311,13 +323,14 @@ const makeAaveFiatCollateralTestSuite = ( increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, resetFork: getResetFork(FORK_BLOCK), collateralName, chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 0e902705fd..d6302abfb0 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -142,11 +142,23 @@ const makeAaveNonFiatCollateralTestSuite = ( Define helper functions */ - // eslint-disable-next-line @typescript-eslint/no-empty-function - const reduceTargetPerRef = async () => {} + const reduceTargetPerRef = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctDecrease: BigNumberish + ) => { + const lastRound = await ctx.targetPrRefFeed!.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) + } - // eslint-disable-next-line @typescript-eslint/no-empty-function - const increaseTargetPerRef = async () => {} + const increaseTargetPerRef = async ( + ctx: MorphoAaveCollateralFixtureContext, + pctIncrease: BigNumberish + ) => { + const lastRound = await ctx.targetPrRefFeed!.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) + } const changeRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, @@ -215,7 +227,7 @@ const makeAaveNonFiatCollateralTestSuite = ( increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 7bb8adbe2a..637d4b1476 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -1,49 +1,73 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `131942`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135022`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `127473`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130553`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `177256`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `180391`; exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `111194`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `131942`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135022`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `127473`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130553`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `169570`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `111194`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `169570`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `111194`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `132145`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172705`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `127676`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172705`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `177662`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `180256`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172987`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135225`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130756`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180797`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `111397`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `132145`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135225`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130756`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `111397`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `127676`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `111397`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `169976`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `173111`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `169976`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `173111`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `131298`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180662`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `126829`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `173393`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `175968`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134378`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129909`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `179103`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `110550`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `131298`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134378`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129909`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `110550`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `110550`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `171417`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `126829`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `171417`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `168282`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178968`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `168282`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171699`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index 7d3645000a..fd7e828651 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -1,33 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `131365`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134445`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `126896`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129976`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `194216`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `200486`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `110550`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `178094`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `184309`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `173625`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `179840`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `186530`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `110550`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `186530`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `110550`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `164997`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192800`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `160528`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192800`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `233480`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `197551`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `193082`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `168077`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `163608`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239750`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `144182`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `217358`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `223573`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `219104`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `144182`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `144182`; + +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `232064`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `212889`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `232064`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `225794`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `236815`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `225794`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `232346`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index 0bb7fec1de..a8faf3cbe4 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `199080`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `202160`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `194611`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197691`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `215207`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `218342`; exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `144160`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `199080`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `202160`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `194611`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197691`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `207521`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210656`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `207521`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210656`; diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap index 54fc867521..35bb6dd12a 100644 --- a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `68835`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `71915`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `64366`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67446`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `102946`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `109216`; exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `48056`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `68835`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `71915`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `64366`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67446`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `95260`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `101530`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `95260`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `101530`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap index 5757607e08..a11f838460 100644 --- a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap @@ -1,49 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `53187`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56267`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48719`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51799`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `66829`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `69964`; exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `23429`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `53187`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56267`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48719`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51799`; exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `23429`; exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `23429`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `64090`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `67225`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `64090`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `67225`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `71640`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74775`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `64372`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67507`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `53187`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56267`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48719`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51799`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `66829`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `69964`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `23429`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `53187`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56267`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48719`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51799`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `23429`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `23429`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `64090`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `67225`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `64090`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `67225`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `71640`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74775`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `64372`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67507`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 0e0cede769..d0562e5cc1 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `11745060`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12085685`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9481763`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9838290`; -exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2292984`; +exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2293006`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `12996739`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13276964`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `25285711`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20658478`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10751848`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11092473`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8471463`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8827990`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `4535170`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `4557434`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `17723377`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `13292502`; From 99d9db72e04db29f8e80e50a78b16a0b475d79f3 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 15 Aug 2023 05:13:53 +0530 Subject: [PATCH 023/450] Bunch of gas optimizations (#894) Co-authored-by: Taylor Brent --- .openzeppelin/ropsten.json | 11 +- contracts/interfaces/IBackingManager.sol | 4 +- contracts/interfaces/IBasketHandler.sol | 9 +- contracts/interfaces/IBroker.sol | 18 +-- contracts/interfaces/IDistributor.sol | 4 +- contracts/interfaces/IFurnace.sol | 2 +- contracts/interfaces/IMain.sol | 28 ++-- contracts/interfaces/IRToken.sol | 4 +- contracts/interfaces/IRewardable.sol | 2 +- contracts/interfaces/IStRSR.sol | 12 +- contracts/interfaces/ITrading.sol | 4 +- contracts/p1/BasketHandler.sol | 5 +- contracts/p1/Distributor.sol | 7 +- contracts/p1/RToken.sol | 13 +- contracts/p1/mixins/BasketLib.sol | 47 +++--- .../plugins/assets/aave/StaticATokenLM.sol | 2 +- .../curve/cvx/vendor/ConvexStakingWrapper.sol | 16 +- contracts/plugins/mocks/EasyAuction.sol | 20 +-- .../mocks/InvalidRefPerTokCollateral.sol | 7 +- contracts/plugins/trading/DutchTrade.sol | 39 +++-- package.json | 1 - .../addresses/3-tmp-assets-collateral.json | 2 +- scripts/addresses/3-tmp-deployments.json | 2 +- .../deploy_morpho_aavev2_plugin.ts | 138 +++++++++--------- tasks/testing/upgrade-checker-utils/trades.ts | 2 +- .../upgrade-checker-utils/upgrades/2_1_0.ts | 6 +- test/__snapshots__/Broker.test.ts.snap | 8 +- test/__snapshots__/FacadeWrite.test.ts.snap | 4 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 8 +- test/__snapshots__/Revenues.test.ts.snap | 20 +-- test/__snapshots__/ZZStRSR.test.ts.snap | 4 +- .../RewardableERC20.test.ts.snap | 8 +- .../ATokenFiatCollateral.test.ts.snap | 2 +- .../individual-collateral/collateralTests.ts | 2 + .../curve/collateralTests.ts | 2 + .../dsr/SDaiCollateralTestSuite.test.ts | 1 + .../FTokenFiatCollateral.test.ts.snap | 26 ++-- .../__snapshots__/MaxBasketSize.test.ts.snap | 16 +- 39 files changed, 261 insertions(+), 251 deletions(-) diff --git a/.openzeppelin/ropsten.json b/.openzeppelin/ropsten.json index 8370c99c6f..ba9ed634a2 100644 --- a/.openzeppelin/ropsten.json +++ b/.openzeppelin/ropsten.json @@ -866,10 +866,7 @@ }, "t_enum(TradeKind)10909": { "label": "enum TradeKind", - "members": [ - "DUTCH_AUCTION", - "BATCH_AUCTION" - ], + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)6264,t_contract(ITrade)12850)": { @@ -1162,11 +1159,7 @@ }, "t_enum(CollateralStatus)20723": { "label": "enum CollateralStatus", - "members": [ - "SOUND", - "IFFY", - "DISABLED" - ], + "members": ["SOUND", "IFFY", "DISABLED"], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { diff --git a/contracts/interfaces/IBackingManager.sol b/contracts/interfaces/IBackingManager.sol index 1aa4b9fb39..0699da6d6c 100644 --- a/contracts/interfaces/IBackingManager.sol +++ b/contracts/interfaces/IBackingManager.sol @@ -18,12 +18,12 @@ interface IBackingManager is IComponent, ITrading { /// Emitted when the trading delay is changed /// @param oldVal The old trading delay /// @param newVal The new trading delay - event TradingDelaySet(uint48 indexed oldVal, uint48 indexed newVal); + event TradingDelaySet(uint48 oldVal, uint48 newVal); /// Emitted when the backing buffer is changed /// @param oldVal The old backing buffer /// @param newVal The new backing buffer - event BackingBufferSet(uint192 indexed oldVal, uint192 indexed newVal); + event BackingBufferSet(uint192 oldVal, uint192 newVal); // Initialization function init( diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index f944550840..42bb8bf092 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -36,20 +36,17 @@ interface IBasketHandler is IComponent { /// @param targetName The name of the target unit as a bytes32 /// @param max The max number to use from `erc20s` /// @param erc20s The set of backup collateral tokens - event BackupConfigSet(bytes32 indexed targetName, uint256 indexed max, IERC20[] erc20s); + event BackupConfigSet(bytes32 indexed targetName, uint256 max, IERC20[] erc20s); /// Emitted when the warmup period is changed /// @param oldVal The old warmup period /// @param newVal The new warmup period - event WarmupPeriodSet(uint48 indexed oldVal, uint48 indexed newVal); + event WarmupPeriodSet(uint48 oldVal, uint48 newVal); /// Emitted when the status of a basket has changed /// @param oldStatus The previous basket status /// @param newStatus The new basket status - event BasketStatusChanged( - CollateralStatus indexed oldStatus, - CollateralStatus indexed newStatus - ); + event BasketStatusChanged(CollateralStatus oldStatus, CollateralStatus newStatus); // Initialization function init(IMain main_, uint48 warmupPeriod_) external; diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index c0496801a0..0c83eb9216 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -33,17 +33,13 @@ struct TradeRequest { * the continued proper functioning of trading platforms. */ interface IBroker is IComponent { - event GnosisSet(IGnosis indexed oldVal, IGnosis indexed newVal); - event BatchTradeImplementationSet(ITrade indexed oldVal, ITrade indexed newVal); - event DutchTradeImplementationSet(ITrade indexed oldVal, ITrade indexed newVal); - event BatchAuctionLengthSet(uint48 indexed oldVal, uint48 indexed newVal); - event DutchAuctionLengthSet(uint48 indexed oldVal, uint48 indexed newVal); - event BatchTradeDisabledSet(bool indexed prevVal, bool indexed newVal); - event DutchTradeDisabledSet( - IERC20Metadata indexed erc20, - bool indexed prevVal, - bool indexed newVal - ); + event GnosisSet(IGnosis oldVal, IGnosis newVal); + event BatchTradeImplementationSet(ITrade oldVal, ITrade newVal); + event DutchTradeImplementationSet(ITrade oldVal, ITrade newVal); + event BatchAuctionLengthSet(uint48 oldVal, uint48 newVal); + event DutchAuctionLengthSet(uint48 oldVal, uint48 newVal); + event BatchTradeDisabledSet(bool prevVal, bool newVal); + event DutchTradeDisabledSet(IERC20Metadata indexed erc20, bool prevVal, bool newVal); // Initialization function init( diff --git a/contracts/interfaces/IDistributor.sol b/contracts/interfaces/IDistributor.sol index e3c7de6ace..5f5c76c5a2 100644 --- a/contracts/interfaces/IDistributor.sol +++ b/contracts/interfaces/IDistributor.sol @@ -28,13 +28,13 @@ interface IDistributor is IComponent { /// @param dest The address set to receive the distribution /// @param rTokenDist The distribution of RToken that should go to `dest` /// @param rsrDist The distribution of RSR that should go to `dest` - event DistributionSet(address dest, uint16 rTokenDist, uint16 rsrDist); + event DistributionSet(address indexed dest, uint16 rTokenDist, uint16 rsrDist); /// Emitted when revenue is distributed /// @param erc20 The token being distributed, either RSR or the RToken itself /// @param source The address providing the revenue /// @param amount The amount of the revenue - event RevenueDistributed(IERC20 indexed erc20, address indexed source, uint256 indexed amount); + event RevenueDistributed(IERC20 indexed erc20, address indexed source, uint256 amount); // Initialization function init(IMain main_, RevenueShare memory dist) external; diff --git a/contracts/interfaces/IFurnace.sol b/contracts/interfaces/IFurnace.sol index 25c754aacf..170cb4c554 100644 --- a/contracts/interfaces/IFurnace.sol +++ b/contracts/interfaces/IFurnace.sol @@ -15,7 +15,7 @@ interface IFurnace is IComponent { /// Emitted when the melting ratio is changed /// @param oldRatio The old ratio /// @param newRatio The new ratio - event RatioSet(uint192 indexed oldRatio, uint192 indexed newRatio); + event RatioSet(uint192 oldRatio, uint192 newRatio); function ratio() external view returns (uint192); diff --git a/contracts/interfaces/IMain.sol b/contracts/interfaces/IMain.sol index 00bb261de9..f282be1479 100644 --- a/contracts/interfaces/IMain.sol +++ b/contracts/interfaces/IMain.sol @@ -49,27 +49,27 @@ interface IAuth is IAccessControlUpgradeable { /// Emitted when `unfreezeAt` is changed /// @param oldVal The old value of `unfreezeAt` /// @param newVal The new value of `unfreezeAt` - event UnfreezeAtSet(uint48 indexed oldVal, uint48 indexed newVal); + event UnfreezeAtSet(uint48 oldVal, uint48 newVal); /// Emitted when the short freeze duration governance param is changed /// @param oldDuration The old short freeze duration /// @param newDuration The new short freeze duration - event ShortFreezeDurationSet(uint48 indexed oldDuration, uint48 indexed newDuration); + event ShortFreezeDurationSet(uint48 oldDuration, uint48 newDuration); /// Emitted when the long freeze duration governance param is changed /// @param oldDuration The old long freeze duration /// @param newDuration The new long freeze duration - event LongFreezeDurationSet(uint48 indexed oldDuration, uint48 indexed newDuration); + event LongFreezeDurationSet(uint48 oldDuration, uint48 newDuration); /// Emitted when the system is paused or unpaused for trading /// @param oldVal The old value of `tradingPaused` /// @param newVal The new value of `tradingPaused` - event TradingPausedSet(bool indexed oldVal, bool indexed newVal); + event TradingPausedSet(bool oldVal, bool newVal); /// Emitted when the system is paused or unpaused for issuance /// @param oldVal The old value of `issuancePaused` /// @param newVal The new value of `issuancePaused` - event IssuancePausedSet(bool indexed oldVal, bool indexed newVal); + event IssuancePausedSet(bool oldVal, bool newVal); /** * Trading Paused: Disable everything except for OWNER actions, RToken.issue, RToken.redeem, @@ -118,39 +118,39 @@ interface IComponentRegistry { function rToken() external view returns (IRToken); - event StRSRSet(IStRSR indexed oldVal, IStRSR indexed newVal); + event StRSRSet(IStRSR oldVal, IStRSR newVal); function stRSR() external view returns (IStRSR); - event AssetRegistrySet(IAssetRegistry indexed oldVal, IAssetRegistry indexed newVal); + event AssetRegistrySet(IAssetRegistry oldVal, IAssetRegistry newVal); function assetRegistry() external view returns (IAssetRegistry); - event BasketHandlerSet(IBasketHandler indexed oldVal, IBasketHandler indexed newVal); + event BasketHandlerSet(IBasketHandler oldVal, IBasketHandler newVal); function basketHandler() external view returns (IBasketHandler); - event BackingManagerSet(IBackingManager indexed oldVal, IBackingManager indexed newVal); + event BackingManagerSet(IBackingManager oldVal, IBackingManager newVal); function backingManager() external view returns (IBackingManager); - event DistributorSet(IDistributor indexed oldVal, IDistributor indexed newVal); + event DistributorSet(IDistributor oldVal, IDistributor newVal); function distributor() external view returns (IDistributor); - event RSRTraderSet(IRevenueTrader indexed oldVal, IRevenueTrader indexed newVal); + event RSRTraderSet(IRevenueTrader oldVal, IRevenueTrader newVal); function rsrTrader() external view returns (IRevenueTrader); - event RTokenTraderSet(IRevenueTrader indexed oldVal, IRevenueTrader indexed newVal); + event RTokenTraderSet(IRevenueTrader oldVal, IRevenueTrader newVal); function rTokenTrader() external view returns (IRevenueTrader); - event FurnaceSet(IFurnace indexed oldVal, IFurnace indexed newVal); + event FurnaceSet(IFurnace oldVal, IFurnace newVal); function furnace() external view returns (IFurnace); - event BrokerSet(IBroker indexed oldVal, IBroker indexed newVal); + event BrokerSet(IBroker oldVal, IBroker newVal); function broker() external view returns (IBroker); } diff --git a/contracts/interfaces/IRToken.sol b/contracts/interfaces/IRToken.sol index 3111563053..9528ab2efd 100644 --- a/contracts/interfaces/IRToken.sol +++ b/contracts/interfaces/IRToken.sol @@ -25,7 +25,7 @@ interface IRToken is IComponent, IERC20MetadataUpgradeable, IERC20PermitUpgradea event Issuance( address indexed issuer, address indexed recipient, - uint256 indexed amount, + uint256 amount, uint192 baskets ); @@ -38,7 +38,7 @@ interface IRToken is IComponent, IERC20MetadataUpgradeable, IERC20PermitUpgradea event Redemption( address indexed redeemer, address indexed recipient, - uint256 indexed amount, + uint256 amount, uint192 baskets ); diff --git a/contracts/interfaces/IRewardable.sol b/contracts/interfaces/IRewardable.sol index 90563bad51..48da999850 100644 --- a/contracts/interfaces/IRewardable.sol +++ b/contracts/interfaces/IRewardable.sol @@ -11,7 +11,7 @@ import "./IMain.sol"; */ interface IRewardable { /// Emitted whenever a reward token balance is claimed - event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); + event RewardsClaimed(IERC20 indexed erc20, uint256 amount); /// Claim rewards earned by holding a balance of the ERC20 token /// Must emit `RewardsClaimed` for each token rewards are claimed for diff --git a/contracts/interfaces/IStRSR.sol b/contracts/interfaces/IStRSR.sol index efdb937f32..b0279ef220 100644 --- a/contracts/interfaces/IStRSR.sol +++ b/contracts/interfaces/IStRSR.sol @@ -29,7 +29,7 @@ interface IStRSR is IERC20MetadataUpgradeable, IERC20PermitUpgradeable, ICompone uint256 indexed era, address indexed staker, uint256 rsrAmount, - uint256 indexed stRSRAmount + uint256 stRSRAmount ); /// Emitted when an unstaking is started @@ -83,19 +83,19 @@ interface IStRSR is IERC20MetadataUpgradeable, IERC20PermitUpgradeable, ICompone ); /// Emitted whenever the exchange rate changes - event ExchangeRateSet(uint192 indexed oldVal, uint192 indexed newVal); + event ExchangeRateSet(uint192 oldVal, uint192 newVal); /// Emitted whenever RSR are paids out - event RewardsPaid(uint256 indexed rsrAmt); + event RewardsPaid(uint256 rsrAmt); /// Emitted if all the RSR in the staking pool is seized and all balances are reset to zero. event AllBalancesReset(uint256 indexed newEra); /// Emitted if all the RSR in the unstakin pool is seized, and all ongoing unstaking is voided. event AllUnstakingReset(uint256 indexed newEra); - event UnstakingDelaySet(uint48 indexed oldVal, uint48 indexed newVal); - event RewardRatioSet(uint192 indexed oldVal, uint192 indexed newVal); - event WithdrawalLeakSet(uint192 indexed oldVal, uint192 indexed newVal); + event UnstakingDelaySet(uint48 oldVal, uint48 newVal); + event RewardRatioSet(uint192 oldVal, uint192 newVal); + event WithdrawalLeakSet(uint192 oldVal, uint192 newVal); // Initialization function init( diff --git a/contracts/interfaces/ITrading.sol b/contracts/interfaces/ITrading.sol index 4c40bce0e0..b0bed9bad3 100644 --- a/contracts/interfaces/ITrading.sol +++ b/contracts/interfaces/ITrading.sol @@ -13,8 +13,8 @@ import "./IRewardable.sol"; * @notice Common events and refresher function for all Trading contracts */ interface ITrading is IComponent, IRewardableComponent { - event MaxTradeSlippageSet(uint192 indexed oldVal, uint192 indexed newVal); - event MinTradeVolumeSet(uint192 indexed oldVal, uint192 indexed newVal); + event MaxTradeSlippageSet(uint192 oldVal, uint192 newVal); + event MinTradeVolumeSet(uint192 oldVal, uint192 newVal); /// Emitted when a trade is started /// @param trade The one-time-use trade contract that was just deployed diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 441007d763..387055fc63 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -255,7 +255,10 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 i = 0; i < size; ++i) { CollateralStatus s = assetRegistry.toColl(basket.erc20s[i]).status(); - if (s.worseThan(status_)) status_ = s; + if (s.worseThan(status_)) { + if (s == CollateralStatus.DISABLED) return CollateralStatus.DISABLED; + status_ = s; + } } } diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 4373a9a9bc..ca818f5a14 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -104,6 +104,9 @@ contract DistributorP1 is ComponentP1, IDistributor { Transfer[] memory transfers = new Transfer[](destinations.length()); uint256 numTransfers; + address furnaceAddr = furnace; // gas-saver + address stRSRAddr = stRSR; // gas-saver + for (uint256 i = 0; i < destinations.length(); ++i) { address addrTo = destinations.at(i); @@ -114,9 +117,9 @@ contract DistributorP1 is ComponentP1, IDistributor { uint256 transferAmt = tokensPerShare * numberOfShares; if (addrTo == FURNACE) { - addrTo = furnace; + addrTo = furnaceAddr; } else if (addrTo == ST_RSR) { - addrTo = stRSR; + addrTo = stRSRAddr; } transfers[numTransfers] = Transfer({ diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index dd5b1790a9..77f15bef54 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -183,7 +183,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Refresh == assetRegistry.refresh(); // solhint-disable-next-line no-empty-blocks - try main.furnace().melt() {} catch {} // nice for the redeemer, but not necessary + try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == @@ -255,7 +255,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Refresh == assetRegistry.refresh(); // solhint-disable-next-line no-empty-blocks - try main.furnace().melt() {} catch {} // nice for the redeemer, but not necessary + try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == @@ -399,8 +399,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // Note: These are D18s, even though they are uint256s. This is because // we cannot assume we stay inside our valid range here, as that is what // we are checking in the first place - uint256 low = (FIX_ONE_256 * basketsNeeded) / supply; // D18{BU/rTok} - uint256 high = (FIX_ONE_256 * basketsNeeded + (supply - 1)) / supply; // D18{BU/rTok} + uint256 low = (FIX_ONE_256 * basketsNeeded_) / supply; // D18{BU/rTok} + uint256 high = (FIX_ONE_256 * basketsNeeded_ + (supply - 1)) / supply; // D18{BU/rTok} // here we take advantage of an implicit upcast from uint192 exchange rates require(low >= MIN_EXCHANGE_RATE && high <= MAX_EXCHANGE_RATE, "BU rate out of range"); @@ -426,8 +426,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { /// @return available {qRTok} The maximum redemption that can be performed in the current block function redemptionAvailable() external view returns (uint256 available) { uint256 supply = totalSupply(); - uint256 hourlyLimit = redemptionThrottle.hourlyLimit(supply); - available = redemptionThrottle.currentlyAvailable(hourlyLimit); + available = redemptionThrottle.currentlyAvailable(redemptionThrottle.hourlyLimit(supply)); if (supply < available) available = supply; } @@ -447,6 +446,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { require(params.amtRate <= MAX_THROTTLE_RATE_AMT, "issuance amtRate too big"); require(params.pctRate <= MAX_THROTTLE_PCT_AMT, "issuance pctRate too big"); issuanceThrottle.useAvailable(totalSupply(), 0); + emit IssuanceThrottleSet(issuanceThrottle.params, params); issuanceThrottle.params = params; } @@ -457,6 +457,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { require(params.amtRate <= MAX_THROTTLE_RATE_AMT, "redemption amtRate too big"); require(params.pctRate <= MAX_THROTTLE_PCT_AMT, "redemption pctRate too big"); redemptionThrottle.useAvailable(totalSupply(), 0); + emit RedemptionThrottleSet(redemptionThrottle.params, params); redemptionThrottle.params = params; } diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index 0ade4b65e8..6480d77055 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -76,8 +76,9 @@ library BasketLibP1 { empty(self); uint256 length = other.erc20s.length; for (uint256 i = 0; i < length; ++i) { - self.erc20s.push(other.erc20s[i]); - self.refAmts[other.erc20s[i]] = other.refAmts[other.erc20s[i]]; + IERC20 _erc20 = other.erc20s[i]; // gas-saver + self.erc20s.push(_erc20); + self.refAmts[_erc20] = other.refAmts[_erc20]; } } @@ -165,7 +166,9 @@ library BasketLibP1 { IAssetRegistry assetRegistry ) external returns (bool) { // targetNames := {} - while (targetNames.length() > 0) targetNames.remove(targetNames.at(0)); + while (targetNames.length() > 0) { + targetNames.remove(targetNames.at(targetNames.length() - 1)); + } // newBasket := {} newBasket.empty(); @@ -193,30 +196,28 @@ library BasketLibP1 { for (uint256 i = 0; i < config.erc20s.length; ++i) { // Find collateral's targetName index uint256 targetIndex; + IERC20 _erc20 = config.erc20s[i]; // gas-saver for (targetIndex = 0; targetIndex < targetsLength; ++targetIndex) { - if (targetNames.at(targetIndex) == config.targetNames[config.erc20s[i]]) break; + if (targetNames.at(targetIndex) == config.targetNames[_erc20]) break; } assert(targetIndex < targetsLength); // now, targetNames[targetIndex] == config.targetNames[erc20] // Set basket weights for good, prime collateral, // and accumulate the values of goodWeights and targetWeights - uint192 targetWeight = config.targetAmts[config.erc20s[i]]; + uint192 targetWeight = config.targetAmts[_erc20]; totalWeights[targetIndex] = totalWeights[targetIndex].plus(targetWeight); if ( - goodCollateral( - config.targetNames[config.erc20s[i]], - config.erc20s[i], - assetRegistry - ) && targetWeight.gt(FIX_ZERO) + goodCollateral(config.targetNames[_erc20], _erc20, assetRegistry) && + targetWeight.gt(FIX_ZERO) ) { goodWeights[targetIndex] = goodWeights[targetIndex].plus(targetWeight); newBasket.add( - config.erc20s[i], + _erc20, targetWeight.div( // this div is safe: targetPerRef() > 0: goodCollateral check - assetRegistry.toColl(config.erc20s[i]).targetPerRef(), + assetRegistry.toColl(_erc20).targetPerRef(), CEIL ) ); @@ -237,16 +238,17 @@ library BasketLibP1 { // backup basket for tgt to make up that weight: for (uint256 i = 0; i < targetsLength; ++i) { if (totalWeights[i].lte(goodWeights[i])) continue; // Don't need any backup weight + bytes32 _targetName = targetNames.at(i); // "tgt" = targetNames[i] // Now, unsoundPrimeWt(tgt) > 0 uint256 size = 0; // backup basket size - BackupConfig storage backup = config.backups[targetNames.at(i)]; + BackupConfig storage backup = config.backups[_targetName]; // Find the backup basket size: min(backup.max, # of good backup collateral) for (uint256 j = 0; j < backup.erc20s.length && size < backup.max; ++j) { - if (goodCollateral(targetNames.at(i), backup.erc20s[j], assetRegistry)) size++; + if (goodCollateral(_targetName, backup.erc20s[j], assetRegistry)) size++; } // Now, size = len(backups(tgt)). If empty, fail. @@ -257,17 +259,16 @@ library BasketLibP1 { // Loop: for erc20 in backups(tgt)... for (uint256 j = 0; j < backup.erc20s.length && assigned < size; ++j) { - if (goodCollateral(targetNames.at(i), backup.erc20s[j], assetRegistry)) { + if (goodCollateral(_targetName, backup.erc20s[j], assetRegistry)) { + uint192 backupWeight = totalWeights[i].minus(goodWeights[i]).div( + // this div is safe: targetPerRef > 0: goodCollateral check + assetRegistry.toColl(backup.erc20s[j]).targetPerRef().mulu(size), + CEIL + ); + // Across this .add(), targetWeight(newBasket',erc20) // = targetWeight(newBasket,erc20) + unsoundPrimeWt(tgt) / len(backups(tgt)) - newBasket.add( - backup.erc20s[j], - totalWeights[i].minus(goodWeights[i]).div( - // this div is safe: targetPerRef > 0: goodCollateral check - assetRegistry.toColl(backup.erc20s[j]).targetPerRef().mulu(size), - CEIL - ) - ); + BasketLibP1.add(newBasket, backup.erc20s[j], backupWeight); assigned++; } } diff --git a/contracts/plugins/assets/aave/StaticATokenLM.sol b/contracts/plugins/assets/aave/StaticATokenLM.sol index b24a3c14b5..f6637e1369 100644 --- a/contracts/plugins/assets/aave/StaticATokenLM.sol +++ b/contracts/plugins/assets/aave/StaticATokenLM.sol @@ -39,7 +39,7 @@ contract StaticATokenLM is using RayMathNoRounding for uint256; /// Emitted whenever a reward token balance is claimed - event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); + event RewardsClaimed(IERC20 indexed erc20, uint256 amount); bytes public constant EIP712_REVISION = bytes("1"); bytes32 internal constant EIP712_DOMAIN = diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index aa83bacdf8..fb6b12065a 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -101,7 +101,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { emit OwnershipTransferred(address(0), owner); (address _lptoken, address _token, , address _rewards, , ) = IBooster(convexBooster) - .poolInfo(_poolId); + .poolInfo(_poolId); curveToken = _lptoken; convexToken = _token; convexPool = _rewards; @@ -275,10 +275,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { } } else { reward.claimable_reward[_accounts[u]] = reward - .claimable_reward[_accounts[u]] - .add( - _balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20) - ); + .claimable_reward[_accounts[u]] + .add(_balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20)); } reward.reward_integral_for[_accounts[u]] = reward.reward_integral; } @@ -375,8 +373,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { } uint256 newlyClaimable = _getDepositedBalance(_account) - .mul(I.sub(reward.reward_integral_for[_account])) - .div(1e20); + .mul(I.sub(reward.reward_integral_for[_account])) + .div(1e20); claimable[i].amount = claimable[i].amount.add( reward.claimable_reward[_account].add(newlyClaimable) ); @@ -395,8 +393,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { ); } newlyClaimable = _getDepositedBalance(_account) - .mul(I.sub(reward.reward_integral_for[_account])) - .div(1e20); + .mul(I.sub(reward.reward_integral_for[_account])) + .div(1e20); claimable[CVX_INDEX].amount = CvxMining.ConvertCrvToCvx(newlyClaimable); claimable[CVX_INDEX].token = cvx; } diff --git a/contracts/plugins/mocks/EasyAuction.sol b/contracts/plugins/mocks/EasyAuction.sol index ef52004075..8acf1a9ec9 100644 --- a/contracts/plugins/mocks/EasyAuction.sol +++ b/contracts/plugins/mocks/EasyAuction.sol @@ -336,8 +336,8 @@ contract EasyAuction is Ownable { atStageSolutionSubmission(auctionId) { (, , uint96 auctioneerSellAmount) = auctionData[auctionId] - .initialAuctionOrder - .decodeOrder(); + .initialAuctionOrder + .decodeOrder(); uint256 sumBidAmount = auctionData[auctionId].interimSumBidAmount; bytes32 iterOrder = auctionData[auctionId].interimOrder; @@ -438,7 +438,7 @@ contract EasyAuction is Ownable { // Auction fully filled via partial match of currentOrder uint256 sellAmountClearingOrder = sellAmountOfIter.sub(uncoveredBids); auctionData[auctionId].volumeClearingPriceOrder = sellAmountClearingOrder - .toUint96(); + .toUint96(); currentBidSum = currentBidSum.sub(uncoveredBids); clearingOrder = currentOrder; } else { @@ -474,9 +474,9 @@ contract EasyAuction is Ownable { ); fillVolumeOfAuctioneerOrder = currentBidSum - .mul(fullAuctionedAmount) - .div(minAuctionedBuyAmount) - .toUint96(); + .mul(fullAuctionedAmount) + .div(minAuctionedBuyAmount) + .toUint96(); } } auctionData[auctionId].clearingPriceOrder = clearingOrder; @@ -517,8 +517,8 @@ contract EasyAuction is Ownable { } AuctionData memory auction = auctionData[auctionId]; (, uint96 priceNumerator, uint96 priceDenominator) = auction - .clearingPriceOrder - .decodeOrder(); + .clearingPriceOrder + .decodeOrder(); (uint64 userId, , ) = orders[0].decodeOrder(); bool minFundingThresholdNotReached = auctionData[auctionId].minFundingThresholdNotReached; for (uint256 i = 0; i < orders.length; i++) { @@ -568,8 +568,8 @@ contract EasyAuction is Ownable { } else { //[11] (, uint96 priceNumerator, uint96 priceDenominator) = auctionData[auctionId] - .clearingPriceOrder - .decodeOrder(); + .clearingPriceOrder + .decodeOrder(); uint256 unsettledAuctionTokens = fullAuctionedAmount.sub(fillVolumeOfAuctioneerOrder); uint256 auctioningTokenAmount = unsettledAuctionTokens.add( feeAmount.mul(unsettledAuctionTokens).div(fullAuctionedAmount) diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index 3ce9386c9e..aca54d543c 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -18,10 +18,9 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { // solhint-disable no-empty-blocks - constructor( - CollateralConfig memory config, - uint192 revenueHiding - ) AppreciatingFiatCollateral(config, revenueHiding) {} + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + {} // solhint-enable no-empty-blocks diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index b6373b32a6..002af6b057 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -165,9 +165,14 @@ contract DutchTrade is ITrade { require(sellAmount_ <= sell.balanceOf(address(this)), "unfunded trade"); sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals())); // {sellTok} - startBlock = block.number + 1; // start in the next block - endBlock = startBlock + auctionLength / ONE_BLOCK; // FLOOR, since endBlock is inclusive - endTime = uint48(block.timestamp + ONE_BLOCK * (endBlock - startBlock)); + + uint256 _startBlock = block.number + 1; // start in the next block + startBlock = _startBlock; // gas-saver + + uint256 _endBlock = _startBlock + auctionLength / ONE_BLOCK; // FLOOR; endBlock is inclusive + endBlock = _endBlock; // gas-saver + + endTime = uint48(block.timestamp + ONE_BLOCK * (_endBlock - _startBlock)); // {1} uint192 slippage = _slippage( @@ -177,9 +182,11 @@ contract DutchTrade is ITrade { ); // {buyTok/sellTok} = {UoA/sellTok} * {1} / {UoA/buyTok} - worstPrice = prices.sellLow.mulDiv(FIX_ONE - slippage, prices.buyHigh, FLOOR); - bestPrice = prices.sellHigh.div(prices.buyLow, CEIL); // no additional slippage - assert(worstPrice <= bestPrice); + uint192 _worstPrice = prices.sellLow.mulDiv(FIX_ONE - slippage, prices.buyHigh, FLOOR); + uint192 _bestPrice = prices.sellHigh.div(prices.buyLow, CEIL); // no additional slippage + assert(_worstPrice <= _bestPrice); + worstPrice = _worstPrice; // gas-saver + bestPrice = _bestPrice; // gas-saver } /// Bid for the auction lot at the current price; settling atomically via a callback @@ -196,7 +203,7 @@ contract DutchTrade is ITrade { // Transfer in buy tokens bidder = msg.sender; - buy.safeTransferFrom(bidder, address(this), amountIn); + buy.safeTransferFrom(msg.sender, address(this), amountIn); // status must begin OPEN assert(status == TradeStatus.OPEN); @@ -281,8 +288,10 @@ contract DutchTrade is ITrade { /// @param blockNumber {block} The block number to get price for /// @return {buyTok/sellTok} function _price(uint256 blockNumber) private view returns (uint192) { - require(blockNumber >= startBlock, "auction not started"); - require(blockNumber <= endBlock, "auction over"); + uint256 _startBlock = startBlock; // gas savings + uint256 _endBlock = endBlock; // gas savings + require(blockNumber >= _startBlock, "auction not started"); + require(blockNumber <= _endBlock, "auction over"); /// Price Curve: /// - first 20%: geometrically decrease the price from 1000x the bestPrice to 1.5x it @@ -290,7 +299,7 @@ contract DutchTrade is ITrade { /// - next 50%: linearly decrease the price from bestPrice to worstPrice /// - last 5%: constant at worstPrice - uint192 progression = divuu(blockNumber - startBlock, endBlock - startBlock); // {1} + uint192 progression = divuu(blockNumber - _startBlock, _endBlock - _startBlock); // {1} // Fast geometric decay -- 0%-20% of auction if (progression < TWENTY_PERCENT) { @@ -305,19 +314,21 @@ contract DutchTrade is ITrade { // First linear decay -- 20%-45% of auction // 1.5x -> 1x the bestPrice + uint192 _bestPrice = bestPrice; // gas savings // {buyTok/sellTok} = {buyTok/sellTok} * {1} - uint192 highPrice = bestPrice.mul(ONE_POINT_FIVE, CEIL); + uint192 highPrice = _bestPrice.mul(ONE_POINT_FIVE, CEIL); return highPrice - - (highPrice - bestPrice).mulDiv(progression - TWENTY_PERCENT, TWENTY_FIVE_PERCENT); + (highPrice - _bestPrice).mulDiv(progression - TWENTY_PERCENT, TWENTY_FIVE_PERCENT); } else if (progression < NINETY_FIVE_PERCENT) { // Second linear decay -- 45%-95% of auction // bestPrice -> worstPrice + uint192 _bestPrice = bestPrice; // gas savings // {buyTok/sellTok} = {buyTok/sellTok} * {1} return - bestPrice - - (bestPrice - worstPrice).mulDiv(progression - FORTY_FIVE_PERCENT, FIFTY_PERCENT); + _bestPrice - + (_bestPrice - worstPrice).mulDiv(progression - FORTY_FIVE_PERCENT, FIFTY_PERCENT); } // Constant price -- 95%-100% of auction diff --git a/package.json b/package.json index 79032da344..976df23cc0 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,6 @@ "test:gas": "yarn test:gas:protocol && yarn test:gas:collateral && yarn test:gas:integration", "test:gas:protocol": "REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts", "test:gas:collateral": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", - "test:gas:integration": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/integration/**/*.test.ts", "test:coverage": "PROTO_IMPL=1 hardhat coverage --testfiles 'test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts'", "test:unit:coverage": "PROTO_IMPL=1 SLOW= hardhat coverage --testfiles 'test/*.test.ts test/libraries/*.test.ts test/plugins/*.test.ts'", "eslint": "eslint test/", diff --git a/scripts/addresses/3-tmp-assets-collateral.json b/scripts/addresses/3-tmp-assets-collateral.json index ff5d1dac64..a462576f94 100644 --- a/scripts/addresses/3-tmp-assets-collateral.json +++ b/scripts/addresses/3-tmp-assets-collateral.json @@ -82,4 +82,4 @@ "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704" } -} \ No newline at end of file +} diff --git a/scripts/addresses/3-tmp-deployments.json b/scripts/addresses/3-tmp-deployments.json index 92393dde70..e53597cd9f 100644 --- a/scripts/addresses/3-tmp-deployments.json +++ b/scripts/addresses/3-tmp-deployments.json @@ -32,4 +32,4 @@ "stRSR": "0x5a5eb5d26871e26645bD6d006671ec0887aeca69" } } -} \ No newline at end of file +} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index 6bc493a48c..429eac9944 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -43,7 +43,9 @@ async function main() { /******** Morpho token vaults **************************/ console.log(`Deploying morpho token vaults to network ${hre.network.name} (${chainId}) with burner account: ${deployer.address}`) - const MorphoTokenisedDepositFactory = await ethers.getContractFactory("MorphoAaveV2TokenisedDeposit") + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDeposit' + ) const maUSDT = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, @@ -113,14 +115,10 @@ async function main() { assetCollDeployments.erc20s.maStETH = maStETH.address /******** Morpho collateral **************************/ - const FiatCollateralFactory = await hre.ethers.getContractFactory( - "MorphoFiatCollateral" - ) - const NonFiatCollateralFactory = await hre.ethers.getContractFactory( - "MorphoNonFiatCollateral" - ) + const FiatCollateralFactory = await hre.ethers.getContractFactory('MorphoFiatCollateral') + const NonFiatCollateralFactory = await hre.ethers.getContractFactory('MorphoNonFiatCollateral') const SelfReferentialFactory = await hre.ethers.getContractFactory( - "MorphoSelfReferentialCollateral" + 'MorphoSelfReferentialCollateral' ) const stablesOracleError = fp('0.0025') // 0.25% @@ -129,41 +127,44 @@ async function main() { oracleError: stablesOracleError.toString(), maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr - targetName: ethers.utils.formatBytes32String("USD"), - defaultThreshold: stablesOracleError.add(fp("0.01")), // 1.25% + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: stablesOracleError.add(fp('0.01')), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h } { - const collateral = await FiatCollateralFactory.connect(deployer).deploy({ - ...baseStableConfig, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDT!, - erc20: maUSDT.address, - }, + const collateral = await FiatCollateralFactory.connect(deployer).deploy( + { + ...baseStableConfig, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDT!, + erc20: maUSDT.address, + }, revenueHiding - ); + ) assetCollDeployments.collateral.maUSDT = collateral.address deployedCollateral.push(collateral.address.toString()) } { - const collateral = await FiatCollateralFactory.connect(deployer).deploy({ - ...baseStableConfig, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - erc20: maUSDC.address, - }, + const collateral = await FiatCollateralFactory.connect(deployer).deploy( + { + ...baseStableConfig, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + erc20: maUSDC.address, + }, revenueHiding - ); + ) assetCollDeployments.collateral.maUSDC = collateral.address deployedCollateral.push(collateral.address.toString()) } { - const collateral = await FiatCollateralFactory.connect(deployer).deploy({ - ...baseStableConfig, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI!, - erc20: maDAI.address, - }, + const collateral = await FiatCollateralFactory.connect(deployer).deploy( + { + ...baseStableConfig, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI!, + erc20: maDAI.address, + }, revenueHiding - ); + ) assetCollDeployments.collateral.maDAI = collateral.address deployedCollateral.push(collateral.address.toString()) } @@ -172,39 +173,41 @@ async function main() { const wbtcOracleError = fp('0.02') // 2% const btcOracleError = fp('0.005') // 0.5% const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) - const collateral = await NonFiatCollateralFactory.connect(deployer).deploy({ - priceTimeout: priceTimeout, - oracleError: combinedBTCWBTCError, - maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr - targetName: ethers.utils.formatBytes32String("BTC"), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% - delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, - erc20: maWBTC.address, - }, + const collateral = await NonFiatCollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + oracleError: combinedBTCWBTCError, + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, + erc20: maWBTC.address, + }, revenueHiding, networkConfig[chainId].chainlinkFeeds.wBTCBTC!, - oracleTimeout(chainId, '86400').toString(), // 1 hr - ); + oracleTimeout(chainId, '86400').toString() // 1 hr + ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) } { - const collateral = await SelfReferentialFactory.connect(deployer).deploy({ - priceTimeout: priceTimeout, - oracleError: fp('0.005'), - maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr - targetName: ethers.utils.formatBytes32String("ETH"), - defaultThreshold: fp('0.05'), // 5% - delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, - erc20: maWBTC.address, - }, - revenueHiding, - ); + const collateral = await SelfReferentialFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + oracleError: fp('0.005'), + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.05'), // 5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + erc20: maWBTC.address, + }, + revenueHiding + ) assetCollDeployments.collateral.maWETH = collateral.address deployedCollateral.push(collateral.address.toString()) } @@ -218,21 +221,22 @@ async function main() { // TAR: ETH // REF: stETH // TOK: maETH - const collateral = await NonFiatCollateralFactory.connect(deployer).deploy({ - priceTimeout: priceTimeout, - oracleError: combinedOracleErrors, - maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr - targetName: ethers.utils.formatBytes32String("ETH"), - defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% - delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, - erc20: maStETH.address, - }, + const collateral = await NonFiatCollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + oracleError: combinedOracleErrors, + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + erc20: maStETH.address, + }, revenueHiding, networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} - oracleTimeout(chainId, '86400').toString(), // 1 hr - ); + oracleTimeout(chainId, '86400').toString() // 1 hr + ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) } diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index 4db79d0220..17082bcabc 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -117,4 +117,4 @@ const mintAToken = async ( await underlying.connect(usdtSigner).approve(collateral.address, amount) await collateral.connect(usdtSigner).deposit(recipient, amount, 0, true) }) -} \ No newline at end of file +} diff --git a/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts b/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts index 6b36c96ec1..c5398e5744 100644 --- a/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts +++ b/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts @@ -127,12 +127,13 @@ export default async ( let parsedLog: LogDescription | undefined try { parsedLog = iface.parseLog(event) - } catch { } + } catch {} if (parsedLog && parsedLog.name == 'TradeStarted') { console.log( `\n====== Trade Started: sell ${logToken(parsedLog.args.sell)} / buy ${logToken( parsedLog.args.buy - )} ======\n\tmbuyAmount: ${parsedLog.args.minBuyAmount}\n\tsellAmount: ${parsedLog.args.sellAmount + )} ======\n\tmbuyAmount: ${parsedLog.args.minBuyAmount}\n\tsellAmount: ${ + parsedLog.args.sellAmount }` ) // @@ -187,7 +188,6 @@ export default async ( console.log('Trying again...') } } - }) const lastTimestamp = await getLatestBlockTimestamp(hre) diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index 9c02711719..889471b056 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -1,12 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `259737`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `259526`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `368979`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `368768`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `371094`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `370883`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `373232`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `373021`; exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index cfc4b24738..857bff5b7e 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8367047`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8355533`; -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464633`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464235`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Without governance 1`] = `114895`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index 0ffc6842b6..eb047d1e78 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791756`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791646`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618760`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618650`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `594756`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `593423`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 585e4bef18..f7e606d149 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1390986`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1390775`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1517200`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1516167`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `732257`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `744609`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1685173`; @@ -14,6 +14,6 @@ exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1704814`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1704288`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index c5ac463af2..3b77878520 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -1,27 +1,27 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `165190`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `164974`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165243`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165027`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165243`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165027`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208840`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208624`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229593`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212493`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1034629`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1034418`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `777373`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1188577`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `309815`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `264881`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `743173`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `240675`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 629cb7687c..263e512679 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139830`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; -exports[`StRSRP1 contract Gas Reporting Stake 2`] = `135030`; +exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63409`; diff --git a/test/plugins/__snapshots__/RewardableERC20.test.ts.snap b/test/plugins/__snapshots__/RewardableERC20.test.ts.snap index 3f3231f06b..195b28a702 100644 --- a/test/plugins/__snapshots__/RewardableERC20.test.ts.snap +++ b/test/plugins/__snapshots__/RewardableERC20.test.ts.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Gas Reporting RewardableERC20WrapperTest claimRewards 1`] = `174149`; +exports[`Gas Reporting RewardableERC20WrapperTest claimRewards 1`] = `174078`; -exports[`Gas Reporting RewardableERC20WrapperTest claimRewards 2`] = `105749`; +exports[`Gas Reporting RewardableERC20WrapperTest claimRewards 2`] = `105678`; exports[`Gas Reporting RewardableERC20WrapperTest deposit 1`] = `119303`; @@ -12,9 +12,9 @@ exports[`Gas Reporting RewardableERC20WrapperTest withdraw 1`] = `96090`; exports[`Gas Reporting RewardableERC20WrapperTest withdraw 2`] = `64590`; -exports[`Gas Reporting RewardableERC4626VaultTest claimRewards 1`] = `174118`; +exports[`Gas Reporting RewardableERC4626VaultTest claimRewards 1`] = `174047`; -exports[`Gas Reporting RewardableERC4626VaultTest claimRewards 2`] = `105718`; +exports[`Gas Reporting RewardableERC4626VaultTest claimRewards 2`] = `105647`; exports[`Gas Reporting RewardableERC4626VaultTest deposit 1`] = `121596`; diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 1976652900..62146c7325 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -20,6 +20,6 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() durin exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `93269`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128267`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128341`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `92399`; diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 653af6dc07..00891b0076 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -497,6 +497,8 @@ export default function fn( describe('collateral-specific tests', collateralSpecificStatusTests) describeGas('Gas Reporting', () => { + if (IMPLEMENTATION != Implementation.P1 || !useEnv('REPORT_GAS')) return // hide pending + context('refresh()', () => { afterEach(async () => { await snapshotGasCost(collateral.refresh()) diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 55af313bd8..14aff54151 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -643,6 +643,8 @@ export default function fn( }) describeGas('Gas Reporting', () => { + if (IMPLEMENTATION != Implementation.P1 || !useEnv('REPORT_GAS')) return // hide pending + context('refresh()', () => { afterEach(async () => { await snapshotGasCost(ctx.collateral.refresh()) diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index a6070353d4..7ee5c7dc01 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -212,6 +212,7 @@ const opts = { resetFork, collateralName: 'SDaiCollateral', chainlinkDefaultAnswer, + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index ed9963c4ca..f2f98569c7 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -4,9 +4,9 @@ exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refr exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116663`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140108`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141925`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140108`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `97011`; exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118331`; @@ -20,17 +20,17 @@ exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refr exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140108`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142058`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142132`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140390`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140464`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118523`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116855`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140364`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `142181`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140294`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `97203`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118523`; @@ -44,17 +44,17 @@ exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ref exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140364`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142314`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142388`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140720`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140646`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `126813`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `125145`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149076`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150963`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `149146`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `105493`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `126813`; @@ -68,7 +68,7 @@ exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ref exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `149146`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `151096`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `151026`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `149428`; @@ -76,9 +76,9 @@ exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ref exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `119793`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `143510`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `145257`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `143440`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `100141`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `121461`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index d0562e5cc1..3da2c08a10 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12085685`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12085575`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9838290`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9836953`; -exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2293006`; +exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13276964`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13002663`; exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20658478`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11092473`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11092363`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8827990`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8826653`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `4557434`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `4481356`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `13292502`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `13292858`; From 11aa80b8235689484c84b452c7e1145fcef988d7 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 18 Aug 2023 14:12:11 -0400 Subject: [PATCH 024/450] deployment: overwrite addresses when working with tenderly --- scripts/deployment/phase1-common/0_setup_deployments.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/deployment/phase1-common/0_setup_deployments.ts b/scripts/deployment/phase1-common/0_setup_deployments.ts index 2cd8266bbe..d9c71ff769 100644 --- a/scripts/deployment/phase1-common/0_setup_deployments.ts +++ b/scripts/deployment/phase1-common/0_setup_deployments.ts @@ -17,7 +17,7 @@ async function main() { // Check if deployment file already exists for this chainId const deploymentFilename = getDeploymentFilename(chainId) - if (chainId != '31337' && fileExists(deploymentFilename)) { + if (chainId != '31337' && chainId != '3' && fileExists(deploymentFilename)) { throw new Error(`${deploymentFilename} exists; I won't overwrite it.`) } From bc8a1772a08c3a96ad1ea8b1581d074a47327e5f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 21 Aug 2023 09:02:38 -0400 Subject: [PATCH 025/450] do not stop refreshing prices for DISABLED collateral (#902) --- contracts/plugins/assets/AppreciatingFiatCollateral.sol | 6 ------ contracts/plugins/assets/FiatCollateral.sol | 5 ----- contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol | 6 ------ contracts/plugins/assets/curve/CurveStableCollateral.sol | 6 ------ .../plugins/assets/stargate/StargatePoolFiatCollateral.sol | 2 -- contracts/plugins/mocks/BadCollateralPlugin.sol | 6 ------ 6 files changed, 31 deletions(-) diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 3722b5644d..bf7cef6022 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -75,12 +75,6 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { /// Refresh exchange rates and update default status. /// @dev Should not need to override: can handle collateral with variable refPerTok() function refresh() public virtual override { - if (alreadyDefaulted()) { - // continue to update rates - exposedReferencePrice = _underlyingRefPerTok().mul(revenueShowing); - return; - } - CollateralStatus oldStatus = status(); // Check for hard default diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index d4d1412818..9110117bc5 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -120,7 +120,6 @@ contract FiatCollateral is ICollateral, Asset { /// Refresh exchange rates and update default status. /// @dev May need to override: limited to handling collateral with refPerTok() = 1 function refresh() public virtual override(Asset, IAsset) { - if (alreadyDefaulted()) return; CollateralStatus oldStatus = status(); // Check for soft default + save lotPrice @@ -191,10 +190,6 @@ contract FiatCollateral is ICollateral, Asset { } } - function alreadyDefaulted() internal view returns (bool) { - return _whenDefault <= block.timestamp; - } - function whenDefault() external view returns (uint256) { return _whenDefault; } diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index a4d9e8f625..b9b1e8b233 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -61,12 +61,6 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { function refresh() public virtual override { ICusdcV3Wrapper(address(erc20)).accrue(); - if (alreadyDefaulted()) { - // continue to update rates - exposedReferencePrice = _underlyingRefPerTok().mul(revenueShowing); - return; - } - CollateralStatus oldStatus = status(); // Check for hard default diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index 4a2b0d35ac..22c336cee0 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -72,12 +72,6 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { /// Refresh exchange rates and update default status. /// Have to override to add custom default checks function refresh() public virtual override { - if (alreadyDefaulted()) { - // continue to update rates - exposedReferencePrice = _underlyingRefPerTok().mul(revenueShowing); - return; - } - CollateralStatus oldStatus = status(); // Check for hard default diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 54a7a203fa..8ac8c13e66 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -58,8 +58,6 @@ contract StargatePoolFiatCollateral is FiatCollateral { /// Refresh exchange rates and update default status. /// @dev Should not need to override: can handle collateral with variable refPerTok() function refresh() public virtual override { - if (alreadyDefaulted()) return; - CollateralStatus oldStatus = status(); // Check for hard default diff --git a/contracts/plugins/mocks/BadCollateralPlugin.sol b/contracts/plugins/mocks/BadCollateralPlugin.sol index 2af22a1291..5001542aaf 100644 --- a/contracts/plugins/mocks/BadCollateralPlugin.sol +++ b/contracts/plugins/mocks/BadCollateralPlugin.sol @@ -26,12 +26,6 @@ contract BadCollateralPlugin is ATokenFiatCollateral { /// Refresh exchange rates and update default status. /// @dev Should be general enough to not need to be overridden function refresh() public virtual override { - if (alreadyDefaulted()) { - // continue to update rates - exposedReferencePrice = _underlyingRefPerTok().mul(revenueShowing); - return; - } - CollateralStatus oldStatus = status(); // Check for hard default From 54dde6dc2955e6c6dade1aef7137121474044a78 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 21 Aug 2023 10:11:41 -0400 Subject: [PATCH 026/450] update gas snapshots (#904) --- package.json | 2 +- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Main.test.ts.snap | 2 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 12 +-- test/__snapshots__/Revenues.test.ts.snap | 4 +- test/__snapshots__/ZZStRSR.test.ts.snap | 4 +- .../__snapshots__/Collateral.test.ts.snap | 18 ++-- .../ATokenFiatCollateral.test.ts.snap | 24 ++--- .../AnkrEthCollateralTestSuite.test.ts.snap | 16 ++-- .../CBETHCollateral.test.ts.snap | 16 ++-- .../CTokenFiatCollateral.test.ts.snap | 24 ++--- .../__snapshots__/CometTestSuite.test.ts.snap | 24 ++--- .../CrvStableMetapoolSuite.test.ts.snap | 24 ++--- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 ++--- .../CrvStableTestSuite.test.ts.snap | 24 ++--- .../CrvVolatileTestSuite.test.ts.snap | 24 ++--- .../CvxStableMetapoolSuite.test.ts.snap | 24 ++--- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 ++--- .../CvxStableTestSuite.test.ts.snap | 24 ++--- .../CvxVolatileTestSuite.test.ts.snap | 24 ++--- .../SDaiCollateralTestSuite.test.ts.snap | 24 ++--- .../FTokenFiatCollateral.test.ts.snap | 96 +++++++++---------- .../SFrxEthTestSuite.test.ts.snap | 12 +-- .../LidoStakedEthTestSuite.test.ts.snap | 24 ++--- .../MorphoAAVEFiatCollateral.test.ts.snap | 72 +++++++------- .../MorphoAAVENonFiatCollateral.test.ts.snap | 48 +++++----- ...AAVESelfReferentialCollateral.test.ts.snap | 16 ++-- .../RethCollateralTestSuite.test.ts.snap | 16 ++-- .../StargateETHTestSuite.test.ts.snap | 48 +++++----- .../__snapshots__/MaxBasketSize.test.ts.snap | 16 ++-- 31 files changed, 359 insertions(+), 359 deletions(-) diff --git a/package.json b/package.json index 976df23cc0..1d6413e41f 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "test:plugins:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts", "test:scenario": "PROTO_IMPL=1 hardhat test test/scenario/*.test.ts", - "test:gas": "yarn test:gas:protocol && yarn test:gas:collateral && yarn test:gas:integration", + "test:gas": "yarn test:gas:protocol && yarn test:gas:collateral", "test:gas:protocol": "REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts", "test:gas:collateral": "FORK=1 REPORT_GAS=1 PROTO_IMPL=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", "test:coverage": "PROTO_IMPL=1 hardhat coverage --testfiles 'test/{libraries,plugins,scenario}/*.test.ts test/*.test.ts'", diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 857bff5b7e..1b0751af8d 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8355533`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8354959`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464235`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 40f226bf7b..94907cfd67 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `361898`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `361362`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `196758`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index eb047d1e78..e8e5328dd7 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791646`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791110`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618650`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618114`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `593423`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `592887`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index f7e606d149..d47fb3da07 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1390775`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1407849`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1516167`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1533241`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `744609`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `748681`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1685173`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1702113`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1616603`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1633187`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1704288`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1721584`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 3b77878520..3f423f56a7 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -12,11 +12,11 @@ exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1034418`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1033882`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `777373`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1188577`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1188041`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 263e512679..8604200d7a 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -14,6 +14,6 @@ exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `576204`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `575668`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `530208`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `529672`; diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index 9c98a9ffd2..cedffac69d 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `72844`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `72710`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `73980`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `73846`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `62534`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `62400`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 2`] = `55266`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 2`] = `55132`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 3`] = `54984`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 3`] = `54850`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 4`] = `23429`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 4`] = `54791`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 5`] = `54984`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 5`] = `54850`; -exports[`Collateral contracts Gas Reporting refresh() during SOUND 1`] = `54984`; +exports[`Collateral contracts Gas Reporting refresh() during SOUND 1`] = `54850`; -exports[`Collateral contracts Gas Reporting refresh() during SOUND 2`] = `54984`; +exports[`Collateral contracts Gas Reporting refresh() during SOUND 2`] = `54850`; diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 62146c7325..f02da1ba1a 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `75367`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `75233`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `73699`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `73565`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73922`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73788`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `30918`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `66106`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `75367`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `75233`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `73699`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `73565`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `51728`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91924`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `51728`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91998`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `93195`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `93061`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `93269`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `93135`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128341`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128207`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `92399`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `92265`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index efb00072cb..6faac2e04c 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61342`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61208`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56873`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56739`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `79535`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `79401`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `37508`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `71718`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61342`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61208`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `56873`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `56739`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `71849`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `71715`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `71849`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `71715`; diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index 67c84c6cc5..f086c155bb 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60830`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60696`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56361`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56227`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98131`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `97997`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `36971`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90314`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81946`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81812`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77477`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77343`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90445`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90311`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90445`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90311`; diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index 00de61ac71..f872809ebb 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `120330`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `120196`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `118662`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `118528`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `75058`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `74924`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `31842`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `67242`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `120330`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `120196`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `118662`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `118528`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `96669`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `139517`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `96669`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `139517`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `140788`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `140654`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `140788`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `140654`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175860`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175726`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139992`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139858`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index c760e4bbb0..4f0b595a2d 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `110087`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109932`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `105350`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `105195`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `135455`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `135300`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `70661`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `127617`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `110087`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109932`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `105350`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `105195`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `73461`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107922`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `70661`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `104854`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `127769`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `127614`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `127769`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `127614`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `135320`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `135165`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `128051`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127896`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index 6aaba60bdb..9593a4f3bf 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `82121`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `81987`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77653`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77519`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259238`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259104`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `254222`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `82121`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81987`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77653`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77519`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `77178`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `77178`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254353`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254219`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254353`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254219`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261931`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261797`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254663`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254529`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 2b5d33eea0..7d386b05ce 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `99018`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `98884`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94550`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94416`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232924`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232790`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `227908`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `104078`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `103944`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99610`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99476`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `99135`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `99135`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `228039`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `227905`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `228039`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `227905`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213786`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213652`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206518`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206384`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index ffe45ebe78..8381cbd1f2 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62898`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62764`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58430`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58296`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205141`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205007`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `200125`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62898`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62764`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58430`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58296`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57955`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57955`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200256`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200122`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200256`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200122`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185611`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185477`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178343`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178209`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap index cf655d93a7..99c585e1e6 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65346`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65212`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60878`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60744`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241371`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241237`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `236355`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65346`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65212`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60878`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60744`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `60403`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `60403`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236486`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236352`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236486`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236352`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242740`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242606`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235472`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235338`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 6a295e365d..0959931c42 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `82121`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `81987`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77653`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77519`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259238`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259104`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `254222`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `82121`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81987`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77653`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77519`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `77178`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `77178`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254353`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254219`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254353`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254219`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261931`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261797`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254663`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254529`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index 49b74a184d..1225a8c886 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `99018`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `98884`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94550`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94416`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232924`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232790`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29804`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `227908`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `104078`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `103944`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99610`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99476`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29804`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `99135`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29804`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `99135`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `228039`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `227905`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `228039`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `227905`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213786`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213652`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206518`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206384`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index 53d7c649fe..130ef52bef 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62898`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62764`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58430`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58296`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205141`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205007`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `200125`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62898`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62764`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58430`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58296`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57955`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57955`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200256`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200122`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200256`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200122`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185611`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185477`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178343`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178209`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap index 562706cdba..3c1e73b07a 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65346`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65212`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60878`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60744`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241371`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241237`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `29793`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `236355`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65346`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65212`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60878`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60744`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `29793`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `60403`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `29793`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `60403`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236486`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236352`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236486`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236352`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242740`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242606`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235472`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235338`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index 0d82e1ea60..9202afd768 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117757`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117728`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `109445`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `109311`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `132246`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `132112`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90061`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `124152`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117576`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117442`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `109445`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `109311`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `93388`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `112297`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `90061`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108970`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `124283`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `124149`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `124283`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `124149`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `132111`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131977`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `124565`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `124431`; diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index f2f98569c7..d91ce93686 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -1,97 +1,97 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118331`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118197`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116663`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116529`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141925`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141791`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `97011`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139977`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118331`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118197`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116663`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116529`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `97011`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `116188`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `97011`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `116188`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140108`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139974`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140108`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139974`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142132`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141998`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140464`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140330`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118523`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118389`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116855`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116721`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `142181`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `142047`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `97203`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140233`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118523`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118389`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116855`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116721`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `97203`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `116380`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `97203`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `116380`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140364`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140230`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140364`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140230`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142388`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142254`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140646`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140512`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `126813`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `126679`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `125145`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `125011`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150963`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150829`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `105493`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `149015`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `126813`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `126679`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `125145`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `125011`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `105493`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `124670`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `105493`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `124670`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `149146`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `149012`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `149146`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `149012`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `151026`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150892`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `149428`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `149294`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `121461`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `121327`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `119793`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `119659`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `145257`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `145123`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `100141`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `143379`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `121461`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `121327`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `119793`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `119659`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `100141`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `119318`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `100141`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `119318`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `143510`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `143376`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `143440`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `143306`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `145460`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `145326`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `143792`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `143658`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index 40c07ca09a..61665d768b 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59998`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59864`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55261`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55127`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60698`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60564`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `59029`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58895`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `74794`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `74660`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `74794`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `74660`; diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index 9764e5e036..9514e3f06b 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `89047`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88913`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `84578`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `84444`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `134690`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `134556`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `65149`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `126873`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `89047`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88913`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `84578`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `84444`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `65149`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `84103`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `65149`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `84103`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `127004`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `126870`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `127004`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `126870`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `131755`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `131621`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `127286`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `127152`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 637d4b1476..f3460e5383 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -1,73 +1,73 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135022`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134888`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130553`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130419`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `180391`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `180257`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `111194`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172574`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135022`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134888`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130553`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130419`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `111194`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `130078`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `111194`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `130078`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172705`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172571`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172705`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172571`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `180256`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `180122`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172987`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172853`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135225`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135091`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130756`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130622`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180797`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180663`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `111397`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172980`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135225`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135091`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130756`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130622`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `111397`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `130281`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `111397`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `130281`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `173111`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172977`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `173111`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172977`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180662`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180528`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `173393`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `173259`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134378`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134244`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129909`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129775`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `179103`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178969`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `110550`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `171286`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134378`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134244`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129909`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129775`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `110550`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `129434`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `110550`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `129434`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `171417`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `171283`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `171417`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `171283`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178968`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178834`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171699`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171565`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index fd7e828651..75cc7c2e6a 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -1,49 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134445`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134311`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129976`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129842`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `200486`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `200352`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `110550`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192669`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `184309`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `184175`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `179840`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `179706`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `110550`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `179365`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `110550`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `179365`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192800`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192666`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192800`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192666`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `197551`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `197417`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `193082`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192948`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `168077`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167943`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `163608`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `163474`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239750`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239616`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `144182`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231933`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `223573`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `223439`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `219104`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `218970`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `144182`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `218629`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `144182`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `218629`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `232064`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231930`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `232064`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231930`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `236815`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `236681`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `232346`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `232212`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index a8faf3cbe4..30864ba004 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `202160`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `202026`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197691`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197557`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `218342`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `218208`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `144160`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210525`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `202160`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `202026`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197691`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197557`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210656`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210522`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210656`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210522`; diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap index 35bb6dd12a..66168f0739 100644 --- a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `71915`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `71781`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67446`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67312`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `109216`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `109082`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `48056`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `101399`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `71915`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `71781`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67446`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67312`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `101530`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `101396`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `101530`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `101396`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap index a11f838460..eba13d6f0e 100644 --- a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap @@ -1,49 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56267`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56133`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51799`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51665`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `69964`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `69830`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `23429`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `67216`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56267`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56133`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51799`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51665`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `23429`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `51324`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `23429`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `51324`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `67225`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `67091`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `67225`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `67091`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74775`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74641`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67507`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67373`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56267`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56133`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51799`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51665`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `69964`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `69830`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `23429`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `67216`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56267`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56133`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51799`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51665`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `23429`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `51324`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `23429`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `51324`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `67225`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `67091`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `67225`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `67091`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74775`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74641`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67507`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67373`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 3da2c08a10..f7ca06c407 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12085575`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12071639`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9836953`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9810015`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13002663`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13596421`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20658478`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21212846`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11092363`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11078427`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8826653`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8799715`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `4481356`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6630749`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `13292858`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15560638`; From 5d551f4baee4fe01fa5c1d646590ef698e67f5b9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 21 Aug 2023 11:55:54 -0400 Subject: [PATCH 027/450] Single price (#900) --- CHANGELOG.md | 22 ++ contracts/facade/FacadeAct.sol | 6 +- contracts/interfaces/IAsset.sol | 15 +- contracts/interfaces/IBasketHandler.sol | 7 +- contracts/interfaces/IBroker.sol | 2 +- contracts/p0/BasketHandler.sol | 21 +- contracts/p0/Broker.sol | 11 + contracts/p0/RevenueTrader.sol | 4 +- contracts/p0/mixins/TradingLib.sol | 53 +++-- contracts/p1/BasketHandler.sol | 22 +- contracts/p1/Broker.sol | 27 ++- contracts/p1/RevenueTrader.sol | 4 +- .../p1/mixins/RecollateralizationLib.sol | 79 ++++---- contracts/p1/mixins/Trading.sol | 2 +- contracts/plugins/assets/Asset.sol | 55 +++-- contracts/plugins/assets/FiatCollateral.sol | 2 +- contracts/plugins/assets/RTokenAsset.sol | 25 +-- docs/collateral.md | 24 +-- docs/deployment.md | 2 +- docs/recollateralization.md | 16 +- scripts/confirmation/1_confirm_assets.ts | 39 ++-- test/Broker.test.ts | 21 +- test/Facade.test.ts | 19 +- test/Main.test.ts | 48 +---- test/Recollateralization.test.ts | 11 +- test/Revenues.test.ts | 6 +- test/__snapshots__/Broker.test.ts.snap | 6 +- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Main.test.ts.snap | 8 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 12 +- test/__snapshots__/Revenues.test.ts.snap | 8 +- test/__snapshots__/ZZStRSR.test.ts.snap | 8 +- test/integration/AssetPlugins.test.ts | 18 +- test/plugins/Asset.test.ts | 188 +++++++++--------- test/plugins/Collateral.test.ts | 88 +++++--- .../__snapshots__/Collateral.test.ts.snap | 8 +- .../aave/ATokenFiatCollateral.test.ts | 23 ++- .../ATokenFiatCollateral.test.ts.snap | 24 +-- .../AnkrEthCollateralTestSuite.test.ts.snap | 16 +- .../CBETHCollateral.test.ts.snap | 16 +- .../individual-collateral/collateralTests.ts | 61 +++--- .../compoundv2/CTokenFiatCollateral.test.ts | 23 ++- .../CTokenFiatCollateral.test.ts.snap | 24 +-- .../__snapshots__/CometTestSuite.test.ts.snap | 24 +-- .../curve/collateralTests.ts | 43 ++-- .../CrvStableMetapoolSuite.test.ts.snap | 24 +-- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +-- .../CrvStableTestSuite.test.ts.snap | 24 +-- .../CrvVolatileTestSuite.test.ts.snap | 24 +-- .../CvxStableMetapoolSuite.test.ts.snap | 24 +-- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +-- .../CvxStableTestSuite.test.ts.snap | 24 +-- .../CvxVolatileTestSuite.test.ts.snap | 24 +-- .../SDaiCollateralTestSuite.test.ts.snap | 24 +-- .../FTokenFiatCollateral.test.ts.snap | 96 ++++----- .../SFrxEthTestSuite.test.ts.snap | 12 +- .../LidoStakedEthTestSuite.test.ts.snap | 24 +-- .../MorphoAAVEFiatCollateral.test.ts.snap | 72 +++---- .../MorphoAAVENonFiatCollateral.test.ts.snap | 48 ++--- ...AAVESelfReferentialCollateral.test.ts.snap | 16 +- .../RethCollateralTestSuite.test.ts.snap | 16 +- test/scenario/ComplexBasket.test.ts | 8 +- .../__snapshots__/MaxBasketSize.test.ts.snap | 14 +- 64 files changed, 834 insertions(+), 837 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 163413e8af..2c799ae6f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,27 @@ # Changelog +# 3.1.0 - Unreleased + +### Upgrade Steps -- Required + +Upgrade `BackingManager`, `Broker`, and _all_ assets + +Then call `Broker.cacheComponents()`. + +### Core Protocol Contracts + +- `BackingManager` + - Replace use of `lotPrice()` with `price()` +- `Broker` [+1 slot] + - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` + +## Plugins + +### Assets + +- Remove `lotPrice()` +- Alter `price().high` to decay upwards to 3x over the price timeout + # 3.0.0 - Unreleased ### Upgrade Steps diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 7c6d952a8c..823edd2546 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -113,11 +113,11 @@ contract FacadeAct is IFacadeAct, Multicall { } surpluses[i] = erc20s[i].balanceOf(address(revenueTrader)); - (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} - if (lotLow == 0) continue; + (uint192 low, ) = reg.assets[i].price(); // {UoA/tok} + if (low == 0) continue; // {qTok} = {UoA} / {UoA/tok} - minTradeAmounts[i] = minTradeVolume.safeDiv(lotLow, FLOOR).shiftl_toUint( + minTradeAmounts[i] = minTradeVolume.safeDiv(low, FLOOR).shiftl_toUint( int8(reg.assets[i].erc20Decimals()) ); diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index bd796190a7..b5423ab2b5 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -27,16 +27,11 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert + /// low should be nonzero if the asset could be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192); @@ -67,8 +62,14 @@ interface TestIAsset is IAsset { /// @return {s} Seconds that an oracle value is considered valid function oracleTimeout() external view returns (uint48); - /// @return {s} Seconds that the lotPrice should decay over, after stale price + /// @return {s} Seconds that the price().low should decay over, after stale price function priceTimeout() external view returns (uint48); + + /// @return {UoA/tok} The last saved low price + function savedLowPrice() external view returns (uint192); + + /// @return {UoA/tok} The last saved high price + function savedHighPrice() external view returns (uint192); } /// CollateralStatus must obey a linear ordering. That is: diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index 42bb8bf092..e43cf6735f 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -133,16 +133,11 @@ interface IBasketHandler is IComponent { function basketsHeldBy(address account) external view returns (BasketRange memory); /// Should not revert + /// low should be nonzero when BUs are worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); - /// Should not revert - /// lotLow should be nonzero if a BU could be worth selling - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - /// @return timestamp The timestamp at which the basket was last set function timestamp() external view returns (uint48); diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index 0c83eb9216..cecaf8d7b0 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -11,7 +11,7 @@ enum TradeKind { BATCH_AUCTION } -/// Cache of all (lot) prices for a pair to prevent re-lookup +/// Cache of all prices for a pair to prevent re-lookup struct TradePrices { uint192 sellLow; // {UoA/sellTok} can be 0 uint192 sellHigh; // {UoA/sellTok} should not be 0 diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 357b0a7251..7cec1d292d 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -368,26 +368,11 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } /// Should not revert + /// low should be nonzero when the asset might be worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) function price() external view returns (uint192 low, uint192 high) { - return _price(false); - } - - /// Should not revert - /// lowLow should be nonzero when the asset might be worth selling - /// @return lotLow {UoA/BU} The lower end of the lot price estimate - /// @return lotHigh {UoA/BU} The upper end of the lot price estimate - // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - return _price(true); - } - - /// Returns the price of a BU, using the lot prices if `useLotPrice` is true - /// @return low {UoA/BU} The lower end of the lot price estimate - /// @return high {UoA/BU} The upper end of the lot price estimate - function _price(bool useLotPrice) internal view returns (uint192 low, uint192 high) { IAssetRegistry reg = main.assetRegistry(); uint256 low256; @@ -397,9 +382,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint192 qty = quantity(basket.erc20s[i]); if (qty == 0) continue; - (uint192 lowP, uint192 highP) = useLotPrice - ? reg.toAsset(basket.erc20s[i]).lotPrice() - : reg.toAsset(basket.erc20s[i]).price(); + (uint192 lowP, uint192 highP) = reg.toAsset(basket.erc20s[i]).price(); low256 += qty.safeMul(lowP, RoundingMode.FLOOR); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 41584907d2..51619620ed 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -224,6 +224,11 @@ contract BrokerP0 is ComponentP0, IBroker { "dutch auctions disabled for token pair" ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); + require( + priceIsCurrent(req.sell) && priceIsCurrent(req.buy), + "dutch auctions require live prices" + ); + DutchTrade trade = DutchTrade(Clones.clone(address(dutchTradeImplementation))); trades[address(trade)] = true; @@ -248,4 +253,10 @@ contract BrokerP0 is ComponentP0, IBroker { emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); dutchTradeDisabled[erc20] = disabled; } + + /// @return true if the price is current, or it's the RTokenAsset + function priceIsCurrent(IAsset asset) private view returns (bool) { + return + asset.lastSave() == block.timestamp || address(asset.erc20()) == address(main.rToken()); + } } diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 2f380927fe..1d47a5e494 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -83,7 +83,7 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { main.assetRegistry().refresh(); IAsset assetToBuy = main.assetRegistry().toAsset(tokenToBuy); - (uint192 buyLow, uint192 buyHigh) = assetToBuy.lotPrice(); // {UoA/tok} + (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); // For each ERC20: start auction of given kind @@ -99,7 +99,7 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { require(address(trades[erc20]) == address(0), "trade open"); require(erc20.balanceOf(address(this)) > 0, "0 balance"); - (uint192 sellLow, uint192 sellHigh) = assetToSell.lotPrice(); // {UoA/tok} + (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} TradingLibP0.TradeInfo memory trade = TradingLibP0.TradeInfo({ sell: assetToSell, diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index a71df6c027..d8638e915f 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -274,7 +274,7 @@ library TradingLibP0 { view returns (BasketRange memory range) { - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.lotPrice(); // {UoA/BU} + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} // Cap ctx.basketsHeld.top if (ctx.basketsHeld.top > ctx.rToken.basketsNeeded()) { @@ -303,21 +303,14 @@ library TradingLibP0 { bal = bal.plus(asset.bal(address(ctx.stRSR))); } - { - // Skip over dust-balance assets not in the basket - (uint192 lotLow, ) = asset.lotPrice(); // {UoA/tok} - - // Intentionally include value of IFFY/DISABLED collateral - if ( - ctx.bh.quantity(erc20s[i]) == 0 && - !isEnoughToSell(asset, bal, lotLow, ctx.minTradeVolume) - ) continue; - } - (uint192 low, uint192 high) = asset.price(); // {UoA/tok} - // price() is better than lotPrice() here: it's important to not underestimate how - // much value could be in a token that is unpriced by using a decaying high lotPrice. - // price() will return [0, FIX_MAX] in this case, which is preferable. + + // Skip over dust-balance assets not in the basket + // Intentionally include value of IFFY/DISABLED collateral + if ( + ctx.bh.quantity(erc20s[i]) == 0 && + !isEnoughToSell(asset, bal, low, ctx.minTradeVolume) + ) continue; // throughout these sections +/- is same as Fix.plus/Fix.minus and is Fix.gt/.lt @@ -354,7 +347,7 @@ library TradingLibP0 { // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price (lotLow, technically), + // A: Our use of isEnoughToSell always uses the low price (low, technically), // so min trade volumes are always assesed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up @@ -453,19 +446,19 @@ library TradingLibP0 { // {tok} = {BU} * {tok/BU} uint192 needed = range.top.mul(ctx.bh.quantity(erc20s[i]), CEIL); // {tok} if (bal.gt(needed)) { - (uint192 lotLow, uint192 lotHigh) = asset.lotPrice(); // {UoA/sellTok} - if (lotHigh == 0) continue; // Skip worthless assets + (uint192 low, uint192 high) = asset.price(); // {UoA/sellTok} + if (high == 0) continue; // Skip worthless assets // by calculating this early we can duck the stack limit but be less gas-efficient bool enoughToSell = isEnoughToSell( asset, bal.minus(needed), - lotLow, + low, ctx.minTradeVolume ); // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = bal.minus(needed).mul(lotLow, FLOOR); + uint192 delta = bal.minus(needed).mul(low, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -476,8 +469,8 @@ library TradingLibP0 { if (isBetterSurplus(maxes, status, delta) && enoughToSell) { trade.sell = asset; trade.sellAmount = bal.minus(needed); - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; maxes.surplusStatus = status; maxes.surplus = delta; @@ -487,17 +480,17 @@ library TradingLibP0 { needed = range.bottom.mul(ctx.bh.quantity(erc20s[i]), CEIL); // {buyTok}; if (bal.lt(needed)) { uint192 amtShort = needed.minus(bal); // {buyTok} - (uint192 lotLow, uint192 lotHigh) = asset.lotPrice(); // {UoA/buyTok} + (uint192 low, uint192 high) = asset.price(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} - uint192 delta = amtShort.mul(lotHigh, CEIL); + uint192 delta = amtShort.mul(high, CEIL); // The best asset to buy is whichever asset has the largest deficit if (delta.gt(maxes.deficit)) { trade.buy = ICollateral(address(asset)); trade.buyAmount = amtShort; - trade.prices.buyLow = lotLow; - trade.prices.buyHigh = lotHigh; + trade.prices.buyLow = low; + trade.prices.buyHigh = high; maxes.deficit = delta; } @@ -512,13 +505,13 @@ library TradingLibP0 { uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( rsrAsset.bal(address(ctx.stRSR)) ); - (uint192 lotLow, uint192 lotHigh) = rsrAsset.lotPrice(); // {UoA/RSR} + (uint192 low, uint192 high) = rsrAsset.price(); // {UoA/RSR} - if (lotHigh > 0 && isEnoughToSell(rsrAsset, rsrAvailable, lotLow, ctx.minTradeVolume)) { + if (high > 0 && isEnoughToSell(rsrAsset, rsrAvailable, low, ctx.minTradeVolume)) { trade.sell = rsrAsset; trade.sellAmount = rsrAvailable; - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; } } } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 387055fc63..03bce5b6c1 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -309,27 +309,11 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } /// Should not revert + /// low should be nonzero when BUs are worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) function price() external view returns (uint192 low, uint192 high) { - return _price(false); - } - - /// Should not revert - /// lowLow should be nonzero when the asset might be worth selling - /// @return lotLow {UoA/BU} The lower end of the lot price estimate - /// @return lotHigh {UoA/BU} The upper end of the lot price estimate - // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - return _price(true); - } - - /// Returns the price of a BU, using the lot prices if `useLotPrice` is true - /// @param useLotPrice Whether to use lotPrice() or price() - /// @return low {UoA/BU} The lower end of the price estimate - /// @return high {UoA/BU} The upper end of the price estimate - function _price(bool useLotPrice) internal view returns (uint192 low, uint192 high) { uint256 low256; uint256 high256; @@ -338,9 +322,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 qty = quantity(basket.erc20s[i]); if (qty == 0) continue; - (uint192 lowP, uint192 highP) = useLotPrice - ? assetRegistry.toAsset(basket.erc20s[i]).lotPrice() - : assetRegistry.toAsset(basket.erc20s[i]).price(); + (uint192 lowP, uint192 highP) = assetRegistry.toAsset(basket.erc20s[i]).price(); low256 += qty.safeMul(lowP, RoundingMode.FLOOR); diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 98e52120e4..2cf4600878 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -62,6 +62,10 @@ contract BrokerP1 is ComponentP1, IBroker { // Whether Dutch Auctions are currently disabled, per ERC20 mapping(IERC20Metadata => bool) public dutchTradeDisabled; + // === 3.1.0 === + + IRToken private rToken; + // ==== Invariant ==== // (trades[addr] == true) iff this contract has created an ITrade clone at addr @@ -80,10 +84,7 @@ contract BrokerP1 is ComponentP1, IBroker { uint48 dutchAuctionLength_ ) external initializer { __Component_init(main_); - - backingManager = main_.backingManager(); - rsrTrader = main_.rsrTrader(); - rTokenTrader = main_.rTokenTrader(); + cacheComponents(); setGnosis(gnosis_); setBatchTradeImplementation(batchTradeImplementation_); @@ -92,6 +93,14 @@ contract BrokerP1 is ComponentP1, IBroker { setDutchAuctionLength(dutchAuctionLength_); } + /// Call after upgrade to >= 3.1.0 + function cacheComponents() public { + backingManager = main.backingManager(); + rsrTrader = main.rsrTrader(); + rTokenTrader = main.rTokenTrader(); + rToken = main.rToken(); + } + /// Handle a trade request by deploying a customized disposable trading contract /// @param kind TradeKind.DUTCH_AUCTION or TradeKind.BATCH_AUCTION /// @dev Requires setting an allowance in advance @@ -252,6 +261,11 @@ contract BrokerP1 is ComponentP1, IBroker { "dutch auctions disabled for token pair" ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); + require( + priceIsCurrent(req.sell) && priceIsCurrent(req.buy), + "dutch auctions require live prices" + ); + DutchTrade trade = DutchTrade(address(dutchTradeImplementation).clone()); trades[address(trade)] = true; @@ -266,6 +280,11 @@ contract BrokerP1 is ComponentP1, IBroker { return trade; } + /// @return true if the price is current, or it's the RTokenAsset + function priceIsCurrent(IAsset asset) private view returns (bool) { + return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(rToken); + } + /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index fe7b409b50..1065fb96e7 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -135,7 +135,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { } // Cache and validate buyHigh - (uint192 buyLow, uint192 buyHigh) = assetToBuy.lotPrice(); // {UoA/tok} + (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); // For each ERC20 that isn't the tokenToBuy, start an auction of the given kind @@ -147,7 +147,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { require(erc20.balanceOf(address(this)) > 0, "0 balance"); IAsset assetToSell = assetRegistry.toAsset(erc20); - (uint192 sellLow, uint192 sellHigh) = assetToSell.lotPrice(); // {UoA/tok} + (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} TradeInfo memory trade = TradeInfo({ sell: assetToSell, diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index dd86e45ca1..c6eff7ff4f 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -11,7 +11,7 @@ import "./TradeLib.sol"; /// Struct purposes: /// 1. Configure trading /// 2. Stay under stack limit with fewer vars -/// 3. Cache information such as component addresses to save on gas +/// 3. Cache information such as component addresses and basket quantities, to save on gas struct TradingContext { BasketRange basketsHeld; // {BU} // basketsHeld.top is the number of partial baskets units held @@ -80,7 +80,7 @@ library RecollateralizationLibP1 { ctx.minTradeVolume = bm.minTradeVolume(); ctx.maxTradeSlippage = bm.maxTradeSlippage(); - // Calculate quantities + // Cache quantities Registry memory reg = ctx.ar.getRegistry(); ctx.quantities = new uint192[](reg.erc20s.length); for (uint256 i = 0; i < reg.erc20s.length; ++i) { @@ -90,6 +90,7 @@ library RecollateralizationLibP1 { // ============================ // Compute a target basket range for trading - {BU} + // The basket range is the full range of projected outcomes for the rebalancing process BasketRange memory range = basketRange(ctx, reg); // Select a pair to trade next, if one exists @@ -129,7 +130,8 @@ library RecollateralizationLibP1 { // Compute the target basket range // Algorithm intuition: Trade conservatively. Quantify uncertainty based on the proportion of // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty - // the largest amount possible with each trade. + // the largest amount possible with each trade. As long as trades clear within the expected + // range of prices, the basket range should narrow with each iteration (under constant prices) // // How do we know this algorithm converges? // Assumption: constant oracle prices; monotonically increasing refPerTok() @@ -141,12 +143,12 @@ library RecollateralizationLibP1 { // run-to-run, but will never increase it // // Preconditions: - // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top - // - reg contains erc20 + asset + quantities arrays in same order and without duplicates + // - ctx is correctly populated, with current basketsHeld + quantities + // - reg contains erc20 + asset arrays in same order and without duplicates // Trading Strategy: // - We will not aim to hold more than rToken.basketsNeeded() BUs - // - No double trades: if we buy B in one trade, we won't sell B in another trade - // Caveat: Unless the asset we're selling is IFFY/DISABLED + // - No double trades: capital converted from token A to token B should not go to token C + // unless the clearing price was outside the expected price range // - The best price we might get for a trade is at the high sell price and low buy price // - The worst price we might get for a trade is at the low sell price and // the high buy price, multiplied by ( 1 - maxTradeSlippage ) @@ -164,7 +166,9 @@ library RecollateralizationLibP1 { view returns (BasketRange memory range) { - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.lotPrice(); // {UoA/BU} + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} + require(buPriceLow > 0 && buPriceHigh < FIX_MAX, "BUs unpriced"); + uint192 basketsNeeded = ctx.rToken.basketsNeeded(); // {BU} // Cap ctx.basketsHeld.top @@ -196,21 +200,17 @@ library RecollateralizationLibP1 { bal = bal.plus(reg.assets[i].bal(address(ctx.stRSR))); } - if (ctx.quantities[i] == 0) { - // Skip over dust-balance assets not in the basket - (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} - // Intentionally include value of IFFY/DISABLED collateral - if (!TradeLib.isEnoughToSell(reg.assets[i], bal, lotLow, ctx.minTradeVolume)) { - continue; - } + // Skip over dust-balance assets not in the basket + // Intentionally include value of IFFY/DISABLED collateral + if ( + ctx.quantities[i] == 0 && + !TradeLib.isEnoughToSell(reg.assets[i], bal, low, ctx.minTradeVolume) + ) { + continue; } - (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} - // price() is better than lotPrice() here: it's important to not underestimate how - // much value could be in a token that is unpriced by using a decaying high lotPrice. - // price() will return [0, FIX_MAX] in this case, which is preferable. - // throughout these sections +/- is same as Fix.plus/Fix.minus and is Fix.gt/.lt // deltaTop: optimistic case @@ -246,8 +246,8 @@ library RecollateralizationLibP1 { // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price (lotLow, technically), - // so min trade volumes are always assesed based on low prices. At this point + // A: Our use of isEnoughToSell always uses the low price, + // so min trade volumes are always assessed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up // to straightforwardly deduct the minTradeVolume before trying to buy BUs. @@ -305,9 +305,9 @@ library RecollateralizationLibP1 { /// prices.buyLow {UoA/buyTok} The best-case price of the buy token on secondary markets /// prices.buyHigh {UoA/buyTok} The worst-case price of the buy token on secondary markets /// - // Defining "sell" and "buy": - // If bal(e) > (quantity(e) * range.top), then e is in surplus by the difference - // If bal(e) < (quantity(e) * range.bottom), then e is in deficit by the difference + // For each asset e: + // If bal(e) > (quantity(e) * range.top), then e is in surplus by the difference + // If bal(e) < (quantity(e) * range.bottom), then e is in deficit by the difference // // First, ignoring RSR: // `trade.sell` is the token from erc20s with the greatest surplus value (in UoA), @@ -345,11 +345,11 @@ library RecollateralizationLibP1 { uint192 needed = range.top.mul(ctx.quantities[i], CEIL); // {tok} if (bal.gt(needed)) { - (uint192 lotLow, uint192 lotHigh) = reg.assets[i].lotPrice(); // {UoA/sellTok} - if (lotHigh == 0) continue; // skip over worthless assets + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/sellTok} + if (high == 0) continue; // skip over worthless assets // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = bal.minus(needed).mul(lotLow, FLOOR); + uint192 delta = bal.minus(needed).mul(low, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -364,14 +364,14 @@ library RecollateralizationLibP1 { TradeLib.isEnoughToSell( reg.assets[i], bal.minus(needed), - lotLow, + low, ctx.minTradeVolume ) ) { trade.sell = reg.assets[i]; trade.sellAmount = bal.minus(needed); - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; maxes.surplusStatus = status; maxes.surplus = delta; @@ -382,17 +382,17 @@ library RecollateralizationLibP1 { if (bal.lt(needed)) { uint192 amtShort = needed.minus(bal); // {buyTok} - (uint192 lotLow, uint192 lotHigh) = reg.assets[i].lotPrice(); // {UoA/buyTok} + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} - uint192 delta = amtShort.mul(lotHigh, CEIL); + uint192 delta = amtShort.mul(high, CEIL); // The best asset to buy is whichever asset has the largest deficit if (delta.gt(maxes.deficit)) { trade.buy = reg.assets[i]; trade.buyAmount = amtShort; - trade.prices.buyLow = lotLow; - trade.prices.buyHigh = lotHigh; + trade.prices.buyLow = low; + trade.prices.buyHigh = high; maxes.deficit = delta; } @@ -407,16 +407,15 @@ library RecollateralizationLibP1 { uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( rsrAsset.bal(address(ctx.stRSR)) ); - (uint192 lotLow, uint192 lotHigh) = rsrAsset.lotPrice(); // {UoA/RSR} + (uint192 low, uint192 high) = rsrAsset.price(); // {UoA/RSR} if ( - lotHigh > 0 && - TradeLib.isEnoughToSell(rsrAsset, rsrAvailable, lotLow, ctx.minTradeVolume) + high > 0 && TradeLib.isEnoughToSell(rsrAsset, rsrAvailable, low, ctx.minTradeVolume) ) { trade.sell = rsrAsset; trade.sellAmount = rsrAvailable; - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; } } } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 863f7ab113..387bf2d7f2 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -118,7 +118,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl TradePrices memory prices ) internal returns (ITrade trade) { IERC20 sell = req.sell.erc20(); - assert(address(trades[sell]) == address(0)); + assert(address(trades[sell]) == address(0)); // ensure calling class has checked this IERC20Upgradeable(address(sell)).safeApprove(address(broker), 0); IERC20Upgradeable(address(sell)).safeApprove(address(broker), req.sellAmount); diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index ba6908c8a8..a254f390ce 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -11,6 +11,8 @@ contract Asset is IAsset, VersionedAsset { using FixLib for uint192; using OracleLib for AggregatorV3Interface; + uint192 public constant MAX_HIGH_PRICE_BUFFER = 2 * FIX_ONE; // {UoA/tok} 200% + AggregatorV3Interface public immutable chainlinkFeed; // {UoA/tok} IERC20Metadata public immutable erc20; @@ -106,54 +108,45 @@ contract Asset is IAsset, VersionedAsset { } /// Should not revert + /// low should be nonzero if the asset could be worth selling /// @dev Should be general enough to not need to be overridden - /// @return {UoA/tok} The lower end of the price estimate - /// @return {UoA/tok} The upper end of the price estimate - function price() public view virtual returns (uint192, uint192) { - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - assert(low <= high); - return (low, high); - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return (0, FIX_MAX); - } - } - - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @dev Should be general enough to not need to be overridden - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + /// @return _low {UoA/tok} The lower end of the price estimate + /// @return _high {UoA/tok} The upper end of the price estimate + function price() public view virtual returns (uint192 _low, uint192 _high) { try this.tryPrice() returns (uint192 low, uint192 high, uint192) { // if the price feed is still functioning, use that - lotLow = low; - lotHigh = high; + _low = low; + _high = high; } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - // if the price feed is broken, use a decayed historical value + // if the price feed is broken, decay _low downwards and _high upwards uint48 delta = uint48(block.timestamp) - lastSave; // {s} if (delta <= oracleTimeout) { - lotLow = savedLowPrice; - lotHigh = savedHighPrice; + // use saved prices for at least the oracleTimeout + _low = savedLowPrice; + _high = savedHighPrice; } else if (delta >= oracleTimeout + priceTimeout) { - return (0, 0); // no price after full timeout + // use unpriced after a full timeout, incase 3x was not enough + return (0, FIX_MAX); } else { // oracleTimeout <= delta <= oracleTimeout + priceTimeout - // {1} = {s} / {s} - uint192 lotMultiplier = divuu(oracleTimeout + priceTimeout - delta, priceTimeout); - + // Decay _low downwards from savedLowPrice to 0 // {UoA/tok} = {UoA/tok} * {1} - lotLow = savedLowPrice.mul(lotMultiplier); - lotHigh = savedHighPrice.mul(lotMultiplier); + _low = savedLowPrice.muluDivu(oracleTimeout + priceTimeout - delta, priceTimeout); + + // Decay _high upwards to 3x savedHighPrice + _high = savedHighPrice.plus( + savedHighPrice.mul( + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout) + ) + ); } } - assert(lotLow <= lotHigh); + assert(_low <= _high); } /// @return {tok} The balance of the ERC20 in whole tokens diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index 9110117bc5..ac6e4576bd 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -122,7 +122,7 @@ contract FiatCollateral is ICollateral, Asset { function refresh() public virtual override(Asset, IAsset) { CollateralStatus oldStatus = status(); - // Check for soft default + save lotPrice + // Check for soft default + save price try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {target/ref} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index fd8c78fa24..0f30067a3f 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -73,7 +73,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-disable no-empty-blocks function refresh() public virtual override { - // No need to save lastPrice; can piggyback off the backing collateral's lotPrice() + // No need to save lastPrice; can piggyback off the backing collateral's saved prices cachedOracleData.cachedAtTime = 0; // force oracle refresh } @@ -93,27 +93,6 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { } } - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - (uint192 buLow, uint192 buHigh) = basketHandler.lotPrice(); // {UoA/BU} - - // Here we take advantage of the fact that we know RToken has 18 decimals - // to convert between uint256 an uint192. Fits due to assumed max totalSupply. - uint192 supply = _safeWrap(IRToken(address(erc20)).totalSupply()); - - if (supply == 0) return (buLow, buHigh); - - BasketRange memory range = basketRange(); // {BU} - - // {UoA/tok} = {BU} * {UoA/BU} / {tok} - lotLow = range.bottom.mulDiv(buLow, supply, FLOOR); - lotHigh = range.top.mulDiv(buHigh, supply, CEIL); - assert(lotLow <= lotHigh); // not obviously true - } - /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192) { // The RToken has 18 decimals, so there's no reason to waste gas here doing a shiftl_toFix @@ -174,7 +153,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { ); } - /// Computationally expensive basketRange calculation; used in price() & lotPrice() + /// Computationally expensive basketRange calculation; used in price() function basketRange() private view returns (BasketRange memory range) { BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(backingManager)); uint192 basketsNeeded = IRToken(address(erc20)).basketsNeeded(); // {BU} diff --git a/docs/collateral.md b/docs/collateral.md index aa4fe491cd..ea48f8f023 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -55,16 +55,11 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert + /// low should be nonzero when the asset might be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192); @@ -79,6 +74,9 @@ interface IAsset is IRewardable { /// @param {UoA} The max trade volume, in UoA function maxTradeVolume() external view returns (uint192); + + /// @return {s} The timestamp of the last refresh() that saved prices + function lastSave() external view returns (uint48); } /// CollateralStatus must obey a linear ordering. That is: @@ -317,7 +315,7 @@ The same wrapper approach is easily used to tokenize positions in protocols that Because it’s called at the beginning of many transactions, `refresh()` should never revert. If `refresh()` encounters a critical error, it should change the Collateral contract’s state so that `status()` becomes `DISABLED`. -To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`lotPrice()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. +To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. ### The `IFFY` status should be temporary. @@ -364,7 +362,7 @@ The values returned by the following view methods should never change: Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can restrict their attention to overriding the following four functions: -- `tryPrice()` (not on the ICollateral interface; used by `price()`/`lotPrice()`/`refresh()`) +- `tryPrice()` (not on the ICollateral interface; used by `price()`/`refresh()`) - `refPerTok()` - `targetPerRef()` - `claimRewards()` @@ -441,15 +439,7 @@ Lower estimate must be <= upper estimate. Should return `(0, FIX_MAX)` if pricing data is unavailable or stale. -Should be gas-efficient. - -### lotPrice() `{UoA/tok}` - -Should never revert. - -Lower estimate must be <= upper estimate. - -The low estimate should be nonzero while the asset is worth selling. +Recommend decaying low estimate downwards and high estimate upwards over time. Should be gas-efficient. diff --git a/docs/deployment.md b/docs/deployment.md index 6fbf565027..98c96678ef 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -220,7 +220,7 @@ yarn deploy:run:confirm --network mainnet This checks that: -- For each asset, confirm `lotPrice()` and `price()` are close. +- For each asset, confirm: - `main.tradingPaused()` and `main.issuancePaused()` are true - `timelockController.minDelay()` is > 1e12 diff --git a/docs/recollateralization.md b/docs/recollateralization.md index aecb345c94..06cf836594 100644 --- a/docs/recollateralization.md +++ b/docs/recollateralization.md @@ -64,21 +64,7 @@ If there does not exist a trade that meets these constraints, then the protocol #### Trade Sizing -The `IAsset` interface defines two types of prices: - -```solidity -/// @return low {UoA/tok} The lower end of the price estimate -/// @return high {UoA/tok} The upper end of the price estimate -function price() external view returns (uint192 low, uint192 high); - -/// lotLow should be nonzero when the asset might be worth selling -/// @return lotLow {UoA/tok} The lower end of the lot price estimate -/// @return lotHigh {UoA/tok} The upper end of the lot price estimate -function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - -``` - -All trades have a worst-case exchange rate that is a function of (among other things) the selling asset's `lotPrice().low` and the buying asset's `lotPrice().high`. +All trades have a worst-case exchange rate that is a function of (among other things) the selling asset's `price().low` and the buying asset's `price().high`. #### Trade Examples diff --git a/scripts/confirmation/1_confirm_assets.ts b/scripts/confirmation/1_confirm_assets.ts index 0c62bfbac1..b5ea27b8ec 100644 --- a/scripts/confirmation/1_confirm_assets.ts +++ b/scripts/confirmation/1_confirm_assets.ts @@ -2,7 +2,8 @@ import hre from 'hardhat' import { getChainId } from '../../common/blockchain-utils' import { developmentChains, networkConfig } from '../../common/configuration' -import { CollateralStatus } from '../../common/constants' +import { CollateralStatus, MAX_UINT192 } from '../../common/constants' +import { getLatestBlockTimestamp } from '#/utils/time' import { getDeploymentFile, IAssetCollDeployments, @@ -27,18 +28,20 @@ async function main() { const assets = Object.values(assetsColls.assets) const collateral = Object.values(assetsColls.collateral) - // Confirm lotPrice() == price() for (const a of assets) { console.log(`confirming asset ${a}`) const asset = await hre.ethers.getContractAt('Asset', a) - const [lotLow, lotHigh] = await asset.lotPrice() const [low, high] = await asset.price() // {UoA/tok} - if (low.eq(0) || high.eq(0)) throw new Error('misconfigured oracle') - - if (!lotLow.eq(low) || !lotHigh.eq(high)) { - console.log('lotLow, low, lotHigh, high', lotLow, low, lotHigh, high) - throw new Error('lot price off') - } + const timestamp = await getLatestBlockTimestamp(hre) + if ( + low.eq(0) || + low.eq(MAX_UINT192) || + high.eq(0) || + high.eq(MAX_UINT192) || + await asset.lastSave() !== timestamp || + await asset.lastSave() !== timestamp + ) + throw new Error('misconfigured oracle') } // Collateral @@ -49,14 +52,18 @@ async function main() { if ((await coll.status()) != CollateralStatus.SOUND) throw new Error('collateral unsound') - const [lotLow, lotHigh] = await coll.lotPrice() const [low, high] = await coll.price() // {UoA/tok} - if (low.eq(0) || high.eq(0)) throw new Error('misconfigured oracle') - - if (!lotLow.eq(low) || !lotHigh.eq(high)) { - console.log('lotLow, low, lotHigh, high', lotLow, low, lotHigh, high) - throw new Error('lot price off') - } + const timestamp = await getLatestBlockTimestamp(hre) + if ( + low.eq(0) || + low.eq(MAX_UINT192) || + high.eq(0) || + high.eq(MAX_UINT192) || + await coll.lastSave() !== timestamp || + await coll.lastSave() !== timestamp + ) + throw new Error('misconfigured oracle') + } } } diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 61398dba6f..5db42e6e2b 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1,4 +1,4 @@ -import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' +import { loadFixture, getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' @@ -463,6 +463,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await token0.connect(bmSigner).approve(broker.address, tradeRequest.sellAmount) // Should succeed in callStatic + await assetRegistry.refresh() await broker .connect(bmSigner) .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) @@ -483,6 +484,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .withArgs(token0.address, true, false) // Should succeed in callStatic + await assetRegistry.refresh() await broker .connect(bmSigner) .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) @@ -1648,6 +1650,14 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { let TradeFactory: ContractFactory let newTrade: DutchTrade + // Increment `lastSave` in storage slot 1 + const incrementLastSave = async (addr: string) => { + const asArray = ethers.utils.arrayify(await getStorageAt(addr, 1)) + asArray[7] = asArray[7] + 1 // increment least significant byte of lastSave + const asHex = ethers.utils.hexlify(asArray) + await setStorageAt(addr, 1, asHex) + } + beforeEach(async () => { amount = bn('100e18') @@ -1675,6 +1685,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Backing Manager await whileImpersonating(backingManager.address, async (bmSigner) => { await token0.connect(bmSigner).approve(broker.address, amount) + await assetRegistry.refresh() + await incrementLastSave(tradeRequest.sell) + await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(bmSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) @@ -1683,6 +1696,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // RSR Trader await whileImpersonating(rsrTrader.address, async (rsrSigner) => { await token0.connect(rsrSigner).approve(broker.address, amount) + await assetRegistry.refresh() + await incrementLastSave(tradeRequest.sell) + await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(rsrSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) @@ -1691,6 +1707,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // RToken Trader await whileImpersonating(rTokenTrader.address, async (rtokSigner) => { await token0.connect(rtokSigner).approve(broker.address, amount) + await assetRegistry.refresh() + await incrementLastSave(tradeRequest.sell) + await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(rtokSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 5415dd39d6..956b154b01 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -45,6 +45,8 @@ import { IMPLEMENTATION, defaultFixture, ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, } from './fixtures' import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' import { CollateralStatus, TradeKind, MAX_UINT256, ZERO_ADDRESS } from '#/common/constants' @@ -270,7 +272,7 @@ describe('FacadeRead + FacadeAct contracts', () => { it('Should handle UNPRICED when returning issuable quantities', async () => { // Set unpriced assets, should return UoA = 0 - await setOraclePrice(tokenAsset.address, MAX_UINT256.div(2).sub(1)) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) const [toks, quantities, uoas] = await facade.callStatic.issue(rToken.address, issueAmount) expect(toks.length).to.equal(4) expect(toks[0]).to.equal(token.address) @@ -283,9 +285,9 @@ describe('FacadeRead + FacadeAct contracts', () => { expect(quantities[2]).to.equal(issueAmount.div(4)) expect(quantities[3]).to.equal(issueAmount.div(4).mul(50).div(bn('1e10'))) expect(uoas.length).to.equal(4) - // Three assets are unpriced + // Assets are unpriced expect(uoas[0]).to.equal(0) - expect(uoas[1]).to.equal(issueAmount.div(4)) + expect(uoas[1]).to.equal(0) expect(uoas[2]).to.equal(0) expect(uoas[3]).to.equal(0) }) @@ -505,7 +507,10 @@ describe('FacadeRead + FacadeAct contracts', () => { expect(backing).to.equal(fp('1')) expect(overCollateralization).to.equal(fp('0.5')) - await setOraclePrice(rsrAsset.address, MAX_UINT256.div(2).sub(1)) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, bn('1e8')) + await setOraclePrice(usdcAsset.address, bn('1e8')) + await assetRegistry.refresh() ;[backing, overCollateralization] = await facade.callStatic.backingOverview(rToken.address) // Check values - Fully collateralized and no over-collateralization @@ -560,11 +565,11 @@ describe('FacadeRead + FacadeAct contracts', () => { const tokenSurplus = bn('0.5e18') await token.connect(addr1).transfer(trader.address, tokenSurplus) - // Set lotLow to 0 == revenueOverview() should not revert + // Set low to 0 == revenueOverview() should not revert await setOraclePrice(usdcAsset.address, bn('0')) await usdcAsset.refresh() - const [lotLow] = await usdcAsset.lotPrice() - expect(lotLow).to.equal(0) + const [low] = await usdcAsset.price() + expect(low).to.equal(0) // revenue let [erc20s, canStart, surpluses, minTradeAmounts] = diff --git a/test/Main.test.ts b/test/Main.test.ts index b8613d40a0..ac0ec60a94 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -70,6 +70,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from './fixtures' @@ -2756,8 +2757,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Check BU price -- 1/4 of the basket has lost half its value await expectPrice(basketHandler.address, fp('0.875'), ORACLE_ERROR, true) - // Set collateral1 price to invalid value that should produce [0, FIX_MAX] - await setOraclePrice(collateral1.address, MAX_UINT192) + // Set collateral1 price to [0, FIX_MAX] + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(collateral0.address, bn('1e8')) + await assetRegistry.refresh() // Check BU price -- 1/4 of the basket has lost all its value const asset = await ethers.getContractAt('Asset', basketHandler.address) @@ -2838,17 +2841,9 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { REVENUE_HIDING ) await assetRegistry.connect(owner).swapRegistered(newColl.address) - await setOraclePrice(newColl.address, MAX_UINT192) // overflow - await expectUnpriced(newColl.address) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) await newColl.setTargetPerRef(1) - await freshBasketHandler.setPrimeBasket([await newColl.erc20()], [fp('1000')]) - await freshBasketHandler.refreshBasket() - - // Expect [something > 0, FIX_MAX] - const bh = await ethers.getContractAt('Asset', basketHandler.address) - const [lowPrice, highPrice] = await bh.price() - expect(lowPrice).to.be.gt(0) - expect(highPrice).to.equal(MAX_UINT192) + await expectUnpriced(basketHandler.address) }) it('Should handle overflow in price calculation and return [FIX_MAX, FIX_MAX] - case 1', async () => { @@ -2905,35 +2900,6 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(highPrice).to.equal(MAX_UINT192) }) - it('Should distinguish between price/lotPrice', async () => { - // Set basket with single collateral - await basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await basketHandler.refreshBasket() - - await collateral0.refresh() - const [low, high] = await collateral0.price() - await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // oracle error - - // lotPrice() should begin at 100% - let [lowPrice, highPrice] = await basketHandler.price() - let [lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() - expect(lowPrice).to.equal(0) - expect(highPrice).to.equal(MAX_UINT192) - expect(lotLowPrice).to.be.eq(low) - expect(lotHighPrice).to.be.eq(high) - - // Advance time past 100% period -- lotPrice() should begin to fall - await advanceTime(await collateral0.oracleTimeout()) - ;[lowPrice, highPrice] = await basketHandler.price() - ;[lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() - expect(lowPrice).to.equal(0) - expect(highPrice).to.equal(MAX_UINT192) - expect(lotLowPrice).to.be.closeTo(low, low.div(bn('1e5'))) // small decay expected - expect(lotLowPrice).to.be.lt(low) - expect(lotHighPrice).to.be.closeTo(high, high.div(bn('1e5'))) // small decay expected - expect(lotHighPrice).to.be.lt(high) - }) - it('Should disable basket on asset deregistration + return quantities correctly', async () => { // Check values expect(await facadeTest.wholeBasketsHeldBy(rToken.address, addr1.address)).to.equal( diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 5b7718a225..014dca14ab 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -1015,9 +1015,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('Should not recollateralize when switching basket if all assets are UNPRICED', async () => { - // Set price to use lot price - await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) - // Setup prime basket await basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')]) @@ -1029,7 +1026,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Advance time post warmup period - temporary IFFY->SOUND await advanceTime(Number(config.warmupPeriod) + 1) - // Set to sell price = 0 + // Set all assets to UNPRICED await advanceTime(Number(ORACLE_TIMEOUT.add(PRICE_TIMEOUT))) // Check state remains SOUND @@ -1188,8 +1185,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) }) - it('Should recollateralize correctly when switching basket - Using lot price', async () => { - // Set price to unpriced (will use lotPrice to size trade) + it('Should recollateralize correctly when switching basket', async () => { + // Set oracle value out-of-range await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // Setup prime basket @@ -1218,7 +1215,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await toMinBuyAmt(sellAmt, fp('1'), fp('1')), 6 ).add(1) - // since within oracleTimeout lotPrice() should still be at 100% of original price + // since within oracleTimeout, price() should still be at 100% of original price await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) .to.emit(backingManager, 'TradeStarted') diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 6b4dad02c8..191c5864e0 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -554,13 +554,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(0) }) - it('Should launch revenue auction at lotPrice if UNPRICED', async () => { - // After oracleTimeout the lotPrice should be the original price still + it('Should launch revenue auction if UNPRICED', async () => { + // After oracleTimeout it should still launch auction for RToken await advanceTime(ORACLE_TIMEOUT.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.callStatic.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) - // After oracleTimeout the lotPrice should be the original price still + // After priceTimeout it should not buy RToken await advanceTime(PRICE_TIMEOUT.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await expect( diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index 889471b056..897ad0109f 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -2,11 +2,11 @@ exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `259526`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `368768`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `374656`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `370883`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `376771`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `373021`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `378909`; exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 1b0751af8d..92ea4d72d1 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8354959`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8320542`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464235`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 94907cfd67..4728df82a4 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `361362`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `361384`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `196758`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `196758`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167914`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167892`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80532`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70044`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70022`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index e8e5328dd7..4a613f6302 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791110`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `791197`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618114`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `618201`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `592887`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `592909`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index d47fb3da07..26e5a305aa 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1407849`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1392247`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1533241`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1527925`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `748681`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `748791`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1702113`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1684579`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1633187`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1625939`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1721584`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1714413`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 3f423f56a7..4a58b2ec34 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -12,16 +12,16 @@ exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1033882`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1039136`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `777373`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `777525`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1188041`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1188936`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `743173`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `743325`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 8604200d7a..529ecbcfcf 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `156559`; exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; @@ -10,10 +10,10 @@ exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41509`; exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58621`; -exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; +exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `241951`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `575668`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `575755`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `529672`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `529759`; diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 672f5566de..c9bd6d3ddd 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -1082,7 +1082,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, }) it('Should handle invalid/stale Price - Assets', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Stale Oracle await expectUnpriced(compAsset.address) @@ -1126,7 +1126,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) await expectUnpriced(daiCollateral.address) await expectUnpriced(usdcCollateral.address) @@ -1206,7 +1206,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await cUsdtCollateral.status()).to.equal(CollateralStatus.SOUND) // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cDaiCollateral.address) @@ -1279,7 +1279,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - ATokens Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(aDaiCollateral.address) @@ -1356,7 +1356,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - Non-Fiatcoins', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(wbtcCollateral.address) @@ -1428,7 +1428,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - CTokens Non-Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cWBTCCollateral.address) @@ -1509,7 +1509,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const delayUntilDefault = bn('86400') // 24h // Dows not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(wethCollateral.address) @@ -1570,7 +1570,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const delayUntilDefault = bn('86400') // 24h // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cETHCollateral.address) @@ -1646,7 +1646,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - EUR Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) await expectUnpriced(eurtCollateral.address) diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 3d9661263f..e783be4022 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -261,22 +261,22 @@ describe('Assets contracts #fast', () => { await expectPrice(compAsset.address, bn('0'), bn('0'), false) await expectPrice(aaveAsset.address, bn('0'), bn('0'), false) - // Fallback prices should be zero - let [lotLow, lotHigh] = await rsrAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) - ;[lotLow, lotHigh] = await rsrAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) - ;[lotLow, lotHigh] = await aaveAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + // prices should be zero + let [low, high] = await rsrAsset.price() + expect(low).to.eq(0) + expect(high).to.eq(0) + ;[low, high] = await rsrAsset.price() + expect(low).to.eq(0) + expect(high).to.eq(0) + ;[low, high] = await aaveAsset.price() + expect(low).to.eq(0) + expect(high).to.eq(0) // Update values of underlying tokens of RToken to 0 await setOraclePrice(collateral0.address, bn(0)) await setOraclePrice(collateral1.address, bn(0)) - // RTokenAsset should be unpriced now + // RTokenAsset should be 0 await expectRTokenPrice( rTokenAsset.address, bn(0), @@ -284,11 +284,9 @@ describe('Assets contracts #fast', () => { await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) ) - - // Should have lot price - ;[lotLow, lotHigh] = await rTokenAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + ;[low, high] = await rTokenAsset.price() + expect(low).to.eq(0) + expect(high).to.eq(0) }) it('Should return 0 price for RTokenAsset in full haircut scenario', async () => { @@ -306,7 +304,7 @@ describe('Assets contracts #fast', () => { ) }) - it('Should not revert RToken price if supply is zero', async () => { + it('Should not revert during RToken price() if supply is zero', async () => { // Redeem RToken to make price function revert // Note: To get RToken price to 0, a full basket refresh needs to occur (covered in RToken tests) await rToken.connect(wallet).redeem(amt) @@ -318,12 +316,6 @@ describe('Assets contracts #fast', () => { config.minTradeVolume.mul((await assetRegistry.erc20s()).length) ) expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) - - // Should have lot price, equal to price when feed works OK - const [lowPrice, highPrice] = await rTokenAsset.price() - const [lotLow, lotHigh] = await rTokenAsset.lotPrice() - expect(lotLow).to.equal(lowPrice) - expect(lotHigh).to.equal(highPrice) }) it('Should calculate trade min correctly', async () => { @@ -350,35 +342,59 @@ describe('Assets contracts #fast', () => { expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) }) - it('Should be unpriced if price is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + it('Should remain at saved price if oracle is stale', async () => { + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // Check unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + // lastSave should not be block timestamp after refresh + await rsrAsset.refresh() + await compAsset.refresh() + await aaveAsset.refresh() + expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) - it('Should be unpriced in case of invalid timestamp', async () => { + it('Should remain at saved price in case of invalid timestamp', async () => { await setInvalidOracleTimestamp(rsrAsset.address) await setInvalidOracleTimestamp(compAsset.address) await setInvalidOracleTimestamp(aaveAsset.address) - // Check unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + // lastSave should not be block timestamp after refresh + await rsrAsset.refresh() + await compAsset.refresh() + await aaveAsset.refresh() + expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) - it('Should be unpriced in case of invalid answered round', async () => { + it('Should remain at saved price in case of invalid answered round', async () => { await setInvalidOracleAnsweredRound(rsrAsset.address) await setInvalidOracleAnsweredRound(compAsset.address) await setInvalidOracleAnsweredRound(aaveAsset.address) - // Check unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + // lastSave should not be block timestamp after refresh + await rsrAsset.refresh() + await compAsset.refresh() + await aaveAsset.refresh() + expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) it('Should handle unpriced edge cases for RToken', async () => { @@ -505,37 +521,35 @@ describe('Assets contracts #fast', () => { expect(await unpricedRSRAsset.lastSave()).to.equal(currBlockTimestamp) }) - it('Should not revert on refresh if unpriced', async () => { + it('Should not revert on refresh if stale', async () => { // Check initial prices - use RSR as example - const currBlockTimestamp: number = await getLatestBlockTimestamp() - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, true) + const startBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) const [prevLowPrice, prevHighPrice] = await rsrAsset.price() expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) // Set invalid oracle await setInvalidOracleTimestamp(rsrAsset.address) - // Check unpriced - uses still previous prices - await expectUnpriced(rsrAsset.address) + // Check price - uses still previous prices + await rsrAsset.refresh() let [lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(bn(0)) - expect(highPrice).to.equal(MAX_UINT192) + expect(lowPrice).to.equal(prevLowPrice) + expect(highPrice).to.equal(prevHighPrice) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) - // Perform refresh + // Check price - no update on prices/timestamp await rsrAsset.refresh() - - // Check still unpriced - no update on prices/timestamp - await expectUnpriced(rsrAsset.address) ;[lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(bn(0)) - expect(highPrice).to.equal(MAX_UINT192) + expect(lowPrice).to.equal(prevLowPrice) + expect(highPrice).to.equal(prevHighPrice) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) }) it('Reverts if Chainlink feed reverts or runs out of gas', async () => { @@ -560,72 +574,64 @@ describe('Assets contracts #fast', () => { // Reverting with no reason await invalidChainlinkFeed.setSimplyRevert(true) await expect(invalidRSRAsset.price()).to.be.reverted - await expect(invalidRSRAsset.lotPrice()).to.be.reverted await expect(invalidRSRAsset.refresh()).to.be.reverted // Runnning out of gas (same error) await invalidChainlinkFeed.setSimplyRevert(false) await expect(invalidRSRAsset.price()).to.be.reverted - await expect(invalidRSRAsset.lotPrice()).to.be.reverted await expect(invalidRSRAsset.refresh()).to.be.reverted }) - it('Should handle lot price correctly', async () => { + it('Should handle price decay correctly', async () => { await rsrAsset.refresh() - // Check lot prices - use RSR as example - const currBlockTimestamp: number = await getLatestBlockTimestamp() - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, true) + // Check prices - use RSR as example + const startBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) const [prevLowPrice, prevHighPrice] = await rsrAsset.price() expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) - - // Lot price equals price when feed works OK - const [lotLowPrice1, lotHighPrice1] = await rsrAsset.lotPrice() - expect(lotLowPrice1).to.equal(prevLowPrice) - expect(lotHighPrice1).to.equal(prevHighPrice) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) // Set invalid oracle await setInvalidOracleTimestamp(rsrAsset.address) // Check unpriced - uses still previous prices - await expectUnpriced(rsrAsset.address) const [lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(bn(0)) - expect(highPrice).to.equal(MAX_UINT192) + expect(lowPrice).to.equal(prevLowPrice) + expect(highPrice).to.equal(prevHighPrice) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) - // At first lot price doesn't decrease - const [lotLowPrice2, lotHighPrice2] = await rsrAsset.lotPrice() - expect(lotLowPrice2).to.eq(lotLowPrice1) - expect(lotHighPrice2).to.eq(lotHighPrice1) + // At first price doesn't decrease + const [lowPrice2, highPrice2] = await rsrAsset.price() + expect(lowPrice2).to.eq(lowPrice) + expect(highPrice2).to.eq(highPrice) // Advance past oracleTimeout await advanceTime(await rsrAsset.oracleTimeout()) - // Now lot price decreases - const [lotLowPrice3, lotHighPrice3] = await rsrAsset.lotPrice() - expect(lotLowPrice3).to.be.lt(lotLowPrice2) - expect(lotHighPrice3).to.be.lt(lotHighPrice2) + // Now price widens + const [lowPrice3, highPrice3] = await rsrAsset.price() + expect(lowPrice3).to.be.lt(lowPrice2) + expect(highPrice3).to.be.gt(highPrice2) - // Advance block, lot price keeps decreasing + // Advance block, price keeps widening await advanceBlocks(1) - const [lotLowPrice4, lotHighPrice4] = await rsrAsset.lotPrice() - expect(lotLowPrice4).to.be.lt(lotLowPrice3) - expect(lotHighPrice4).to.be.lt(lotHighPrice3) + const [lowPrice4, highPrice4] = await rsrAsset.price() + expect(lowPrice4).to.be.lt(lowPrice3) + expect(highPrice4).to.be.gt(highPrice3) - // Advance blocks beyond PRICE_TIMEOUT + // Advance blocks beyond PRICE_TIMEOUT; price should be [O, FIX_MAX] await advanceTime(PRICE_TIMEOUT.toNumber()) // Lot price returns 0 once time elapses - const [lotLowPrice5, lotHighPrice5] = await rsrAsset.lotPrice() - expect(lotLowPrice5).to.be.lt(lotLowPrice4) - expect(lotHighPrice5).to.be.lt(lotHighPrice4) - expect(lotLowPrice5).to.be.equal(bn(0)) - expect(lotHighPrice5).to.be.equal(bn(0)) + const [lowPrice5, highPrice5] = await rsrAsset.price() + expect(lowPrice5).to.be.lt(lowPrice4) + expect(highPrice5).to.be.gt(highPrice4) + expect(lowPrice5).to.be.equal(bn(0)) + expect(highPrice5).to.be.equal(MAX_UINT192) }) }) @@ -696,9 +702,9 @@ describe('Assets contracts #fast', () => { it('refresh() after full price timeout', async () => { await advanceTime((await rsrAsset.priceTimeout()) + (await rsrAsset.oracleTimeout())) - const lotP = await rsrAsset.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await rsrAsset.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) }) }) }) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index ea5db3b17e..02484890e1 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -590,10 +590,10 @@ describe('Collateral contracts', () => { await expectPrice(aTokenCollateral.address, bn('0'), bn('0'), false) await expectPrice(cTokenCollateral.address, bn('0'), bn('0'), false) - // Lot prices should be zero - const [lotLow, lotHigh] = await tokenCollateral.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + // price should be zero + const [low, high] = await tokenCollateral.price() + expect(low).to.eq(0) + expect(high).to.eq(0) // When refreshed, sets status to Unpriced await tokenCollateral.refresh() @@ -605,38 +605,56 @@ describe('Collateral contracts', () => { expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Should be unpriced in case of invalid timestamp', async () => { + it('Should remain at saved price in case of invalid timestamp', async () => { await setInvalidOracleTimestamp(tokenCollateral.address) + await setInvalidOracleTimestamp(usdcCollateral.address) - // Check price of token - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - await expectUnpriced(cTokenCollateral.address) - - // When refreshed, sets status to Unpriced + // lastSave should not be block timestamp after refresh await tokenCollateral.refresh() + await usdcCollateral.refresh() await aTokenCollateral.refresh() await cTokenCollateral.refresh() - + expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) + + // Sets status to IFFY expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) + expect(await usdcCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Should be unpriced in case of invalid answered round', async () => { + it('Should remain at saved price in case of invalid answered round', async () => { await setInvalidOracleAnsweredRound(tokenCollateral.address) + await setInvalidOracleAnsweredRound(usdcCollateral.address) - // Check price of token - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - await expectUnpriced(cTokenCollateral.address) - - // When refreshed, sets status to Unpriced + // lastSave should not be block timestamp after refresh await tokenCollateral.refresh() + await usdcCollateral.refresh() await aTokenCollateral.refresh() await cTokenCollateral.refresh() - + expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) + + // Sets status to IFFY expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) + expect(await usdcCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -897,14 +915,24 @@ describe('Collateral contracts', () => { } }) - it('Unpriced if price is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + it('Should remain at saved price if oracle is stale', async () => { + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // Check unpriced - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(usdcCollateral.address) - await expectUnpriced(cTokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) + // lastSave should not be block timestamp after refresh + await tokenCollateral.refresh() + await usdcCollateral.refresh() + await cTokenCollateral.refresh() + await aTokenCollateral.refresh() + expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price + await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) + await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) }) it('Enters IFFY state when price becomes stale', async () => { @@ -2221,15 +2249,15 @@ describe('Collateral contracts', () => { const oracleTimeout = await tokenCollateral.oracleTimeout() await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(bn(oracleTimeout).div(12)) + await snapshotGasCost(tokenCollateral.refresh()) }) it('after full price timeout', async () => { await advanceTime( (await tokenCollateral.priceTimeout()) + (await tokenCollateral.oracleTimeout()) ) - const lotP = await tokenCollateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + await expectUnpriced(tokenCollateral.address) + await snapshotGasCost(tokenCollateral.refresh()) }) }) }) diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index cedffac69d..9b37ebf315 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,8 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `72710`; +exports[`Collateral contracts Gas Reporting refresh() after full price timeout 1`] = `47097`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `73846`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `72688`; + +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `73824`; + +exports[`Collateral contracts Gas Reporting refresh() after oracle timeout 1`] = `47097`; exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `62400`; diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index b74fda69de..11497aa3fc 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -22,7 +22,12 @@ import { IRTokenSetup, networkConfig, } from '../../../../common/configuration' -import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../../../common/constants' +import { + CollateralStatus, + MAX_UINT48, + MAX_UINT192, + ZERO_ADDRESS, +} from '../../../../common/constants' import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' @@ -653,10 +658,14 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // stkAAVEound - await expectUnpriced(aDaiCollateral.address) + // Price is at saved prices + const savedLowPrice = await aDaiCollateral.savedLowPrice() + const savedHighPrice = await aDaiCollateral.savedHighPrice() + const p = await aDaiCollateral.price() + expect(p[0]).to.equal(savedLowPrice) + expect(p[1]).to.equal(savedHighPrice) // Refresh should mark status IFFY await aDaiCollateral.refresh() @@ -1000,9 +1009,9 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime( (await aDaiCollateral.priceTimeout()) + (await aDaiCollateral.oracleTimeout()) ) - const lotP = await aDaiCollateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await aDaiCollateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) await snapshotGasCost(aDaiCollateral.refresh()) await snapshotGasCost(aDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index f02da1ba1a..5f8655593d 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `75233`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `75222`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `73565`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `73554`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73788`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `73766`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `66106`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `66084`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `75233`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `75222`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `73565`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `73554`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91924`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91976`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91998`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91902`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `93061`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `93039`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `93135`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `93113`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128207`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `128111`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `92265`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `92243`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index 6faac2e04c..1865ad22d4 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61208`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61197`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56739`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56728`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `79401`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `79379`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `71718`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `71696`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61208`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61197`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `56739`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `56728`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `71715`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `71693`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `71715`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `71693`; diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index f086c155bb..b2f52853e9 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60696`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60685`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56227`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `56216`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `97997`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `97975`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90314`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90292`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81812`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81801`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77343`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77332`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90311`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90289`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90311`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90289`; diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 00891b0076..2fddefca79 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -25,7 +25,7 @@ import { CollateralTestSuiteFixtures, CollateralStatus, } from './pluginTestTypes' -import { expectPrice } from '../../utils/oracles' +import { expectPrice, expectUnpriced } from '../../utils/oracles' import snapshotGasCost from '../../utils/snapshotGasCost' import { IMPLEMENTATION, Implementation } from '../../fixtures' @@ -261,7 +261,7 @@ export default function fn( const updateAnswerTx = await chainlinkFeed.updateAnswer(0) await updateAnswerTx.wait() - // (0, FIX_MAX) is returned + // (0, 0) is returned const [low, high] = await collateral.price() expect(low).to.equal(0) expect(high).to.equal(0) @@ -271,33 +271,28 @@ export default function fn( expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('reverts in case of invalid timestamp', async () => { + it('does not revert in case of invalid timestamp', async () => { await chainlinkFeed.setInvalidTimestamp() - // Check price of token - const [low, high] = await collateral.price() - expect(low).to.equal(0) - expect(high).to.equal(MAX_UINT192) - - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) it('does not update the saved prices if collateral is unpriced', async () => { /* - want to cover this block from the refresh function + want to cover this block from the refresh function is it even possible to cover this w/ the tryPrice from AppreciatingFiatCollateral? - + if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); } else { - // must be unpriced - assert(low == 0); + // must be unpriced + assert(low == 0); } - */ + */ expect(true) }) @@ -350,29 +345,27 @@ export default function fn( expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('decays lotPrice over priceTimeout period', async () => { - // Prices should start out equal + it('decays price over priceTimeout period', async () => { await collateral.refresh() - const p = await collateral.price() - let lotP = await collateral.lotPrice() - expect(p.length).to.equal(lotP.length) - expect(p[0]).to.equal(lotP[0]) - expect(p[1]).to.equal(lotP[1]) + const savedLow = await collateral.savedLowPrice() + const savedHigh = await collateral.savedHighPrice() + // Price should start out at saved prices + let p = await collateral.price() + expect(p[0]).to.equal(savedLow) + expect(p[1]).to.equal(savedHigh) await advanceTime(await collateral.oracleTimeout()) // Should be roughly half, after half of priceTimeout const priceTimeout = await collateral.priceTimeout() await advanceTime(priceTimeout / 2) - lotP = await collateral.lotPrice() - expect(lotP[0]).to.be.closeTo(p[0].div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand - expect(lotP[1]).to.be.closeTo(p[1].div(2), p[1].div(2).div(10000)) // 1 part in 10 thousand + p = await collateral.price() + expect(p[0]).to.be.closeTo(savedLow.div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand + expect(p[1]).to.be.closeTo(savedHigh.mul(2), p[1].mul(2).div(10000)) // 1 part in 10 thousand - // Should be 0 after full priceTimeout + // Should be unpriced after full priceTimeout await advanceTime(priceTimeout / 2) - lotP = await collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + await expectUnpriced(collateral.address) }) }) @@ -535,9 +528,9 @@ export default function fn( await advanceTime( (await collateral.priceTimeout()) + (await collateral.oracleTimeout()) ) - const lotP = await collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await collateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) }) }) }) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 2a16daceb9..53025c4ef8 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -22,7 +22,12 @@ import { IRTokenSetup, networkConfig, } from '../../../../common/configuration' -import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../../../common/constants' +import { + CollateralStatus, + MAX_UINT48, + MAX_UINT192, + ZERO_ADDRESS, +} from '../../../../common/constants' import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp, toBNDecimals } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' @@ -666,10 +671,14 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // Compound - await expectUnpriced(cDaiCollateral.address) + // Price is at saved prices + const savedLowPrice = await cDaiCollateral.savedLowPrice() + const savedHighPrice = await cDaiCollateral.savedHighPrice() + const p = await cDaiCollateral.price() + expect(p[0]).to.equal(savedLowPrice) + expect(p[1]).to.equal(savedHighPrice) // Refresh should mark status IFFY await cDaiCollateral.refresh() @@ -1028,9 +1037,9 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime( (await cDaiCollateral.priceTimeout()) + (await cDaiCollateral.oracleTimeout()) ) - const lotP = await cDaiCollateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await cDaiCollateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) await snapshotGasCost(cDaiCollateral.refresh()) await snapshotGasCost(cDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index f872809ebb..e390fbcda3 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `120196`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `120185`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `118528`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `118517`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `74924`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `74902`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `67242`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `67220`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `120196`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `120185`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `118528`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `118517`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `139517`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `139495`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `139517`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `139495`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `140654`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `140632`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `140654`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `140632`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175726`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175704`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139858`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139836`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index 4f0b595a2d..2d49b4c967 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109932`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109921`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `105195`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `105184`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `135300`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `135278`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `127617`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `127595`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109932`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109921`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `105195`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `105184`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107922`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107911`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `104854`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `104843`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `127614`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `127592`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `127614`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `127592`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `135165`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `135143`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127896`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127874`; diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 14aff54151..5ee8b6984c 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -8,7 +8,7 @@ import { ethers } from 'hardhat' import { ERC20Mock, InvalidMockV3Aggregator } from '../../../../typechain' import { BigNumber } from 'ethers' import { bn, fp } from '../../../../common/numbers' -import { MAX_UINT48, ZERO_ADDRESS, ONE_ADDRESS } from '../../../../common/constants' +import { MAX_UINT48, MAX_UINT192, ZERO_ADDRESS, ONE_ADDRESS } from '../../../../common/constants' import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { useEnv } from '#/utils/env' @@ -403,7 +403,7 @@ export default function fn( expect(low).to.equal(0) expect(high).to.equal(0) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -411,13 +411,15 @@ export default function fn( it('does not revert in case of invalid timestamp', async () => { await ctx.feeds[0].setInvalidTimestamp() - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Handles stale price', async () => { - await advanceTime(await ctx.collateral.priceTimeout()) + it('handles stale price', async () => { + await advanceTime( + (await ctx.collateral.oracleTimeout()) + (await ctx.collateral.priceTimeout()) + ) // (0, FIX_MAX) is returned await expectUnpriced(ctx.collateral.address) @@ -427,28 +429,27 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('decays lotPrice over priceTimeout period', async () => { - // Prices should start out equal - const p = await ctx.collateral.price() - let lotP = await ctx.collateral.lotPrice() - expect(p.length).to.equal(lotP.length) - expect(p[0]).to.equal(lotP[0]) - expect(p[1]).to.equal(lotP[1]) + it('decays price over priceTimeout period', async () => { + const savedLow = await ctx.collateral.savedLowPrice() + const savedHigh = await ctx.collateral.savedHighPrice() + // Price should start out at saved prices + await ctx.collateral.refresh() + let p = await ctx.collateral.price() + expect(p[0]).to.equal(savedLow) + expect(p[1]).to.equal(savedHigh) await advanceTime(await ctx.collateral.oracleTimeout()) // Should be roughly half, after half of priceTimeout const priceTimeout = await ctx.collateral.priceTimeout() await advanceTime(priceTimeout / 2) - lotP = await ctx.collateral.lotPrice() - expect(lotP[0]).to.be.closeTo(p[0].div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand - expect(lotP[1]).to.be.closeTo(p[1].div(2), p[1].div(2).div(10000)) // 1 part in 10 thousand + p = await ctx.collateral.price() + expect(p[0]).to.be.closeTo(savedLow.div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand + expect(p[1]).to.be.closeTo(savedHigh.mul(2), p[1].mul(2).div(10000)) // 1 part in 10 thousand // Should be 0 after full priceTimeout await advanceTime(priceTimeout / 2) - lotP = await ctx.collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + await expectUnpriced(ctx.collateral.address) }) }) @@ -686,9 +687,9 @@ export default function fn( await advanceTime( (await ctx.collateral.priceTimeout()) + (await ctx.collateral.oracleTimeout()) ) - const lotP = await ctx.collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await ctx.collateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) }) }) }) diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index 9593a4f3bf..c397dd75b2 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `81987`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `81995`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77519`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77527`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259104`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259452`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `254222`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `254570`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81987`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81995`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77519`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77527`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `77178`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `77186`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `77178`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `77186`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254219`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254567`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254219`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254567`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261797`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `262145`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254529`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254877`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 7d386b05ce..b9d8d3a9c7 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `98884`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `107067`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94416`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `102525`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232790`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232814`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `227908`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `227932`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `103944`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `103956`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99476`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99488`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `99135`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `99147`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `99135`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `99147`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `227905`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `227929`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `227905`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `227929`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213652`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213664`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206384`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206396`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index 8381cbd1f2..e0d9367b5d 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62764`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62753`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58296`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58285`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205007`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `204534`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `200125`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `199652`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62764`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62753`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58296`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58285`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57955`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57944`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57955`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57944`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200122`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `199649`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200122`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `199649`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185477`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185136`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178209`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `177868`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap index 99c585e1e6..11f409aefa 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvVolatileTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65212`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65201`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60744`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60733`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241237`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `240731`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `236355`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `235849`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65212`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65201`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60744`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60733`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `60403`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `60392`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `60403`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `60392`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236352`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `235846`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236352`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `235846`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242606`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242100`; -exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235338`; +exports[`Collateral: CurveVolatileCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `234832`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 0959931c42..ba002c3bba 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `81987`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `81995`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77519`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `77527`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259104`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `259452`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `254222`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `254570`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81987`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `81995`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77519`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `77527`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `77178`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `77186`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `77178`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `77186`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254219`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `254567`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254219`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `254567`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `261797`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `262145`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254529`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `254877`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index 1225a8c886..f60389a6fa 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `98884`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `106993`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `94416`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `102599`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232790`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `232814`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `227908`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `227932`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `103944`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `103956`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99476`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `99488`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `99135`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `99147`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `99135`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `99147`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `227905`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `227929`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `227905`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `227929`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213652`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `213664`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206384`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `206396`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index 130ef52bef..a82a997fc8 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62764`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `62753`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58296`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `58285`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `205007`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `204534`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `200125`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `199652`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62764`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `62753`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58296`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58285`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57955`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57944`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57955`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57944`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `200122`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `199649`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `200122`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `199649`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185477`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `185136`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `178209`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `177868`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap index 3c1e73b07a..9da426d197 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxVolatileTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65212`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `65201`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60744`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `60733`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `241237`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `240731`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `236355`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `235849`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65212`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `65201`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60744`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `60733`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `60403`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `60392`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `60403`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `60392`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `236352`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `235846`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `236352`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `235846`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242606`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `242100`; -exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `235338`; +exports[`Collateral: CurveVolatileCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `234832`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index 9202afd768..3638eadd37 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117728`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117612`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `109311`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `109300`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `132112`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `132090`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `124152`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `124130`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117442`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117431`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `109311`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `109300`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `112297`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `112286`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108970`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108959`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `124149`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `124127`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `124149`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `124127`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131977`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `132029`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `124431`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `124483`; diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index d91ce93686..24698bfd3e 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -1,97 +1,97 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118197`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118186`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116529`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116518`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141791`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141769`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139977`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139955`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118197`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118186`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116529`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116518`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `116188`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `116177`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `116188`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `116177`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139974`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139952`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139974`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139952`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141998`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141976`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140330`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140308`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118389`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `118378`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116721`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `116710`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `142047`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `142025`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140233`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `140211`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118389`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `118378`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116721`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `116710`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `116380`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `116369`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `116380`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `116369`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140230`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `140208`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140230`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `140208`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142254`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `142232`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140512`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `140490`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `126679`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `126668`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `125011`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `125000`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150829`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150807`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `149015`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148993`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `126679`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `126668`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `125011`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `125000`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `124670`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `124659`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `124670`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `124659`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `149012`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148990`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `149012`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148990`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150892`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150870`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `149294`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `149272`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `121327`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `121316`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `119659`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `119648`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `145123`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `145101`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `143379`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `143357`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `121327`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `121316`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `119659`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `119648`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `119318`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `119307`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `119318`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `119307`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `143376`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `143354`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `143306`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `143284`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `145326`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `145304`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `143658`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `143636`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index 61665d768b..13a93c34d8 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59864`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59853`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55127`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55116`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60564`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60553`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58895`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58884`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `74660`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `74638`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `74660`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `74638`; diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index 9514e3f06b..0d86536827 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88913`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88902`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `84444`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `84433`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `134556`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `134534`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `126873`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `126851`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88913`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88902`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `84444`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `84433`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `84103`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `84092`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `84103`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `84092`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `126870`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `126848`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `126870`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `126848`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `131621`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `131599`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `127152`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `127130`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index f3460e5383..0f5db3ba5a 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -1,73 +1,73 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134888`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134877`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130419`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130408`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `180257`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `180235`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172574`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172552`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134888`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134877`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130419`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130408`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `130078`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `130067`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `130078`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `130067`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172571`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172549`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172571`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172549`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `180122`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `180100`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172853`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172831`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135091`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `135080`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130622`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `130611`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180663`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180641`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172980`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172958`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135091`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `135080`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130622`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `130611`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `130281`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `130270`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `130281`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `130270`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172977`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172955`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172977`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172955`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180528`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180506`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `173259`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `173237`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134244`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134233`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129775`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129764`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178969`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178947`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `171286`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `171264`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134244`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134233`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129775`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129764`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `129434`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `129423`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `129434`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `129423`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `171283`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `171261`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `171283`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `171261`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178834`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178812`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171565`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171543`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index 75cc7c2e6a..b69f4cba3f 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -1,49 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134311`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134300`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129842`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129831`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `200352`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `200330`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192669`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192647`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `184175`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `184164`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `179706`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `179695`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `179365`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `179354`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `179365`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `179354`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192666`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192644`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192666`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192644`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `197417`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `197395`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192948`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192926`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167943`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167932`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `163474`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `163463`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239616`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239594`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231933`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231911`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `223439`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `223428`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `218970`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `218959`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `218629`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `218618`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `218629`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `218618`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231930`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231908`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231930`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231908`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `236681`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `236659`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `232212`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `232190`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index 30864ba004..6727634337 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `202026`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `202015`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197557`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197546`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `218208`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `218186`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210525`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210503`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `202026`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `202015`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197557`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197546`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210522`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210500`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210522`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210500`; diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap index 66168f0739..06ad7d31b9 100644 --- a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `71781`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `71770`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67312`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67301`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `109082`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `109060`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `101399`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `101377`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `71781`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `71770`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67312`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67301`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `101396`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `101374`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `101396`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `101374`; diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index f55d5a3652..e97f5bea25 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -1598,8 +1598,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - cETHVault partial sale for weth // Will sell about 841K of cETHVault, expect to receive 8167 wETH (minimum) // We would still have about 438K to sell of cETHVault - let [, lotHigh] = await cETHVaultCollateral.lotPrice() - const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(lotHigh) + let [, high] = await cETHVaultCollateral.price() + const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(high) const sellAmt = toBNDecimals(sellAmtUnscaled, 8) const sellAmtRemainder = (await cETHVault.balanceOf(backingManager.address)).sub(sellAmt) // Price for cETHVault = 1200 / 50 = $24 at rate 50% = $12 @@ -1744,8 +1744,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // 13K wETH @ 1200 = 15,600,000 USD of value, in RSR ~= 156,000 RSR (@100 usd) // We exceed maxTradeVolume so we need two auctions - Will first sell 10M in value // Sells about 101K RSR, for 8167 WETH minimum - ;[, lotHigh] = await rsrAsset.lotPrice() - const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(lotHigh) + ;[, high] = await rsrAsset.price() + const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(high) const buyAmtBidRSR1 = toMinBuyAmt( sellAmtRSR1, rsrPrice, diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index f7ca06c407..629bb089a0 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12071639`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12069526`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9810015`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9807837`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13596421`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13594221`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21212846`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20999017`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11078427`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `11078514`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8799715`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8799737`; exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6630749`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15560638`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14802600`; From 45d8c362026b6b76e70a245d1fd0800e91743658 Mon Sep 17 00:00:00 2001 From: brr Date: Mon, 21 Aug 2023 17:03:19 +0100 Subject: [PATCH 028/450] c4: #5 Potential Early Exploit in Morho-Aave ERC4626 Implementation (#897) Co-authored-by: Patrick McKelvy --- .../plugins/assets/morpho-aave/IMorpho.sol | 6 + .../morpho-aave/MorphoTokenisedDeposit.sol | 2 +- .../individual-collateral/collateralTests.ts | 13 +- .../MorphoAaveV2TokenisedDeposit.test.ts | 138 ++++++++++++++---- 4 files changed, 127 insertions(+), 32 deletions(-) diff --git a/contracts/plugins/assets/morpho-aave/IMorpho.sol b/contracts/plugins/assets/morpho-aave/IMorpho.sol index 9883baa8ca..bc9ec4bce7 100644 --- a/contracts/plugins/assets/morpho-aave/IMorpho.sol +++ b/contracts/plugins/assets/morpho-aave/IMorpho.sol @@ -7,6 +7,12 @@ import { IERC4626 } from "../../../vendor/oz/IERC4626.sol"; interface IMorpho { function supply(address _poolToken, uint256 _amount) external; + function supply( + address _poolToken, + address _onBehalf, + uint256 _amount + ) external; + function withdraw(address _poolToken, uint256 _amount) external; } diff --git a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol index 6e33542725..d2664e782c 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol @@ -64,7 +64,7 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { } function _decimalsOffset() internal view virtual override returns (uint8) { - return 0; + return 9; } function _withdraw( diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 00891b0076..36ff13e747 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -127,14 +127,17 @@ export default function fn( describe('functions', () => { it('returns the correct bal (18 decimals)', async () => { - const amount = bn('20').mul(bn(10).pow(await ctx.tok.decimals())) + const decimals = await ctx.tok.decimals() + const amount = bn('20').mul(bn(10).pow(decimals)) await mintCollateralTo(ctx, amount, alice, alice.address) const aliceBal = await collateral.bal(alice.address) - expect(aliceBal).to.closeTo( - amount.mul(bn(10).pow(18 - (await ctx.tok.decimals()))), - bn('100').mul(bn(10).pow(18 - (await ctx.tok.decimals()))) - ) + const amount18d = + decimals <= 18 + ? amount.mul(bn(10).pow(18 - decimals)) + : amount.div(bn(10).pow(decimals - 18)) + const dist18d = decimals <= 18 ? bn('100').mul(bn(10).pow(18 - decimals)) : bn('10') + expect(aliceBal).to.closeTo(amount18d, dist18d) }) }) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index c529655694..20d9a1406a 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -2,10 +2,11 @@ import { ITokens, networkConfig } from '#/common/configuration' import { ethers } from 'hardhat' import { whileImpersonating } from '../../../utils/impersonation' import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' -import { Signer } from 'ethers' +import { BigNumber, Signer } from 'ethers' import { formatUnits, parseUnits } from 'ethers/lib/utils' import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { bn } from '#/common/numbers' type ITokenSymbol = keyof ITokens const networkConfigToUse = networkConfig[31337] @@ -14,32 +15,47 @@ const mkToken = (symbol: ITokenSymbol) => ({ address: networkConfigToUse.tokens[symbol]! as string, symbol: symbol, }) -const mkTestCase = (symbol: T, amount: string) => ({ +const mkTestCase = ( + symbol: T, + amount: string, + inflationStartAmount: string +) => ({ token: mkToken(symbol), poolToken: mkToken(`a${symbol}` as ITokenSymbol), amount, + inflationStartAmount, }) const TOKENS_TO_TEST = [ - mkTestCase('USDC', '1000.0'), - mkTestCase('USDT', '1000.0'), - mkTestCase('DAI', '1000.0'), - mkTestCase('WETH', '1.0'), - mkTestCase('stETH', '1.0'), - mkTestCase('WBTC', '1.0'), + mkTestCase('USDC', '1000.0', '1'), + mkTestCase('USDT', '1000.0', '1'), + mkTestCase('DAI', '1000.0', '1'), + mkTestCase('WETH', '200.0', '1'), + mkTestCase('stETH', '1.0', '2'), + mkTestCase('WBTC', '1.0', '1'), ] type ITestSuiteVariant = typeof TOKENS_TO_TEST[number] -const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { +const execTestForToken = ({ + token, + poolToken, + amount, + inflationStartAmount, +}: ITestSuiteVariant) => { describe('Tokenised Morpho Position - ' + token.symbol, () => { const beforeEachFn = async () => { const factories = { ERC20Mock: await ethers.getContractFactory('ERC20Mock'), MorphoTokenisedDeposit: await ethers.getContractFactory('MorphoAaveV2TokenisedDeposit'), } + const instances = { underlying: factories.ERC20Mock.attach(token.address), morpho: factories.ERC20Mock.attach(networkConfigToUse.tokens.MORPHO!), + morphoAaveV2Controller: await ethers.getContractAt( + 'IMorpho', + networkConfigToUse.MORPHO_AAVE_CONTROLLER! + ), tokenVault: await factories.MorphoTokenisedDeposit.deploy({ underlyingERC20: token.address, poolToken: poolToken.address, @@ -51,6 +67,8 @@ const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { } const underlyingDecimals = await instances.underlying.decimals() const shareDecimals = await instances.tokenVault.decimals() + const amountBN = parseUnits(amount, underlyingDecimals) + const signers = await ethers.getSigners() const users = { alice: signers[0], @@ -59,32 +77,46 @@ const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { } await whileImpersonating(whales[token.address.toLowerCase()], async (whaleSigner) => { - await instances.underlying - .connect(whaleSigner) - .transfer(users.alice.address, parseUnits(amount, underlyingDecimals)) - await instances.underlying - .connect(whaleSigner) - .transfer(users.bob.address, parseUnits(amount, underlyingDecimals)) - await instances.underlying - .connect(whaleSigner) - .transfer(users.charlie.address, parseUnits(amount, underlyingDecimals)) + await instances.underlying.connect(whaleSigner).transfer(users.alice.address, amountBN) + await instances.underlying.connect(whaleSigner).transfer(users.bob.address, amountBN) + await instances.underlying.connect(whaleSigner).transfer(users.charlie.address, amountBN) }) return { factories, instances, + amountBN, users, methods: { + async mint(user: Signer, amount: BigNumber) { + await whileImpersonating(whales[token.address.toLowerCase()], async (whaleSigner) => { + await instances.underlying + .connect(whaleSigner) + .transfer(await user.getAddress(), amount) + }) + }, deposit: async (user: Signer, amount: string, dest?: string) => { + await instances.underlying.connect(user).approve(instances.tokenVault.address, 0) await instances.underlying .connect(user) - .approve(instances.tokenVault.address, parseUnits(amount, underlyingDecimals)) + .approve(instances.tokenVault.address, ethers.constants.MaxUint256) await instances.tokenVault .connect(user) .deposit(parseUnits(amount, underlyingDecimals), dest ?? (await user.getAddress())) }, + + depositBN: async (user: Signer, amount: BigNumber, dest?: string) => { + await instances.underlying.connect(user).approve(instances.tokenVault.address, 0) + await instances.underlying + .connect(user) + .approve(instances.tokenVault.address, ethers.constants.MaxUint256) + + await instances.tokenVault + .connect(user) + .deposit(amount, dest ?? (await user.getAddress())) + }, shares: async (user: Signer) => { return formatUnits( - await instances.tokenVault.connect(user).maxRedeem(await user.getAddress()), + await instances.tokenVault.connect(user).balanceOf(await user.getAddress()), shareDecimals ) }, @@ -103,17 +135,26 @@ const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { await user.getAddress() ) }, + redeem: async (user: Signer, shares: string, dest?: string) => { + await instances.tokenVault + .connect(user) + .redeem( + parseUnits(shares, await instances.tokenVault.decimals()), + dest ?? (await user.getAddress()), + await user.getAddress() + ) + }, balanceUnderlying: async (user: Signer) => { return formatUnits( - await instances.underlying.connect(user).balanceOf(await user.getAddress()), + await instances.underlying.balanceOf(await user.getAddress()), underlyingDecimals ) }, + balanceUnderlyingBn: async (user: Signer) => { + return await instances.underlying.balanceOf(await user.getAddress()) + }, balanceMorpho: async (user: Signer) => { - return formatUnits( - await instances.morpho.connect(user).balanceOf(await user.getAddress()), - 18 - ) + return formatUnits(await instances.morpho.balanceOf(await user.getAddress()), 18) }, transferShares: async (from: Signer, to: Signer, amount: string) => { await instances.tokenVault @@ -146,7 +187,6 @@ const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { const fraction = (percent: number) => ((amountAsNumber * percent) / 100).toFixed(1) const closeTo = async (actual: Promise, expected: string) => { - await new Promise((r) => setTimeout(r, 200)) expect(parseFloat(await actual)).to.closeTo(parseFloat(expected), 0.5) } @@ -212,11 +252,57 @@ const execTestForToken = ({ token, poolToken, amount }: ITestSuiteVariant) => { await closeTo(methods.assets(bob), fraction(50)) }) + it('Regression Test - C4 July 2023 Issue #5', async () => { + const { + users: { alice, bob }, + methods, + instances, + amountBN, + } = context + const orignalBalance = await methods.balanceUnderlying(bob) + await instances.underlying + .connect(bob) + .approve(instances.morphoAaveV2Controller.address, ethers.constants.MaxUint256) + + await instances.underlying + .connect(bob) + .approve(instances.tokenVault.address, ethers.constants.MaxUint256) + + // Mint a few more tokens so we have enough for the initial 1 wei of a share + await methods.mint(bob, bn(inflationStartAmount).mul(10)) + await methods.depositBN(bob, bn(inflationStartAmount)) + + await instances.morphoAaveV2Controller + .connect(bob) + ['supply(address,address,uint256)']( + await instances.tokenVault.poolToken(), + instances.tokenVault.address, + amountBN + ) + + await closeTo(methods.balanceUnderlying(bob), '0.0') + expect(await methods.shares(alice)).to.equal('0.0') + await methods.depositBN(alice, amountBN.div(2)) + + expect(await methods.shares(alice)).to.not.equal('0.0') + // expect(await methods.shares(alice)).to.equal('0.0') // <- inflation attack check + // Bob inflated his 1 wei of a share share to be worth all of Alices deposit + // ^ The attack above ultimately does not seem to be worth it for the attacker + // half 25% of the attackers funds end up locked in the zero'th share of the vault + + await methods.withdraw(bob, await methods.assets(bob)) + const postWithdrawalBalance = parseFloat(await methods.balanceUnderlying(bob)) + + // Bob should loose funds from the attack + expect(postWithdrawalBalance).lt(parseFloat(orignalBalance)) + }) + /** * There is a test for claiming rewards in the MorphoAAVEFiatCollateral.test.ts */ }) } + describe('MorphoAaveV2TokenisedDeposit', () => { TOKENS_TO_TEST.forEach(execTestForToken) }) From 2cb41d451ab542c2e3fa40ba48623b8856b1fcef Mon Sep 17 00:00:00 2001 From: Julian R <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:11:55 -0300 Subject: [PATCH 029/450] avoid revert when checking recoll auctions --- contracts/facade/FacadeAct.sol | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 7c6d952a8c..a071b74c2d 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -253,7 +253,8 @@ contract FacadeAct is IFacadeAct, Multicall { bytes1 majorVersion = bytes(bm.version())[0]; if (majorVersion == MAJOR_VERSION_3) { - bm.rebalance(TradeKind.DUTCH_AUCTION); + // solhint-disable-next-line no-empty-blocks + try bm.rebalance(TradeKind.DUTCH_AUCTION) {} catch {} } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { IERC20[] memory emptyERC20s = new IERC20[](0); address(bm).functionCall( From 91cc33ef69a1f4591586c1f9bc1d95c6e707989b Mon Sep 17 00:00:00 2001 From: Julian R <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:14:35 -0300 Subject: [PATCH 030/450] rollback change in facade --- contracts/facade/FacadeAct.sol | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index a071b74c2d..7c6d952a8c 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -253,8 +253,7 @@ contract FacadeAct is IFacadeAct, Multicall { bytes1 majorVersion = bytes(bm.version())[0]; if (majorVersion == MAJOR_VERSION_3) { - // solhint-disable-next-line no-empty-blocks - try bm.rebalance(TradeKind.DUTCH_AUCTION) {} catch {} + bm.rebalance(TradeKind.DUTCH_AUCTION); } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { IERC20[] memory emptyERC20s = new IERC20[](0); address(bm).functionCall( From 19d84ef987c6eda99a46e0a83123cfcde650d116 Mon Sep 17 00:00:00 2001 From: brr Date: Tue, 22 Aug 2023 18:07:08 +0100 Subject: [PATCH 031/450] C4: #35 #32, fixes rETH / cbETH / ankrETH ref unit and adds soft default checks (#899) Co-authored-by: Taylor Brent --- .../assets/ankr/AnkrStakedEthCollateral.sol | 41 ++++-- contracts/plugins/assets/ankr/README.md | 12 +- .../plugins/assets/cbeth/CBETHCollateral.sol | 45 +++--- contracts/plugins/assets/cbeth/README.md | 6 +- contracts/plugins/assets/rocket-eth/README.md | 12 +- .../assets/rocket-eth/RethCollateral.sol | 44 +++--- .../ankr/AnkrEthCollateralTestSuite.test.ts | 128 ++++++++++++++---- .../cbeth/CBETHCollateral.test.ts | 97 +++++++------ .../individual-collateral/collateralTests.ts | 4 +- .../RethCollateralTestSuite.test.ts | 84 ++++++------ 10 files changed, 295 insertions(+), 178 deletions(-) diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 251686c301..594db5465e 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -9,23 +9,34 @@ import "./vendor/IAnkrETH.sol"; /** * @title Ankr Staked Eth Collateral - * @notice Collateral plugin for Ankr ankrETH, + * @notice Collateral plugin for Ankr's ankrETH * tok = ankrETH - * ref = ETH + * ref = ETH2 * tar = ETH * UoA = USD + * @dev Not ready to deploy yet. Missing a {target/tok} feed from Chainlink. */ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - // solhint-disable no-empty-blocks - /// @param config.chainlinkFeed Feed units: {UoA/ref} - constructor(CollateralConfig memory config, uint192 revenueHiding) - AppreciatingFiatCollateral(config, revenueHiding) - {} + AggregatorV3Interface public immutable targetPerTokChainlinkFeed; // {target/tok} + uint48 public immutable targetPerTokChainlinkTimeout; - // solhint-enable no-empty-blocks + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param _targetPerTokChainlinkFeed {target/tok} price of cbETH in ETH terms + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + AggregatorV3Interface _targetPerTokChainlinkFeed, + uint48 _targetPerTokChainlinkTimeout + ) AppreciatingFiatCollateral(config, revenueHiding) { + require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); + require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + + targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; + targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; + } /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate @@ -41,22 +52,22 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { uint192 pegPrice ) { - uint192 pricePerRef = chainlinkFeed.price(oracleTimeout); // {UoA/ref} + uint192 targetPerTok = targetPerTokChainlinkFeed.price(targetPerTokChainlinkTimeout); - // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = pricePerRef.mul(_underlyingRefPerTok()); + // {UoA/tok} = {UoA/target} * {target/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(targetPerTok); uint192 err = p.mul(oracleError, CEIL); - low = p - err; high = p + err; + low = p - err; // assert(low <= high); obviously true just by inspection - pegPrice = targetPerRef(); // ETH/ETH + // {target/ref} = {target/tok} / {ref/tok} + pegPrice = targetPerTok.div(_underlyingRefPerTok()); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - uint256 rate = IAnkrETH(address(erc20)).ratio(); - return FIX_ONE.div(_safeWrap(rate), FLOOR); + return FIX_ONE.div(_safeWrap(IAnkrETH(address(erc20)).ratio()), FLOOR); } } diff --git a/contracts/plugins/assets/ankr/README.md b/contracts/plugins/assets/ankr/README.md index 37652a5e8f..667f144c85 100644 --- a/contracts/plugins/assets/ankr/README.md +++ b/contracts/plugins/assets/ankr/README.md @@ -8,22 +8,22 @@ This plugin allows the usage of [ankrETH](https://www.ankr.com/about-staking/) a The `ankrETH` token represents the users staked ETH plus accumulated staking rewards. It is immediately liquid, which enables users to trade them instantly, or unstake them to redeem the original underlying asset. -User's balances in `ankrETH` remain constant, but the value of each ankrETH token grows over time. It is a reward-bearing token, meaning that the fair value of 1 ankrETH token vs. ETH increases over time as staking rewards accumulate. When possible, users will have the option to redeem ankrETH and unstake ETH with accumulated [staking rewards](https://www.ankr.com/docs/staking/liquid-staking/eth/overview/). +User's balances in `ankrETH` remain constant, but the value of each ankrETH token grows over time. It is a reward-bearing token, meaning that the fair value of 1 ankrETH token vs. ETH2 increases over time as staking rewards accumulate. When possible, users will have the option to redeem ankrETH and unstake ETH2 for ETH with accumulated [staking rewards](https://www.ankr.com/docs/staking/liquid-staking/eth/overview/). ## Implementation ### Units -| tok | ref | target | UoA | -| ------- | --- | ------ | --- | -| ankrETH | ETH | ETH | USD | +| tok | ref | target | UoA | +| ------- | ---- | ------ | --- | +| ankrETH | ETH2 | ETH | USD | ### Functions #### refPerTok {ref/tok} -The exchange rate between ETH and ankrETH can be fetched using the ankrETH contract function `ratio()`. From this, we can obtain the inverse rate from ankrETH to ETH, and use that as `refPerTok`. +The exchange rate between ETH2 and ankrETH can be fetched using the ankrETH contract function `ratio()`. From this, we can obtain the inverse rate from ankrETH to ETH2, and use that as `refPerTok`. -This new ratio, increases over time, which means that the amount of ETH redeemable for each ankrETH token always increases. +This new ratio, increases over time, which means that the amount of ETH redeemable for each ankrETH token always increases, though redemptions sit behind a withdrawal queue. `ratio()` returns the exchange rate in 18 decimals. diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 40ee822e38..f9aec23f54 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -2,8 +2,9 @@ pragma solidity 0.8.19; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; -import { _safeWrap } from "../../../libraries/Fixed.sol"; -import "../AppreciatingFiatCollateral.sol"; +import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; +import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; +import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; interface CBEth is IERC20Metadata { function mint(address account, uint256 amount) external returns (bool); @@ -15,25 +16,34 @@ interface CBEth is IERC20Metadata { function exchangeRate() external view returns (uint256 _exchangeRate); } +/** + * @title CBEthCollateral + * @notice Collateral plugin for Coinbase's staked ETH + * tok = cbETH + * ref = ETH2 + * tar = ETH + * UoA = USD + */ contract CBEthCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - CBEth public immutable token; - AggregatorV3Interface public immutable refPerTokChainlinkFeed; - uint48 public immutable refPerTokChainlinkTimeout; + AggregatorV3Interface public immutable targetPerTokChainlinkFeed; // {target/tok} + uint48 public immutable targetPerTokChainlinkTimeout; - /// @param config.chainlinkFeed {UoA/ref} price of DAI in USD terms + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param _targetPerTokChainlinkFeed {target/tok} price of cbETH in ETH terms constructor( CollateralConfig memory config, uint192 revenueHiding, - AggregatorV3Interface _refPerTokChainlinkFeed, - uint48 _refPerTokChainlinkTimeout + AggregatorV3Interface _targetPerTokChainlinkFeed, + uint48 _targetPerTokChainlinkTimeout ) AppreciatingFiatCollateral(config, revenueHiding) { - token = CBEth(address(config.erc20)); + require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); + require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - refPerTokChainlinkFeed = _refPerTokChainlinkFeed; - refPerTokChainlinkTimeout = _refPerTokChainlinkTimeout; + targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; + targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; } /// Can revert, used by other contract functions in order to catch errors @@ -50,21 +60,22 @@ contract CBEthCollateral is AppreciatingFiatCollateral { uint192 pegPrice ) { - // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul( - refPerTokChainlinkFeed.price(refPerTokChainlinkTimeout) - ); + uint192 targetPerTok = targetPerTokChainlinkFeed.price(targetPerTokChainlinkTimeout); + + // {UoA/tok} = {UoA/target} * {target/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(targetPerTok); uint192 err = p.mul(oracleError, CEIL); high = p + err; low = p - err; // assert(low <= high); obviously true just by inspection - pegPrice = targetPerRef(); // {target/ref} ETH/ETH is always 1 + // {target/ref} = {target/tok} / {ref/tok} + pegPrice = targetPerTok.div(_underlyingRefPerTok()); } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - return _safeWrap(token.exchangeRate()); + return _safeWrap(CBEth(address(erc20)).exchangeRate()); } } diff --git a/contracts/plugins/assets/cbeth/README.md b/contracts/plugins/assets/cbeth/README.md index fe74735ca5..aa654f92eb 100644 --- a/contracts/plugins/assets/cbeth/README.md +++ b/contracts/plugins/assets/cbeth/README.md @@ -8,9 +8,9 @@ This plugin allows `CBETH` holders to use their tokens as collateral in the Rese ### Units -| tok | ref | target | UoA | -| ----- | --- | ------ | --- | -| cbeth | ETH | ETH | ETH | +| tok | ref | target | UoA | +| ----- | ---- | ------ | --- | +| cbeth | ETH2 | ETH | USD | ### Functions diff --git a/contracts/plugins/assets/rocket-eth/README.md b/contracts/plugins/assets/rocket-eth/README.md index c896231af0..78b2ab3441 100644 --- a/contracts/plugins/assets/rocket-eth/README.md +++ b/contracts/plugins/assets/rocket-eth/README.md @@ -15,15 +15,15 @@ stake in the POS ETH2.0 consenus layer. ### Units -| tok | ref | target | UoA | -| ---- | --- | ------ | --- | -| rETH | ETH | ETH | USD | +| tok | ref | target | UoA | +| ---- | ---- | ------ | --- | +| rETH | ETH2 | ETH | USD | ### refPerTok() -Gets the exchange rate for `rETH` to `ETH` from the rETH token contract using the [getExchangeRate()](https://github.com/rocket-pool/rocketpool/blob/master/contracts/contract/token/RocketTokenRETH.sol#L66) -function. This is the rate used by rocket pool when converting between reth and eth and is closely followed by secondary markets. -While the value of ETH/rETH **should** be only-increasing, it is possible that slashing or inactivity events could occur for the rETH +Gets the exchange rate for `rETH` to `ETH2` from the rETH token contract using the [getExchangeRate()](https://github.com/rocket-pool/rocketpool/blob/master/contracts/contract/token/RocketTokenRETH.sol#L66) +function. This is the rate used by rocket pool when converting between reth and eth2 and is closely followed by secondary markets. +While the value of ETH2/rETH **should** be only-increasing, it is possible that slashing or inactivity events could occur for the rETH validators. As such, `rETH` inherits `AppreciatingFiatCollateral` to allow for some amount of revenue-hiding. The amount of revenue-hiding should be determined by the deployer, but can likely be quite high, as it is more likely that any dips, however large, would be temporary, and, in particularly bad instances, be covered by the Rocket Pool protocol. diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index 42888b93d7..f7f4386650 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -1,17 +1,16 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import "@openzeppelin/contracts/utils/math/Math.sol"; -import "../../../libraries/Fixed.sol"; -import "../AppreciatingFiatCollateral.sol"; -import "../OracleLib.sol"; -import "./vendor/IReth.sol"; +import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; +import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; +import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; +import { IReth } from "./vendor/IReth.sol"; /** * @title RethCollateral - * @notice Collateral plugin for Rocket-Pool ETH, + * @notice Collateral plugin for Rocket-Pool ETH * tok = rETH - * ref = ETH + * ref = ETH2 * tar = ETH * UoA = USD */ @@ -19,20 +18,22 @@ contract RethCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - AggregatorV3Interface public immutable refPerTokChainlinkFeed; - uint48 public immutable refPerTokChainlinkTimeout; + AggregatorV3Interface public immutable targetPerTokChainlinkFeed; + uint48 public immutable targetPerTokChainlinkTimeout; - /// @param config.chainlinkFeed Feed units: {UoA/ref} + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param _targetPerTokChainlinkFeed {target/tok} price of rETH in ETH terms constructor( CollateralConfig memory config, uint192 revenueHiding, - AggregatorV3Interface _refPerTokChainlinkFeed, - uint48 _refPerTokChainlinkTimeout + AggregatorV3Interface _targetPerTokChainlinkFeed, + uint48 _targetPerTokChainlinkTimeout ) AppreciatingFiatCollateral(config, revenueHiding) { - require(address(_refPerTokChainlinkFeed) != address(0), "missing refPerTok feed"); - require(_refPerTokChainlinkTimeout != 0, "refPerTokChainlinkTimeout zero"); - refPerTokChainlinkFeed = _refPerTokChainlinkFeed; - refPerTokChainlinkTimeout = _refPerTokChainlinkTimeout; + require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); + require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + + targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; + targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; } /// Can revert, used by other contract functions in order to catch errors @@ -49,17 +50,18 @@ contract RethCollateral is AppreciatingFiatCollateral { uint192 pegPrice ) { - // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul( - refPerTokChainlinkFeed.price(refPerTokChainlinkTimeout) - ); + uint192 targetPerTok = targetPerTokChainlinkFeed.price(targetPerTokChainlinkTimeout); + + // {UoA/tok} = {UoA/target} * {target/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(targetPerTok); uint192 err = p.mul(oracleError, CEIL); high = p + err; low = p - err; // assert(low <= high); obviously true just by inspection - pegPrice = targetPerRef(); // {target/ref} ETH/ETH is always 1 + // {target/ref} = {target/tok} / {ref/tok} + pegPrice = targetPerTok.div(_underlyingRefPerTok()); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index eed4bb3c43..79f063c586 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -5,7 +5,6 @@ import { ethers } from 'hardhat' import { expect } from 'chai' import { ContractFactory, BigNumberish, BigNumber } from 'ethers' import { - ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -33,13 +32,19 @@ import { whileImpersonating } from '../../../utils/impersonation' interface AnkrETHCollateralFixtureContext extends CollateralFixtureContext { ankreth: IAnkrETH + targetPerTokChainlinkFeed: MockV3Aggregator +} + +interface AnkrETHCollateralOpts extends CollateralOpts { + targetPerTokChainlinkFeed?: string + targetPerTokChainlinkTimeout?: BigNumberish } /* Define deployment functions */ -export const defaultAnkrEthCollateralOpts: CollateralOpts = { +export const defaultAnkrETHCollateralOpts: AnkrETHCollateralOpts = { erc20: ANKRETH, targetName: ethers.utils.formatBytes32String('ETH'), rewardERC20: ZERO_ADDRESS, @@ -53,8 +58,24 @@ export const defaultAnkrEthCollateralOpts: CollateralOpts = { revenueHiding: fp('0'), } -export const deployCollateral = async (opts: CollateralOpts = {}): Promise => { - opts = { ...defaultAnkrEthCollateralOpts, ...opts } +export const deployCollateral = async ( + opts: AnkrETHCollateralOpts = {} +): Promise => { + opts = { ...defaultAnkrETHCollateralOpts, ...opts } + + if (opts.targetPerTokChainlinkFeed === undefined) { + // Use mock targetPerTok feed until Chainlink deploys a real one + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + const targetPerTokChainlinkFeed = ( + await MockV3AggregatorFactory.deploy(18, targetPerTokChainlinkDefaultAnswer) + ) + opts.targetPerTokChainlinkFeed = targetPerTokChainlinkFeed.address + } + if (opts.targetPerTokChainlinkTimeout === undefined) { + opts.targetPerTokChainlinkTimeout = ORACLE_TIMEOUT + } const AnkrETHCollateralFactory: ContractFactory = await ethers.getContractFactory( 'AnkrStakedEthCollateral' @@ -73,6 +94,8 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise = () => Promise const makeCollateralFixtureContext = ( alice: SignerWithAddress, - opts: CollateralOpts = {} + opts: AnkrETHCollateralOpts = {} ): Fixture => { - const collateralOpts = { ...defaultAnkrEthCollateralOpts, ...opts } + const collateralOpts = { ...defaultAnkrETHCollateralOpts, ...opts } const makeCollateralFixtureContext = async () => { const MockV3AggregatorFactory = ( @@ -105,17 +129,22 @@ const makeCollateralFixtureContext = ( collateralOpts.chainlinkFeed = chainlinkFeed.address + const targetPerTokChainlinkFeed = ( + await MockV3AggregatorFactory.deploy(18, targetPerTokChainlinkDefaultAnswer) + ) + collateralOpts.targetPerTokChainlinkFeed = targetPerTokChainlinkFeed.address + collateralOpts.targetPerTokChainlinkTimeout = ORACLE_TIMEOUT + const ankreth = (await ethers.getContractAt('IAnkrETH', ANKRETH)) as IAnkrETH - const rewardToken = (await ethers.getContractAt('ERC20Mock', ZERO_ADDRESS)) as ERC20Mock const collateral = await deployCollateral(collateralOpts) return { alice, collateral, chainlinkFeed, + targetPerTokChainlinkFeed, ankreth, tok: ankreth, - rewardToken, } } @@ -135,50 +164,78 @@ const mintCollateralTo: MintCollateralFunc = as await mintAnkrETH(ctx.ankreth, user, amount, recipient) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} +const changeTargetPerRef = async ( + ctx: AnkrETHCollateralFixtureContext, + percentChange: BigNumber +) => { + // We leave the actual refPerTok exchange where it is and just change {target/tok} + { + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) + } +} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} +const reduceTargetPerRef = async ( + ctx: AnkrETHCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) +} -const reduceRefPerTok = async (ctx: AnkrETHCollateralFixtureContext, pctDecrease: BigNumberish) => { +const increaseTargetPerRef = async ( + ctx: AnkrETHCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctIncrease)) +} + +const changeRefPerTok = async (ctx: AnkrETHCollateralFixtureContext, percentChange: BigNumber) => { const ankrETH = (await ethers.getContractAt('IAnkrETH', ANKRETH)) as IAnkrETH - // Increase ratio so refPerTok decreases + // Move ratio in opposite direction as percentChange const currentRatio = await ankrETH.ratio() - const newRatio: BigNumberish = currentRatio.add(currentRatio.mul(pctDecrease).div(100)) + const newRatio: BigNumberish = currentRatio.add(currentRatio.mul(percentChange.mul(-1)).div(100)) // Impersonate AnkrETH Owner await whileImpersonating(ANKRETH_OWNER, async (ankrEthOwnerSigner) => { await ankrETH.connect(ankrEthOwnerSigner).updateRatio(newRatio) }) + + { + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) + } + + { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } +} + +const reduceRefPerTok = async (ctx: AnkrETHCollateralFixtureContext, pctDecrease: BigNumberish) => { + await changeRefPerTok(ctx, bn(pctDecrease).mul(-1)) } const increaseRefPerTok = async ( ctx: AnkrETHCollateralFixtureContext, pctIncrease: BigNumberish ) => { - const ankrETH = (await ethers.getContractAt('IAnkrETH', ANKRETH)) as IAnkrETH - - // Decrease ratio so refPerTok increases - const currentRatio = await ankrETH.ratio() - const newRatio: BigNumberish = currentRatio.sub(currentRatio.mul(pctIncrease).div(100)) - - // Impersonate AnkrETH Owner - await whileImpersonating(ANKRETH_OWNER, async (ankrEthOwnerSigner) => { - await ankrETH.connect(ankrEthOwnerSigner).updateRatio(newRatio) - }) + await changeRefPerTok(ctx, bn(pctIncrease)) } const getExpectedPrice = async (ctx: AnkrETHCollateralFixtureContext): Promise => { const clData = await ctx.chainlinkFeed.latestRoundData() const clDecimals = await ctx.chainlinkFeed.decimals() - const refPerTok = await ctx.collateral.refPerTok() + const clRptData = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const clRptDecimals = await ctx.targetPerTokChainlinkFeed.decimals() return clData.answer .mul(bn(10).pow(18 - clDecimals)) - .mul(refPerTok) + .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) .div(fp('1')) } @@ -187,7 +244,19 @@ const getExpectedPrice = async (ctx: AnkrETHCollateralFixtureContext): Promise {} +const collateralSpecificConstructorTests = () => { + it('does not allow missing targetPerTok chainlink feed', async () => { + await expect( + deployCollateral({ targetPerTokChainlinkFeed: ethers.constants.AddressZero }) + ).to.be.revertedWith('missing targetPerTok feed') + }) + + it('does not allow targetPerTok oracle timeout at 0', async () => { + await expect(deployCollateral({ targetPerTokChainlinkTimeout: 0 })).to.be.revertedWith( + 'targetPerTokChainlinkTimeout zero' + ) + }) +} // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => {} @@ -212,13 +281,14 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, resetFork, collateralName: 'AnkrStakedETH', chainlinkDefaultAnswer, + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 60473286fc..fa6340bfb4 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -26,12 +26,12 @@ import hre from 'hardhat' interface CbEthCollateralFixtureContext extends CollateralFixtureContext { cbETH: CBEth - refPerTokChainlinkFeed: MockV3Aggregator + targetPerTokChainlinkFeed: MockV3Aggregator } interface CbEthCollateralOpts extends CollateralOpts { - refPerTokChainlinkFeed?: string - refPerTokChainlinkTimeout?: BigNumberish + targetPerTokChainlinkFeed?: string + targetPerTokChainlinkTimeout?: BigNumberish } export const deployCollateral = async ( @@ -54,8 +54,8 @@ export const deployCollateral = async ( delayUntilDefault: opts.delayUntilDefault, }, opts.revenueHiding, - opts.refPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED, - opts.refPerTokChainlinkTimeout ?? ORACLE_TIMEOUT, + opts.targetPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED, + opts.targetPerTokChainlinkTimeout ?? ORACLE_TIMEOUT, { gasLimit: 2000000000 } ) await collateral.deployed() @@ -66,7 +66,7 @@ export const deployCollateral = async ( } const chainlinkDefaultAnswer = bn('1600e8') -const refPerTokChainlinkDefaultAnswer = fp('1') +const targetPerTokChainlinkDefaultAnswer = fp('1.04027709') type Fixture = () => Promise @@ -85,12 +85,12 @@ const makeCollateralFixtureContext = ( await MockV3AggregatorFactory.deploy(8, chainlinkDefaultAnswer) ) collateralOpts.chainlinkFeed = chainlinkFeed.address - const refPerTokChainlinkFeed = ( - await MockV3AggregatorFactory.deploy(18, refPerTokChainlinkDefaultAnswer) + const targetPerTokChainlinkFeed = ( + await MockV3AggregatorFactory.deploy(18, targetPerTokChainlinkDefaultAnswer) ) - collateralOpts.refPerTokChainlinkFeed = refPerTokChainlinkFeed.address - collateralOpts.refPerTokChainlinkTimeout = PRICE_TIMEOUT + collateralOpts.targetPerTokChainlinkFeed = targetPerTokChainlinkFeed.address + collateralOpts.targetPerTokChainlinkTimeout = ORACLE_TIMEOUT const cbETH = (await ethers.getContractAt('CBEth', CB_ETH)) as unknown as CBEth const collateral = await deployCollateral(collateralOpts) @@ -99,7 +99,7 @@ const makeCollateralFixtureContext = ( alice, collateral, chainlinkFeed, - refPerTokChainlinkFeed, + targetPerTokChainlinkFeed, cbETH, tok: cbETH as unknown as ERC20Mock, } @@ -120,11 +120,28 @@ const mintCollateralTo: MintCollateralFunc = asyn await mintCBETH(amount, recipient) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} +const changeTargetPerRef = async (ctx: CbEthCollateralFixtureContext, percentChange: BigNumber) => { + // We leave the actual refPerTok exchange where it is and just change {target/tok} + { + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) + } +} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} +const reduceTargetPerRef = async ( + ctx: CbEthCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) +} + +const increaseTargetPerRef = async ( + ctx: CbEthCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease)) +} const changeRefPerTok = async (ctx: CbEthCollateralFixtureContext, percentChange: BigNumber) => { await whileImpersonating(hre, CB_ETH_ORACLE, async (oracleSigner) => { @@ -133,9 +150,9 @@ const changeRefPerTok = async (ctx: CbEthCollateralFixtureContext, percentChange .connect(oracleSigner) .updateExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) { - const lastRound = await ctx.refPerTokChainlinkFeed.latestRoundData() + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) - await ctx.refPerTokChainlinkFeed.updateAnswer(nextAnswer) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) } { @@ -146,32 +163,19 @@ const changeRefPerTok = async (ctx: CbEthCollateralFixtureContext, percentChange }) } -// prettier-ignore -const reduceRefPerTok = async ( - ctx: CbEthCollateralFixtureContext, - pctDecrease: BigNumberish -) => { - await changeRefPerTok( - ctx, - bn(pctDecrease).mul(-1) - ) +const reduceRefPerTok = async (ctx: CbEthCollateralFixtureContext, pctDecrease: BigNumberish) => { + await changeRefPerTok(ctx, bn(pctDecrease).mul(-1)) } -// prettier-ignore -const increaseRefPerTok = async ( - ctx: CbEthCollateralFixtureContext, - pctIncrease: BigNumberish -) => { - await changeRefPerTok( - ctx, - bn(pctIncrease) - ) + +const increaseRefPerTok = async (ctx: CbEthCollateralFixtureContext, pctIncrease: BigNumberish) => { + await changeRefPerTok(ctx, bn(pctIncrease)) } const getExpectedPrice = async (ctx: CbEthCollateralFixtureContext): Promise => { const clData = await ctx.chainlinkFeed.latestRoundData() const clDecimals = await ctx.chainlinkFeed.decimals() - const clRptData = await ctx.refPerTokChainlinkFeed.latestRoundData() - const clRptDecimals = await ctx.refPerTokChainlinkFeed.decimals() + const clRptData = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const clRptDecimals = await ctx.targetPerTokChainlinkFeed.decimals() return clData.answer .mul(bn(10).pow(18 - clDecimals)) @@ -184,7 +188,19 @@ const getExpectedPrice = async (ctx: CbEthCollateralFixtureContext): Promise {} +const collateralSpecificConstructorTests = () => { + it('does not allow missing targetPerTok chainlink feed', async () => { + await expect( + deployCollateral({ targetPerTokChainlinkFeed: ethers.constants.AddressZero }) + ).to.be.revertedWith('missing targetPerTok feed') + }) + + it('does not allow targetPerTok oracle timeout at 0', async () => { + await expect(deployCollateral({ targetPerTokChainlinkTimeout: 0 })).to.be.revertedWith( + 'targetPerTokChainlinkTimeout zero' + ) + }) +} // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => {} @@ -221,13 +237,14 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, - resetFork: resetFork, + resetFork, collateralName: 'CBEthCollateral', chainlinkDefaultAnswer, + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 36ff13e747..ebda92aa3d 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -220,8 +220,8 @@ export default function fn( const newPrice = await getExpectedPrice(ctx) await expectPrice(collateral.address, newPrice, oracleError, true) const [newLow, newHigh] = await collateral.price() - expect(oldLow).to.not.equal(newLow) - expect(oldHigh).to.not.equal(newHigh) + expect(oldLow).to.be.lt(newLow) + expect(oldHigh).to.be.lt(newHigh) } else { // Check new prices -- no increase expected await expectPrice(collateral.address, expectedPrice, oracleError, true) diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index 21b019a34c..506ed02fd2 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -38,12 +38,12 @@ import { whileImpersonating } from '#/test/utils/impersonation' interface RethCollateralFixtureContext extends CollateralFixtureContext { weth: WETH9 reth: IReth - refPerTokChainlinkFeed: MockV3Aggregator + targetPerTokChainlinkFeed: MockV3Aggregator } interface RethCollateralOpts extends CollateralOpts { - refPerTokChainlinkFeed?: string - refPerTokChainlinkTimeout?: BigNumberish + targetPerTokChainlinkFeed?: string + targetPerTokChainlinkTimeout?: BigNumberish } /* @@ -61,8 +61,8 @@ export const defaultRethCollateralOpts: RethCollateralOpts = { maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, - refPerTokChainlinkFeed: RETH_ETH_PRICE_FEED, - refPerTokChainlinkTimeout: ORACLE_TIMEOUT, + targetPerTokChainlinkFeed: RETH_ETH_PRICE_FEED, + targetPerTokChainlinkTimeout: ORACLE_TIMEOUT, revenueHiding: fp('0'), } @@ -84,8 +84,8 @@ export const deployCollateral = async (opts: RethCollateralOpts = {}): Promise = () => Promise @@ -116,11 +116,11 @@ const makeCollateralFixtureContext = ( await MockV3AggregatorFactory.deploy(8, chainlinkDefaultAnswer) ) - const refPerTokChainlinkFeed = ( + const targetPerTokChainlinkFeed = ( await MockV3AggregatorFactory.deploy(18, refPerTokChainlinkDefaultAnswer) ) collateralOpts.chainlinkFeed = chainlinkFeed.address - collateralOpts.refPerTokChainlinkFeed = refPerTokChainlinkFeed.address + collateralOpts.targetPerTokChainlinkFeed = targetPerTokChainlinkFeed.address const weth = (await ethers.getContractAt('WETH9', WETH)) as WETH9 const reth = (await ethers.getContractAt('IReth', RETH)) as IReth @@ -133,7 +133,7 @@ const makeCollateralFixtureContext = ( chainlinkFeed, weth, reth, - refPerTokChainlinkFeed, + targetPerTokChainlinkFeed, tok: reth, rewardToken, } @@ -205,19 +205,29 @@ const mintCollateralTo: MintCollateralFunc = async await mintRETH(ctx.reth, user, amount, recipient) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} +const changeTargetPerRef = async (ctx: RethCollateralFixtureContext, percentChange: BigNumber) => { + // We leave the actual refPerTok exchange where it is and just change {target/tok} + { + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) + } +} -const rocketBalanceKey = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('network.balance.total')) +const reduceTargetPerRef = async (ctx: RethCollateralFixtureContext, pctDecrease: BigNumberish) => { + await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) +} -// prettier-ignore -const reduceRefPerTok = async ( +const increaseTargetPerRef = async ( ctx: RethCollateralFixtureContext, - pctDecrease: BigNumberish + pctDecrease: BigNumberish ) => { + await changeTargetPerRef(ctx, bn(pctDecrease)) +} + +const rocketBalanceKey = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('network.balance.total')) + +const reduceRefPerTok = async (ctx: RethCollateralFixtureContext, pctDecrease: BigNumberish) => { const rethNetworkBalances = await ethers.getContractAt( 'IRocketNetworkBalances', RETH_NETWORK_BALANCES @@ -229,16 +239,12 @@ const reduceRefPerTok = async ( await rocketStorage.connect(rethSigner).setUint(rocketBalanceKey, lowerBal) }) - const lastRound = await ctx.refPerTokChainlinkFeed.latestRoundData() + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) - await ctx.refPerTokChainlinkFeed.updateAnswer(nextAnswer) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) } -// prettier-ignore -const increaseRefPerTok = async ( - ctx: RethCollateralFixtureContext, - pctIncrease: BigNumberish -) => { +const increaseRefPerTok = async (ctx: RethCollateralFixtureContext, pctIncrease: BigNumberish) => { const rethNetworkBalances = await ethers.getContractAt( 'IRocketNetworkBalances', RETH_NETWORK_BALANCES @@ -250,17 +256,17 @@ const increaseRefPerTok = async ( await rocketStorage.connect(rethSigner).setUint(rocketBalanceKey, lowerBal) }) - const lastRound = await ctx.refPerTokChainlinkFeed.latestRoundData() + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) - await ctx.refPerTokChainlinkFeed.updateAnswer(nextAnswer) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) } const getExpectedPrice = async (ctx: RethCollateralFixtureContext): Promise => { const clData = await ctx.chainlinkFeed.latestRoundData() const clDecimals = await ctx.chainlinkFeed.decimals() - const clRptData = await ctx.refPerTokChainlinkFeed.latestRoundData() - const clRptDecimals = await ctx.refPerTokChainlinkFeed.decimals() + const clRptData = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const clRptDecimals = await ctx.targetPerTokChainlinkFeed.decimals() return clData.answer .mul(bn(10).pow(18 - clDecimals)) @@ -272,17 +278,16 @@ const getExpectedPrice = async (ctx: RethCollateralFixtureContext): Promise { - it('does not allow missing refPerTok chainlink feed', async () => { + it('does not allow missing targetPerTok chainlink feed', async () => { await expect( - deployCollateral({ refPerTokChainlinkFeed: ethers.constants.AddressZero }) - ).to.be.revertedWith('missing refPerTok feed') + deployCollateral({ targetPerTokChainlinkFeed: ethers.constants.AddressZero }) + ).to.be.revertedWith('missing targetPerTok feed') }) - it('does not allow refPerTok oracle timeout at 0', async () => { - await expect(deployCollateral({ refPerTokChainlinkTimeout: 0 })).to.be.revertedWith( - 'refPerTokChainlinkTimeout zero' + it('does not allow targetPerTok oracle timeout at 0', async () => { + await expect(deployCollateral({ targetPerTokChainlinkTimeout: 0 })).to.be.revertedWith( + 'targetPerTokChainlinkTimeout zero' ) }) } @@ -310,13 +315,14 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, resetFork, collateralName: 'RocketPoolETH', chainlinkDefaultAnswer, + itIsPricedByPeg: true, } collateralTests(opts) From f8a7519f18d15dc68bc9ab2b3d9e39e40baedf86 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Tue, 22 Aug 2023 13:09:06 -0400 Subject: [PATCH 032/450] document recommended throttle limits. (#905) --- docs/deployment-variables.md | 217 +++++++++++++++++++++++++++++++++++ docs/system-design.md | 208 --------------------------------- 2 files changed, 217 insertions(+), 208 deletions(-) create mode 100644 docs/deployment-variables.md diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md new file mode 100644 index 0000000000..30a80c383b --- /dev/null +++ b/docs/deployment-variables.md @@ -0,0 +1,217 @@ +# Deployment Parameters + +### `dist` (revenue split) + +The fraction of revenues that should go towards RToken holders vs stakers, as given by the relative values of `dist.rTokenDist` and `dist.rsrDist`. This can be thought of as a single variable between 0 and 100% (during deployment). + +Default value: 60% to stakers and 40% to RToken holders. +Mainnet reasonable range: 0% to 100% + +### `minTradeVolume` + +Dimension: `{UoA}` + +The minimum sized trade that can be performed, in terms of the unit of account. + +Setting this too high will result in auctions happening infrequently or the RToken taking a haircut when it cannot be sure it has enough staked RSR to succeed in rebalancing at par. + +Setting this too low may allow griefers to delay important auctions. The variable should be set such that donations of size `minTradeVolume` would be worth delaying trading `batchAuctionLength` seconds. + +This variable should NOT be interpreted to mean that auction sizes above this value will necessarily clear. It could be the case that gas frictions are so high that auctions launched at this size are not worthy of bids. + +This parameter can be set to zero. + +Default value: `1e21` = $1k +Mainnet reasonable range: 1e19 to 1e23 + +#### `rTokenMaxTradeVolume` + +Dimension: `{UoA}` + +The maximum sized trade for any trade involving RToken, in terms of the unit of account. The high end of the price is applied to this variable to convert it to a token quantity. + +This parameter can be set to zero. + +Default value: `1e24` = $1M +Mainnet reasonable range: 1e22 to 1e27. + +### `rewardRatio` + +Dimension: `{1}` + +The `rewardRatio` is the fraction of the current reward amount that should be handed out per block. + +Default value: `68764601000000` = a half life of 14 days. + +Mainnet reasonable range: 1e11 to 1e13 + +To calculate: `ln(2) / (60*60*24*desired_days_in_half_life/12)`, and then multiply by 1e18. + +### `unstakingDelay` + +Dimension: `{seconds}` + +The unstaking delay is the number of seconds that all RSR unstakings must be delayed in order to account for stakers trying to frontrun defaults. It must be longer than governance cycle, and must be long enough that RSR stakers do not unstake in advance of foreseeable basket change in order to avoid being expensed for slippage. + +Default value: `1209600` = 2 weeks +Mainnet reasonable range: 1 to 31536000 + +### `tradingDelay` + +Dimension: `{seconds}` + +The trading delay is how many seconds should pass after the basket has been changed before a trade can be opened. In the long term this can be set to 0 after MEV searchers are firmly integrated, but at the start it may be useful to have a delay before trading in order to avoid worst-case prices. + +Default value: `7200` = 2 hours +Mainnet reasonable range: 0 to 604800 + +### `warmupPeriod` + +Dimension: `{seconds}` + +The warmup period is how many seconds should pass after the basket regained the SOUND status before an RToken can be issued and/or a trade can be opened. + +Default value: `900` = 15 minutes +Mainnet reasonable range: 0 to 604800 + +### `batchAuctionLength` + +Dimension: `{seconds}` + +The auction length is how many seconds long Gnosis EasyAuctions should be. + +Default value: `900` = 15 minutes +Mainnet reasonable range: 60 to 3600 + +### `dutchAuctionLength` + +Dimension: `{seconds}` + +The dutch auction length is how many seconds long falling-price dutch auctions should be. A longer period will result in less slippage due to better price granularity, and a shorter period will result in more slippage. + +In general, the dutchAuctionLength should be a multiple of the blocktime. This is not enforced at a smart-contract level. + +Default value: `1800` = 30 minutes +Mainnet reasonable range: 300 to 3600 + +At 30 minutes, a 12-second blocktime chain would have 10.87% price drops during the first 40% of the auction, and 0.055% price drops during the second 60%. + +### `backingBuffer` + +Dimension: `{1}` + +The backing buffer is a percentage value that describes how much overcollateralization to hold in the form of RToken. This buffer allows collateral tokens to be converted into RToken, which is a more efficient form of revenue production than trading each individual collateral for the desired RToken, and also adds a small buffer that can prevent RSR from being seized when there are small losses due to slippage during rebalancing. + +Default value: `1e15` = 0.1% +Mainnet reasonable range: 1e12 to 1e18 + +### `maxTradeSlippage` + +Dimension: `{1}` + +The max trade slippage is a percentage value that describes the maximum deviation from oracle prices that any trade can clear at. Oracle prices have ranges of their own; the maximum trade slippage permits additional price movement beyond the worst-case oracle price. + +Default value: `0.01e18` = 1% +Mainnet reasonable range: 1e12 to 1e18 + +### `shortFreeze` + +Dimension: `{s}` + +The number of seconds a short freeze lasts. Governance can freeze forever. + +Default value: `259200` = 3 days +Mainnet reasonable range: 3600 to 2592000 (1 hour to 1 month) + +### `longFreeze` + +Dimension: `{s}` + +The number of seconds a long freeze lasts. Long freezes can be disabled by removing all addresses from the `LONG_FREEZER` role. A long freezer has 6 charges that can be used. + +Default value: `604800` = 7 days +Mainnet reasonable range: 86400 to 31536000 (1 day to 1 year) + +### `withdrawalLeak` + +Dimension: `{1}` + +The fraction of RSR stake that should be permitted to withdraw without a refresh. When cumulative withdrawals (or a single withdrawal) exceed this fraction, gas must be paid to refresh all assets. + +Setting this number larger allows unstakers to save more on gas at the cost of allowing more RSR to exit improperly prior to a default. + +Default value: `5e16` = 5% +Mainnet reasonable range: 0 to 25e16 (0 to 25%) + +### `RToken Supply Throttles` + +In order to restrict the system to organic patterns of behavior, we maintain two supply throttles, one for net issuance and one for net redemption. When a supply change occurs, a check is performed to ensure this does not move the supply more than an acceptable range over a period; a period is fixed to be an hour. The acceptable range (per throttle) is a function of the `amtRate` and `pctRate` variables. **It is the maximum of whichever variable provides the larger rate.** + +The recommended starting values (amt-rate normalized to $USD) for these parameters are as follows: +|**Parameter**|**Value**| +|-------------|---------| +|issuanceThrottle.amtRate|$250k| +|issuanceThrottle.pctRate|5%| +|redemptionThrottle.amtRate|$500k| +|redemptionThrottle.pctRate|7.5%| + +Be sure to convert a $ amtRate (units of `{qUSD}`) back into RTokens (units of `{qTok}`). + +Note the differing units: the `amtRate` variable is in terms of `{qRTok/hour}` while the `pctRate` variable is in terms of `{1/hour}`, i.e a fraction. + +#### `issuanceThrottle.amtRate` + +Dimension: `{qRTok/hour}` + +A quantity of RToken that serves as a lower-bound for how much net issuance to allow per hour. + +Must be at least 1 whole RToken, or 1e18. Can be as large as 1e48. Set it to 1e48 if you want to effectively disable the issuance throttle altogether. + +Default value: `2.5e23` = 250,000 RToken +Mainnet reasonable range: 1e23 to 1e27 + +#### `issuanceThrottle.pctRate` + +Dimension: `{1/hour}` + +A fraction of the RToken supply that indicates how much net issuance to allow per hour. + +Can be 0 to solely rely on `amtRate`; cannot be above 1e18. + +Default value: `5e16` = 5% per hour +Mainnet reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) + +#### `redemptionThrottle.amtRate` + +Dimension: `{qRTok/hour}` + +A quantity of RToken that serves as a lower-bound for how much net redemption to allow per hour. + +Must be at least 1 whole RToken, or 1e18. Can be as large as 1e48. Set it to 1e48 if you want to effectively disable the redemption throttle altogether. + +Default value: `5e23` = 500,000 RToken +Mainnet reasonable range: 1e23 to 1e27 + +#### `redemptionThrottle.pctRate` + +Dimension: `{1/hour}` + +A fraction of the RToken supply that indicates how much net redemption to allow per hour. + +Can be 0 to solely rely on `amtRate`; cannot be above 1e18. + +Default value: `7.5e16` = 7.5% per hour +Mainnet reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) + +### Governance Parameters + +Governance is 8 days end-to-end. + +**Default values** + +- Voting delay: 2 day +- Voting period: 3 days +- Execution delay: 3 days + +Proposal Threshold: 0.01% +Quorum: 10% of the StRSR supply (not RSR) diff --git a/docs/system-design.md b/docs/system-design.md index 8e8ba41292..76c746a2db 100644 --- a/docs/system-design.md +++ b/docs/system-design.md @@ -169,211 +169,3 @@ Linear Phase (last 60% of auction): During this phase, the price decreases linea The `dutchAuctionLength` can be configured to be any value. The suggested default is 30 minutes for a blockchain with a 12-second blocktime. At this ratio of blocktime to auction length, there is a 10.87% price drop per block during the geometric/exponential period and a 0.05% drop during the linear period. The duration of the auction can be adjusted, which will impact the size of the price decreases per block. The "best plausible price" is equal to the exchange rate at the high price of the sell token and the low price of the buy token. The "worst-case price" is equal to the exchange rate at the low price of the sell token and the high price of the sell token, plus an additional discount ranging from 0 to `maxTradeSlippage()`. At minimum auction size the full `maxTradeSlippage()` is applied, while at max auction size no further discount is applied. - -## Deployment Parameters - -### `dist` (revenue split) - -The fraction of revenues that should go towards RToken holders vs stakers, as given by the relative values of `dist.rTokenDist` and `dist.rsrDist`. This can be thought of as a single variable between 0 and 100% (during deployment). - -Default value: 60% to stakers and 40% to RToken holders. -Mainnet reasonable range: 0% to 100% - -### `minTradeVolume` - -Dimension: `{UoA}` - -The minimum sized trade that can be performed, in terms of the unit of account. - -Setting this too high will result in auctions happening infrequently or the RToken taking a haircut when it cannot be sure it has enough staked RSR to succeed in rebalancing at par. - -Setting this too low may allow griefers to delay important auctions. The variable should be set such that donations of size `minTradeVolume` would be worth delaying trading `batchAuctionLength` seconds. - -This variable should NOT be interpreted to mean that auction sizes above this value will necessarily clear. It could be the case that gas frictions are so high that auctions launched at this size are not worthy of bids. - -This parameter can be set to zero. - -Default value: `1e21` = $1k -Mainnet reasonable range: 1e19 to 1e23 - -#### `rTokenMaxTradeVolume` - -Dimension: `{UoA}` - -The maximum sized trade for any trade involving RToken, in terms of the unit of account. The high end of the price is applied to this variable to convert it to a token quantity. - -This parameter can be set to zero. - -Default value: `1e24` = $1M -Mainnet reasonable range: 1e22 to 1e27. - -### `rewardRatio` - -Dimension: `{1}` - -The `rewardRatio` is the fraction of the current reward amount that should be handed out per block. - -Default value: `3209014700000` = a half life of 30 days. - -Mainnet reasonable range: 1e11 to 1e13 - -To calculate: `ln(2) / (60*60*24*desired_days_in_half_life/12)`, and then multiply by 1e18. - -### `unstakingDelay` - -Dimension: `{seconds}` - -The unstaking delay is the number of seconds that all RSR unstakings must be delayed in order to account for stakers trying to frontrun defaults. It must be longer than governance cycle, and must be long enough that RSR stakers do not unstake in advance of foreseeable basket change in order to avoid being expensed for slippage. - -Default value: `1209600` = 2 weeks -Mainnet reasonable range: 1 to 31536000 - -### `tradingDelay` - -Dimension: `{seconds}` - -The trading delay is how many seconds should pass after the basket has been changed before a trade can be opened. In the long term this can be set to 0 after MEV searchers are firmly integrated, but at the start it may be useful to have a delay before trading in order to avoid worst-case prices. - -Default value: `7200` = 2 hours -Mainnet reasonable range: 0 to 604800 - -### `warmupPeriod` - -Dimension: `{seconds}` - -The warmup period is how many seconds should pass after the basket regained the SOUND status before an RToken can be issued and/or a trade can be opened. - -Default value: `900` = 15 minutes -Mainnet reasonable range: 0 to 604800 - -### `batchAuctionLength` - -Dimension: `{seconds}` - -The auction length is how many seconds long Gnosis EasyAuctions should be. - -Default value: `900` = 15 minutes -Mainnet reasonable range: 60 to 3600 - -### `dutchAuctionLength` - -Dimension: `{seconds}` - -The dutch auction length is how many seconds long falling-price dutch auctions should be. A longer period will result in less slippage due to better price granularity, and a shorter period will result in more slippage. - -In general, the dutchAuctionLength should be a multiple of the blocktime. This is not enforced at a smart-contract level. - -Default value: `1800` = 30 minutes -Mainnet reasonable range: 300 to 3600 - -At 30 minutes, a 12-second blocktime chain would have 10.87% price drops during the first 40% of the auction, and 0.055% price drops during the second 60%. - -### `backingBuffer` - -Dimension: `{1}` - -The backing buffer is a percentage value that describes how much overcollateralization to hold in the form of RToken. This buffer allows collateral tokens to be converted into RToken, which is a more efficient form of revenue production than trading each individual collateral for the desired RToken, and also adds a small buffer that can prevent RSR from being seized when there are small losses due to slippage during rebalancing. - -Default value: `1e15` = 0.1% -Mainnet reasonable range: 1e12 to 1e18 - -### `maxTradeSlippage` - -Dimension: `{1}` - -The max trade slippage is a percentage value that describes the maximum deviation from oracle prices that any trade can clear at. Oracle prices have ranges of their own; the maximum trade slippage permits additional price movement beyond the worst-case oracle price. - -Default value: `0.01e18` = 1% -Mainnet reasonable range: 1e12 to 1e18 - -### `shortFreeze` - -Dimension: `{s}` - -The number of seconds a short freeze lasts. Governance can freeze forever. - -Default value: `259200` = 3 days -Mainnet reasonable range: 3600 to 2592000 (1 hour to 1 month) - -### `longFreeze` - -Dimension: `{s}` - -The number of seconds a long freeze lasts. Long freezes can be disabled by removing all addresses from the `LONG_FREEZER` role. A long freezer has 6 charges that can be used. - -Default value: `604800` = 7 days -Mainnet reasonable range: 86400 to 31536000 (1 day to 1 year) - -### `withdrawalLeak` - -Dimension: `{1}` - -The fraction of RSR stake that should be permitted to withdraw without a refresh. When cumulative withdrawals (or a single withdrawal) exceed this fraction, gas must be paid to refresh all assets. - -Setting this number larger allows unstakers to save more on gas at the cost of allowing more RSR to exit improperly prior to a default. - -Default value: `5e16` = 5% -Mainnet reasonable range: 0 to 25e16 (0 to 25%) - -### `RToken Supply Throttles` - -In order to restrict the system to organic patterns of behavior, we maintain two supply throttles, one for net issuance and one for net redemption. When a supply change occurs, a check is performed to ensure this does not move the supply more than an acceptable range over a period; a period is fixed to be an hour. The acceptable range (per throttle) is a function of the `amtRate` and `pctRate` variables. **It is the maximum of whichever variable provides the larger rate.** - -Note the differing units: the `amtRate` variable is in terms of `{qRTok/hour}` while the `pctRate` variable is in terms of `{1/hour}`, i.e a fraction. - -#### `issuanceThrottle.amtRate` - -Dimension: `{qRTok/hour}` - -A quantity of RToken that serves as a lower-bound for how much net issuance to allow per hour. - -Must be at least 1 whole RToken, or 1e18. Can be as large as 1e48. Set it to 1e48 if you want to effectively disable the issuance throttle altogether. - -Default value: `1e24` = 1,000,000 RToken -Mainnet reasonable range: 1e23 to 1e27 - -#### `issuanceThrottle.pctRate` - -Dimension: `{1/hour}` - -A fraction of the RToken supply that indicates how much net issuance to allow per hour. - -Can be 0 to solely rely on `amtRate`; cannot be above 1e18. - -Default value: `2.5e16` = 2.5% per hour -Mainnet reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) - -#### `redemptionThrottle.amtRate` - -Dimension: `{qRTok/hour}` - -A quantity of RToken that serves as a lower-bound for how much net redemption to allow per hour. - -Must be at least 1 whole RToken, or 1e18. Can be as large as 1e48. Set it to 1e48 if you want to effectively disable the redemption throttle altogether. - -Default value: `2e24` = 2,000,000 RToken -Mainnet reasonable range: 1e23 to 1e27 - -#### `redemptionThrottle.pctRate` - -Dimension: `{1/hour}` - -A fraction of the RToken supply that indicates how much net redemption to allow per hour. - -Can be 0 to solely rely on `amtRate`; cannot be above 1e18. - -Default value: `5e16` = 5% per hour -Mainnet reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) - -### Governance Parameters - -Governance is 8 days end-to-end. - -**Default values** - -- Voting delay: 2 day -- Voting period: 3 days -- Execution delay: 3 days - -Proposal Threshold: 0.01% -Quorum: 10% of the StRSR supply (not RSR) From 006eb166b8ec1b4bb7f1b10ec3d793c017057194 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 22 Aug 2023 17:09:01 -0300 Subject: [PATCH 033/450] fix rebalance in facade (#908) --- contracts/facade/FacadeAct.sol | 7 +++++-- test/Facade.test.ts | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 7c6d952a8c..549ccf16ae 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -253,12 +253,15 @@ contract FacadeAct is IFacadeAct, Multicall { bytes1 majorVersion = bytes(bm.version())[0]; if (majorVersion == MAJOR_VERSION_3) { - bm.rebalance(TradeKind.DUTCH_AUCTION); + // solhint-disable-next-line no-empty-blocks + try bm.rebalance(TradeKind.DUTCH_AUCTION) {} catch {} } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { IERC20[] memory emptyERC20s = new IERC20[](0); - address(bm).functionCall( + // solhint-disable-next-line avoid-low-level-calls + (bool success, ) = address(bm).call{ value: 0 }( abi.encodeWithSignature("manageTokens(address[])", emptyERC20s) ); + success = success; // hush warning } else { _revertUnrecognizedVersion(); } diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 5415dd39d6..f500a6a977 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -664,6 +664,11 @@ describe('FacadeRead + FacadeAct contracts', () => { }) it('Should return nextRecollateralizationAuction', async () => { + // Confirm no auction to run yet - should not revert + let [canStart, sell, buy, sellAmount] = + await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + expect(canStart).to.equal(false) + // Setup prime basket await basketHandler.connect(owner).setPrimeBasket([usdc.address], [fp('1')]) @@ -676,7 +681,7 @@ describe('FacadeRead + FacadeAct contracts', () => { const sellAmt: BigNumber = await token.balanceOf(backingManager.address) // Confirm nextRecollateralizationAuction is true - let [canStart, sell, buy, sellAmount] = + ;[canStart, sell, buy, sellAmount] = await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) @@ -739,6 +744,11 @@ describe('FacadeRead + FacadeAct contracts', () => { // Upgrade BackingManager to V2 await backingManager.connect(owner).upgradeTo(backingManagerV2.address) + // Confirm no auction to run yet - should not revert + let [canStart, sell, buy, sellAmount] = + await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + expect(canStart).to.equal(false) + // Setup prime basket await basketHandler.connect(owner).setPrimeBasket([usdc.address], [fp('1')]) @@ -751,7 +761,7 @@ describe('FacadeRead + FacadeAct contracts', () => { const sellAmt: BigNumber = await token.balanceOf(backingManager.address) // Confirm nextRecollateralizationAuction is true - let [canStart, sell, buy, sellAmount] = + ;[canStart, sell, buy, sellAmount] = await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) From 1b37c77004e919aab2158fbbddee05dd63bf5449 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Tue, 22 Aug 2023 16:44:39 -0400 Subject: [PATCH 034/450] C4 39 use comet decimals instead of wrapper decimals. (#889) --- contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol | 4 +++- contracts/plugins/assets/compoundv3/vendor/IComet.sol | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index b9b1e8b233..5e7bd1238c 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -31,6 +31,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { IERC20 public immutable rewardERC20; IComet public immutable comet; uint256 public immutable reservesThresholdIffy; // {qUSDC} + uint8 public immutable cometDecimals; /// @param config.chainlinkFeed Feed units: {UoA/ref} constructor( @@ -41,6 +42,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { rewardERC20 = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); reservesThresholdIffy = reservesThresholdIffy_; + cometDecimals = comet.decimals(); } function bal(address account) external view override(Asset, IAsset) returns (uint192) { @@ -53,7 +55,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { } function _underlyingRefPerTok() internal view virtual override returns (uint192) { - return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(erc20Decimals)); + return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(cometDecimals)); } /// Refresh exchange rates and update default status. diff --git a/contracts/plugins/assets/compoundv3/vendor/IComet.sol b/contracts/plugins/assets/compoundv3/vendor/IComet.sol index 44fffae2d7..e249a3663a 100644 --- a/contracts/plugins/assets/compoundv3/vendor/IComet.sol +++ b/contracts/plugins/assets/compoundv3/vendor/IComet.sol @@ -6,4 +6,6 @@ interface IComet { /// @dev uint104 function targetReserves() external view returns (uint256); + + function decimals() external view returns (uint8); } From 755cf3cdf663c3e9d23206a1b38dd8338c40bd3d Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Wed, 23 Aug 2023 13:06:11 -0400 Subject: [PATCH 035/450] update Asset price comment. (#910) Co-authored-by: Taylor Brent --- contracts/plugins/assets/Asset.sol | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index a254f390ce..14f3b03003 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -112,6 +112,14 @@ contract Asset is IAsset, VersionedAsset { /// @dev Should be general enough to not need to be overridden /// @return _low {UoA/tok} The lower end of the price estimate /// @return _high {UoA/tok} The upper end of the price estimate + /// @notice If the price feed is broken, _low will decay downwards and _high will decay upwards + /// If tryPrice() is broken for more than `oracleTimeout + priceTimeout` seconds, + /// _low will be 0 and _high will be FIX_MAX. + /// Because the price decay begins at `oracleTimeout` seconds and not `updateTime` from the + /// price feed, the price feed can be broken for up to `2 * oracleTimeout` seconds without + /// affecting the price estimate. This could happen if the Asset is refreshed just before + /// the oracleTimeout is reached, forcing a second period of oracleTimeout to pass before + /// the price begins to decay. function price() public view virtual returns (uint192 _low, uint192 _high) { try this.tryPrice() returns (uint192 low, uint192 high, uint192) { // if the price feed is still functioning, use that From 4fb96fa28022998ceb87d9a26d12feebb141d0b6 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Thu, 24 Aug 2023 00:25:34 +0530 Subject: [PATCH 036/450] C4 Audit (Plugin) Changes (#896) Co-authored-by: Taylor Brent --- contracts/plugins/assets/Asset.sol | 2 + .../plugins/assets/EURFiatCollateral.sol | 2 +- .../plugins/assets/aave/StaticATokenLM.sol | 2 +- .../assets/curve/CurveStableCollateral.sol | 3 + .../curve/CurveStableMetapoolCollateral.sol | 3 + .../CurveStableRTokenMetapoolCollateral.sol | 3 + .../assets/curve/CurveVolatileCollateral.sol | 66 ----- .../plugins/assets/erc20/RewardableERC20.sol | 13 +- .../assets/erc20/RewardableERC20Wrapper.sol | 1 + .../MorphoAaveV2TokenisedDeposit.sol | 4 +- .../stargate/StargatePoolFiatCollateral.sol | 3 + .../stargate/StargateRewardableWrapper.sol | 34 ++- .../interfaces/IStargateLPStaking.sol | 2 + .../stargate/mocks/StargateLPStakingMock.sol | 16 +- docs/collateral.md | 4 + test/plugins/RewardableERC20.test.ts | 43 ++++ .../curve/crv/CrvVolatileTestSuite.test.ts | 225 ----------------- .../curve/cvx/CvxVolatileTestSuite.test.ts | 227 ------------------ .../StargateRewardableWrapper.test.ts | 49 +++- 19 files changed, 165 insertions(+), 537 deletions(-) delete mode 100644 contracts/plugins/assets/curve/CurveVolatileCollateral.sol delete mode 100644 test/plugins/individual-collateral/curve/crv/CrvVolatileTestSuite.test.ts delete mode 100644 test/plugins/individual-collateral/curve/cvx/CvxVolatileTestSuite.test.ts diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index ba6908c8a8..1bb044c239 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -38,6 +38,8 @@ contract Asset is IAsset, VersionedAsset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid + /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of + /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, AggregatorV3Interface chainlinkFeed_, diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index ae6dcfc3ca..67d0c12f34 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -34,7 +34,7 @@ contract EURFiatCollateral is FiatCollateral { /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return pegPrice {UoA/ref} + /// @return pegPrice {target/ref} function tryPrice() external view diff --git a/contracts/plugins/assets/aave/StaticATokenLM.sol b/contracts/plugins/assets/aave/StaticATokenLM.sol index f6637e1369..bbecab06dd 100644 --- a/contracts/plugins/assets/aave/StaticATokenLM.sol +++ b/contracts/plugins/assets/aave/StaticATokenLM.sol @@ -554,7 +554,7 @@ contract StaticATokenLM is * @param user The user to compute for * @param balance The balance of the user * @param fresh Flag to account for rewards not claimed by contract yet - * @return The amound of pending rewards in RAY + * @return The amount of pending rewards in RAY */ function _getPendingRewards( address user, diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index 22c336cee0..f5706f75e6 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -20,6 +20,9 @@ import "../curve/PoolTokens.sol"; * ref = stablePlainPool pool invariant * tar = USD * UoA = USD + * + * @notice Curve pools with native ETH or ERC777 should be avoided, + * see docs/collateral.md for information */ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { using OracleLib for AggregatorV3Interface; diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 450cf1f70b..874b48b94e 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -17,6 +17,9 @@ interface ICurveMetaPool is ICurvePool, IERC20Metadata { * ref = PairedUSDToken/USDBasePool pool invariant * tar = USD * UoA = USD + * + * @notice Curve pools with native ETH or ERC777 should be avoided, + * see docs/collateral.md for information */ contract CurveStableMetapoolCollateral is CurveStableCollateral { using OracleLib for AggregatorV3Interface; diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 005a7911b8..420e002f4a 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -12,6 +12,9 @@ import "./CurveStableMetapoolCollateral.sol"; * ref = PairedUSDRToken/USDBasePool pool invariant * tar = USD * UoA = USD + * + * @notice Curve pools with native ETH or ERC777 should be avoided, + * see docs/collateral.md for information */ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { using FixLib for uint192; diff --git a/contracts/plugins/assets/curve/CurveVolatileCollateral.sol b/contracts/plugins/assets/curve/CurveVolatileCollateral.sol deleted file mode 100644 index 4846f4fa25..0000000000 --- a/contracts/plugins/assets/curve/CurveVolatileCollateral.sol +++ /dev/null @@ -1,66 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "./CurveStableCollateral.sol"; - -/** - * @title CurveVolatileCollateral - * This plugin contract extends CrvCurveStableCollateral to work for - * volatile pools like TriCrypto. - * - * tok = ConvexStakingWrapper(volatilePlainPool) - * ref = volatilePlainPool pool invariant - * tar = volatilePlainPool pool invariant - * UoA = USD - */ -contract CurveVolatileCollateral is CurveStableCollateral { - using FixLib for uint192; - - // this isn't saved by our parent classes, but we'll need to track it - uint192 internal immutable _defaultThreshold; // {1} - - /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout - constructor( - CollateralConfig memory config, - uint192 revenueHiding, - PTConfiguration memory ptConfig - ) CurveStableCollateral(config, revenueHiding, ptConfig) { - _defaultThreshold = config.defaultThreshold; - } - - // Override this later to implement non-stable pools - function _anyDepeggedInPool() internal view override returns (bool) { - uint192[] memory balances = getBalances(); // [{tok}] - uint192[] memory vals = new uint192[](balances.length); // {UoA} - uint192 valSum; // {UoA} - - // Calculate vals - for (uint8 i = 0; i < nTokens; i++) { - try this.tokenPrice(i) returns (uint192 low, uint192 high) { - // {UoA/tok} = {UoA/tok} + {UoA/tok} - uint192 mid = (low + high) / 2; - - // {UoA} = {tok} * {UoA/tok} - vals[i] = balances[i].mul(mid); - valSum += vals[i]; - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - // untested: - // pattern validated in other plugins, cost to test is high - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return true; - } - } - - // Check distribution of capital - uint192 expected = FIX_ONE.divu(nTokens); // {1} - for (uint8 i = 0; i < nTokens; i++) { - uint192 observed = divuu(vals[i], valSum); // {1} - if (observed > expected) { - if (observed - expected > _defaultThreshold) return true; - } - } - - return false; - } -} diff --git a/contracts/plugins/assets/erc20/RewardableERC20.sol b/contracts/plugins/assets/erc20/RewardableERC20.sol index cfa132d7cf..58fd23855c 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20.sol @@ -54,7 +54,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { uint256 shares = balanceOf(account); // {qRewards} - uint256 _accumuatedRewards = accumulatedRewards[account]; + uint256 _accumulatedRewards = accumulatedRewards[account]; // {qRewards/share} uint256 _rewardsPerShare = rewardsPerShare; @@ -63,10 +63,10 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { uint256 delta = _rewardsPerShare - accountRewardsPerShare; // {qRewards} = {qRewards/share} * {qShare} - _accumuatedRewards += (delta * shares) / one; + _accumulatedRewards += (delta * shares) / one; } lastRewardsPerShare[account] = _rewardsPerShare; - accumulatedRewards[account] = _accumuatedRewards; + accumulatedRewards[account] = _accumulatedRewards; } function _claimAndSyncRewards() internal virtual { @@ -82,9 +82,14 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { if (balanceAfterClaimingRewards > _previousBalance) { uint256 delta = balanceAfterClaimingRewards - _previousBalance; + uint256 deltaPerShare = (delta * one) / _totalSupply; + + balanceAfterClaimingRewards = _previousBalance + (deltaPerShare * _totalSupply) / one; + // {qRewards/share} += {qRewards} * {qShare/share} / {qShare} - _rewardsPerShare += (delta * one) / _totalSupply; + _rewardsPerShare += deltaPerShare; } + lastRewardBalance = balanceAfterClaimingRewards; rewardsPerShare = _rewardsPerShare; } diff --git a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol index 285582a02f..e2a4ec927f 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol @@ -45,6 +45,7 @@ abstract contract RewardableERC20Wrapper is RewardableERC20 { underlying.safeTransferFrom(msg.sender, address(this), _amount); _afterDeposit(_amount, _to); } + emit Deposited(msg.sender, _to, _amount); } diff --git a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol index 3d4d0d240e..eff7ccd9b5 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol @@ -32,7 +32,7 @@ contract MorphoAaveV2TokenisedDeposit is MorphoTokenisedDeposit { morphoLens = config.morphoLens; } - function getMorphoPoolBalance(address poolToken) + function getMorphoPoolBalance(address _poolToken) internal view virtual @@ -40,7 +40,7 @@ contract MorphoAaveV2TokenisedDeposit is MorphoTokenisedDeposit { returns (uint256) { (, , uint256 supplyBalance) = morphoLens.getCurrentSupplyBalanceInOf( - poolToken, + _poolToken, address(this) ); return supplyBalance; diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 8ac8c13e66..2a97424f65 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -112,6 +112,9 @@ contract StargatePoolFiatCollateral is FiatCollateral { if (_totalSupply != 0) { _rate = divuu(pool.totalLiquidity(), _totalSupply); + } else { + // In case the pool has no tokens at all, the rate is 1:1 + _rate = FIX_ONE; } } diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 44621f3152..d1f6878053 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -25,6 +25,7 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { address(pool_) != address(0), "Invalid address" ); + require(address(stargate_) == address(stakingContract_.stargate()), "Wrong stargate"); uint256 poolLength = stakingContract_.poolLength(); uint256 pid = type(uint256).max; @@ -36,8 +37,6 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { } require(pid != type(uint256).max, "Invalid pool"); - pool_.approve(address(stakingContract_), type(uint256).max); // TODO: Change this! - pool = pool_; poolId = pid; stakingContract = stakingContract_; @@ -45,18 +44,35 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { } function _claimAssetRewards() internal override { - stakingContract.deposit(poolId, 0); + IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); + + if (poolInfo.allocPoint != 0 && totalSupply() != 0) { + stakingContract.deposit(poolId, 0); + } else { + stakingContract.emergencyWithdraw(poolId); + } } - function _afterDeposit(uint256 _amount, address to) internal override { - require(to == msg.sender, "Only the sender can deposit"); + function _afterDeposit(uint256, address) internal override { + uint256 underlyingBalance = underlying.balanceOf(address(this)); + IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); - stakingContract.deposit(poolId, _amount); + if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { + pool.approve(address(stakingContract), underlyingBalance); + stakingContract.deposit(poolId, underlyingBalance); + } } - function _beforeWithdraw(uint256 _amount, address to) internal override { - require(to == msg.sender, "Only the sender can withdraw"); + function _beforeWithdraw(uint256 _amount, address) internal override { + IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); - stakingContract.withdraw(poolId, _amount); + if (poolInfo.allocPoint != 0) { + uint256 underlyingBalance = underlying.balanceOf(address(this)); + if (underlyingBalance < _amount) { + stakingContract.withdraw(poolId, _amount - underlyingBalance); + } + } else { + stakingContract.emergencyWithdraw(poolId); + } } } diff --git a/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol b/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol index 4210c5734f..53b6684366 100644 --- a/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol +++ b/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol @@ -6,6 +6,8 @@ import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; interface IStargateLPStaking { function poolLength() external view returns (uint256); + function stargate() external view returns (IERC20); + // Info of each pool. struct PoolInfo { // Address of LP token contract. diff --git a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol index b5c03837f1..2fa2cebe45 100644 --- a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol +++ b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol @@ -10,9 +10,11 @@ contract StargateLPStakingMock is IStargateLPStaking { mapping(uint256 => mapping(address => uint256)) poolToUserBalance; ERC20Mock public immutable stargateMock; + IERC20 public immutable stargate; constructor(ERC20Mock stargateMock_) { stargateMock = stargateMock_; + stargate = stargateMock_; } function poolLength() external view override returns (uint256) { @@ -46,7 +48,14 @@ contract StargateLPStakingMock is IStargateLPStaking { poolToUserBalance[pid][sender] -= amount; } - function emergencyWithdraw(uint256 pid) external override {} + function emergencyWithdraw(uint256 pid) external override { + IERC20 pool = _poolInfo[pid].lpToken; + + uint256 amount = poolToUserBalance[pid][msg.sender]; + poolToUserBalance[pid][msg.sender] = 0; + + pool.transfer(msg.sender, amount); + } function addRewardsToUser( uint256 pid, @@ -59,9 +68,14 @@ contract StargateLPStakingMock is IStargateLPStaking { function addPool(IERC20 lpToken) internal { PoolInfo memory info; info.lpToken = lpToken; + info.allocPoint = 10; _poolInfo.push(info); } + function setAllocPoint(uint256 pid, uint256 allocPoint) external { + _poolInfo[pid].allocPoint = allocPoint; + } + function _emitUserRewards(uint256 pid, address user) private { uint256 amount = poolToUserRewardsPending[pid][user]; stargateMock.mint(user, amount); diff --git a/docs/collateral.md b/docs/collateral.md index aa4fe491cd..d9589954e1 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -125,6 +125,10 @@ interface ICollateral is IAsset { ``` +## Some security considerations + +The protocol specifically does not allow the use of any assets that have a callback mechanism, such as ERC777 or native ETH. In order to support these assets, they must be wrapped in an ERC20 contract that does not have a callback mechanism. This is a security consideration to prevent reentrancy attacks. This recommendation extends to LP tokens that contain assets with callback mechanisms (Such as Curve raw ETH pools - CRV/ETH for example) as well as tokens/LPs that involve WETH with unwrapping built-in. + ## Accounting Units and Exchange Rates To create a Collateral plugin, you need to select its accounting units (`{tok}`, `{ref}`, `{target}`, and `{UoA}`), and implement views of the exchange rates: `refPerTok()` and `targetPerRef()`. diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index 53459332d9..abc94deb66 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -16,6 +16,7 @@ import { useEnv } from '#/utils/env' import { Implementation } from '../fixtures' import snapshotGasCost from '../utils/snapshotGasCost' import { formatUnits, parseUnits } from 'ethers/lib/utils' +import { MAX_UINT256 } from '#/common/constants' type Fixture = () => Promise @@ -630,6 +631,48 @@ for (const wrapperName of wrapperNames) { }) }) + describe(`${wrapperName.replace('Test', '')} Special Case: Fractional Rewards Tracking`, () => { + // Assets + let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest + let rewardableAsset: ERC20MockRewarding + + // Main + let alice: Wallet + let bob: Wallet + + const initBalance = parseUnits('1000000', 18) + const rewardAmount = parseUnits('1.9', 6) + + const fixture = getFixture(18, 6) + + before('load wallets', async () => { + ;[alice, bob] = (await ethers.getSigners()) as unknown as Wallet[] + }) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Correctly handles fractional rewards', async () => { + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + + for (let i = 0; i < 10; i++) { + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + await rewardableVault.claimRewards() + + expect(await rewardableVault.rewardsPerShare()).to.equal(Math.floor(1.9 * (i + 1))) + } + }) + }) + const IMPLEMENTATION: Implementation = useEnv('PROTO_IMPL') == Implementation.P1.toString() ? Implementation.P1 : Implementation.P0 diff --git a/test/plugins/individual-collateral/curve/crv/CrvVolatileTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvVolatileTestSuite.test.ts deleted file mode 100644 index 3230147ce7..0000000000 --- a/test/plugins/individual-collateral/curve/crv/CrvVolatileTestSuite.test.ts +++ /dev/null @@ -1,225 +0,0 @@ -import collateralTests from '../collateralTests' -import { - CurveCollateralFixtureContext, - CurveCollateralOpts, - MintCurveCollateralFunc, -} from '../pluginTestTypes' -import { mintWPool, makeWTricryptoPoolVolatile, resetFork } from './helpers' -import { ethers } from 'hardhat' -import { ContractFactory, BigNumberish } from 'ethers' -import { - ERC20Mock, - MockV3Aggregator, - MockV3Aggregator__factory, - TestICollateral, -} from '../../../../../typechain' -import { bn } from '../../../../../common/numbers' -import { ZERO_ADDRESS } from '../../../../../common/constants' -import { expect } from 'chai' -import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { - PRICE_TIMEOUT, - USDT_ORACLE_TIMEOUT, - USDT_ORACLE_ERROR, - MAX_TRADE_VOL, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - CurvePoolType, - CRV, - TRI_CRYPTO_HOLDER, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - WBTC_BTC_FEED, - BTC_USD_FEED, - BTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WBTC_BTC_ORACLE_ERROR, - WBTC_ORACLE_TIMEOUT, - WETH_ORACLE_TIMEOUT, - USDT_USD_FEED, - BTC_USD_ORACLE_ERROR, - WETH_ORACLE_ERROR, -} from '../constants' - -type Fixture = () => Promise - -export const defaultCrvVolatileCollateralOpts: CurveCollateralOpts = { - erc20: ZERO_ADDRESS, - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: USDT_USD_FEED, // unused but cannot be zero - oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts - oracleError: bn('1'), // unused but cannot be zero - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - revenueHiding: bn('0'), - nTokens: 3, - curvePool: TRI_CRYPTO, - lpToken: TRI_CRYPTO_TOKEN, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [USDT_ORACLE_TIMEOUT], - [WBTC_ORACLE_TIMEOUT, BTC_ORACLE_TIMEOUT], - [WETH_ORACLE_TIMEOUT], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], -} - -const makeFeeds = async () => { - const MockV3AggregatorFactory = ( - await ethers.getContractFactory('MockV3Aggregator') - ) - - // Substitute all 3 feeds: DAI, USDC, USDT - const wethFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - const wbtcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - const btcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - const usdtFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const wethFeedOrg = MockV3AggregatorFactory.attach(WETH_USD_FEED) - const wbtcFeedOrg = MockV3AggregatorFactory.attach(WBTC_BTC_FEED) - const btcFeedOrg = MockV3AggregatorFactory.attach(BTC_USD_FEED) - const usdtFeedOrg = MockV3AggregatorFactory.attach(USDT_USD_FEED) - - await wethFeed.updateAnswer(await wethFeedOrg.latestAnswer()) - await wbtcFeed.updateAnswer(await wbtcFeedOrg.latestAnswer()) - await btcFeed.updateAnswer(await btcFeedOrg.latestAnswer()) - await usdtFeed.updateAnswer(await usdtFeedOrg.latestAnswer()) - - return { wethFeed, wbtcFeed, btcFeed, usdtFeed } -} - -export const deployCollateral = async ( - opts: CurveCollateralOpts = {} -): Promise<[TestICollateral, CurveCollateralOpts]> => { - if (!opts.erc20 && !opts.feeds) { - const { wethFeed, wbtcFeed, btcFeed, usdtFeed } = await makeFeeds() - - const fix = await makeWTricryptoPoolVolatile() - - opts.feeds = [[wethFeed.address], [wbtcFeed.address, btcFeed.address], [usdtFeed.address]] - opts.erc20 = fix.wrapper.address - } - - opts = { ...defaultCrvVolatileCollateralOpts, ...opts } - - const CrvVolatileCollateralFactory: ContractFactory = await ethers.getContractFactory( - 'CurveVolatileCollateral' - ) - - const collateral = await CrvVolatileCollateralFactory.deploy( - { - erc20: opts.erc20, - targetName: opts.targetName, - priceTimeout: opts.priceTimeout, - chainlinkFeed: opts.chainlinkFeed, - oracleError: opts.oracleError, - oracleTimeout: opts.oracleTimeout, - maxTradeVolume: opts.maxTradeVolume, - defaultThreshold: opts.defaultThreshold, - delayUntilDefault: opts.delayUntilDefault, - }, - opts.revenueHiding, - { - nTokens: opts.nTokens, - curvePool: opts.curvePool, - poolType: opts.poolType, - feeds: opts.feeds, - oracleTimeouts: opts.oracleTimeouts, - oracleErrors: opts.oracleErrors, - lpToken: opts.lpToken, - } - ) - await collateral.deployed() - - // sometimes we are trying to test a negative test case and we want this to fail silently - // fortunately this syntax fails silently because our tools are terrible - await expect(collateral.refresh()) - - return [collateral, opts] -} - -const makeCollateralFixtureContext = ( - alice: SignerWithAddress, - opts: CurveCollateralOpts = {} -): Fixture => { - const collateralOpts = { ...defaultCrvVolatileCollateralOpts, ...opts } - - const makeCollateralFixtureContext = async () => { - const { wethFeed, wbtcFeed, btcFeed, usdtFeed } = await makeFeeds() - - collateralOpts.feeds = [ - [usdtFeed.address], - [wbtcFeed.address, btcFeed.address], - [wethFeed.address], - ] - - const fix = await makeWTricryptoPoolVolatile() - - collateralOpts.erc20 = fix.wrapper.address - collateralOpts.curvePool = fix.curvePool.address - const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) - const crv = await ethers.getContractAt('ERC20Mock', CRV) - - return { - alice, - collateral, - curvePool: fix.curvePool, - wrapper: fix.wrapper, - rewardTokens: [crv], - poolTokens: [fix.usdt, fix.wbtc, fix.weth], - feeds: [usdtFeed, btcFeed, wethFeed], // exclude wbtcFeed - } - } - - return makeCollateralFixtureContext -} - -/* - Define helper functions -*/ - -const mintCollateralTo: MintCurveCollateralFunc = async ( - ctx: CurveCollateralFixtureContext, - amount: BigNumberish, - user: SignerWithAddress, - recipient: string -) => { - await mintWPool(ctx, amount, user, recipient, TRI_CRYPTO_HOLDER) -} - -/* - Define collateral-specific tests -*/ - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificConstructorTests = () => {} - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificStatusTests = () => {} - -/* - Run the test suite -*/ - -const opts = { - deployCollateral, - collateralSpecificConstructorTests, - collateralSpecificStatusTests, - makeCollateralFixtureContext, - mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, - isMetapool: false, - resetFork, - collateralName: 'CurveVolatileCollateral - CurveGaugeWrapper', -} - -collateralTests(opts) diff --git a/test/plugins/individual-collateral/curve/cvx/CvxVolatileTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxVolatileTestSuite.test.ts deleted file mode 100644 index 014b053b86..0000000000 --- a/test/plugins/individual-collateral/curve/cvx/CvxVolatileTestSuite.test.ts +++ /dev/null @@ -1,227 +0,0 @@ -import collateralTests from '../collateralTests' -import { - CurveCollateralFixtureContext, - CurveCollateralOpts, - MintCurveCollateralFunc, -} from '../pluginTestTypes' -import { mintWPool, makeWTricryptoPoolVolatile, resetFork } from './helpers' -import { ethers } from 'hardhat' -import { ContractFactory, BigNumberish } from 'ethers' -import { - ERC20Mock, - MockV3Aggregator, - MockV3Aggregator__factory, - TestICollateral, -} from '../../../../../typechain' -import { bn } from '../../../../../common/numbers' -import { ZERO_ADDRESS } from '../../../../../common/constants' -import { expect } from 'chai' -import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { - PRICE_TIMEOUT, - CVX, - USDT_ORACLE_TIMEOUT, - USDT_ORACLE_ERROR, - MAX_TRADE_VOL, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - CurvePoolType, - CRV, - TRI_CRYPTO_HOLDER, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - WBTC_BTC_FEED, - BTC_USD_FEED, - BTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WBTC_BTC_ORACLE_ERROR, - WBTC_ORACLE_TIMEOUT, - WETH_ORACLE_TIMEOUT, - USDT_USD_FEED, - BTC_USD_ORACLE_ERROR, - WETH_ORACLE_ERROR, -} from '../constants' - -type Fixture = () => Promise - -export const defaultCvxVolatileCollateralOpts: CurveCollateralOpts = { - erc20: ZERO_ADDRESS, - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: USDT_USD_FEED, // unused but cannot be zero - oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts - oracleError: bn('1'), // unused but cannot be zero - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - revenueHiding: bn('0'), - nTokens: 3, - curvePool: TRI_CRYPTO, - lpToken: TRI_CRYPTO_TOKEN, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [USDT_ORACLE_TIMEOUT], - [WBTC_ORACLE_TIMEOUT, BTC_ORACLE_TIMEOUT], - [WETH_ORACLE_TIMEOUT], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], -} - -const makeFeeds = async () => { - const MockV3AggregatorFactory = ( - await ethers.getContractFactory('MockV3Aggregator') - ) - - // Substitute all 3 feeds: DAI, USDC, USDT - const wethFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - const wbtcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - const btcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - const usdtFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const wethFeedOrg = MockV3AggregatorFactory.attach(WETH_USD_FEED) - const wbtcFeedOrg = MockV3AggregatorFactory.attach(WBTC_BTC_FEED) - const btcFeedOrg = MockV3AggregatorFactory.attach(BTC_USD_FEED) - const usdtFeedOrg = MockV3AggregatorFactory.attach(USDT_USD_FEED) - - await wethFeed.updateAnswer(await wethFeedOrg.latestAnswer()) - await wbtcFeed.updateAnswer(await wbtcFeedOrg.latestAnswer()) - await btcFeed.updateAnswer(await btcFeedOrg.latestAnswer()) - await usdtFeed.updateAnswer(await usdtFeedOrg.latestAnswer()) - - return { wethFeed, wbtcFeed, btcFeed, usdtFeed } -} - -export const deployCollateral = async ( - opts: CurveCollateralOpts = {} -): Promise<[TestICollateral, CurveCollateralOpts]> => { - if (!opts.erc20 && !opts.feeds) { - const { wethFeed, wbtcFeed, btcFeed, usdtFeed } = await makeFeeds() - - const fix = await makeWTricryptoPoolVolatile() - - opts.feeds = [[wethFeed.address], [wbtcFeed.address, btcFeed.address], [usdtFeed.address]] - opts.erc20 = fix.wrapper.address - } - - opts = { ...defaultCvxVolatileCollateralOpts, ...opts } - - const CvxVolatileCollateralFactory: ContractFactory = await ethers.getContractFactory( - 'CurveVolatileCollateral' - ) - - const collateral = await CvxVolatileCollateralFactory.deploy( - { - erc20: opts.erc20, - targetName: opts.targetName, - priceTimeout: opts.priceTimeout, - chainlinkFeed: opts.chainlinkFeed, - oracleError: opts.oracleError, - oracleTimeout: opts.oracleTimeout, - maxTradeVolume: opts.maxTradeVolume, - defaultThreshold: opts.defaultThreshold, - delayUntilDefault: opts.delayUntilDefault, - }, - opts.revenueHiding, - { - nTokens: opts.nTokens, - curvePool: opts.curvePool, - poolType: opts.poolType, - feeds: opts.feeds, - oracleTimeouts: opts.oracleTimeouts, - oracleErrors: opts.oracleErrors, - lpToken: opts.lpToken, - } - ) - await collateral.deployed() - - // sometimes we are trying to test a negative test case and we want this to fail silently - // fortunately this syntax fails silently because our tools are terrible - await expect(collateral.refresh()) - - return [collateral, opts] -} - -const makeCollateralFixtureContext = ( - alice: SignerWithAddress, - opts: CurveCollateralOpts = {} -): Fixture => { - const collateralOpts = { ...defaultCvxVolatileCollateralOpts, ...opts } - - const makeCollateralFixtureContext = async () => { - const { wethFeed, wbtcFeed, btcFeed, usdtFeed } = await makeFeeds() - - collateralOpts.feeds = [ - [usdtFeed.address], - [wbtcFeed.address, btcFeed.address], - [wethFeed.address], - ] - - const fix = await makeWTricryptoPoolVolatile() - - collateralOpts.erc20 = fix.wrapper.address - collateralOpts.curvePool = fix.curvePool.address - const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) - const cvx = await ethers.getContractAt('ERC20Mock', CVX) - const crv = await ethers.getContractAt('ERC20Mock', CRV) - - return { - alice, - collateral, - curvePool: fix.curvePool, - wrapper: fix.wrapper, - rewardTokens: [cvx, crv], - poolTokens: [fix.usdt, fix.wbtc, fix.weth], - feeds: [usdtFeed, btcFeed, wethFeed], // exclude wbtcFeed - } - } - - return makeCollateralFixtureContext -} - -/* - Define helper functions -*/ - -const mintCollateralTo: MintCurveCollateralFunc = async ( - ctx: CurveCollateralFixtureContext, - amount: BigNumberish, - user: SignerWithAddress, - recipient: string -) => { - await mintWPool(ctx, amount, user, recipient, TRI_CRYPTO_HOLDER) -} - -/* - Define collateral-specific tests -*/ - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificConstructorTests = () => {} - -// eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificStatusTests = () => {} - -/* - Run the test suite -*/ - -const opts = { - deployCollateral, - collateralSpecificConstructorTests, - collateralSpecificStatusTests, - makeCollateralFixtureContext, - mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, - isMetapool: false, - resetFork, - collateralName: 'CurveVolatileCollateral - ConvexStakingWrapper', -} - -collateralTests(opts) diff --git a/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts b/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts index e0c4eb4e37..76bf95cb27 100644 --- a/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts @@ -255,10 +255,10 @@ describeFork('Wrapped S*USDC', () => { }) it('claims previous rewards', async () => { + await wrapper.connect(bob).deposit(await mockPool.balanceOf(bob.address), bob.address) await stakingContract.addRewardsToUser(bn('0'), wrapper.address, bn('20000e18')) const availableReward = await stakingContract.pendingStargate('0', wrapper.address) await mockPool.mint(bob.address, initialAmount) - await wrapper.connect(bob).deposit(await mockPool.balanceOf(bob.address), bob.address) await wrapper.connect(bob).claimRewards() expect(availableReward).to.be.eq(await stargate.balanceOf(bob.address)) @@ -383,5 +383,52 @@ describeFork('Wrapped S*USDC', () => { // charles rewards - 0 }) }) + + describe('Emergency - Ignore Rewards', () => { + const amount = bn('20000e6') + + beforeEach(async () => { + const requiredAmount = await stgUSDC.amountLPtoLD(amount) + + await allocateUSDC(bob.address, requiredAmount.sub(await usdc.balanceOf(bob.address))) + + await usdc.connect(bob).approve(router.address, requiredAmount) + await router.connect(bob).addLiquidity(await stgUSDC.poolId(), requiredAmount, bob.address) + + await stgUSDC.connect(bob).approve(wstgUSDC.address, ethers.constants.MaxUint256) + }) + + it('deposits & withdraws correctly when in emergency already', async () => { + // Set staking contract in emergency mode + await stakingContract.setAllocPoint(0, 0) + + await wstgUSDC.connect(bob).deposit(await stgUSDC.balanceOf(bob.address), bob.address) + + expect(await stgUSDC.balanceOf(bob.address)).to.equal(0) + expect(await wstgUSDC.balanceOf(bob.address)).to.closeTo(amount, 10) + expect(await usdc.balanceOf(bob.address)).to.equal(0) + + await wstgUSDC.connect(bob).withdraw(await wstgUSDC.balanceOf(bob.address), bob.address) + + expect(await wstgUSDC.balanceOf(bob.address)).to.closeTo(bn('0'), 10) + expect(await stgUSDC.balanceOf(bob.address)).to.closeTo(amount, 10) + }) + + it('deposits & withdraws correctly when put in emergency while operating', async () => { + await wstgUSDC.connect(bob).deposit(await stgUSDC.balanceOf(bob.address), bob.address) + + expect(await stgUSDC.balanceOf(bob.address)).to.equal(0) + expect(await wstgUSDC.balanceOf(bob.address)).to.closeTo(amount, 10) + expect(await usdc.balanceOf(bob.address)).to.equal(0) + + // Set staking contract in emergency mode + await stakingContract.setAllocPoint(0, 0) + + await wstgUSDC.connect(bob).withdraw(await wstgUSDC.balanceOf(bob.address), bob.address) + + expect(await wstgUSDC.balanceOf(bob.address)).to.closeTo(bn('0'), 10) + expect(await stgUSDC.balanceOf(bob.address)).to.closeTo(amount, 10) + }) + }) }) }) From 8aa658e0cbd8f3fe815831c1454c3a3e4350b9bb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 23 Aug 2023 16:12:45 -0400 Subject: [PATCH 037/450] Restrict disabling dutch auctions to those started by the BackingManager (#903) --- CHANGELOG.md | 1 + contracts/p0/Broker.sol | 17 ++++++++++------- contracts/p1/Broker.sol | 17 ++++++++++------- test/Revenues.test.ts | 18 +++++++++--------- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c799ae6f1..c4c5452c71 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ Then call `Broker.cacheComponents()`. - Replace use of `lotPrice()` with `price()` - `Broker` [+1 slot] - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` + - Only permit BackingManager-started dutch auctions to report violations and disable trading ## Plugins diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 51619620ed..9527a213dc 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -101,13 +101,16 @@ contract BrokerP0 is ComponentP0, IBroker { emit BatchTradeDisabledSet(batchTradeDisabled, true); batchTradeDisabled = true; } else if (kind == TradeKind.DUTCH_AUCTION) { - IERC20Metadata sell = trade.sell(); - emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); - dutchTradeDisabled[sell] = true; - - IERC20Metadata buy = trade.buy(); - emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); - dutchTradeDisabled[buy] = true; + // Only allow BackingManager-started trades to disable Dutch Auctions + if (DutchTrade(address(trade)).origin() == main.backingManager()) { + IERC20Metadata sell = trade.sell(); + emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); + dutchTradeDisabled[sell] = true; + + IERC20Metadata buy = trade.buy(); + emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); + dutchTradeDisabled[buy] = true; + } } else { revert("unrecognized trade kind"); } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 2cf4600878..a8fd023aee 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -146,13 +146,16 @@ contract BrokerP1 is ComponentP1, IBroker { emit BatchTradeDisabledSet(batchTradeDisabled, true); batchTradeDisabled = true; } else if (kind == TradeKind.DUTCH_AUCTION) { - IERC20Metadata sell = trade.sell(); - emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); - dutchTradeDisabled[sell] = true; - - IERC20Metadata buy = trade.buy(); - emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); - dutchTradeDisabled[buy] = true; + // Only allow BackingManager-started trades to disable Dutch Auctions + if (DutchTrade(address(trade)).origin() == backingManager) { + IERC20Metadata sell = trade.sell(); + emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); + dutchTradeDisabled[sell] = true; + + IERC20Metadata buy = trade.buy(); + emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); + dutchTradeDisabled[buy] = true; + } } else { revert("unrecognized trade kind"); } diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 191c5864e0..86ba41c71c 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -2228,7 +2228,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) }) - it('Should report violation when Dutch Auction clears in geometric phase', async () => { + it('Should not report violation when Dutch Auction clears in geometric phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade @@ -2322,24 +2322,24 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Advance time near end of geometric phase await advanceBlocks(config.dutchAuctionLength.div(12).div(5).sub(5)) - // Should settle RSR auction + // Should settle RSR auction without disabling dutch auctions await rsr.connect(addr1).approve(rsrTrade.address, sellAmt.mul(10)) await expect(rsrTrade.connect(addr1).bid()) .to.emit(rsrTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rsr.address, sellAmt, anyValue) - expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(true) + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) - // Should still be able to settle RToken auction, even though aaveToken is now disabled + // Should still be able to settle RToken auction await rToken.connect(addr1).approve(rTokenTrade.address, sellAmtRToken.mul(10)) await expect(rTokenTrade.connect(addr1).bid()) .to.emit(rTokenTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rToken.address, sellAmtRToken, anyValue) - // Check all 3 tokens are disabled for dutch auctions - expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(true) + // Check all no tokens are disabled for dutch auctions + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) }) it('Should not report violation when Dutch Auction clears in first linear phase', async () => { From 2c98933c00935ffdae6cd447acf50deaf7ecd4c2 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Thu, 24 Aug 2023 15:58:18 -0400 Subject: [PATCH 038/450] Stargate fixes (#881) Co-authored-by: Akshat Mittal --- .../stargate/StargatePoolETHCollateral.sol | 8 ++++++++ .../stargate/StargatePoolFiatCollateral.sol | 8 ++++++++ .../stargate/StargateRewardableWrapper.sol | 2 -- .../deploy_stargate_eth_collateral.ts | 16 ++++++++-------- .../deploy_stargate_usdc_collateral.ts | 4 ++-- .../deploy_stargate_usdt_collateral.ts | 4 ++-- 6 files changed, 28 insertions(+), 14 deletions(-) diff --git a/contracts/plugins/assets/stargate/StargatePoolETHCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolETHCollateral.sol index f33f9f1bb2..cf06c6df8d 100644 --- a/contracts/plugins/assets/stargate/StargatePoolETHCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolETHCollateral.sol @@ -6,6 +6,14 @@ import "../OracleLib.sol"; import "./interfaces/IStargatePool.sol"; import "./StargatePoolFiatCollateral.sol"; +/** + * @title StargatePoolETHCollateral + * @notice Collateral plugin for Stargate ETH, + * tok = wstgETH + * ref = ETH + * tar = ETH + * UoA = USD + */ contract StargatePoolETHCollateral is StargatePoolFiatCollateral { using FixLib for uint192; using OracleLib for AggregatorV3Interface; diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 2a97424f65..2a785a97a5 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -8,6 +8,14 @@ import "./interfaces/IStargatePool.sol"; import "./StargateRewardableWrapper.sol"; +/** + * @title StargatePoolFiatCollateral + * @notice Collateral plugin for Stargate USD Stablecoins, + * tok = wstgUSDC / wstgUSDT + * ref = USDC / USDT + * tar = USD + * UoA = USD + */ contract StargatePoolFiatCollateral is FiatCollateral { using FixLib for uint192; using OracleLib for AggregatorV3Interface; diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index d1f6878053..277acc3a7b 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -9,7 +9,6 @@ import "../erc20/RewardableERC20Wrapper.sol"; contract StargateRewardableWrapper is RewardableERC20Wrapper { IStargateLPStaking public immutable stakingContract; IStargatePool public immutable pool; - IERC20 public immutable stargate; uint256 public immutable poolId; constructor( @@ -40,7 +39,6 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { pool = pool_; poolId = pid; stakingContract = stakingContract_; - stargate = stargate_; } function _claimAssetRewards() internal override { diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_eth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_eth_collateral.ts index 522bc917f0..062619d2df 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_eth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_eth_collateral.ts @@ -14,8 +14,8 @@ import { } from '../../common' import { priceTimeout, oracleTimeout } from '../../utils' import { - StargatePoolFiatCollateral, - StargatePoolFiatCollateral__factory, + StargatePoolETHCollateral, + StargatePoolETHCollateral__factory, } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -65,10 +65,10 @@ async function main() { `Deployed Wrapper for Stargate ETH on ${hre.network.name} (${chainId}): ${erc20.address} ` ) - const StargateCollateralFactory: StargatePoolFiatCollateral__factory = - await hre.ethers.getContractFactory('StargatePoolFiatCollateral') + const StargateCollateralFactory: StargatePoolETHCollateral__factory = + await hre.ethers.getContractFactory('StargatePoolETHCollateral') - const collateral = await StargateCollateralFactory.connect( + const collateral = await StargateCollateralFactory.connect( deployer ).deploy({ priceTimeout: priceTimeout.toString(), @@ -76,10 +76,10 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5%, erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.05').toString(), - delayUntilDefault: bn('86400').toString(), // 24h + defaultThreshold: 0, + delayUntilDefault: 0, }) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts index 6b91f8d531..041c639de9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts @@ -73,12 +73,12 @@ async function main() { ).deploy({ priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: fp('0.001').toString(), // 0.1%, + oracleError: fp('0.0025').toString(), // 0.25%, erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.05').toString(), + defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }) await collateral.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts index 6d0d723c7a..30278b042d 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts @@ -73,12 +73,12 @@ async function main() { ).deploy({ priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDT!, - oracleError: fp('0.001').toString(), // 0.1%, + oracleError: fp('0.0025').toString(), // 0.25%, erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.05').toString(), + defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }) await collateral.deployed() From c10d1cf28c37eba518a514aa0a3e31000c148c28 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 23 Aug 2023 16:51:21 -0400 Subject: [PATCH 039/450] README --- README.md | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 2ff52fa10b..0fb2726242 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The Reserve Protocol enables a class of token called RToken: self-issued tokens RTokens can be minted by depositing a basket of _collateral tokens_, and redeemed for the basket as well. Thus, an RToken will tend to trade at the market value of the entire basket that backs it, as any lower or higher price could be arbitraged. -The definition of the collateral basket is set dynamically on a block-by-block basis with respect to a _reference basket_. While the RToken often does its internal calculus in terms of a single unit of account (USD), what constitutes appreciation is entirely a function of the reference basket, which will often be associated with a variety of units. +The definition of the issuance/redemption basket is set dynamically on a block-by-block basis with respect to a _reference basket_. While the RToken often does its internal calculus in terms of a single unit of account (USD), what constitutes appreciation is entirely a function of the reference basket, which is a linear combination of reference units. RTokens can be over-collateralized, which means that if any of their collateral tokens default, there's a pool of value available to make up for the loss. RToken over-collateralization is provided by Reserve Rights (RSR) holders, who may choose to stake their RSR on an RToken instance. Staked RSR can be seized in the case of a default, in a process that is entirely mechanistic based on on-chain price-feeds, and does not depend on governance votes or human judgment. @@ -22,6 +22,7 @@ For a much more detailed explanation of the economic design, including an hour-l - [Testing with Echidna](docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) - [Deployment](docs/deployment.md): How to do test deployments in our environment. - [System Design](docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. +- [Deployment Variables](docs/deployment-variables.md) A detailed description of the governance variables of the protocol. - [Our Solidity Style](docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. - [Writing Collateral Plugins](docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. - [Building on Top](docs/build-on-top.md): How to build on top of Reserve, including information about long-lived fork environments. @@ -103,13 +104,10 @@ The less-central folders in the repository are dedicated to project management, ## Types of Tests -We conceive of several different types of tests: - -Finally, inside particular testing, it's quite useful to distinguish unit tests from full end-to-end tests. As such, we expect to write tests of the following 5 types: - ### Unit/System Tests - Driven by `hardhat test` +- Addressed by `yarn test:unit` - Checks for expected behavior of the system. - Can run the same tests against both p0 and p1 - Uses contract mocks, where helpful to predict component behavior @@ -119,6 +117,7 @@ Target: Full branch coverage, and testing of any semantically-relevant situation ### End-to-End Tests - Driven by `hardhat test` +- Addressed by `yarn test:integration` - Uses mainnet forking - Can run the same tests against both p0 and p1 - Tests all needed plugin contracts, contract deployment, any migrations, etc. @@ -137,17 +136,7 @@ Located in `fuzz` branch only. Target: The handful of our most depended-upon system properties and invariants are articulated and thoroughly fuzz-tested. Examples of such properties include: - Unless the basket is switched (due to token default or governance) the protocol always remains fully-collateralized. -- Unless the protocol is paused, RToken holders can always redeem -- If the protocol is paused, and governance does not act further, the protocol will later become unpaused. - -### Differential Testing - -Located in `fuzz` branch only. - -- Driven by Echidna -- Asserts that the behavior of each p1 contract matches that of p0 - -Target: Intensive equivalence testing, run continuously for days or weeks, sensitive to any difference between observable behaviors of p0 and p1. +- Unless the protocol is frozen, RToken holders can always redeem ## Contributing @@ -159,7 +148,7 @@ To get setup with tenderly, install the [tenderly cli](https://github.com/Tender ## Responsible Disclosure -[Immunifi](https://immunefi.com/bounty/reserve/) +See: [Immunifi](https://immunefi.com/bounty/reserve/) ## External Documentation From c4c0a2aa3bc4ad67559f4719fef905b1d659bd45 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 24 Aug 2023 18:13:52 -0400 Subject: [PATCH 040/450] nit: re-order usings to alphabetic ordering --- contracts/p1/BasketHandler.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 387055fc63..2cb493d1a3 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -21,9 +21,9 @@ import "./mixins/Component.sol"; /// @custom:oz-upgrades-unsafe-allow external-library-linking contract BasketHandlerP1 is ComponentP1, IBasketHandler { using BasketLibP1 for Basket; + using CollateralStatusComparator for CollateralStatus; using EnumerableMap for EnumerableMap.Bytes32ToUintMap; using EnumerableSet for EnumerableSet.Bytes32Set; - using CollateralStatusComparator for CollateralStatus; using FixLib for uint192; uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight From 182874420c8b8b4c528a4a790f3fb4dfb0460e6c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 24 Aug 2023 18:23:19 -0400 Subject: [PATCH 041/450] C4 40: Restrict dutch trades to being disabled only by BackingManager-started trades (#913) --- CHANGELOG.md | 1 + contracts/p0/Broker.sol | 17 ++++++++++------- contracts/p1/Broker.sol | 17 ++++++++++------- test/Revenues.test.ts | 18 +++++++++--------- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 163413e8af..2e16d9a2f1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,6 +74,7 @@ Bump solidity version to 0.8.19 - Rename event `AuctionLengthSet()` -> `BatchAuctionLengthSet()` - Add `dutchAuctionLength` and `setDutchAuctionLength()` setter and `DutchAuctionLengthSet()` event - Add `dutchTradeImplementation` and `setDutchTradeImplementation()` setter and `DutchTradeImplementationSet()` event + - Only permit BackingManager-started dutch auctions to report violations and disable trading - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req)` - Allow when paused / frozen, since caller must be in-system diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 41584907d2..13ddbbff1a 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -101,13 +101,16 @@ contract BrokerP0 is ComponentP0, IBroker { emit BatchTradeDisabledSet(batchTradeDisabled, true); batchTradeDisabled = true; } else if (kind == TradeKind.DUTCH_AUCTION) { - IERC20Metadata sell = trade.sell(); - emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); - dutchTradeDisabled[sell] = true; - - IERC20Metadata buy = trade.buy(); - emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); - dutchTradeDisabled[buy] = true; + // Only allow BackingManager-started trades to disable Dutch Auctions + if (DutchTrade(address(trade)).origin() == main.backingManager()) { + IERC20Metadata sell = trade.sell(); + emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); + dutchTradeDisabled[sell] = true; + + IERC20Metadata buy = trade.buy(); + emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); + dutchTradeDisabled[buy] = true; + } } else { revert("unrecognized trade kind"); } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 98e52120e4..a87ae21d3d 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -137,13 +137,16 @@ contract BrokerP1 is ComponentP1, IBroker { emit BatchTradeDisabledSet(batchTradeDisabled, true); batchTradeDisabled = true; } else if (kind == TradeKind.DUTCH_AUCTION) { - IERC20Metadata sell = trade.sell(); - emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); - dutchTradeDisabled[sell] = true; - - IERC20Metadata buy = trade.buy(); - emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); - dutchTradeDisabled[buy] = true; + // Only allow BackingManager-started trades to disable Dutch Auctions + if (DutchTrade(address(trade)).origin() == backingManager) { + IERC20Metadata sell = trade.sell(); + emit DutchTradeDisabledSet(sell, dutchTradeDisabled[sell], true); + dutchTradeDisabled[sell] = true; + + IERC20Metadata buy = trade.buy(); + emit DutchTradeDisabledSet(buy, dutchTradeDisabled[buy], true); + dutchTradeDisabled[buy] = true; + } } else { revert("unrecognized trade kind"); } diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 6b4dad02c8..9581b78271 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -2228,7 +2228,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) }) - it('Should report violation when Dutch Auction clears in geometric phase', async () => { + it('Should not report violation when Dutch Auction clears in geometric phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade @@ -2322,24 +2322,24 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Advance time near end of geometric phase await advanceBlocks(config.dutchAuctionLength.div(12).div(5).sub(5)) - // Should settle RSR auction + // Should settle RSR auction without disabling dutch auctions await rsr.connect(addr1).approve(rsrTrade.address, sellAmt.mul(10)) await expect(rsrTrade.connect(addr1).bid()) .to.emit(rsrTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rsr.address, sellAmt, anyValue) - expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(true) + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) - // Should still be able to settle RToken auction, even though aaveToken is now disabled + // Should still be able to settle RToken auction await rToken.connect(addr1).approve(rTokenTrade.address, sellAmtRToken.mul(10)) await expect(rTokenTrade.connect(addr1).bid()) .to.emit(rTokenTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rToken.address, sellAmtRToken, anyValue) - // Check all 3 tokens are disabled for dutch auctions - expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(true) + // Check all no tokens are disabled for dutch auctions + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) }) it('Should not report violation when Dutch Auction clears in first linear phase', async () => { From 97f6d4b6bf6e3addad5a75e5f7f2cb15d00390d5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 24 Aug 2023 18:58:34 -0400 Subject: [PATCH 042/450] CHANGELOG.md --- CHANGELOG.md | 128 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 79 insertions(+), 49 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 163413e8af..aecf655ad9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,43 +14,49 @@ Call the following functions: - `RevenueTrader.cacheComponents()` (for both rsrTrader and rTokenTrader) - `Distributor.cacheComponents()` -Collateral / Asset plugins from 2.1.0 do not need to be upgraded with the exception of Compound V2 cToken collateral ([CTokenFiatCollateral.sol](contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol)), which needs to be swapped in via `AssetRegistry.swapRegistered()`. Skipping this step will result in COMP rewards becoming unclaimable. Note that this will change the ERC20 for the collateral plugin, causing the protocol to trade out of the old ERC20. Since COMP rewards are claimed on every transfer, COMP does not need to be claimed beforehand. +_All_ asset plugins (and their corresponding ERC20s) must be upgraded. + +- Make sure to use `Deployer.deployRTokenAsset()` to create new `RTokenAsset` instances. This asset must be swapped too. #### Optional Steps Call the following functions, once it is desired to turn on the new features: -- `BaasketHandler.setWarmupPeriod()` +- `BasketHandler.setWarmupPeriod()` - `StRSR.setWithdrawalLeak()` - `Broker.setDutchAuctionLength()` -### Core Protocol Contracts +It is acceptable to leave these function calls out of the initial upgrade tx and follow up with them later. The protocol will continue to function, just without dutch auctions, RSR unstaking gas-savings, and the warmup period. -Bump solidity version to 0.8.19 +### 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 + Summary: StRSR contract need to know when refresh() was last called - Add last refresh timestamp tracking and expose via `lastRefresh()` getter - Add `size()` getter for number of registered assets + - Require asset is SOUND on registration + - Bugfix: Fix gas attack that could result in someone disabling the basket - `BackingManager` [+2 slots] Summary: manageTokens was broken out into rebalancing and surplus-forwarding functions to allow users to more precisely call the protocol - Replace `manageTokens(IERC20[] memory erc20s)` with: - - `rebalance(TradeKind)` + `RecollateralizationLibP1` - - Modify trading algorithm to not trade RToken, and instead dissolve it when it has a balance above ~1e6. "dissolve" = melt() with a basketsNeeded change, like redemption. + - `rebalance(TradeKind)` + - Modify trading algorithm to not trade RToken, and instead dissolve it when it has a balance above ~1e6 RToken quanta. "dissolve" = melt() with a basketsNeeded change, similar to redemption but without transfer of RToken collateral. + - Use `lotPrice()` to set trade prices instead of `price()` - Add significant caching to save gas - `forwardRevenue(IERC20[] memory erc20s)` - - Modify backingBuffer logic to keep the backing buffer in collateral tokens only. Fix subtle and inconsequential bug that resulted in not maximizing RToken minting locally, though overall RToken production would not have been lower. + - Modify backingBuffer logic to keep the backing buffer in collateral tokens only. Fix subtle and inconsequential bug that resulted in not maximizing RToken minting locally, though overall RToken production does not change. - Use `nonReentrant` over CEI pattern for gas improvement. related to discussion of [this](https://github.com/code-423n4/2023-01-reserve-findings/issues/347) cross-contract reentrancy risk - move `nonReentrant` up outside `tryTrade` internal helper - Remove `manageTokensSortedOrder(IERC20[] memory erc20s)` - Modify `settleTrade(IERC20 sell)` to call `rebalance()` when caller is a trade it deployed. - - Remove all `delegatecall` during reward claiming + - Remove all `delegatecall` during reward claiming; call `claimRewards()` directly on ERC20 - Functions now revert on unproductive executions, instead of no-op - Do not trade until a warmupPeriod (last time SOUND was newly attained) has passed - Add `cacheComponents()` refresher to be called on upgrade + - Add concept of `tradeNonce` - Bugfix: consider `maxTradeVolume()` from both assets on a trade, not just 1 - `BasketHandler` [+5 slots] @@ -62,18 +68,19 @@ Bump solidity version to 0.8.19 - Enforce `setPrimeBasket()` does not change the net value of a basket in terms of its target units - Add `quoteCustomRedemption(uint48[] basketNonces, uint192[] memory portions, ..)` to quote a linear combination of current-or-previous baskets for redemption - Add `getHistoricalBasket(uint48 basketNonce)` view + - Bugfix: Protect against high BU price overflow -- `Broker` [+1 slot] - Summary: Add a new trading plugin that performs single-lot dutch auctions. Batch auctions via Gnosis EasyAuction are expected to be the backup auction (can be faster if more gas costly) going forward. +- `Broker` [+2 slot] + Summary: Add a second trading method for single-lot dutch auctions. Batch auctions via Gnosis EasyAuction are expected to be the backup auction going forward. - - Add `TradeKind` enum to track multiple trading types - Add new dutch auction `DutchTrade` - - Add minimum auction length of 24s; applies to all auction types + - Add minimum auction length of 20 blocks based on network block time - Rename variable `auctionLength` -> `batchAuctionLength` - Rename setter `setAuctionLength()` -> `setBatchAuctionLength()` - Rename event `AuctionLengthSet()` -> `BatchAuctionLengthSet()` - Add `dutchAuctionLength` and `setDutchAuctionLength()` setter and `DutchAuctionLengthSet()` event - Add `dutchTradeImplementation` and `setDutchTradeImplementation()` setter and `DutchTradeImplementationSet()` event + - Unlike batch auctions, dutch auctions can be disabled _per-ERC20_, and can only be disabled by BackingManager-started trades - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req)` - Allow when paused / frozen, since caller must be in-system @@ -82,13 +89,18 @@ Bump solidity version to 0.8.19 - Modify to handle new gov params: `warmupPeriod`, `dutchAuctionLength`, and `withdrawalLeak` - Do not grant OWNER any of the roles other than ownership + - Add `deployRTokenAsset()` to allow easy creation of new `RTokenAsset` instances -- `Distributor` [+0 slots] - Summary: Waste of gas to double-check this, since caller is another component +- `Distributor` [+2 slots] + Summary: Restrict callers to system components and remove paused/frozen checks - Remove `notPausedOrFrozen` modifier from `distribute()` - `Furnace` [+0 slots] - Summary: Should be able to melting while redeeming when frozen - - Modify `melt()` modifier: `notPausedOrFrozen` -> `notFrozen` + Summary: Allow melting while paused + + - Allow melting while paused + - Melt during updates to the melting ratio + - Lower `MAX_RATIO` from 1e18 to 1e14. + - `Main` [+0 slots] Summary: Breakup pausing into two types of pausing: issuance and trading @@ -98,88 +110,106 @@ Bump solidity version to 0.8.19 - `pausedOrFrozen()` -> `tradingPausedOrFrozen()` and `issuancePausedOrFrozen()` - `PausedSet()` event -> `TradingPausedSet()` and `IssuancePausedSet()` -- `RevenueTrader` [+3 slots] +- `RevenueTrader` [+4 slots] Summary: QoL improvements. Make compatible with new dutch auction trading method - - Remove `delegatecall` during reward claiming + - Remove `delegatecall` during reward claiming; call `claimRewards()` directly on ERC20 - Add `cacheComponents()` refresher to be called on upgrade - - `manageToken(IERC20 sell)` -> `manageToken(IERC20 sell, TradeKind kind)` - - Allow `manageToken(..)` to open dust auctions - - Revert on 0 balance or collision auction, instead of no-op + - `manageToken(IERC20 sell)` -> `manageTokens(IERC20[] calldata erc20s, TradeKind[] memory kinds)` + - Allow multiple auctions to be launched at once + - Allow opening dust auctions (i.e ignore `minTradeVolume`) + - Revert on 0 balance or collision auction instead of no-op - Refresh buy and sell asset before trade - - `settleTrade(IERC20)` now distributes `tokenToBuy`, instead of requiring separate `manageToken(IERC20)` call + - `settleTrade(IERC20)` now distributes `tokenToBuy` automatically, instead of requiring separate `manageToken(IERC20)` call + - Add `returnTokens(IERC20[] memory erc20s)` to return tokens to the BackingManager when the distribution is set to 0 + - Add concept of `tradeNonce` - `RToken` [+0 slots] - Summary: Provide multiple redemption methods for when fullyCollateralized vs not. Should support a higher RToken price during basket changes. + Summary: Provide multiple redemption methods for fullyCollateralized vs uncollateralized. - - Remove `exchangeRateIsValidAfter` modifier from all functions except `setBasketsNeeded()` - - Modify `issueTo()` to revert before `warmupPeriod` - - Modify `redeem(uint256 amount, uint48 basketNonce)` -> `redeem(uint256 amount)`. Redemptions are on the current basket nonce and revert under partial redemption + - Gas: Remove `exchangeRateIsValidAfter` modifier from all functions except `setBasketsNeeded()` + - Modify issuance`to revert before`warmupPeriod` + - Modify `redeem(uint256 amount, uint48 basketNonce)` -> `redeem(uint256 amount)`. Redemptions are always on the current basket nonce and revert under partial redemption - Modify `redeemTo(address recipient, uint256 amount, uint48 basketNonce)` -> `redeemTo(address recipient, uint256 amount)`. Redemptions are on the current basket nonce and revert under partial redemption - - Add new `redeemCustom(.., uint256 amount, uint48[] memory basketNonces, uint192[] memory portions, ..)` function to allow redemption from a linear combination of current and previous baskets. During rebalancing this method of redemption will provide a higher overall redemption value than prorata redemption on the current basket nonce would. - - `mint(address recipient, uint256 amtRToken)` -> `mint(uint256 amtRToken)`, since recipient is _always_ BackingManager. Expand scope to include adjustments to `basketsNeeded` + - Add new `redeemCustom(.., uint256 amount, uint48[] memory basketNonces, uint192[] memory portions, ..)` function to allow redemption from a linear combination of current and previous baskets. During rebalancing this method of redemption may provide a higher overall redemption value than prorata redemption on the current basket nonce would. + - Modify `mint(address recipient, uint256 amtRToken)` -> `mint(uint256 amtRToken)`, since recipient is _always_ BackingManager. Expand scope to include adjustments to `basketsNeeded` - Add `dissolve(uint256 amount)`: burns RToken and reduces `basketsNeeded`, similar to redemption. Only callable by BackingManager - Modify `setBasketsNeeded(..)` to revert when supply is 0 + - Bugfix: Accumulate throttles upon change - `StRSR` [+2 slots] - Summary: Add the ability to cancel unstakings and a withdrawal() gas-saver to allow small RSR amounts to be exempt from refreshes + Summary: Add the ability to cancel unstakings and a withdrawal() gas-saver to allow small RSR amounts to be exempt from asset refreshes + - Lower `MAX_REWARD_RATIO` from 1e18 to 1e14. - Remove duplicate `stakeRate()` getter (same as `1 / exchangeRate()`) - Add `withdrawalLeak` gov param, with `setWithdrawalLeak(..)` setter and `WithdrawalLeakSet()` event - - Modify `withdraw()` to allow a small % of RSR too exit without paying to refresh all assets + - Modify `withdraw()` to allow a small % of RSR to exit without paying to refresh all assets - Modify `withdraw()` to check for `warmupPeriod` - Add ability to re-stake during a withdrawal via `cancelUnstake(uint256 endId)` - Add `UnstakingCancelled()` event + - Allow payout of (already acquired) RSR rewards while frozen + - Add ability for governance to `resetStakes()` when stake rate falls outside (1e12, 1e24) - `StRSRVotes` [+0 slots] - - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function, to encourage people to receive voting weight upon staking + - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking ### Facades -- `FacadeWrite` - Summary: More expressive and fine-grained control over the set of pausers and freezers - - - Do not automatically grant Guardian PAUSER/SHORT_FREEZER/LONG_FREEZER - - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER - - Add ability to initialize with multiple pausers, short freezers, and long freezers - - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` - - Update `DeploymentParams` and `Implementations` struct to contain new gov params and dutch trade plugin - - `FacadeAct` Summary: Remove unused getActCalldata and add way to run revenue auctions - Remove `getActCalldata(..)` + - Remove `canRunRecollateralizationAuctions(..)` - Modify `runRevenueAuctions(..)` to work with both 3.0.0 and 2.1.0 interfaces + - Add `revenueOverview(..)` callstatic function to get an overview of the current revenue state + - Add `nextRecollateralizationAuction(..)` callstatic function to get an overview of the rebalancing state + +- Remove `FacadeMonitor` - `FacadeRead` Summary: Add new data summary views frontends may be interested in - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` + - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions - Remove `traderBalances(..)` - `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` - - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` -- Remove `FacadeMonitor` - redundant with `nextRecollateralizationAuction()` and `revenueOverview()` +- `FacadeWrite` + Summary: More expressive and fine-grained control over the set of pausers and freezers + + - Do not automatically grant Guardian PAUSER/SHORT_FREEZER/LONG_FREEZER + - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER + - Add ability to initialize with multiple pausers, short freezers, and long freezers + - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` + - Update `DeploymentParams` and `Implementations` struct to contain new gov params and dutch trade plugin ## Plugins ### DutchTrade -A cheaper, simpler, trading method. Intended to be the new dominant trading method, with GnosisTrade (batch auctions) available as a faster-but-more-gas-expensive backup option. +A cheaper, simpler, trading method. Intended to be the new dominant trading method, with GnosisTrade (batch auctions) available as a backup option. Generally speaking the batch auction length can be kept shorter than the dutch auction length. -DutchTrade implements a two-stage, single-lot, falling price dutch auction. In the first 40% of the auction, the price falls from 1000x to the best-case price in a geometric/exponential decay as a price manipulation defense mechanism. Bids are not expected to occur (but note: unlike the GnosisTrade batch auction, this mechanism is not resistant to _arbitrary_ price manipulation). +DutchTrade implements a four-stage, single-lot, falling price dutch auction: -Over the last 60% of the auction, the price falls linearly from the best-case price to the worst-case price. Only a single bidder can bid fill the auction, and settlement is atomic. If no bids are received, the capital cycles back to the BackingManager and no loss is taken. +1. In the first 20% of the auction, the price falls from 1000x the best price to the best price in a geometric/exponential decay as a price manipulation defense mechanism. Bids are not expected to occur (but note: unlike the GnosisTrade batch auction, this mechanism is not resistant to _arbitrary_ price manipulation). If a bid occurs, then trading for the pair of tokens is disabled as long as the trade was started by the BackingManager. +2. Between 20% and 45%, the price falls linearly from 1.5x the best price to the best price. +3. Between 45% and 95%, the price falls linearly from the best price to the worst price. +4. Over the last 5% of the auction, the price remains constant at the worst price. Duration: 30 min (default) ### Assets and Collateral -- Bugfix: `lotPrice()` now begins at 100% the lastSavedPrice, instead of below 100%. It can be at 100% for up to the oracleTimeout in the worst-case. - Add `version() return (string)` getter to pave way for separation of asset versioning and core protocol versioning -- Update `claimRewards()` on all assets to 3.0.0-style, without `delegatecall` +- Deprecate `claimRewards()` - Add `lastSave()` to `RTokenAsset` +- Remove `CurveVolatileCollateral` +- Switch `CToken*Collateral` (Compound V2) to using a CTokenVault ERC20 rather than the raw cToken +- Bugfix: `lotPrice()` now begins at 100% the lastSavedPrice, instead of below 100%. It can be at 100% for up to the oracleTimeout in the worst-case. +- Bugfix: Handle oracle deprecation as indicated by the `aggregator()` being set to the zero address +- Bugfix: `AnkrStakedETHCollateral`/`CBETHCollateral`/`RethCollateral` now correctly detects soft default (note that Ankr still requires a new oracle before it can be deployed) +- Bugfix: Adjust `Curve*Collateral` and `RTokenAsset` to treat FIX_MAX correctly as +inf +- Bugfix: Continue updating cached price after collateral default (impacts all appreciating collateral) # 2.1.0 From 51bbdf1f46b079e87c637357848f9ac3fbc60eb4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 24 Aug 2023 19:03:35 -0400 Subject: [PATCH 043/450] collateral.md --- docs/collateral.md | 31 +++++++++---------------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/docs/collateral.md b/docs/collateral.md index d9589954e1..a1108021c1 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -15,7 +15,6 @@ In our inheritance tree, Collateral is a subtype of Asset (i.e. `ICollateral is - How to get its price - A maximum volume per trade -- How to claim token rewards, if the token offers them A Collateral contract is a subtype of Asset (i.e. `ICollateral is IAsset`), so it does everything as Asset does. Beyond that, a Collateral plugin provides the Reserve Protocol with the information it needs to use its token as collateral -- as backing, held in the RToken's basket. @@ -27,20 +26,6 @@ A Collateral contract is a subtype of Asset (i.e. `ICollateral is IAsset`), so i The IAsset and ICollateral interfaces, from `IAsset.sol`, are as follows: ```solidity -/** - * @title IRewardable - * @notice A simple interface mixin to support claiming of rewards. - */ -interface IRewardable { - /// Emitted whenever a reward token balance is claimed - event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); - - /// Claim rewards earned by holding a balance of the ERC20 token - /// Must emit `RewardsClaimed` for each token rewards are claimed for - /// @custom:interaction - function claimRewards() external; -} - /** * @title IAsset * @notice Supertype. Any token that interacts with our system must be wrapped in an asset, @@ -77,8 +62,11 @@ interface IAsset is IRewardable { /// @return If the asset is an instance of ICollateral or not function isCollateral() external view returns (bool); - /// @param {UoA} The max trade volume, in UoA + /// @return {UoA} The max trade volume, in UoA function maxTradeVolume() external view returns (uint192); + + /// @return {s} The timestamp of the last refresh() that saved prices + function lastSave() external view returns (uint48); } /// CollateralStatus must obey a linear ordering. That is: @@ -199,9 +187,9 @@ Note, this doesn't disqualify collateral with USD as its target unit! It's fine ### Representing Fractional Values -Wherever contract variables have these units, it's understood that even though they're handled as `uint`s, they represent fractional values with 18 decimals. In particular, a `{tok}` value is a number of "whole tokens" with 18 decimals. So even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working in units of `{tok}`. +Wherever contract variables have these units, it's understood that even though they're handled as `uint192`s, they represent fractional values with 18 decimals. In particular, a `{tok}` value is a number of "whole tokens" with 18 decimals. So even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working in units of `{tok}`. -For more about our approach for handling decimal-fixed-point, see our [docs on the Fix Library](solidity-style.md#The-Fix-Library). +For more about our approach for handling decimal-fixed-point, see our [docs on the Fix Library](solidity-style.md#The-Fix-Library). Ideally a user-defined type would be used but we found static analyses tools had trouble with that. ## Synthetic Units @@ -349,9 +337,9 @@ If `status()` ever returns `CollateralStatus.DISABLED`, then it must always retu ### Token rewards should be claimable. -Protocol contracts that hold an asset for any significant amount of time are all able to call `claimRewards()` on the ERC20 itself (previously on the asset/collateral plugin via delegatecall). The erc20 or its wrapper contract should include whatever logic is necessary to claim rewards from all relevant defi protocols. These rewards are often emissions from other protocols, but may also be something like trading fees in the case of UNIV3 collateral. To take advantage of this: +Protocol contracts that hold an asset for any significant amount of time must be able to call `claimRewards()` on the ERC20 itself (previously on the asset/collateral plugin via delegatecall). The erc20 should include whatever logic is necessary to claim rewards from all relevant defi protocols. These rewards are often emissions from other protocols, but may also be something like trading fees in the case of UNIV3 collateral. To take advantage of this: -- `claimRewards()` must claim all rewards that may be earned by holding the asset ERC20 and send them to the holder. +- `claimRewards()` must claim all rewards that may be earned by holding the asset ERC20 and send them to the holder, in the correct proportions based on amount of time held. - The `RewardsClaimed` event should be emitted for each token type claimed. ### Smaller Constraints @@ -371,7 +359,6 @@ Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/a - `tryPrice()` (not on the ICollateral interface; used by `price()`/`lotPrice()`/`refresh()`) - `refPerTok()` - `targetPerRef()` -- `claimRewards()` ### refresh() @@ -490,6 +477,6 @@ If implementing a demurrage-based collateral plugin, make sure your targetName f ## Practical Advice from Previous Work -In most cases [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of four functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`, `claimRewards()`. +In most cases [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of three functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`. If you're quite stuck, you might also find it useful to read through our other Collateral plugins as models, found in our repository in `/contracts/plugins/assets`. From 4ed50dc2c2b3821e1d551e9cdb78615765296a5b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 24 Aug 2023 19:05:39 -0400 Subject: [PATCH 044/450] mev.md --- docs/mev.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/mev.md b/docs/mev.md index 8d2cfdf714..7d32e64687 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -27,7 +27,7 @@ Bidding instructions from the `DutchTrade` contract: `DutchTrade` (relevant) interface: ```solidity -function bid() external; // execute a bid at the current block timestamp +function bid() external; // execute a bid at the current block number function sell() external view returns (IERC20); @@ -37,7 +37,7 @@ function status() external view returns (uint8); // 0: not_started, 1: active, 2 function lot() external view returns (uint256); // {qSellTok} the number of tokens being sold -function bidAmount(uint48 timestamp) external view returns (uint256); // {qBuyTok} the number of tokens required to buy the lot, at a particular timestamp +function bidAmount(uint256 blockNumber) external view returns (uint256); // {qBuyTok} the number of tokens required to buy the lot, at a particular block number ``` @@ -45,7 +45,7 @@ To participate: 1. Call `status()` view; the auction is ongoing if return value is 1 2. Call `lot()` to see the number of tokens being sold -3. Call `bidAmount()` to see the number of tokens required to buy the lot, at various timestamps +3. Call `bidAmount()` to see the number of tokens required to buy the lot, at various block numbers 4. After finding an attractive bidAmount, provide an approval for the `buy()` token. The spender should be the `DutchTrade` contract. **Note**: it is very important to set tight approvals! Do not set more than the `bidAmount()` for the desired bidding block else reorgs present risk. 5. Wait until the desired block is reached (hopefully not in the first 40% of the auction) From 9dc44c6040e06bc9a552dc173768b0e322a267a1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 25 Aug 2023 11:13:11 -0400 Subject: [PATCH 045/450] save gas by only checking aggregator if there is a revert (#914) --- contracts/plugins/assets/OracleLib.sol | 47 ++++++++++++++++++-------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index 495186e36c..79b268ed46 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -12,7 +12,7 @@ interface EACAggregatorProxy { /// Used by asset plugins to price their collateral library OracleLib { - /// @dev Use for on-the-fly calculations that should revert + /// @dev Use for nested calls that should revert when there is a problem /// @param timeout The number of seconds after which oracle values should be considered stale /// @return {UoA/tok} function price(AggregatorV3Interface chainlinkFeed, uint48 timeout) @@ -20,22 +20,39 @@ library OracleLib { view returns (uint192) { - // If the aggregator is not set, the chainlink feed has been deprecated - if (EACAggregatorProxy(address(chainlinkFeed)).aggregator() == address(0)) { - revert StalePrice(); - } + try chainlinkFeed.latestRoundData() returns ( + uint80 roundId, + int256 p, + uint256, + uint256 updateTime, + uint80 answeredInRound + ) { + if (updateTime == 0 || answeredInRound < roundId) { + revert StalePrice(); + } - (uint80 roundId, int256 p, , uint256 updateTime, uint80 answeredInRound) = chainlinkFeed - .latestRoundData(); + // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 + uint48 secondsSince = uint48(block.timestamp - updateTime); + if (secondsSince > timeout) revert StalePrice(); - if (updateTime == 0 || answeredInRound < roundId) { - revert StalePrice(); - } - // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 - uint48 secondsSince = uint48(block.timestamp - updateTime); - if (secondsSince > timeout) revert StalePrice(); + // {UoA/tok} + return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); + } catch (bytes memory errData) { + // Check if the aggregator was not set: if so, the chainlink feed has been deprecated + // and a _specific_ error needs to be raised in order to avoid looking like OOG + if (errData.length == 0) { + if (EACAggregatorProxy(address(chainlinkFeed)).aggregator() == address(0)) { + revert StalePrice(); + } + // solhint-disable-next-line reason-string + revert(); + } - // {UoA/tok} - return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); + // Otherwise, preserve the error bytes + // solhint-disable-next-line no-inline-assembly + assembly { + revert(add(32, errData), mload(errData)) + } + } } } From 9657c31cef4e4c0f08cd2bead1c8b150b21eb1db Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Sun, 27 Aug 2023 11:13:34 -0300 Subject: [PATCH 046/450] facade support batch auctions (#918) --- contracts/facade/FacadeAct.sol | 25 +++++++++++---- contracts/interfaces/IFacadeAct.sol | 2 +- test/Facade.test.ts | 50 +++++++++++++++++++++++------ 3 files changed, 60 insertions(+), 17 deletions(-) diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 549ccf16ae..ab3e77152e 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -5,6 +5,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/utils/Address.sol"; import "@openzeppelin/contracts/utils/Multicall.sol"; import "../plugins/trading/DutchTrade.sol"; +import "../plugins/trading/GnosisTrade.sol"; import "../interfaces/IBackingManager.sol"; import "../interfaces/IFacadeAct.sol"; import "../interfaces/IFacadeRead.sol"; @@ -159,7 +160,7 @@ contract FacadeAct is IFacadeAct, Multicall { /// @return buy The buy token in the auction /// @return sellAmount {qSellTok} How much would be sold /// @custom:static-call - function nextRecollateralizationAuction(IBackingManager bm) + function nextRecollateralizationAuction(IBackingManager bm, TradeKind kind) external returns ( bool canStart, @@ -183,22 +184,34 @@ contract FacadeAct is IFacadeAct, Multicall { // If no auctions ongoing, to find a new auction to start if (bm.tradesOpen() == 0) { - _rebalance(bm); + _rebalance(bm, kind); // Find the started auction for (uint256 i = 0; i < erc20s.length; ++i) { - DutchTrade trade = DutchTrade(address(bm.trades(erc20s[i]))); + ITrade trade = ITrade(address(bm.trades(erc20s[i]))); if (address(trade) != address(0)) { canStart = true; sell = trade.sell(); buy = trade.buy(); - sellAmount = trade.sellAmount(); + sellAmount = _getSellAmount(trade); } } } } // === Private === + function _getSellAmount(ITrade trade) private view returns (uint256) { + if (trade.KIND() == TradeKind.DUTCH_AUCTION) { + return + DutchTrade(address(trade)).sellAmount().shiftl_toUint( + int8(trade.sell().decimals()) + ); + } else if (trade.KIND() == TradeKind.BATCH_AUCTION) { + return GnosisTrade(address(trade)).initBal(); + } else { + revert("invalid trade type"); + } + } function _settleTrade(ITrading trader, IERC20 toSettle) private { bytes1 majorVersion = bytes(trader.version())[0]; @@ -249,12 +262,12 @@ contract FacadeAct is IFacadeAct, Multicall { } } - function _rebalance(IBackingManager bm) private { + function _rebalance(IBackingManager bm, TradeKind kind) private { bytes1 majorVersion = bytes(bm.version())[0]; if (majorVersion == MAJOR_VERSION_3) { // solhint-disable-next-line no-empty-blocks - try bm.rebalance(TradeKind.DUTCH_AUCTION) {} catch {} + try bm.rebalance(kind) {} catch {} } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { IERC20[] memory emptyERC20s = new IERC20[](0); // solhint-disable-next-line avoid-low-level-calls diff --git a/contracts/interfaces/IFacadeAct.sol b/contracts/interfaces/IFacadeAct.sol index 61085f0a72..eef569af4f 100644 --- a/contracts/interfaces/IFacadeAct.sol +++ b/contracts/interfaces/IFacadeAct.sol @@ -66,7 +66,7 @@ interface IFacadeAct { /// @return buy The buy token in the auction /// @return sellAmount {qSellTok} How much would be sold /// @custom:static-call - function nextRecollateralizationAuction(IBackingManager bm) + function nextRecollateralizationAuction(IBackingManager bm, TradeKind kind) external returns ( bool canStart, diff --git a/test/Facade.test.ts b/test/Facade.test.ts index f500a6a977..fc1a7121ff 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -666,7 +666,10 @@ describe('FacadeRead + FacadeAct contracts', () => { it('Should return nextRecollateralizationAuction', async () => { // Confirm no auction to run yet - should not revert let [canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(false) // Setup prime basket @@ -682,7 +685,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // Confirm nextRecollateralizationAuction is true ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -704,7 +710,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // nextRecollateralizationAuction should return false (trade open) ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(false) expect(sell).to.equal(ZERO_ADDRESS) expect(buy).to.equal(ZERO_ADDRESS) @@ -716,7 +725,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // nextRecollateralizationAuction should return the next trade // In this case it will retry the same auction ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -746,7 +758,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // Confirm no auction to run yet - should not revert let [canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(false) // Setup prime basket @@ -762,7 +777,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // Confirm nextRecollateralizationAuction is true ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -787,7 +805,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // nextRecollateralizationAuction should return false (trade open) ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(false) expect(sell).to.equal(ZERO_ADDRESS) expect(buy).to.equal(ZERO_ADDRESS) @@ -799,7 +820,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // nextRecollateralizationAuction should return the next trade // In this case it will retry the same auction ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -809,7 +833,10 @@ describe('FacadeRead + FacadeAct contracts', () => { await backingManager.connect(owner).upgradeTo(backingManagerInvalidVer.address) await expect( - facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) ).to.be.revertedWith('unrecognized version') }) @@ -836,7 +863,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // Attempt to trigger recollateralization await expect( - facadeAct.callStatic.nextRecollateralizationAuction(backingManager.address) + facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) ).to.be.revertedWith('unrecognized version') }) From 1db057bf5184ae2625e3690175a8165f703f997d Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 28 Aug 2023 12:17:48 -0400 Subject: [PATCH 047/450] document RTokenAsset.price() oracleError double-counting (#916) --- contracts/plugins/assets/RTokenAsset.sol | 9 ++++++++- docs/collateral.md | 2 ++ docs/writing-collateral-plugins.md | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index fd8c78fa24..6aee26fd40 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -12,7 +12,7 @@ uint256 constant ORACLE_TIMEOUT = 15 minutes; /// Once an RToken gets large enough to get a price feed, replacing this asset with /// a simpler one will do wonders for gas usage -// @dev This RTokenAsset is ONLY compatible with Protocol ^3.0.0 +/// @dev This RTokenAsset is ONLY compatible with Protocol ^3.0.0 contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { using FixLib for uint192; using OracleLib for AggregatorV3Interface; @@ -48,6 +48,11 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { } /// Can revert, used by other contract functions in order to catch errors + /// @dev This method for calculating the price can provide a 2x larger range than the average + /// oracleError of the RToken's backing collateral. This only occurs when there is + /// less RSR overcollateralization in % terms than the average (weighted) oracleError. + /// This arises from the use of oracleErrors inside of `basketRange()` and inside + /// `basketHandler.price()`. When `range.bottom == range.top` then there is no compounding. /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate function tryPrice() external view virtual returns (uint192 low, uint192 high) { @@ -81,6 +86,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-enable no-empty-blocks /// Should not revert + /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { @@ -95,6 +101,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// Should not revert /// lotLow should be nonzero when the asset might be worth selling + /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { diff --git a/docs/collateral.md b/docs/collateral.md index a1108021c1..88727f0fb1 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -428,6 +428,8 @@ Should never revert. Should return a lower and upper estimate for the price of the token on secondary markets. +The difference between the upper and lower estimate should not exceed 5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. + Lower estimate must be <= upper estimate. Should return `(0, FIX_MAX)` if pricing data is unavailable or stale. diff --git a/docs/writing-collateral-plugins.md b/docs/writing-collateral-plugins.md index 01fe3d75d4..be05b3ec64 100644 --- a/docs/writing-collateral-plugins.md +++ b/docs/writing-collateral-plugins.md @@ -27,6 +27,7 @@ Here are some basic questions to answer before beginning to write a new collater 7. **What amount of revenue should this plugin hide? (a minimum of `1e-6`% is recommended, but some collateral may require higher thresholds, and, in rare cases, `0` can be used)** 8. **Are there rewards that can be claimed by holding this collateral? If so, how are they claimed?** Include a github link to the callable function or an example of how to claim. 9. **Does the collateral need to be "refreshed" in order to update its internal state before refreshing the plugin?** Include a github link to the callable function. +10. **Can the `price()` range be kept <5%? What is the largest possible % difference (while priced) between `price().high` and `price().low`?** See [RTokenAsset.tryPrice()](../contracts/plugins/assets/RTokenAsset.sol) and [docs/collateral.md](./collateral.md#price) for additional context. ## Implementation From 57c88d118b9c186b245fe5b968bc3580a74a619d Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:59:11 -0300 Subject: [PATCH 048/450] try catch on ctoken exchangeRateCurrent (#921) Co-authored-by: Taylor Brent --- .../compoundv2/CTokenFiatCollateral.sol | 14 ++- .../CTokenSelfReferentialCollateral.sol | 14 ++- contracts/plugins/mocks/CTokenMock.sol | 9 ++ ...WrapperMock2.sol => CTokenWrapperMock.sol} | 0 test/plugins/Collateral.test.ts | 97 +++++++++++++++++++ .../compoundv2/CTokenFiatCollateral.test.ts | 66 +++++++++++++ 6 files changed, 198 insertions(+), 2 deletions(-) rename contracts/plugins/mocks/{CTokenWrapperMock2.sol => CTokenWrapperMock.sol} (100%) diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index 9688f437d2..78d37b5bcb 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -39,7 +39,19 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { function refresh() public virtual override { // == Refresh == // Update the Compound Protocol - cToken.exchangeRateCurrent(); + // solhint-disable no-empty-blocks + try cToken.exchangeRateCurrent() {} catch (bytes memory errData) { + CollateralStatus oldStatus = status(); + + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } + } // Intentional and correct for the super call to be last! super.refresh(); // already handles all necessary default checks diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index f4b8adf30b..00218ec37e 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -64,7 +64,19 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { function refresh() public virtual override { // == Refresh == // Update the Compound Protocol -- access cToken directly - cToken.exchangeRateCurrent(); + // solhint-disable no-empty-blocks + try cToken.exchangeRateCurrent() {} catch (bytes memory errData) { + CollateralStatus oldStatus = status(); + + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } + } // Violation of calling super first! Composition broken! Intentional! super.refresh(); // already handles all necessary default checks diff --git a/contracts/plugins/mocks/CTokenMock.sol b/contracts/plugins/mocks/CTokenMock.sol index d02401dee0..a0d4f0b562 100644 --- a/contracts/plugins/mocks/CTokenMock.sol +++ b/contracts/plugins/mocks/CTokenMock.sol @@ -11,6 +11,8 @@ contract CTokenMock is ERC20Mock { uint256 internal _exchangeRate; + bool public revertExchangeRate; + constructor( string memory name, string memory symbol, @@ -25,6 +27,9 @@ contract CTokenMock is ERC20Mock { } function exchangeRateCurrent() external returns (uint256) { + if (revertExchangeRate) { + revert("reverting exchange rate current"); + } _exchangeRate = _exchangeRate; // just to avoid sol warning return _exchangeRate; } @@ -48,4 +53,8 @@ contract CTokenMock is ERC20Mock { int8 leftShift = 18 - int8(decimals()) + int8(IERC20Metadata(_underlyingToken).decimals()); return fiatcoinRedemptionRate.shiftl(leftShift).mul_toUint(start); } + + function setRevertExchangeRate(bool newVal) external { + revertExchangeRate = newVal; + } } diff --git a/contracts/plugins/mocks/CTokenWrapperMock2.sol b/contracts/plugins/mocks/CTokenWrapperMock.sol similarity index 100% rename from contracts/plugins/mocks/CTokenWrapperMock2.sol rename to contracts/plugins/mocks/CTokenWrapperMock.sol diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index ea5db3b17e..7f4404952d 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -11,6 +11,7 @@ import { ComptrollerMock, CTokenFiatCollateral, CTokenNonFiatCollateral, + CTokenMock, CTokenWrapperMock, CTokenSelfReferentialCollateral, ERC20Mock, @@ -919,6 +920,38 @@ describe('Collateral contracts', () => { expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) + it('CTokens - Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cToken.exchangeRateStored() + const [currLow, currHigh] = await cTokenCollateral.price() + + expect(await cTokenCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cToken.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenCollateral.refresh()) + .to.emit(cTokenCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cToken.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + it('Reverts if Chainlink feed reverts or runs out of gas, maintains status - Fiat', async () => { const invalidChainlinkFeed: InvalidMockV3Aggregator = ( await InvalidMockV3AggregatorFactory.deploy(8, bn('1e8')) @@ -1521,6 +1554,38 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cNonFiatTokenVault.exchangeRateStored() + const [currLow, currHigh] = await cTokenNonFiatCollateral.price() + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenNonFiatCollateral.refresh()) + .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenNonFiatCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { const invalidChainlinkFeed: InvalidMockV3Aggregator = ( await InvalidMockV3AggregatorFactory.deploy(8, bn('1e8')) @@ -1883,6 +1948,38 @@ describe('Collateral contracts', () => { expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) }) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cSelfRefToken.exchangeRateStored() + const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenSelfReferentialCollateral.refresh()) + .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { const invalidChainlinkFeed: InvalidMockV3Aggregator = ( await InvalidMockV3AggregatorFactory.deploy(8, bn('1e8')) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 75aae7ce72..7efc9ab318 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -844,6 +844,72 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) }) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + // Note: In this case requires to use a CToken mock to be able to change the rate + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') + const symbol = await cDai.symbol() + const cDaiMock: CTokenMock = ( + await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address) + ) + + const cDaiVaultFactory: ContractFactory = await ethers.getContractFactory('CTokenWrapper') + const cDaiMockVault = ( + await cDaiVaultFactory.deploy( + cDaiMock.address, + 'cDAI Mock RToken Vault', + 'rv_mock_cDAI', + comptroller.address + ) + ) + + // Redeploy plugin using the new cDai mock + const newCDaiCollateral: CTokenFiatCollateral = await ( + await ethers.getContractFactory('CTokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await cDaiCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: cDaiMockVault.address, + maxTradeVolume: await cDaiCollateral.maxTradeVolume(), + oracleTimeout: await cDaiCollateral.oracleTimeout(), + targetName: await cDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await cDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + await newCDaiCollateral.refresh() + + // Check initial state + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [currLow, currHigh] = await newCDaiCollateral.price() + const currRate = await cDaiMockVault.exchangeRateStored() + + // Make exchangeRateCurrent() revert + await cDaiMock.setRevertExchangeRate(true) + + // Force updates - Should set to DISABLED + await expect(newCDaiCollateral.refresh()) + .to.emit(newCDaiCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cDaiMockVault.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await newCDaiCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + it('Reverts if oracle reverts or runs out of gas, maintains status', async () => { const InvalidMockV3AggregatorFactory = await ethers.getContractFactory( 'InvalidMockV3Aggregator' From ea1e6c14cf36cd41f633538d8d52022ba0c2b634 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 30 Aug 2023 11:59:24 -0300 Subject: [PATCH 049/450] Clarify rewards handling on transfer (#920) --- .../plugins/assets/aave/StaticATokenLM.sol | 15 ++++- .../aave/StaticATokenLM.test.ts | 63 +++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) diff --git a/contracts/plugins/assets/aave/StaticATokenLM.sol b/contracts/plugins/assets/aave/StaticATokenLM.sol index bbecab06dd..56a537a1b6 100644 --- a/contracts/plugins/assets/aave/StaticATokenLM.sol +++ b/contracts/plugins/assets/aave/StaticATokenLM.sol @@ -24,7 +24,17 @@ import { SafeMath } from "@aave/protocol-v2/contracts/dependencies/openzeppelin/ * @title StaticATokenLM * @notice Wrapper token that allows to deposit tokens on the Aave protocol and receive * a token which balance doesn't increase automatically, but uses an ever-increasing exchange rate. - * The token support claiming liquidity mining rewards from the Aave system. + * + * The token supports claiming liquidity mining rewards from the Aave system. However, there might be + * be permanent loss of rewards for the sender of the token when a `transfer` is performed. This is due + * to the fact that only rewards previously collected from the Incentives Controller are processed (and + * assigned to the `sender`) when tokens are transferred. Any rewards pending to be collected are ignored + * on `transfer`, and might be later claimed by the `receiver`. It was designed this way to reduce gas + * costs on every transfer which would probably outweigh any missing/unprocessed/unclaimed rewards. + * It is important to remark that several operations such as `deposit`, `withdraw`, `collectAndUpdateRewards`, + * among others, will update rewards balances correctly, so while it is true that under certain circumstances + * rewards may not be fully accurate, we expect them only to be slightly off. + * * @author Aave * From: https://github.com/aave/protocol-v2/blob/238e5af2a95c3fbb83b0c8f44501ed2541215122/contracts/protocol/tokenization/StaticATokenLM.sol#L255 **/ @@ -366,6 +376,9 @@ contract StaticATokenLM is /** * @notice Updates rewards for senders and receiver in a transfer (not updating rewards for address(0)) + * Only rewards which were previously collected from the Incentives Controller will be updated on + * every transfer. It is designed this way to reduce gas costs on `transfer`, which will likely + * outweigh the pending (uncollected) rewards for the sender under certain circumstances. * @param from The address of the sender of tokens * @param to The address of the receiver of tokens */ diff --git a/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts b/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts index bb78081cd7..c065fe9f72 100644 --- a/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts +++ b/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts @@ -1868,6 +1868,69 @@ describeFork('StaticATokenLM: aToken wrapper with static balances and liquidity expect(totClaimable4).to.be.gt(userBalance4) expect(unclaimedRewards4).to.be.eq(0) }) + + it('Potential loss of rewards on transfer', async () => { + const amountToDeposit = utils.parseEther('5') + + // Just preparation + await waitForTx(await weth.deposit({ value: amountToDeposit.mul(2) })) + await waitForTx( + await weth.approve(staticAToken.address, amountToDeposit.mul(2), defaultTxParams) + ) + + // Depositing + await waitForTx( + await staticAToken.deposit(userSigner._address, amountToDeposit, 0, true, defaultTxParams) + ) + + const pendingRewards1_u1 = await staticAToken.getClaimableRewards(userSigner._address) + const pendingRewards1_u2 = await staticAToken.getClaimableRewards(user2Signer._address) + + // No rewards assigned yet + expect(pendingRewards1_u1).to.be.eq(0) + expect(pendingRewards1_u2).to.be.eq(0) + + await advanceTime(60 * 60) + + // User1 now has some pending rewards. User2 should have no rewards. + const pendingRewards2_u1 = await staticAToken.getClaimableRewards(userSigner._address) + const pendingRewards2_u2 = await staticAToken.getClaimableRewards(user2Signer._address) + expect(pendingRewards2_u1).to.be.gt(pendingRewards1_u1) + expect(pendingRewards2_u2).to.be.eq(0) + + // Transfer staticATokens to user2 + await waitForTx( + await staticAToken.transfer( + user2Signer._address, + await staticAToken.balanceOf(userSigner._address) + ) + ) + + // User1 now has zero pending rewards, all transferred to User2 + const pendingRewards3_u1 = await staticAToken.getClaimableRewards(userSigner._address) + const pendingRewards3_u2 = await staticAToken.getClaimableRewards(user2Signer._address) + + expect(pendingRewards3_u1).to.be.eq(0) + expect(pendingRewards3_u2).to.be.gt(pendingRewards2_u1) + + // User2 can keep the rewards if for example `collectAndUpdateRewards` is called + await staticAToken.collectAndUpdateRewards() + + // If transfer is performed to User1, rewards stay with User2 + await waitForTx( + await staticAToken + .connect(user2Signer) + .transfer(userSigner._address, await staticAToken.balanceOf(user2Signer._address)) + ) + + // User1 gets only some small rewards, but User2 keeps the rewards + const pendingRewards4_u1 = await staticAToken.getClaimableRewards(userSigner._address) + const pendingRewards4_u2 = await staticAToken.getClaimableRewards(user2Signer._address) + + expect(pendingRewards4_u1).to.be.gt(0) + expect(pendingRewards4_u1).to.be.lt(pendingRewards4_u2) + expect(pendingRewards4_u2).to.be.gt(pendingRewards3_u2) + }) }) it('Multiple users deposit WETH on stataWETH, wait 1 hour, update rewards, one user transfer, then claim and update rewards.', async () => { From b4200598b43445e3a7961f8e22e625038046158c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 10:06:20 -0400 Subject: [PATCH 050/450] 3.1.0 c4 20 (#922) --- CHANGELOG.md | 2 + contracts/interfaces/IBroker.sol | 4 +- contracts/p0/Broker.sol | 24 +++---- contracts/p1/Broker.sol | 12 ++-- contracts/plugins/mocks/InvalidBrokerMock.sol | 4 +- test/Broker.test.ts | 72 ++++++++++--------- test/Revenues.test.ts | 19 ++++- .../aave/ATokenFiatCollateral.test.ts | 7 +- .../compoundv2/CTokenFiatCollateral.test.ts | 7 +- 9 files changed, 82 insertions(+), 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4c5452c71..648ca86e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ Then call `Broker.cacheComponents()`. - `Broker` [+1 slot] - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` - Only permit BackingManager-started dutch auctions to report violations and disable trading + - Remove `setBatchTradeDisabled(bool)` and replace with `enableBatchTrade()` + - Remove `setDutchTradeDisabled(IERC20 erc20, bool)` and replace with `enableDutchTrade(IERC20 erc20)` ## Plugins diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index cecaf8d7b0..fcaeac2c10 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -89,9 +89,9 @@ interface TestIBroker is IBroker { function setDutchAuctionLength(uint48 newAuctionLength) external; - function setBatchTradeDisabled(bool disabled) external; + function enableBatchTrade() external; - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external; + function enableDutchTrade(IERC20Metadata erc20) external; // only present on pre-3.0.0 Brokers; used by EasyAuction regression test function disabled() external view returns (bool); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 9527a213dc..51fcf6ac10 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -190,6 +190,18 @@ contract BrokerP0 is ComponentP0, IBroker { dutchAuctionLength = newAuctionLength; } + /// @custom:governance + function enableBatchTrade() external governance { + emit BatchTradeDisabledSet(batchTradeDisabled, false); + batchTradeDisabled = false; + } + + /// @custom:governance + function enableDutchTrade(IERC20Metadata erc20) external governance { + emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], false); + dutchTradeDisabled[erc20] = false; + } + // === Private === function newBatchAuction(TradeRequest memory req, address caller) private returns (ITrade) { @@ -245,18 +257,6 @@ contract BrokerP0 is ComponentP0, IBroker { return trade; } - /// @custom:governance - function setBatchTradeDisabled(bool disabled) external governance { - emit BatchTradeDisabledSet(batchTradeDisabled, disabled); - batchTradeDisabled = disabled; - } - - /// @custom:governance - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance { - emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); - dutchTradeDisabled[erc20] = disabled; - } - /// @return true if the price is current, or it's the RTokenAsset function priceIsCurrent(IAsset asset) private view returns (bool) { return diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index a8fd023aee..c5cdb649e8 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -216,15 +216,15 @@ contract BrokerP1 is ComponentP1, IBroker { } /// @custom:governance - function setBatchTradeDisabled(bool disabled) external governance { - emit BatchTradeDisabledSet(batchTradeDisabled, disabled); - batchTradeDisabled = disabled; + function enableBatchTrade() external governance { + emit BatchTradeDisabledSet(batchTradeDisabled, false); + batchTradeDisabled = false; } /// @custom:governance - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance { - emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); - dutchTradeDisabled[erc20] = disabled; + function enableDutchTrade(IERC20Metadata erc20) external governance { + emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], false); + dutchTradeDisabled[erc20] = false; } // === Private === diff --git a/contracts/plugins/mocks/InvalidBrokerMock.sol b/contracts/plugins/mocks/InvalidBrokerMock.sol index 7b19993c94..191df5136f 100644 --- a/contracts/plugins/mocks/InvalidBrokerMock.sol +++ b/contracts/plugins/mocks/InvalidBrokerMock.sol @@ -64,9 +64,9 @@ contract InvalidBrokerMock is ComponentP0, IBroker { /// Dummy implementation /* solhint-disable no-empty-blocks */ - function setBatchTradeDisabled(bool disabled) external governance {} + function enableBatchTrade() external governance {} /// Dummy implementation /* solhint-disable no-empty-blocks */ - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance {} + function enableDutchTrade(IERC20Metadata erc20) external governance {} } diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 5db42e6e2b..46c5d69280 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -132,6 +132,30 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { prices = { sellLow: fp('1'), sellHigh: fp('1'), buyLow: fp('1'), buyHigh: fp('1') } }) + const disableBatchTrade = async () => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt( + broker.address, + 205, + slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) + ) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) + } + + const disableDutchTrade = async (erc20: string) => { + const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') + const p = mappingSlot.toHexString().slice(2).padStart(64, '0') + const key = erc20.slice(2).padStart(64, '0') + const slot = ethers.utils.keccak256('0x' + key + p) + await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) + expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) + } + describe('Deployment', () => { it('Should setup Broker correctly', async () => { expect(await broker.gnosis()).to.equal(gnosis.address) @@ -378,28 +402,21 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // If not owner cannot update - await expect(broker.connect(other).setBatchTradeDisabled(true)).to.be.revertedWith( + await expect(broker.connect(other).enableBatchTrade()).to.be.revertedWith('governance only') + await expect(broker.connect(other).enableDutchTrade(token0.address)).to.be.revertedWith( 'governance only' ) - await expect( - broker.connect(other).setDutchTradeDisabled(token0.address, true) - ).to.be.revertedWith('governance only') // Check value did not change expect(await broker.batchTradeDisabled()).to.equal(false) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update batchTradeDisabled with owner - await expect(broker.connect(owner).setBatchTradeDisabled(true)) - .to.emit(broker, 'BatchTradeDisabledSet') - .withArgs(false, true) - - // Check value was updated + // Disable batch trade manually + await disableBatchTrade() expect(await broker.batchTradeDisabled()).to.equal(true) - expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update back to false - await expect(broker.connect(owner).setBatchTradeDisabled(false)) + // Enable batch trade with owner + await expect(broker.connect(owner).enableBatchTrade()) .to.emit(broker, 'BatchTradeDisabledSet') .withArgs(true, false) @@ -407,24 +424,19 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.batchTradeDisabled()).to.equal(false) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update dutchTradeDisabled with owner - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, true)) - .to.emit(broker, 'DutchTradeDisabledSet') - .withArgs(token0.address, false, true) - - // Check value was updated - expect(await broker.batchTradeDisabled()).to.equal(false) + // Disable dutch trade manually + await disableDutchTrade(token0.address) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(token1.address)).to.equal(false) - // Update back to false - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, false)) + // Enable dutch trade with owner + await expect(broker.connect(owner).enableDutchTrade(token0.address)) .to.emit(broker, 'DutchTradeDisabledSet') .withArgs(token0.address, true, false) // Check value was updated expect(await broker.batchTradeDisabled()).to.equal(false) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) expect(await broker.dutchTradeDisabled(token1.address)).to.equal(false) }) }) @@ -432,9 +444,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { describe('Trade Management', () => { it('Should not allow to open Batch trade if Disabled', async () => { // Disable Broker Batch Auctions - await expect(broker.connect(owner).setBatchTradeDisabled(true)) - .to.emit(broker, 'BatchTradeDisabledSet') - .withArgs(false, true) + await disableBatchTrade() const tradeRequest: ITradeRequest = { sell: collateral0.address, @@ -469,9 +479,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token0 - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, true)) - .to.emit(broker, 'DutchTradeDisabledSet') - .withArgs(token0.address, false, true) + await disableDutchTrade(token0.address) // Dutch Auction openTrade should fail now await expect( @@ -479,7 +487,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ).to.be.revertedWith('dutch auctions disabled for token pair') // Re-enable Dutch Auctions for token0 - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, false)) + await expect(broker.connect(owner).enableDutchTrade(token0.address)) .to.emit(broker, 'DutchTradeDisabledSet') .withArgs(token0.address, true, false) @@ -490,9 +498,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token1 - await expect(broker.connect(owner).setDutchTradeDisabled(token1.address, true)) - .to.emit(broker, 'DutchTradeDisabledSet') - .withArgs(token1.address, false, true) + await disableDutchTrade(token1.address) // Dutch Auction openTrade should fail now await expect( diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 86ba41c71c..3573d8310a 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1,4 +1,4 @@ -import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { loadFixture, getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' @@ -142,6 +142,21 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { return divCeil(divCeil(product, highBuyPrice), fp('1')) // (c) } + const disableBatchTrade = async () => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt( + broker.address, + 205, + slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) + ) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) + } + beforeEach(async () => { ;[owner, addr1, addr2, other] = await ethers.getSigners() @@ -2484,7 +2499,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal(0) // Disable broker - await broker.connect(owner).setBatchTradeDisabled(true) + await disableBatchTrade() // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 11497aa3fc..8eb81b79df 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -31,12 +31,7 @@ import { import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' -import { - expectPrice, - expectRTokenPrice, - expectUnpriced, - setOraclePrice, -} from '../../../utils/oracles' +import { expectPrice, expectRTokenPrice, setOraclePrice } from '../../../utils/oracles' import { advanceBlocks, advanceTime, diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 53025c4ef8..6bc97b5a2d 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -31,12 +31,7 @@ import { import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp, toBNDecimals } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' -import { - expectPrice, - expectRTokenPrice, - expectUnpriced, - setOraclePrice, -} from '../../../utils/oracles' +import { expectPrice, expectRTokenPrice, setOraclePrice } from '../../../utils/oracles' import { advanceBlocks, advanceTime, From b0849fd470eedd1fa406e51ac5004e3f06132880 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 12:10:32 -0400 Subject: [PATCH 051/450] C4 +inf (#917) Co-authored-by: Akshat Mittal --- contracts/plugins/assets/OracleLib.sol | 3 + contracts/plugins/assets/RTokenAsset.sol | 31 ++++---- .../curve/CurveStableMetapoolCollateral.sol | 22 ++---- contracts/plugins/assets/curve/PoolTokens.sol | 2 + contracts/plugins/mocks/AssetMock.sol | 56 +++++++++++++ .../plugins/mocks/BadCollateralPlugin.sol | 1 + .../plugins/mocks/InvalidFiatCollateral.sol | 8 ++ .../mocks/InvalidRefPerTokCollateral.sol | 5 +- contracts/plugins/trading/DutchTrade.sol | 4 +- test/Facade.test.ts | 12 +-- test/Main.test.ts | 6 +- test/Recollateralization.test.ts | 23 +++--- test/Revenues.test.ts | 20 +++-- test/integration/AssetPlugins.test.ts | 32 ++++---- test/integration/EasyAuction.test.ts | 22 ++---- test/plugins/Asset.test.ts | 78 +++++++++++++------ test/plugins/Collateral.test.ts | 57 ++++++++------ .../aave/ATokenFiatCollateral.test.ts | 4 +- .../individual-collateral/collateralTests.ts | 25 +----- .../compoundv2/CTokenFiatCollateral.test.ts | 4 +- .../curve/collateralTests.ts | 59 +++++++------- .../CrvStableRTokenMetapoolTestSuite.test.ts | 49 +++++++++++- .../CvxStableRTokenMetapoolTestSuite.test.ts | 49 +++++++++++- 23 files changed, 365 insertions(+), 207 deletions(-) create mode 100644 contracts/plugins/mocks/AssetMock.sol diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index 79b268ed46..ff9bd0ef59 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -5,6 +5,7 @@ import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import "../../libraries/Fixed.sol"; error StalePrice(); +error ZeroPrice(); interface EACAggregatorProxy { function aggregator() external view returns (address); @@ -35,6 +36,8 @@ library OracleLib { uint48 secondsSince = uint48(block.timestamp - updateTime); if (secondsSince > timeout) revert StalePrice(); + if (p == 0) revert ZeroPrice(); + // {UoA/tok} return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); } catch (bytes memory errData) { diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index fd8c78fa24..eae0c8b2b0 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -50,8 +50,11 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - function tryPrice() external view virtual returns (uint192 low, uint192 high) { - (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(); // {UoA/BU} + function tryPrice(bool useLotPrice) external view virtual returns (uint192 low, uint192 high) { + (uint192 lowBUPrice, uint192 highBUPrice) = useLotPrice + ? basketHandler.lotPrice() + : basketHandler.price(); // {UoA/BU} + require(lowBUPrice != 0 && highBUPrice != FIX_MAX, "invalid price"); assert(lowBUPrice <= highBUPrice); // not obviously true just by inspection // Here we take advantage of the fact that we know RToken has 18 decimals @@ -84,7 +87,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { - try this.tryPrice() returns (uint192 low, uint192 high) { + try this.tryPrice(false) returns (uint192 low, uint192 high) { return (low, high); } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data @@ -98,20 +101,14 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - (uint192 buLow, uint192 buHigh) = basketHandler.lotPrice(); // {UoA/BU} - - // Here we take advantage of the fact that we know RToken has 18 decimals - // to convert between uint256 an uint192. Fits due to assumed max totalSupply. - uint192 supply = _safeWrap(IRToken(address(erc20)).totalSupply()); - - if (supply == 0) return (buLow, buHigh); - - BasketRange memory range = basketRange(); // {BU} - - // {UoA/tok} = {BU} * {UoA/BU} / {tok} - lotLow = range.bottom.mulDiv(buLow, supply, FLOOR); - lotHigh = range.top.mulDiv(buHigh, supply, CEIL); - assert(lotLow <= lotHigh); // not obviously true + try this.tryPrice(true) returns (uint192 low, uint192 high) { + lotLow = low; + lotHigh = high; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return (0, 0); + } } /// @return {tok} The balance of the ERC20 in whole tokens diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 874b48b94e..7fd4fe005b 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -81,12 +81,8 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { ) { // {UoA/pairedTok} - uint192 lowPaired; - uint192 highPaired = FIX_MAX; - try this.tryPairedPrice() returns (uint192 lowPaired_, uint192 highPaired_) { - lowPaired = lowPaired_; - highPaired = highPaired_; - } catch {} + (uint192 lowPaired, uint192 highPaired) = tryPairedPrice(); + require(lowPaired != 0 && highPaired != FIX_MAX, "invalid price"); // {UoA} (uint192 aumLow, uint192 aumHigh) = _metapoolBalancesValue(lowPaired, highPaired); @@ -124,8 +120,8 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // Check for defaults outside the pool function _anyDepeggedOutsidePool() internal view virtual override returns (bool) { try this.tryPairedPrice() returns (uint192 low, uint192 high) { - // {UoA/tok} = {UoA/tok} + {UoA/tok} - uint192 mid = (low + high) / 2; + // D18{UoA/tok} = D18{UoA/tok} + D18{UoA/tok} + uint256 mid = (low + uint256(high)) / 2; // If the price is below the default-threshold price, default eventually // uint192(+/-) is the same as Fix.plus/minus @@ -140,6 +136,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { return false; } + /// @dev Warning: Can revert /// @param lowPaired {UoA/pairedTok} /// @param highPaired {UoA/pairedTok} /// @return aumLow {UoA} @@ -172,13 +169,6 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // Add-in contribution from pairedTok // {UoA} = {UoA} + {UoA/pairedTok} * {pairedTok} aumLow += lowPaired.mul(pairedBal, FLOOR); - - // Add-in high part carefully - uint192 toAdd = highPaired.safeMul(pairedBal, CEIL); - if (aumHigh + uint256(toAdd) >= FIX_MAX) { - aumHigh = FIX_MAX; - } else { - aumHigh += toAdd; - } + aumHigh += highPaired.mul(pairedBal, CEIL); } } diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index bc5367dcdf..1af669572b 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -229,6 +229,7 @@ contract PoolTokens { } } + /// @dev Warning: Can revert /// @param index The index of the token: 0, 1, 2, or 3 /// @return low {UoA/ref_index} /// @return high {UoA/ref_index} @@ -278,6 +279,7 @@ contract PoolTokens { // === Internal === + /// @dev Warning: Can revert /// @return low {UoA} /// @return high {UoA} function totalBalancesValue() internal view returns (uint192 low, uint192 high) { diff --git a/contracts/plugins/mocks/AssetMock.sol b/contracts/plugins/mocks/AssetMock.sol new file mode 100644 index 0000000000..b6abe6fffb --- /dev/null +++ b/contracts/plugins/mocks/AssetMock.sol @@ -0,0 +1,56 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../assets/Asset.sol"; + +contract AssetMock is Asset { + uint192 private lowPrice; + uint192 private highPrice; + + /// @param priceTimeout_ {s} The number of seconds over which savedHighPrice decays to 0 + /// @param chainlinkFeed_ Feed units: {UoA/tok} + /// @param oracleError_ {1} The % the oracle feed can be off by + /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA + /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid + /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of + /// all assets' oracleTimeout in a collateral if there are multiple oracles + constructor( + uint48 priceTimeout_, + AggregatorV3Interface chainlinkFeed_, + uint192 oracleError_, + IERC20Metadata erc20_, + uint192 maxTradeVolume_, + uint48 oracleTimeout_ + ) Asset(priceTimeout_, chainlinkFeed_, oracleError_, erc20_, maxTradeVolume_, oracleTimeout_) {} + + /// Can revert, used by other contract functions in order to catch errors + /// Should not return FIX_MAX for low + /// Should only return FIX_MAX for high if low is 0 + /// @dev The third (unused) variable is only here for compatibility with Collateral + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + function tryPrice() + external + view + virtual + override + returns ( + uint192 low, + uint192 high, + uint192 + ) + { + return (lowPrice, highPrice, 0); + } + + /// Should not revert + /// Refresh saved prices + function refresh() public virtual override { + // pass + } + + function setPrice(uint192 low, uint192 high) external { + lowPrice = low; + highPrice = high; + } +} diff --git a/contracts/plugins/mocks/BadCollateralPlugin.sol b/contracts/plugins/mocks/BadCollateralPlugin.sol index 5001542aaf..765d95892a 100644 --- a/contracts/plugins/mocks/BadCollateralPlugin.sol +++ b/contracts/plugins/mocks/BadCollateralPlugin.sol @@ -57,6 +57,7 @@ contract BadCollateralPlugin is ATokenFiatCollateral { savedHighPrice = high; lastSave = uint48(block.timestamp); } + // If the price is below the default-threshold price, default eventually // uint192(+/-) is the same as Fix.plus/minus if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { diff --git a/contracts/plugins/mocks/InvalidFiatCollateral.sol b/contracts/plugins/mocks/InvalidFiatCollateral.sol index 343737bd38..89787b0290 100644 --- a/contracts/plugins/mocks/InvalidFiatCollateral.sol +++ b/contracts/plugins/mocks/InvalidFiatCollateral.sol @@ -8,6 +8,8 @@ contract InvalidFiatCollateral is FiatCollateral { bool public simplyRevert; + bool public unpriced; + /// @param config.chainlinkFeed Feed units: {UoA/ref} constructor(CollateralConfig memory config) FiatCollateral(config) {} @@ -15,6 +17,8 @@ contract InvalidFiatCollateral is FiatCollateral { function price() public view virtual override(Asset, IAsset) returns (uint192, uint192) { if (simplyRevert) { revert("errormsg"); // Revert with no reason + } else if (unpriced) { + return (0, FIX_MAX); } else { // Run out of gas this.infiniteLoop{ gas: 10 }(); @@ -28,6 +32,10 @@ contract InvalidFiatCollateral is FiatCollateral { simplyRevert = on; } + function setUnpriced(bool on) external { + unpriced = on; + } + function infiniteLoop() external pure { uint256 i = 0; uint256[1] memory array; diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index aca54d543c..a8a644df53 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -37,14 +37,11 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { // {UoA/tok}, {UoA/tok}, {target/ref} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - // Save prices if priced + // Save prices if high price is finite if (high < FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); - } else { - // must be unpriced - assert(low == 0); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 002af6b057..ba647e95a8 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -155,8 +155,8 @@ contract DutchTrade is ITrade { ); // misuse by caller // Only start dutch auctions under well-defined prices - require(prices.sellLow > 0 && prices.sellHigh < FIX_MAX / 1000, "bad sell pricing"); - require(prices.buyLow > 0 && prices.buyHigh < FIX_MAX / 1000, "bad buy pricing"); + require(prices.sellLow != 0 && prices.sellHigh < FIX_MAX / 1000, "bad sell pricing"); + require(prices.buyLow != 0 && prices.buyHigh < FIX_MAX / 1000, "bad buy pricing"); broker = IBroker(msg.sender); origin = origin_; diff --git a/test/Facade.test.ts b/test/Facade.test.ts index fc1a7121ff..ecbf420a25 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -552,6 +552,11 @@ describe('FacadeRead + FacadeAct contracts', () => { it('Should return revenue + chain into FacadeAct.runRevenueAuctions', async () => { const traders = [rTokenTrader, rsrTrader] + const initialPrice = await usdcAsset.price() + + // Set lotLow to 0 == revenueOverview() should not revert + await setOraclePrice(usdcAsset.address, bn('0')) + await usdcAsset.refresh() for (let traderIndex = 0; traderIndex < traders.length; traderIndex++) { const trader = traders[traderIndex] @@ -560,11 +565,8 @@ describe('FacadeRead + FacadeAct contracts', () => { const tokenSurplus = bn('0.5e18') await token.connect(addr1).transfer(trader.address, tokenSurplus) - // Set lotLow to 0 == revenueOverview() should not revert - await setOraclePrice(usdcAsset.address, bn('0')) - await usdcAsset.refresh() const [lotLow] = await usdcAsset.lotPrice() - expect(lotLow).to.equal(0) + expect(lotLow).to.equal(initialPrice[0]) // revenue let [erc20s, canStart, surpluses, minTradeAmounts] = @@ -582,7 +584,7 @@ describe('FacadeRead + FacadeAct contracts', () => { expect(surpluses[i]).to.equal(0) } const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) - const [low] = await asset.price() + const [low] = await asset.lotPrice() expect(minTradeAmounts[i]).to.equal( low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 ) // 1% oracleError diff --git a/test/Main.test.ts b/test/Main.test.ts index b8613d40a0..788d4eba4b 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2814,8 +2814,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await setOraclePrice(newColl2.address, bn('0')) // Check status and price again - expect(await basketHandler.status()).to.equal(CollateralStatus.DISABLED) - await expectPrice(basketHandler.address, fp('0.25'), ORACLE_ERROR, true) + const p = await basketHandler.price() + expect(p[0]).to.be.closeTo(fp('1').div(4), fp('1').div(4).div(100)) // within 1% + expect(p[0]).to.be.lt(fp('1').div(4)) + expect(p[1]).to.equal(MAX_UINT192) }) it('Should handle a collateral (price * quantity) overflow', async () => { diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 5b7718a225..e806d4b316 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -3048,7 +3048,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) }) - it('Should not sell worthless asset when doing recollateralization- Use RSR directly for remainder', async () => { + it('Should sell worthless asset when doing recollateralization - Use RSR directly for remainder', async () => { // Set prime basket await basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')]) @@ -3129,6 +3129,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Send the excess revenue tokens to backing manager - should try to use it instead of RSR // But we set price = $0, so it wont be sold -Will use RSR for remainder await aaveToken.connect(owner).mint(backingManager.address, buyAmtBidRemToken.mul(2)) + + // Make aaveToken worthless await setOraclePrice(aaveAsset.address, bn('0')) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { @@ -3148,7 +3150,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { name: 'TradeStarted', args: [ anyValue, - rsr.address, + aaveToken.address, token1.address, anyValue, toBNDecimals(buyAmtBidRemToken, 6).add(1), @@ -3161,13 +3163,13 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // RSR Token -> Token1 Auction await expectTrade(backingManager, { - sell: rsr.address, + sell: aaveToken.address, buy: token1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('1'), }) - const t = await getTrade(backingManager, rsr.address) + const t = await getTrade(backingManager, aaveToken.address) const sellAmtRemToken = await t.initBal() expect(toBNDecimals(buyAmtBidRemToken, 6).add(1)).to.equal( toBNDecimals(await toMinBuyAmt(sellAmtRemToken, fp('1'), fp('1')), 6).add(1) @@ -3180,15 +3182,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token1.balanceOf(backingManager.address)).to.equal( toBNDecimals(minBuyAmt, 6).add(1) ) - // Aave token balance remains unchanged - expect(await aaveToken.balanceOf(backingManager.address)).to.equal( - buyAmtBidRemToken.mul(2) - ) - expect(await rToken.totalSupply()).to.equal(issueAmount) - // Check Gnosis- using RSR - expect(await rsr.balanceOf(gnosis.address)).to.equal(sellAmtRemToken) + // Check Gnosis - using AAVE + expect(await aaveToken.balanceOf(gnosis.address)).to.equal(sellAmtRemToken) // Perform Mock Bids for the new Token (addr1 has balance) // Cover buyAmtBidRevToken which is all the amount required @@ -3209,7 +3206,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { name: 'TradeSettled', args: [ anyValue, - rsr.address, + aaveToken.address, token1.address, sellAmtRemToken, toBNDecimals(buyAmtBidRemToken, 6).add(1), @@ -3237,7 +3234,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) // Stakes used in this case - expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount.sub(sellAmtRemToken)) + expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) }) }) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 9581b78271..e0f16dadb8 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1029,6 +1029,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const p1RevenueTrader = await ethers.getContractAt('RevenueTraderP1', rTokenTrader.address) await setOraclePrice(collateral0.address, bn(0)) await collateral0.refresh() + await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await setOraclePrice(collateral1.address, bn('1e8')) + + const p = await collateral0.lotPrice() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(0) await expect( p1RevenueTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) ).to.revertedWith('bad sell pricing') @@ -2035,7 +2041,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) - it('Should not trade if price for buy token = 0', async () => { + it('Should trade even if price for buy token = 0', async () => { // Set AAVE tokens as reward rewardAmountAAVE = bn('1e18') @@ -2078,13 +2084,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set RSR price to 0 await setOraclePrice(rsrAsset.address, bn('0')) - // Should revert - await expect( - rsrTrader.manageTokens([aaveToken.address], [TradeKind.BATCH_AUCTION]) - ).to.be.revertedWith('buy asset price unknown') + // Should not revert + await expect(rsrTrader.manageTokens([aaveToken.address], [TradeKind.BATCH_AUCTION])).to.not + .be.reverted - // Funds still in Trader - expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal(expectedToTrader) + // Trade open for aaveToken + const t = await getTrade(rsrTrader, aaveToken.address) + expect(t.address).to.not.equal(ZERO_ADDRESS) }) it('Should report violation when Batch Auction behaves incorrectly', async () => { diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 672f5566de..7e067fa875 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -1120,8 +1120,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await setOraclePrice(zeroPriceAsset.address, bn(0)) - // Zero price - await expectPrice(zeroPriceAsset.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeroPriceAsset.address) }) it('Should handle invalid/stale Price - Collateral - Fiat', async () => { @@ -1192,8 +1192,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await setOraclePrice(zeroFiatCollateral.address, bn(0)) - // With zero price - await expectPrice(zeroFiatCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeroFiatCollateral.address) // Refresh should mark status IFFY await zeroFiatCollateral.refresh() @@ -1269,8 +1269,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) - // With zero price - await expectPrice(zeropriceCtokenCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeropriceCtokenCollateral.address) // Refresh should mark status IFFY await zeropriceCtokenCollateral.refresh() @@ -1346,8 +1346,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) - // With zero price - await expectPrice(zeroPriceAtokenCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeroPriceAtokenCollateral.address) // Refresh should mark status IFFY await zeroPriceAtokenCollateral.refresh() @@ -1418,8 +1418,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) await v3Aggregator.updateAnswer(bn(0)) - // Does not revert with zero price - await expectPrice(zeroPriceNonFiatCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeroPriceNonFiatCollateral.address) // Refresh should mark status IFFY await zeroPriceNonFiatCollateral.refresh() @@ -1497,8 +1497,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) await v3Aggregator.updateAnswer(bn(0)) - // With zero price - await expectPrice(zeropriceCtokenNonFiatCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeropriceCtokenNonFiatCollateral.address) // Refresh should mark status IFFY await zeropriceCtokenNonFiatCollateral.refresh() @@ -1558,8 +1558,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Set price = 0 await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) - // Does not revert with zero price - await expectPrice(zeroPriceSelfReferentialCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeroPriceSelfReferentialCollateral.address) // Refresh should mark status IFFY await zeroPriceSelfReferentialCollateral.refresh() @@ -1634,8 +1634,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Set price = 0 await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) - // With zero price - await expectPrice(zeroPriceCtokenSelfReferentialCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeroPriceCtokenSelfReferentialCollateral.address) // Refresh should mark status IFFY await zeroPriceCtokenSelfReferentialCollateral.refresh() diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 16798523be..3d63f9e5b8 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -10,6 +10,8 @@ import { Implementation, SLOW, ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, defaultFixture, // intentional } from '../fixtures' import { bn, fp, shortString, divCeil } from '../../common/numbers' @@ -549,7 +551,11 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function }) it('should be able to scoop entire auction cheaply when minBuyAmount = 0', async () => { - await setOraclePrice(collateral0.address, bn('0')) // make collateral0 worthless + // Make collateral0 lotPrice (0, 0) + await setOraclePrice(collateral0.address, bn('0')) + await collateral0.refresh() + await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await setOraclePrice(await assetRegistry.toAsset(rsr.address), bn('1e8')) // force a revenue dust auction await expect(rsrTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])).to.emit( @@ -576,20 +582,6 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function await rsr.mint(addr1.address, issueAmount) await rsr.connect(addr1).approve(easyAuction.address, issueAmount) - // Bid with a too-small order and fail. - const lowBidAmt = 2 - await expect( - easyAuction - .connect(addr1) - .placeSellOrders( - auctionId, - [issueAmount], - [lowBidAmt], - [QUEUE_START], - ethers.constants.HashZero - ) - ).to.be.revertedWith('order too small') - // Bid with a nontheless pretty small order, and succeed. const bidAmt = (await trade.DEFAULT_MIN_BID()).add(1) await easyAuction diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 3d9661263f..0a534ae9cc 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -250,45 +250,44 @@ describe('Assets contracts #fast', () => { ) }) - it('Should return (0, 0) if price is zero', async () => { + it('Should become unpriced if price is zero', async () => { + const compInitPrice = await compAsset.price() + const aaveInitPrice = await aaveAsset.price() + const rsrInitPrice = await rsrAsset.price() + const rTokenInitPrice = await rTokenAsset.price() + // Update values in Oracles to 0 await setOraclePrice(compAsset.address, bn('0')) await setOraclePrice(aaveAsset.address, bn('0')) await setOraclePrice(rsrAsset.address, bn('0')) - // New prices should be (0, 0) - await expectPrice(rsrAsset.address, bn('0'), bn('0'), false) - await expectPrice(compAsset.address, bn('0'), bn('0'), false) - await expectPrice(aaveAsset.address, bn('0'), bn('0'), false) + // Should be unpriced + await expectUnpriced(rsrAsset.address) + await expectUnpriced(compAsset.address) + await expectUnpriced(aaveAsset.address) - // Fallback prices should be zero - let [lotLow, lotHigh] = await rsrAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + // Fallback prices should be initial prices + let [lotLow, lotHigh] = await compAsset.lotPrice() + expect(lotLow).to.eq(compInitPrice[0]) + expect(lotHigh).to.eq(compInitPrice[1]) ;[lotLow, lotHigh] = await rsrAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + expect(lotLow).to.eq(rsrInitPrice[0]) + expect(lotHigh).to.eq(rsrInitPrice[1]) ;[lotLow, lotHigh] = await aaveAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + expect(lotLow).to.eq(aaveInitPrice[0]) + expect(lotHigh).to.eq(aaveInitPrice[1]) // Update values of underlying tokens of RToken to 0 await setOraclePrice(collateral0.address, bn(0)) await setOraclePrice(collateral1.address, bn(0)) // RTokenAsset should be unpriced now - await expectRTokenPrice( - rTokenAsset.address, - bn(0), - ORACLE_ERROR, - await backingManager.maxTradeSlippage(), - config.minTradeVolume.mul((await assetRegistry.erc20s()).length) - ) + await expectUnpriced(rTokenAsset.address) - // Should have lot price + // Should have initial lot price ;[lotLow, lotHigh] = await rTokenAsset.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + expect(lotLow).to.eq(rTokenInitPrice[0]) + expect(lotHigh).to.eq(rTokenInitPrice[1]) }) it('Should return 0 price for RTokenAsset in full haircut scenario', async () => { @@ -381,7 +380,7 @@ describe('Assets contracts #fast', () => { await expectUnpriced(aaveAsset.address) }) - it('Should handle unpriced edge cases for RToken', async () => { + it('Should handle reverting edge cases for RToken', async () => { // Swap one of the collaterals for an invalid one const InvalidFiatCollateralFactory = await ethers.getContractFactory('InvalidFiatCollateral') const invalidFiatCollateral: InvalidFiatCollateral = ( @@ -408,7 +407,7 @@ describe('Assets contracts #fast', () => { // Check RToken unpriced await expectUnpriced(rTokenAsset.address) - // Runnning out of gas + // Runnning out of gas await invalidFiatCollateral.setSimplyRevert(false) await expect(invalidFiatCollateral.price()).to.be.reverted @@ -416,6 +415,35 @@ describe('Assets contracts #fast', () => { await expect(rTokenAsset.price()).to.be.reverted }) + it('Regression test -- Should handle unpriced collateral for RToken', async () => { + // https://github.com/code-423n4/2023-07-reserve-findings/issues/20 + + // Swap one of the collaterals for an invalid one + const InvalidFiatCollateralFactory = await ethers.getContractFactory('InvalidFiatCollateral') + const invalidFiatCollateral: InvalidFiatCollateral = ( + await InvalidFiatCollateralFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await collateral0.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: await collateral0.erc20(), + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }) + ) + + // Swap asset + await assetRegistry.swapRegistered(invalidFiatCollateral.address) + + // Set unpriced collateral + await invalidFiatCollateral.setUnpriced(true) + + // Check RToken is unpriced + await expectUnpriced(rTokenAsset.address) + }) + it('Should be able to refresh saved prices', async () => { // Check initial prices - use RSR as example let currBlockTimestamp: number = await getLatestBlockTimestamp() diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 7f4404952d..ff0441b43c 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -582,19 +582,29 @@ describe('Collateral contracts', () => { ) }) - it('Should be (0, 0) if price is zero', async () => { - // Set price of token to 0 in Aave + it('Should become unpriced if price is zero', async () => { + const compInitPrice = await tokenCollateral.price() + const aaveInitPrice = await aTokenCollateral.price() + const rsrInitPrice = await cTokenCollateral.price() + + // Update values in Oracles to 0 await setOraclePrice(tokenCollateral.address, bn('0')) - // Check price of tokens - await expectPrice(tokenCollateral.address, bn('0'), bn('0'), false) - await expectPrice(aTokenCollateral.address, bn('0'), bn('0'), false) - await expectPrice(cTokenCollateral.address, bn('0'), bn('0'), false) + // Should be unpriced + await expectUnpriced(cTokenCollateral.address) + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) - // Lot prices should be zero - const [lotLow, lotHigh] = await tokenCollateral.lotPrice() - expect(lotLow).to.eq(0) - expect(lotHigh).to.eq(0) + // Fallback prices should be initial prices + let [lotLow, lotHigh] = await tokenCollateral.lotPrice() + expect(lotLow).to.eq(compInitPrice[0]) + expect(lotHigh).to.eq(compInitPrice[1]) + ;[lotLow, lotHigh] = await cTokenCollateral.lotPrice() + expect(lotLow).to.eq(rsrInitPrice[0]) + expect(lotHigh).to.eq(rsrInitPrice[1]) + ;[lotLow, lotHigh] = await aTokenCollateral.lotPrice() + expect(lotLow).to.eq(aaveInitPrice[0]) + expect(lotHigh).to.eq(aaveInitPrice[1]) // When refreshed, sets status to Unpriced await tokenCollateral.refresh() @@ -1232,7 +1242,7 @@ describe('Collateral contracts', () => { // Unpriced if price is zero - Update Oracles and check prices await targetUnitOracle.updateAnswer(bn('0')) - await expectPrice(nonFiatCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(nonFiatCollateral.address) // When refreshed, sets status to IFFY await nonFiatCollateral.refresh() @@ -1245,9 +1255,9 @@ describe('Collateral contracts', () => { // Check the other oracle await referenceUnitOracle.updateAnswer(bn('0')) - await expectPrice(nonFiatCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(nonFiatCollateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await nonFiatCollateral.refresh() expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1535,11 +1545,12 @@ describe('Collateral contracts', () => { // Unpriced if price is zero - Update Oracles and check prices await targetUnitOracle.updateAnswer(bn('0')) - await expectPrice(cTokenNonFiatCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(cTokenNonFiatCollateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await cTokenNonFiatCollateral.refresh() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // Restore await targetUnitOracle.updateAnswer(bn('22000e8')) await cTokenNonFiatCollateral.refresh() @@ -1547,9 +1558,9 @@ describe('Collateral contracts', () => { // Revert if price is zero - Update the other Oracle await referenceUnitOracle.updateAnswer(bn('0')) - await expectPrice(cTokenNonFiatCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(cTokenNonFiatCollateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await cTokenNonFiatCollateral.refresh() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1730,9 +1741,9 @@ describe('Collateral contracts', () => { // Unpriced if price is zero - Update Oracles and check prices await setOraclePrice(selfReferentialCollateral.address, bn(0)) - await expectPrice(selfReferentialCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(selfReferentialCollateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await selfReferentialCollateral.refresh() expect(await selfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) @@ -1941,9 +1952,9 @@ describe('Collateral contracts', () => { // Unpriced if price is zero - Update Oracles and check prices await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) - await expectPrice(cTokenSelfReferentialCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(cTokenSelfReferentialCollateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await cTokenSelfReferentialCollateral.refresh() expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -2185,9 +2196,9 @@ describe('Collateral contracts', () => { // Unpriced if price is zero - Update Oracles and check prices await referenceUnitOracle.updateAnswer(bn('0')) - await expectPrice(eurFiatCollateral.address, bn('0'), bn('0'), false) + await expectUnpriced(eurFiatCollateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await eurFiatCollateral.refresh() expect(await eurFiatCollateral.status()).to.equal(CollateralStatus.IFFY) diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 3d23c0d407..9dc2c4f7fa 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -707,8 +707,8 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) - // Does not revert with zero price - await expectPrice(zeropriceCtokenCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeropriceCtokenCollateral.address) // Refresh should mark status IFFY await zeropriceCtokenCollateral.refresh() diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index d6dd85740d..09443b0846 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -25,7 +25,7 @@ import { CollateralTestSuiteFixtures, CollateralStatus, } from './pluginTestTypes' -import { expectPrice } from '../../utils/oracles' +import { expectPrice, expectUnpriced } from '../../utils/oracles' import snapshotGasCost from '../../utils/snapshotGasCost' import { IMPLEMENTATION, Implementation } from '../../fixtures' @@ -259,15 +259,13 @@ export default function fn( expect(newHigh).to.be.gt(initHigh) }) - it('returns a 0 price', async () => { + it('returns unpriced for 0-valued oracle', async () => { // Set price of underlying to 0 const updateAnswerTx = await chainlinkFeed.updateAnswer(0) await updateAnswerTx.wait() // (0, FIX_MAX) is returned - const [low, high] = await collateral.price() - expect(low).to.equal(0) - expect(high).to.equal(0) + await expectUnpriced(collateral.address) // When refreshed, sets status to Unpriced await collateral.refresh() @@ -287,23 +285,6 @@ export default function fn( expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('does not update the saved prices if collateral is unpriced', async () => { - /* - want to cover this block from the refresh function - is it even possible to cover this w/ the tryPrice from AppreciatingFiatCollateral? - - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - assert(low == 0); - } - */ - expect(true) - }) - itHasRevenueHiding('does revenue hiding correctly', async () => { ctx.collateral = await deployCollateral({ erc20: ctx.tok.address, diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 7efc9ab318..df5264769f 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -720,8 +720,8 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) - // Does not revert with zero price - await expectPrice(zeropriceCtokenCollateral.address, bn('0'), bn('0'), false) + // Unpriced + await expectUnpriced(zeropriceCtokenCollateral.address) // Refresh should mark status IFFY await zeropriceCtokenCollateral.refresh() diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 9f48ae2077..bb31869a26 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -393,15 +393,13 @@ export default function fn( } }) - it('returns a 0 price', async () => { + it('returns unpriced for 0-valued oracle', async () => { for (const feed of ctx.feeds) { await feed.updateAnswer(0).then((e) => e.wait()) } - // (0, 0) is returned - const [low, high] = await ctx.collateral.price() - expect(low).to.equal(0) - expect(high).to.equal(0) + // (0, FIX_MAX) is returned + await expectUnpriced(ctx.collateral.address) // When refreshed, sets status to Unpriced await ctx.collateral.refresh() @@ -453,6 +451,32 @@ export default function fn( }) describe('status', () => { + before(resetFork) + + it('reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { + const InvalidMockV3AggregatorFactory = await ethers.getContractFactory( + 'InvalidMockV3Aggregator' + ) + const invalidChainlinkFeed = ( + await InvalidMockV3AggregatorFactory.deploy(6, bn('1e6')) + ) + + const [invalidCollateral] = await deployCollateral({ + erc20: ctx.wrapper.address, + feeds: defaultOpts.feeds!.map((f) => f.map(() => invalidChainlinkFeed.address)), + }) + + // Reverting with no reason + await invalidChainlinkFeed.setSimplyRevert(true) + await expect(invalidCollateral.refresh()).to.be.revertedWithoutReason() + expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) + + // Runnning out of gas (same error) + await invalidChainlinkFeed.setSimplyRevert(false) + await expect(invalidCollateral.refresh()).to.be.revertedWithoutReason() + expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) + }) + it('maintains status in normal situations', async () => { // Check initial state expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) @@ -614,31 +638,6 @@ export default function fn( expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) }) - it('reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { - const InvalidMockV3AggregatorFactory = await ethers.getContractFactory( - 'InvalidMockV3Aggregator' - ) - const invalidChainlinkFeed = ( - await InvalidMockV3AggregatorFactory.deploy(6, bn('1e6')) - ) - - ctx = await loadFixture(makeCollateralFixtureContext(ctx.alice, {})) - const [invalidCollateral] = await deployCollateral({ - erc20: ctx.wrapper.address, - feeds: defaultOpts.feeds!.map((f) => f.map(() => invalidChainlinkFeed.address)), - }) - - // Reverting with no reason - await invalidChainlinkFeed.setSimplyRevert(true) - await expect(invalidCollateral.refresh()).to.be.revertedWithoutReason() - expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) - - // Runnning out of gas (same error) - await invalidChainlinkFeed.setSimplyRevert(false) - await expect(invalidCollateral.refresh()).to.be.revertedWithoutReason() - expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) - }) - describe('collateral-specific tests', collateralSpecificStatusTests) }) diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index ec1a4c1582..091863c246 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -7,6 +7,7 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' +import { expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, @@ -14,7 +15,7 @@ import { TestICollateral, } from '../../../../../typechain' import { bn } from '../../../../../common/numbers' -import { ZERO_ADDRESS, ONE_ADDRESS } from '../../../../../common/constants' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { @@ -34,7 +35,9 @@ import { CurvePoolType, CRV, eUSD_FRAX_HOLDER, + eUSD, } from '../constants' +import { whileImpersonating } from '../../../../utils/impersonation' type Fixture = () => Promise @@ -48,7 +51,7 @@ export const defaultCrvStableCollateralOpts: CurveMetapoolCollateralOpts = { maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, - revenueHiding: bn('0'), // TODO + revenueHiding: bn('0'), nTokens: 2, curvePool: FRAX_BP, lpToken: FRAX_BP_TOKEN, @@ -196,7 +199,47 @@ const collateralSpecificConstructorTests = () => { } // eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificStatusTests = () => {} +const collateralSpecificStatusTests = () => { + it('Regression test -- becomes unpriced if inner RTokenAsset becomes unpriced', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out eUSD's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + eUSD, + bn('1'), // unused + bn('1') // unused + ) + const eUSDAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { + await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset to unpriced + // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset + await mockRTokenAsset.setPrice(0, MAX_UINT192) + + // refresh() should not revert + await collateral.refresh() + + // Should be unpriced + await expectUnpriced(collateral.address) + + // Lot price should be initial price + const lotP = await collateral.lotPrice() + expect(lotP[0]).to.eq(initialPrice[0]) + expect(lotP[1]).to.eq(initialPrice[1]) + }) +} /* Run the test suite diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index fca510042b..e1646193a8 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -7,6 +7,7 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' +import { expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, @@ -14,7 +15,7 @@ import { TestICollateral, } from '../../../../../typechain' import { bn } from '../../../../../common/numbers' -import { ZERO_ADDRESS, ONE_ADDRESS } from '../../../../../common/constants' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { @@ -35,7 +36,9 @@ import { CurvePoolType, CRV, eUSD_FRAX_HOLDER, + eUSD, } from '../constants' +import { whileImpersonating } from '../../../../utils/impersonation' type Fixture = () => Promise @@ -49,7 +52,7 @@ export const defaultCvxStableCollateralOpts: CurveMetapoolCollateralOpts = { maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, - revenueHiding: bn('0'), // TODO + revenueHiding: bn('0'), nTokens: 2, curvePool: FRAX_BP, lpToken: FRAX_BP_TOKEN, @@ -198,7 +201,47 @@ const collateralSpecificConstructorTests = () => { } // eslint-disable-next-line @typescript-eslint/no-empty-function -const collateralSpecificStatusTests = () => {} +const collateralSpecificStatusTests = () => { + it('Regression test -- becomes unpriced if inner RTokenAsset becomes unpriced', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out eUSD's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + eUSD, + bn('1'), // unused + bn('1') // unused + ) + const eUSDAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { + await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset to unpriced + // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset + await mockRTokenAsset.setPrice(0, MAX_UINT192) + + // refresh() should not revert + await collateral.refresh() + + // Should be unpriced + await expectUnpriced(collateral.address) + + // Lot price should be initial price + const lotP = await collateral.lotPrice() + expect(lotP[0]).to.eq(initialPrice[0]) + expect(lotP[1]).to.eq(initialPrice[1]) + }) +} /* Run the test suite From 4d989e53f19195afd10fd349b7453c4931f78031 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 31 Aug 2023 14:11:59 -0300 Subject: [PATCH 052/450] distribute token to buy in setDistribution (#925) --- contracts/p0/Distributor.sol | 5 +++ contracts/p1/Distributor.sol | 5 +++ test/Revenues.test.ts | 80 +++++++++++++++++++++++++++++++++--- 3 files changed, 85 insertions(+), 5 deletions(-) diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index d305e9b521..8c5f429b69 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -33,6 +33,11 @@ contract DistributorP0 is ComponentP0, IDistributor { /// Set the RevenueShare for destination `dest`. Destinations `FURNACE` and `ST_RSR` refer to /// main.furnace() and main.stRSR(). function setDistribution(address dest, RevenueShare memory share) external governance { + // solhint-disable-next-line no-empty-blocks + try main.rsrTrader().distributeTokenToBuy() {} catch {} + // solhint-disable-next-line no-empty-blocks + try main.rTokenTrader().distributeTokenToBuy() {} catch {} + _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index ca818f5a14..bce53c5eff 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -57,6 +57,11 @@ contract DistributorP1 is ComponentP1, IDistributor { // destinations' = destinations.add(dest) // distribution' = distribution.set(dest, share) function setDistribution(address dest, RevenueShare memory share) external governance { + // solhint-disable-next-line no-empty-blocks + try main.rsrTrader().distributeTokenToBuy() {} catch {} + // solhint-disable-next-line no-empty-blocks + try main.rTokenTrader().distributeTokenToBuy() {} catch {} + _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 3573d8310a..dcdd1ff538 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -651,9 +651,75 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) }) + it('Should distribute tokenToBuy before updating distribution', async () => { + // Check initial status + const [rTokenTotal, rsrTotal] = await distributor.totals() + expect(rsrTotal).equal(bn(60)) + expect(rTokenTotal).equal(bn(40)) + + // Set some balance of token-to-buy in traders + const issueAmount = bn('100e18') + + // RSR Trader + const stRSRBal = await rsr.balanceOf(stRSR.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + + // RToken Trader + const rTokenBal = await rToken.balanceOf(furnace.address) + await rToken.connect(addr1).issueTo(rTokenTrader.address, issueAmount) + + // Update distributions with owner - Set f = 1 + await distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + + // Check tokens were transferred from Traders + const expectedAmountRSR = stRSRBal.add(issueAmount) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountRSR, 100) + expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(bn(0), 100) + + const expectedAmountRToken = rTokenBal.add(issueAmount) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expectedAmountRToken, 100) + expect(await rsr.balanceOf(rTokenTrader.address)).to.be.closeTo(bn(0), 100) + + // Check updated distributions + const [newRTokenTotal, newRsrTotal] = await distributor.totals() + expect(newRsrTotal).equal(bn(60)) + expect(newRTokenTotal).equal(bn(0)) + }) + + it('Should update distribution even if distributeTokenToBuy() reverts', async () => { + // Check initial status + const [rTokenTotal, rsrTotal] = await distributor.totals() + expect(rsrTotal).equal(bn(60)) + expect(rTokenTotal).equal(bn(40)) + + // Set some balance of token-to-buy in RSR trader + const issueAmount = bn('100e18') + const stRSRBal = await rsr.balanceOf(stRSR.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + + // Pause the system, makes distributeTokenToBuy() revert + await main.connect(owner).pauseTrading() + await expect(rsrTrader.distributeTokenToBuy()).to.be.reverted + + // Update distributions with owner - Set f = 1 + await distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + + // Check no tokens were transferred + expect(await rsr.balanceOf(stRSR.address)).to.equal(stRSRBal) + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(issueAmount) + + // Check updated distributions + const [newRTokenTotal, newRsrTotal] = await distributor.totals() + expect(newRsrTotal).equal(bn(60)) + expect(newRTokenTotal).equal(bn(0)) + }) + it('Should return tokens to BackingManager correctly - rsrTrader.returnTokens()', async () => { // Mint tokens - await rsr.connect(owner).mint(rsrTrader.address, issueAmount) await token0.connect(owner).mint(rsrTrader.address, issueAmount.add(1)) await token1.connect(owner).mint(rsrTrader.address, issueAmount.add(2)) @@ -676,6 +742,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ).to.be.revertedWith('rsrTotal > 0') await distributor.setDistribution(STRSR_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) + // Mint RSR + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + // Should fail for unregistered token await assetRegistry.connect(owner).unregister(collateral1.address) await expect( @@ -981,6 +1050,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { minBuyAmtRToken.div(bn('1e15')) ) }) + it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { const minTrade = bn('1e18') @@ -1963,10 +2033,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should only allow RevenueTraders to call distribute()', async () => { const distAmount: BigNumber = bn('100e18') - // Transfer some RSR to RevenueTraders - await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) - await rsr.connect(addr1).transfer(rsrTrader.address, distAmount) - // Set f = 1 await expect( distributor @@ -1984,6 +2050,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .to.emit(distributor, 'DistributionSet') .withArgs(STRSR_DEST, bn(0), bn(1)) + // Transfer some RSR to RevenueTraders + await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) + await rsr.connect(addr1).transfer(rsrTrader.address, distAmount) + // Check funds in RevenueTraders and destinations expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(distAmount) expect(await rsr.balanceOf(rsrTrader.address)).to.equal(distAmount) From 875bfc3b146e2f3d6726ea4e87313a797aed7a85 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Thu, 31 Aug 2023 14:14:44 -0400 Subject: [PATCH 053/450] C4 mit 31 - standoff scenario (#923) --- contracts/p1/StRSR.sol | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index ffe8d0669f..527d63f50c 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -488,6 +488,14 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:governance /// Reset all stakes and advance era + /// @notice This function is only callable when the stake rate is unsafe. + /// The stake rate is unsafe when it is either too high or too low. + /// There is the possibility of the rate reaching the borderline of being unsafe, + /// where users won't stake in fear that a reset might be executed. + /// A user may also grief this situation by staking enough RSR to vote against any reset. + /// This standoff will continue until enough RSR is staked and a reset is executed. + /// There is currently no good and easy way to mitigate the possibility of this situation, + /// and the risk of it occurring is low enough that it is not worth the effort to mitigate. function resetStakes() external { requireGovernanceOnly(); require( From 8d9edaa087273d05748903230269443a37548618 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 17:26:17 -0400 Subject: [PATCH 054/450] cherry-pick enable-only auction setters (#924) Co-authored-by: Patrick McKelvy --- CHANGELOG.md | 2 + contracts/interfaces/IBroker.sol | 4 +- contracts/p0/Broker.sol | 24 +++--- contracts/p1/Broker.sol | 12 +-- contracts/plugins/mocks/InvalidBrokerMock.sol | 4 +- test/Broker.test.ts | 74 ++++++++++--------- test/Revenues.test.ts | 19 ++++- 7 files changed, 81 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e16d9a2f1..114233c2ca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -75,6 +75,8 @@ Bump solidity version to 0.8.19 - Add `dutchAuctionLength` and `setDutchAuctionLength()` setter and `DutchAuctionLengthSet()` event - Add `dutchTradeImplementation` and `setDutchTradeImplementation()` setter and `DutchTradeImplementationSet()` event - Only permit BackingManager-started dutch auctions to report violations and disable trading + - Remove `setBatchTradeDisabled(bool)` and replace with `enableBatchTrade()` + - Remove `setDutchTradeDisabled(IERC20 erc20, bool)` and replace with `enableDutchTrade(IERC20 erc20)` - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req)` - Allow when paused / frozen, since caller must be in-system diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index 0c83eb9216..20e2ed0cb0 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -89,9 +89,9 @@ interface TestIBroker is IBroker { function setDutchAuctionLength(uint48 newAuctionLength) external; - function setBatchTradeDisabled(bool disabled) external; + function enableBatchTrade() external; - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external; + function enableDutchTrade(IERC20Metadata erc20) external; // only present on pre-3.0.0 Brokers; used by EasyAuction regression test function disabled() external view returns (bool); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 13ddbbff1a..02b88de2f3 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -190,6 +190,18 @@ contract BrokerP0 is ComponentP0, IBroker { dutchAuctionLength = newAuctionLength; } + /// @custom:governance + function enableBatchTrade() external governance { + emit BatchTradeDisabledSet(batchTradeDisabled, false); + batchTradeDisabled = false; + } + + /// @custom:governance + function enableDutchTrade(IERC20Metadata erc20) external governance { + emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], false); + dutchTradeDisabled[erc20] = false; + } + // === Private === function newBatchAuction(TradeRequest memory req, address caller) private returns (ITrade) { @@ -239,16 +251,4 @@ contract BrokerP0 is ComponentP0, IBroker { trade.init(caller, req.sell, req.buy, req.sellAmount, dutchAuctionLength, prices); return trade; } - - /// @custom:governance - function setBatchTradeDisabled(bool disabled) external governance { - emit BatchTradeDisabledSet(batchTradeDisabled, disabled); - batchTradeDisabled = disabled; - } - - /// @custom:governance - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance { - emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); - dutchTradeDisabled[erc20] = disabled; - } } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index a87ae21d3d..4e23432832 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -207,15 +207,15 @@ contract BrokerP1 is ComponentP1, IBroker { } /// @custom:governance - function setBatchTradeDisabled(bool disabled) external governance { - emit BatchTradeDisabledSet(batchTradeDisabled, disabled); - batchTradeDisabled = disabled; + function enableBatchTrade() external governance { + emit BatchTradeDisabledSet(batchTradeDisabled, false); + batchTradeDisabled = false; } /// @custom:governance - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance { - emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], disabled); - dutchTradeDisabled[erc20] = disabled; + function enableDutchTrade(IERC20Metadata erc20) external governance { + emit DutchTradeDisabledSet(erc20, dutchTradeDisabled[erc20], false); + dutchTradeDisabled[erc20] = false; } // === Private === diff --git a/contracts/plugins/mocks/InvalidBrokerMock.sol b/contracts/plugins/mocks/InvalidBrokerMock.sol index 7b19993c94..191df5136f 100644 --- a/contracts/plugins/mocks/InvalidBrokerMock.sol +++ b/contracts/plugins/mocks/InvalidBrokerMock.sol @@ -64,9 +64,9 @@ contract InvalidBrokerMock is ComponentP0, IBroker { /// Dummy implementation /* solhint-disable no-empty-blocks */ - function setBatchTradeDisabled(bool disabled) external governance {} + function enableBatchTrade() external governance {} /// Dummy implementation /* solhint-disable no-empty-blocks */ - function setDutchTradeDisabled(IERC20Metadata erc20, bool disabled) external governance {} + function enableDutchTrade(IERC20Metadata erc20) external governance {} } diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 61398dba6f..6d4f1ab032 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1,4 +1,4 @@ -import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' +import { loadFixture, getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' @@ -132,6 +132,30 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { prices = { sellLow: fp('1'), sellHigh: fp('1'), buyLow: fp('1'), buyHigh: fp('1') } }) + const disableBatchTrade = async () => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt( + broker.address, + 205, + slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) + ) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) + } + + const disableDutchTrade = async (erc20: string) => { + const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') + const p = mappingSlot.toHexString().slice(2).padStart(64, '0') + const key = erc20.slice(2).padStart(64, '0') + const slot = ethers.utils.keccak256('0x' + key + p) + await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) + expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) + } + describe('Deployment', () => { it('Should setup Broker correctly', async () => { expect(await broker.gnosis()).to.equal(gnosis.address) @@ -378,28 +402,21 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // If not owner cannot update - await expect(broker.connect(other).setBatchTradeDisabled(true)).to.be.revertedWith( + await expect(broker.connect(other).enableBatchTrade()).to.be.revertedWith('governance only') + await expect(broker.connect(other).enableDutchTrade(token0.address)).to.be.revertedWith( 'governance only' ) - await expect( - broker.connect(other).setDutchTradeDisabled(token0.address, true) - ).to.be.revertedWith('governance only') // Check value did not change expect(await broker.batchTradeDisabled()).to.equal(false) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update batchTradeDisabled with owner - await expect(broker.connect(owner).setBatchTradeDisabled(true)) - .to.emit(broker, 'BatchTradeDisabledSet') - .withArgs(false, true) - - // Check value was updated + // Disable batch trade manually + await disableBatchTrade() expect(await broker.batchTradeDisabled()).to.equal(true) - expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update back to false - await expect(broker.connect(owner).setBatchTradeDisabled(false)) + // Enable batch trade with owner + await expect(broker.connect(owner).enableBatchTrade()) .to.emit(broker, 'BatchTradeDisabledSet') .withArgs(true, false) @@ -407,24 +424,19 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.batchTradeDisabled()).to.equal(false) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) - // Update dutchTradeDisabled with owner - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, true)) - .to.emit(broker, 'DutchTradeDisabledSet') - .withArgs(token0.address, false, true) - - // Check value was updated - expect(await broker.batchTradeDisabled()).to.equal(false) + // Disable dutch trade manually + await disableDutchTrade(token0.address) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(true) - expect(await broker.dutchTradeDisabled(token1.address)).to.equal(false) - // Update back to false - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, false)) + // Enable dutch trade with owner + await expect(broker.connect(owner).enableDutchTrade(token0.address)) .to.emit(broker, 'DutchTradeDisabledSet') .withArgs(token0.address, true, false) // Check value was updated expect(await broker.batchTradeDisabled()).to.equal(false) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) + expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) expect(await broker.dutchTradeDisabled(token1.address)).to.equal(false) }) }) @@ -432,9 +444,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { describe('Trade Management', () => { it('Should not allow to open Batch trade if Disabled', async () => { // Disable Broker Batch Auctions - await expect(broker.connect(owner).setBatchTradeDisabled(true)) - .to.emit(broker, 'BatchTradeDisabledSet') - .withArgs(false, true) + await disableBatchTrade() const tradeRequest: ITradeRequest = { sell: collateral0.address, @@ -468,9 +478,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token0 - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, true)) - .to.emit(broker, 'DutchTradeDisabledSet') - .withArgs(token0.address, false, true) + await disableDutchTrade(token0.address) // Dutch Auction openTrade should fail now await expect( @@ -478,7 +486,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ).to.be.revertedWith('dutch auctions disabled for token pair') // Re-enable Dutch Auctions for token0 - await expect(broker.connect(owner).setDutchTradeDisabled(token0.address, false)) + await expect(broker.connect(owner).enableDutchTrade(token0.address)) .to.emit(broker, 'DutchTradeDisabledSet') .withArgs(token0.address, true, false) @@ -488,9 +496,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token1 - await expect(broker.connect(owner).setDutchTradeDisabled(token1.address, true)) - .to.emit(broker, 'DutchTradeDisabledSet') - .withArgs(token1.address, false, true) + await disableDutchTrade(token1.address) // Dutch Auction openTrade should fail now await expect( diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index e0f16dadb8..4277386931 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1,4 +1,4 @@ -import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { loadFixture, getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' @@ -142,6 +142,21 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { return divCeil(divCeil(product, highBuyPrice), fp('1')) // (c) } + const disableBatchTrade = async () => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt( + broker.address, + 205, + slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) + ) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) + } + beforeEach(async () => { ;[owner, addr1, addr2, other] = await ethers.getSigners() @@ -2490,7 +2505,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal(0) // Disable broker - await broker.connect(owner).setBatchTradeDisabled(true) + await disableBatchTrade() // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% From 907299c969d97a26803a139e7cd478462895d111 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 31 Aug 2023 18:27:11 -0300 Subject: [PATCH 055/450] loss of pending rewards when claiming in StaticAToken (#926) --- .../plugins/assets/aave/StaticATokenLM.sol | 6 +++ .../aave/StaticATokenLM.test.ts | 53 +++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/contracts/plugins/assets/aave/StaticATokenLM.sol b/contracts/plugins/assets/aave/StaticATokenLM.sol index 56a537a1b6..ef776a19bc 100644 --- a/contracts/plugins/assets/aave/StaticATokenLM.sol +++ b/contracts/plugins/assets/aave/StaticATokenLM.sol @@ -35,6 +35,10 @@ import { SafeMath } from "@aave/protocol-v2/contracts/dependencies/openzeppelin/ * among others, will update rewards balances correctly, so while it is true that under certain circumstances * rewards may not be fully accurate, we expect them only to be slightly off. * + * Users should also be careful when claiming rewards using `forceUpdate=false` as this will result on permanent + * loss of pending/uncollected rewards. It is recommended to always claim rewards using `forceUpdate=true` + * unless the user is sure that gas costs would exceed the lost rewards. + * * @author Aave * From: https://github.com/aave/protocol-v2/blob/238e5af2a95c3fbb83b0c8f44501ed2541215122/contracts/protocol/tokenization/StaticATokenLM.sol#L255 **/ @@ -467,6 +471,8 @@ contract StaticATokenLM is /** * @notice Claim rewards on behalf of a user and send them to a receiver + * Users should be careful when claiming rewards using `forceUpdate=false` as this will result on permanent + * loss of pending/uncollected rewards. Always claim rewards using `forceUpdate=true` when possible. * @param onBehalfOf The address to claim on behalf of * @param receiver The address to receive the rewards * @param forceUpdate Flag to retrieve latest rewards from `INCENTIVES_CONTROLLER` diff --git a/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts b/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts index c065fe9f72..943738b43e 100644 --- a/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts +++ b/test/plugins/individual-collateral/aave/StaticATokenLM.test.ts @@ -1931,6 +1931,59 @@ describeFork('StaticATokenLM: aToken wrapper with static balances and liquidity expect(pendingRewards4_u1).to.be.lt(pendingRewards4_u2) expect(pendingRewards4_u2).to.be.gt(pendingRewards3_u2) }) + + it('Loss of rewards when claiming with forceUpdate=false', async () => { + const amountToDeposit = utils.parseEther('5') + + // Just preparation + await waitForTx(await weth.deposit({ value: amountToDeposit.mul(2) })) + await waitForTx( + await weth.approve(staticAToken.address, amountToDeposit.mul(2), defaultTxParams) + ) + + // Depositing + await waitForTx( + await staticAToken.deposit(userSigner._address, amountToDeposit, 0, true, defaultTxParams) + ) + await advanceTime(1) + + //***** need small reward balace + await staticAToken.collectAndUpdateRewards() + const staticATokenBalanceFirst = await stkAave.balanceOf(staticAToken.address) + expect(staticATokenBalanceFirst).to.be.gt(0) + + await advanceTime(60 * 60 * 24) + + // Depositing + await waitForTx( + await staticAToken.deposit(userSigner._address, amountToDeposit, 0, true, defaultTxParams) + ) + + const beforeRewardBalance = await stkAave.balanceOf(userSigner._address) + const pendingRewardsBefore = await staticAToken.getClaimableRewards(userSigner._address) + + // User has no balance yet + expect(beforeRewardBalance).to.equal(0) + // Additional rewards exist to be collected + expect(pendingRewardsBefore).to.be.gt(staticATokenBalanceFirst) + + // user claim forceUpdate = false + await waitForTx(await staticAToken.connect(userSigner).claimRewardsToSelf(false)) + + const afterRewardBalance = await stkAave.balanceOf(userSigner._address) + const pendingRewardsAfter = await staticAToken.getClaimableRewards(userSigner._address) + + const pendingRewardsDecline = pendingRewardsBefore.toNumber() - pendingRewardsAfter.toNumber() + const getRewards = afterRewardBalance.toNumber() - beforeRewardBalance.toNumber() + const staticATokenBalanceAfter = await stkAave.balanceOf(staticAToken.address) + + // User has the funds, nothing remains in contract + expect(afterRewardBalance).to.equal(staticATokenBalanceFirst) + expect(staticATokenBalanceAfter).to.equal(0) + + // Check there is a loss + expect(pendingRewardsDecline - getRewards).to.be.gt(0) + }) }) it('Multiple users deposit WETH on stataWETH, wait 1 hour, update rewards, one user transfer, then claim and update rewards.', async () => { From e1d26ca2cc5d762c797168ea26e78b1c5c81010a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 18:03:07 -0400 Subject: [PATCH 056/450] update CHANGELOG and a few stale comments --- CHANGELOG.md | 39 ++++++++++++++++++--------------- contracts/facade/FacadeAct.sol | 2 +- contracts/facade/FacadeRead.sol | 1 + 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83dfae64ad..80654bcf8c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,16 +30,17 @@ It is acceptable to leave these function calls out of the initial upgrade tx and ### Core Protocol Contracts -Bump solidity version to 0.8.19 - - `AssetRegistry` [+1 slot] Summary: StRSR contract need to know when refresh() was last called - - Add last refresh timestamp tracking and expose via `lastRefresh()` getter + - # Add last refresh timestamp tracking and expose via `lastRefresh()` getter + Summary: Other component contracts need to know when refresh() was last called + - Add `lastRefresh()` timestamp getter + > > > > > > > Stashed changes - Add `size()` getter for number of registered assets - Require asset is SOUND on registration - Bugfix: Fix gas attack that could result in someone disabling the basket - `BackingManager` [+2 slots] - Summary: manageTokens was broken out into rebalancing and surplus-forwarding functions to allow users to more precisely call the protocol + Summary: manageTokens was broken out into separate rebalancing and surplus-forwarding functions to allow users to more precisely call the protocol - Replace `manageTokens(IERC20[] memory erc20s)` with: - `rebalance(TradeKind)` @@ -63,6 +64,7 @@ Bump solidity version to 0.8.19 Summary: Introduces a notion of basket warmup to defend against short-term oracle manipulation attacks. Prevent RTokens from changing in value due to governance - Add new gov param: `warmupPeriod` with setter `setWarmupPeriod(..)` and event `WarmupPeriodSet()` + - Add `trackStatus()` refresher - Add `isReady()` view - Extract basket switching logic out into external library `BasketLibP1` - Enforce `setPrimeBasket()` does not change the net value of a basket in terms of its target units @@ -80,9 +82,10 @@ Bump solidity version to 0.8.19 - Rename event `AuctionLengthSet()` -> `BatchAuctionLengthSet()` - Add `dutchAuctionLength` and `setDutchAuctionLength()` setter and `DutchAuctionLengthSet()` event - Add `dutchTradeImplementation` and `setDutchTradeImplementation()` setter and `DutchTradeImplementationSet()` event - - Unlike batch auctions, dutch auctions can be disabled _per-ERC20_, and can only be disabled by BackingManager-started trades - - Only permit BackingManager-started dutch auctions to report violations and disable trading - - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req)` + - Modify `setBatchTradeDisabled(bool)` -> `enableBatchTrade()` + - Modify `setDutchTradeDisabled(IERC20 erc20, bool)` -> `enableDutchTrade(IERC20 erc20)` + - Unlike batch auctions, dutch auctions can be disabled _per-ERC20_, and can only be disabled by BackingManager-started trades + - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req, TradePrices memory prices)` - Allow when paused / frozen, since caller must be in-system - `Deployer` [+0 slots] @@ -103,9 +106,9 @@ Bump solidity version to 0.8.19 - Lower `MAX_RATIO` from 1e18 to 1e14. - `Main` [+0 slots] - Summary: Breakup pausing into two types of pausing: issuance and trading + Summary: Split pausing into two types of pausing: issuance and trading - - Break `paused` into `issuancePaused` and `tradingPaused` + - Split `paused` into `issuancePaused` and `tradingPaused` - `pause()` -> `pauseTrading()` and `pauseIssuance()` - `unpause()` -> `unpauseTrading()` and `unpauseIssuance()` - `pausedOrFrozen()` -> `tradingPausedOrFrozen()` and `issuancePausedOrFrozen()` @@ -146,7 +149,7 @@ Bump solidity version to 0.8.19 - Add `withdrawalLeak` gov param, with `setWithdrawalLeak(..)` setter and `WithdrawalLeakSet()` event - Modify `withdraw()` to allow a small % of RSR to exit without paying to refresh all assets - Modify `withdraw()` to check for `warmupPeriod` - - Add ability to re-stake during a withdrawal via `cancelUnstake(uint256 endId)` + - Add `cancelUnstake(uint256 endId)` to allow re-staking during unstaking - Add `UnstakingCancelled()` event - Allow payout of (already acquired) RSR rewards while frozen - Add ability for governance to `resetStakes()` when stake rate falls outside (1e12, 1e24) @@ -156,16 +159,17 @@ Bump solidity version to 0.8.19 ### Facades +Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` and `revenueOverview()` + - `FacadeAct` - Summary: Remove unused getActCalldata and add way to run revenue auctions + Summary: Remove unused `getActCalldata()` and add way to run revenue auctions - Remove `getActCalldata(..)` - Remove `canRunRecollateralizationAuctions(..)` - - Modify `runRevenueAuctions(..)` to work with both 3.0.0 and 2.1.0 interfaces - - Add `revenueOverview(..)` callstatic function to get an overview of the current revenue state - - Add `nextRecollateralizationAuction(..)` callstatic function to get an overview of the rebalancing state - -- Remove `FacadeMonitor` + - Remove `runRevenueAuctions(..)` + - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` + - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` + - Modify all functions to work on both 3.0.0 and 2.1.0 RTokens - `FacadeRead` Summary: Add new data summary views frontends may be interested in @@ -173,7 +177,7 @@ Bump solidity version to 0.8.19 - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions - Remove `traderBalances(..)` - - `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` + - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - `FacadeWrite` Summary: More expressive and fine-grained control over the set of pausers and freezers @@ -182,7 +186,6 @@ Bump solidity version to 0.8.19 - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER - Add ability to initialize with multiple pausers, short freezers, and long freezers - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` - - Update `DeploymentParams` and `Implementations` struct to contain new gov params and dutch trade plugin ## Plugins diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 549ccf16ae..3ded3549d9 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -12,7 +12,7 @@ import "../interfaces/IFacadeRead.sol"; /** * @title Facade * @notice A Facade to help batch compound actions that cannot be done from an EOA, solely. - * For use with ^3.0.0 RTokens. + * Compatible with both 2.1.0 and ^3.0.0 RTokens. */ contract FacadeAct is IFacadeAct, Multicall { using Address for address; diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 694ae839c6..10f60d9182 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -16,6 +16,7 @@ import "../p1/StRSRVotes.sol"; /** * @title Facade * @notice A UX-friendly layer for reading out the state of a ^3.0.0 RToken in summary views. + * Backwards-compatible with 2.1.0 RTokens with the exception of `redeemCustom()`. * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ contract FacadeRead is IFacadeRead { From 1bcc26837e47ab043f479a2c1603799584be9ffa Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 18:07:43 -0400 Subject: [PATCH 057/450] clarify aave V2 erc20s don't need to upgrade --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 01a444e106..9a03c0e1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,9 @@ Call the following functions: - `RevenueTrader.cacheComponents()` (for both rsrTrader and rTokenTrader) - `Distributor.cacheComponents()` -_All_ asset plugins (and their corresponding ERC20s) must be upgraded. +_All_ asset plugins (and their corresponding ERC20s) must be upgraded. The only exception is the `StaticATokenLM` ERC20s from Aave V2. These can be left the same, however their assets should upgraded. -- Make sure to use `Deployer.deployRTokenAsset()` to create new `RTokenAsset` instances. This asset must be swapped too. +- Note: Make sure to use `Deployer.deployRTokenAsset()` to create new `RTokenAsset` instances. This asset should be swapped too. #### Optional Steps From 817c36d20e5f90b54378ad95adbea91d9889b6fc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 18:14:37 -0400 Subject: [PATCH 058/450] CHANGELOG.md --- CHANGELOG.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 82f201dbd5..45c59ff34f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,19 +4,18 @@ ### Upgrade Steps -- Required -Upgrade `BackingManager`, `Broker`, and _all_ assets +Upgrade `BackingManager`, `Broker`, and _all_ assets. ERC20s do not need to be upgraded. -Then call `Broker.cacheComponents()`. +Then, call `Broker.cacheComponents()`. ### Core Protocol Contracts - `BackingManager` - Replace use of `lotPrice()` with `price()` +- `BasketHandler` + - Remove `lotPrice()` - `Broker` [+1 slot] - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` - - Only permit BackingManager-started dutch auctions to report violations and disable trading - - Remove `setBatchTradeDisabled(bool)` and replace with `enableBatchTrade()` - - Remove `setDutchTradeDisabled(IERC20 erc20, bool)` and replace with `enableDutchTrade(IERC20 erc20)` ## Plugins @@ -25,7 +24,9 @@ Then call `Broker.cacheComponents()`. - Remove `lotPrice()` - Alter `price().high` to decay upwards to 3x over the price timeout -# 3.0.0 - Unreleased +# 3.0.0 + +Bump solidity version to 0.8.19 ### Upgrade Steps From 9587d282c83c8d2820c1a363770c6088e4c142e3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 18:27:36 -0400 Subject: [PATCH 059/450] compile --- contracts/plugins/assets/RTokenAsset.sol | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index 314134cbc6..2dd0010f07 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -55,10 +55,8 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// `basketHandler.price()`. When `range.bottom == range.top` then there is no compounding. /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - function tryPrice(bool useLotPrice) external view virtual returns (uint192 low, uint192 high) { - (uint192 lowBUPrice, uint192 highBUPrice) = useLotPrice - ? basketHandler.lotPrice() - : basketHandler.price(); // {UoA/BU} + function tryPrice() external view virtual returns (uint192 low, uint192 high) { + (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(); // {UoA/BU} require(lowBUPrice != 0 && highBUPrice != FIX_MAX, "invalid price"); assert(lowBUPrice <= highBUPrice); // not obviously true just by inspection @@ -93,7 +91,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { - try this.tryPrice(false) returns (uint192 low, uint192 high) { + try this.tryPrice() returns (uint192 low, uint192 high) { return (low, high); } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data From ecc62f3c65f420381e21cd2c6519f9b55bc2d6bc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 31 Aug 2023 20:59:35 -0400 Subject: [PATCH 060/450] Update docs for 3.0.0 (#915) --- CHANGELOG.md | 154 ++++++++++++++--------- README.md | 23 +--- contracts/facade/FacadeAct.sol | 2 +- contracts/facade/FacadeRead.sol | 1 + contracts/p1/BasketHandler.sol | 2 +- contracts/plugins/assets/RTokenAsset.sol | 9 +- docs/collateral.md | 33 ++--- docs/mev.md | 6 +- docs/writing-collateral-plugins.md | 1 + 9 files changed, 124 insertions(+), 107 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 114233c2ca..9a03c0e1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,70 +14,77 @@ Call the following functions: - `RevenueTrader.cacheComponents()` (for both rsrTrader and rTokenTrader) - `Distributor.cacheComponents()` -Collateral / Asset plugins from 2.1.0 do not need to be upgraded with the exception of Compound V2 cToken collateral ([CTokenFiatCollateral.sol](contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol)), which needs to be swapped in via `AssetRegistry.swapRegistered()`. Skipping this step will result in COMP rewards becoming unclaimable. Note that this will change the ERC20 for the collateral plugin, causing the protocol to trade out of the old ERC20. Since COMP rewards are claimed on every transfer, COMP does not need to be claimed beforehand. +_All_ asset plugins (and their corresponding ERC20s) must be upgraded. The only exception is the `StaticATokenLM` ERC20s from Aave V2. These can be left the same, however their assets should upgraded. + +- Note: Make sure to use `Deployer.deployRTokenAsset()` to create new `RTokenAsset` instances. This asset should be swapped too. #### Optional Steps Call the following functions, once it is desired to turn on the new features: -- `BaasketHandler.setWarmupPeriod()` +- `BasketHandler.setWarmupPeriod()` - `StRSR.setWithdrawalLeak()` - `Broker.setDutchAuctionLength()` -### Core Protocol Contracts - -Bump solidity version to 0.8.19 +It is acceptable to leave these function calls out of the initial upgrade tx and follow up with them later. The protocol will continue to function, just without dutch auctions, RSR unstaking gas-savings, and the warmup period. -Bump solidity version to 0.8.19 +### Core Protocol Contracts - `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 + Summary: StRSR contract need to know when refresh() was last called + - # Add last refresh timestamp tracking and expose via `lastRefresh()` getter + Summary: Other component contracts need to know when refresh() was last called + - Add `lastRefresh()` timestamp getter - Add `size()` getter for number of registered assets + - Require asset is SOUND on registration + - Bugfix: Fix gas attack that could result in someone disabling the basket - `BackingManager` [+2 slots] - Summary: manageTokens was broken out into rebalancing and surplus-forwarding functions to allow users to more precisely call the protocol + Summary: manageTokens was broken out into separate rebalancing and surplus-forwarding functions to allow users to more precisely call the protocol - Replace `manageTokens(IERC20[] memory erc20s)` with: - - `rebalance(TradeKind)` + `RecollateralizationLibP1` - - Modify trading algorithm to not trade RToken, and instead dissolve it when it has a balance above ~1e6. "dissolve" = melt() with a basketsNeeded change, like redemption. + - `rebalance(TradeKind)` + - Modify trading algorithm to not trade RToken, and instead dissolve it when it has a balance above ~1e6 RToken quanta. "dissolve" = melt() with a basketsNeeded change, similar to redemption but without transfer of RToken collateral. + - Use `lotPrice()` to set trade prices instead of `price()` - Add significant caching to save gas - `forwardRevenue(IERC20[] memory erc20s)` - - Modify backingBuffer logic to keep the backing buffer in collateral tokens only. Fix subtle and inconsequential bug that resulted in not maximizing RToken minting locally, though overall RToken production would not have been lower. + - Modify backingBuffer logic to keep the backing buffer in collateral tokens only. Fix subtle and inconsequential bug that resulted in not maximizing RToken minting locally, though overall RToken production does not change. - Use `nonReentrant` over CEI pattern for gas improvement. related to discussion of [this](https://github.com/code-423n4/2023-01-reserve-findings/issues/347) cross-contract reentrancy risk - move `nonReentrant` up outside `tryTrade` internal helper - Remove `manageTokensSortedOrder(IERC20[] memory erc20s)` - Modify `settleTrade(IERC20 sell)` to call `rebalance()` when caller is a trade it deployed. - - Remove all `delegatecall` during reward claiming + - Remove all `delegatecall` during reward claiming; call `claimRewards()` directly on ERC20 - Functions now revert on unproductive executions, instead of no-op - Do not trade until a warmupPeriod (last time SOUND was newly attained) has passed - Add `cacheComponents()` refresher to be called on upgrade + - Add concept of `tradeNonce` - Bugfix: consider `maxTradeVolume()` from both assets on a trade, not just 1 - `BasketHandler` [+5 slots] Summary: Introduces a notion of basket warmup to defend against short-term oracle manipulation attacks. Prevent RTokens from changing in value due to governance - Add new gov param: `warmupPeriod` with setter `setWarmupPeriod(..)` and event `WarmupPeriodSet()` + - Add `trackStatus()` refresher - Add `isReady()` view - Extract basket switching logic out into external library `BasketLibP1` - Enforce `setPrimeBasket()` does not change the net value of a basket in terms of its target units - Add `quoteCustomRedemption(uint48[] basketNonces, uint192[] memory portions, ..)` to quote a linear combination of current-or-previous baskets for redemption - Add `getHistoricalBasket(uint48 basketNonce)` view + - Bugfix: Protect against high BU price overflow -- `Broker` [+1 slot] - Summary: Add a new trading plugin that performs single-lot dutch auctions. Batch auctions via Gnosis EasyAuction are expected to be the backup auction (can be faster if more gas costly) going forward. +- `Broker` [+2 slot] + Summary: Add a second trading method for single-lot dutch auctions. Batch auctions via Gnosis EasyAuction are expected to be the backup auction going forward. - - Add `TradeKind` enum to track multiple trading types - Add new dutch auction `DutchTrade` - - Add minimum auction length of 24s; applies to all auction types + - Add minimum auction length of 20 blocks based on network block time - Rename variable `auctionLength` -> `batchAuctionLength` - Rename setter `setAuctionLength()` -> `setBatchAuctionLength()` - Rename event `AuctionLengthSet()` -> `BatchAuctionLengthSet()` - Add `dutchAuctionLength` and `setDutchAuctionLength()` setter and `DutchAuctionLengthSet()` event - Add `dutchTradeImplementation` and `setDutchTradeImplementation()` setter and `DutchTradeImplementationSet()` event - - Only permit BackingManager-started dutch auctions to report violations and disable trading - - Remove `setBatchTradeDisabled(bool)` and replace with `enableBatchTrade()` - - Remove `setDutchTradeDisabled(IERC20 erc20, bool)` and replace with `enableDutchTrade(IERC20 erc20)` - - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req)` + - Modify `setBatchTradeDisabled(bool)` -> `enableBatchTrade()` + - Modify `setDutchTradeDisabled(IERC20 erc20, bool)` -> `enableDutchTrade(IERC20 erc20)` + - Unlike batch auctions, dutch auctions can be disabled _per-ERC20_, and can only be disabled by BackingManager-started trades + - Modify `openTrade(TradeRequest memory reg)` -> `openTrade(TradeKind kind, TradeRequest memory req, TradePrices memory prices)` - Allow when paused / frozen, since caller must be in-system - `Deployer` [+0 slots] @@ -85,104 +92,127 @@ Bump solidity version to 0.8.19 - Modify to handle new gov params: `warmupPeriod`, `dutchAuctionLength`, and `withdrawalLeak` - Do not grant OWNER any of the roles other than ownership + - Add `deployRTokenAsset()` to allow easy creation of new `RTokenAsset` instances -- `Distributor` [+0 slots] - Summary: Waste of gas to double-check this, since caller is another component +- `Distributor` [+2 slots] + Summary: Restrict callers to system components and remove paused/frozen checks - Remove `notPausedOrFrozen` modifier from `distribute()` - `Furnace` [+0 slots] - Summary: Should be able to melting while redeeming when frozen - - Modify `melt()` modifier: `notPausedOrFrozen` -> `notFrozen` + Summary: Allow melting while paused + + - Allow melting while paused + - Melt during updates to the melting ratio + - Lower `MAX_RATIO` from 1e18 to 1e14. + - `Main` [+0 slots] - Summary: Breakup pausing into two types of pausing: issuance and trading + Summary: Split pausing into two types of pausing: issuance and trading - - Break `paused` into `issuancePaused` and `tradingPaused` + - Split `paused` into `issuancePaused` and `tradingPaused` - `pause()` -> `pauseTrading()` and `pauseIssuance()` - `unpause()` -> `unpauseTrading()` and `unpauseIssuance()` - `pausedOrFrozen()` -> `tradingPausedOrFrozen()` and `issuancePausedOrFrozen()` - `PausedSet()` event -> `TradingPausedSet()` and `IssuancePausedSet()` -- `RevenueTrader` [+3 slots] +- `RevenueTrader` [+4 slots] Summary: QoL improvements. Make compatible with new dutch auction trading method - - Remove `delegatecall` during reward claiming + - Remove `delegatecall` during reward claiming; call `claimRewards()` directly on ERC20 - Add `cacheComponents()` refresher to be called on upgrade - - `manageToken(IERC20 sell)` -> `manageToken(IERC20 sell, TradeKind kind)` - - Allow `manageToken(..)` to open dust auctions - - Revert on 0 balance or collision auction, instead of no-op + - `manageToken(IERC20 sell)` -> `manageTokens(IERC20[] calldata erc20s, TradeKind[] memory kinds)` + - Allow multiple auctions to be launched at once + - Allow opening dust auctions (i.e ignore `minTradeVolume`) + - Revert on 0 balance or collision auction instead of no-op - Refresh buy and sell asset before trade - - `settleTrade(IERC20)` now distributes `tokenToBuy`, instead of requiring separate `manageToken(IERC20)` call + - `settleTrade(IERC20)` now distributes `tokenToBuy` automatically, instead of requiring separate `manageToken(IERC20)` call + - Add `returnTokens(IERC20[] memory erc20s)` to return tokens to the BackingManager when the distribution is set to 0 + - Add concept of `tradeNonce` - `RToken` [+0 slots] - Summary: Provide multiple redemption methods for when fullyCollateralized vs not. Should support a higher RToken price during basket changes. + Summary: Provide multiple redemption methods for fullyCollateralized vs uncollateralized. - - Remove `exchangeRateIsValidAfter` modifier from all functions except `setBasketsNeeded()` - - Modify `issueTo()` to revert before `warmupPeriod` - - Modify `redeem(uint256 amount, uint48 basketNonce)` -> `redeem(uint256 amount)`. Redemptions are on the current basket nonce and revert under partial redemption + - Gas: Remove `exchangeRateIsValidAfter` modifier from all functions except `setBasketsNeeded()` + - Modify issuance`to revert before`warmupPeriod` + - Modify `redeem(uint256 amount, uint48 basketNonce)` -> `redeem(uint256 amount)`. Redemptions are always on the current basket nonce and revert under partial redemption - Modify `redeemTo(address recipient, uint256 amount, uint48 basketNonce)` -> `redeemTo(address recipient, uint256 amount)`. Redemptions are on the current basket nonce and revert under partial redemption - - Add new `redeemCustom(.., uint256 amount, uint48[] memory basketNonces, uint192[] memory portions, ..)` function to allow redemption from a linear combination of current and previous baskets. During rebalancing this method of redemption will provide a higher overall redemption value than prorata redemption on the current basket nonce would. - - `mint(address recipient, uint256 amtRToken)` -> `mint(uint256 amtRToken)`, since recipient is _always_ BackingManager. Expand scope to include adjustments to `basketsNeeded` + - Add new `redeemCustom(.., uint256 amount, uint48[] memory basketNonces, uint192[] memory portions, ..)` function to allow redemption from a linear combination of current and previous baskets. During rebalancing this method of redemption may provide a higher overall redemption value than prorata redemption on the current basket nonce would. + - Modify `mint(address recipient, uint256 amtRToken)` -> `mint(uint256 amtRToken)`, since recipient is _always_ BackingManager. Expand scope to include adjustments to `basketsNeeded` - Add `dissolve(uint256 amount)`: burns RToken and reduces `basketsNeeded`, similar to redemption. Only callable by BackingManager - Modify `setBasketsNeeded(..)` to revert when supply is 0 + - Bugfix: Accumulate throttles upon change - `StRSR` [+2 slots] - Summary: Add the ability to cancel unstakings and a withdrawal() gas-saver to allow small RSR amounts to be exempt from refreshes + Summary: Add the ability to cancel unstakings and a withdrawal() gas-saver to allow small RSR amounts to be exempt from asset refreshes + - Lower `MAX_REWARD_RATIO` from 1e18 to 1e14. - Remove duplicate `stakeRate()` getter (same as `1 / exchangeRate()`) - Add `withdrawalLeak` gov param, with `setWithdrawalLeak(..)` setter and `WithdrawalLeakSet()` event - - Modify `withdraw()` to allow a small % of RSR too exit without paying to refresh all assets + - Modify `withdraw()` to allow a small % of RSR to exit without paying to refresh all assets - Modify `withdraw()` to check for `warmupPeriod` - - Add ability to re-stake during a withdrawal via `cancelUnstake(uint256 endId)` + - Add `cancelUnstake(uint256 endId)` to allow re-staking during unstaking - Add `UnstakingCancelled()` event + - Allow payout of (already acquired) RSR rewards while frozen + - Add ability for governance to `resetStakes()` when stake rate falls outside (1e12, 1e24) - `StRSRVotes` [+0 slots] - - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function, to encourage people to receive voting weight upon staking + - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking ### Facades -- `FacadeWrite` - Summary: More expressive and fine-grained control over the set of pausers and freezers - - - Do not automatically grant Guardian PAUSER/SHORT_FREEZER/LONG_FREEZER - - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER - - Add ability to initialize with multiple pausers, short freezers, and long freezers - - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` - - Update `DeploymentParams` and `Implementations` struct to contain new gov params and dutch trade plugin +Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` and `revenueOverview()` - `FacadeAct` - Summary: Remove unused getActCalldata and add way to run revenue auctions + Summary: Remove unused `getActCalldata()` and add way to run revenue auctions - Remove `getActCalldata(..)` - - Modify `runRevenueAuctions(..)` to work with both 3.0.0 and 2.1.0 interfaces + - Remove `canRunRecollateralizationAuctions(..)` + - Remove `runRevenueAuctions(..)` + - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` + - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` + - Modify all functions to work on both 3.0.0 and 2.1.0 RTokens - `FacadeRead` Summary: Add new data summary views frontends may be interested in - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` + - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions - Remove `traderBalances(..)` - - `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` - - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` + - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` -- Remove `FacadeMonitor` - redundant with `nextRecollateralizationAuction()` and `revenueOverview()` +- `FacadeWrite` + Summary: More expressive and fine-grained control over the set of pausers and freezers + + - Do not automatically grant Guardian PAUSER/SHORT_FREEZER/LONG_FREEZER + - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER + - Add ability to initialize with multiple pausers, short freezers, and long freezers + - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` ## Plugins ### DutchTrade -A cheaper, simpler, trading method. Intended to be the new dominant trading method, with GnosisTrade (batch auctions) available as a faster-but-more-gas-expensive backup option. +A cheaper, simpler, trading method. Intended to be the new dominant trading method, with GnosisTrade (batch auctions) available as a backup option. Generally speaking the batch auction length can be kept shorter than the dutch auction length. -DutchTrade implements a two-stage, single-lot, falling price dutch auction. In the first 40% of the auction, the price falls from 1000x to the best-case price in a geometric/exponential decay as a price manipulation defense mechanism. Bids are not expected to occur (but note: unlike the GnosisTrade batch auction, this mechanism is not resistant to _arbitrary_ price manipulation). +DutchTrade implements a four-stage, single-lot, falling price dutch auction: -Over the last 60% of the auction, the price falls linearly from the best-case price to the worst-case price. Only a single bidder can bid fill the auction, and settlement is atomic. If no bids are received, the capital cycles back to the BackingManager and no loss is taken. +1. In the first 20% of the auction, the price falls from 1000x the best price to the best price in a geometric/exponential decay as a price manipulation defense mechanism. Bids are not expected to occur (but note: unlike the GnosisTrade batch auction, this mechanism is not resistant to _arbitrary_ price manipulation). If a bid occurs, then trading for the pair of tokens is disabled as long as the trade was started by the BackingManager. +2. Between 20% and 45%, the price falls linearly from 1.5x the best price to the best price. +3. Between 45% and 95%, the price falls linearly from the best price to the worst price. +4. Over the last 5% of the auction, the price remains constant at the worst price. Duration: 30 min (default) ### Assets and Collateral -- Bugfix: `lotPrice()` now begins at 100% the lastSavedPrice, instead of below 100%. It can be at 100% for up to the oracleTimeout in the worst-case. - Add `version() return (string)` getter to pave way for separation of asset versioning and core protocol versioning -- Update `claimRewards()` on all assets to 3.0.0-style, without `delegatecall` +- Deprecate `claimRewards()` - Add `lastSave()` to `RTokenAsset` +- Remove `CurveVolatileCollateral` +- Switch `CToken*Collateral` (Compound V2) to using a CTokenVault ERC20 rather than the raw cToken +- Bugfix: `lotPrice()` now begins at 100% the lastSavedPrice, instead of below 100%. It can be at 100% for up to the oracleTimeout in the worst-case. +- Bugfix: Handle oracle deprecation as indicated by the `aggregator()` being set to the zero address +- Bugfix: `AnkrStakedETHCollateral`/`CBETHCollateral`/`RethCollateral` now correctly detects soft default (note that Ankr still requires a new oracle before it can be deployed) +- Bugfix: Adjust `Curve*Collateral` and `RTokenAsset` to treat FIX_MAX correctly as +inf +- Bugfix: Continue updating cached price after collateral default (impacts all appreciating collateral) # 2.1.0 diff --git a/README.md b/README.md index 2ff52fa10b..0fb2726242 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ The Reserve Protocol enables a class of token called RToken: self-issued tokens RTokens can be minted by depositing a basket of _collateral tokens_, and redeemed for the basket as well. Thus, an RToken will tend to trade at the market value of the entire basket that backs it, as any lower or higher price could be arbitraged. -The definition of the collateral basket is set dynamically on a block-by-block basis with respect to a _reference basket_. While the RToken often does its internal calculus in terms of a single unit of account (USD), what constitutes appreciation is entirely a function of the reference basket, which will often be associated with a variety of units. +The definition of the issuance/redemption basket is set dynamically on a block-by-block basis with respect to a _reference basket_. While the RToken often does its internal calculus in terms of a single unit of account (USD), what constitutes appreciation is entirely a function of the reference basket, which is a linear combination of reference units. RTokens can be over-collateralized, which means that if any of their collateral tokens default, there's a pool of value available to make up for the loss. RToken over-collateralization is provided by Reserve Rights (RSR) holders, who may choose to stake their RSR on an RToken instance. Staked RSR can be seized in the case of a default, in a process that is entirely mechanistic based on on-chain price-feeds, and does not depend on governance votes or human judgment. @@ -22,6 +22,7 @@ For a much more detailed explanation of the economic design, including an hour-l - [Testing with Echidna](docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) - [Deployment](docs/deployment.md): How to do test deployments in our environment. - [System Design](docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. +- [Deployment Variables](docs/deployment-variables.md) A detailed description of the governance variables of the protocol. - [Our Solidity Style](docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. - [Writing Collateral Plugins](docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. - [Building on Top](docs/build-on-top.md): How to build on top of Reserve, including information about long-lived fork environments. @@ -103,13 +104,10 @@ The less-central folders in the repository are dedicated to project management, ## Types of Tests -We conceive of several different types of tests: - -Finally, inside particular testing, it's quite useful to distinguish unit tests from full end-to-end tests. As such, we expect to write tests of the following 5 types: - ### Unit/System Tests - Driven by `hardhat test` +- Addressed by `yarn test:unit` - Checks for expected behavior of the system. - Can run the same tests against both p0 and p1 - Uses contract mocks, where helpful to predict component behavior @@ -119,6 +117,7 @@ Target: Full branch coverage, and testing of any semantically-relevant situation ### End-to-End Tests - Driven by `hardhat test` +- Addressed by `yarn test:integration` - Uses mainnet forking - Can run the same tests against both p0 and p1 - Tests all needed plugin contracts, contract deployment, any migrations, etc. @@ -137,17 +136,7 @@ Located in `fuzz` branch only. Target: The handful of our most depended-upon system properties and invariants are articulated and thoroughly fuzz-tested. Examples of such properties include: - Unless the basket is switched (due to token default or governance) the protocol always remains fully-collateralized. -- Unless the protocol is paused, RToken holders can always redeem -- If the protocol is paused, and governance does not act further, the protocol will later become unpaused. - -### Differential Testing - -Located in `fuzz` branch only. - -- Driven by Echidna -- Asserts that the behavior of each p1 contract matches that of p0 - -Target: Intensive equivalence testing, run continuously for days or weeks, sensitive to any difference between observable behaviors of p0 and p1. +- Unless the protocol is frozen, RToken holders can always redeem ## Contributing @@ -159,7 +148,7 @@ To get setup with tenderly, install the [tenderly cli](https://github.com/Tender ## Responsible Disclosure -[Immunifi](https://immunefi.com/bounty/reserve/) +See: [Immunifi](https://immunefi.com/bounty/reserve/) ## External Documentation diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index ab3e77152e..c8be6f29ad 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -13,7 +13,7 @@ import "../interfaces/IFacadeRead.sol"; /** * @title Facade * @notice A Facade to help batch compound actions that cannot be done from an EOA, solely. - * For use with ^3.0.0 RTokens. + * Compatible with both 2.1.0 and ^3.0.0 RTokens. */ contract FacadeAct is IFacadeAct, Multicall { using Address for address; diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 694ae839c6..10f60d9182 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -16,6 +16,7 @@ import "../p1/StRSRVotes.sol"; /** * @title Facade * @notice A UX-friendly layer for reading out the state of a ^3.0.0 RToken in summary views. + * Backwards-compatible with 2.1.0 RTokens with the exception of `redeemCustom()`. * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ contract FacadeRead is IFacadeRead { diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 387055fc63..2cb493d1a3 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -21,9 +21,9 @@ import "./mixins/Component.sol"; /// @custom:oz-upgrades-unsafe-allow external-library-linking contract BasketHandlerP1 is ComponentP1, IBasketHandler { using BasketLibP1 for Basket; + using CollateralStatusComparator for CollateralStatus; using EnumerableMap for EnumerableMap.Bytes32ToUintMap; using EnumerableSet for EnumerableSet.Bytes32Set; - using CollateralStatusComparator for CollateralStatus; using FixLib for uint192; uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index eae0c8b2b0..68a9da9863 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -12,7 +12,7 @@ uint256 constant ORACLE_TIMEOUT = 15 minutes; /// Once an RToken gets large enough to get a price feed, replacing this asset with /// a simpler one will do wonders for gas usage -// @dev This RTokenAsset is ONLY compatible with Protocol ^3.0.0 +/// @dev This RTokenAsset is ONLY compatible with Protocol ^3.0.0 contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { using FixLib for uint192; using OracleLib for AggregatorV3Interface; @@ -48,6 +48,11 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { } /// Can revert, used by other contract functions in order to catch errors + /// @dev This method for calculating the price can provide a 2x larger range than the average + /// oracleError of the RToken's backing collateral. This only occurs when there is + /// less RSR overcollateralization in % terms than the average (weighted) oracleError. + /// This arises from the use of oracleErrors inside of `basketRange()` and inside + /// `basketHandler.price()`. When `range.bottom == range.top` then there is no compounding. /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate function tryPrice(bool useLotPrice) external view virtual returns (uint192 low, uint192 high) { @@ -84,6 +89,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-enable no-empty-blocks /// Should not revert + /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { @@ -98,6 +104,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// Should not revert /// lotLow should be nonzero when the asset might be worth selling + /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { diff --git a/docs/collateral.md b/docs/collateral.md index d9589954e1..88727f0fb1 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -15,7 +15,6 @@ In our inheritance tree, Collateral is a subtype of Asset (i.e. `ICollateral is - How to get its price - A maximum volume per trade -- How to claim token rewards, if the token offers them A Collateral contract is a subtype of Asset (i.e. `ICollateral is IAsset`), so it does everything as Asset does. Beyond that, a Collateral plugin provides the Reserve Protocol with the information it needs to use its token as collateral -- as backing, held in the RToken's basket. @@ -27,20 +26,6 @@ A Collateral contract is a subtype of Asset (i.e. `ICollateral is IAsset`), so i The IAsset and ICollateral interfaces, from `IAsset.sol`, are as follows: ```solidity -/** - * @title IRewardable - * @notice A simple interface mixin to support claiming of rewards. - */ -interface IRewardable { - /// Emitted whenever a reward token balance is claimed - event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); - - /// Claim rewards earned by holding a balance of the ERC20 token - /// Must emit `RewardsClaimed` for each token rewards are claimed for - /// @custom:interaction - function claimRewards() external; -} - /** * @title IAsset * @notice Supertype. Any token that interacts with our system must be wrapped in an asset, @@ -77,8 +62,11 @@ interface IAsset is IRewardable { /// @return If the asset is an instance of ICollateral or not function isCollateral() external view returns (bool); - /// @param {UoA} The max trade volume, in UoA + /// @return {UoA} The max trade volume, in UoA function maxTradeVolume() external view returns (uint192); + + /// @return {s} The timestamp of the last refresh() that saved prices + function lastSave() external view returns (uint48); } /// CollateralStatus must obey a linear ordering. That is: @@ -199,9 +187,9 @@ Note, this doesn't disqualify collateral with USD as its target unit! It's fine ### Representing Fractional Values -Wherever contract variables have these units, it's understood that even though they're handled as `uint`s, they represent fractional values with 18 decimals. In particular, a `{tok}` value is a number of "whole tokens" with 18 decimals. So even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working in units of `{tok}`. +Wherever contract variables have these units, it's understood that even though they're handled as `uint192`s, they represent fractional values with 18 decimals. In particular, a `{tok}` value is a number of "whole tokens" with 18 decimals. So even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working in units of `{tok}`. -For more about our approach for handling decimal-fixed-point, see our [docs on the Fix Library](solidity-style.md#The-Fix-Library). +For more about our approach for handling decimal-fixed-point, see our [docs on the Fix Library](solidity-style.md#The-Fix-Library). Ideally a user-defined type would be used but we found static analyses tools had trouble with that. ## Synthetic Units @@ -349,9 +337,9 @@ If `status()` ever returns `CollateralStatus.DISABLED`, then it must always retu ### Token rewards should be claimable. -Protocol contracts that hold an asset for any significant amount of time are all able to call `claimRewards()` on the ERC20 itself (previously on the asset/collateral plugin via delegatecall). The erc20 or its wrapper contract should include whatever logic is necessary to claim rewards from all relevant defi protocols. These rewards are often emissions from other protocols, but may also be something like trading fees in the case of UNIV3 collateral. To take advantage of this: +Protocol contracts that hold an asset for any significant amount of time must be able to call `claimRewards()` on the ERC20 itself (previously on the asset/collateral plugin via delegatecall). The erc20 should include whatever logic is necessary to claim rewards from all relevant defi protocols. These rewards are often emissions from other protocols, but may also be something like trading fees in the case of UNIV3 collateral. To take advantage of this: -- `claimRewards()` must claim all rewards that may be earned by holding the asset ERC20 and send them to the holder. +- `claimRewards()` must claim all rewards that may be earned by holding the asset ERC20 and send them to the holder, in the correct proportions based on amount of time held. - The `RewardsClaimed` event should be emitted for each token type claimed. ### Smaller Constraints @@ -371,7 +359,6 @@ Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/a - `tryPrice()` (not on the ICollateral interface; used by `price()`/`lotPrice()`/`refresh()`) - `refPerTok()` - `targetPerRef()` -- `claimRewards()` ### refresh() @@ -441,6 +428,8 @@ Should never revert. Should return a lower and upper estimate for the price of the token on secondary markets. +The difference between the upper and lower estimate should not exceed 5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. + Lower estimate must be <= upper estimate. Should return `(0, FIX_MAX)` if pricing data is unavailable or stale. @@ -490,6 +479,6 @@ If implementing a demurrage-based collateral plugin, make sure your targetName f ## Practical Advice from Previous Work -In most cases [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of four functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`, `claimRewards()`. +In most cases [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of three functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`. If you're quite stuck, you might also find it useful to read through our other Collateral plugins as models, found in our repository in `/contracts/plugins/assets`. diff --git a/docs/mev.md b/docs/mev.md index 8d2cfdf714..7d32e64687 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -27,7 +27,7 @@ Bidding instructions from the `DutchTrade` contract: `DutchTrade` (relevant) interface: ```solidity -function bid() external; // execute a bid at the current block timestamp +function bid() external; // execute a bid at the current block number function sell() external view returns (IERC20); @@ -37,7 +37,7 @@ function status() external view returns (uint8); // 0: not_started, 1: active, 2 function lot() external view returns (uint256); // {qSellTok} the number of tokens being sold -function bidAmount(uint48 timestamp) external view returns (uint256); // {qBuyTok} the number of tokens required to buy the lot, at a particular timestamp +function bidAmount(uint256 blockNumber) external view returns (uint256); // {qBuyTok} the number of tokens required to buy the lot, at a particular block number ``` @@ -45,7 +45,7 @@ To participate: 1. Call `status()` view; the auction is ongoing if return value is 1 2. Call `lot()` to see the number of tokens being sold -3. Call `bidAmount()` to see the number of tokens required to buy the lot, at various timestamps +3. Call `bidAmount()` to see the number of tokens required to buy the lot, at various block numbers 4. After finding an attractive bidAmount, provide an approval for the `buy()` token. The spender should be the `DutchTrade` contract. **Note**: it is very important to set tight approvals! Do not set more than the `bidAmount()` for the desired bidding block else reorgs present risk. 5. Wait until the desired block is reached (hopefully not in the first 40% of the auction) diff --git a/docs/writing-collateral-plugins.md b/docs/writing-collateral-plugins.md index 01fe3d75d4..be05b3ec64 100644 --- a/docs/writing-collateral-plugins.md +++ b/docs/writing-collateral-plugins.md @@ -27,6 +27,7 @@ Here are some basic questions to answer before beginning to write a new collater 7. **What amount of revenue should this plugin hide? (a minimum of `1e-6`% is recommended, but some collateral may require higher thresholds, and, in rare cases, `0` can be used)** 8. **Are there rewards that can be claimed by holding this collateral? If so, how are they claimed?** Include a github link to the callable function or an example of how to claim. 9. **Does the collateral need to be "refreshed" in order to update its internal state before refreshing the plugin?** Include a github link to the callable function. +10. **Can the `price()` range be kept <5%? What is the largest possible % difference (while priced) between `price().high` and `price().low`?** See [RTokenAsset.tryPrice()](../contracts/plugins/assets/RTokenAsset.sol) and [docs/collateral.md](./collateral.md#price) for additional context. ## Implementation From b31005bf95f79fa6c1014fe063790905b89fb3b2 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 1 Sep 2023 00:28:07 -0300 Subject: [PATCH 061/450] Upg checker 3.0 (#909) Co-authored-by: Taylor Brent Co-authored-by: Patrick McKelvy --- .../upgrade-checker-utils/constants.ts | 16 +- .../upgrade-checker-utils/governance.ts | 6 +- tasks/testing/upgrade-checker-utils/logs.ts | 2 + .../testing/upgrade-checker-utils/oracles.ts | 27 +- .../testing/upgrade-checker-utils/rewards.ts | 4 +- .../testing/upgrade-checker-utils/rtokens.ts | 193 ++++++- tasks/testing/upgrade-checker-utils/trades.ts | 213 +++++++- .../upgrade-checker-utils/upgrades/3_0_0.ts | 481 ++++++++++++++++++ tasks/testing/upgrade-checker.ts | 171 ++++--- 9 files changed, 981 insertions(+), 132 deletions(-) create mode 100644 tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts diff --git a/tasks/testing/upgrade-checker-utils/constants.ts b/tasks/testing/upgrade-checker-utils/constants.ts index a58d60a7fe..518a48adc3 100644 --- a/tasks/testing/upgrade-checker-utils/constants.ts +++ b/tasks/testing/upgrade-checker-utils/constants.ts @@ -4,14 +4,22 @@ export const whales: { [key: string]: string } = { [networkConfig['1'].tokens.USDT!.toLowerCase()]: '0x47ac0Fb4F2D84898e4D9E7b4DaB3C24507a6D503', [networkConfig['1'].tokens.USDC!.toLowerCase()]: '0x756D64Dc5eDb56740fC617628dC832DDBCfd373c', [networkConfig['1'].tokens.RSR!.toLowerCase()]: '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1', - [networkConfig['1'].tokens.cUSDT!.toLowerCase()]: '0x5754284f345afc66a98fbB0a0Afe71e0F007B949', - [networkConfig['1'].tokens.aUSDT!.toLowerCase()]: '0x5754284f345afc66a98fbB0a0Afe71e0F007B949', + [networkConfig['1'].tokens.cUSDT!.toLowerCase()]: '0xb99CC7e10Fe0Acc68C50C7829F473d81e23249cc', + [networkConfig['1'].tokens.aUSDT!.toLowerCase()]: '0x0B6B712B0f3998961Cd3109341b00c905b16124A', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: '0x5754284f345afc66a98fbB0a0Afe71e0F007B949', // saUSDT - [networkConfig['1'].tokens.aUSDC!.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', - [networkConfig['1'].tokens.cUSDC!.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', + // TODO: Replace with real address + ['0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038'.toLowerCase()]: + '0x5754284f345afc66a98fbB0a0Afe71e0F007B949', // cUSDTVault + + [networkConfig['1'].tokens.aUSDC!.toLowerCase()]: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', + [networkConfig['1'].tokens.cUSDC!.toLowerCase()]: '0x97D868b5C2937355Bf89C5E5463d52016240fE86', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', // saUSDC + // TODO: Replace with real address + ['0xf201fFeA8447AB3d43c98Da3349e0749813C9009'.toLowerCase()]: + '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', // cUSDCVault + [networkConfig['1'].tokens.RSR!.toLowerCase()]: '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1', [networkConfig['1'].tokens.WBTC!.toLowerCase()]: '0x8eb8a3b98659cce290402893d0123abb75e3ab28', [networkConfig['1'].tokens.stETH!.toLowerCase()]: '0x176F3DAb24a159341c0509bB36B833E7fdd0a132', diff --git a/tasks/testing/upgrade-checker-utils/governance.ts b/tasks/testing/upgrade-checker-utils/governance.ts index 7b312efb34..1003f1e0ee 100644 --- a/tasks/testing/upgrade-checker-utils/governance.ts +++ b/tasks/testing/upgrade-checker-utils/governance.ts @@ -5,6 +5,7 @@ import { Delegate, Proposal, getDelegates, getProposalDetails } from '#/utils/su import { advanceBlocks, advanceTime } from '#/utils/time' import { BigNumber, PopulatedTransaction } from 'ethers' import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { pushOraclesForward } from './oracles' export const passAndExecuteProposal = async ( hre: HardhatRuntimeEnvironment, @@ -105,6 +106,7 @@ export const passAndExecuteProposal = async ( // Advance time required by timelock await advanceTime(hre, minDelay.add(1).toString()) await advanceBlocks(hre, 1) + await pushOraclesForward(hre, rtokenAddress) // Execute await governor.execute(proposal.targets, proposal.values, proposal.calldatas, descriptionHash) @@ -122,10 +124,8 @@ export const passAndExecuteProposal = async ( export const stakeAndDelegateRsr = async ( hre: HardhatRuntimeEnvironment, rtokenAddress: string, - governorAddress: string, user: string ) => { - const governor = await hre.ethers.getContractAt('Governance', governorAddress) const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) @@ -167,7 +167,7 @@ export const proposeUpgrade = async ( const [tester] = await hre.ethers.getSigners() await hre.run('give-rsr', { address: tester.address }) - await stakeAndDelegateRsr(hre, rTokenAddress, governorAddress, tester.address) + await stakeAndDelegateRsr(hre, rTokenAddress, tester.address) const proposal = await proposalBuilder(hre, rTokenAddress, governorAddress) diff --git a/tasks/testing/upgrade-checker-utils/logs.ts b/tasks/testing/upgrade-checker-utils/logs.ts index ec25ff1afb..756c7594d5 100644 --- a/tasks/testing/upgrade-checker-utils/logs.ts +++ b/tasks/testing/upgrade-checker-utils/logs.ts @@ -44,6 +44,8 @@ const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.DAI!.toLowerCase()]: 'DAI', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: 'saUSDC', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: 'saUSDT', + ['0xf201fFeA8447AB3d43c98Da3349e0749813C9009'.toLowerCase()]: 'cUSDCVault', // TODO: Replace with real address + ['0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038'.toLowerCase()]: 'cUSDTVault', // TODO: Replace with real address } export const logToken = (tokenAddress: string) => { diff --git a/tasks/testing/upgrade-checker-utils/oracles.ts b/tasks/testing/upgrade-checker-utils/oracles.ts index 198592464b..aa5d536188 100644 --- a/tasks/testing/upgrade-checker-utils/oracles.ts +++ b/tasks/testing/upgrade-checker-utils/oracles.ts @@ -1,12 +1,16 @@ import { setCode } from '@nomicfoundation/hardhat-network-helpers' import { EACAggregatorProxyMock } from '@typechain/EACAggregatorProxyMock' import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { BigNumber } from 'ethers' export const overrideOracle = async ( hre: HardhatRuntimeEnvironment, oracleAddress: string ): Promise => { - const oracle = await hre.ethers.getContractAt('EACAggregatorProxy', oracleAddress) + const oracle = await hre.ethers.getContractAt( + 'contracts/plugins/mocks/EACAggregatorProxyMock.sol:EACAggregatorProxy', + oracleAddress + ) const aggregator = await oracle.aggregator() const accessController = await oracle.accessController() const initPrice = await oracle.latestRoundData() @@ -48,3 +52,24 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s const oracle = await overrideOracle(hre, realChainlinkFeed.address) await oracle.updateAnswer(initPrice.answer) } + +export const setOraclePrice = async ( + hre: HardhatRuntimeEnvironment, + asset: string, + value: BigNumber +) => { + const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) + let chainlinkFeed = '' + try { + chainlinkFeed = await assetContract.chainlinkFeed() + } catch { + console.log(`no chainlink oracle found. skipping RTokenAsset ${asset}...`) + return + } + const realChainlinkFeed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContract.chainlinkFeed() + ) + const oracle = await overrideOracle(hre, realChainlinkFeed.address) + await oracle.updateAnswer(value) +} diff --git a/tasks/testing/upgrade-checker-utils/rewards.ts b/tasks/testing/upgrade-checker-utils/rewards.ts index 4281738bc4..22a291619a 100644 --- a/tasks/testing/upgrade-checker-utils/rewards.ts +++ b/tasks/testing/upgrade-checker-utils/rewards.ts @@ -5,7 +5,7 @@ import { advanceBlocks, advanceTime } from '#/utils/time' import { IRewardable } from '@typechain/IRewardable' import { formatEther } from 'ethers/lib/utils' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { runTrade } from '../upgrade-checker-utils/trades' +import { runBatchTrade } from '../upgrade-checker-utils/trades' const claimRewards = async (claimer: IRewardable) => { const resp = await claimer.claimRewards() @@ -43,7 +43,7 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr }) await rsrTrader.manageTokens([comp], [TradeKind.BATCH_AUCTION]) - await runTrade(hre, rsrTrader, comp, false) + await runBatchTrade(hre, rsrTrader, comp, false) await rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) await strsr.payoutRewards() await advanceBlocks(hre, 100) diff --git a/tasks/testing/upgrade-checker-utils/rtokens.ts b/tasks/testing/upgrade-checker-utils/rtokens.ts index 6573909e88..b092d51a8f 100644 --- a/tasks/testing/upgrade-checker-utils/rtokens.ts +++ b/tasks/testing/upgrade-checker-utils/rtokens.ts @@ -1,12 +1,15 @@ import { bn } from '#/common/numbers' -import { TradeKind } from '#/common/constants' +import { ONE_PERIOD, TradeKind } from '#/common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { BigNumber } from 'ethers' -import { Interface, LogDescription, formatEther } from 'ethers/lib/utils' +import { BigNumber, ContractFactory } from 'ethers' +import { formatEther } from 'ethers/lib/utils' +import { advanceTime } from '#/utils/time' +import { fp } from '#/common/numbers' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { runTrade } from './trades' -import { logToken } from './logs' +import { callAndGetNextTrade, runBatchTrade, runDutchTrade } from './trades' import { CollateralStatus } from '#/common/constants' +import { FacadeAct } from '@typechain/FacadeAct' +import { FacadeRead } from '@typechain/FacadeRead' type Balances = { [key: string]: BigNumber } @@ -78,8 +81,92 @@ export const redeemRTokens = async ( console.log(`successfully redeemed ${formatEther(redeemAmount)} RTokens`) } -export const recollateralize = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { - console.log(`\n\n* * * * * Recollateralizing RToken ${rtokenAddress}...`) +export const customRedeemRTokens = async ( + hre: HardhatRuntimeEnvironment, + user: SignerWithAddress, + rTokenAddress: string, + basketNonce: number, + redeemAmount: BigNumber +) => { + console.log(`\nCustom Redeeming ${formatEther(redeemAmount)}...`) + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + + const FacadeReadFactory: ContractFactory = await hre.ethers.getContractFactory('FacadeRead') + const facadeRead = await FacadeReadFactory.deploy() + const redeemQuote = await facadeRead.callStatic.redeemCustom( + rToken.address, + redeemAmount, + [basketNonce], + [fp('1')] + ) + const expectedTokens = redeemQuote[0] + const expectedQuantities = redeemQuote[1] + const expectedBalances: Balances = {} + let log = '' + for (const erc20 in expectedTokens) { + console.log('Token: ', expectedTokens[erc20]) + console.log( + 'Balance: ', + await ( + await hre.ethers.getContractAt('ERC20Mock', expectedTokens[erc20]) + ).balanceOf(await main.backingManager()) + ) + expectedBalances[expectedTokens[erc20]] = expectedQuantities[erc20] + log += `\n\t${expectedTokens[erc20]}: ${expectedQuantities[erc20]}` + } + console.log(`Expecting to receive: ${log}`) + + const preRedeemRTokenBal = await rToken.balanceOf(user.address) + const preRedeemErc20Bals = await getAccountBalances(hre, user.address, expectedTokens) + + await rToken.connect(user).redeemCustom( + user.address, + redeemAmount, + [basketNonce], + [fp('1')], + expectedTokens, + expectedQuantities.map((q) => q.mul(99).div(100)) + ) + const postRedeemRTokenBal = await rToken.balanceOf(user.address) + const postRedeemErc20Bals = await getAccountBalances(hre, user.address, expectedTokens) + + for (const erc20 of expectedTokens) { + const receivedBalance = postRedeemErc20Bals[erc20].sub(preRedeemErc20Bals[erc20]) + if (!closeTo(receivedBalance, expectedBalances[erc20], bn(1))) { + throw new Error( + `Did not receive the correct amount of token from custom redemption \n token: ${erc20} \n received: ${receivedBalance} \n expected: ${expectedBalances[erc20]}` + ) + } + } + + if (!preRedeemRTokenBal.sub(postRedeemRTokenBal).eq(redeemAmount)) { + throw new Error( + `Did not custom redeem the correct amount of RTokens \n expected: ${redeemAmount} \n redeemed: ${postRedeemRTokenBal.sub( + preRedeemRTokenBal + )}` + ) + } + + console.log(`successfully custom redeemed ${formatEther(redeemAmount)} RTokens`) +} + +export const recollateralize = async ( + hre: HardhatRuntimeEnvironment, + rtokenAddress: string, + kind: TradeKind +) => { + if (kind == TradeKind.BATCH_AUCTION) { + await recollateralizeBatch(hre, rtokenAddress) + } else if (kind == TradeKind.DUTCH_AUCTION) { + await recollateralizeDutch(hre, rtokenAddress) + } else { + throw new Error(`Invalid Trade Type`) + } +} + +const recollateralizeBatch = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { + console.log(`\n\n* * * * * Recollateralizing (Batch) RToken ${rtokenAddress}...`) const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const backingManager = await hre.ethers.getContractAt( @@ -91,31 +178,30 @@ export const recollateralize = async (hre: HardhatRuntimeEnvironment, rtokenAddr await main.basketHandler() ) - let r = await backingManager.rebalance(TradeKind.BATCH_AUCTION) + // Deploy FacadeAct + const FacadeActFactory: ContractFactory = await hre.ethers.getContractFactory('FacadeAct') + const facadeAct = await FacadeActFactory.deploy() + + // Move post trading delay + await advanceTime(hre, (await backingManager.tradingDelay()) + 1) - const iface: Interface = backingManager.interface + //const iface: Interface = backingManager.interface let tradesRemain = true while (tradesRemain) { - tradesRemain = false - const resp = await r.wait() - for (const event of resp.events!) { - let parsedLog: LogDescription | undefined - try { - parsedLog = iface.parseLog(event) - } catch {} - if (parsedLog && parsedLog.name == 'TradeStarted') { - tradesRemain = true - console.log( - `\n====== Trade Started: sell ${logToken(parsedLog.args.sell)} / buy ${logToken( - parsedLog.args.buy - )} ======\n\tmbuyAmount: ${parsedLog.args.minBuyAmount}\n\tsellAmount: ${ - parsedLog.args.sellAmount - }` - ) - await runTrade(hre, backingManager, parsedLog.args.sell, false) - } + const [newTradeCreated, newSellToken] = await callAndGetNextTrade( + backingManager.rebalance(TradeKind.BATCH_AUCTION), + backingManager + ) + + if (newTradeCreated) { + await runBatchTrade(hre, backingManager, newSellToken, false) } - r = await backingManager.rebalance(TradeKind.BATCH_AUCTION) + + // Set tradesRemain + ;[tradesRemain, , ,] = await facadeAct.callStatic.nextRecollateralizationAuction( + backingManager.address + ) + await advanceTime(hre, ONE_PERIOD.toString()) } const basketStatus = await basketHandler.status() @@ -123,5 +209,56 @@ export const recollateralize = async (hre: HardhatRuntimeEnvironment, rtokenAddr throw new Error(`Basket is not SOUND after recollateralizing new basket`) } + if (!(await basketHandler.fullyCollateralized())) { + throw new Error(`Basket is not fully collateralized!`) + } + + console.log('Recollateralization complete!') +} + +const recollateralizeDutch = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { + console.log(`\n\n* * * * * Recollateralizing (Dutch) RToken ${rtokenAddress}...`) + const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) + + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + + // Move post trading delay + await advanceTime(hre, (await backingManager.tradingDelay()) + 1) + + let tradesRemain = false + let sellToken: string = '' + + const [newTradeCreated, initialSellToken] = await callAndGetNextTrade( + backingManager.rebalance(TradeKind.DUTCH_AUCTION), + backingManager + ) + + if (newTradeCreated) { + tradesRemain = true + sellToken = initialSellToken + + while (tradesRemain) { + ;[tradesRemain, sellToken] = await runDutchTrade(hre, backingManager, sellToken) + await advanceTime(hre, ONE_PERIOD.toString()) + } + } + + const basketStatus = await basketHandler.status() + if (basketStatus != CollateralStatus.SOUND) { + throw new Error(`Basket is not SOUND after recollateralizing new basket`) + } + + if (!(await basketHandler.fullyCollateralized())) { + throw new Error(`Basket is not fully collateralized!`) + } + console.log('Recollateralization complete!') } diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index 17082bcabc..11062484bb 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -1,16 +1,22 @@ import { whileImpersonating } from '#/utils/impersonation' -import { advanceTime, getLatestBlockTimestamp } from '#/utils/time' -import { getTrade } from '#/utils/trades' +import { + advanceBlocks, + advanceTime, + getLatestBlockTimestamp, + getLatestBlockNumber, +} from '#/utils/time' import { TestITrading } from '@typechain/TestITrading' -import { BigNumber } from 'ethers' +import { BigNumber, ContractTransaction } from 'ethers' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { QUEUE_START } from '#/common/constants' +import { QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' +import { Interface, LogDescription } from 'ethers/lib/utils' import { collateralToUnderlying, whales } from './constants' import { bn, fp } from '#/common/numbers' import { logToken } from './logs' -import { networkConfig } from '#/common/configuration' +import { GnosisTrade } from '@typechain/GnosisTrade' +import { DutchTrade } from '@typechain/DutchTrade' -export const runTrade = async ( +export const runBatchTrade = async ( hre: HardhatRuntimeEnvironment, trader: TestITrading, tradeToken: string, @@ -20,7 +26,14 @@ export const runTrade = async ( // buy & sell are from the perspective of the auction-starter // placeSellOrders() flips it to be from the perspective of the trader - const trade = await getTrade(hre, trader, tradeToken) + const tradeAddr = await trader.trades(tradeToken) + const trade = await hre.ethers.getContractAt('GnosisTrade', tradeAddr) + + // Only works for Batch trades + if ((await trade.KIND()) != TradeKind.BATCH_AUCTION) { + throw new Error(`Invalid Trade Type`) + } + const buyTokenAddress = await trade.buy() console.log(`Running trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...`) const endTime = await trade.endTime() @@ -41,9 +54,15 @@ export const runTrade = async ( buyAmount = buyAmount.add(fp('1').div(bn(10 ** (18 - buyDecimals)))) const gnosis = await hre.ethers.getContractAt('EasyAuction', await trade.gnosis()) - await whileImpersonating(hre, whales[buyTokenAddress.toLowerCase()], async (whale) => { + const whaleAddr = whales[buyTokenAddress.toLowerCase()] + + // For newly wrapped tokens we need to feed the whale + await getTokens(hre, buyTokenAddress, buyAmount, whaleAddr) + + await whileImpersonating(hre, whaleAddr, async (whale) => { const sellToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) await sellToken.connect(whale).approve(gnosis.address, buyAmount) + await gnosis .connect(whale) .placeSellOrders( @@ -60,25 +79,116 @@ export const runTrade = async ( await trader.settleTrade(tradeToken) console.log(`Settled trade for ${logToken(buyTokenAddress)}.`) } -// impersonate the whale to get the token -const mintTokensIfNeeded = async ( + +export const runDutchTrade = async ( + hre: HardhatRuntimeEnvironment, + trader: TestITrading, + tradeToken: string +): Promise<[boolean, string]> => { + // NOTE: + // buy & sell are from the perspective of the auction-starter + // bid() flips it to be from the perspective of the trader + + let tradesRemain: boolean = false + let newSellToken: string = '' + + const tradeAddr = await trader.trades(tradeToken) + const trade = await hre.ethers.getContractAt('DutchTrade', tradeAddr) + + // Only works for Dutch trades + if ((await trade.KIND()) != TradeKind.DUTCH_AUCTION) { + throw new Error(`Invalid Trade Type`) + } + + const buyTokenAddress = await trade.buy() + console.log(`Running trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...`) + + const endBlock = await trade.endBlock() + const whaleAddr = whales[buyTokenAddress.toLowerCase()] + + // Bid close to end block + await advanceBlocks(hre, endBlock.sub(await getLatestBlockNumber(hre)).sub(5)) + const buyAmount = await trade.bidAmount(await getLatestBlockNumber(hre)) + + // Ensure funds available + await getTokens(hre, buyTokenAddress, buyAmount, whaleAddr) + + await whileImpersonating(hre, whaleAddr, async (whale) => { + const sellToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) + await sellToken.connect(whale).approve(trade.address, buyAmount) + // Bid + ;[tradesRemain, newSellToken] = await callAndGetNextTrade(trade.connect(whale).bid(), trader) + }) + + if ( + (await trade.canSettle()) || + (await trade.status()) != TradeStatus.CLOSED || + (await trade.bidder()) != whaleAddr + ) { + throw new Error(`Error settling Dutch Trade`) + } + + console.log(`Settled trade for ${logToken(buyTokenAddress)}.`) + + // Return new trade (if exists) + return [tradesRemain, newSellToken] +} + +export const callAndGetNextTrade = async ( + tx: Promise, + trader: TestITrading +): Promise<[boolean, string]> => { + let tradesRemain: boolean = false + let newSellToken: string = '' + + // Process transaction and get next trade + const r = await tx + const resp = await r.wait() + const iface: Interface = trader.interface + for (const event of resp.events!) { + let parsedLog: LogDescription | undefined + try { + parsedLog = iface.parseLog(event) + } catch {} + if (parsedLog && parsedLog.name == 'TradeStarted') { + console.log( + `\n====== Trade Started: sell ${logToken(parsedLog.args.sell)} / buy ${logToken( + parsedLog.args.buy + )} ======\n\tmbuyAmount: ${parsedLog.args.minBuyAmount}\n\tsellAmount: ${ + parsedLog.args.sellAmount + }` + ) + tradesRemain = true + newSellToken = parsedLog.args.sell + } + } + + return [tradesRemain, newSellToken] +} +// impersonate the whale to provide the required tokens to recipient +export const getTokens = async ( hre: HardhatRuntimeEnvironment, tokenAddress: string, amount: BigNumber, recipient: string ) => { switch (tokenAddress) { - case networkConfig['1'].tokens.aUSDC: - case networkConfig['1'].tokens.aUSDT: - await mintAToken(hre, tokenAddress, amount, recipient) - case networkConfig['1'].tokens.cUSDC: - case networkConfig['1'].tokens.cUSDT: - await mintCToken(hre, tokenAddress, amount, recipient) + case '0x60C384e226b120d93f3e0F4C502957b2B9C32B15': // saUSDC + case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9': // saUSDT + await getStaticAToken(hre, tokenAddress, amount, recipient) + break + // TODO: Replace with real addresses + case '0xf201fFeA8447AB3d43c98Da3349e0749813C9009': // cUSDCVault + case '0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038': // cUSDTVault + await getCTokenVault(hre, tokenAddress, amount, recipient) + break default: + await getERC20Tokens(hre, tokenAddress, amount, recipient) return } } +// mint regular cTokens for an amount of `underlying` const mintCToken = async ( hre: HardhatRuntimeEnvironment, tokenAddress: string, @@ -91,18 +201,15 @@ const mintCToken = async ( collateralToUnderlying[tokenAddress.toLowerCase()] ) await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (whaleSigner) => { - console.log('0', amount, recipient, collateral.address, underlying.address, whaleSigner.address) await underlying.connect(whaleSigner).approve(collateral.address, amount) - console.log('1', amount, recipient) await collateral.connect(whaleSigner).mint(amount) - console.log('2', amount, recipient) const bal = await collateral.balanceOf(whaleSigner.address) - console.log('3', amount, recipient, bal) await collateral.connect(whaleSigner).transfer(recipient, bal) }) } -const mintAToken = async ( +// mints staticAToken for an amount of `underlying` +const mintStaticAToken = async ( hre: HardhatRuntimeEnvironment, tokenAddress: string, amount: BigNumber, @@ -113,8 +220,66 @@ const mintAToken = async ( 'ERC20Mock', collateralToUnderlying[tokenAddress.toLowerCase()] ) - await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (usdtSigner) => { - await underlying.connect(usdtSigner).approve(collateral.address, amount) - await collateral.connect(usdtSigner).deposit(recipient, amount, 0, true) + await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (whaleSigner) => { + await underlying.connect(whaleSigner).approve(collateral.address, amount) + await collateral.connect(whaleSigner).deposit(recipient, amount, 0, true) + }) +} + +// get a specific amount of wrapped cTokens +const getCTokenVault = async ( + hre: HardhatRuntimeEnvironment, + tokenAddress: string, + amount: BigNumber, + recipient: string +) => { + const collateral = await hre.ethers.getContractAt('CTokenWrapper', tokenAddress) + const cToken = await hre.ethers.getContractAt('ICToken', await collateral.underlying()) + + await whileImpersonating(hre, whales[cToken.address.toLowerCase()], async (whaleSigner) => { + await cToken.connect(whaleSigner).transfer(recipient, amount) + }) + + await whileImpersonating(hre, recipient, async (recipientSigner) => { + await cToken.connect(recipientSigner).approve(collateral.address, amount) + await collateral.connect(recipientSigner).deposit(amount, recipient) + }) +} + +// get a specific amount of static aTokens +const getStaticAToken = async ( + hre: HardhatRuntimeEnvironment, + tokenAddress: string, + amount: BigNumber, + recipient: string +) => { + const collateral = await hre.ethers.getContractAt('StaticATokenLM', tokenAddress) + const aTokensNeeded = await collateral.staticToDynamicAmount(amount) + const aToken = await hre.ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', + await collateral.ATOKEN() + ) + + await whileImpersonating(hre, whales[aToken.address.toLowerCase()], async (whaleSigner) => { + await aToken.connect(whaleSigner).transfer(recipient, aTokensNeeded.mul(101).div(100)) // buffer to ensure enough balance + }) + + await whileImpersonating(hre, recipient, async (recipientSigner) => { + const bal = await aToken.balanceOf(recipientSigner.address) + await aToken.connect(recipientSigner).approve(collateral.address, bal) + await collateral.connect(recipientSigner).deposit(recipient, bal, 0, false) + }) +} + +// get a specific amount of erc20 plain token +const getERC20Tokens = async ( + hre: HardhatRuntimeEnvironment, + tokenAddress: string, + amount: BigNumber, + recipient: string +) => { + const token = await hre.ethers.getContractAt('ERC20Mock', tokenAddress) + await whileImpersonating(hre, whales[token.address.toLowerCase()], async (whaleSigner) => { + await token.connect(whaleSigner).transfer(recipient, amount) }) } diff --git a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts new file mode 100644 index 0000000000..e7b772ca6a --- /dev/null +++ b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts @@ -0,0 +1,481 @@ +import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { expect } from 'chai' +import { ProposalBuilder, buildProposal } from '../governance' +import { Proposal } from '#/utils/subgraph' +import { IImplementations, networkConfig } from '#/common/configuration' +import { bn, fp, toBNDecimals } from '#/common/numbers' +import { CollateralStatus, TradeKind, ZERO_ADDRESS } from '#/common/constants' +import { setOraclePrice } from '../oracles' +import { whileImpersonating } from '#/utils/impersonation' +import { whales } from '../constants' +import { getTokens, runDutchTrade } from '../trades' +import { + AssetRegistryP1, + BackingManagerP1, + BasketHandlerP1, + BasketLibP1, + BrokerP1, + CTokenFiatCollateral, + DistributorP1, + EURFiatCollateral, + FurnaceP1, + MockV3Aggregator, + GnosisTrade, + IERC20Metadata, + DutchTrade, + RevenueTraderP1, + RTokenP1, + StRSRP1Votes, + MainP1, + RecollateralizationLibP1, +} from '../../../../typechain' +import { advanceTime, getLatestBlockTimestamp, setNextBlockTimestamp } from '#/utils/time' + +export default async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string, + governorAddress: string +) => { + console.log('\n* * * * * Run checks for release 3.0.0...') + const [tester] = await hre.ethers.getSigners() + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const timelockAddress = await governor.timelock() + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) + + /* + Asset Registry - new getters + */ + const nextTimestamp = (await getLatestBlockTimestamp(hre)) + 10 + await setNextBlockTimestamp(hre, nextTimestamp) + await assetRegistry.refresh() + expect(await assetRegistry.lastRefresh()).to.equal(nextTimestamp) + expect(await assetRegistry.size()).to.equal(16) + + /* + New Basket validations - units and weights + */ + const usdcCollat = await assetRegistry.toColl(networkConfig['1'].tokens.USDC!) + const usdcFiatColl = await hre.ethers.getContractAt('FiatCollateral', usdcCollat) + const usdc = await hre.ethers.getContractAt('USDCMock', await usdcFiatColl.erc20()) + + // Attempt to change target weights in basket + await whileImpersonating(hre, timelockAddress, async (tl) => { + await expect( + basketHandler.connect(tl).setPrimeBasket([usdc.address], [fp('20')]) + ).to.be.revertedWith('new target weights') + }) + + // Attempt to change target unit in basket + const eurt = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.EURT!) + const EURFiatCollateralFactory = await hre.ethers.getContractFactory('EURFiatCollateral') + const feedMock = ( + await (await hre.ethers.getContractFactory('MockV3Aggregator')).deploy(8, bn('1e8')) + ) + const eurFiatCollateral = await EURFiatCollateralFactory.deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: feedMock.address, + oracleError: fp('0.01'), + erc20: eurt.address, + maxTradeVolume: fp('1000'), + oracleTimeout: await usdcFiatColl.oracleTimeout(), + targetName: hre.ethers.utils.formatBytes32String('EUR'), + defaultThreshold: fp('0.01'), + delayUntilDefault: bn('86400'), + }, + feedMock.address, + await usdcFiatColl.oracleTimeout() + ) + await eurFiatCollateral.refresh() + + // Attempt to set basket with an EUR token + await whileImpersonating(hre, timelockAddress, async (tl) => { + await assetRegistry.connect(tl).register(eurFiatCollateral.address) + await expect( + basketHandler.connect(tl).setPrimeBasket([eurt.address], [fp('1')]) + ).to.be.revertedWith('new target weights') + await assetRegistry.connect(tl).unregister(eurFiatCollateral.address) + }) + + /* + Main - Pausing issuance and trading + */ + // Can pause/unpause issuance and trading separately + await whileImpersonating(hre, timelockAddress, async (tl) => { + await main.connect(tl).pauseIssuance() + + await expect(rToken.connect(tester).issue(fp('100'))).to.be.revertedWith( + 'frozen or issuance paused' + ) + + await main.connect(tl).unpauseIssuance() + + await expect(rToken.connect(tester).issue(fp('100'))).to.emit(rToken, 'Issuance') + + await main.connect(tl).pauseTrading() + + await expect(backingManager.connect(tester).forwardRevenue([])).to.be.revertedWith( + 'frozen or trading paused' + ) + + await main.connect(tl).unpauseTrading() + + await expect(backingManager.connect(tester).forwardRevenue([])).to.not.be.reverted + }) + + /* + Dust Auctions + */ + const minTrade = bn('1e18') + const minTradePrev = await rsrTrader.minTradeVolume() + await whileImpersonating(hre, timelockAddress, async (tl) => { + await rsrTrader.connect(tl).setMinTradeVolume(minTrade) + }) + await usdcFiatColl.refresh() + + const dustAmount = bn('1e17') + await getTokens(hre, usdc.address, toBNDecimals(dustAmount, 6), tester.address) + await usdc.connect(tester).transfer(rsrTrader.address, toBNDecimals(dustAmount, 6)) + + await expect(rsrTrader.manageTokens([usdc.address], [TradeKind.DUTCH_AUCTION])).to.emit( + rsrTrader, + 'TradeStarted' + ) + + await runDutchTrade(hre, rsrTrader, usdc.address) + + // Restore values + await whileImpersonating(hre, timelockAddress, async (tl) => { + await rsrTrader.connect(tl).setMinTradeVolume(minTradePrev) + }) + + /* + Warmup period + */ + const usdcChainlinkFeed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await usdcFiatColl.chainlinkFeed() + ) + + const roundData = await usdcChainlinkFeed.latestRoundData() + await setOraclePrice(hre, usdcFiatColl.address, bn('0.8e8')) + await assetRegistry.refresh() + expect(await usdcFiatColl.status()).to.equal(CollateralStatus.IFFY) + expect(await basketHandler.status()).to.equal(CollateralStatus.IFFY) + expect(await basketHandler.isReady()).to.equal(false) + + // Restore SOUND + await setOraclePrice(hre, usdcFiatColl.address, roundData.answer) + await assetRegistry.refresh() + + // Still cannot issue + expect(await usdcFiatColl.status()).to.equal(CollateralStatus.SOUND) + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await basketHandler.isReady()).to.equal(false) + await expect(rToken.connect(tester).issue(fp('1'))).to.be.revertedWith('basket not ready') + + // Move post warmup period + await advanceTime(hre, Number(await basketHandler.warmupPeriod()) + 1) + + // Can issue now + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await basketHandler.isReady()).to.equal(true) + await expect(rToken.connect(tester).issue(fp('1'))).to.emit(rToken, 'Issuance') + + /* + Melting occurs when paused + */ + await whileImpersonating(hre, timelockAddress, async (tl) => { + await main.connect(tl).pauseIssuance() + await main.connect(tl).pauseTrading() + + await furnace.melt() + + await main.connect(tl).unpauseIssuance() + await main.connect(tl).unpauseTrading() + }) + + /* + Stake and delegate + */ + const stakeAmount = fp('4e6') + + await whileImpersonating(hre, whales[networkConfig['1'].tokens.RSR!], async (rsrSigner) => { + expect(await stRSR.delegates(rsrSigner.address)).to.equal(ZERO_ADDRESS) + expect(await stRSR.balanceOf(rsrSigner.address)).to.equal(0) + + await rsr.connect(rsrSigner).approve(stRSR.address, stakeAmount) + await stRSR.connect(rsrSigner).stakeAndDelegate(stakeAmount, rsrSigner.address) + + expect(await stRSR.delegates(rsrSigner.address)).to.equal(rsrSigner.address) + expect(await stRSR.balanceOf(rsrSigner.address)).to.be.gt(0) + }) + + console.log('\n3.0.0 check succeeded!') +} + +export const proposal_3_0_0: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string +): Promise => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + const distributor = await hre.ethers.getContractAt('DistributorP1', await main.distributor()) + const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) + const rTokenTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rTokenTrader()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + + // TODO: Uncomment and replace with deployed addresses once they are available + /* + const mainImplAddr = '0x...' + const batchTradeImplAddr = '0x...' + const dutchTradeImplAddr = '0x...' + const assetRegImplAddr = '0x...' + const bckMgrImplAddr = '0x...' + const bsktHdlImplAddr = '0x...' + const brokerImplAddr = '0x...' + const distImplAddr = '0x...' + const furnaceImplAddr = '0x...' + const rsrTraderImplAddr = '0x...' + const rTokenTraderImplAddr = '0x...' + const rTokenImplAddr = '0x...' + const stRSRImplAddr = '0x...' + */ + + // TODO: Remove code once addresses are available + const implementations: IImplementations = await deployNewImplementations(hre) + const mainImplAddr = implementations.main + const batchTradeImplAddr = implementations.trading.gnosisTrade + const dutchTradeImplAddr = implementations.trading.dutchTrade + const assetRegImplAddr = implementations.components.assetRegistry + const bckMgrImplAddr = implementations.components.backingManager + const bsktHdlImplAddr = implementations.components.basketHandler + const brokerImplAddr = implementations.components.broker + const distImplAddr = implementations.components.distributor + const furnaceImplAddr = implementations.components.furnace + const rsrTraderImplAddr = implementations.components.rsrTrader + const rTokenTraderImplAddr = implementations.components.rTokenTrader + const rTokenImplAddr = implementations.components.rToken + const stRSRImplAddr = implementations.components.stRSR + + // TODO: Uncomment and replace with deployed addresses once they are available + /* + const cUSDCVaultAddr = '0x...' + const cUSDCNewCollateralAddr = '0x...' + const cUSDTVaultAddr = '0x...' + const cUSDTNewCollateralAddr = '0x...' + */ + const saUSDCCollateralAddr = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15' + const saUSDTCollateralAddr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' + + // TODO: Remove code once addresses are available + // CUSDC Vault and collateral + const [cUSDCVaultAddr, cUSDCVaultCollateralAddr] = await makeCTokenVaultCollateral( + hre, + networkConfig['1'].tokens.cUSDC!, + await assetRegistry.toColl(networkConfig['1'].tokens.cUSDC!), + networkConfig['1'].COMPTROLLER! + ) + const [cUSDTVaultAddr, cUSDTVaultCollateralAddr] = await makeCTokenVaultCollateral( + hre, + networkConfig['1'].tokens.cUSDT!, + await assetRegistry.toColl(networkConfig['1'].tokens.cUSDT!), + networkConfig['1'].COMPTROLLER! + ) + + // Step 1 - Update implementations and config + const txs = [ + await main.populateTransaction.upgradeTo(mainImplAddr), + await assetRegistry.populateTransaction.upgradeTo(assetRegImplAddr), + await backingManager.populateTransaction.upgradeTo(bckMgrImplAddr), + await basketHandler.populateTransaction.upgradeTo(bsktHdlImplAddr), + await broker.populateTransaction.upgradeTo(brokerImplAddr), + await distributor.populateTransaction.upgradeTo(distImplAddr), + await furnace.populateTransaction.upgradeTo(furnaceImplAddr), + await rsrTrader.populateTransaction.upgradeTo(rsrTraderImplAddr), + await rTokenTrader.populateTransaction.upgradeTo(rTokenTraderImplAddr), + await rToken.populateTransaction.upgradeTo(rTokenImplAddr), + await stRSR.populateTransaction.upgradeTo(stRSRImplAddr), + await broker.populateTransaction.setBatchTradeImplementation(batchTradeImplAddr), + await broker.populateTransaction.setDutchTradeImplementation(dutchTradeImplAddr), + await backingManager.populateTransaction.cacheComponents(), + await rsrTrader.populateTransaction.cacheComponents(), + await rTokenTrader.populateTransaction.cacheComponents(), + await distributor.populateTransaction.cacheComponents(), + await basketHandler.populateTransaction.setWarmupPeriod(900), + await stRSR.populateTransaction.setWithdrawalLeak(bn('5e16')), + await broker.populateTransaction.setDutchAuctionLength(1800), + ] + + // Step 2 - Basket change + txs.push( + await assetRegistry.populateTransaction.register(cUSDCVaultCollateralAddr), + await assetRegistry.populateTransaction.register(cUSDTVaultCollateralAddr), + await basketHandler.populateTransaction.setPrimeBasket( + [saUSDCCollateralAddr, cUSDCVaultAddr, saUSDTCollateralAddr, cUSDTVaultAddr], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ), + await basketHandler.populateTransaction.refreshBasket() + ) + + const description = + 'Upgrade implementations, set trade plugins, components, config values, and update basket' + + return buildProposal(txs, description) +} + +// TODO: Remove once final addresses exist on Mainnet +const deployNewImplementations = async ( + hre: HardhatRuntimeEnvironment +): Promise => { + // Deploy new implementations + const MainImplFactory = await hre.ethers.getContractFactory('MainP1') + const mainImpl: MainP1 = await MainImplFactory.deploy() + + // Deploy TradingLib external library + const TradingLibFactory = await hre.ethers.getContractFactory('RecollateralizationLibP1') + const tradingLib: RecollateralizationLibP1 = ( + await TradingLibFactory.deploy() + ) + + // Deploy BasketLib external library + const BasketLibFactory = await hre.ethers.getContractFactory('BasketLibP1') + const basketLib: BasketLibP1 = await BasketLibFactory.deploy() + + const AssetRegImplFactory = await hre.ethers.getContractFactory('AssetRegistryP1') + const assetRegImpl: AssetRegistryP1 = await AssetRegImplFactory.deploy() + + const BackingMgrImplFactory = await hre.ethers.getContractFactory('BackingManagerP1', { + libraries: { + RecollateralizationLibP1: tradingLib.address, + }, + }) + const backingMgrImpl: BackingManagerP1 = await BackingMgrImplFactory.deploy() + + const BskHandlerImplFactory = await hre.ethers.getContractFactory('BasketHandlerP1', { + libraries: { BasketLibP1: basketLib.address }, + }) + const bskHndlrImpl: BasketHandlerP1 = await BskHandlerImplFactory.deploy() + + const DistribImplFactory = await hre.ethers.getContractFactory('DistributorP1') + const distribImpl: DistributorP1 = await DistribImplFactory.deploy() + + const RevTraderImplFactory = await hre.ethers.getContractFactory('RevenueTraderP1') + const revTraderImpl: RevenueTraderP1 = await RevTraderImplFactory.deploy() + + const FurnaceImplFactory = await hre.ethers.getContractFactory('FurnaceP1') + const furnaceImpl: FurnaceP1 = await FurnaceImplFactory.deploy() + + const GnosisTradeImplFactory = await hre.ethers.getContractFactory('GnosisTrade') + const gnosisTrade: GnosisTrade = await GnosisTradeImplFactory.deploy() + + const DutchTradeImplFactory = await hre.ethers.getContractFactory('DutchTrade') + const dutchTrade: DutchTrade = await DutchTradeImplFactory.deploy() + + const BrokerImplFactory = await hre.ethers.getContractFactory('BrokerP1') + const brokerImpl: BrokerP1 = await BrokerImplFactory.deploy() + + const RTokenImplFactory = await hre.ethers.getContractFactory('RTokenP1') + const rTokenImpl: RTokenP1 = await RTokenImplFactory.deploy() + + const StRSRImplFactory = await hre.ethers.getContractFactory('StRSRP1Votes') + const stRSRImpl: StRSRP1Votes = await StRSRImplFactory.deploy() + + return { + main: mainImpl.address, + trading: { gnosisTrade: gnosisTrade.address, dutchTrade: dutchTrade.address }, + components: { + assetRegistry: assetRegImpl.address, + backingManager: backingMgrImpl.address, + basketHandler: bskHndlrImpl.address, + broker: brokerImpl.address, + distributor: distribImpl.address, + furnace: furnaceImpl.address, + rsrTrader: revTraderImpl.address, + rTokenTrader: revTraderImpl.address, + rToken: rTokenImpl.address, + stRSR: stRSRImpl.address, + }, + } +} + +// TODO: Remove once final addresses exist on Mainnet +const makeCTokenVaultCollateral = async ( + hre: HardhatRuntimeEnvironment, + tokenAddress: string, + collAddress: string, + comptrollerAddr: string +): Promise<[string, string]> => { + const CTokenWrapperFactory = await hre.ethers.getContractFactory('CTokenWrapper') + const CTokenCollateralFactory = await hre.ethers.getContractFactory('CTokenFiatCollateral') + + const erc20: IERC20Metadata = ( + await hre.ethers.getContractAt('CTokenMock', tokenAddress) + ) + + const currentColl: CTokenFiatCollateral = ( + await hre.ethers.getContractAt('CTokenFiatCollateral', collAddress) + ) + + const vault = await CTokenWrapperFactory.deploy( + erc20.address, + `${await erc20.name()} Vault`, + `${await erc20.symbol()}-VAULT`, + comptrollerAddr + ) + + await vault.deployed() + + const coll = await CTokenCollateralFactory.deploy( + { + priceTimeout: await currentColl.priceTimeout(), + chainlinkFeed: await currentColl.chainlinkFeed(), + oracleError: await currentColl.oracleError(), + erc20: vault.address, + maxTradeVolume: await currentColl.maxTradeVolume(), + oracleTimeout: await currentColl.oracleTimeout(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), + delayUntilDefault: await currentColl.delayUntilDefault(), + }, + fp('1e-6') + ) + + await coll.deployed() + + await (await coll.refresh()).wait() + + return [vault.address, coll.address] +} diff --git a/tasks/testing/upgrade-checker.ts b/tasks/testing/upgrade-checker.ts index 19d82d4fb1..aeb3dedf8e 100644 --- a/tasks/testing/upgrade-checker.ts +++ b/tasks/testing/upgrade-checker.ts @@ -3,18 +3,28 @@ import { networkConfig } from '../../common/configuration' import { getChainId } from '../../common/blockchain-utils' import { whileImpersonating } from '#/utils/impersonation' import { useEnv } from '#/utils/env' +import { expect } from 'chai' import { resetFork } from '#/utils/chain' import { bn, fp } from '#/common/numbers' +import { TradeKind } from '#/common/constants' import { formatEther, formatUnits } from 'ethers/lib/utils' import { pushOraclesForward } from './upgrade-checker-utils/oracles' -import { recollateralize, redeemRTokens } from './upgrade-checker-utils/rtokens' +import { + recollateralize, + redeemRTokens, + customRedeemRTokens, +} from './upgrade-checker-utils/rtokens' import { claimRsrRewards } from './upgrade-checker-utils/rewards' import { whales } from './upgrade-checker-utils/constants' -import runChecks2_1_0, { proposal_2_1_0 } from './upgrade-checker-utils/upgrades/2_1_0' -import { passAndExecuteProposal, proposeUpgrade } from './upgrade-checker-utils/governance' +import runChecks3_0_0, { proposal_3_0_0 } from './upgrade-checker-utils/upgrades/3_0_0' +import { + passAndExecuteProposal, + proposeUpgrade, + stakeAndDelegateRsr, +} from './upgrade-checker-utils/governance' import { advanceBlocks, advanceTime, getLatestBlockNumber } from '#/utils/time' -// run script for eUSD +// run script for eUSD (version 3.0.0) // npx hardhat upgrade-checker --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --governor 0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6 /* @@ -59,9 +69,10 @@ task('upgrade-checker', 'Mints all the tokens to an address') console.log(`starting at block ${await getLatestBlockNumber(hre)}`) - // 1. Approve and execute the govnerance proposal + // 1. Approve and execute the governance proposal if (!params.proposalid) { - const proposal = await proposeUpgrade(hre, params.rtoken, params.governor, proposal_2_1_0) + const proposal = await proposeUpgrade(hre, params.rtoken, params.governor, proposal_3_0_0) + await passAndExecuteProposal( hre, params.rtoken, @@ -76,15 +87,9 @@ task('upgrade-checker', 'Mints all the tokens to an address') // we pushed the chain forward, so we need to keep the rToken SOUND await pushOraclesForward(hre, params.rtoken) - // 2. Run various checks - const saUsdtAddress = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase() - const saUsdcAddress = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase() - const usdtAddress = networkConfig['1'].tokens.USDT! - const usdcAddress = networkConfig['1'].tokens.USDC! - const cUsdtAddress = networkConfig['1'].tokens.cUSDT! - const cUsdcAddress = networkConfig['1'].tokens.cUSDC! - const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) + + // 2. Bring back to fully collateralized const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const basketHandler = await hre.ethers.getContractAt( 'BasketHandlerP1', @@ -94,9 +99,25 @@ task('upgrade-checker', 'Mints all the tokens to an address') 'BackingManagerP1', await main.backingManager() ) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + + // Move past trading delay + await advanceTime(hre, (await backingManager.tradingDelay()) + 1) + + await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION) // DUTCH_AUCTION + + // 3. Run various checks + const saUsdtAddress = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase() + const saUsdcAddress = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase() + const usdtAddress = networkConfig['1'].tokens.USDT! + const usdcAddress = networkConfig['1'].tokens.USDC! + const cUsdtAddress = networkConfig['1'].tokens.cUSDT! + const cUsdcAddress = networkConfig['1'].tokens.cUSDC! + const cUsdtVaultAddress = '0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038'.toLowerCase() + const cUsdcVaultAddress = '0xf201fFeA8447AB3d43c98Da3349e0749813C9009'.toLowerCase() /* - + mint this is another area that needs to be made general @@ -110,8 +131,10 @@ task('upgrade-checker', 'Mints all the tokens to an address') const usdc = await hre.ethers.getContractAt('ERC20Mock', usdcAddress) const saUsdt = await hre.ethers.getContractAt('StaticATokenLM', saUsdtAddress) const cUsdt = await hre.ethers.getContractAt('ICToken', cUsdtAddress) + const cUsdtVault = await hre.ethers.getContractAt('CTokenWrapper', cUsdtVaultAddress) const saUsdc = await hre.ethers.getContractAt('StaticATokenLM', saUsdcAddress) const cUsdc = await hre.ethers.getContractAt('ICToken', cUsdcAddress) + const cUsdcVault = await hre.ethers.getContractAt('CTokenWrapper', cUsdcVaultAddress) // get saUsdt await whileImpersonating( @@ -125,20 +148,21 @@ task('upgrade-checker', 'Mints all the tokens to an address') const saUsdtBal = await saUsdt.balanceOf(tester.address) await saUsdt.connect(tester).approve(rToken.address, saUsdtBal) - // get cUsdt + // get cUsdtVault await whileImpersonating( hre, whales[networkConfig['1'].tokens.USDT!.toLowerCase()], async (usdtSigner) => { - console.log(cUsdt.address, usdt.address, usdtSigner.address) await usdt.connect(usdtSigner).approve(cUsdt.address, initialBal) await cUsdt.connect(usdtSigner).mint(initialBal) const bal = await cUsdt.balanceOf(usdtSigner.address) - await cUsdt.connect(usdtSigner).transfer(tester.address, bal) + await cUsdt.connect(usdtSigner).approve(cUsdtVault.address, bal) + await cUsdtVault.connect(usdtSigner).deposit(bal, tester.address) } ) - const cUsdtBal = await cUsdt.balanceOf(tester.address) - await cUsdt.connect(tester).approve(rToken.address, cUsdtBal) + + const cUsdtVaultBal = await cUsdtVault.balanceOf(tester.address) + await cUsdtVault.connect(tester).approve(rToken.address, cUsdtVaultBal) // get saUsdc await whileImpersonating( @@ -152,7 +176,7 @@ task('upgrade-checker', 'Mints all the tokens to an address') const saUsdcBal = await saUsdc.balanceOf(tester.address) await saUsdc.connect(tester).approve(rToken.address, saUsdcBal) - // get cUsdc + // get cUsdcVault await whileImpersonating( hre, whales[networkConfig['1'].tokens.USDC!.toLowerCase()], @@ -160,11 +184,12 @@ task('upgrade-checker', 'Mints all the tokens to an address') await usdc.connect(usdcSigner).approve(cUsdc.address, initialBal) await cUsdc.connect(usdcSigner).mint(initialBal) const bal = await cUsdc.balanceOf(usdcSigner.address) - await cUsdc.connect(usdcSigner).transfer(tester.address, bal) + await cUsdc.connect(usdcSigner).approve(cUsdcVault.address, bal) + await cUsdcVault.connect(usdcSigner).deposit(bal, tester.address) } ) - const cUsdcBal = await cUsdc.balanceOf(tester.address) - await cUsdc.connect(tester).approve(rToken.address, cUsdcBal) + const cUsdcVaultBal = await cUsdcVault.balanceOf(tester.address) + await cUsdcVault.connect(tester).approve(rToken.address, cUsdcVaultBal) console.log(`\nIssuing ${formatEther(issueAmount)} RTokens...`) await rToken.connect(tester).issue(issueAmount) @@ -180,46 +205,6 @@ task('upgrade-checker', 'Mints all the tokens to an address') console.log('successfully minted RTokens') - // get saUsdt - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDT!.toLowerCase()], - async (usdtSigner) => { - await usdt.connect(usdtSigner).approve(saUsdt.address, initialBal.mul(20)) - await saUsdt.connect(usdtSigner).deposit(usdtSigner.address, initialBal.mul(20), 0, true) - } - ) - - // get cUsdt - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDT!.toLowerCase()], - async (usdtSigner) => { - console.log(cUsdt.address, usdt.address, usdtSigner.address) - await usdt.connect(usdtSigner).approve(cUsdt.address, initialBal.mul(20)) - await cUsdt.connect(usdtSigner).mint(initialBal.mul(20)) - } - ) - - // get saUsdc - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDC!.toLowerCase()], - async (usdcSigner) => { - await usdc.connect(usdcSigner).approve(saUsdc.address, initialBal.mul(20)) - await saUsdc.connect(usdcSigner).deposit(usdcSigner.address, initialBal.mul(20), 0, true) - } - ) - - // get cUsdc - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDC!.toLowerCase()], - async (usdcSigner) => { - await usdc.connect(usdcSigner).approve(cUsdc.address, initialBal.mul(20)) - await cUsdc.connect(usdcSigner).mint(initialBal.mul(20)) - } - ) /* redeem @@ -228,8 +213,12 @@ task('upgrade-checker', 'Mints all the tokens to an address') const redeemAmount = fp('5e4') await redeemRTokens(hre, tester, params.rtoken, redeemAmount) - // 2. Run the 2.1.0 checks - await runChecks2_1_0(hre, params.rtoken, params.governor) + // 3. Run the 3.0.0 checks + await pushOraclesForward(hre, params.rtoken) + await runChecks3_0_0(hre, params.rtoken, params.governor) + + // we pushed the chain forward, so we need to keep the rToken SOUND + await pushOraclesForward(hre, params.rtoken) /* @@ -240,20 +229,49 @@ task('upgrade-checker', 'Mints all the tokens to an address') /* - switch basket and recollateralize + staking/unstaking + + */ + + // get RSR + const stakeAmount = fp('4e6') + const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.RSR!.toLowerCase()], + async (rsrSigner) => { + await rsr.connect(rsrSigner).transfer(tester.address, stakeAmount) + } + ) + + const balPrevRSR = await rsr.balanceOf(stRSR.address) + const balPrevStRSR = await stRSR.balanceOf(tester.address) + + await stakeAndDelegateRsr(hre, rToken.address, tester.address) + + expect(await rsr.balanceOf(stRSR.address)).to.equal(balPrevRSR.add(stakeAmount)) + expect(await stRSR.balanceOf(tester.address)).to.be.gt(balPrevStRSR) + + /* + + switch basket and recollateralize - using Batch Auctions + Also check for custom redemption */ + + // we pushed the chain forward, so we need to keep the rToken SOUND await pushOraclesForward(hre, params.rtoken) const bas = await basketHandler.getPrimeBasket() console.log(bas.erc20s) + const prevNonce = await basketHandler.nonce() const governor = await hre.ethers.getContractAt('Governance', params.governor) const timelockAddress = await governor.timelock() await whileImpersonating(hre, timelockAddress, async (tl) => { await basketHandler .connect(tl) - .setPrimeBasket([saUsdtAddress, cUsdtAddress], [fp('0.5'), fp('0.5')]) + .setPrimeBasket([saUsdtAddress, cUsdtVaultAddress], [fp('0.5'), fp('0.5')]) await basketHandler.connect(tl).refreshBasket() const tradingDelay = await backingManager.tradingDelay() await advanceBlocks(hre, tradingDelay / 12 + 1) @@ -263,12 +281,25 @@ task('upgrade-checker', 'Mints all the tokens to an address') const b = await basketHandler.getPrimeBasket() console.log(b.erc20s) - await recollateralize(hre, rToken.address) + /* + custom redemption + */ + // Cannot do normal redeem + expect(await basketHandler.fullyCollateralized()).to.equal(false) + await expect(rToken.connect(tester).redeem(redeemAmount)).to.be.revertedWith( + 'partial redemption; use redeemCustom' + ) + + // Do custom redemption on previous basket + await customRedeemRTokens(hre, tester, params.rtoken, prevNonce, redeemAmount) + + // Recollateralize using Batch auctions + await recollateralize(hre, rToken.address, TradeKind.BATCH_AUCTION) }) task('propose', 'propose a gov action') .addParam('rtoken', 'the address of the RToken being upgraded') .addParam('governor', 'the address of the OWNER of the RToken being upgraded') .setAction(async (params, hre) => { - await proposeUpgrade(hre, params.rtoken, params.governor, proposal_2_1_0) + await proposeUpgrade(hre, params.rtoken, params.governor, proposal_3_0_0) }) From 5d04fbbb9c1ffca953d965190e1180dcb304a887 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 17:07:00 -0400 Subject: [PATCH 062/450] price(): fix possible overflow threat --- contracts/plugins/assets/Asset.sol | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 6f135ab342..7c52e64c1e 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -139,7 +139,7 @@ contract Asset is IAsset, VersionedAsset { _low = savedLowPrice; _high = savedHighPrice; } else if (delta >= oracleTimeout + priceTimeout) { - // use unpriced after a full timeout, incase 3x was not enough + // unpriced after a full timeout return (0, FIX_MAX); } else { // oracleTimeout <= delta <= oracleTimeout + priceTimeout @@ -147,13 +147,14 @@ contract Asset is IAsset, VersionedAsset { // Decay _low downwards from savedLowPrice to 0 // {UoA/tok} = {UoA/tok} * {1} _low = savedLowPrice.muluDivu(oracleTimeout + priceTimeout - delta, priceTimeout); + // during overflow should revert // Decay _high upwards to 3x savedHighPrice - _high = savedHighPrice.plus( - savedHighPrice.mul( - MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout) - ) - ); + // {UoA/tok} = {UoA/tok} * {1} + _high = savedHighPrice.safeMul( + FIX_ONE + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout), + ROUND + ); // during overflow should not revert } } assert(_low <= _high); From 3a198ee77fc6c3e8abd8e823ec18aa46a00f1e3a Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 1 Sep 2023 18:13:22 -0300 Subject: [PATCH 063/450] Additional checks and logging (#929) --- .../testing/upgrade-checker-utils/rtokens.ts | 14 +- tasks/testing/upgrade-checker-utils/trades.ts | 1 + .../upgrade-checker-utils/upgrades/3_0_0.ts | 154 +++++++++++++++++- tasks/testing/upgrade-checker.ts | 7 +- 4 files changed, 157 insertions(+), 19 deletions(-) diff --git a/tasks/testing/upgrade-checker-utils/rtokens.ts b/tasks/testing/upgrade-checker-utils/rtokens.ts index b092d51a8f..8b76df7908 100644 --- a/tasks/testing/upgrade-checker-utils/rtokens.ts +++ b/tasks/testing/upgrade-checker-utils/rtokens.ts @@ -90,7 +90,6 @@ export const customRedeemRTokens = async ( ) => { console.log(`\nCustom Redeeming ${formatEther(redeemAmount)}...`) const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const FacadeReadFactory: ContractFactory = await hre.ethers.getContractFactory('FacadeRead') const facadeRead = await FacadeReadFactory.deploy() @@ -105,13 +104,6 @@ export const customRedeemRTokens = async ( const expectedBalances: Balances = {} let log = '' for (const erc20 in expectedTokens) { - console.log('Token: ', expectedTokens[erc20]) - console.log( - 'Balance: ', - await ( - await hre.ethers.getContractAt('ERC20Mock', expectedTokens[erc20]) - ).balanceOf(await main.backingManager()) - ) expectedBalances[expectedTokens[erc20]] = expectedQuantities[erc20] log += `\n\t${expectedTokens[erc20]}: ${expectedQuantities[erc20]}` } @@ -197,11 +189,13 @@ const recollateralizeBatch = async (hre: HardhatRuntimeEnvironment, rtokenAddres await runBatchTrade(hre, backingManager, newSellToken, false) } + await advanceTime(hre, ONE_PERIOD.toString()) + // Set tradesRemain ;[tradesRemain, , ,] = await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address + backingManager.address, + TradeKind.BATCH_AUCTION ) - await advanceTime(hre, ONE_PERIOD.toString()) } const basketStatus = await basketHandler.status() diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index 11062484bb..d45a377e54 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -77,6 +77,7 @@ export const runBatchTrade = async ( const lastTimestamp = await getLatestBlockTimestamp(hre) await advanceTime(hre, BigNumber.from(endTime).sub(lastTimestamp).toString()) await trader.settleTrade(tradeToken) + console.log(`Settled trade for ${logToken(buyTokenAddress)}.`) } diff --git a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts index e7b772ca6a..49d5fc4753 100644 --- a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts +++ b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts @@ -5,7 +5,7 @@ import { Proposal } from '#/utils/subgraph' import { IImplementations, networkConfig } from '#/common/configuration' import { bn, fp, toBNDecimals } from '#/common/numbers' import { CollateralStatus, TradeKind, ZERO_ADDRESS } from '#/common/constants' -import { setOraclePrice } from '../oracles' +import { pushOraclesForward, setOraclePrice } from '../oracles' import { whileImpersonating } from '#/utils/impersonation' import { whales } from '../constants' import { getTokens, runDutchTrade } from '../trades' @@ -29,7 +29,12 @@ import { MainP1, RecollateralizationLibP1, } from '../../../../typechain' -import { advanceTime, getLatestBlockTimestamp, setNextBlockTimestamp } from '#/utils/time' +import { + advanceTime, + advanceToTimestamp, + getLatestBlockTimestamp, + setNextBlockTimestamp, +} from '#/utils/time' export default async ( hre: HardhatRuntimeEnvironment, @@ -54,11 +59,15 @@ export default async ( 'BackingManagerP1', await main.backingManager() ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) + // we pushed the chain forward, so we need to keep the rToken SOUND + await pushOraclesForward(hre, rTokenAddress) + /* Asset Registry - new getters */ @@ -67,6 +76,7 @@ export default async ( await assetRegistry.refresh() expect(await assetRegistry.lastRefresh()).to.equal(nextTimestamp) expect(await assetRegistry.size()).to.equal(16) + console.log(`successfully tested new AssetRegistry getters`) /* New Basket validations - units and weights @@ -114,6 +124,8 @@ export default async ( await assetRegistry.connect(tl).unregister(eurFiatCollateral.address) }) + console.log(`successfully tested validations of weights and units on basket switch`) + /* Main - Pausing issuance and trading */ @@ -140,12 +152,28 @@ export default async ( await expect(backingManager.connect(tester).forwardRevenue([])).to.not.be.reverted }) + console.log(`successfully tested issuance and trading pause`) + + /* + New setters for enabling auctions + */ + // Auction setters + await whileImpersonating(hre, timelockAddress, async (tl) => { + await broker.connect(tl).enableBatchTrade() + await broker.connect(tl).enableDutchTrade(rsr.address) + }) + + console.log(`successfully tested new auction setters`) + /* Dust Auctions */ + console.log(`testing dust auctions...`) + const minTrade = bn('1e18') const minTradePrev = await rsrTrader.minTradeVolume() await whileImpersonating(hre, timelockAddress, async (tl) => { + await broker.connect(tl).setDutchAuctionLength(1800) await rsrTrader.connect(tl).setMinTradeVolume(minTrade) }) await usdcFiatColl.refresh() @@ -164,11 +192,17 @@ export default async ( // Restore values await whileImpersonating(hre, timelockAddress, async (tl) => { await rsrTrader.connect(tl).setMinTradeVolume(minTradePrev) + await broker.connect(tl).setDutchAuctionLength(0) }) + console.log(`succesfully tested dust auctions`) + /* Warmup period */ + + console.log(`testing warmup period...`) + const usdcChainlinkFeed = await hre.ethers.getContractAt( 'AggregatorV3Interface', await usdcFiatColl.chainlinkFeed() @@ -188,21 +222,30 @@ export default async ( // Still cannot issue expect(await usdcFiatColl.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.isReady()).to.equal(false) - await expect(rToken.connect(tester).issue(fp('1'))).to.be.revertedWith('basket not ready') - // Move post warmup period - await advanceTime(hre, Number(await basketHandler.warmupPeriod()) + 1) + // If warmup period defined + if ((await basketHandler.warmupPeriod()) > 0) { + expect(await basketHandler.isReady()).to.equal(false) + await expect(rToken.connect(tester).issue(fp('1'))).to.be.revertedWith('basket not ready') + + // Move post warmup period + await advanceTime(hre, Number(await basketHandler.warmupPeriod()) + 1) + } // Can issue now - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await usdcFiatColl.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.isReady()).to.equal(true) await expect(rToken.connect(tester).issue(fp('1'))).to.emit(rToken, 'Issuance') + console.log(`succesfully tested warmup period`) + + // we pushed the chain forward, so we need to keep the rToken SOUND + await pushOraclesForward(hre, rTokenAddress) /* Melting occurs when paused */ + await whileImpersonating(hre, timelockAddress, async (tl) => { await main.connect(tl).pauseIssuance() await main.connect(tl).pauseTrading() @@ -212,12 +255,14 @@ export default async ( await main.connect(tl).unpauseIssuance() await main.connect(tl).unpauseTrading() }) + console.log(`successfully tested melting during paused state`) /* Stake and delegate */ - const stakeAmount = fp('4e6') + console.log(`testing stakeAndDelegate...`) + const stakeAmount = fp('4e6') await whileImpersonating(hre, whales[networkConfig['1'].tokens.RSR!], async (rsrSigner) => { expect(await stRSR.delegates(rsrSigner.address)).to.equal(ZERO_ADDRESS) expect(await stRSR.balanceOf(rsrSigner.address)).to.equal(0) @@ -228,6 +273,99 @@ export default async ( expect(await stRSR.delegates(rsrSigner.address)).to.equal(rsrSigner.address) expect(await stRSR.balanceOf(rsrSigner.address)).to.be.gt(0) }) + console.log(`successfully tested stakeAndDelegate`) + + /* + Withdrawal leak + */ + + console.log(`testing withrawalLeak...`) + + // Decrease withdrawal leak to be able to test with previous stake + const withdrawalLeakPrev = await stRSR.withdrawalLeak() + const withdrawalLeak = withdrawalLeakPrev.eq(bn(0)) ? bn(0) : bn('1e5') + const unstakingDelay = await stRSR.unstakingDelay() + + await whileImpersonating(hre, timelockAddress, async (tl) => { + await stRSR.connect(tl).setWithdrawalLeak(withdrawalLeak) + }) + + await whileImpersonating(hre, whales[networkConfig['1'].tokens.RSR!], async (rsrSigner) => { + const withdrawal = stakeAmount + await stRSR.connect(rsrSigner).unstake(1) + await stRSR.connect(rsrSigner).unstake(withdrawal) + await stRSR.connect(rsrSigner).unstake(1) + + // Move forward past stakingWithdrawalDelay + await advanceToTimestamp(hre, Number(await getLatestBlockTimestamp(hre)) + unstakingDelay) + + // we pushed the chain forward, so we need to keep the rToken SOUND + await pushOraclesForward(hre, rTokenAddress) + + let lastRefresh = await assetRegistry.lastRefresh() + + // Should not refresh if withdrawal leak is applied + await stRSR.connect(rsrSigner).withdraw(rsrSigner.address, 1) + if (withdrawalLeak.gt(bn(0))) { + expect(await assetRegistry.lastRefresh()).to.eq(lastRefresh) + } + + // Should refresh + await stRSR.connect(rsrSigner).withdraw(rsrSigner.address, 2) + expect(await assetRegistry.lastRefresh()).to.be.gt(lastRefresh) + lastRefresh = await assetRegistry.lastRefresh() + + // Should not refresh + await stRSR.connect(rsrSigner).withdraw(rsrSigner.address, 3) + if (withdrawalLeak.gt(bn(0))) { + expect(await assetRegistry.lastRefresh()).to.eq(lastRefresh) + } + }) + + // Restore values + await whileImpersonating(hre, timelockAddress, async (tl) => { + await stRSR.connect(tl).setWithdrawalLeak(withdrawalLeakPrev) + }) + console.log(`successfully tested withrawalLeak`) + + // we pushed the chain forward, so we need to keep the rToken SOUND + await pushOraclesForward(hre, rTokenAddress) + + /* + RToken Asset + */ + console.log(`swapping RTokenAsset...`) + + const rTokenAsset = await hre.ethers.getContractAt( + 'TestIAsset', + await assetRegistry.toAsset(rToken.address) + ) + const maxTradeVolumePrev = await rTokenAsset.maxTradeVolume() + + const newRTokenAsset = await ( + await hre.ethers.getContractFactory('RTokenAsset') + ).deploy(rToken.address, maxTradeVolumePrev) + + // Swap RToken Asset + await whileImpersonating(hre, timelockAddress, async (tl) => { + await assetRegistry.connect(tl).swapRegistered(newRTokenAsset.address) + }) + await assetRegistry.refresh() + + // Check interface behaves properly + expect(await newRTokenAsset.isCollateral()).to.equal(false) + expect(await newRTokenAsset.erc20()).to.equal(rToken.address) + expect(await rToken.decimals()).to.equal(18) + expect(await newRTokenAsset.version()).to.equal('3.0.0') + expect(await newRTokenAsset.maxTradeVolume()).to.equal(maxTradeVolumePrev) + + const [lowPricePrev, highPricePrev] = await rTokenAsset.price() + const [lowPrice, highPrice] = await newRTokenAsset.price() + expect(lowPrice).to.equal(lowPricePrev) + expect(highPrice).to.equal(highPricePrev) + + await expect(rTokenAsset.claimRewards()).to.not.emit(rTokenAsset, 'RewardsClaimed') + console.log(`successfully tested RTokenAsset`) console.log('\n3.0.0 check succeeded!') } diff --git a/tasks/testing/upgrade-checker.ts b/tasks/testing/upgrade-checker.ts index aeb3dedf8e..9ee7df67a7 100644 --- a/tasks/testing/upgrade-checker.ts +++ b/tasks/testing/upgrade-checker.ts @@ -99,12 +99,17 @@ task('upgrade-checker', 'Mints all the tokens to an address') 'BackingManagerP1', await main.backingManager() ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) // Move past trading delay await advanceTime(hre, (await backingManager.tradingDelay()) + 1) - await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION) // DUTCH_AUCTION + await recollateralize( + hre, + rToken.address, + (await broker.dutchAuctionLength()) > 0 ? TradeKind.DUTCH_AUCTION : TradeKind.BATCH_AUCTION + ) // 3. Run various checks const saUsdtAddress = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase() From 18f3b9d87953e62de2e8fb32b45155e0116ea8e4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 17:18:36 -0400 Subject: [PATCH 064/450] enforce UNPRICED if high price overflows --- contracts/plugins/assets/Asset.sol | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 7c52e64c1e..bfc786dc68 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -144,17 +144,23 @@ contract Asset is IAsset, VersionedAsset { } else { // oracleTimeout <= delta <= oracleTimeout + priceTimeout - // Decay _low downwards from savedLowPrice to 0 - // {UoA/tok} = {UoA/tok} * {1} - _low = savedLowPrice.muluDivu(oracleTimeout + priceTimeout - delta, priceTimeout); - // during overflow should revert - // Decay _high upwards to 3x savedHighPrice // {UoA/tok} = {UoA/tok} * {1} _high = savedHighPrice.safeMul( FIX_ONE + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout), ROUND ); // during overflow should not revert + + // if _high is FIX_MAX, leave at UNPRICED + if (_high != FIX_MAX) { + // Decay _low downwards from savedLowPrice to 0 + // {UoA/tok} = {UoA/tok} * {1} + _low = savedLowPrice.muluDivu( + oracleTimeout + priceTimeout - delta, + priceTimeout + ); + // during overflow should revert since a FIX_MAX _low breaks everything + } } } assert(_low <= _high); From 999c7e397ed63b428218a67339fc5b2b8978e7b3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 18:18:45 -0400 Subject: [PATCH 065/450] add oracle helpers for testing decay/precise prices --- test/utils/oracles.ts | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 944cf02dc4..81cbd3a0db 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -6,6 +6,13 @@ import { MAX_UINT192 } from '../../common/constants' const toleranceDivisor = bn('1e15') // 1 part in 1000 trillions +export const expectExactPrice = async (assetAddr: string, price: [BigNumber, BigNumber]) => { + const asset = await ethers.getContractAt('Asset', assetAddr) + const [lowPrice, highPrice] = await asset.price() + expect(lowPrice).to.equal(price[0]) + expect(highPrice).to.equal(price[1]) +} + // Expects a price around `avgPrice` assuming a consistent percentage oracle error // If near is truthy, allows a small error of 1 part in 1000 trillions export const expectPrice = async ( @@ -84,6 +91,15 @@ export const expectRTokenPrice = async ( expect(highPrice).to.be.gte(avgPrice) } +export const expectDecayedPrice = async (assetAddr: string) => { + const asset = await ethers.getContractAt('Asset', assetAddr) + const [lowPrice, highPrice] = await asset.price() + expect(lowPrice).to.be.gt(0) + expect(lowPrice).to.be.lt(await asset.savedLowPrice()) + expect(highPrice).to.be.gt(await asset.savedHighPrice()) + expect(highPrice).to.be.lt(MAX_UINT192) +} + // Expects an unpriced asset with low = 0 and high = FIX_MAX export const expectUnpriced = async (assetAddr: string) => { const asset = await ethers.getContractAt('Asset', assetAddr) From 53aeffdb44ce309bb4731bb6b2875abdda5ad941 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 18:19:03 -0400 Subject: [PATCH 066/450] decrease testing oracle timeout --- test/fixtures.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/fixtures.ts b/test/fixtures.ts index 15944a43b8..5bf2201390 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -71,7 +71,7 @@ export const SLOW = !!useEnv('SLOW') export const PRICE_TIMEOUT = bn('604800') // 1 week -export const ORACLE_TIMEOUT = bn('281474976710655').div(2) // type(uint48).max / 2 +export const ORACLE_TIMEOUT = bn('281474976710655').div(100) // type(uint48).max / 100 export const ORACLE_ERROR = fp('0.01') // 1% oracle error From 5289955d522d4482de5fcf1a06667727f3631f15 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 18:39:35 -0400 Subject: [PATCH 067/450] Asset.test.ts --- test/plugins/Asset.test.ts | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 1077360a01..c83e6f41bb 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -260,11 +260,8 @@ describe('Assets contracts #fast', () => { await setOraclePrice(compAsset.address, bn('0')) await setOraclePrice(aaveAsset.address, bn('0')) await setOraclePrice(rsrAsset.address, bn('0')) - - // Should be unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + await setOraclePrice(collateral0.address, bn(0)) + await setOraclePrice(collateral1.address, bn(0)) // Fallback prices should be initial prices let [lotLow, lotHigh] = await compAsset.price() @@ -276,18 +273,18 @@ describe('Assets contracts #fast', () => { ;[lotLow, lotHigh] = await aaveAsset.price() expect(lotLow).to.eq(aaveInitPrice[0]) expect(lotHigh).to.eq(aaveInitPrice[1]) - - // Update values of underlying tokens of RToken to 0 - await setOraclePrice(collateral0.address, bn(0)) - await setOraclePrice(collateral1.address, bn(0)) - - // RTokenAsset should be unpriced now - await expectUnpriced(rTokenAsset.address) - - // Should have initial lot price ;[lotLow, lotHigh] = await rTokenAsset.price() expect(lotLow).to.eq(rTokenInitPrice[0]) expect(lotHigh).to.eq(rTokenInitPrice[1]) + + // Advance past timeouts + await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + + // Should be unpriced now + await expectUnpriced(rsrAsset.address) + await expectUnpriced(compAsset.address) + await expectUnpriced(aaveAsset.address) + await expectUnpriced(rTokenAsset.address) }) it('Should return 0 price for RTokenAsset in full haircut scenario', async () => { From acc6722900cfe0615677d32878ec0aded6f91309 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 18:39:43 -0400 Subject: [PATCH 068/450] Collateral.test.ts --- test/plugins/Collateral.test.ts | 154 ++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 39 deletions(-) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 979af9ad02..d62e3f7c53 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -39,6 +39,8 @@ import { } from '../utils/time' import snapshotGasCost from '../utils/snapshotGasCost' import { + expectDecayedPrice, + expectExactPrice, expectPrice, expectRTokenPrice, expectUnpriced, @@ -582,7 +584,7 @@ describe('Collateral contracts', () => { ) }) - it('Should become unpriced if price is zero', async () => { + it('Should handle prices correctly when price is zero', async () => { const compInitPrice = await tokenCollateral.price() const aaveInitPrice = await aTokenCollateral.price() const rsrInitPrice = await cTokenCollateral.price() @@ -590,11 +592,6 @@ describe('Collateral contracts', () => { // Update values in Oracles to 0 await setOraclePrice(tokenCollateral.address, bn('0')) - // Should be unpriced - await expectUnpriced(cTokenCollateral.address) - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - // Fallback prices should be initial prices let [lotLow, lotHigh] = await tokenCollateral.price() expect(lotLow).to.eq(compInitPrice[0]) @@ -606,6 +603,14 @@ describe('Collateral contracts', () => { expect(lotLow).to.eq(aaveInitPrice[0]) expect(lotHigh).to.eq(aaveInitPrice[1]) + // Advance past timeouts + await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + + // Should be unpriced + await expectUnpriced(cTokenCollateral.address) + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) + // When refreshed, sets status to Unpriced await tokenCollateral.refresh() await aTokenCollateral.refresh() @@ -1259,6 +1264,8 @@ describe('Collateral contracts', () => { }) it('Should calculate prices correctly', async function () { + const initialPrice = await nonFiatCollateral.price() + // Check initial prices await expectPrice(nonFiatCollateral.address, fp('20000'), ORACLE_ERROR, true) @@ -1268,26 +1275,37 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(nonFiatCollateral.address, fp('22000'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices + // Cached but IFFY if price is zero await targetUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(nonFiatCollateral.address) - - // When refreshed, sets status to IFFY await nonFiatCollateral.refresh() expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + await expectExactPrice(nonFiatCollateral.address, initialPrice) + + // Should become disabled after just ORACLE_TIMEOUT + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await targetUnitOracle.updateAnswer(bn('0')) + expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + await expectDecayedPrice(nonFiatCollateral.address) // Restore price await targetUnitOracle.updateAnswer(bn('20000e8')) + await referenceUnitOracle.updateAnswer(bn('1e8')) await nonFiatCollateral.refresh() - expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(nonFiatCollateral.address, initialPrice) - // Check the other oracle + // Check the other oracle's impact await referenceUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(nonFiatCollateral.address) + await expectExactPrice(nonFiatCollateral.address, initialPrice) - // When refreshed, sets status to IFFY - await nonFiatCollateral.refresh() - expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // Advance past oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectDecayedPrice(nonFiatCollateral.address) + + // Advance past price timeout + await advanceTime(PRICE_TIMEOUT.toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectUnpriced(nonFiatCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -1550,47 +1568,64 @@ describe('Collateral contracts', () => { }) it('Should calculate prices correctly', async function () { + // Check initial prices await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - - // Check refPerTok initial values expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.02')) // Increase rate to double await cNonFiatTokenVault.setExchangeRate(fp(2)) await cTokenNonFiatCollateral.refresh() - // Check price doubled - await expectPrice(cTokenNonFiatCollateral.address, fp('800'), ORACLE_ERROR, true) - // RefPerTok also doubles in this case expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.04')) + // Check new prices + await expectPrice(cTokenNonFiatCollateral.address, fp('800'), ORACLE_ERROR, true) + // Update values in Oracle increase by 10% await targetUnitOracle.updateAnswer(bn('22000e8')) // $22k // Check new price await expectPrice(cTokenNonFiatCollateral.address, fp('880'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices - await targetUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(cTokenNonFiatCollateral.address) + // Should be SOUND + await cTokenNonFiatCollateral.refresh() + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - // When refreshed, sets status to IFFY + const initialPrice = await cTokenNonFiatCollateral.price() + + // Cached but IFFY when price becomes zero + await targetUnitOracle.updateAnswer(bn('0')) await cTokenNonFiatCollateral.refresh() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - // Restore + // Should become disabled after just ORACLE_TIMEOUT + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await targetUnitOracle.updateAnswer(bn('0')) + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + await cTokenNonFiatCollateral.refresh() + await expectDecayedPrice(cTokenNonFiatCollateral.address) + + // Restore price await targetUnitOracle.updateAnswer(bn('22000e8')) + await referenceUnitOracle.updateAnswer(bn('1e8')) await cTokenNonFiatCollateral.refresh() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - // Revert if price is zero - Update the other Oracle + // Check the other oracle's impact await referenceUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(cTokenNonFiatCollateral.address) + await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - // When refreshed, sets status to IFFY - await cTokenNonFiatCollateral.refresh() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // Advance past oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectDecayedPrice(cTokenNonFiatCollateral.address) + + // Advance past price timeout + await advanceTime(PRICE_TIMEOUT.toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectUnpriced(cTokenNonFiatCollateral.address) }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { @@ -1767,9 +1802,17 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(selfReferentialCollateral.address, fp('1.1'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices + await selfReferentialCollateral.refresh() + const initialPrice = await selfReferentialCollateral.price() + + // Cached price if oracle price is zero await setOraclePrice(selfReferentialCollateral.address, bn(0)) - await expectUnpriced(selfReferentialCollateral.address) + await expectExactPrice(selfReferentialCollateral.address, initialPrice) + + // Decay starts after oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(selfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(selfReferentialCollateral.address) // When refreshed, sets status to IFFY await selfReferentialCollateral.refresh() @@ -1786,6 +1829,12 @@ describe('Collateral contracts', () => { // Another call would not change the state await selfReferentialCollateral.refresh() expect(await selfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + + // Final price checks + await expectDecayedPrice(selfReferentialCollateral.address) + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(selfReferentialCollateral.address, bn(0)) + await expectUnpriced(selfReferentialCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -1978,13 +2027,26 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.044'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices + await cTokenSelfReferentialCollateral.refresh() + const initialPrice = await cTokenSelfReferentialCollateral.price() await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) - await expectUnpriced(cTokenSelfReferentialCollateral.address) + await expectExactPrice(cTokenSelfReferentialCollateral.address, initialPrice) - // When refreshed, sets status to IFFY + // Decays if price is zero await cTokenSelfReferentialCollateral.refresh() expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(cTokenSelfReferentialCollateral.address) + + // Unpriced after price timeout + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) + await expectUnpriced(cTokenSelfReferentialCollateral.address) + + // When refreshed, sets status to DISABLED + await cTokenSelfReferentialCollateral.refresh() + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { @@ -2221,10 +2283,12 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(eurFiatCollateral.address, fp('2'), ORACLE_ERROR, true) + await eurFiatCollateral.refresh() + const initialPrice = await eurFiatCollateral.price() - // Unpriced if price is zero - Update Oracles and check prices + // Decays if price is zero await referenceUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(eurFiatCollateral.address) + await expectExactPrice(eurFiatCollateral.address, initialPrice) // When refreshed, sets status to IFFY await eurFiatCollateral.refresh() @@ -2239,6 +2303,18 @@ describe('Collateral contracts', () => { await targetUnitOracle.updateAnswer(bn('0')) await eurFiatCollateral.refresh() expect(await eurFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + + // Decays if price is zero + await referenceUnitOracle.updateAnswer(bn('0')) + await expectExactPrice(eurFiatCollateral.address, initialPrice) + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectDecayedPrice(eurFiatCollateral.address) + + // After timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectUnpriced(eurFiatCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { From e5ffdaf279f6b0c37dead45d409a285fbc578443 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 18:45:47 -0400 Subject: [PATCH 069/450] Asset.test.ts --- test/plugins/Asset.test.ts | 56 ++++++++++++++++++++++++++------------ 1 file changed, 39 insertions(+), 17 deletions(-) diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index c83e6f41bb..a10b4ce63d 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -12,6 +12,8 @@ import { import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../common/constants' import { bn, fp } from '../../common/numbers' import { + expectDecayedPrice, + expectExactPrice, expectPrice, expectRTokenPrice, expectUnpriced, @@ -260,25 +262,45 @@ describe('Assets contracts #fast', () => { await setOraclePrice(compAsset.address, bn('0')) await setOraclePrice(aaveAsset.address, bn('0')) await setOraclePrice(rsrAsset.address, bn('0')) - await setOraclePrice(collateral0.address, bn(0)) - await setOraclePrice(collateral1.address, bn(0)) + await setOraclePrice(collateral0.address, bn('0')) + await setOraclePrice(collateral1.address, bn('0')) // Fallback prices should be initial prices - let [lotLow, lotHigh] = await compAsset.price() - expect(lotLow).to.eq(compInitPrice[0]) - expect(lotHigh).to.eq(compInitPrice[1]) - ;[lotLow, lotHigh] = await rsrAsset.price() - expect(lotLow).to.eq(rsrInitPrice[0]) - expect(lotHigh).to.eq(rsrInitPrice[1]) - ;[lotLow, lotHigh] = await aaveAsset.price() - expect(lotLow).to.eq(aaveInitPrice[0]) - expect(lotHigh).to.eq(aaveInitPrice[1]) - ;[lotLow, lotHigh] = await rTokenAsset.price() - expect(lotLow).to.eq(rTokenInitPrice[0]) - expect(lotHigh).to.eq(rTokenInitPrice[1]) - - // Advance past timeouts - await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await expectExactPrice(compAsset.address, compInitPrice) + await expectExactPrice(rsrAsset.address, rsrInitPrice) + await expectExactPrice(aaveAsset.address, aaveInitPrice) + await expectExactPrice(rTokenAsset.address, rTokenInitPrice) + + // Advance past oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(compAsset.address, bn('0')) + await setOraclePrice(aaveAsset.address, bn('0')) + await setOraclePrice(rsrAsset.address, bn('0')) + await setOraclePrice(collateral0.address, bn('0')) + await setOraclePrice(collateral1.address, bn('0')) + await compAsset.refresh() + await rsrAsset.refresh() + await aaveAsset.refresh() + await collateral0.refresh() + await collateral1.refresh() + + // Prices should be decaying + await expectDecayedPrice(compAsset.address) + await expectDecayedPrice(rsrAsset.address) + await expectDecayedPrice(aaveAsset.address) + const p = await rTokenAsset.price() + expect(p[0]).to.be.gt(0) + expect(p[0]).to.be.lt(rTokenInitPrice[0]) + expect(p[1]).to.be.gt(rTokenInitPrice[1]) + expect(p[1]).to.be.lt(MAX_UINT192) + + // After price timeout, should be unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(compAsset.address, bn('0')) + await setOraclePrice(aaveAsset.address, bn('0')) + await setOraclePrice(rsrAsset.address, bn('0')) + await setOraclePrice(collateral0.address, bn('0')) + await setOraclePrice(collateral1.address, bn('0')) // Should be unpriced now await expectUnpriced(rsrAsset.address) From 4c80697a5258ccdedc3fe972e85922a89c6af39f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 19:36:50 -0400 Subject: [PATCH 070/450] test/integration/AssetPlugins.test.ts --- contracts/plugins/assets/Asset.sol | 2 +- contracts/plugins/mocks/AssetMock.sol | 2 +- test/integration/AssetPlugins.test.ts | 193 +++++++++++++++++++------- 3 files changed, 144 insertions(+), 53 deletions(-) diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index bfc786dc68..ed98e9a1d7 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -40,7 +40,7 @@ contract Asset is IAsset, VersionedAsset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of + /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, diff --git a/contracts/plugins/mocks/AssetMock.sol b/contracts/plugins/mocks/AssetMock.sol index b6abe6fffb..c1b495380f 100644 --- a/contracts/plugins/mocks/AssetMock.sol +++ b/contracts/plugins/mocks/AssetMock.sol @@ -12,7 +12,7 @@ contract AssetMock is Asset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of + /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 15f4b2236d..ccb0089359 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -19,7 +19,14 @@ import { expectEvents } from '../../common/events' import { bn, fp, toBNDecimals } from '../../common/numbers' import { advanceBlocks, advanceTime } from '../utils/time' import { whileImpersonating } from '../utils/impersonation' -import { expectPrice, expectRTokenPrice, expectUnpriced, setOraclePrice } from '../utils/oracles' +import { + expectDecayedPrice, + expectExactPrice, + expectPrice, + expectRTokenPrice, + expectUnpriced, + setOraclePrice, +} from '../utils/oracles' import forkBlockNumber from './fork-block-numbers' import { Asset, @@ -39,6 +46,7 @@ import { MockV3Aggregator, NonFiatCollateral, RTokenAsset, + SelfReferentialCollateral, StaticATokenLM, TestIBackingManager, TestIBasketHandler, @@ -969,7 +977,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, cTokenAddress: networkConfig[chainId].tokens.cETH || '', cTokenCollateral: cETHCollateral, price: fp('1859.17'), // approx price June 6, 2022 - refPerTok: fp('0.020064224962890636'), // for weth on June 2022 targetName: 'ETH', }, ] @@ -1114,13 +1121,24 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, ORACLE_ERROR, networkConfig[chainId].tokens.stkAAVE || '', config.rTokenMaxTradeVolume, - MAX_ORACLE_TIMEOUT + ORACLE_TIMEOUT ) ) + await setOraclePrice(zeroPriceAsset.address, bn('1e10')) + await zeroPriceAsset.refresh() + + const initialPrice = await zeroPriceAsset.price() + await setOraclePrice(zeroPriceAsset.address, bn(0)) + await expectExactPrice(zeroPriceAsset.address, initialPrice) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceAsset.address, bn(0)) + await expectDecayedPrice(zeroPriceAsset.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceAsset.address, bn(0)) await expectUnpriced(zeroPriceAsset.address) }) @@ -1183,19 +1201,30 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: dai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }) + await setOraclePrice(zeroFiatCollateral.address, bn('1e8')) await zeroFiatCollateral.refresh() + expect(await zeroFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + const initialPrice = await zeroFiatCollateral.price() await setOraclePrice(zeroFiatCollateral.address, bn(0)) + await expectExactPrice(zeroFiatCollateral.address, initialPrice) - // Unpriced + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeroFiatCollateral.address, bn(0)) + await expectDecayedPrice(zeroFiatCollateral.address) + + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroFiatCollateral.address, bn(0)) await expectUnpriced(zeroFiatCollateral.address) - // Refresh should mark status IFFY + // Marked IFFY after refresh await zeroFiatCollateral.refresh() expect(await zeroFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1258,18 +1287,29 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }, REVENUE_HIDING ) + await setOraclePrice(zeropriceCtokenCollateral.address, bn('1e8')) await zeropriceCtokenCollateral.refresh() + expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await zeropriceCtokenCollateral.price() + await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) + await expectExactPrice(zeropriceCtokenCollateral.address, initialPrice) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) + await expectDecayedPrice(zeropriceCtokenCollateral.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) await expectUnpriced(zeropriceCtokenCollateral.address) // Refresh should mark status IFFY @@ -1335,18 +1375,29 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: stataDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }, REVENUE_HIDING ) + await setOraclePrice(zeroPriceAtokenCollateral.address, bn('1e8')) await zeroPriceAtokenCollateral.refresh() + expect(await zeroPriceAtokenCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await zeroPriceAtokenCollateral.price() + await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) + await expectExactPrice(zeroPriceAtokenCollateral.address, initialPrice) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceAtokenCollateral.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) await expectUnpriced(zeroPriceAtokenCollateral.address) // Refresh should mark status IFFY @@ -1403,27 +1454,30 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: wbtc.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - MAX_ORACLE_TIMEOUT + ORACLE_TIMEOUT ) + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn('1e10')) await zeroPriceNonFiatCollateral.refresh() - // Set price = 0 - const chainlinkFeedAddr = await zeroPriceNonFiatCollateral.chainlinkFeed() - const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) - await v3Aggregator.updateAnswer(bn(0)) + const initialPrice = await zeroPriceNonFiatCollateral.price() + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + await expectExactPrice(zeroPriceNonFiatCollateral.address, initialPrice) - // Unpriced - await expectUnpriced(zeroPriceNonFiatCollateral.address) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceNonFiatCollateral.address) - // Refresh should mark status IFFY - await zeroPriceNonFiatCollateral.refresh() - expect(await zeroPriceNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + await expectUnpriced(zeroPriceNonFiatCollateral.address) }) it('Should handle invalid/stale Price - Collateral - CTokens Non-Fiat', async () => { @@ -1480,29 +1534,32 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cWBTCVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - MAX_ORACLE_TIMEOUT, + ORACLE_TIMEOUT, REVENUE_HIDING ) ) + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn('1e10')) await zeropriceCtokenNonFiatCollateral.refresh() - // Set price = 0 - const chainlinkFeedAddr = await zeropriceCtokenNonFiatCollateral.targetUnitChainlinkFeed() - const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) - await v3Aggregator.updateAnswer(bn(0)) + const initialPrice = await zeropriceCtokenNonFiatCollateral.price() + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + await expectExactPrice(zeropriceCtokenNonFiatCollateral.address, initialPrice) - // Unpriced - await expectUnpriced(zeropriceCtokenNonFiatCollateral.address) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + await expectDecayedPrice(zeropriceCtokenNonFiatCollateral.address) - // Refresh should mark status IFFY - await zeropriceCtokenNonFiatCollateral.refresh() - expect(await zeropriceCtokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + await expectUnpriced(zeropriceCtokenNonFiatCollateral.address) }) it('Should handle invalid/stale Price - Collateral - Self-Referential', async () => { @@ -1518,8 +1575,10 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await wethCollateral.status()).to.equal(CollateralStatus.IFFY) // Self referential collateral with no price - const nonpriceSelfReferentialCollateral: FiatCollateral = await ( - await ethers.getContractFactory('FiatCollateral') + const nonpriceSelfReferentialCollateral: SelfReferentialCollateral = < + SelfReferentialCollateral + >await ( + await ethers.getContractFactory('SelfReferentialCollateral') ).deploy({ priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, @@ -1540,28 +1599,40 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await nonpriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) // Self referential collateral with zero price - const zeroPriceSelfReferentialCollateral: FiatCollateral = await ( - await ethers.getContractFactory('FiatCollateral') + const zeroPriceSelfReferentialCollateral: SelfReferentialCollateral = < + SelfReferentialCollateral + >await ( + await ethers.getContractFactory('SelfReferentialCollateral') ).deploy({ priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, erc20: weth.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, }) + await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn('1e10')) await zeroPriceSelfReferentialCollateral.refresh() + expect(await zeroPriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await zeroPriceSelfReferentialCollateral.price() + await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) + await expectExactPrice(zeroPriceSelfReferentialCollateral.address, initialPrice) - // Set price = 0 + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceSelfReferentialCollateral.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) await expectUnpriced(zeroPriceSelfReferentialCollateral.address) - // Refresh should mark status IFFY + // Refresh should mark status DISABLED await zeroPriceSelfReferentialCollateral.refresh() expect(await zeroPriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1621,7 +1692,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cETHVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1629,12 +1700,24 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, REVENUE_HIDING, await weth.decimals() ) + await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn('1e10')) await zeroPriceCtokenSelfReferentialCollateral.refresh() + expect(await zeroPriceCtokenSelfReferentialCollateral.status()).to.equal( + CollateralStatus.SOUND + ) - // Set price = 0 + const initialPrice = await zeroPriceCtokenSelfReferentialCollateral.price() await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) + await expectExactPrice(zeroPriceCtokenSelfReferentialCollateral.address, initialPrice) - // Unpriced + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceCtokenSelfReferentialCollateral.address) + + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) await expectUnpriced(zeroPriceCtokenSelfReferentialCollateral.address) // Refresh should mark status IFFY @@ -1692,22 +1775,30 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: eurt.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - MAX_ORACLE_TIMEOUT + ORACLE_TIMEOUT ) + await setOraclePrice(invalidPriceEURCollateral.address, bn('1e10')) await invalidPriceEURCollateral.refresh() + expect(await invalidPriceEURCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await invalidPriceEURCollateral.price() + await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) + await expectExactPrice(invalidPriceEURCollateral.address, initialPrice) - // Set price = 0 - const chainlinkFeedAddr = await invalidPriceEURCollateral.targetUnitChainlinkFeed() - const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) - await v3Aggregator.updateAnswer(bn(0)) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) + await expectDecayedPrice(invalidPriceEURCollateral.address) - // With zero price + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) await expectUnpriced(invalidPriceEURCollateral.address) // Refresh should mark status IFFY From 4b1fcf75ca37519fcb0a887b1fea8452b659f63e Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 19:45:02 -0400 Subject: [PATCH 071/450] cap maxTradeSell using low price, not high --- contracts/p0/mixins/TradingLib.sol | 2 +- contracts/p1/mixins/TradeLib.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index d8638e915f..72ae48ad53 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -60,7 +60,7 @@ library TradingLibP0 { ); // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} // Calculate equivalent buyAmount within [0, FIX_MAX] diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index f0921dd511..8d3c8e01c9 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -62,7 +62,7 @@ library TradeLib { ); // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} // Calculate equivalent buyAmount within [0, FIX_MAX] From 4641d0f514c3a06a82d75d8c2bbc9d569613d164 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 19:48:22 -0400 Subject: [PATCH 072/450] EasyAuction.test.ts --- test/integration/EasyAuction.test.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 3d63f9e5b8..af2f439042 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -551,10 +551,11 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function }) it('should be able to scoop entire auction cheaply when minBuyAmount = 0', async () => { - // Make collateral0 lotPrice (0, 0) + // Make collateral0 price (0, FIX_MAX) await setOraclePrice(collateral0.address, bn('0')) await collateral0.refresh() await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await setOraclePrice(collateral0.address, bn('0')) await setOraclePrice(await assetRegistry.toAsset(rsr.address), bn('1e8')) // force a revenue dust auction From 1e5e647d3175d1e89f9a8e7573f5aefac43a447d Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 20:02:02 -0400 Subject: [PATCH 073/450] test/plugins/individual-collateral/**/*.test.ts --- .../individual-collateral/collateralTests.ts | 32 ++++++++++++++++--- .../curve/collateralTests.ts | 28 +++++++++++++--- .../CrvStableRTokenMetapoolTestSuite.test.ts | 4 +-- .../CvxStableRTokenMetapoolTestSuite.test.ts | 4 +-- 4 files changed, 54 insertions(+), 14 deletions(-) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 49e4cec608..7be0cd4520 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -25,7 +25,12 @@ import { CollateralTestSuiteFixtures, CollateralStatus, } from './pluginTestTypes' -import { expectPrice, expectUnpriced } from '../../utils/oracles' +import { + expectDecayedPrice, + expectExactPrice, + expectPrice, + expectUnpriced, +} from '../../utils/oracles' import snapshotGasCost from '../../utils/snapshotGasCost' import { IMPLEMENTATION, Implementation } from '../../fixtures' @@ -259,17 +264,34 @@ export default function fn( expect(newHigh).to.be.gt(initHigh) }) - it('returns unpriced for 0-valued oracle', async () => { + it('decays for 0-valued oracle', async () => { + const initialPrice = await collateral.price() + // Set price of underlying to 0 const updateAnswerTx = await chainlinkFeed.updateAnswer(0) await updateAnswerTx.wait() - // (0, FIX_MAX) is returned + // Price remains same at first, though IFFY + await collateral.refresh() + await expectExactPrice(collateral.address, initialPrice) + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + + // After oracle timeout decay begins + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(1 + oracleTimeout / 12) + await collateral.refresh() + await expectDecayedPrice(collateral.address) + + // After price timeout it becomes unpriced + const priceTimeout = await collateral.priceTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceBlocks(1 + priceTimeout / 12) await expectUnpriced(collateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to DISABLED await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) }) it('does not revert in case of invalid timestamp', async () => { diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 215814db2b..33285835f7 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -12,7 +12,7 @@ import { MAX_UINT48, MAX_UINT192, ZERO_ADDRESS, ONE_ADDRESS } from '../../../../ import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { useEnv } from '#/utils/env' -import { expectUnpriced } from '../../../utils/oracles' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../utils/oracles' import { advanceBlocks, advanceTime, @@ -393,17 +393,35 @@ export default function fn( } }) - it('returns unpriced for 0-valued oracle', async () => { + it('decays for 0-valued oracle', async () => { + const initialPrice = await ctx.collateral.price() + + // Set price of underlyings to 0 for (const feed of ctx.feeds) { await feed.updateAnswer(0).then((e) => e.wait()) } - // (0, FIX_MAX) is returned + // Price remains same at first, though IFFY + await ctx.collateral.refresh() + await expectExactPrice(ctx.collateral.address, initialPrice) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + + // After oracle timeout decay begins + const oracleTimeout = await ctx.collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(1 + oracleTimeout / 12) + await ctx.collateral.refresh() + await expectDecayedPrice(ctx.collateral.address) + + // After price timeout it becomes unpriced + const priceTimeout = await ctx.collateral.priceTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceBlocks(1 + priceTimeout / 12) await expectUnpriced(ctx.collateral.address) - // When refreshed, sets status to IFFY + // When refreshed, sets status to DISABLED await ctx.collateral.refresh() - expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) }) it('does not revert in case of invalid timestamp', async () => { diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index 091863c246..0075e261f6 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -234,8 +234,8 @@ const collateralSpecificStatusTests = () => { // Should be unpriced await expectUnpriced(collateral.address) - // Lot price should be initial price - const lotP = await collateral.lotPrice() + // Price should be initial price + const lotP = await collateral.price() expect(lotP[0]).to.eq(initialPrice[0]) expect(lotP[1]).to.eq(initialPrice[1]) }) diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index e1646193a8..aa7f2c9dd7 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -236,8 +236,8 @@ const collateralSpecificStatusTests = () => { // Should be unpriced await expectUnpriced(collateral.address) - // Lot price should be initial price - const lotP = await collateral.lotPrice() + // Price should be initial price + const lotP = await collateral.price() expect(lotP[0]).to.eq(initialPrice[0]) expect(lotP[1]).to.eq(initialPrice[1]) }) From 53f24f71e8e1692f17cd3f40b91e2709a1959179 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 20:14:24 -0400 Subject: [PATCH 074/450] fix AssetPlugins integration tests --- test/integration/AssetPlugins.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index ccb0089359..1729c21c9b 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -977,6 +977,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, cTokenAddress: networkConfig[chainId].tokens.cETH || '', cTokenCollateral: cETHCollateral, price: fp('1859.17'), // approx price June 6, 2022 + refPerTok: fp('0.020064224962890636'), // for weth on June 2022 targetName: 'ETH', }, ] From 7a1b16f8ce65d07701129e3ccde733a791f6a883 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 20:23:20 -0400 Subject: [PATCH 075/450] Revenues.test.ts --- test/Revenues.test.ts | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 9581f3fe61..6fc7a8ec71 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1106,26 +1106,26 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should only be able to start a dust auction BATCH_AUCTION (and not DUTCH_AUCTION) if oracle has failed', async () => { const minTrade = bn('1e18') - await rTokenTrader.connect(owner).setMinTradeVolume(minTrade) + await rsrTrader.connect(owner).setMinTradeVolume(minTrade) const dustAmount = bn('1e17') - await token0.connect(addr1).transfer(rTokenTrader.address, dustAmount) + await token0.connect(addr1).transfer(rsrTrader.address, dustAmount) - const p1RevenueTrader = await ethers.getContractAt('RevenueTraderP1', rTokenTrader.address) await setOraclePrice(collateral0.address, bn(0)) await collateral0.refresh() await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) - await setOraclePrice(collateral1.address, bn('1e8')) + await setOraclePrice(rsrAsset.address, bn('1e8')) - const p = await collateral0.lotPrice() + const p = await collateral0.price() expect(p[0]).to.equal(0) - expect(p[1]).to.equal(0) - await expect( - p1RevenueTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - ).to.revertedWith('bad sell pricing') + expect(p[1]).to.equal(MAX_UINT192) await expect( - p1RevenueTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION]) - ).to.emit(rTokenTrader, 'TradeStarted') + rsrTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + ).to.revertedWith('dutch auctions require live prices') + await expect(rsrTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])).to.emit( + rsrTrader, + 'TradeStarted' + ) }) it('Should not launch an auction for 1 qTok', async () => { @@ -1481,7 +1481,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) // Expected values based on Prices between AAVE and RSR = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to oracle error + const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to oracle error const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) // Run auctions @@ -1663,7 +1663,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RToken = 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) await expectEvents(backingManager.claimRewards(), [ @@ -1861,7 +1861,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.mul(20).div(100) // All Rtokens can be sold - 20% of total comp based on f From f720f27eddfe8385390d7de5750bcd3223b46967 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 20:29:58 -0400 Subject: [PATCH 076/450] Recollateralization.test.ts --- test/Recollateralization.test.ts | 88 +++---------------- .../aave/ATokenFiatCollateral.test.ts | 7 +- 2 files changed, 20 insertions(+), 75 deletions(-) diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 4e05b74a6a..37cfe6955e 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -2209,7 +2209,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ).div(2) const sellAmt = sellAmtBeforeSlippage .mul(BN_SCALE_FACTOR) - .div(BN_SCALE_FACTOR.add(ORACLE_ERROR)) + .div(BN_SCALE_FACTOR.sub(ORACLE_ERROR)) const minBuyAmt = await toMinBuyAmt(sellAmt, fp('0.5'), fp('1')) await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) @@ -2252,64 +2252,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await advanceTime(config.batchAuctionLength.add(100).toString()) // Run auctions - will end current, and will open a new auction for the same amount - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: backingManager, - name: 'TradeSettled', - args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], - emitted: true, - }, - { - contract: backingManager, - name: 'TradeStarted', - args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], - emitted: true, - }, - ]) - const leftoverSellAmt = issueAmount.sub(sellAmt.mul(2)) - - // Check new auction - // Token0 -> Backup Token Auction - await expectTrade(backingManager, { - sell: token0.address, - buy: backupToken1.address, - endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), - externalId: bn('1'), - }) - - // Check state - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.add(leftoverSellAmt.div(2)) - ) - expect(await token0.balanceOf(backingManager.address)).to.equal(leftoverSellAmt) - expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) - expect(await rToken.totalSupply()).to.equal(issueAmount) - - // Check price in USD of the current RToken - await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) - - // Perform Mock Bids (addr1 has balance) - // Pay at worst-case price - await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt, - }) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Check staking situation remains unchanged - expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) - expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Run auctions - will end current, and will open a new auction for the same amount + const leftoverSellAmt = issueAmount.sub(sellAmt) const leftoverMinBuyAmt = await toMinBuyAmt(leftoverSellAmt, fp('0.5'), fp('1')) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { @@ -2338,17 +2281,14 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: token0.address, buy: backupToken1.address, endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), - externalId: bn('2'), + externalId: bn('1'), }) // Check state expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.mul(2) - ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) - expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt.mul(2)) + expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) expect(await rToken.totalSupply()).to.equal(issueAmount) // Check price in USD of the current RToken @@ -2357,7 +2297,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) - await gnosis.placeBid(2, { + await gnosis.placeBid(1, { bidder: addr1.address, sellAmount: leftoverSellAmt, buyAmount: leftoverMinBuyAmt, @@ -2370,11 +2310,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) - // End current auction, should start a new one to sell RSR for collateral - // ~51e18 Tokens left to buy - Sets Buy amount as independent value - const buyAmtBidRSR: BigNumber = issueAmount - .sub(minBuyAmt.mul(2).add(leftoverMinBuyAmt)) - .add(1) + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Run auctions - will end current, and will open a new auction for the same amount + const buyAmtBidRSR: BigNumber = issueAmount.sub(minBuyAmt.add(leftoverMinBuyAmt)).add(1) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: backingManager, @@ -2404,7 +2344,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: rsr.address, buy: backupToken1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('3'), + externalId: bn('2'), }) const t = await getTrade(backingManager, rsr.address) @@ -2415,11 +2355,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.mul(2).add(leftoverMinBuyAmt) + minBuyAmt.add(leftoverMinBuyAmt) ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) expect(await backupToken1.balanceOf(backingManager.address)).to.equal( - minBuyAmt.mul(2).add(leftoverMinBuyAmt) + minBuyAmt.add(leftoverMinBuyAmt) ) expect(await rToken.totalSupply()).to.equal(issueAmount) @@ -2432,7 +2372,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids for RSR (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, buyAmtBidRSR) - await gnosis.placeBid(3, { + await gnosis.placeBid(2, { bidder: addr1.address, sellAmount: sellAmtRSR, buyAmount: buyAmtBidRSR, diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index c05faee8ac..8e38035704 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -31,7 +31,12 @@ import { import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' -import { expectPrice, expectRTokenPrice, setOraclePrice } from '../../../utils/oracles' +import { + expectPrice, + expectRTokenPrice, + setOraclePrice, + expectUnpriced, +} from '../../../utils/oracles' import { advanceBlocks, advanceTime, From 1deef71f86b66e9d9d26a5aa6d7b4e6c48c8422b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 22:42:50 -0400 Subject: [PATCH 077/450] CTokenFiatCollateral.test.ts --- .../compoundv2/CTokenFiatCollateral.test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index effbdef07d..d3d0af540e 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -31,7 +31,12 @@ import { import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp, toBNDecimals } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' -import { expectPrice, expectRTokenPrice, setOraclePrice } from '../../../utils/oracles' +import { + expectPrice, + expectRTokenPrice, + expectUnpriced, + setOraclePrice, +} from '../../../utils/oracles' import { advanceBlocks, advanceTime, From 8cd631744bdc32b9b168439d739a40a2cd6d901c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 22:42:56 -0400 Subject: [PATCH 078/450] ComplexBasket.test.ts --- test/scenario/ComplexBasket.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index e97f5bea25..9dd384a82c 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -1598,8 +1598,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - cETHVault partial sale for weth // Will sell about 841K of cETHVault, expect to receive 8167 wETH (minimum) // We would still have about 438K to sell of cETHVault - let [, high] = await cETHVaultCollateral.price() - const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(high) + let [low] = await cETHVaultCollateral.price() + const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) const sellAmt = toBNDecimals(sellAmtUnscaled, 8) const sellAmtRemainder = (await cETHVault.balanceOf(backingManager.address)).sub(sellAmt) // Price for cETHVault = 1200 / 50 = $24 at rate 50% = $12 @@ -1744,8 +1744,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // 13K wETH @ 1200 = 15,600,000 USD of value, in RSR ~= 156,000 RSR (@100 usd) // We exceed maxTradeVolume so we need two auctions - Will first sell 10M in value // Sells about 101K RSR, for 8167 WETH minimum - ;[, high] = await rsrAsset.price() - const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(high) + ;[low] = await rsrAsset.price() + const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) const buyAmtBidRSR1 = toMinBuyAmt( sellAmtRSR1, rsrPrice, From dd696791451d65573e5d63fd855e673ac7da89b9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 22:54:02 -0400 Subject: [PATCH 079/450] Facade.test.ts --- test/Facade.test.ts | 175 +++++++++++++++++++++++--------------------- 1 file changed, 92 insertions(+), 83 deletions(-) diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 6082e986d0..9da2b8398a 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -483,6 +483,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // Set price to 0 await setOraclePrice(rsrAsset.address, bn(0)) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, bn('1e8')) + await setOraclePrice(usdcAsset.address, bn('1e8')) + await assetRegistry.refresh() const [backing2, overCollateralization2] = await facade.callStatic.backingOverview( rToken.address @@ -556,97 +560,98 @@ describe('FacadeRead + FacadeAct contracts', () => { }) it('Should return revenue + chain into FacadeAct.runRevenueAuctions', async () => { - const traders = [rTokenTrader, rsrTrader] + // Set low to 0 == revenueOverview() should not revert + const minTradeVolume = await rsrTrader.minTradeVolume() + const auctionLength = await broker.dutchAuctionLength() + const tokenSurplus = bn('0.5e18') + await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) - // Set lotLow to 0 == revenueOverview() should not revert await setOraclePrice(usdcAsset.address, bn('0')) - await usdcAsset.refresh() - for (let traderIndex = 0; traderIndex < traders.length; traderIndex++) { - const trader = traders[traderIndex] - - const minTradeVolume = await trader.minTradeVolume() - const auctionLength = await broker.dutchAuctionLength() - const tokenSurplus = bn('0.5e18') - await token.connect(addr1).transfer(trader.address, tokenSurplus) - - const [low] = await usdcAsset.price() - expect(low).to.equal(0) - - // revenue - let [erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s - - const erc20sToStart = [] - for (let i = 0; i < 8; i++) { - if (erc20s[i] == token.address) { - erc20sToStart.push(erc20s[i]) - expect(canStart[i]).to.equal(true) - expect(surpluses[i]).to.equal(tokenSurplus) - } else { - expect(canStart[i]).to.equal(false) - expect(surpluses[i]).to.equal(0) - } - const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) - const [low] = await asset.price() - expect(minTradeAmounts[i]).to.equal( - low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 - ) // 1% oracleError - } + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, bn('1e8')) + await setOraclePrice(rsrAsset.address, bn('1e8')) + await assetRegistry.refresh() - // Run revenue auctions via multicall - const funcSig = ethers.utils.id('runRevenueAuctions(address,address[],address[],uint8[])') - const args = ethers.utils.defaultAbiCoder.encode( - ['address', 'address[]', 'address[]', 'uint8[]'], - [trader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] - ) - const data = funcSig.substring(0, 10) + args.slice(2) - await expect(facadeAct.multicall([data])).to.emit(trader, 'TradeStarted') - - // Another call to revenueOverview should not propose any auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - expect(canStart).to.eql(Array(8).fill(false)) - - // Nothing should be settleable - expect((await facade.auctionsSettleable(trader.address)).length).to.equal(0) - - // Advance time till auction is over - await advanceBlocks(2 + auctionLength / 12) - - // Now should be settleable - const settleable = await facade.auctionsSettleable(trader.address) - expect(settleable.length).to.equal(1) - expect(settleable[0]).to.equal(token.address) - - // Another call to revenueOverview should settle and propose new auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - - // Should repeat the same auctions - for (let i = 0; i < 8; i++) { - if (erc20s[i] == token.address) { - expect(canStart[i]).to.equal(true) - expect(surpluses[i]).to.equal(tokenSurplus) - } else { - expect(canStart[i]).to.equal(false) - expect(surpluses[i]).to.equal(0) - } + const [low] = await usdcAsset.price() + expect(low).to.equal(0) + + // revenue + let [erc20s, canStart, surpluses, minTradeAmounts] = + await facadeAct.callStatic.revenueOverview(rsrTrader.address) + expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s + + const erc20sToStart = [] + for (let i = 0; i < 8; i++) { + if (erc20s[i] == token.address) { + erc20sToStart.push(erc20s[i]) + expect(canStart[i]).to.equal(true) + expect(surpluses[i]).to.equal(tokenSurplus) + } else { + expect(canStart[i]).to.equal(false) + expect(surpluses[i]).to.equal(0) } + const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) + const [low] = await asset.price() + expect(minTradeAmounts[i]).to.equal( + low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 + ) // 1% oracleError + } - // Settle and start new auction - await facadeAct.runRevenueAuctions(trader.address, erc20sToStart, erc20sToStart, [ - TradeKind.DUTCH_AUCTION, - ]) + // Run revenue auctions via multicall + const funcSig = ethers.utils.id('runRevenueAuctions(address,address[],address[],uint8[])') + const args = ethers.utils.defaultAbiCoder.encode( + ['address', 'address[]', 'address[]', 'uint8[]'], + [rsrTrader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] + ) + const data = funcSig.substring(0, 10) + args.slice(2) + await expect(facadeAct.multicall([data])).to.emit(rsrTrader, 'TradeStarted') - // Send additional revenues - await token.connect(addr1).transfer(trader.address, tokenSurplus) + // Another call to revenueOverview should not propose any auction + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + rsrTrader.address + ) + expect(canStart).to.eql(Array(8).fill(false)) - // Call revenueOverview, cannot open new auctions - ;[erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - expect(canStart).to.eql(Array(8).fill(false)) + // Nothing should be settleable + expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) + + // Advance time till auction is over + await advanceBlocks(2 + auctionLength / 12) + + // Now should be settleable + const settleable = await facade.auctionsSettleable(rsrTrader.address) + expect(settleable.length).to.equal(1) + expect(settleable[0]).to.equal(token.address) + + // Another call to revenueOverview should settle and propose new auction + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + rsrTrader.address + ) + + // Should repeat the same auctions + for (let i = 0; i < 8; i++) { + if (erc20s[i] == token.address) { + expect(canStart[i]).to.equal(true) + expect(surpluses[i]).to.equal(tokenSurplus) + } else { + expect(canStart[i]).to.equal(false) + expect(surpluses[i]).to.equal(0) + } } + + // Settle and start new auction + await facadeAct.runRevenueAuctions(rsrTrader.address, erc20sToStart, erc20sToStart, [ + TradeKind.DUTCH_AUCTION, + ]) + + // Send additional revenues + await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) + + // Call revenueOverview, cannot open new auctions + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + rsrTrader.address + ) + expect(canStart).to.eql(Array(8).fill(false)) }) itP1('Should handle invalid versions when running revenueOverview', async () => { @@ -896,7 +901,11 @@ describe('FacadeRead + FacadeAct contracts', () => { ) // set price of dai to 0 await chainlinkFeed.updateAnswer(0) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(usdcAsset.address, bn('1e8')) + await assetRegistry.refresh() await main.connect(owner).pauseTrading() + const [erc20s, breakdown, targets] = await facade.callStatic.basketBreakdown(rToken.address) expect(erc20s.length).to.equal(4) expect(breakdown.length).to.equal(4) From 722fea63e9fd30802b1278bc9763c9b0fed80d71 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 1 Sep 2023 22:54:11 -0400 Subject: [PATCH 080/450] Main.test.ts --- test/Main.test.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/Main.test.ts b/test/Main.test.ts index 95fba1d958..7556200088 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2815,6 +2815,8 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Set price = 0, which hits 3 of our 4 collateral in the basket await setOraclePrice(newColl2.address, bn('0')) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(collateral1.address, bn('1e8')) // Check status and price again const p = await basketHandler.price() From 843a9c66482424e2a4996b1dec0f591b66ab9325 Mon Sep 17 00:00:00 2001 From: Patrick McKelvy Date: Sun, 3 Sep 2023 11:06:16 -0400 Subject: [PATCH 081/450] fix plugin tests. --- .../individual-collateral/collateralTests.ts | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 7be0cd4520..1b7f94a9fb 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -264,36 +264,6 @@ export default function fn( expect(newHigh).to.be.gt(initHigh) }) - it('decays for 0-valued oracle', async () => { - const initialPrice = await collateral.price() - - // Set price of underlying to 0 - const updateAnswerTx = await chainlinkFeed.updateAnswer(0) - await updateAnswerTx.wait() - - // Price remains same at first, though IFFY - await collateral.refresh() - await expectExactPrice(collateral.address, initialPrice) - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - - // After oracle timeout decay begins - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(1 + oracleTimeout / 12) - await collateral.refresh() - await expectDecayedPrice(collateral.address) - - // After price timeout it becomes unpriced - const priceTimeout = await collateral.priceTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) - await advanceBlocks(1 + priceTimeout / 12) - await expectUnpriced(collateral.address) - - // When refreshed, sets status to DISABLED - await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - }) - it('does not revert in case of invalid timestamp', async () => { await chainlinkFeed.setInvalidTimestamp() @@ -373,6 +343,36 @@ export default function fn( await advanceTime(priceTimeout / 2) await expectUnpriced(collateral.address) }) + + it('decays for 0-valued oracle', async () => { + const initialPrice = await collateral.price() + + // Set price of underlying to 0 + const updateAnswerTx = await chainlinkFeed.updateAnswer(0) + await updateAnswerTx.wait() + + // Price remains same at first, though IFFY + await collateral.refresh() + await expectExactPrice(collateral.address, initialPrice) + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + + // After oracle timeout decay begins + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(1 + oracleTimeout / 12) + await collateral.refresh() + await expectDecayedPrice(collateral.address) + + // After price timeout it becomes unpriced + const priceTimeout = await collateral.priceTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceBlocks(1 + priceTimeout / 12) + await expectUnpriced(collateral.address) + + // When refreshed, sets status to DISABLED + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + }) }) describe('status', () => { From 86aa66b640e1312b9b7ec74549b93118b154ce23 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 5 Sep 2023 11:45:51 -0400 Subject: [PATCH 082/450] fix final failing tests --- .../CrvStableRTokenMetapoolTestSuite.test.ts | 18 ++++++++++-------- .../CvxStableRTokenMetapoolTestSuite.test.ts | 18 ++++++++++-------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index 0075e261f6..a97702d5af 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -7,13 +7,14 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' -import { expectUnpriced } from '../../../../utils/oracles' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, } from '../../../../../typechain' +import { advanceTime } from '../../../../utils/time' import { bn } from '../../../../../common/numbers' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' @@ -227,17 +228,18 @@ const collateralSpecificStatusTests = () => { // Set RTokenAsset to unpriced // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset await mockRTokenAsset.setPrice(0, MAX_UINT192) + await expectExactPrice(collateral.address, initialPrice) - // refresh() should not revert - await collateral.refresh() + // Should decay after oracle timeout + await advanceTime(await collateral.oracleTimeout()) + await expectDecayedPrice(collateral.address) - // Should be unpriced + // Should be unpriced after price timeout + await advanceTime(await collateral.priceTimeout()) await expectUnpriced(collateral.address) - // Price should be initial price - const lotP = await collateral.price() - expect(lotP[0]).to.eq(initialPrice[0]) - expect(lotP[1]).to.eq(initialPrice[1]) + // refresh() should not revert + await collateral.refresh() }) } diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index aa7f2c9dd7..bfb1f30180 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -7,13 +7,14 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' -import { expectUnpriced } from '../../../../utils/oracles' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, } from '../../../../../typechain' +import { advanceTime } from '../../../../utils/time' import { bn } from '../../../../../common/numbers' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' @@ -229,17 +230,18 @@ const collateralSpecificStatusTests = () => { // Set RTokenAsset to unpriced // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset await mockRTokenAsset.setPrice(0, MAX_UINT192) + await expectExactPrice(collateral.address, initialPrice) - // refresh() should not revert - await collateral.refresh() + // Should decay after oracle timeout + await advanceTime(await collateral.oracleTimeout()) + await expectDecayedPrice(collateral.address) - // Should be unpriced + // Should be unpriced after price timeout + await advanceTime(await collateral.priceTimeout()) await expectUnpriced(collateral.address) - // Price should be initial price - const lotP = await collateral.price() - expect(lotP[0]).to.eq(initialPrice[0]) - expect(lotP[1]).to.eq(initialPrice[1]) + // refresh() should not revert + await collateral.refresh() }) } From b7c958104d109678ad6ba960d5ebff7b704ccb2b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 11 Sep 2023 09:24:09 -0400 Subject: [PATCH 083/450] advance oracles to prevent timeouts (#933) --- .../ankr/AnkrEthCollateralTestSuite.test.ts | 4 ++ .../cbeth/CBETHCollateral.test.ts | 5 ++ .../individual-collateral/collateralTests.ts | 60 +++++++++---------- .../compoundv3/CometTestSuite.test.ts | 4 ++ .../dsr/SDaiCollateralTestSuite.test.ts | 5 ++ .../flux-finance/FTokenFiatCollateral.test.ts | 4 ++ .../frax-eth/SFrxEthTestSuite.test.ts | 5 ++ .../lido/LidoStakedEthTestSuite.test.ts | 6 ++ .../MorphoAAVEFiatCollateral.test.ts | 4 ++ .../MorphoAAVENonFiatCollateral.test.ts | 5 ++ ...orphoAAVESelfReferentialCollateral.test.ts | 4 ++ .../RethCollateralTestSuite.test.ts | 6 ++ .../stargate/StargateUSDCTestSuite.test.ts | 4 ++ test/utils/oracles.ts | 34 ++++++++++- 14 files changed, 119 insertions(+), 31 deletions(-) diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index 79f063c586..0635aba4c3 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -10,6 +10,7 @@ import { TestICollateral, IAnkrETH, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -100,6 +101,9 @@ export const deployCollateral = async ( ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index fa6340bfb4..47ca9b8da1 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -12,6 +12,7 @@ import { ORACLE_TIMEOUT, PRICE_TIMEOUT, } from './constants' +import { pushOracleForward } from '../../../utils/oracles' import { BigNumber, BigNumberish, ContractFactory } from 'ethers' import { bn, fp } from '#/common/numbers' import { TestICollateral } from '@typechain/TestICollateral' @@ -60,6 +61,10 @@ export const deployCollateral = async ( ) await collateral.deployed() + // Push forward chainlink feeds + await pushOracleForward(opts.chainlinkFeed!) + await pushOracleForward(opts.targetPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED) + await expect(collateral.refresh()) return collateral diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 1b7f94a9fb..7be0cd4520 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -264,6 +264,36 @@ export default function fn( expect(newHigh).to.be.gt(initHigh) }) + it('decays for 0-valued oracle', async () => { + const initialPrice = await collateral.price() + + // Set price of underlying to 0 + const updateAnswerTx = await chainlinkFeed.updateAnswer(0) + await updateAnswerTx.wait() + + // Price remains same at first, though IFFY + await collateral.refresh() + await expectExactPrice(collateral.address, initialPrice) + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + + // After oracle timeout decay begins + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(1 + oracleTimeout / 12) + await collateral.refresh() + await expectDecayedPrice(collateral.address) + + // After price timeout it becomes unpriced + const priceTimeout = await collateral.priceTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceBlocks(1 + priceTimeout / 12) + await expectUnpriced(collateral.address) + + // When refreshed, sets status to DISABLED + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + }) + it('does not revert in case of invalid timestamp', async () => { await chainlinkFeed.setInvalidTimestamp() @@ -343,36 +373,6 @@ export default function fn( await advanceTime(priceTimeout / 2) await expectUnpriced(collateral.address) }) - - it('decays for 0-valued oracle', async () => { - const initialPrice = await collateral.price() - - // Set price of underlying to 0 - const updateAnswerTx = await chainlinkFeed.updateAnswer(0) - await updateAnswerTx.wait() - - // Price remains same at first, though IFFY - await collateral.refresh() - await expectExactPrice(collateral.address, initialPrice) - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - - // After oracle timeout decay begins - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(1 + oracleTimeout / 12) - await collateral.refresh() - await expectDecayedPrice(collateral.address) - - // After price timeout it becomes unpriced - const priceTimeout = await collateral.priceTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) - await advanceBlocks(1 + priceTimeout / 12) - await expectUnpriced(collateral.address) - - // When refreshed, sets status to DISABLED - await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - }) }) describe('status', () => { diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 3ea997da0d..22365aaab9 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -22,6 +22,7 @@ import { CometMock__factory, TestICollateral, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { MAX_UINT48 } from '../../../../common/constants' import { expect } from 'chai' @@ -118,6 +119,9 @@ export const deployCollateral = async ( ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 7ee5c7dc01..43b5f8593a 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -12,6 +12,7 @@ import { PotMock, TestICollateral, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -69,6 +70,10 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise { ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index d47e23919f..701789f733 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -12,6 +12,7 @@ import { TestICollateral, IsfrxEth, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { CollateralStatus } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -84,6 +85,10 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise { const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) await v3Aggregator.setInvalidAnsweredRound() } + +// === Pushing oracles (real or mock) forward === + +export const overrideOracle = async (oracleAddress: string): Promise => { + const oracle = await ethers.getContractAt( + 'contracts/plugins/mocks/EACAggregatorProxyMock.sol:EACAggregatorProxy', + oracleAddress + ) + const aggregator = await oracle.aggregator() + const accessController = await oracle.accessController() + const initPrice = await oracle.latestAnswer() + const mockOracleFactory = await ethers.getContractFactory('EACAggregatorProxyMock') + const mockOracle = await mockOracleFactory.deploy(aggregator, accessController, initPrice) + const bytecode = await network.provider.send('eth_getCode', [mockOracle.address]) + await setCode(oracleAddress, bytecode) + return ethers.getContractAt('EACAggregatorProxyMock', oracleAddress) +} + +export const pushOracleForward = async (chainlinkAddr: string) => { + const chainlinkFeed = await ethers.getContractAt('MockV3Aggregator', await chainlinkAddr) + const initPrice = await chainlinkFeed.latestAnswer() + try { + // Try to update as if it's a mock already + await chainlinkFeed.updateAnswer(initPrice) + } catch { + // Not a mock; need to override the oracle first + const oracle = await overrideOracle(chainlinkFeed.address) + await oracle.updateAnswer(initPrice) + } +} From 632fe66e82c4c5ec60958b7dc8630ac340898905 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 2 Oct 2023 19:08:17 -0400 Subject: [PATCH 084/450] merge 3.0.0 in --- .env.example | 10 +- .github/workflows/docgen-netlify.yml | 52 + .github/workflows/tests.yml | 39 +- .openzeppelin/base_8453.json | 3149 +++++++++++++++++ .openzeppelin/mainnet.json | 3143 ++++++++++++++++ CHANGELOG.md | 118 + README.md | 67 +- ... - Reserve Audit Report - 3.0.0 Release.md | 1553 ++++++++ book.toml | 15 + common/configuration.ts | 67 +- contracts/facade/FacadeAct.sol | 2 + contracts/facade/FacadeWrite.sol | 2 +- contracts/interfaces/IDeployer.sol | 5 + contracts/p0/Deployer.sol | 9 +- contracts/p0/mixins/TradingLib.sol | 3 + contracts/p1/Broker.sol | 1 + contracts/p1/Deployer.sol | 9 +- .../p1/mixins/RecollateralizationLib.sol | 7 +- contracts/plugins/assets/L2LSDCollateral.sol | 108 + .../assets/aave-v3/AaveV3FiatCollateral.sol | 40 + .../aave-v3/mock/MockStaticATokenV3.sol | 27 + .../plugins/assets/aave-v3/vendor/ERC20.sol | 237 ++ .../vendor/RayMathExplicitRounding.sol | 46 + .../aave-v3/vendor/StaticATokenErrors.sol | 14 + .../aave-v3/vendor/StaticATokenV3LM.sol | 753 ++++ .../aave-v3/vendor/interfaces/IAToken.sol | 22 + .../aave-v3/vendor/interfaces/IERC4626.sol | 245 ++ .../IInitializableStaticATokenLM.sol | 41 + .../vendor/interfaces/IStaticATokenV3LM.sol | 220 ++ .../plugins/assets/cbeth/CBETHCollateral.sol | 13 +- .../assets/cbeth/CBETHCollateralL2.sol | 76 + contracts/plugins/assets/cbeth/README.md | 4 +- .../plugins/assets/cbeth/vendor/ICBEth.sol | 14 + .../compoundv2/CTokenFiatCollateral.sol | 24 +- .../curve/cvx/vendor/ConvexStakingWrapper.sol | 7 +- .../morpho-aave/MorphoFiatCollateral.sol | 2 +- .../morpho-aave/MorphoNonFiatCollateral.sol | 8 +- .../MorphoSelfReferentialCollateral.sol | 2 +- contracts/plugins/trading/DutchTrade.sol | 44 +- docs/collateral.md | 200 +- docs/deployed-addresses/1-ETH+.md | 24 + docs/deployed-addresses/1-assets-2.1.0.md | 44 + docs/deployed-addresses/1-components-2.1.0.md | 31 + docs/deployed-addresses/1-eUSD.md | 24 + docs/deployed-addresses/1-hyUSD.md | 24 + docs/deployment-variables.md | 4 +- docs/mev.md | 2 + docs/plugin-addresses.md | 84 +- docs/solidity-style.md | 2 +- docs/system-design.md | 172 +- hardhat.config.ts | 25 +- package.json | 2 + .../84531-tmp-assets-collateral.json | 6 +- scripts/addresses/84531-tmp-deployments.json | 44 +- .../8453-tmp-assets-collateral.json | 22 + .../base-3.0.0/8453-tmp-deployments.json | 35 + .../1-tmp-assets-collateral.json | 100 + .../mainnet-3.0.0/1-tmp-deployments.json | 44 +- scripts/collateral-params.ts | 6 +- scripts/deploy.ts | 79 +- .../phase1-common/1_deploy_libraries.ts | 16 +- .../phase2-assets/1_deploy_assets.ts | 28 +- .../phase2-assets/2_deploy_collateral.ts | 1322 +++---- .../collaterals/deploy_aave_v3_usdbc.ts | 110 + .../collaterals/deploy_aave_v3_usdc.ts | 111 + .../collaterals/deploy_cbeth_collateral.ts | 92 +- .../deploy_ctokenv3_usdbc_collateral.ts | 104 + .../deploy_ctokenv3_usdc_collateral.ts | 21 +- .../collaterals/deploy_curve_stable_plugin.ts | 5 +- .../collaterals/deploy_dsr_sdai.ts | 4 +- .../deploy_flux_finance_collateral.ts | 67 +- .../deploy_lido_wsteth_collateral.ts | 2 +- .../deploy_morpho_aavev2_plugin.ts | 26 +- .../deploy_rocket_pool_reth_collateral.ts | 6 +- scripts/deployment/utils.ts | 2 +- scripts/verification/6_verify_collateral.ts | 45 +- .../verify_aave_v3_usdbc.ts | 71 + .../collateral-plugins/verify_aave_v3_usdc.ts | 69 + .../collateral-plugins/verify_cbeth.ts | 74 +- .../verify_convex_stable.ts | 8 +- .../verify_convex_stable_metapool.ts | 2 +- .../verify_convex_stable_rtoken_metapool.ts | 4 +- .../collateral-plugins/verify_curve_stable.ts | 2 +- .../verify_curve_stable_rtoken_metapool.ts | 2 +- .../collateral-plugins/verify_cusdbcv3.ts | 81 + .../collateral-plugins/verify_cusdcv3.ts | 13 +- .../collateral-plugins/verify_morpho.ts | 140 + .../collateral-plugins/verify_reth.ts | 5 +- .../collateral-plugins/verify_wsteth.ts | 2 +- scripts/verify_etherscan.ts | 49 +- tasks/deployment/get-addresses.ts | 269 ++ tasks/index.ts | 1 + .../upgrade-checker-utils/constants.ts | 6 +- tasks/testing/upgrade-checker-utils/logs.ts | 4 +- tasks/testing/upgrade-checker-utils/trades.ts | 5 +- .../upgrade-checker-utils/upgrades/3_0_0.ts | 347 +- tasks/testing/upgrade-checker.ts | 6 +- test/Broker.test.ts | 10 +- test/Deployer.test.ts | 4 +- test/FacadeWrite.test.ts | 6 + test/Governance.test.ts | 21 +- test/Main.test.ts | 29 + test/RTokenExtremes.test.ts | 2 + test/Revenues.test.ts | 2 + test/ZTradingExtremes.test.ts | 2 + test/__snapshots__/Broker.test.ts.snap | 8 +- test/__snapshots__/FacadeWrite.test.ts.snap | 4 +- test/__snapshots__/Main.test.ts.snap | 8 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 12 +- test/__snapshots__/Revenues.test.ts.snap | 8 +- test/__snapshots__/ZZStRSR.test.ts.snap | 6 +- test/plugins/Asset.test.ts | 6 + test/plugins/Collateral.test.ts | 64 + test/plugins/__snapshots__/Asset.test.ts.snap | 4 +- .../__snapshots__/Collateral.test.ts.snap | 22 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 219 ++ .../AaveV3FiatCollateral.test.ts.snap | 25 + .../aave-v3/constants.ts | 2 + .../ATokenFiatCollateral.test.ts.snap | 24 +- .../AnkrEthCollateralTestSuite.test.ts.snap | 24 +- .../cbeth/CBETHCollateral.test.ts | 6 +- .../cbeth/CBETHCollateralL2.test.ts | 287 ++ .../CBETHCollateral.test.ts.snap | 24 +- .../individual-collateral/cbeth/constants.ts | 9 + .../individual-collateral/cbeth/helpers.ts | 14 +- .../individual-collateral/collateralTests.ts | 41 +- .../CTokenFiatCollateral.test.ts.snap | 24 +- .../__snapshots__/CometTestSuite.test.ts.snap | 24 +- .../CrvStableMetapoolSuite.test.ts.snap | 24 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +- .../CrvStableTestSuite.test.ts.snap | 24 +- .../curve/cvx/CvxStableTestSuite.test.ts | 53 +- .../CvxStableMetapoolSuite.test.ts.snap | 24 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +- .../CvxStableTestSuite.test.ts.snap | 24 +- .../curve/cvx/helpers.ts | 9 +- .../curve/pluginTestTypes.ts | 3 +- .../SDaiCollateralTestSuite.test.ts.snap | 24 +- .../flux-finance/FTokenFiatCollateral.test.ts | 20 +- .../FTokenFiatCollateral.test.ts.snap | 96 +- .../SFrxEthTestSuite.test.ts.snap | 12 +- test/plugins/individual-collateral/helpers.ts | 3 +- .../LidoStakedEthTestSuite.test.ts.snap | 24 +- .../MorphoAAVENonFiatCollateral.test.ts | 5 +- .../MorphoAAVEFiatCollateral.test.ts.snap | 72 +- .../MorphoAAVENonFiatCollateral.test.ts.snap | 48 +- ...AAVESelfReferentialCollateral.test.ts.snap | 16 +- .../individual-collateral/pluginTestTypes.ts | 6 + .../RethCollateralTestSuite.test.ts | 50 - .../RethCollateralTestSuite.test.ts.snap | 24 +- .../StargateETHTestSuite.test.ts.snap | 24 +- .../__snapshots__/MaxBasketSize.test.ts.snap | 16 +- test/utils/oracles.ts | 2 +- test/utils/trades.ts | 14 +- tools/docgen/custom.css | 116 + tools/docgen/foundry.toml | 7 + utils/env.ts | 4 +- utils/fork.ts | 12 + yarn.lock | 18 + 160 files changed, 14150 insertions(+), 1912 deletions(-) create mode 100644 .github/workflows/docgen-netlify.yml create mode 100644 .openzeppelin/base_8453.json create mode 100644 audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md create mode 100644 book.toml create mode 100644 contracts/plugins/assets/L2LSDCollateral.sol create mode 100644 contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol create mode 100644 contracts/plugins/assets/aave-v3/mock/MockStaticATokenV3.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/ERC20.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/RayMathExplicitRounding.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/StaticATokenErrors.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/interfaces/IAToken.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/interfaces/IInitializableStaticATokenLM.sol create mode 100644 contracts/plugins/assets/aave-v3/vendor/interfaces/IStaticATokenV3LM.sol create mode 100644 contracts/plugins/assets/cbeth/CBETHCollateralL2.sol create mode 100644 contracts/plugins/assets/cbeth/vendor/ICBEth.sol create mode 100644 docs/deployed-addresses/1-ETH+.md create mode 100644 docs/deployed-addresses/1-assets-2.1.0.md create mode 100644 docs/deployed-addresses/1-components-2.1.0.md create mode 100644 docs/deployed-addresses/1-eUSD.md create mode 100644 docs/deployed-addresses/1-hyUSD.md create mode 100644 scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json create mode 100644 scripts/addresses/base-3.0.0/8453-tmp-deployments.json create mode 100644 scripts/addresses/mainnet-3.0.0/1-tmp-assets-collateral.json create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts create mode 100644 scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts create mode 100644 scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts create mode 100644 scripts/verification/collateral-plugins/verify_cusdbcv3.ts create mode 100644 scripts/verification/collateral-plugins/verify_morpho.ts create mode 100644 tasks/deployment/get-addresses.ts create mode 100644 test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts create mode 100644 test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap create mode 100644 test/plugins/individual-collateral/aave-v3/constants.ts create mode 100644 test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts create mode 100644 tools/docgen/custom.css create mode 100644 tools/docgen/foundry.toml create mode 100644 utils/fork.ts diff --git a/.env.example b/.env.example index 3ee518afba..98f4a01a35 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,9 @@ BASE_GOERLI_RPC_URL="https://goerli.base.org" # Mainnet URL, used for Mainnet forking (Alchemy) MAINNET_RPC_URL="https://eth-mainnet.alchemyapi.io/v2/your_mainnet_api_key" +# Base Mainnet URL, used for Base Mainnet forking (Alchemy) +BASE_RPC_URL="https://base-mainnet.g.alchemy.com/v2/your_base_mainnet_api_key" + # Mnemonic, first address will be used for deployments MNEMONIC='copy here your mnemonic words' @@ -29,8 +32,11 @@ ETHERSCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1 # Run tests and scripts using Mainnet forking - required for integration tests # FORK=1 -# Block to use as default for mainnet forking -MAINNET_BLOCK=14916729 +# Network to fork when forking for hardhat +# FORK_NETWORK='mainnet' + +# Block to use as default for forking +# FORK_BLOCK=4446300 # Select Protocol implementation to run tests for, 0 (Prototype) or 1 (Production) PROTO_IMPL=0 diff --git a/.github/workflows/docgen-netlify.yml b/.github/workflows/docgen-netlify.yml new file mode 100644 index 0000000000..7326b95c60 --- /dev/null +++ b/.github/workflows/docgen-netlify.yml @@ -0,0 +1,52 @@ +name: Generate and Deploy Reserve Docs to Netlify + +on: + push: + branches: + - master + +env: + NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_ARTORIAS_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DOCS_SITE_ID }} + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Setup Node.js + uses: actions/setup-node@v3 + with: + node-version: 16 + cache: yarn + + - name: Install Foundry + uses: onbjerg/foundry-toolchain@v1 + with: + version: nightly + + - name: Install node dependencies + run: yarn install + shell: bash + + - name: Setup Forge config + run: forge config --config-path tools/docgen/foundry.toml + shell: bash + + - name: Generate docs + run: forge doc --build --out tools/docgen + shell: bash + + - name: Deploy to Netlify + uses: jsmrcaga/action-netlify-deploy@v2.0.0 + with: + NETLIFY_AUTH_TOKEN: ${{ env.NETLIFY_AUTH_TOKEN }} + NETLIFY_SITE_ID: ${{ env.NETLIFY_SITE_ID }} + NETLIFY_DEPLOY_MESSAGE: "Prod deploy v${{ github.ref }}" + NETLIFY_DEPLOY_TO_PROD: true + build_directory: tools/docgen/book + install_command: "echo Skipping installing the dependencies" + build_command: "echo Skipping building the web files" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a0215996f0..ca7fc0ee67 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -21,7 +21,9 @@ jobs: - run: yarn install --immutable - run: yarn devchain & env: - MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + MAINNET_RPC_URL: https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161 + FORK_BLOCK: 18114118 + FORK_NETWORK: mainnet - run: yarn deploy:run --network localhost env: SKIP_PROMPT: 1 @@ -38,8 +40,8 @@ jobs: - run: yarn install --immutable - run: yarn lint - plugin-tests: - name: 'Plugin Tests' + plugin-tests-mainnet: + name: 'Plugin Tests (Mainnet)' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -62,6 +64,35 @@ jobs: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet + + plugin-tests-base: + name: 'Plugin Tests (Base)' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - name: 'Cache hardhat network fork' + uses: actions/cache@v3 + with: + path: cache/hardhat-network-fork + key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} + restore-keys: | + hardhat-network-fork-${{ runner.os }}- + hardhat-network-fork- + - run: npx hardhat test ./test/plugins/individual-collateral/cbeth/*.test.ts + env: + NODE_OPTIONS: '--max-old-space-size=8192' + TS_NODE_SKIP_IGNORE: true + BASE_RPC_URL: https://base-mainnet.infura.io/v3/${{ secrets.INFURA_BASE_KEY }} + FORK_NETWORK: base + FORK_BLOCK: 4446300 + FORK: 1 + PROTO_IMPL: 1 p0-tests: name: 'P0 tests' @@ -129,6 +160,7 @@ jobs: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet integration-tests: name: 'Integration Tests' @@ -155,3 +187,4 @@ jobs: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet diff --git a/.openzeppelin/base_8453.json b/.openzeppelin/base_8453.json new file mode 100644 index 0000000000..6c4c4a3671 --- /dev/null +++ b/.openzeppelin/base_8453.json @@ -0,0 +1,3149 @@ +{ + "manifestVersion": "3.2", + "proxies": [], + "impls": { + "9ff12d14530d638900db7dd2f55b43196fd6d1fe09e9c635a8da175a62a5cda5": { + "address": "0x1D6d0B74E7A701aE5C2E11967b242E9861275143", + "txHash": "0x4843fca0d0fb070bfe72919ca1f530e5ac723964e47aea2feb2fd8bf59797401", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41" + }, + { + "label": "_roles", + "offset": 0, + "slot": "101", + "type": "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:61" + }, + { + "label": "__gap", + "offset": 0, + "slot": "102", + "type": "t_array(t_uint256)49_storage", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:259" + }, + { + "label": "longFreezes", + "offset": 0, + "slot": "151", + "type": "t_mapping(t_address,t_uint256)", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:36" + }, + { + "label": "unfreezeAt", + "offset": 0, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:38" + }, + { + "label": "shortFreeze", + "offset": 6, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:39" + }, + { + "label": "longFreeze", + "offset": 12, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:40" + }, + { + "label": "tradingPaused", + "offset": 18, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:45", + "renamedFrom": "paused" + }, + { + "label": "issuancePaused", + "offset": 19, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "153", + "type": "t_array(t_uint256)48_storage", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:225" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)26835", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "202", + "type": "t_contract(IStRSR)27176", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:42" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "203", + "type": "t_contract(IAssetRegistry)24822", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:50" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "204", + "type": "t_contract(IBasketHandler)25131", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:58" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "205", + "type": "t_contract(IBackingManager)24884", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:66" + }, + { + "label": "distributor", + "offset": 0, + "slot": "206", + "type": "t_contract(IDistributor)25643", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:74" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "207", + "type": "t_contract(IRevenueTrader)26964", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:82" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_contract(IRevenueTrader)26964", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:90" + }, + { + "label": "furnace", + "offset": 0, + "slot": "209", + "type": "t_contract(IFurnace)26171", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:98" + }, + { + "label": "broker", + "offset": 0, + "slot": "210", + "type": "t_contract(IBroker)25280", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:106" + }, + { + "label": "__gap", + "offset": 0, + "slot": "211", + "type": "t_array(t_uint256)40_storage", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:119" + }, + { + "label": "__gap", + "offset": 0, + "slot": "251", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "301", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "rsr", + "offset": 0, + "slot": "351", + "type": "t_contract(IERC20)15339", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:19" + }, + { + "label": "__gap", + "offset": 0, + "slot": "352", + "type": "t_array(t_uint256)49_storage", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:71" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)40_storage": { + "label": "uint256[40]", + "numberOfBytes": "1280" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24822": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)25131": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)25280": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)25643": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26171": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26835": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)26964": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)27176": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)": { + "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)", + "numberOfBytes": "32" + }, + "t_struct(RoleData)3741_storage": { + "label": "struct AccessControlUpgradeable.RoleData", + "members": [ + { + "label": "members", + "type": "t_mapping(t_address,t_bool)", + "offset": 0, + "slot": "0" + }, + { + "label": "adminRole", + "type": "t_bytes32", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "fe0f2dec194b882efa0d8220d324cba3ec32136c7c6322c221bd90103690d736": { + "address": "0x9c387fc258061bd3E02c851F36aE227DB03a396C", + "txHash": "0x931576bc01d5984558263d8d5facbbd4748e81f53f5cdb4cc732215000dcbbb6", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "201", + "type": "t_contract(IBasketHandler)25131", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:19" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)24884", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:20" + }, + { + "label": "_erc20s", + "offset": 0, + "slot": "203", + "type": "t_struct(AddressSet)21587_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:23" + }, + { + "label": "assets", + "offset": 0, + "slot": "205", + "type": "t_mapping(t_contract(IERC20)15339,t_contract(IAsset)24579)", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:26" + }, + { + "label": "lastRefresh", + "offset": 0, + "slot": "206", + "type": "t_uint48", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:30" + }, + { + "label": "__gap", + "offset": 0, + "slot": "207", + "type": "t_array(t_uint256)46_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:233" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAsset)24579": { + "label": "contract IAsset", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)25131": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)15339,t_contract(IAsset)24579)": { + "label": "mapping(contract IERC20 => contract IAsset)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)21587_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)21286_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Set)21286_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "48661fdf6237c49a10304321f297c21ad2799eb111db81c7380ea05da78601f2": { + "address": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE", + "txHash": "0x05c4ce9b2e15eac4b03c76588ae104e9d43308a385d3d03eaeae82942c4c02a2", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)25280", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:27" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)15339,t_contract(ITrade)27311)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:155" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)24822", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)25131", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)25643", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)26835", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:33" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)15339", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)27176", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:35" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)26964", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)26964", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:42" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)26171", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:45" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)25153,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "312", + "type": "t_array(t_uint256)39_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:310" + } + ], + "types": { + "t_array(t_uint256)39_storage": { + "label": "uint256[39]", + "numberOfBytes": "1248" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)24822": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)25131": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)25280": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)25643": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26171": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26835": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)26964": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)27176": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)27311": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)25153": { + "label": "enum TradeKind", + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)15339,t_contract(ITrade)27311)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)25153,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "4e2cfd07678877b4bd048e05bb2382697948cb5ed20e4611cda549bf9f1c5541": { + "address": "0x25E92785C1AC01B397224E0534f3D626868A1Cbf", + "txHash": "0x6d83e8e952d340e41f0e83e6db70f0f92e89ec87c1a9a1e3a3fd75215ee1ad97", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "201", + "type": "t_contract(IAssetRegistry)24822", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:34" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)24884", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:35" + }, + { + "label": "rsr", + "offset": 0, + "slot": "203", + "type": "t_contract(IERC20)15339", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "204", + "type": "t_contract(IRToken)26835", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:37" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "205", + "type": "t_contract(IStRSR)27176", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:38" + }, + { + "label": "config", + "offset": 0, + "slot": "206", + "type": "t_struct(BasketConfig)54599_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:42" + }, + { + "label": "basket", + "offset": 0, + "slot": "210", + "type": "t_struct(Basket)54609_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:46" + }, + { + "label": "nonce", + "offset": 0, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:48" + }, + { + "label": "timestamp", + "offset": 6, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:49" + }, + { + "label": "disabled", + "offset": 12, + "slot": "212", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:53" + }, + { + "label": "_targetNames", + "offset": 0, + "slot": "213", + "type": "t_struct(Bytes32Set)21480_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:59" + }, + { + "label": "_newBasket", + "offset": 0, + "slot": "215", + "type": "t_struct(Basket)54609_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:60" + }, + { + "label": "warmupPeriod", + "offset": 0, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:66" + }, + { + "label": "lastStatusTimestamp", + "offset": 6, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:70" + }, + { + "label": "lastStatus", + "offset": 12, + "slot": "217", + "type": "t_enum(CollateralStatus)24611", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:71" + }, + { + "label": "basketHistory", + "offset": 0, + "slot": "218", + "type": "t_mapping(t_uint48,t_struct(Basket)54609_storage)", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:77" + }, + { + "label": "_targetAmts", + "offset": 0, + "slot": "219", + "type": "t_struct(Bytes32ToUintMap)21092_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:80" + }, + { + "label": "__gap", + "offset": 0, + "slot": "222", + "type": "t_array(t_uint256)37_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:673" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_contract(IERC20)15339)dyn_storage": { + "label": "contract IERC20[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)37_storage": { + "label": "uint256[37]", + "numberOfBytes": "1184" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24822": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26835": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)27176": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_enum(CollateralStatus)24611": { + "label": "enum CollateralStatus", + "members": ["SOUND", "IFFY", "DISABLED"], + "numberOfBytes": "1" + }, + "t_mapping(t_bytes32,t_bytes32)": { + "label": "mapping(bytes32 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(BackupConfig)54579_storage)": { + "label": "mapping(bytes32 => struct BackupConfig)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)15339,t_bytes32)": { + "label": "mapping(contract IERC20 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)15339,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint48,t_struct(Basket)54609_storage)": { + "label": "mapping(uint48 => struct Basket)", + "numberOfBytes": "32" + }, + "t_struct(BackupConfig)54579_storage": { + "label": "struct BackupConfig", + "members": [ + { + "label": "max", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)15339)dyn_storage", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Basket)54609_storage": { + "label": "struct Basket", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)15339)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "refAmts", + "type": "t_mapping(t_contract(IERC20)15339,t_uint192)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(BasketConfig)54599_storage": { + "label": "struct BasketConfig", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)15339)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "targetAmts", + "type": "t_mapping(t_contract(IERC20)15339,t_uint192)", + "offset": 0, + "slot": "1" + }, + { + "label": "targetNames", + "type": "t_mapping(t_contract(IERC20)15339,t_bytes32)", + "offset": 0, + "slot": "2" + }, + { + "label": "backups", + "type": "t_mapping(t_bytes32,t_struct(BackupConfig)54579_storage)", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(Bytes32Set)21480_storage": { + "label": "struct EnumerableSet.Bytes32Set", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)21286_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32ToBytes32Map)20169_storage": { + "label": "struct EnumerableMap.Bytes32ToBytes32Map", + "members": [ + { + "label": "_keys", + "type": "t_struct(Bytes32Set)21480_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_values", + "type": "t_mapping(t_bytes32,t_bytes32)", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Bytes32ToUintMap)21092_storage": { + "label": "struct EnumerableMap.Bytes32ToUintMap", + "members": [ + { + "label": "_inner", + "type": "t_struct(Bytes32ToBytes32Map)20169_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Set)21286_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "eb36ed3a59a82baec4bd56fa27434f627d80b31df3a101e16165d869c850512c": { + "address": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba", + "txHash": "0x5fe697334dd0eef6a26b080b6245022a5cf7837ef03c1b7af54c9f060d2aab12", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "201", + "type": "t_contract(IBackingManager)24884", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:31" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "202", + "type": "t_contract(IRevenueTrader)26964", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:32" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "203", + "type": "t_contract(IRevenueTrader)26964", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:33" + }, + { + "label": "batchTradeImplementation", + "offset": 0, + "slot": "204", + "type": "t_contract(ITrade)27311", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:37", + "renamedFrom": "tradeImplementation" + }, + { + "label": "gnosis", + "offset": 0, + "slot": "205", + "type": "t_contract(IGnosis)26271", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:40" + }, + { + "label": "batchAuctionLength", + "offset": 20, + "slot": "205", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:44", + "renamedFrom": "auctionLength" + }, + { + "label": "batchTradeDisabled", + "offset": 26, + "slot": "205", + "type": "t_bool", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:50", + "renamedFrom": "disabled" + }, + { + "label": "trades", + "offset": 0, + "slot": "206", + "type": "t_mapping(t_address,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:53" + }, + { + "label": "dutchTradeImplementation", + "offset": 0, + "slot": "207", + "type": "t_contract(ITrade)27311", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:58" + }, + { + "label": "dutchAuctionLength", + "offset": 20, + "slot": "207", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:61" + }, + { + "label": "dutchTradeDisabled", + "offset": 0, + "slot": "208", + "type": "t_mapping(t_contract(IERC20Metadata)15364,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:64" + }, + { + "label": "__gap", + "offset": 0, + "slot": "209", + "type": "t_array(t_uint256)42_storage", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:278" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20Metadata)15364": { + "label": "contract IERC20Metadata", + "numberOfBytes": "20" + }, + "t_contract(IGnosis)26271": { + "label": "contract IGnosis", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)26964": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(ITrade)27311": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20Metadata)15364,t_bool)": { + "label": "mapping(contract IERC20Metadata => bool)", + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "ba4e753809f0c7a43fa0a310c6445dbc18238bc5e8e399210a08bce936c83763": { + "address": "0xd31de64957b79435bfc702044590ac417e02c19B", + "txHash": "0x3fd4499d73d2c4bcd3b07bf2cd73b8f4c9ccfd2c1b30354308f852e2d9fa8bcb", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "destinations", + "offset": 0, + "slot": "201", + "type": "t_struct(AddressSet)21587_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:17" + }, + { + "label": "distribution", + "offset": 0, + "slot": "203", + "type": "t_mapping(t_address,t_struct(RevenueShare)25581_storage)", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:18" + }, + { + "label": "rsr", + "offset": 0, + "slot": "204", + "type": "t_contract(IERC20)15339", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "205", + "type": "t_contract(IERC20)15339", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:37" + }, + { + "label": "furnace", + "offset": 0, + "slot": "206", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:38" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "207", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:39" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:40" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "209", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:41" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)44_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:206" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)44_storage": { + "label": "uint256[44]", + "numberOfBytes": "1408" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_struct(RevenueShare)25581_storage)": { + "label": "mapping(address => struct RevenueShare)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)21587_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)21286_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(RevenueShare)25581_storage": { + "label": "struct RevenueShare", + "members": [ + { + "label": "rTokenDist", + "type": "t_uint16", + "offset": 0, + "slot": "0" + }, + { + "label": "rsrDist", + "type": "t_uint16", + "offset": 2, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Set)21286_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "546202a50d79a0dd7cfcb3f9e0e3a2794622502a556be156f418d865aa4d7d04": { + "address": "0x45D7dFE976cdF80962d863A66918346a457b87Bd", + "txHash": "0x0be38d9b586b534dc0afe9089b00aedcf6045c46930becd5dc34283bb4f38d02", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)26835", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:21" + }, + { + "label": "ratio", + "offset": 0, + "slot": "202", + "type": "t_uint192", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:24" + }, + { + "label": "lastPayout", + "offset": 24, + "slot": "202", + "type": "t_uint48", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:27" + }, + { + "label": "lastPayoutBal", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:28" + }, + { + "label": "__gap", + "offset": 0, + "slot": "204", + "type": "t_array(t_uint256)47_storage", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:112" + } + ], + "types": { + "t_array(t_uint256)47_storage": { + "label": "uint256[47]", + "numberOfBytes": "1504" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26835": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "632dbf8b9744ed3b4bedeca088a559a83fb7354de5b593aefa39ab7993ce04bf": { + "address": "0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09", + "txHash": "0xa366202f823e4a4cf49e8e3ab5c69193088302464785962f31dc22778e3a822b", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)25280", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:27" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)15339,t_contract(ITrade)27311)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:155" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)15339", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)24822", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)25643", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)24884", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)26171", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)26835", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)15339", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:190" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)24822": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)25280": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)25643": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26171": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26835": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)27311": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)15339,t_contract(ITrade)27311)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "654ae924bb358aa1208293e52f8ad1216a89fcc33581dfea5664a9666450057b": { + "address": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", + "txHash": "0x20a2299b0aa2cce8b168ef6e0583addce5dadf5f12fcef83be3ec367a44320f2", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_balances", + "offset": 0, + "slot": "201", + "type": "t_mapping(t_address,t_uint256)", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:37" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "202", + "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:39" + }, + { + "label": "_totalSupply", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:41" + }, + { + "label": "_name", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:43" + }, + { + "label": "_symbol", + "offset": 0, + "slot": "205", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" + }, + { + "label": "__gap", + "offset": 0, + "slot": "206", + "type": "t_array(t_uint256)45_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:394" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "251", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "252", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "253", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "303", + "type": "t_mapping(t_address,t_struct(Counter)6400_storage)", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:37" + }, + { + "label": "_PERMIT_TYPEHASH_DEPRECATED_SLOT", + "offset": 0, + "slot": "304", + "type": "t_bytes32", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:51", + "renamedFrom": "_PERMIT_TYPEHASH" + }, + { + "label": "__gap", + "offset": 0, + "slot": "305", + "type": "t_array(t_uint256)48_storage", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:129" + }, + { + "label": "mandate", + "offset": 0, + "slot": "353", + "type": "t_string_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:44" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "354", + "type": "t_contract(IAssetRegistry)24822", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:47" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "355", + "type": "t_contract(IBasketHandler)25131", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:48" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "356", + "type": "t_contract(IBackingManager)24884", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:49" + }, + { + "label": "furnace", + "offset": 0, + "slot": "357", + "type": "t_contract(IFurnace)26171", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:50" + }, + { + "label": "basketsNeeded", + "offset": 0, + "slot": "358", + "type": "t_uint192", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:55" + }, + { + "label": "issuanceThrottle", + "offset": 0, + "slot": "359", + "type": "t_struct(Throttle)29644_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:58" + }, + { + "label": "redemptionThrottle", + "offset": 0, + "slot": "363", + "type": "t_struct(Throttle)29644_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:59" + }, + { + "label": "__gap", + "offset": 0, + "slot": "367", + "type": "t_array(t_uint256)42_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:536" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24822": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)25131": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26171": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)6400_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Counter)6400_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Params)29636_storage": { + "label": "struct ThrottleLib.Params", + "members": [ + { + "label": "amtRate", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "pctRate", + "type": "t_uint192", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Throttle)29644_storage": { + "label": "struct ThrottleLib.Throttle", + "members": [ + { + "label": "params", + "type": "t_struct(Params)29636_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "lastTimestamp", + "type": "t_uint48", + "offset": 0, + "slot": "2" + }, + { + "label": "lastAvailable", + "type": "t_uint256", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "2ea71a5ba1eac5bb0c264e453e5886b4b378edf1164bf5292a0b3e6989933c2b": { + "address": "0x53321f03A7cce52413515DFD0527e0163ec69A46", + "txHash": "0xd1d7036ee0562557797266d49b3260261a198212725e596b185c62533f847c3e", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26615", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "201", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "202", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "203", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "name", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:48" + }, + { + "label": "symbol", + "offset": 0, + "slot": "254", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:49" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "255", + "type": "t_contract(IAssetRegistry)24822", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:54" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "256", + "type": "t_contract(IBackingManager)24884", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:55" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "257", + "type": "t_contract(IBasketHandler)25131", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:56" + }, + { + "label": "rsr", + "offset": 0, + "slot": "258", + "type": "t_contract(IERC20)15339", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:57" + }, + { + "label": "era", + "offset": 0, + "slot": "259", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:62" + }, + { + "label": "stakes", + "offset": 0, + "slot": "260", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:66" + }, + { + "label": "totalStakes", + "offset": 0, + "slot": "261", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:67" + }, + { + "label": "stakeRSR", + "offset": 0, + "slot": "262", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:68" + }, + { + "label": "stakeRate", + "offset": 0, + "slot": "263", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:69" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "264", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:74" + }, + { + "label": "draftEra", + "offset": 0, + "slot": "265", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:79" + }, + { + "label": "draftQueues", + "offset": 0, + "slot": "266", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)51598_storage)dyn_storage))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:87" + }, + { + "label": "firstRemainingDraft", + "offset": 0, + "slot": "267", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:88" + }, + { + "label": "totalDrafts", + "offset": 0, + "slot": "268", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:89" + }, + { + "label": "draftRSR", + "offset": 0, + "slot": "269", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:90" + }, + { + "label": "draftRate", + "offset": 0, + "slot": "270", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:91" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "271", + "type": "t_mapping(t_address,t_struct(Counter)6400_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:129" + }, + { + "label": "_delegationNonces", + "offset": 0, + "slot": "272", + "type": "t_mapping(t_address,t_struct(Counter)6400_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:131" + }, + { + "label": "unstakingDelay", + "offset": 0, + "slot": "273", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:141" + }, + { + "label": "rewardRatio", + "offset": 6, + "slot": "273", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:142" + }, + { + "label": "payoutLastPaid", + "offset": 0, + "slot": "274", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:153" + }, + { + "label": "rsrRewardsAtLastPayout", + "offset": 0, + "slot": "275", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:156" + }, + { + "label": "leaked", + "offset": 0, + "slot": "276", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:162" + }, + { + "label": "lastWithdrawRefresh", + "offset": 24, + "slot": "276", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:163" + }, + { + "label": "withdrawalLeak", + "offset": 0, + "slot": "277", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:164" + }, + { + "label": "__gap", + "offset": 0, + "slot": "278", + "type": "t_array(t_uint256)28_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:1001" + }, + { + "label": "_delegates", + "offset": 0, + "slot": "306", + "type": "t_mapping(t_address,t_address)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:31" + }, + { + "label": "_eras", + "offset": 0, + "slot": "307", + "type": "t_array(t_struct(Checkpoint)53832_storage)dyn_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:34" + }, + { + "label": "_checkpoints", + "offset": 0, + "slot": "308", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)53832_storage)dyn_storage))", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:38" + }, + { + "label": "_totalSupplyCheckpoints", + "offset": 0, + "slot": "309", + "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)53832_storage)dyn_storage)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "310", + "type": "t_array(t_uint256)46_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:243" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_struct(Checkpoint)53832_storage)dyn_storage": { + "label": "struct StRSRP1Votes.Checkpoint[]", + "numberOfBytes": "32" + }, + "t_array(t_struct(CumulativeDraft)51598_storage)dyn_storage": { + "label": "struct StRSRP1.CumulativeDraft[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)28_storage": { + "label": "uint256[28]", + "numberOfBytes": "896" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24822": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24884": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)25131": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15339": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26615": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_address)": { + "label": "mapping(address => address)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(Checkpoint)53832_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(CumulativeDraft)51598_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1.CumulativeDraft[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)6400_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_array(t_struct(Checkpoint)53832_storage)dyn_storage)": { + "label": "mapping(uint256 => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)53832_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1Votes.Checkpoint[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)51598_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1.CumulativeDraft[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))": { + "label": "mapping(uint256 => mapping(address => mapping(address => uint256)))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Checkpoint)53832_storage": { + "label": "struct StRSRP1Votes.Checkpoint", + "members": [ + { + "label": "fromBlock", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "val", + "type": "t_uint224", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Counter)6400_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(CumulativeDraft)51598_storage": { + "label": "struct StRSRP1.CumulativeDraft", + "members": [ + { + "label": "drafts", + "type": "t_uint176", + "offset": 0, + "slot": "0" + }, + { + "label": "availableAt", + "type": "t_uint64", + "offset": 22, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint176": { + "label": "uint176", + "numberOfBytes": "22" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint224": { + "label": "uint224", + "numberOfBytes": "28" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + } + } +} diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index ebff644d82..cb33be3859 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -2882,6 +2882,3149 @@ } } } + }, + "9ff12d14530d638900db7dd2f55b43196fd6d1fe09e9c635a8da175a62a5cda5": { + "address": "0xF5366f67FF66A3CefcB18809a762D5b5931FebF8", + "txHash": "0x25b5d397ea11b22100bc2b7bf21813104fe8b84c77118aa1d1c6fb39ba1558ef", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41" + }, + { + "label": "_roles", + "offset": 0, + "slot": "101", + "type": "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:61" + }, + { + "label": "__gap", + "offset": 0, + "slot": "102", + "type": "t_array(t_uint256)49_storage", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:259" + }, + { + "label": "longFreezes", + "offset": 0, + "slot": "151", + "type": "t_mapping(t_address,t_uint256)", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:36" + }, + { + "label": "unfreezeAt", + "offset": 0, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:38" + }, + { + "label": "shortFreeze", + "offset": 6, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:39" + }, + { + "label": "longFreeze", + "offset": 12, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:40" + }, + { + "label": "tradingPaused", + "offset": 18, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:45", + "renamedFrom": "paused" + }, + { + "label": "issuancePaused", + "offset": 19, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "153", + "type": "t_array(t_uint256)48_storage", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:225" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)26675", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "202", + "type": "t_contract(IStRSR)27016", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:42" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "203", + "type": "t_contract(IAssetRegistry)24671", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:50" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "204", + "type": "t_contract(IBasketHandler)24980", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:58" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "205", + "type": "t_contract(IBackingManager)24733", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:66" + }, + { + "label": "distributor", + "offset": 0, + "slot": "206", + "type": "t_contract(IDistributor)25483", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:74" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "207", + "type": "t_contract(IRevenueTrader)26804", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:82" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_contract(IRevenueTrader)26804", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:90" + }, + { + "label": "furnace", + "offset": 0, + "slot": "209", + "type": "t_contract(IFurnace)26011", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:98" + }, + { + "label": "broker", + "offset": 0, + "slot": "210", + "type": "t_contract(IBroker)25129", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:106" + }, + { + "label": "__gap", + "offset": 0, + "slot": "211", + "type": "t_array(t_uint256)40_storage", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:119" + }, + { + "label": "__gap", + "offset": 0, + "slot": "251", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "301", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "rsr", + "offset": 0, + "slot": "351", + "type": "t_contract(IERC20)15191", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:19" + }, + { + "label": "__gap", + "offset": 0, + "slot": "352", + "type": "t_array(t_uint256)49_storage", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:71" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)40_storage": { + "label": "uint256[40]", + "numberOfBytes": "1280" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24671": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)24980": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)25129": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)25483": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26011": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26675": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)26804": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)27016": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)": { + "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)", + "numberOfBytes": "32" + }, + "t_struct(RoleData)3741_storage": { + "label": "struct AccessControlUpgradeable.RoleData", + "members": [ + { + "label": "members", + "type": "t_mapping(t_address,t_bool)", + "offset": 0, + "slot": "0" + }, + { + "label": "adminRole", + "type": "t_bytes32", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "fe0f2dec194b882efa0d8220d324cba3ec32136c7c6322c221bd90103690d736": { + "address": "0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450", + "txHash": "0xbdbde4636b24e254b21d5506964fdc019f5369421fcaa90116ed6f882193cdf9", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "201", + "type": "t_contract(IBasketHandler)24980", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:19" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)24733", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:20" + }, + { + "label": "_erc20s", + "offset": 0, + "slot": "203", + "type": "t_struct(AddressSet)21439_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:23" + }, + { + "label": "assets", + "offset": 0, + "slot": "205", + "type": "t_mapping(t_contract(IERC20)15191,t_contract(IAsset)24428)", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:26" + }, + { + "label": "lastRefresh", + "offset": 0, + "slot": "206", + "type": "t_uint48", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:30" + }, + { + "label": "__gap", + "offset": 0, + "slot": "207", + "type": "t_array(t_uint256)46_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:233" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAsset)24428": { + "label": "contract IAsset", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)24980": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)15191,t_contract(IAsset)24428)": { + "label": "mapping(contract IERC20 => contract IAsset)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)21439_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)21138_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Set)21138_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "27fae0bad0c3da7d638bee52dc88d1e4fb2a82b065d5718429785fd97e33174f": { + "address": "0x0A388FC05AA017b31fb084e43e7aEaFdBc043080", + "txHash": "0x01087c684030e2a84a29d2b20e098461c1a7cba6214f32e5906ee58bb3926306", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)25129", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:27" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:155" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)24671", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)24980", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)25483", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)26675", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:33" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)15191", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)27016", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:35" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)26804", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)26804", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:42" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)26011", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:45" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)25002,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "312", + "type": "t_array(t_uint256)39_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:310" + } + ], + "types": { + "t_array(t_uint256)39_storage": { + "label": "uint256[39]", + "numberOfBytes": "1248" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)24671": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)24980": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)25129": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)25483": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26011": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26675": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)26804": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)27016": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)27151": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)25002": { + "label": "enum TradeKind", + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)25002,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "3932e3a18a08667478426126d6b91d5a6c9550a08ed3d33006f251ce889a369c": { + "address": "0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc", + "txHash": "0x69e22cd8dbb7da095140555f5bd8b96842a95dbd3800106eaa52f50b31120153", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "201", + "type": "t_contract(IAssetRegistry)24671", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:34" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)24733", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:35" + }, + { + "label": "rsr", + "offset": 0, + "slot": "203", + "type": "t_contract(IERC20)15191", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "204", + "type": "t_contract(IRToken)26675", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:37" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "205", + "type": "t_contract(IStRSR)27016", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:38" + }, + { + "label": "config", + "offset": 0, + "slot": "206", + "type": "t_struct(BasketConfig)53516_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:42" + }, + { + "label": "basket", + "offset": 0, + "slot": "210", + "type": "t_struct(Basket)53526_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:46" + }, + { + "label": "nonce", + "offset": 0, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:48" + }, + { + "label": "timestamp", + "offset": 6, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:49" + }, + { + "label": "disabled", + "offset": 12, + "slot": "212", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:53" + }, + { + "label": "_targetNames", + "offset": 0, + "slot": "213", + "type": "t_struct(Bytes32Set)21332_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:59" + }, + { + "label": "_newBasket", + "offset": 0, + "slot": "215", + "type": "t_struct(Basket)53526_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:60" + }, + { + "label": "warmupPeriod", + "offset": 0, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:66" + }, + { + "label": "lastStatusTimestamp", + "offset": 6, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:70" + }, + { + "label": "lastStatus", + "offset": 12, + "slot": "217", + "type": "t_enum(CollateralStatus)24460", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:71" + }, + { + "label": "basketHistory", + "offset": 0, + "slot": "218", + "type": "t_mapping(t_uint48,t_struct(Basket)53526_storage)", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:77" + }, + { + "label": "_targetAmts", + "offset": 0, + "slot": "219", + "type": "t_struct(Bytes32ToUintMap)20944_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:80" + }, + { + "label": "__gap", + "offset": 0, + "slot": "222", + "type": "t_array(t_uint256)37_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:673" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_contract(IERC20)15191)dyn_storage": { + "label": "contract IERC20[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)37_storage": { + "label": "uint256[37]", + "numberOfBytes": "1184" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24671": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26675": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)27016": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_enum(CollateralStatus)24460": { + "label": "enum CollateralStatus", + "members": ["SOUND", "IFFY", "DISABLED"], + "numberOfBytes": "1" + }, + "t_mapping(t_bytes32,t_bytes32)": { + "label": "mapping(bytes32 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(BackupConfig)53496_storage)": { + "label": "mapping(bytes32 => struct BackupConfig)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)15191,t_bytes32)": { + "label": "mapping(contract IERC20 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)15191,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint48,t_struct(Basket)53526_storage)": { + "label": "mapping(uint48 => struct Basket)", + "numberOfBytes": "32" + }, + "t_struct(BackupConfig)53496_storage": { + "label": "struct BackupConfig", + "members": [ + { + "label": "max", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)15191)dyn_storage", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Basket)53526_storage": { + "label": "struct Basket", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)15191)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "refAmts", + "type": "t_mapping(t_contract(IERC20)15191,t_uint192)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(BasketConfig)53516_storage": { + "label": "struct BasketConfig", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)15191)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "targetAmts", + "type": "t_mapping(t_contract(IERC20)15191,t_uint192)", + "offset": 0, + "slot": "1" + }, + { + "label": "targetNames", + "type": "t_mapping(t_contract(IERC20)15191,t_bytes32)", + "offset": 0, + "slot": "2" + }, + { + "label": "backups", + "type": "t_mapping(t_bytes32,t_struct(BackupConfig)53496_storage)", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(Bytes32Set)21332_storage": { + "label": "struct EnumerableSet.Bytes32Set", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)21138_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32ToBytes32Map)20021_storage": { + "label": "struct EnumerableMap.Bytes32ToBytes32Map", + "members": [ + { + "label": "_keys", + "type": "t_struct(Bytes32Set)21332_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_values", + "type": "t_mapping(t_bytes32,t_bytes32)", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Bytes32ToUintMap)20944_storage": { + "label": "struct EnumerableMap.Bytes32ToUintMap", + "members": [ + { + "label": "_inner", + "type": "t_struct(Bytes32ToBytes32Map)20021_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Set)21138_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "eb36ed3a59a82baec4bd56fa27434f627d80b31df3a101e16165d869c850512c": { + "address": "0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04", + "txHash": "0x65f97beea44073eaa104d688c41656b1bbd0ddb240e5fc0c208562c84d32ede1", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "201", + "type": "t_contract(IBackingManager)24733", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:31" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "202", + "type": "t_contract(IRevenueTrader)26804", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:32" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "203", + "type": "t_contract(IRevenueTrader)26804", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:33" + }, + { + "label": "batchTradeImplementation", + "offset": 0, + "slot": "204", + "type": "t_contract(ITrade)27151", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:37", + "renamedFrom": "tradeImplementation" + }, + { + "label": "gnosis", + "offset": 0, + "slot": "205", + "type": "t_contract(IGnosis)26111", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:40" + }, + { + "label": "batchAuctionLength", + "offset": 20, + "slot": "205", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:44", + "renamedFrom": "auctionLength" + }, + { + "label": "batchTradeDisabled", + "offset": 26, + "slot": "205", + "type": "t_bool", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:50", + "renamedFrom": "disabled" + }, + { + "label": "trades", + "offset": 0, + "slot": "206", + "type": "t_mapping(t_address,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:53" + }, + { + "label": "dutchTradeImplementation", + "offset": 0, + "slot": "207", + "type": "t_contract(ITrade)27151", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:58" + }, + { + "label": "dutchAuctionLength", + "offset": 20, + "slot": "207", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:61" + }, + { + "label": "dutchTradeDisabled", + "offset": 0, + "slot": "208", + "type": "t_mapping(t_contract(IERC20Metadata)15216,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:64" + }, + { + "label": "__gap", + "offset": 0, + "slot": "209", + "type": "t_array(t_uint256)42_storage", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:278" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20Metadata)15216": { + "label": "contract IERC20Metadata", + "numberOfBytes": "20" + }, + "t_contract(IGnosis)26111": { + "label": "contract IGnosis", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)26804": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(ITrade)27151": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20Metadata)15216,t_bool)": { + "label": "mapping(contract IERC20Metadata => bool)", + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "ba4e753809f0c7a43fa0a310c6445dbc18238bc5e8e399210a08bce936c83763": { + "address": "0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac", + "txHash": "0x6eeb691ccce0b8f3af94d4d11d9f9ef3df58515c35970972c98a3a5eed7ec5db", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "destinations", + "offset": 0, + "slot": "201", + "type": "t_struct(AddressSet)21439_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:17" + }, + { + "label": "distribution", + "offset": 0, + "slot": "203", + "type": "t_mapping(t_address,t_struct(RevenueShare)25421_storage)", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:18" + }, + { + "label": "rsr", + "offset": 0, + "slot": "204", + "type": "t_contract(IERC20)15191", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "205", + "type": "t_contract(IERC20)15191", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:37" + }, + { + "label": "furnace", + "offset": 0, + "slot": "206", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:38" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "207", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:39" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:40" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "209", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:41" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)44_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:206" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)44_storage": { + "label": "uint256[44]", + "numberOfBytes": "1408" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_struct(RevenueShare)25421_storage)": { + "label": "mapping(address => struct RevenueShare)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)21439_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)21138_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(RevenueShare)25421_storage": { + "label": "struct RevenueShare", + "members": [ + { + "label": "rTokenDist", + "type": "t_uint16", + "offset": 0, + "slot": "0" + }, + { + "label": "rsrDist", + "type": "t_uint16", + "offset": 2, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Set)21138_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "546202a50d79a0dd7cfcb3f9e0e3a2794622502a556be156f418d865aa4d7d04": { + "address": "0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c", + "txHash": "0xa65b956104e3f80aa39ab5307b85799a2709f020987a65a3292762a64dd94dd4", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)26675", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:21" + }, + { + "label": "ratio", + "offset": 0, + "slot": "202", + "type": "t_uint192", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:24" + }, + { + "label": "lastPayout", + "offset": 24, + "slot": "202", + "type": "t_uint48", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:27" + }, + { + "label": "lastPayoutBal", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:28" + }, + { + "label": "__gap", + "offset": 0, + "slot": "204", + "type": "t_array(t_uint256)47_storage", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:112" + } + ], + "types": { + "t_array(t_uint256)47_storage": { + "label": "uint256[47]", + "numberOfBytes": "1504" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26675": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "632dbf8b9744ed3b4bedeca088a559a83fb7354de5b593aefa39ab7993ce04bf": { + "address": "0x1cCa3FBB11C4b734183f997679d52DeFA74b613A", + "txHash": "0x63f37f08a7bc49c077875e288998abad28f3514099a7a308651723d37cff7a02", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)25129", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:27" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:155" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)15191", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)24671", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)25483", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)24733", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)26011", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)26675", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)15191", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:190" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)24671": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)25129": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)25483": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26011": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)26675": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)27151": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "654ae924bb358aa1208293e52f8ad1216a89fcc33581dfea5664a9666450057b": { + "address": "0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F", + "txHash": "0x6f13a2b27846ae2866c301b7d60fd62f6df7ddd4f2a6676889c5472250686669", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_balances", + "offset": 0, + "slot": "201", + "type": "t_mapping(t_address,t_uint256)", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:37" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "202", + "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:39" + }, + { + "label": "_totalSupply", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:41" + }, + { + "label": "_name", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:43" + }, + { + "label": "_symbol", + "offset": 0, + "slot": "205", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" + }, + { + "label": "__gap", + "offset": 0, + "slot": "206", + "type": "t_array(t_uint256)45_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:394" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "251", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "252", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "253", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "303", + "type": "t_mapping(t_address,t_struct(Counter)6400_storage)", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:37" + }, + { + "label": "_PERMIT_TYPEHASH_DEPRECATED_SLOT", + "offset": 0, + "slot": "304", + "type": "t_bytes32", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:51", + "renamedFrom": "_PERMIT_TYPEHASH" + }, + { + "label": "__gap", + "offset": 0, + "slot": "305", + "type": "t_array(t_uint256)48_storage", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:129" + }, + { + "label": "mandate", + "offset": 0, + "slot": "353", + "type": "t_string_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:44" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "354", + "type": "t_contract(IAssetRegistry)24671", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:47" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "355", + "type": "t_contract(IBasketHandler)24980", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:48" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "356", + "type": "t_contract(IBackingManager)24733", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:49" + }, + { + "label": "furnace", + "offset": 0, + "slot": "357", + "type": "t_contract(IFurnace)26011", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:50" + }, + { + "label": "basketsNeeded", + "offset": 0, + "slot": "358", + "type": "t_uint192", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:55" + }, + { + "label": "issuanceThrottle", + "offset": 0, + "slot": "359", + "type": "t_struct(Throttle)29484_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:58" + }, + { + "label": "redemptionThrottle", + "offset": 0, + "slot": "363", + "type": "t_struct(Throttle)29484_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:59" + }, + { + "label": "__gap", + "offset": 0, + "slot": "367", + "type": "t_array(t_uint256)42_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:536" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24671": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)24980": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)26011": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)6400_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Counter)6400_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Params)29476_storage": { + "label": "struct ThrottleLib.Params", + "members": [ + { + "label": "amtRate", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "pctRate", + "type": "t_uint192", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Throttle)29484_storage": { + "label": "struct ThrottleLib.Throttle", + "members": [ + { + "label": "params", + "type": "t_struct(Params)29476_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "lastTimestamp", + "type": "t_uint48", + "offset": 0, + "slot": "2" + }, + { + "label": "lastAvailable", + "type": "t_uint256", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "2ea71a5ba1eac5bb0c264e453e5886b4b378edf1164bf5292a0b3e6989933c2b": { + "address": "0xC98eaFc9F249D90e3E35E729e3679DD75A899c10", + "txHash": "0xd0188111deb4fe412a62db6ef61561b237f7b13f2332c87006e348cfca9e7915", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)26455", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "201", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "202", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "203", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "name", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:48" + }, + { + "label": "symbol", + "offset": 0, + "slot": "254", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:49" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "255", + "type": "t_contract(IAssetRegistry)24671", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:54" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "256", + "type": "t_contract(IBackingManager)24733", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:55" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "257", + "type": "t_contract(IBasketHandler)24980", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:56" + }, + { + "label": "rsr", + "offset": 0, + "slot": "258", + "type": "t_contract(IERC20)15191", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:57" + }, + { + "label": "era", + "offset": 0, + "slot": "259", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:62" + }, + { + "label": "stakes", + "offset": 0, + "slot": "260", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:66" + }, + { + "label": "totalStakes", + "offset": 0, + "slot": "261", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:67" + }, + { + "label": "stakeRSR", + "offset": 0, + "slot": "262", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:68" + }, + { + "label": "stakeRate", + "offset": 0, + "slot": "263", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:69" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "264", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:74" + }, + { + "label": "draftEra", + "offset": 0, + "slot": "265", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:79" + }, + { + "label": "draftQueues", + "offset": 0, + "slot": "266", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)50515_storage)dyn_storage))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:87" + }, + { + "label": "firstRemainingDraft", + "offset": 0, + "slot": "267", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:88" + }, + { + "label": "totalDrafts", + "offset": 0, + "slot": "268", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:89" + }, + { + "label": "draftRSR", + "offset": 0, + "slot": "269", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:90" + }, + { + "label": "draftRate", + "offset": 0, + "slot": "270", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:91" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "271", + "type": "t_mapping(t_address,t_struct(Counter)6400_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:129" + }, + { + "label": "_delegationNonces", + "offset": 0, + "slot": "272", + "type": "t_mapping(t_address,t_struct(Counter)6400_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:131" + }, + { + "label": "unstakingDelay", + "offset": 0, + "slot": "273", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:141" + }, + { + "label": "rewardRatio", + "offset": 6, + "slot": "273", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:142" + }, + { + "label": "payoutLastPaid", + "offset": 0, + "slot": "274", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:153" + }, + { + "label": "rsrRewardsAtLastPayout", + "offset": 0, + "slot": "275", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:156" + }, + { + "label": "leaked", + "offset": 0, + "slot": "276", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:162" + }, + { + "label": "lastWithdrawRefresh", + "offset": 24, + "slot": "276", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:163" + }, + { + "label": "withdrawalLeak", + "offset": 0, + "slot": "277", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:164" + }, + { + "label": "__gap", + "offset": 0, + "slot": "278", + "type": "t_array(t_uint256)28_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:1001" + }, + { + "label": "_delegates", + "offset": 0, + "slot": "306", + "type": "t_mapping(t_address,t_address)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:31" + }, + { + "label": "_eras", + "offset": 0, + "slot": "307", + "type": "t_array(t_struct(Checkpoint)52749_storage)dyn_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:34" + }, + { + "label": "_checkpoints", + "offset": 0, + "slot": "308", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)52749_storage)dyn_storage))", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:38" + }, + { + "label": "_totalSupplyCheckpoints", + "offset": 0, + "slot": "309", + "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)52749_storage)dyn_storage)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "310", + "type": "t_array(t_uint256)46_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:243" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_struct(Checkpoint)52749_storage)dyn_storage": { + "label": "struct StRSRP1Votes.Checkpoint[]", + "numberOfBytes": "32" + }, + "t_array(t_struct(CumulativeDraft)50515_storage)dyn_storage": { + "label": "struct StRSRP1.CumulativeDraft[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)28_storage": { + "label": "uint256[28]", + "numberOfBytes": "896" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)24671": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)24733": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)24980": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)15191": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)26455": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_address)": { + "label": "mapping(address => address)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(Checkpoint)52749_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(CumulativeDraft)50515_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1.CumulativeDraft[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)6400_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_array(t_struct(Checkpoint)52749_storage)dyn_storage)": { + "label": "mapping(uint256 => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)52749_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1Votes.Checkpoint[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)50515_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1.CumulativeDraft[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))": { + "label": "mapping(uint256 => mapping(address => mapping(address => uint256)))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Checkpoint)52749_storage": { + "label": "struct StRSRP1Votes.Checkpoint", + "members": [ + { + "label": "fromBlock", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "val", + "type": "t_uint224", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Counter)6400_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(CumulativeDraft)50515_storage": { + "label": "struct StRSRP1.CumulativeDraft", + "members": [ + { + "label": "drafts", + "type": "t_uint176", + "offset": 0, + "slot": "0" + }, + { + "label": "availableAt", + "type": "t_uint64", + "offset": 22, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint176": { + "label": "uint176", + "numberOfBytes": "22" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint224": { + "label": "uint224", + "numberOfBytes": "28" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/CHANGELOG.md b/CHANGELOG.md index 45c59ff34f..dfe4bb03c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ Call the following functions, once it is desired to turn on the new features: - `BasketHandler.setWarmupPeriod()` - `StRSR.setWithdrawalLeak()` - `Broker.setDutchAuctionLength()` +- `Broker.setDutchTradeImplementation()` It is acceptable to leave these function calls out of the initial upgrade tx and follow up with them later. The protocol will continue to function, just without dutch auctions, RSR unstaking gas-savings, and the warmup period. @@ -178,6 +179,7 @@ It is acceptable to leave these function calls out of the initial upgrade tx and - Add `UnstakingCancelled()` event - Allow payout of (already acquired) RSR rewards while frozen - Add ability for governance to `resetStakes()` when stake rate falls outside (1e12, 1e24) + <<<<<<< HEAD - `StRSRVotes` [+0 slots] - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking @@ -291,6 +293,122 @@ Across all collateral, `tryPrice()` was updated to exclude revenueHiding conside - Add EasyAuction regression test for Broker false positive (observed during USDC de-peg) - Add EasyAuction extreme tests +======= + +- `StRSRVotes` [+0 slots] + - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking + +### Facades + +Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` and `revenueOverview()` + +- `FacadeAct` + Summary: Remove unused `getActCalldata()` and add way to run revenue auctions + + - Remove `getActCalldata(..)` + - Remove `canRunRecollateralizationAuctions(..)` + - Remove `runRevenueAuctions(..)` + - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` + - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` + - Modify all functions to work on both 3.0.0 and 2.1.0 RTokens + +- `FacadeRead` + Summary: Add new data summary views frontends may be interested in + + - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` + - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions + - Remove `traderBalances(..)` + - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` + +- `FacadeWrite` + Summary: More expressive and fine-grained control over the set of pausers and freezers + + - Do not automatically grant Guardian PAUSER/SHORT_FREEZER/LONG_FREEZER + - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER + - Add ability to initialize with multiple pausers, short freezers, and long freezers + - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` + +## Plugins + +### DutchTrade + +A cheaper, simpler, trading method. Intended to be the new dominant trading method, with GnosisTrade (batch auctions) available as a backup option. Generally speaking the batch auction length can be kept shorter than the dutch auction length. + +DutchTrade implements a four-stage, single-lot, falling price dutch auction: + +1. In the first 20% of the auction, the price falls from 1000x the best price to the best price in a geometric/exponential decay as a price manipulation defense mechanism. Bids are not expected to occur (but note: unlike the GnosisTrade batch auction, this mechanism is not resistant to _arbitrary_ price manipulation). If a bid occurs, then trading for the pair of tokens is disabled as long as the trade was started by the BackingManager. +2. Between 20% and 45%, the price falls linearly from 1.5x the best price to the best price. +3. Between 45% and 95%, the price falls linearly from the best price to the worst price. +4. Over the last 5% of the auction, the price remains constant at the worst price. + +Duration: 30 min (default) + +### Assets and Collateral + +- Add `version() return (string)` getter to pave way for separation of asset versioning and core protocol versioning +- Deprecate `claimRewards()` +- Add `lastSave()` to `RTokenAsset` +- Remove `CurveVolatileCollateral` +- Switch `CToken*Collateral` (Compound V2) to using a CTokenVault ERC20 rather than the raw cToken +- Bugfix: `lotPrice()` now begins at 100% the lastSavedPrice, instead of below 100%. It can be at 100% for up to the oracleTimeout in the worst-case. +- Bugfix: Handle oracle deprecation as indicated by the `aggregator()` being set to the zero address +- Bugfix: `AnkrStakedETHCollateral`/`CBETHCollateral`/`RethCollateral` now correctly detects soft default (note that Ankr still requires a new oracle before it can be deployed) +- Bugfix: Adjust `Curve*Collateral` and `RTokenAsset` to treat FIX_MAX correctly as +inf +- Bugfix: Continue updating cached price after collateral default (impacts all appreciating collateral) + +# 2.1.0 + +### Core protocol contracts + +- `BasketHandler` + - Bugfix for `getPrimeBasket()` view + - Minor change to `_price()` rounding + - Minor natspec improvement to `refreshBasket()` +- `Broker` + - Fix `GnosisTrade` trade implemention to treat defensive rounding by EasyAuction correctly + - Add `setGnosis()` and `setTradeImplementation()` governance functions +- `RToken` + - Minor gas optimization added to `redeemTo` to use saved `assetRegistry` variable +- `StRSR` + - Expose RSR variables via `getDraftRSR()`, `getStakeRSR()`, and `getTotalDrafts()` views + +### Facades + +- `FacadeRead` + - Extend `issue()` to return the estimated USD value of deposits as `depositsUoA` + - Add `traderBalances()` + - Add `auctionsSettleable()` + - Add `nextRecollateralizationAuction()` + - Modify `backingOverview() to handle unpriced cases` +- `FacadeAct` + - Add `runRevenueAuctions()` + +### Plugins + +#### Assets and Collateral + +Across all collateral, `tryPrice()` was updated to exclude revenueHiding considerations + +- Deploy CRV + CVX plugins +- Add `AnkrStakedEthCollateral` + tests + deployment/verification scripts for ankrETH +- Add FluxFinance collateral tests + deployment/verification scripts for fUSDC, fUSDT, fDAI, and fFRAX +- Add CompoundV3 `CTokenV3Collateral` + tests + deployment/verification scripts for cUSDCV3 +- Add Convex `CvxStableCollateral` + tests + deployment/verification scripts for 3Pool +- Add Convex `CvxVolatileCollateral` + tests + deployment/verification scripts for Tricrypto +- Add Convex `CvxStableMetapoolCollateral` + tests + deployment/verification scripts for MIM/3Pool +- Add Convex `CvxStableRTokenMetapoolCollateral` + tests + deployment/verification scripts for eUSD/fraxBP +- Add Frax `SFraxEthCollateral` + tests + deployment/verification scripts for sfrxETH +- Add Lido `LidoStakedEthCollateral` + tests + deployment/verification scripts for wstETH +- Add RocketPool `RethCollateral` + tests + deployment/verification scripts for rETH + +### Testing + +- Add generic collateral testing suite at `test/plugins/individual-collateral/collateralTests.ts` +- Add EasyAuction regression test for Broker false positive (observed during USDC de-peg) +- Add EasyAuction extreme tests + +> > > > > > > master + ### Documentation - Add `docs/plugin-addresses.md` as well as accompanying script for generation at `scripts/collateral-params.ts` diff --git a/README.md b/README.md index 0fb2726242..1c569eb492 100644 --- a/README.md +++ b/README.md @@ -18,45 +18,46 @@ For a much more detailed explanation of the economic design, including an hour-l ## Further Documentation -- [Development Environment](docs/dev-env.md): Setup and usage of our dev environment. How to compile, autoformat, lint, and test our code. - - [Testing with Echidna](docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) - - [Deployment](docs/deployment.md): How to do test deployments in our environment. -- [System Design](docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. -- [Deployment Variables](docs/deployment-variables.md) A detailed description of the governance variables of the protocol. -- [Our Solidity Style](docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. -- [Writing Collateral Plugins](docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. -- [Building on Top](docs/build-on-top.md): How to build on top of Reserve, including information about long-lived fork environments. -- [MEV](docs/mev.md): A resource for MEV searchers and others looking to interact with the deployed protocol programatically. -- [Rebalancing Algorithm](docs/recollateralization.md): Description of our trading algorithm during the recollateralization process -- [Changelog](CHANGELOG.md): Release changelog - -## Mainnet Addresses (v2.1.0) +- [Development Environment](https://github.com/reserve-protocol/protocol/blob/master/docs/dev-env.md): Setup and usage of our dev environment. How to compile, autoformat, lint, and test our code. + - [Testing with Echidna](https://github.com/reserve-protocol/protocol/blob/master/docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) + - [Deployment](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment.md): How to do test deployments in our environment. +- [System Design](https://github.com/reserve-protocol/protocol/blob/master/docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. +- [Deployment Variables](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment-variables.md) A detailed description of the governance variables of the protocol. +- [Our Solidity Style](https://github.com/reserve-protocol/protocol/blob/master/docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. +- [Writing Collateral Plugins](https://github.com/reserve-protocol/protocol/blob/master/docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. +- [Building on Top](https://github.com/reserve-protocol/protocol/blob/master/docs/build-on-top.md): How to build on top of Reserve, including information about long-lived fork environments. +- [MEV](https://github.com/reserve-protocol/protocol/blob/master/docs/mev.md): A resource for MEV searchers and others looking to interact with the deployed protocol programatically. +- [Rebalancing Algorithm](https://github.com/reserve-protocol/protocol/blob/master/docs/recollateralization.md): Description of our trading algorithm during the recollateralization process +- [Changelog](https://github.com/reserve-protocol/protocol/blob/master/CHANGELOG.md): Release changelog + +## Mainnet Addresses (v3.0.0) | Implementation Contracts | Address | | ------------------------ | --------------------------------------------------------------------------------------------------------------------- | -| tradingLib | [0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478](https://etherscan.io/address/0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478) | -| facadeRead | [0xf535Cab96457558eE3eeAF1402fCA6441E832f08](https://etherscan.io/address/0xf535Cab96457558eE3eeAF1402fCA6441E832f08) | -| facadeAct | [0x933c5DBdA80f03C102C560e9ed0c29812998fA78](https://etherscan.io/address/0x933c5DBdA80f03C102C560e9ed0c29812998fA78) | -| facadeWriteLib | [0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8](https://etherscan.io/address/0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8) | -| facadeWrite | [0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629](https://etherscan.io/address/0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629) | -| deployer | [0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB](https://etherscan.io/address/0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB) | -| rsrAsset | [0x9cd0F8387672fEaaf7C269b62c34C53590d7e948](https://etherscan.io/address/0x9cd0F8387672fEaaf7C269b62c34C53590d7e948) | -| main | [0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F](https://etherscan.io/address/0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F) | -| trade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | -| assetRegistry | [0x5a004F70b2450E909B4048050c585549Ab8afeB8](https://etherscan.io/address/0x5a004F70b2450E909B4048050c585549Ab8afeB8) | -| backingManager | [0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC](https://etherscan.io/address/0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC) | -| basketHandler | [0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030](https://etherscan.io/address/0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030) | -| broker | [0x89209a52d085D975b14555F3e828F43fb7EaF3B7](https://etherscan.io/address/0x89209a52d085D975b14555F3e828F43fb7EaF3B7) | -| distributor | [0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569](https://etherscan.io/address/0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569) | -| furnace | [0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96](https://etherscan.io/address/0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96) | -| rsrTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | -| rTokenTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | -| rToken | [0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1](https://etherscan.io/address/0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1) | -| stRSR | [0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f](https://etherscan.io/address/0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f) | +| tradingLib | [0xB81a1fa9A497953CEC7f370CACFA5cc364871A73](https://etherscan.io/address/0xB81a1fa9A497953CEC7f370CACFA5cc364871A73) | +| facadeRead | [0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C](https://etherscan.io/address/0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C) | +| facadeAct | [0x801fF27bacc7C00fBef17FC901504c79D59E845C](https://etherscan.io/address/0x801fF27bacc7C00fBef17FC901504c79D59E845C) | +| facadeWriteLib | [0x0776Ad71Ae99D759354B3f06fe17454b94837B0D](https://etherscan.io/address/0x0776Ad71Ae99D759354B3f06fe17454b94837B0D) | +| facadeWrite | [0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c](https://etherscan.io/address/0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c) | +| deployer | [0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e](https://etherscan.io/address/0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e) | +| rsrAsset | [0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6](https://etherscan.io/address/0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6) | +| main | [0xF5366f67FF66A3CefcB18809a762D5b5931FebF8](https://etherscan.io/address/0xF5366f67FF66A3CefcB18809a762D5b5931FebF8) | +| gnosisTrade | [0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630](https://etherscan.io/address/0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630) | +| dutchTrade | [0x2387C22727ACb91519b80A15AEf393ad40dFdb2F](https://etherscan.io/address/0x2387C22727ACb91519b80A15AEf393ad40dFdb2F) | +| assetRegistry | [0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450](https://etherscan.io/address/0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450) | +| backingManager | [0x0A388FC05AA017b31fb084e43e7aEaFdBc043080](https://etherscan.io/address/0x0A388FC05AA017b31fb084e43e7aEaFdBc043080) | +| basketHandler | [0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc](https://etherscan.io/address/0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc) | +| broker | [0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04](https://etherscan.io/address/0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04) | +| distributor | [0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac](https://etherscan.io/address/0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac) | +| furnace | [0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c](https://etherscan.io/address/0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c) | +| rsrTrader | [0x1cCa3FBB11C4b734183f997679d52DeFA74b613A](https://etherscan.io/address/0x1cCa3FBB11C4b734183f997679d52DeFA74b613A) | +| rTokenTrader | [0x1cCa3FBB11C4b734183f997679d52DeFA74b613A](https://etherscan.io/address/0x1cCa3FBB11C4b734183f997679d52DeFA74b613A) | +| rToken | [0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F](https://etherscan.io/address/0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F) | +| stRSR | [0xC98eaFc9F249D90e3E35E729e3679DD75A899c10](https://etherscan.io/address/0xC98eaFc9F249D90e3E35E729e3679DD75A899c10) | The DeployerRegistry, which contains a link to all official releases via their Deployer contracts, can be found [here](https://etherscan.io/address/0xD85Fac03804a3e44D29c494f3761D11A2262cBBe). -Deployed collateral plugin addresses and their configuration parameters can be found [here](/docs/plugin-addresses.md). +Deployed collateral plugin addresses and their configuration parameters can be found [here](https://github.com/reserve-protocol/protocol/blob/master/docs/plugin-addresses.md). ## Parallel Prototypes diff --git a/audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md b/audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md new file mode 100644 index 0000000000..396da93633 --- /dev/null +++ b/audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md @@ -0,0 +1,1553 @@ +--- +sponsor: "Reserve" +slug: "2023-06-reserve" +date: "2023-09-⭕" # the date this report is published to the C4 website +title: "Reserve Protocol - Invitational" +findings: "https://github.com/code-423n4/2023-06-reserve-findings/issues" +contest: 248 +--- + +# Overview + +## About C4 + +Code4rena (C4) is an open organization consisting of security researchers, auditors, developers, and individuals with domain expertise in smart contracts. + +A C4 audit is an event in which community participants, referred to as Wardens, review, audit, or analyze smart contract logic in exchange for a bounty provided by sponsoring projects. + +During the audit outlined in this document, C4 conducted an analysis of the Reserve Protocol smart contract system written in Solidity. The audit took place between June 15—June 29 2023. + +Following the C4 audit, 3 wardens (0xA5DF, ronnyx2017, and rvierdiiev) reviewed the mitigations for all identified issues; the [mitigation review report](#mitigation-review) is appended below the audit report. + +## Wardens + +In Code4rena's Invitational audits, the competition is limited to a small group of wardens; for this audit, 6 wardens contributed reports: + + 1. 0xA5DF + 2. ronnyx2017 + 3. rvierdiiev + 4. RaymondFam + 5. [carlitox477](https://twitter.com/carlitox477) + 6. [hihen](https://twitter.com/henryxf3) + +This Audit was judged by [0xean](https://github.com/0xean). + +Final report assembled by PaperParachute and [liveactionllama](https://twitter.com/liveactionllama). + +# Summary + +The C4 analysis yielded an aggregated total of 14 unique vulnerabilities. Of these vulnerabilities, 2 received a risk rating in the category of HIGH severity and 12 received a risk rating in the category of MEDIUM severity. + +Additionally, C4 analysis included 6 reports detailing issues with a risk rating of LOW severity or non-critical. There were also 4 reports recommending gas optimizations. + +All of the issues presented here are linked back to their original finding. + +# Scope + +The code under review can be found within the [C4 Reserve Protocol repository](https://github.com/code-423n4/2023-06-reserve), and is composed of 12 smart contracts written in the Solidity programming language and includes 2126 lines of Solidity code. + +# Severity Criteria + +C4 assesses the severity of disclosed vulnerabilities based on three primary risk categories: high, medium, and low/non-critical. + +High-level considerations for vulnerabilities span the following key areas when conducting assessments: + +- Malicious Input Handling +- Escalation of privileges +- Arithmetic +- Gas use + +For more information regarding the severity criteria referenced throughout the submission review process, please refer to the documentation provided on [the C4 website](https://code4rena.com), specifically our section on [Severity Categorization](https://docs.code4rena.com/awarding/judging-criteria/severity-categorization). + +# High Risk Findings (2) +## [[H-01] Custom redemption might revert if old assets were unregistered](https://github.com/code-423n4/2023-06-reserve-findings/issues/4) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-06-reserve-findings/issues/4)* + +`quoteCustomRedemption()` works under the assumption that the maximum size of the `erc20sAll` should be `assetRegistry.size()`, however there can be cases where an asset was unregistered but still exists in an old basket, making the size of the old basket greater than `assetRegistry.size()`. In that case the function will revert with an index out of bounds error. + +### Impact + +Users might not be able to use `redeemCustom` when needed. + +I think this should be considered high severity, since being able to redeem the token at all time is an essential feature for the protocol that's allowed also while frozen. +Not being able to redeem can result in a depeg or in governance becoming malicious and stealing RToken collateral. + +### Proof of Concept + +Consider the following scenario: + +* RToken deployed with 0.9 USDC, 0.05 USDT, 0.05 DAI +* Governance passed a vote to change it to 0.9 DAI and 0.1 USDC and un-register USDT +* Trading is paused before execution, so the basket switch occurs but the re-balance can't be executed. Meaning the actual assets that the backing manager holds are in accordance with the old basket +* A user wants to redeem using the old basket, but custom redemption reverts + +As for the revert: + +* `erc20sAll` is created [here](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/BasketHandler.sol#L391-L392) with the length of `assetRegistry.size()`, which is 2 in our case. +* Then in [this loop](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/BasketHandler.sol#L397-L428) the function tries to push 3 assets into `erc20sAll` which will result in an index-out-of-bonds error + +(the function doesn't include in the final results assets that aren't registered, but it does push them too into `erc20sAll`) + +### Recommended Mitigation Steps + +Allow the user to specify the length of the array `erc20sAll` to avoid this revert + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1586269794):** + > I believe this to be a stretch for high severity. It has several pre-conditions to end up in the proposed state and I do believe it would be entirely possible for governance to change back to the original state (USDC, USDT, DAI), so assets wouldn't be lost and the impact would more be along the lines of a temporary denial of service. +> +> Look forward to warden and sponsor comments. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1587948710):** + > @0xA5DF - nice find! Thoughts on an alternative mitigation? +> - Could move L438 to just after L417, so that `erc20sAll` never includes unregistered ERC20s +> - Would probably have to cache the assets as `assetsAll` for re-use around L438 +> - Has side-effect of making the ERC20 return list never include unregistered ERC20s. Current implementation can return a 0 value for an unregistered ERC20. This is properly handled by the RToken contract, but still, nice-to-have. + +**[0xA5DF (warden) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1587988163):** + > Hey @tbrent -
+> That can work as well, the only downside I can think of is that in case there's an asset that's not registered and is repeated across different baskets - the `toAsset()` would be called multiple times for that asset (while under the current implementation and under the mitigation I've suggested it'll be called only once), this would cost about 300 gas units per additional call (100 for the call, 2 `sload`s to a warm slot inside the call itself) + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1588023172):** +> @0xA5DF - Noted, good point. + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1620824425)** + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1632948695):** + > @tbrent - do you care to comment on your thoughts on severity? I am leaning towards M on this, but it sounds like you believe it is correct as labeled (high). + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/4#issuecomment-1632984393):** + > @0xean - Correct, I think high is appropriate. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Fix `redeemCustom`.
+> PR: https://github.com/reserve-protocol/protocol/pull/857 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/7), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/30), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/3) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[H-02] A new era might be triggered despite a significant value being held in the previous era](https://github.com/code-423n4/2023-06-reserve-findings/issues/2) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-06-reserve-findings/issues/2)* + +
+ +When RSR seizure occurs the staking and drafting rate is adjusted accordingly, if any of those rates is above some threshold then a new era begins (draft or staking era accordingly), wiping out all of the holdings of the current era. +The assumption is that if the rate is above the threshold then there's not much staking or drafts left after the seizure (and therefore it makes sense to begin a new era). +However, there might be a case where a previous seizure has increased the staking/draft rate close to the threshold, and then even a small seizure would make it cross this threshold. In that case the total value of staking or drafts can be very high, and they will all be wiped out by starting a new era. + +### Impact + +Stakers will lose their holdings or pending drafts. + +### Proof of Concept + +Consider the following scenario: + +* Max stake rate is 1e9 +* A seizure occurs and the new rate is now 91e7 +* Not much staking is left after the seizure, but as time passes users keep staking bring back the total stakes to a significant value +* A 10% seizure occurs, this causes the staking rate to cross the threshold (getting to 1.01e9) and start a new era + +This means the stakings were wiped out despite holding a significant amount of value, causing a loss for the holders. + +### Recommended Mitigation Steps + +This one is a bit difficult to mitigate. +One way I can think of is to add a 'migration' feature, where in such cases a new era would be created but users would be able to transfer the funds that they held in the previous era into the new era. But this would require some significant code changes and checking that this doesn't break anything or introduces new bugs. + + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/2#issuecomment-1588260840):** + > @0xA5DF thoughts on a governance function that requires the ratio be out of bounds, that does `beginEra()` and/or `beginDraftEra()`? +> +> The idea is that stakers can mostly withdraw, and since governance thresholds are all percentage, vote to immolate themselves and re-start the staking pool. I think it should treat `beginEra()` and `beginDraftEra()` separately, but I'm not confident in that yet. + +**[tbrent (Reserve) acknowledged and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/2#issuecomment-1620824773):** + > We're still not sure how to mitigate this one. Agree it should be considered HIGH and a new issue. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Adds governance function to manually push the era forward.
+> PR: https://github.com/reserve-protocol/protocol/pull/888 + +**Status:** Mitigation confirmed. Full details in reports from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/31), [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/8), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/11) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + + +# Medium Risk Findings (12) +## [[M-01] A Dutch trade could end up with an unintended lower closing price](https://github.com/code-423n4/2023-06-reserve-findings/issues/48) +*Submitted by [RaymondFam](https://github.com/code-423n4/2023-06-reserve-findings/issues/48)* + +

+ +`notTradingPausedOrFrozen` that is turned on and off during an open Dutch trade could have the auction closed with a lower price depending on the timimg, leading to lesser capability to boost the Rtoken and/or stRSR exchange rates as well as a weakened recollaterization. + +### Proof of Concept + +Here's the scenario: + +1. A 30 minute Dutch trade is opened by the Revenue trader selling a suplus token for Rtoken. + +2. Shortly after the price begins to decrease linearly, Alice calls [`bid()`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/plugins/trading/DutchTrade.sol#L146-L164). As can be seen in line 160 of the code block below, `settleTrade()` is externally called on the `origin`, RevenueTrader.sol in this case: + +```solidity + function bid() external returns (uint256 amountIn) { + require(bidder == address(0), "bid already received"); + + // {qBuyTok} + amountIn = bidAmount(uint48(block.timestamp)); // enforces auction ongoing + + // Transfer in buy tokens + bidder = msg.sender; + buy.safeTransferFrom(bidder, address(this), amountIn); + + // status must begin OPEN + assert(status == TradeStatus.OPEN); + + // settle() via callback +160: origin.settleTrade(sell); + + // confirm callback succeeded + assert(status == TradeStatus.CLOSED); + } +``` + +3. However, her call is preceded by [`pauseTrading()`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/mixins/Auth.sol#L169-L172) invoked by a `PAUSER`, and denied on line 46 of the function below: + + + +```solidity + function settleTrade(IERC20 sell) + public + override(ITrading, TradingP1) +46: notTradingPausedOrFrozen + returns (ITrade trade) + { + trade = super.settleTrade(sell); // nonReentrant + distributeTokenToBuy(); + // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely + } +``` + +4. As the auction is nearing to `endTime`, the `PAUSER` calls [`unpauseIssuance()`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/mixins/Auth.sol#L176-L179). + +5. Bob, the late comer, upon seeing this, proceeds to calling `bid()` and gets the sell token for a price much lower than he would initially expect before the trading pause. + + +### Recommended Mitigation Steps + +Consider removing `notTradingPausedOrFrozen` from the function visibility of `RevenueTrader.settleTrade` and `BackingManager.settleTrade`. This will also have a good side effect of allowing the settling of a Gnosis trade if need be. Collectively, the settled trades could at least proceed to helping boost the RToken and/or stRSR exchange rates that is conducive to the token holders redeeming and withdrawing. The same shall apply to enhancing recollaterization, albeit future tradings will be halted if the trading pause is still enabled. + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/48#issuecomment-1613819858):** + > This also seems like QA. It outlines a very specific set of events that are very unlikely to occur during production scenarios and would additionally come down to admin misconfiguration / mismanagement. will wait for sponsor comment, but most likely downgrade to QA. + + > > - The PAUSER role should be assigned to an address that is able to act quickly in response to off-chain events, such as a Chainlink feed failing. It is acceptable for there to be false positives, since redemption remains enabled. +> +> It is good to consider this quote from the documentation stating that pausing may have false positives. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/48#issuecomment-1618926905):** + > @0xean - We believe a malicious pauser attack vector is dangerous enough that the issue is Medium and deserves a mitigation. Agree with suggested mitigation. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Allow settle trade when paused or frozen.
+> PR: https://github.com/reserve-protocol/protocol/pull/876 + +**Status:** Mitigation confirmed. Full details in reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/5), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/32), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/9) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-02] The broker should not be fully disabled by GnosisTrade.reportViolation](https://github.com/code-423n4/2023-06-reserve-findings/issues/47) +*Submitted by [RaymondFam](https://github.com/code-423n4/2023-06-reserve-findings/issues/47)* + +
+ +GnosisTrade and DutchTrade are two separate auction systems where the failing of either system should not affect the other one. The current design will have `Broker.sol` disabled when `reportViolation` is invoked by `GnosisTrade.settle()` if the auction's clearing price was below what we assert it should be. + + + +```solidity + broker.reportViolation(); +``` + + + +```solidity + function reportViolation() external notTradingPausedOrFrozen { + require(trades[_msgSender()], "unrecognized trade contract"); + emit DisabledSet(disabled, true); + disabled = true; + } +``` + +Consequently, both `BackingManager` and `RevenueTrader (rsrTrader and rTokenTrader)` will not be able to call `openTrade()`: + + + +```soliidty + function openTrade(TradeKind kind, TradeRequest memory req) external returns (ITrade) { + require(!disabled, "broker disabled"); + ... +``` + +till it's resolved by the governance: + + + +```solidity + function setDisabled(bool disabled_) external governance { + emit DisabledSet(disabled, disabled_); + disabled = disabled_; + } +``` + +### Proof of Concept + +The following `Trading.trytrade()` as inherited by `BackingManager` and `RevenueTrader` will be denied on line 121, deterring recollaterization and boosting of Rtoken and stRSR exchange rate. The former deterrence will have [`Rtoken.redeemTo`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/RToken.sol#L190) and [`StRSR.withdraw`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/StRSR.sol#L335) (both [requiring](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/RToken.sol#L190) [`fullyCollateralized`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/StRSR.sol#L335)) denied whereas the latter will have the Rtoken and stRSR holders divested of intended gains. + + + +```solidty + function tryTrade(TradeKind kind, TradeRequest memory req) internal returns (ITrade trade) { + /* */ + IERC20 sell = req.sell.erc20(); + assert(address(trades[sell]) == address(0)); + + IERC20Upgradeable(address(sell)).safeApprove(address(broker), 0); + IERC20Upgradeable(address(sell)).safeApprove(address(broker), req.sellAmount); + +121: trade = broker.openTrade(kind, req); + trades[sell] = trade; + tradesOpen++; + + emit TradeStarted(trade, sell, req.buy.erc20(), req.sellAmount, req.minBuyAmount); + } +``` + +### Recommended Mitigation Steps + +Consider having the affected code refactored as follows: + + + +```diff + function openTrade(TradeKind kind, TradeRequest memory req) external returns (ITrade) { +- require(!disabled, "broker disabled"); + + address caller = _msgSender(); + require( + caller == address(backingManager) || + caller == address(rsrTrader) || + caller == address(rTokenTrader), + "only traders" + ); + + // Must be updated when new TradeKinds are created + if (kind == TradeKind.BATCH_AUCTION) { ++ require(!disabled, "Gnosis Trade disabled"); + return newBatchAuction(req, caller); + } + return newDutchAuction(req, ITrading(caller)); + } +``` + +This will have the Gnosis Trade conditionally denied while still allowing the opening of Dutch Trade. + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/47#issuecomment-1613867516):** + > This currently mostly reads like a design suggestion. I can see the merits of disabling the entire broker in the scenario where the invariant has been violated. Probably best as QA, but will allow for sponsor comment before downgrading. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/47#issuecomment-1618919354):** + > @0xean - We think this should be kept as Medium. It's a good design suggestion that otherwise could lead to the protocol not trading for the length of the governance cycle. This matters when it comes to selling defaulted collateral. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Disable dutch auctions on a per-collateral basis, use 4-step dutch trade curve.
+> PRs:
+> - https://github.com/reserve-protocol/protocol/pull/873
+> - https://github.com/reserve-protocol/protocol/pull/869
+ +**Status:** Two mitigation errors. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20) and [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-03] In case `Distributor.setDistribution` use, revenue from rToken RevenueTrader and rsr token RevenueTrader should be distributed](https://github.com/code-423n4/2023-06-reserve-findings/issues/34) +*Submitted by [rvierdiiev](https://github.com/code-423n4/2023-06-reserve-findings/issues/34)* + +In case Distributor.setDistribution use, revenue from rToken RevenueTrader and rsr token RevenueTrader should be distributed. Otherwise wrong distribution will be used. + +### Proof of Concept + +`BackingManager.forwardRevenue` function sends revenue amount to the `rsrTrader` and `rTokenTrader` contracts, [according to the distribution inside `Distributor` contract](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/BackingManager.sol#L236-L249). For example it can `50%`/`50%`. In case if we have 2 destinations in Distributor: strsr and furnace, that means that half of revenue will be received by strsr stakers as rewards. + +This distribution [can be changed](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/Distributor.sol#L61-L65) at any time.
+The job of `RevenueTrader` is to sell provided token for a `tokenToBuy` and then distribute it using `Distributor.distribute` function. There are 2 ways of auction that are used: dutch and gnosis. Dutch auction will call `RevenueTrader.settleTrade`, which [will initiate distribution](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/RevenueTrader.sol#L50). But Gnosis trade will not do that and user should call `distributeTokenToBuy` manually, after auction is settled. + +The problem that I want to discuss is next.
+Suppose, that governance at the beginning set distribution as 50/50 between 2 destinations: strsr and furnace. And then later `forwardRevenue` sent some tokens to the rsrTrader and rTokenTrader. Then, when trade was active to exchange some token to rsr token, `Distributor.setDistribution` was set in order to make strsr share to 0, so now everything goes to Furnace only. As result, when trade will be finished in the rsrTrader and `Distributor.distribute` will be called, then those tokens will not be sent to the strsr contract, because their share is 0 now. +They will be stuck inside rsrTrader. + +Another problem here is that strsr holders should receive all revenue from the time, where they distribution were created. What i mean is if in time 0, rsr share was 50% and in time 10 rsr share is 10%, then `BackingManager.forwardRevenue` should be called for all tokens that has surplus, because if that will be done after changing to 10%, then strsr stakers will receive less revenue. + +### Tools Used + +VsCode + +### Recommended Mitigation Steps + +You need to think how to guarantee fair distribution to the strsr stakers, when distribution params are changed. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/34#issuecomment-1620796074):** + > This is a good find. The mitigation we have in mind is adding a new function to the `RevenueTrader` that allows anyone to transfer a registered ERC20 back to the `BackingManager`, as long as the current distribution for that `tokenToBuy` is 0%. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Distribute revenue in `setDistribution`.
+> PR: https://github.com/reserve-protocol/protocol/pull/878 + +**Status:** Mitigation error. Full details in reports from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36) and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/10) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-04] FurnaceP1.setRatio will work incorrectly after call when frozen ](https://github.com/code-423n4/2023-06-reserve-findings/issues/29) +*Submitted by [rvierdiiev](https://github.com/code-423n4/2023-06-reserve-findings/issues/29)* + +`FurnaceP1.setRatio` will not update `lastPayout` when called in frozen state, which means that after component will be unfrozen, melting will be incorrect. + +### Proof of Concept + +`melt` function should burn some amount of tokens from `lastPayoutBal`. It depends of `lastPayout` and `ratio` variables. The more time has passed, the more tokens will be burnt. + +When `setRatio` function is called, then `melt` function [is tried to be executed](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/Furnace.sol#L86), because new ratio is provided and it should not be used for previous time ranges. +In case if everything is ok, then `lastPayout` and `lastPayoutBal` will be updated, so it's safe to update `ratio` now. +But it's possible that `melt` function will revert in case if `notFrozen` modifier is not passed. As result `lastPayout` and `lastPayoutBal` will not be updated, but ratio will be. Because of that, when `Furnace` will be unfrozen, then melting rate can be much more, then it should be, because `lastPayout` wasn't updated. + +### Tools Used + +VsCode + +### Recommended Mitigation Steps + +In case of `catch` case, you can update `lastPayout` and `lastPayoutBal`. + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-06-reserve-findings/issues/29#issuecomment-1620802303)** + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Update payout variables if melt fails during `setRatio`.
+> PR: https://github.com/reserve-protocol/protocol/pull/885 + +**Status:** Mitigation error. Full details in report from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/37) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-05] Lack of claimRewards when manageToken in RevenueTrader](https://github.com/code-423n4/2023-06-reserve-findings/issues/16) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-06-reserve-findings/issues/16)* + +There is a dev comment in the Assert.sol: + + DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + +The claimRewards is moved to the `TradingP1.claimRewards/claimRewardsSingle`. + +But when the `RevenueTraderP1` trade and distribute revenues by `manageToken`, it only calls the refresh function of the asserts: + + if (erc20 != IERC20(address(rToken)) && tokenToBuy != IERC20(address(rToken))) { + IAsset sell_ = assetRegistry.toAsset(erc20); + IAsset buy_ = assetRegistry.toAsset(tokenToBuy); + if (sell_.lastSave() != uint48(block.timestamp)) sell_.refresh(); + if (buy_.lastSave() != uint48(block.timestamp)) buy_.refresh(); + } + +The claimRewards is left out. + +### Impact + +Potential loss of rewards. + +### Recommended Mitigation Steps + +Add claimRewardsSingle when refresh assert in the `manageToken`. + + +**[tbrent (Reserve) disputed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/16#issuecomment-1588019948):** + > This is similar to an (unmitigated) issue from an earlier contest: https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/22 +> +> However in this case it has to do with `RevenueTraderP1.manageToken()`, as opposed to `BackingManagerP1.manageTokens()`. +> +> I think that difference matters, because the loss of the rewards _for this auction_ does not have serious long-term consequences. This is not like the BackingManager where it's important that all capital always be available else an unnecessarily large haircut could occur. Instead, the worst that can happen is for the revenue auction to complete at high slippage, and for a second reward token revenue auction to complete afterwards at high slippage yet again, when it could have been a single revenue auction with less slippage. +> +> The recommended mitigation would not succeed, because recall, we may be selling token X but any number of additional assets could have token X as a reward token. We would need to call `claimRewards()`, which is simply too gas-costly to do everytime for revenue auctions. + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/16#issuecomment-1633111555):** + > > Instead, the worst that can happen is for the revenue auction to complete at high slippage, and for a second reward token revenue auction to complete afterwards at high slippage yet again, when it could have been a single revenue auction with less slippage. +> +> @tbrent - The impact sounds like a "leak of value" and therefore I think Medium is the correct severity per the c4 docs. (cc @tbrent - open to additional comment here) + + + +*** + +## [[M-06] Oracle timeout at rebalance will result in a sell-off of all RSRs at 0 price](https://github.com/code-423n4/2023-06-reserve-findings/issues/15) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-06-reserve-findings/issues/15)* + +When creating the trade for rebalance, the `RecollateralizationLibP1.nextTradePair` uses `(uint192 low, uint192 high) = rsrAsset.price(); // {UoA/tok}` to get the rsr sell price. And the rsr assert is a pure Assert contract, which `price()` function will just return (0, FIX\_MAX) if oracle is timeout: + + function price() public view virtual returns (uint192, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + assert(low <= high); + return (low, high); + } catch (bytes memory errData) { + ... + return (0, FIX_MAX); + } + } + +The `trade.sellAmount` will be all the rsr in the `BackingManager` and `stRSR`: + + uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( + rsrAsset.bal(address(ctx.stRSR)) + ); + trade.sellAmount = rsrAvailable; + +It will be cut down to a normal amount fit for buying UoA amount in the `trade.prepareTradeToCoverDeficit` function. + +But if the rsr oracle is timeout and returns a 0 low price. The trade req will be made by `trade.prepareTradeSell`, which will sell all the available rsr at 0 price. + +Note that the SOUND colls won't be affected by the issue because the sell amount has already been cut down by basketsNeeded. + +Loss huge amount of rsr in the auction. When huge amounts of assets are auctioned off at zero, panic and insufficient liquidity make the outcome unpredictable. + +### Proof of Concept + +POC git diff test/Recollateralization.test.ts + +```patch +diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts +index 86cd3e88..15639916 100644 +--- a/test/Recollateralization.test.ts ++++ b/test/Recollateralization.test.ts +@@ -51,7 +51,7 @@ import { + import snapshotGasCost from './utils/snapshotGasCost' + import { expectTrade, getTrade, dutchBuyAmount } from './utils/trades' + import { withinQuad } from './utils/matchers' +-import { expectRTokenPrice, setOraclePrice } from './utils/oracles' ++import { expectRTokenPrice, setInvalidOracleTimestamp, setOraclePrice } from './utils/oracles' + import { useEnv } from '#/utils/env' + import { mintCollaterals } from './utils/tokens' + +@@ -797,6 +797,166 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { + }) + + describe('Recollateralization', function () { ++ context('With simple Basket - Two stablecoins', function () { ++ let issueAmount: BigNumber ++ let stakeAmount: BigNumber ++ ++ beforeEach(async function () { ++ // Issue some RTokens to user ++ issueAmount = bn('100e18') ++ stakeAmount = bn('10000e18') ++ ++ // Setup new basket with token0 & token1 ++ await basketHandler.connect(owner).setPrimeBasket([token0.address, token1.address], [fp('0.5'), fp('0.5')]) ++ await basketHandler.connect(owner).refreshBasket() ++ ++ // Provide approvals ++ await token0.connect(addr1).approve(rToken.address, initialBal) ++ await token1.connect(addr1).approve(rToken.address, initialBal) ++ ++ // Issue rTokens ++ await rToken.connect(addr1).issue(issueAmount) ++ ++ // Stake some RSR ++ await rsr.connect(owner).mint(addr1.address, initialBal) ++ await rsr.connect(addr1).approve(stRSR.address, stakeAmount) ++ await stRSR.connect(addr1).stake(stakeAmount) ++ }) ++ ++ it('C4M7', async () => { ++ // Register Collateral ++ await assetRegistry.connect(owner).register(backupCollateral1.address) ++ ++ // Set backup configuration - USDT as backup ++ await basketHandler ++ .connect(owner) ++ .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), [backupToken1.address]) ++ ++ // Set Token0 to default - 50% price reduction ++ await setOraclePrice(collateral0.address, bn('0.5e8')) ++ ++ // Mark default as probable ++ await assetRegistry.refresh() ++ // Advance time post collateral's default delay ++ await advanceTime((await collateral0.delayUntilDefault()).toString()) ++ ++ // Confirm default and trigger basket switch ++ await basketHandler.refreshBasket() ++ ++ // Advance time post warmup period - SOUND just regained ++ await advanceTime(Number(config.warmupPeriod) + 1) ++ ++ const initToken1B = await token1.balanceOf(backingManager.address); ++ // rebalance ++ const token1Decimal = 6; ++ const sellAmt: BigNumber = await token0.balanceOf(backingManager.address) ++ const buyAmt: BigNumber = sellAmt.div(2) ++ await facadeTest.runAuctionsForAllTraders(rToken.address); ++ // bid ++ await backupToken1.connect(addr1).approve(gnosis.address, sellAmt) ++ await gnosis.placeBid(0, { ++ bidder: addr1.address, ++ sellAmount: sellAmt, ++ buyAmount: buyAmt, ++ }) ++ await advanceTime(config.batchAuctionLength.add(100).toString()) ++ // await facadeTest.runAuctionsForAllTraders(rToken.address); ++ const rsrAssert = await assetRegistry.callStatic.toAsset(rsr.address); ++ await setInvalidOracleTimestamp(rsrAssert); ++ await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ ++ { ++ contract: backingManager, ++ name: 'TradeSettled', ++ args: [anyValue, token0.address, backupToken1.address, sellAmt, buyAmt], ++ emitted: true, ++ }, ++ { ++ contract: backingManager, ++ name: 'TradeStarted', ++ args: [anyValue, rsr.address, backupToken1.address, stakeAmount, anyValue], // sell 25762677277828792981 ++ emitted: true, ++ }, ++ ]) ++ ++ // check ++ console.log(await token0.balanceOf(backingManager.address)); ++ const currentToken1B = await token1.balanceOf(backingManager.address); ++ console.log(currentToken1B); ++ console.log(await backupToken1.balanceOf(backingManager.address)); ++ const rsrB = await rsr.balanceOf(stRSR.address); ++ console.log(rsrB); ++ ++ // expect ++ expect(rsrB).to.eq(0); ++ }) ++ }) ++ + context('With very simple Basket - Single stablecoin', function () { + let issueAmount: BigNumber + let stakeAmount: BigNumber + +``` + +run test: + + PROTO_IMPL=1 npx hardhat test --grep 'C4M7' test/Recollateralization.test.ts + +log: + + Recollateralization - P1 + Recollateralization + With simple Basket - Two stablecoins + BigNumber { value: "0" } + BigNumber { value: "50000000" } + BigNumber { value: "25000000000000000000" } + BigNumber { value: "0" } + +### Recommended Mitigation Steps + +Using lotPrice or just revert for rsr oracle timeout might be a good idea. + + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/15#issuecomment-1588048139):** + > Hmm, interesting case. +> +> There are two types of auctions that can occur: batch auctions via `GnosisTrade`, and dutch auctions via `DutchTrade`. +> +> Batch auctions via `GnosisTrade` are good at discovering prices when price is unknown. It would require self-interested parties to be offline for the entire duration of the batch auction (default: 15 minutes) in order for someone to get away with buying the RSR for close to 0. +> +> Dutch auctions via `DutchTrade` do not have this problem because of an assert that reverts at the top of the contract. +> +> I'm inclined to dispute validity, but I also agree it might be strictly better to use the `lotPrice()`. When trading out backing collateral it is important to sell it quickly and not have to wait for `lotPrice()` to decay sufficiently, but this is not true with RSR. For RSR it might be fine to wait as long as a week for the `lotPrice()` to fall to near 0. +> +> This would then allow dutch auctions via `DutchTrade` to be used when RSR's oracle is offline. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Use `lotPrice()`.
+> PR: https://github.com/reserve-protocol/protocol-private/pull/15 + +**Status:** Mitigation confirmed. Full details in reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/13), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/41), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/23) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-07] Sell reward `rTokens` at low price because of skiping `furnace.melt`](https://github.com/code-423n4/2023-06-reserve-findings/issues/13) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-06-reserve-findings/issues/13)* + +The reward rToken sent to RevenueTrader will be sold at a low price. RSR stakers will lose some of their profits. + +### Proof of Concept + +`RevenueTraderP1.manageToken` function is used to launch auctions for any erc20 tokens sent to it. For the RevenueTrader of the rsr stake, the `tokenToBuy` is rsr and the token to sell is reward rtoken. + +There is the refresh code in the `manageToken` function: + + } else if (assetRegistry.lastRefresh() != uint48(block.timestamp)) { + // Refresh everything only if RToken is being traded + assetRegistry.refresh(); + furnace.melt(); + } + +It refreshes only when the assetRegistry has not been refreshed in the same block. + +So if the actor calls the `assetRegistry.refresh()` before calling `manageToken` function, the `furnace.melt()` won't been called. And the BU exchange rate of the RToken will be lower than actual value. So the sellPrice is also going to be smaller. + + (uint192 sellPrice, ) = sell.price(); // {UoA/tok} + + TradeInfo memory trade = TradeInfo({ + sell: sell, + buy: buy, + sellAmount: sell.bal(address(this)), + buyAmount: 0, + sellPrice: sellPrice, + buyPrice: buyPrice + }); + +### Recommended Mitigation Steps + +Refresh everything before sell rewards. + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-06-reserve-findings/issues/13#issuecomment-1620818933)** + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Refresh before selling rewards, refactor revenue & distro.
+> PR: https://github.com/reserve-protocol/protocol-private/pull/7 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/24), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/34), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/14) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-08] Stake before unfreeze can take away most of rsr rewards in the freeze period](https://github.com/code-423n4/2023-06-reserve-findings/issues/11) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-06-reserve-findings/issues/11), also found by [rvierdiiev](https://github.com/code-423n4/2023-06-reserve-findings/issues/43) and [0xA5DF](https://github.com/code-423n4/2023-05-reserve-findings/issues/24)* + +If the system is frozen, the only allowed operation is `stRST.stake`. And the `_payoutRewards` is not called during freeze period: + + if (!main.frozen()) _payoutRewards(); + + function payoutRewards() external { + requireNotFrozen(); + _payoutRewards(); + } + +So the `payoutLastPaid` stays before the freeze period. But when the system is unfreezed, accumulated rewards will be released all at once because the block.timestamp leapt the whole freeze period. + +### Impact + +A front runner can stake huge proportion rsr before admin unfreezes the system. And the attacker can get most of rsr rewards in the next block. And he only takes the risk of the `unstakingDelay` period. + +### Proof of Concept + +Assumption: there are 2000 rsr stake in the stRSR, and there are 1000 rsr rewards in the `rsrRewardsAtLastPayout` with a 1 year half-life period. + +And at present, the LONG_FREEZER `freezeLong` system for 1 year(default). + +After 1 year, at the unfreeze point, a front runner stake 2000 rsr into stRSR. And then the system is unfreeze. And in the next blcok,the front runner unstakes all the stRSR he has for `2250 rsr = 2000 principal + 1000 / 2 / 2 rsr rewards`. + +The only risk he took is `unstakingDelay`. The original rsr stakers took the risk of the whole freeze period + `unstakingDelay` but only got a part of rewards back. + +### Recommended Mitigation Steps + +payoutRewards before freeze and update payoutLastPaid before unfreeze. + +**[tbrent (Reserve) confirmed via duplicate issue #24](https://github.com/code-423n4/2023-06-reserve-findings/issues/24)** + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> `payoutRewards` before freeze and update `payoutLastPaid` before unfreeze.
+> PR: https://github.com/reserve-protocol/protocol/pull/857 + +**Status:** Mitigation confirmed. Full details in reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/15), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/38), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/25) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-09] `cancelUnstake` lack `payoutRewards` before mint shares](https://github.com/code-423n4/2023-06-reserve-findings/issues/10) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-06-reserve-findings/issues/10), also found by [rvierdiiev](https://github.com/code-423n4/2023-06-reserve-findings/issues/39) and [0xA5DF](https://github.com/code-423n4/2023-05-reserve-findings/issues/5)* + +`cancelUnstake` will cancel the withdrawal request in the queue can mint shares as the current `stakeRate`. But it doesn't `payoutRewards` before `mintStakes`. Therefor it will mint stRsr as a lower rate, which means it will get more rsr. + +### Impact + +Withdrawers in the unstake queue can `cancelUnstake` without calling `payoutRewards` to get more rsr rewards that should not belong to them. + +### Proof of Concept + +POC test/ZZStRSR.test.ts git patch + +```patch +diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts +index ecc31f68..b2809129 100644 +--- a/test/ZZStRSR.test.ts ++++ b/test/ZZStRSR.test.ts +@@ -1333,6 +1333,46 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { + expect(await stRSR.exchangeRate()).to.be.gt(initialRate) + }) + ++ it('cancelUnstake', async () => { ++ const amount: BigNumber = bn('10e18') ++ ++ // Stake ++ await rsr.connect(addr1).approve(stRSR.address, amount) ++ await stRSR.connect(addr1).stake(amount) ++ await rsr.connect(addr2).approve(stRSR.address, amount) ++ await stRSR.connect(addr2).stake(amount) ++ await rsr.connect(addr3).approve(stRSR.address, amount) ++ await stRSR.connect(addr3).stake(amount) ++ ++ const initExchangeRate = await stRSR.exchangeRate(); ++ console.log(initExchangeRate); ++ ++ // Unstake addr2 & addr3 at same time (Although in different blocks, but timestamp only 1s) ++ await stRSR.connect(addr2).unstake(amount) ++ await stRSR.connect(addr3).unstake(amount) ++ ++ // skip 1000 block PERIOD / 12000s ++ await setNextBlockTimestamp(Number(ONE_PERIOD.mul(1000).add(await getLatestBlockTimestamp()))) ++ ++ // Let's cancel the unstake in normal ++ await expect(stRSR.connect(addr2).cancelUnstake(1)).to.emit(stRSR, 'UnstakingCancelled') ++ let exchangeRate = await stRSR.exchangeRate(); ++ expect(exchangeRate).to.equal(initExchangeRate) ++ ++ // addr3 cancelUnstake after payoutRewards ++ await stRSR.payoutRewards() ++ await expect(stRSR.connect(addr3).cancelUnstake(1)).to.emit(stRSR, 'UnstakingCancelled') ++ ++ // Check balances addr2 & addr3 ++ exchangeRate = await stRSR.exchangeRate(); ++ expect(exchangeRate).to.be.gt(initExchangeRate) ++ const addr2NowAmount = exchangeRate.mul(await stRSR.balanceOf(addr2.address)).div(bn('1e18')); ++ console.log("addr2", addr2NowAmount.toString()); ++ const addr3NowAmount = exchangeRate.mul(await stRSR.balanceOf(addr3.address)).div(bn('1e18')); ++ console.log("addr3",addr3NowAmount.toString()); ++ expect(addr2NowAmount).to.gt(addr3NowAmount) ++ }) ++ + it('Rewards should not be handed out when paused but staking should still work', async () => { + await main.connect(owner).pauseTrading() + await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + +``` + +The test simulates two users unstake and cancelUnstake operations at the same time.But the addr2 calls payoutRewards after his cancelUnstake. And addr3 calls cancelUnstake after payoutRewards. Addr2 gets more rsr than addr3 in the end. + +run test: + + PROTO_IMPL=1 npx hardhat test --grep cancelUnstake test/ZZStRSR.test.ts + +log: + + StRSRP1 contract + Add RSR / Rewards + BigNumber { value: "1000000000000000000" } + addr2 10005345501258588240 + addr3 10000000000000000013 + +### Recommended Mitigation Steps + +Call `_payoutRewards` before mint shares. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/10#issuecomment-1589913989):** + > Agree with severity and proposed mitigation. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Payout rewards during cancelUnstake.
+> PR: https://github.com/reserve-protocol/protocol-private/pull/3 + +**Status:** Mitigation confirmed. Full details in reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/16), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/33), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/26) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-10] An oracle deprecation might lead the protocol to sell assets for a low price](https://github.com/code-423n4/2023-06-reserve-findings/issues/8) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-06-reserve-findings/issues/8)* + +During a Dutch Auction, if a user places a bid, the trade is settled in the same transaction. As part of this process, the backing manager tries to call the `rebalance()` function again. +The call to `rebalance()` is wrapped in a try-catch block, if an error occurs and the error data is empty, the function will revert. + +The assumption is that if the error data is empty that means it was due to an out-of-gas error, this assumption isn't always true as mentioned in a [previous issue](https://github.com/code-423n4/2023-01-reserve-findings/issues/234) (that wasn't mitigated). +In the case of this issue, this can result in a case where users can't bid on an auction for some time, ending up selling an asset for a price lower than the market price. + +### Impact + +Protocol's assets will be auctioned for a price lower than the market price. + +### Proof of Concept + +Consider the following scenario: + +* Chainlink announces that an oracle will get deprecated +* Governance passes a proposal to update the asset registry with a new oracle +* A re-balancing is required and executed with a Dutch Auction +* The oracle deprecation happens before the auction price reaches a reasonable value +* Any bid while the oracle is deprecated will revert +* Right before the auction ends the proposal to update the asset becomes available for execution (after the timelock delay has passed). Somebody executes it, bids, and enjoys the low price of the auction. + +### Recommended Mitigation Steps + +On top of checking that the error data is empty, compare the gas before and after to ensure this is an out-of-gas error. + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1586331887):** + > On the fence on this one, it is based off a known issue from a previous Audit but does show a new problem stemming from the same problem of oracle deprecation. +> +> Look forward to sponsor comment. + +**[tbrent (Reserve) disputed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1589910605):** + > The PoC does not function as specified. Specifically, [bidding on an auction](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/plugins/trading/DutchTrade.sol#L146) does not involve the price at the time of the tx. The price is set at the beginning of the dutch auction in the `init()` function. Therefore, it is the starting of new auctions that will revert while the oracle is deprecated, while bids will succeed and simply fail to start the next auction. + +**[0xA5DF (warden) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1633780455):** + > > Therefore, it is the starting of new auctions that will revert while the oracle is deprecated, while bids will succeed and simply fail to start the next auction. +> +> Hey @tbrent - +> I didn't quite understand the dispute here, if starting the next auction will fail/revert then the bid will revert too.
+> `bid()` calls `origin.settleTrade()` and `settleTrade()` calls `rebalance()`.
+> If `rebalance()` reverts due to a deprecated oracle then `settleTrade()` will revert too (`rebalance()` will revert with empty data, and therefore the catch block will trigger a revert [here](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/BackingManager.sol#L94)). + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1636182107):** + > @0xA5DF - Ah, understood now. Agree this is Medium and think it should be counted as a new finding since the consequence (dutch auction economics break) is novel. + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1662674844):** + > Hey @0xa5df -- we're having some confusion around exactly what happens when a chainlink oracle is deprecated. Do you have details to share about what this ends up looking like? +> +> We're having trouble finding documentation on this, and it feels like the aggregator contract should just stay there and return a stale value. Is that not right? Has this happened in the past or has Chainlink committed to a particular approach for deprecating? + +**[0xA5DF (warden) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1662876091):** + > Hey - It's a bit difficult to track deprecated Chainlink oracles since Chainlink removes the announcement once they're deprecated.
+> I was able to track one Oracle that was deprecated during the first contest, from the original issue this seems to be [this one](https://polygonscan.com/address/0x2E5B04aDC0A3b7dB5Fd34AE817c7D0993315A8a6#readContract#F10).
+> It seems that what happens is that Chainlink sets the aggregator address to the zero address, which makes the call to `latestRoundData()` to revert without any data (I guess this is due to the way Solidity handles calls to a non-contract address).
+> See also the PoC in the [original issue](https://github.com/code-423n4/2023-01-reserve-findings/issues/234) in the January contest. + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1662939816):** + > Got it, checks out. Thanks! + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Add oracle deprecation check.
+> PR: https://github.com/reserve-protocol/protocol/pull/886 + +**Status:** Mitigation confirmed. Full details in reports from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/35), [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/28), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/17) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-11] Attacker can disable basket during un-registration, which can cause an unnecessary trade in some cases](https://github.com/code-423n4/2023-06-reserve-findings/issues/7) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-06-reserve-findings/issues/7), also found by [rvierdiiev](https://github.com/code-423n4/2023-06-reserve-findings/issues/35)* + +
+ +At the mitigation contest there was an issue regarding the `basketHandler.quantity()` call at the unregistration process taking up all gas. +As a mitigation to that issue the devs set aside some gas and use the remaining to do that call. +This opens up to a new kind of attack, where a attacker can cause the call to revert by not supplying enough gas to it. + +### Impact + +This can cause the basket to get disabled, which would require a basket refresh. + +After a basket refresh is done, an additional warmup period has to pass for some functionality to be available again (issuance, rebalancing and forwarding revenue). + +In some cases this might trigger a basket switch that would require the protocol to rebalance via trading, trading can have some slippage which can cause a loss for the protocol. + +### Proof of Concept + +The `quantity()` function is being called with the amount of gas that `_reserveGas()` returns + +If an attacker causes the gas to be just right above `GAS_TO_RESERVE` the function would be called with 1 unit of gas, causing it to revert: + +```solidity + function _reserveGas() private view returns (uint256) { + uint256 gas = gasleft(); + require(gas > GAS_TO_RESERVE, "not enough gas to unregister safely"); + return gas - GAS_TO_RESERVE; + } +``` + +Regarding the unnecessary trade, consider the following scenario: + +* The basket has USDC as the main asset and DAI as a backup token +* A proposal to replace the backup token with USDT was raised +* A proposal to unregister BUSD (which isn't part of the basket) was raised too +* USDC defaults and DAI kicks in as the backup token +* Both proposals are now ready to execute and the attacker executes the backup proposal first, then the unregister while disabling the basket using the bug in question +* Now, when the basket is refreshed DAI will be replaced with USDT, making the protocol to trade DAI for USDT + +The refresh was unnecessary and therefore the trade too. + +### Recommended Mitigation Steps + +Reserve gas for the call as well: + +```diff + function _reserveGas() private view returns (uint256) { + uint256 gas = gasleft(); +- require(gas > GAS_TO_RESERVE, "not enough gas to unregister safely"); ++ require(gas >= GAS_TO_RESERVE + MIN_GAS_FOR_EXECUTION, "not enough gas to unregister safely"); + return gas - GAS_TO_RESERVE; + } +``` + +Disclosure: this issue was [mentioned in the comments](https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/73#issuecomment-1435483929) to the issue in the mitigation contest; however, since this wasn't noticed by the devs and isn't part of the submission, I don't think this should be considered a known issue. + +**[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/7#issuecomment-1586332703):** + > Applaud @0xA5DF for highlighting this on their own issue. +> +> > *Disclosure: this issue was [mentioned in the comments](https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/73#issuecomment-1435483929) to the issue in the mitigation contest, however since this wasn't noticed by the devs and isn't part of the submission I don't think this should be considered a known issue* +> +> Look forward to discussion with sponsor. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/7#issuecomment-1589904155):** + > We've discussed and agree with with the warden that this should not be considered a known issue. + +**[Reserve mitigated](https://github.com/code-423n4/2023-08-reserve-mitigation#individual-prs):** +> Change gas reservation policy in `AssetRegistry`.
+> PR: https://github.com/reserve-protocol/protocol/pull/857 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/27), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/39), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/18) - and also shared below in the [Mitigation Review](#mitigation-review) section. + + + +*** + +## [[M-12] Custom redemption can be used to get more than RToken value, when an upwards depeg occurs](https://github.com/code-423n4/2023-06-reserve-findings/issues/6) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-06-reserve-findings/issues/6)* + +
+ +Custom redemption allows to redeem RToken in exchange of a mix of previous baskets (as long as it's not more than the prorata share of the redeemer). +The assumption is that previous baskets aren't worth more than the target value of the basket. +However, a previous basket can contain a collateral that depegged upwards and is now actually worth more than its target. + +### Impact + +Funds that are supposed to go revenue traders would be taken by an attacker redeeming RToken. + +### Proof of Concept + +The [following code](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/plugins/assets/FiatCollateral.sol#L142-L148) shows that when a depeg occurs the collateral becomes IFFY (which means it'll be disabled after a certain delay): + +```solidity + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } +``` + +Consider the following scenario: + +* Basket contains token X which is supposed to be pegged to c +* Token X depegs upwards and is now worth 2c +* After `delayUntilDefault` passes the basket gets disabled +* A basket refresh is executed (can be done by anybody) and token Y kicks in as the backup token +* Half of token X is now traded for the required Y tokens +* The other half should go to revenue traders (rsr trader and Furnace), but before anyone calls ‘forewardRevenue’ the attacker calls custom redemption with half from the current basket and half of the previous one +* The user would get 0.5X+0.5Y per each RToken which is worth 1.5c + +### Recommended Mitigation Steps + +When doing custom redemption check that the collateral used is sound or at least check that the price isn't higher then the peg price. + +**[tbrent (Reserve) acknowledged, but disagreed with severity and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/6#issuecomment-1620823067):** + > This is also true of normal redemption via `redeem()` until `refreshBasket()` is called after the collateral has cycled from IFFY to DISABLED. +> +> It only checks `basketHandler.fullyCollateralized()`, not `basketHandler.isReady()`. This is intended. It is important to not disallow redemption, and using USD prices to determine redemption quantities is opposite to the fundamental design of the protocol. +> + > Agree that the behavior is as the warden indicates. All alternatives seem worse, however. I think this is probably not HIGH. We do not expect to make any change to the behavior. + +**[0xean (judge) reduced severity to Medium and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/6#issuecomment-1632945825):** + > I think Medium seems like the correct severity here. There are pre-conditions for this to occur and in addition the likelihood doesn't seem very high. + + + +*** + +# Low Risk and Non-Critical Issues + +For this Audit, 6 reports were submitted by wardens detailing low risk and non-critical issues. The [report highlighted below](https://github.com/code-423n4/2023-06-reserve-findings/issues/25) by **0xA5DF** received the top score from the judge. + +*The following wardens also submitted reports: [hihen](https://github.com/code-423n4/2023-06-reserve-findings/issues/56), +[RaymondFam](https://github.com/code-423n4/2023-06-reserve-findings/issues/49), +[rvierdiiev](https://github.com/code-423n4/2023-06-reserve-findings/issues/28), +[carlitox477](https://github.com/code-423n4/2023-05-reserve-findings/issues/26), and +[ronnyx2017](https://github.com/code-423n4/2023-05-reserve-findings/issues/21).* + +## [01] A redeemer might get 'front-run' by a freezer +Before redemption `furnace.melt()` is called, which increases a bit the amount of assets the redeemer gets in return. +While frozen the `melt()` call will revert, but since the call is surrounded by a try-catch block the redemption will continue. + +This can lead to a case where a user sends out a redeem tx, expecting melt to be called by the redeem function, but before the tx is executed the protocol gets frozen. This means the user wouldn't get the additional value they expected to get from melting (and that they can get if they choose to wait till after the freeze is over). + +If the last time `melt()` was called wasn't long enough then the additional value from melting wouldn't be that significant. But there can be cases where it can be longer - e.g. low activity or after a freeze (meaning there are 2 freezes one after the other and a user is attempting to redeem between them). + +As a mitigation allow the user to specify if they're ok with skipping the call to `melt()`, if they didn't specifically allow it then revert. + +## [02] Leaky refresh math is incorrect +`leakyRefresh()` keeps track of the percentage that was withdrawn since last refresh by adding up the current percentage that's being withdrawn each time. +However, the current percentage is being calculated as part of the current `totalRSR`, which doesn't account for the already withdrawn drafts. + +This will trigger the `withdrawalLeak` threshold earlier than expected. +E.g. if the threshold is set to `25%` and 26 users try to withdraw `1%` each - the leaky refresh would be triggered by the 23rd person rather than by the 26th. + +## [03] Reorg attack +Reorg attacks aren't very common on mainnet (but more common on L2s if the protocol intends to ever launch on them), but they can still happen (there was [a 7 blocks reorg](https://decrypt.co/101390/ethereum-beacon-chain-blockchain-reorg) on the Beacon chain before the merge). +It can be relevant in the following cases (I've reported a med separately, the followings are the ones I consider low): +* RToken deployment - a user might mint right after the RToken was deployed, a reorg might be used to deploy a different RToken and trap the users' funds in it (since the deployer becomes the owner). +* Dutch Auction - a reorg might switch the addresses of 2 auctions, causing the user to bid on the wrong auction +* Gnosis auctions - this can also cause the user to bid on the wrong auction (it's more relevant for the `EasyAuction` contract which is OOS) + +As a mitigation - make sure to deploy all contracts with `create2` using a salt that's unique to the features of the contract, that will ensure that even in the case of a reorg it wouldn't be deployed to the same address as before. + +## [04] `distributeTokenToBuy()` can be called while paused/frozen +Due to the removal of `notPausedOrFrozen` from `Distributor.distribute()` it's now possible to execute `RevenueTrader.distributeTokenToBuy()` while paused or frozen. + +This is relevant when `tokensToBuy` is sent directly to the revenue trader: RSR sent to RSRTrader or RToken sent directly to RTokenTrader + +## [05] `redeemCustom` allows the use of the zero basket +The basket with nonce `#0` is an empty basket, `redeemCustom` allows to specify that basket for redemption, which will result in a loss for the redeemer. + +## [06] `refreshBasket` can be called before the first prime basket was set +This will result in an event being emitted but will not impact the contract's state. + +## [07] `MIN_AUCTION_LENGTH` seems too low +The current `MIN_AUCTION_LENGTH` is set to 2 blocks. +This seems a bit too low since the price is time-dependant that means there would be only 3 price options for the auctions, and the final price wouldn't necessarily be the optimal price for the protocol. + +## [08] If a token that yields RSR would be used as collateral then 100% of the yield would go to StRSR +This isn’t very likely to happen (currently the only token that yields RSR is StRSR of another RToken) but it’s worth keeping an eye on it. + +## [09] Protocol might not be able to compromise basket when needed +Consider the following scenario: +* Protocol suffers from some loss and compromises the basket to a 1.1e9 ratio +* Months pass by and users mint new tokens and increase the TVL +* A small compromise is required (12%), this brings the ratio to below 1e9 and reverts the compromise +* Protocol is now disabled despite holding a significant amount of value, and users can only redeem for their prorata share of the assets, + +This might be intended design, but worth taking this scenario into account. + + + +*** + +# Gas Optimizations + +For this Audit, 4 reports were submitted by wardens detailing gas optimizations. The [report highlighted below](https://github.com/code-423n4/2023-06-reserve-findings/issues/3) by **0xA5DF** received the top score from the judge. + +*The following wardens also submitted reports: [hihen](https://github.com/code-423n4/2023-06-reserve-findings/issues/55), +[RaymondFam](https://github.com/code-423n4/2023-06-reserve-findings/issues/50), and +[carlitox477](https://github.com/code-423n4/2023-05-reserve-findings/issues/27).* + +## [G-01] At `toColl()` and `toAsset()` use the mapping to check if asset exists +Savings: ~2.1K per call + +Notice this is a function that's being called frequently, and many times per tx. + +**Overall this can save a few thousands of gas units per tx for the most common txs (e.g. issuance, redemption)** + +https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/AssetRegistry.sol#L120-L132 + +At `toColl()` and `toAsset()` instead of using the EnumberableSet to check that the erc20 is registered just check that the value returned from the mapping isn't zero (this is supposed to be equivalent as long as the governance doesn't register the zero address as an asset contract - maybe add a check for that at `register()`). + +Proposed changes: +```solidity + + /// Return the Asset registered for erc20; revert if erc20 is not registered. + // checks: erc20 in assets + // returns: assets[erc20] + function toAsset(IERC20 erc20) external view returns (IAsset) { + IAsset asset = assets[erc20]; + require(asset != IAsset(address(0)), "erc20 unregistered"); + return asset; + } + + /// Return the Collateral registered for erc20; revert if erc20 is not registered as Collateral + // checks: erc20 in assets, assets[erc20].isCollateral() + // returns: assets[erc20] + function toColl(IERC20 erc20) external view returns (ICollateral) { + IAsset coll = assets[erc20]; + require(coll != IAsset(address(0)), "erc20 unregistered"); + require(coll.isCollateral(), "erc20 is not collateral"); + return ICollateral(address(coll)); + } +``` + +## [G-02] Get `targetIndex` from mapping instead of iterating +Gas savings: a few thousands (see below) + +The following code is used at the [BasketLib](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/mixins/BasketLib.sol#L196-L198) to find the index of a value inside an `EnumerableSet` +```solidity + for (targetIndex = 0; targetIndex < targetsLength; ++targetIndex) { + if (targetNames.at(targetIndex) == config.targetNames[config.erc20s[i]]) break; + } +``` + +However the index can be fetched directly from the `_indexed` mapping: + + +```diff +diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol +index bc52d1c6..ce56c715 100644 +--- a/contracts/p1/mixins/BasketLib.sol ++++ b/contracts/p1/mixins/BasketLib.sol +@@ -192,10 +192,8 @@ library BasketLibP1 { + // For each prime collateral token: + for (uint256 i = 0; i < config.erc20s.length; ++i) { + // Find collateral's targetName index +- uint256 targetIndex; +- for (targetIndex = 0; targetIndex < targetsLength; ++targetIndex) { +- if (targetNames.at(targetIndex) == config.targetNames[config.erc20s[i]]) break; +- } ++ uint256 targetIndex = targetNames._inner._indexes[config.targetNames[config.erc20s[i]]] -1 ; ++ + assert(targetIndex < targetsLength); + // now, targetNames[targetIndex] == config.targetNames[erc20] + ``` + +Gas savings: +* The `_indexes` keys are considered warm since all values were inserted in the current tx +* Total saving is the sum of the index of the target names per each erc20 minus 1 +* on average (depends on the location of the target in the set for each erc20): `(config.erc20s.length)*(targetsLength-1)/2*100` + * E.g. for target length of 5 and 10 ERC20 that would save on average `10*4/2*100=2K` + +## [G-03] Use `furnace` instead of `main.furnace()` +Gas savings: ~2.6K + +Code: https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/RToken.sol#L184
+https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/RToken.sol#L257 + +At `RToken.redeemTo()` and `redeemCustom()` furnace is being called using `main.furnace()` instead of using the `furnace` variable. + +The call to `main.furnace()` costs both the cold storage variable read at `main.furnace()` and an external call to a cold address while using the `furnace` variable of the current contract costs only the cold storage read. + +The additional cold call would cost ~2.6K. + +To my understanding both of the values should be equal at all times so there shouldn't be an issue with the replacement. + +## [G-04] Deployer.implementations can be immutable +Gas saved: ~28K per RToken deployment + +The struct itself can’t be immutable, but you can save the values of the fields (and fields of the `components`) as immutable variables, and use an internal function to build the struct out of those immutable variables. + +This would save ~2.1K per field, with 13 fields that brings us to ~28K of units saved. + +## [G-05] Update `lastWithdrawRefresh` only if it has changed +Gas saved: ~100 + +At [`leakyRefresh()`](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/StRSR.sol#L674) `lastWithdrawRefresh` gets updated even if didn't change, that costs an additional 100 gas units. + +Proposed change: +```diff +- leaked = lastWithdrawRefresh != lastRefresh ? withdrawal : leaked + withdrawal; +- lastWithdrawRefresh = lastRefresh; ++ if(lastWithdrawRefresh != lastRefresh){ ++ leaked = withdrawal; ++ lastWithdrawRefresh = lastRefresh; ++ } else{ ++ leaked = leaked + withdrawal; ++ } +``` + +## [G-06] Require array to be sorted and use `sortedAndAllUnique` at `BackingManager.forwardRevenue()` +Estimated savings: `~n^2*10` where n is the length of the asset.
+For example for 20 assets that would save ~4K. + +## [G-07] Caching storage variable and function calls +This is one of the most common ways to save a nice amount of gas. Every additional read costs 100 gas units (when it comes to mapping or arrays there's additional cost), and each additional function call costs at least 100 gas units (usually much more). + +I've noticed a few instances where a storage variable read or a view-function call can be cached to memory to save gas, I'm pretty sure there are many more instances that I didn't notice. + +## [G-08]`BasketLib.nextBasket()` refactoring +Gas saved: a few thousand + +The following refactoring saves a few thousands of gas mostly by preventing: +1. Double call to `goodCollateral` +2. The second iteration over the whole `backup.erc20s` array +```diff +diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol +index bc52d1c6..7ab9c48b 100644 +--- a/contracts/p1/mixins/BasketLib.sol ++++ b/contracts/p1/mixins/BasketLib.sol +@@ -192,10 +192,8 @@ library BasketLibP1 { + // For each prime collateral token: + for (uint256 i = 0; i < config.erc20s.length; ++i) { + // Find collateral's targetName index +- uint256 targetIndex; +- for (targetIndex = 0; targetIndex < targetsLength; ++targetIndex) { +- if (targetNames.at(targetIndex) == config.targetNames[config.erc20s[i]]) break; +- } ++ uint256 targetIndex = targetNames._inner._indexes[config.targetNames[config.erc20s[i]]] -1 ; ++ + assert(targetIndex < targetsLength); + // now, targetNames[targetIndex] == config.targetNames[erc20] + +@@ -244,32 +242,32 @@ library BasketLibP1 { + uint256 size = 0; // backup basket size + BackupConfig storage backup = config.backups[targetNames.at(i)]; + ++ IERC20[] memory backupsToUse = new IERC20[](backup.erc20s.length); ++ + // Find the backup basket size: min(backup.max, # of good backup collateral) + for (uint256 j = 0; j < backup.erc20s.length && size < backup.max; ++j) { +- if (goodCollateral(targetNames.at(i), backup.erc20s[j], assetRegistry)) size++; ++ if (goodCollateral(targetNames.at(i), backup.erc20s[j], assetRegistry)) ++ { ++ backupsToUse[size] = backup.erc20s[j]; ++ size++; ++ } + } + + // Now, size = len(backups(tgt)). If empty, fail. + if (size == 0) return false; + +- // Set backup basket weights... +- uint256 assigned = 0; + + // Loop: for erc20 in backups(tgt)... +- for (uint256 j = 0; j < backup.erc20s.length && assigned < size; ++j) { +- if (goodCollateral(targetNames.at(i), backup.erc20s[j], assetRegistry)) { +- // Across this .add(), targetWeight(newBasket',erc20) +- // = targetWeight(newBasket,erc20) + unsoundPrimeWt(tgt) / len(backups(tgt)) +- newBasket.add( +- backup.erc20s[j], +- totalWeights[i].minus(goodWeights[i]).div( +- // this div is safe: targetPerRef > 0: goodCollateral check +- assetRegistry.toColl(backup.erc20s[j]).targetPerRef().mulu(size), +- CEIL +- ) +- ); +- assigned++; +- } ++ for (uint256 j = 0; j < size; ++j) { ++ ++ newBasket.add( ++ backupsToUse[j], ++ totalWeights[i].minus(goodWeights[i]).div( ++ // this div is safe: targetPerRef > 0: goodCollateral check ++ assetRegistry.toColl(backupsToUse[j]).targetPerRef().mulu(size), ++ CEIL ++ ) ++ ); + } + // Here, targetWeight(newBasket, e) = primeWt(e) + backupWt(e) for all e targeting tgt + } +``` + +## [G-09] `BasketLib.nextBasket()` caching +On top of the above refactoring: +* `config.erc20s[i]` is being read a few times [here](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/mixins/BasketLib.sol#L193-L224) +* `config.erc20s.length` and `backup.erc20s.length` can be cached +* `targetNames.at(i)` is being read twice in the second loop (3 before the proposed refactoring) + + +## [G-10]`sellAmount` at `DutchTrade.settle()` +`sellAmount` is read here twice if greater than `sellBal` +```solidity + soldAmt = sellAmount > sellBal ? sellAmount - sellBal : 0; +``` + +## [G-11] `quoteCustomRedemption()` loop +### `nonce` +Savings: `100*basketNonces.length`
+[Here](https://github.com/reserve-protocol/protocol/blob/c4ec2473bbcb4831d62af55d275368e73e16b984/contracts/p1/BasketHandler.sol#L398) nonce is being read each iteration. +It can be cached outside of the loop. + +### `basketNonces.length` +Savings: `100*basketNonces.length` + +### `b.erc20s.length` +Savings: `100*(sum of `b.erc20s.length` for all baskets)` + +## [G-12] Use custom errors instead of string errors +This saves gas both for deployment and in case that the revert is triggered. + + + +*** + +# [Mitigation Review](#mitigation-review) + +## Introduction + +Following the C4 audit, 3 wardens (0xA5DF, ronnyx2017, and rvierdiiev) reviewed the mitigations for all identified issues. Additional details can be found within the [C4 Reserve Protocol Mitigation Review repository](https://github.com/code-423n4/2023-08-reserve-mitigation). + +## Mitigation Review Scope + +### Branch + +https://github.com/reserve-protocol/protocol/pull/882 (commit hash 99d9db72e04db29f8e80e50a78b16a0b475d79f3) + +### Individual PRs + +| URL | Mitigation of | Purpose | +| ----------------------------------------------------------------------------------------------------------- | ------------- | ------------------------------------------------------------------------------ | +| https://github.com/reserve-protocol/protocol/pull/857 | H-01 | Fix redeemCustom | +| https://github.com/reserve-protocol/protocol/pull/888 | H-02 | Adds governance function to manually push the era forward | +| https://github.com/reserve-protocol/protocol/pull/876 | M-01 | Allow settle trade when paused or frozen | +| https://github.com/reserve-protocol/protocol/pull/873 & https://github.com/reserve-protocol/protocol/pull/869 | M-02 | Disable dutch auctions on a per-collateral basis, use 4-step dutch trade curve | +| https://github.com/reserve-protocol/protocol/pull/878 | M-03 | Distribute revenue in setDistribution | +| https://github.com/reserve-protocol/protocol/pull/885 | M-04 | Update payout variables if melt fails during setRatio | +| https://github.com/reserve-protocol/protocol-private/pull/15 | M-06 | Use lotPrice() | +| https://github.com/reserve-protocol/protocol-private/pull/7 | M-07 | Refresh before selling rewards, refactor revenue & distro | +| https://github.com/reserve-protocol/protocol/pull/857 | M-08 | payoutRewards before freeze and update payoutLastPaid before unfreeze | +| https://github.com/reserve-protocol/protocol-private/pull/3 | M-09 | Payout rewards during cancelUnstake | +| https://github.com/reserve-protocol/protocol/pull/886 | M-10 | Add oracle deprecation check | +| https://github.com/reserve-protocol/protocol/pull/857 | M-11 | Change gas reservation policy in AssetRegistry | + +### Out of Scope + +- [M-05: Lack of claimRewards when manageToken in RevenueTrader](https://github.com/code-423n4/2023-06-reserve-findings/issues/16) +- [M-12: Custom redemption can be used to get more than RToken value, when an upwards depeg occurs](https://github.com/code-423n4/2023-06-reserve-findings/issues/6) + +## Mitigation Review Summary + +| Original Issue | Status | Full Details | +| ----------- | ------------- | ----------- | +| H-01 | Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/7), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/30), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/3) | +| H-02 | Mitigation Confirmed | Reports from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/31), [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/8), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/11) | +| M-01 | Mitigation Confirmed | Reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/5), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/32), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/9) | +| M-02 | Mitigation Errors | Reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20) and [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40) - details also shared below | +| M-03 | Mitigation Error | Reports from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36) and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/10) - details also shared below | +| M-04 | Mitigation Error | Report from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/37) - details also shared below | +| M-05 | Sponsor Disputed | - | +| M-06 | Mitigation Confirmed | Reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/13), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/41), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/23) | +| M-07 | Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/24), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/34), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/14) | +| M-08 | Mitigation Confirmed | Reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/15), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/38), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/25) | +| M-09 | Mitigation Confirmed | Reports from [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/16), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/33), and [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/26) | +| M-10 | Mitigation Confirmed | Reports from [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/35), [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/28), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/17) | +| M-11 | Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/27), [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/39), and [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/18) | +| M-12 | Sponsor Acknowledged | - | + +**During their review, the wardens surfaced several mitigation errors. These consisted of 4 Medium severity issues. See below for details.** + +## [M-02 Mitigation Error: `dutchTradeDisabled[erc20]` gives governance an incentive to disable RSR auctions](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20)* + +**Severity: Medium** + +Lines of Code: [Broker.sol#L213-L216](https://github.com/reserve-protocol/protocol/blob/3.0.0-rc5/contracts/p1/Broker.sol#L213-L216) + +The mitigation adds different disable flags for GnosisTrade and DutchTrade. It can disable dutch trades by specific collateral. But it has serious problem with overall economic model design. + +The traders Broker contract are under control of the governance. The governance proposals are voted by stRSR stakers. And if the RToken is undercollateralized, the staking RSR will be sold for collaterals. In order to prevent this from happening, the governance(stakers) have every incentive to block the rsr auction. Although governance also can set disable flag for trade broker in the previous version of mitigation, there is a difference made it impossible to do so in previous versions. + +In the pre version, there is only one disable flag that disables any trades for any token. So if the governance votes for disable trades, the RToken users will find that they can't derive any gain from RToken. So no one would try to issue RToken by their collateral. It is also unacceptable for governance. + +But after the mitigation, the governance can decide only disable the DutchTrade for RSR. And they can initiate a proposal about enable RSR trade -> open openTrade -> re-disable RSR trade to ensure their own gains. And most importantly, this behavior seems to do no harm to RToken holders just on the face of it, and it therefore does not threaten RToken issuance. + +So in order to prevent the undercollateralized case, dutchTradeDisabled\[erc20] gives governance every incentive to disable RSR auctions. + +### Impact + +When RToken is undercollateralized, disabling RSR trade will force users into redeeming from RToken baskets. It will lead to even greater depeg, and the RToken users will bear all the losses, but the RSR stakers can emerge unscathed. + +### Proof of Concept + +StRSR stakers can initiate such a proposal to prevent staking RSR auctions: + +1. Call `Broker.setBatchTradeDisabled(bool disabled)` to disable any GnosisTrade. + +2. And call `setDutchTradeDisabled(RSR_address, true)` to disable RSR DutchTrade. + +### Recommended Mitigation Steps + +The `dutchTradeDisabled` flag of RSR should not be set to true directly by governance in the `Broker.setDutchTradeDisabled` function. Add a check like that: + + require(!(disabled && rsrTrader.tokenToBuy()==erc20),"xxxxxxx"); + +### Assessed type + +Context + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20#issuecomment-1692159329):** + > Anticipating restricting governance to only be able to _enable_ batch trade, or dutch trade. + + + +*** + +## [M-02 Mitigation Error: Attacker might disable trading by faking a report violation](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40)* + +**Severity: Medium** + +Lines of Code: [DutchTrade.sol#L212-L214](https://github.com/reserve-protocol/protocol/blob/99d9db72e04db29f8e80e50a78b16a0b475d79f3/contracts/plugins/trading/DutchTrade.sol#L212-L214) + +Dutch trade now creates a report violation whenever the price is x1.5 then the best price. + +The issue is that the attacker can fake a report violation by buying with the higher price. Since revenue traders don't have a minimum trade amount that can cost the attacker near zero funds. + +Mitigation might be to create violation report only if the price is high and the total value of the sell is above some threshold. + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40#issuecomment-1692064874)** + + + +*** + +## [M-03 Mitigation Error: Funds aren't distributed before changing distribution](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36), also found by [rvierdiiev](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/10)* + +**Severity: Medium** + +Lines of Code: [Distributor.sol#L59-L63](https://github.com/reserve-protocol/protocol/blob/99d9db72e04db29f8e80e50a78b16a0b475d79f3/contracts/p1/Distributor.sol#L59-L63) + +Mitigation does solve the issue; however there’s a wider issue here that funds aren’t distributed before set distribution is executed. + +Fully mitigating the issue might not be possible, as it’d require to send from the backing manager to revenue trader and sell all assets for the `tokenToBuy`. But we can at least distribute the current balance before changing the distribution. + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36#issuecomment-1692078866):** + > Anticipating adding a try-catch at the start of `setDistribution()` targeting `RevenueTrader.distributeTokenToBuy()` + + + +*** + +## [M-04 Mitigation Error: Furnace would melt less than intended](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/37) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/37)* + +**Severity: Medium** + +Lines of Code: [Furnace.sol#L92-L105](https://github.com/reserve-protocol/protocol/blob/99d9db72e04db29f8e80e50a78b16a0b475d79f3/contracts/p1/Furnace.sol#L92-L105) + +We traded one problem with another here. The original issue was that in case `melt()` fails then the distribution would use the new rate for previous periods as well. + +The issue now is that in case of a failure (e.g. paused or frozen) we simply don’t melt for the previous period. Meaning RToken holders would get deprived of the melting they’re supposed to get. + +This is especially noticeable when the ratio has been decreased and the balance didn’t grow much, in that case we do more harm than good by updating `lastPayout` and `lastPayoutBal`. + +A better mitigation might be to update the `lastPayout` in a way that would reflect the melting that should be distributed. + +**[tbrent (Reserve) acknowledged and commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/37#issuecomment-1692068277):** + > I think this can only happen when frozen, not while paused. `Furnace.melt()` and `RToken.melt()` succeed while paused. + + + +*** + +# Disclosures + +C4 is an open organization governed by participants in the community. + +C4 Audits incentivize the discovery of exploits, vulnerabilities, and bugs in smart contracts. Security researchers are rewarded at an increasing rate for finding higher-risk issues. Audit submissions are judged by a knowledgeable security researcher and solidity developer and disclosed to sponsoring developers. C4 does not conduct formal verification regarding the provided code but instead provides final verification. + +C4 does not provide any guarantee or warranty regarding the security of this project. All smart contract software should be used at the sole risk and responsibility of users. diff --git a/book.toml b/book.toml new file mode 100644 index 0000000000..6b2acd5dbb --- /dev/null +++ b/book.toml @@ -0,0 +1,15 @@ +[book] +src = "src" +title = "Reserve Developer Documentation" + +[output.html] +no-section-label = true +additional-js = ["solidity.min.js"] +additional-css = [ + "book.css", + "custom.css", +] +git-repository-url = "https://github.com/reserve-protocol/protocol" + +[output.html.fold] +enable = true \ No newline at end of file diff --git a/common/configuration.ts b/common/configuration.ts index c12edfa2ce..c9b10de792 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -9,6 +9,7 @@ interface ICurrencies { export interface ITokens { DAI?: string USDC?: string + USDbC?: string USDT?: string USDP?: string TUSD?: string @@ -25,6 +26,10 @@ export interface ITokens { aWETH?: string aWBTC?: string aCRV?: string + aEthUSDC?: string + aBasUSDbC?: string + aWETHv3?: string + acbETHv3?: string cDAI?: string cUSDC?: string cUSDT?: string @@ -51,6 +56,7 @@ export interface ITokens { wstETH?: string rETH?: string cUSDCv3?: string + cUSDbCv3?: string ONDO?: string sDAI?: string cbETH?: string @@ -73,7 +79,8 @@ export interface ITokens { export interface IFeeds { stETHETH?: string stETHUSD?: string - wBTCBTC?: string + wstETHstETHexr?: string + cbETHETHexr?: string } export interface IPools { @@ -102,6 +109,9 @@ interface INetworkConfig { MORPHO_AAVE_CONTROLLER?: string MORPHO_REWARDS_DISTRIBUTOR?: string MORPHO_AAVE_LENS?: string + COMET_REWARDS?: string + AAVE_V3_INCENTIVES_CONTROLLER?: string + AAVE_V3_POOL?: string } export const networkConfig: { [key: string]: INetworkConfig } = { @@ -132,6 +142,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', aWBTC: '0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656', aCRV: '0x8dae6cb04688c62d939ed9b68d32bc62e49970b1', + aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', @@ -192,7 +203,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - wBTCBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', // "WBTC/BTC" }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', @@ -205,15 +215,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', - }, - '3': { - name: 'ropsten', - tokens: { - USDC: '0x07865c6e87b9f70255377e024ace6630c1eaa37f', - RSR: '0x320623b8e4ff03373931769a31fc52a4e78b5d70', - }, - chainlinkFeeds: {}, - COMPTROLLER: '0xcfa7b0e37f5AC60f3ae25226F5e39ec59AD26152', + COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', + AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', }, '1': { name: 'mainnet', @@ -234,6 +238,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aBUSD: '0xA361718326c15715591c299427c62086F69923D9', aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', + aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', @@ -296,7 +301,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - wBTCBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', // "WBTC/BTC" }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -306,6 +310,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', + COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', + AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', }, '3': { name: 'tenderly', @@ -326,6 +333,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aBUSD: '0xA361718326c15715591c299427c62086F69923D9', aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', + aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', @@ -388,7 +396,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - wBTCBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', // "WBTC/BTC" }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -398,6 +405,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', + COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', + AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', }, '5': { name: 'goerli', @@ -487,6 +497,37 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, GNOSIS_EASY_AUCTION: '0xcdf32E323e69090eCA17adDeF058A6A921c3e75A', // mock }, + '8453': { + name: 'base', + tokens: { + DAI: '0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb', + USDbC: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA', + RSR: '0xaB36452DbAC151bE02b16Ca17d8919826072f64a', + COMP: '0x9e1028F5F1D5eDE59748FFceE5532509976840E0', + WETH: '0x4200000000000000000000000000000000000006', + cbETH: '0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22', + cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', + aBasUSDbC: '0x0a1d576f3eFeF75b330424287a95A366e8281D54', + aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', + acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', + }, + chainlinkFeeds: { + DAI: '0x591e79239a7d679378ec8c847e5038150364c78f', // 0.3%, 24hr + ETH: '0x71041dddad3595f9ced3dccfbe3d1f4b0a16bb70', // 0.15%, 20min + WBTC: '0xccadc697c55bbb68dc5bcdf8d3cbe83cdd4e071e', // 0.5%, 24hr + USDC: '0x7e860098f58bbfc8648a4311b374b1d669a2bc6b', // 0.3%, 24hr + USDT: '0xf19d560eb8d2adf07bd6d13ed03e1d11215721f9', // 0.3%, 24hr + COMP: '0x9dda783de64a9d1a60c49ca761ebe528c35ba428', // 0.5%, 24hr + cbETH: '0x806b4ac04501c29769051e42783cf04dce41440b', // 0.5%, 24hr + RSR: '0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1', // 2%, 24hr + wstETHstETHexr: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061', // 0.5%, 24hr + cbETHETHexr: '0x868a501e68F3D1E89CfC0D22F6b22E8dabce5F04', // 0.5%, 24hr + }, + GNOSIS_EASY_AUCTION: '0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02', // mock + COMET_REWARDS: '0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1', + AAVE_V3_POOL: '0xA238Dd80C259a72e81d7e4664a9801593F98d1c5', + AAVE_V3_INCENTIVES_CONTROLLER: '0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44', + }, } export const getNetworkConfig = (chainId: string) => { diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index cbe95038f6..37ec3dc4be 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -59,6 +59,8 @@ contract FacadeAct is IFacadeAct, Multicall { ); } + if (toStart.length == 0) return; + // Transfer revenue backingManager -> revenueTrader _forwardRevenue(revenueTrader.main().backingManager(), toStart); diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index 7d4a4c2c12..ed791cb244 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -165,7 +165,7 @@ contract FacadeWrite is IFacadeWrite { timelock.grantRole(timelock.PROPOSER_ROLE(), governance); // Gov only proposer // Set Guardian as canceller, if address(0) then no one can cancel timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); - timelock.grantRole(timelock.EXECUTOR_ROLE(), address(0)); // Anyone as executor + timelock.grantRole(timelock.EXECUTOR_ROLE(), governance); // Gov only executor timelock.revokeRole(timelock.TIMELOCK_ADMIN_ROLE(), address(this)); // Revoke admin role // Set new owner to timelock diff --git a/contracts/interfaces/IDeployer.sol b/contracts/interfaces/IDeployer.sol index 164c60a8c1..18c1cc4ddc 100644 --- a/contracts/interfaces/IDeployer.sol +++ b/contracts/interfaces/IDeployer.sol @@ -85,6 +85,11 @@ interface IDeployer is IVersioned { string version ); + /// Emitted when a new RTokenAsset is deployed during `deployRTokenAsset` + /// @param rToken The address of the RToken ERC20 + /// @param rTokenAsset The address of the RTokenAsset + event RTokenAssetCreated(IRToken indexed rToken, IAsset rTokenAsset); + // /// Deploys an instance of the entire system diff --git a/contracts/p0/Deployer.sol b/contracts/p0/Deployer.sol index 0b1ff0324a..c143ec9d62 100644 --- a/contracts/p0/Deployer.sol +++ b/contracts/p0/Deployer.sol @@ -162,7 +162,12 @@ contract DeployerP0 is IDeployer, Versioned { } /// @param maxTradeVolume {UoA} The maximum trade volume for the RTokenAsset - function deployRTokenAsset(IRToken rToken, uint192 maxTradeVolume) external returns (IAsset) { - return new RTokenAsset(rToken, maxTradeVolume); + /// @return rTokenAsset The address of the newly deployed RTokenAsset + function deployRTokenAsset(IRToken rToken, uint192 maxTradeVolume) + external + returns (IAsset rTokenAsset) + { + rTokenAsset = new RTokenAsset(rToken, maxTradeVolume); + emit RTokenAssetCreated(rToken, rTokenAsset); } } diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index 72ae48ad53..fd9ea5aa19 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -304,6 +304,9 @@ library TradingLibP0 { } (uint192 low, uint192 high) = asset.price(); // {UoA/tok} + // price() is better than lotPrice() here: it's important to not underestimate how + // much value could be in a token that is unpriced by using a decaying high lotPrice. + // price() will return [0, FIX_MAX] in this case, which is preferable. // Skip over dust-balance assets not in the basket // Intentionally include value of IFFY/DISABLED collateral diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index c5cdb649e8..a83603c226 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -46,6 +46,7 @@ contract BrokerP1 is ComponentP1, IBroker { // Whether Batch Auctions are disabled. // Initially false. Settable by OWNER. // A GnosisTrade clone can set it to true via reportViolation() + /// @custom:oz-renamed-from disabled bool public batchTradeDisabled; // The set of ITrade (clone) addresses this contract has created diff --git a/contracts/p1/Deployer.sol b/contracts/p1/Deployer.sol index 23f0b34ac1..2119420e43 100644 --- a/contracts/p1/Deployer.sol +++ b/contracts/p1/Deployer.sol @@ -251,7 +251,12 @@ contract DeployerP1 is IDeployer, Versioned { /// Deploys a new RTokenAsset instance. Not needed during normal deployment flow /// @param maxTradeVolume {UoA} The maximum trade volume for the RTokenAsset - function deployRTokenAsset(IRToken rToken, uint192 maxTradeVolume) external returns (IAsset) { - return new RTokenAsset(rToken, maxTradeVolume); + /// @return rTokenAsset The address of the newly deployed RTokenAsset + function deployRTokenAsset(IRToken rToken, uint192 maxTradeVolume) + external + returns (IAsset rTokenAsset) + { + rTokenAsset = new RTokenAsset(rToken, maxTradeVolume); + emit RTokenAssetCreated(rToken, rTokenAsset); } } diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index c6eff7ff4f..ac5deeb3f5 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -130,8 +130,7 @@ library RecollateralizationLibP1 { // Compute the target basket range // Algorithm intuition: Trade conservatively. Quantify uncertainty based on the proportion of // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty - // the largest amount possible with each trade. As long as trades clear within the expected - // range of prices, the basket range should narrow with each iteration (under constant prices) + // the largest amount possible with each trade. // // How do we know this algorithm converges? // Assumption: constant oracle prices; monotonically increasing refPerTok() @@ -143,8 +142,8 @@ library RecollateralizationLibP1 { // run-to-run, but will never increase it // // Preconditions: - // - ctx is correctly populated, with current basketsHeld + quantities - // - reg contains erc20 + asset arrays in same order and without duplicates + // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top + // - reg contains erc20 + asset + quantities arrays in same order and without duplicates // Trading Strategy: // - We will not aim to hold more than rToken.basketsNeeded() BUs // - No double trades: capital converted from token A to token B should not go to token C diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol new file mode 100644 index 0000000000..0fc8e40884 --- /dev/null +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -0,0 +1,108 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { CEIL, FIX_MAX, FixLib, _safeWrap } from "../../libraries/Fixed.sol"; +import { AggregatorV3Interface, OracleLib } from "./OracleLib.sol"; +import { CollateralConfig, AppreciatingFiatCollateral } from "./AppreciatingFiatCollateral.sol"; +import { CollateralStatus } from "../../interfaces/IAsset.sol"; + +/** + * @title L2LSDCollateral + * @notice Base collateral plugin for LSDs on L2s. Inherited per collateral. + * @notice _underlyingRefPerTok uses a chainlink feed rather than direct contract calls. + */ +abstract contract L2LSDCollateral is AppreciatingFiatCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + AggregatorV3Interface public immutable exchangeRateChainlinkFeed; + uint48 public immutable exchangeRateChainlinkTimeout; + + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide + /// @param _exchangeRateChainlinkFeed {target/tok} L1 LSD exchange rate, oraclized to L2 + /// @param _exchangeRateChainlinkTimeout {s} Timeout for L1 LSD exchange rate oracle + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + AggregatorV3Interface _exchangeRateChainlinkFeed, + uint48 _exchangeRateChainlinkTimeout + ) AppreciatingFiatCollateral(config, revenueHiding) { + require(address(_exchangeRateChainlinkFeed) != address(0), "missing exchangeRate feed"); + require(_exchangeRateChainlinkTimeout != 0, "exchangeRateChainlinkTimeout zero"); + + exchangeRateChainlinkFeed = _exchangeRateChainlinkFeed; + exchangeRateChainlinkTimeout = _exchangeRateChainlinkTimeout; + } + + /// Should not revert + /// Refresh exchange rates and update default status. + /// @dev Should not need to override: can handle collateral with variable refPerTok() + function refresh() public virtual override { + CollateralStatus oldStatus = status(); + + // Check for hard default + // must happen before tryPrice() call since `refPerTok()` returns a stored value + + // revenue hiding: do not DISABLE if drawdown is small + // underlyingRefPerTok may fail call to chainlink oracle, need to catch + try this.getUnderlyingRefPerTok() returns (uint192 underlyingRefPerTok) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok < exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); + } + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } + } + + function getUnderlyingRefPerTok() public view returns (uint192) { + return _underlyingRefPerTok(); + } + + /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens + function _underlyingRefPerTok() internal view override returns (uint192) { + return exchangeRateChainlinkFeed.price(exchangeRateChainlinkTimeout); + } +} diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol new file mode 100644 index 0000000000..2edfd5d65b --- /dev/null +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../../libraries/Fixed.sol"; +import "../AppreciatingFiatCollateral.sol"; + +import { StaticATokenV3LM } from "./vendor/StaticATokenV3LM.sol"; + +/** + * @title AaveV3FiatCollateral + * @notice Collateral plugin for an aToken for a UoA-pegged asset, like aUSDC or a aUSDP on Aave V3 + * Expected: {tok} != {ref}, {ref} is pegged to {target} unless defaulting, {target} == {UoA} + */ +contract AaveV3FiatCollateral is AppreciatingFiatCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + // solhint-disable no-empty-blocks + /// @param config.chainlinkFeed Feed units: {UoA/ref} + /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + {} + + // solhint-enable no-empty-blocks + + /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens + function _underlyingRefPerTok() internal view override returns (uint192) { + uint256 rate = StaticATokenV3LM(address(erc20)).rate(); // {ray ref/tok} + + return shiftl_toFix(rate, -27); // {ray -> wad} + } + + /// Claim rewards earned by holding a balance of the ERC20 token + /// delegatecall + /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + function claimRewards() external virtual override(Asset, IRewardable) { + StaticATokenV3LM(address(erc20)).claimRewards(); + } +} diff --git a/contracts/plugins/assets/aave-v3/mock/MockStaticATokenV3.sol b/contracts/plugins/assets/aave-v3/mock/MockStaticATokenV3.sol new file mode 100644 index 0000000000..33fd031d93 --- /dev/null +++ b/contracts/plugins/assets/aave-v3/mock/MockStaticATokenV3.sol @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: BUSL-1.1 +pragma solidity 0.8.19; + +import { StaticATokenV3LM, IPool, IRewardsController } from "../vendor/StaticATokenV3LM.sol"; + +contract MockStaticATokenV3LM is StaticATokenV3LM { + uint256 public customRate; + + /* solhint-disable no-empty-blocks */ + constructor(IPool pool, IRewardsController rewardsController) + StaticATokenV3LM(pool, rewardsController) + {} + + /* solhint-enable no-empty-blocks */ + + function rate() public view override returns (uint256) { + if (customRate != 0) { + return customRate; + } + + return POOL.getReserveNormalizedIncome(_aTokenUnderlying); + } + + function mockSetCustomRate(uint256 _customRate) external { + customRate = _customRate; + } +} diff --git a/contracts/plugins/assets/aave-v3/vendor/ERC20.sol b/contracts/plugins/assets/aave-v3/vendor/ERC20.sol new file mode 100644 index 0000000000..1cfa9889f1 --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/ERC20.sol @@ -0,0 +1,237 @@ +// SPDX-License-Identifier: AGPL-3.0-only +pragma solidity >=0.8.0; + +/* solhint-disable */ + +/// @notice Modern and gas efficient ERC20 + EIP-2612 implementation. +/// @author Solmate (https://github.com/Rari-Capital/solmate/blob/main/src/tokens/ERC20.sol) +/// @author Modified from Uniswap (https://github.com/Uniswap/uniswap-v2-core/blob/master/contracts/UniswapV2ERC20.sol) +/// @dev Do not manually set balances without updating totalSupply, as the sum of all user balances must not exceed it. +abstract contract ERC20 { + /* ////////////////////////////////////////////////////////////// + EVENTS + ////////////////////////////////////////////////////////////// */ + + event Transfer(address indexed from, address indexed to, uint256 amount); + + event Approval(address indexed owner, address indexed spender, uint256 amount); + + /* ////////////////////////////////////////////////////////////// + METADATA STORAGE + ////////////////////////////////////////////////////////////// */ + + string public name; + + string public symbol; + + uint8 public decimals; + + /* ////////////////////////////////////////////////////////////// + ERC20 STORAGE + ////////////////////////////////////////////////////////////// */ + + uint256 public totalSupply; + + mapping(address => uint256) public balanceOf; + + mapping(address => mapping(address => uint256)) public allowance; + + /* ////////////////////////////////////////////////////////////// + EIP-2612 STORAGE + ////////////////////////////////////////////////////////////// */ + + uint256 internal immutable INITIAL_CHAIN_ID; + + bytes32 internal immutable INITIAL_DOMAIN_SEPARATOR; + + mapping(address => uint256) public nonces; + + /* ////////////////////////////////////////////////////////////// + CONSTRUCTOR + ////////////////////////////////////////////////////////////// */ + + constructor( + string memory _name, + string memory _symbol, + uint8 _decimals + ) { + name = _name; + symbol = _symbol; + decimals = _decimals; + + INITIAL_CHAIN_ID = block.chainid; + INITIAL_DOMAIN_SEPARATOR = computeDomainSeparator(); + } + + /* ////////////////////////////////////////////////////////////// + ERC20 LOGIC + ////////////////////////////////////////////////////////////// */ + + function approve(address spender, uint256 amount) public virtual returns (bool) { + allowance[msg.sender][spender] = amount; + + emit Approval(msg.sender, spender, amount); + + return true; + } + + function transfer(address to, uint256 amount) public virtual returns (bool) { + _beforeTokenTransfer(msg.sender, to, amount); + balanceOf[msg.sender] -= amount; + + // Cannot overflow because the sum of all user + // balances can't exceed the max uint256 value. + unchecked { + balanceOf[to] += amount; + } + + emit Transfer(msg.sender, to, amount); + + return true; + } + + function transferFrom( + address from, + address to, + uint256 amount + ) public virtual returns (bool) { + _beforeTokenTransfer(from, to, amount); + uint256 allowed = allowance[from][msg.sender]; // Saves gas for limited approvals. + + if (allowed != type(uint256).max) allowance[from][msg.sender] = allowed - amount; + + balanceOf[from] -= amount; + + // Cannot overflow because the sum of all user + // balances can't exceed the max uint256 value. + unchecked { + balanceOf[to] += amount; + } + + emit Transfer(from, to, amount); + + return true; + } + + /* ////////////////////////////////////////////////////////////// + EIP-2612 LOGIC + ////////////////////////////////////////////////////////////// */ + + function permit( + address owner, + address spender, + uint256 value, + uint256 deadline, + uint8 v, + bytes32 r, + bytes32 s + ) public virtual { + require(deadline >= block.timestamp, "PERMIT_DEADLINE_EXPIRED"); + + // Unchecked because the only math done is incrementing + // the owner's nonce which cannot realistically overflow. + unchecked { + address recoveredAddress = ecrecover( + keccak256( + abi.encodePacked( + "\x19\x01", + DOMAIN_SEPARATOR(), + keccak256( + abi.encode( + keccak256( + "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)" + ), + owner, + spender, + value, + nonces[owner]++, + deadline + ) + ) + ) + ), + v, + r, + s + ); + + require(recoveredAddress != address(0) && recoveredAddress == owner, "INVALID_SIGNER"); + + allowance[recoveredAddress][spender] = value; + } + + emit Approval(owner, spender, value); + } + + function DOMAIN_SEPARATOR() public view virtual returns (bytes32) { + return + block.chainid == INITIAL_CHAIN_ID ? INITIAL_DOMAIN_SEPARATOR : computeDomainSeparator(); + } + + function computeDomainSeparator() internal view virtual returns (bytes32) { + return + keccak256( + abi.encode( + keccak256( + "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)" + ), + keccak256(bytes(name)), + keccak256("1"), + block.chainid, + address(this) + ) + ); + } + + /* ////////////////////////////////////////////////////////////// + INTERNAL MINT/BURN LOGIC + ////////////////////////////////////////////////////////////// */ + + function _mint(address to, uint256 amount) internal virtual { + _beforeTokenTransfer(address(0), to, amount); + totalSupply += amount; + + // Cannot overflow because the sum of all user + // balances can't exceed the max uint256 value. + unchecked { + balanceOf[to] += amount; + } + + emit Transfer(address(0), to, amount); + } + + function _burn(address from, uint256 amount) internal virtual { + _beforeTokenTransfer(from, address(0), amount); + balanceOf[from] -= amount; + + // Cannot underflow because a user's balance + // will never be larger than the total supply. + unchecked { + totalSupply -= amount; + } + + emit Transfer(from, address(0), amount); + } + + /** + * @dev Hook that is called before any transfer of tokens. This includes + * minting and burning. + * + * Calling conditions: + * + * - when `from` and `to` are both non-zero, `amount` of ``from``'s tokens + * will be to transferred to `to`. + * - when `from` is zero, `amount` tokens will be minted for `to`. + * - when `to` is zero, `amount` of ``from``'s tokens will be burned. + * - `from` and `to` are never both zero. + * + * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks]. + */ + function _beforeTokenTransfer( + address from, + address to, + uint256 amount + ) internal virtual {} +} + +/* solhint-enable */ diff --git a/contracts/plugins/assets/aave-v3/vendor/RayMathExplicitRounding.sol b/contracts/plugins/assets/aave-v3/vendor/RayMathExplicitRounding.sol new file mode 100644 index 0000000000..b95df0c04d --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/RayMathExplicitRounding.sol @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.8.10; + +/* solhint-disable max-line-length */ + +enum Rounding { + UP, + DOWN +} + +/** + * Simplified version of RayMath that instead of half-up rounding does explicit rounding in a specified direction. + * This is needed to have a 4626 complient implementation, that always predictable rounds in favor of the vault / static a token. + */ +library RayMathExplicitRounding { + uint256 internal constant RAY = 1e27; + uint256 internal constant WAD_RAY_RATIO = 1e9; + + function rayMulRoundDown(uint256 a, uint256 b) internal pure returns (uint256) { + if (a == 0 || b == 0) { + return 0; + } + return (a * b) / RAY; + } + + function rayMulRoundUp(uint256 a, uint256 b) internal pure returns (uint256) { + if (a == 0 || b == 0) { + return 0; + } + return ((a * b) + RAY - 1) / RAY; + } + + function rayDivRoundDown(uint256 a, uint256 b) internal pure returns (uint256) { + return (a * RAY) / b; + } + + function rayDivRoundUp(uint256 a, uint256 b) internal pure returns (uint256) { + return ((a * RAY) + b - 1) / b; + } + + function rayToWadRoundDown(uint256 a) internal pure returns (uint256) { + return a / WAD_RAY_RATIO; + } +} + +/* solhint-enable max-line-length */ diff --git a/contracts/plugins/assets/aave-v3/vendor/StaticATokenErrors.sol b/contracts/plugins/assets/aave-v3/vendor/StaticATokenErrors.sol new file mode 100644 index 0000000000..ccd554d757 --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/StaticATokenErrors.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.8.10; + +library StaticATokenErrors { + string public constant INVALID_OWNER = "1"; + string public constant INVALID_EXPIRATION = "2"; + string public constant INVALID_SIGNATURE = "3"; + string public constant INVALID_DEPOSITOR = "4"; + string public constant INVALID_RECIPIENT = "5"; + string public constant INVALID_CLAIMER = "6"; + string public constant ONLY_ONE_AMOUNT_FORMAT_ALLOWED = "7"; + string public constant INVALID_ZERO_AMOUNT = "8"; + string public constant REWARD_NOT_INITIALIZED = "9"; +} diff --git a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol new file mode 100644 index 0000000000..0b0654cac6 --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol @@ -0,0 +1,753 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.10; + +/* solhint-disable */ + +import { IPool } from "@aave/core-v3/contracts/interfaces/IPool.sol"; +import { DataTypes, ReserveConfiguration } from "@aave/core-v3/contracts/protocol/libraries/configuration/ReserveConfiguration.sol"; +import { IScaledBalanceToken } from "@aave/core-v3/contracts/interfaces/IScaledBalanceToken.sol"; +import { IRewardsController } from "@aave/periphery-v3/contracts/rewards/interfaces/IRewardsController.sol"; +import { WadRayMath } from "@aave/core-v3/contracts/protocol/libraries/math/WadRayMath.sol"; +import { MathUtils } from "@aave/core-v3/contracts/protocol/libraries/math/MathUtils.sol"; + +import { IStaticATokenV3LM } from "./interfaces/IStaticATokenV3LM.sol"; +import { IAToken } from "./interfaces/IAToken.sol"; +import { IInitializableStaticATokenLM } from "./interfaces/IInitializableStaticATokenLM.sol"; +import { StaticATokenErrors } from "./StaticATokenErrors.sol"; +import { RayMathExplicitRounding, Rounding } from "./RayMathExplicitRounding.sol"; + +import { IERC4626 } from "./interfaces/IERC4626.sol"; +import { ERC20 } from "./ERC20.sol"; + +import { IERC20Metadata, IERC20 } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { IERC20Permit } from "@openzeppelin/contracts/token/ERC20/extensions/draft-IERC20Permit.sol"; +import { SafeCast } from "@openzeppelin/contracts/utils/math/SafeCast.sol"; +import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; +import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; + +import { IRewardable } from "../../../../interfaces/IRewardable.sol"; + +/** + * @title StaticATokenLM + * @notice Wrapper smart contract that allows to deposit tokens on the Aave protocol and receive + * a token which balance doesn't increase automatically, but uses an ever-increasing exchange rate. + * It supports claiming liquidity mining rewards from the Aave system. + * @author BGD Labs + * From https://github.com/bgd-labs/static-a-token-v3/blob/b9f6f86b6d89c7407eeb0013af248d3c5f4d09c8/src/StaticATokenLM.sol + * Original source was formally verified + * https://github.com/bgd-labs/static-a-token-v3/blob/b9f6f86b6d89c7407eeb0013af248d3c5f4d09c8/audits/Formal_Verification_Report_staticAToken.pdf + * @dev This contract has been further modified by Reserve to include the claimRewards() function. This is the only change. + */ +contract StaticATokenV3LM is + Initializable, + ERC20("STATIC__aToken_IMPL", "STATIC__aToken_IMPL", 18), + IStaticATokenV3LM, + IERC4626, + IRewardable +{ + using SafeERC20 for IERC20; + using SafeCast for uint256; + using WadRayMath for uint256; + using RayMathExplicitRounding for uint256; + + bytes32 public constant METADEPOSIT_TYPEHASH = + keccak256( + "Deposit(address depositor,address receiver,uint256 assets,uint16 referralCode,bool depositToAave,uint256 nonce,uint256 deadline,PermitParams permit)" + ); + bytes32 public constant METAWITHDRAWAL_TYPEHASH = + keccak256( + "Withdraw(address owner,address receiver,uint256 shares,uint256 assets,bool withdrawFromAave,uint256 nonce,uint256 deadline)" + ); + + uint256 public constant STATIC__ATOKEN_LM_REVISION = 2; + + IPool public immutable POOL; + IRewardsController public immutable INCENTIVES_CONTROLLER; + + IERC20 internal _aToken; + address internal _aTokenUnderlying; + address[] internal _rewardTokens; + mapping(address => RewardIndexCache) internal _startIndex; + mapping(address => mapping(address => UserRewardsData)) internal _userRewardsData; + + constructor(IPool pool, IRewardsController rewardsController) { + POOL = pool; + INCENTIVES_CONTROLLER = rewardsController; + } + + ///@inheritdoc IInitializableStaticATokenLM + function initialize( + address newAToken, + string calldata staticATokenName, + string calldata staticATokenSymbol + ) external initializer { + require(IAToken(newAToken).POOL() == address(POOL)); + _aToken = IERC20(newAToken); + + name = staticATokenName; + symbol = staticATokenSymbol; + decimals = IERC20Metadata(newAToken).decimals(); + + _aTokenUnderlying = IAToken(newAToken).UNDERLYING_ASSET_ADDRESS(); + IERC20(_aTokenUnderlying).safeApprove(address(POOL), type(uint256).max); + + if (INCENTIVES_CONTROLLER != IRewardsController(address(0))) { + refreshRewardTokens(); + } + + emit InitializedStaticATokenLM(newAToken, staticATokenName, staticATokenSymbol); + } + + ///@inheritdoc IStaticATokenV3LM + function refreshRewardTokens() public override { + address[] memory rewards = INCENTIVES_CONTROLLER.getRewardsByAsset(address(_aToken)); + for (uint256 i = 0; i < rewards.length; i++) { + _registerRewardToken(rewards[i]); + } + } + + ///@inheritdoc IStaticATokenV3LM + function isRegisteredRewardToken(address reward) public view override returns (bool) { + return _startIndex[reward].isRegistered; + } + + ///@inheritdoc IStaticATokenV3LM + function deposit( + uint256 assets, + address receiver, + uint16 referralCode, + bool depositToAave + ) external returns (uint256) { + (uint256 shares, ) = _deposit(msg.sender, receiver, 0, assets, referralCode, depositToAave); + return shares; + } + + ///@inheritdoc IStaticATokenV3LM + function metaDeposit( + address depositor, + address receiver, + uint256 assets, + uint16 referralCode, + bool depositToAave, + uint256 deadline, + PermitParams calldata permit, + SignatureParams calldata sigParams + ) external returns (uint256) { + require(depositor != address(0), StaticATokenErrors.INVALID_DEPOSITOR); + //solium-disable-next-line + require(deadline >= block.timestamp, StaticATokenErrors.INVALID_EXPIRATION); + uint256 nonce = nonces[depositor]; + + // Unchecked because the only math done is incrementing + // the owner's nonce which cannot realistically overflow. + unchecked { + bytes32 digest = keccak256( + abi.encodePacked( + "\x19\x01", + DOMAIN_SEPARATOR(), + keccak256( + abi.encode( + METADEPOSIT_TYPEHASH, + depositor, + receiver, + assets, + referralCode, + depositToAave, + nonce, + deadline, + permit + ) + ) + ) + ); + nonces[depositor] = nonce + 1; + require( + depositor == ecrecover(digest, sigParams.v, sigParams.r, sigParams.s), + StaticATokenErrors.INVALID_SIGNATURE + ); + } + // assume if deadline 0 no permit was supplied + if (permit.deadline != 0) { + IERC20Permit(depositToAave ? address(_aTokenUnderlying) : address(_aToken)).permit( + depositor, + address(this), + permit.value, + permit.deadline, + permit.v, + permit.r, + permit.s + ); + } + (uint256 shares, ) = _deposit(depositor, receiver, 0, assets, referralCode, depositToAave); + return shares; + } + + ///@inheritdoc IStaticATokenV3LM + function metaWithdraw( + address owner, + address receiver, + uint256 shares, + uint256 assets, + bool withdrawFromAave, + uint256 deadline, + SignatureParams calldata sigParams + ) external returns (uint256, uint256) { + require(owner != address(0), StaticATokenErrors.INVALID_OWNER); + //solium-disable-next-line + require(deadline >= block.timestamp, StaticATokenErrors.INVALID_EXPIRATION); + uint256 nonce = nonces[owner]; + // Unchecked because the only math done is incrementing + // the owner's nonce which cannot realistically overflow. + unchecked { + bytes32 digest = keccak256( + abi.encodePacked( + "\x19\x01", + DOMAIN_SEPARATOR(), + keccak256( + abi.encode( + METAWITHDRAWAL_TYPEHASH, + owner, + receiver, + shares, + assets, + withdrawFromAave, + nonce, + deadline + ) + ) + ) + ); + nonces[owner] = nonce + 1; + require( + owner == ecrecover(digest, sigParams.v, sigParams.r, sigParams.s), + StaticATokenErrors.INVALID_SIGNATURE + ); + } + return _withdraw(owner, receiver, shares, assets, withdrawFromAave); + } + + ///@inheritdoc IERC4626 + function previewRedeem(uint256 shares) public view virtual returns (uint256) { + return _convertToAssets(shares, Rounding.DOWN); + } + + ///@inheritdoc IERC4626 + function previewMint(uint256 shares) public view virtual returns (uint256) { + return _convertToAssets(shares, Rounding.UP); + } + + ///@inheritdoc IERC4626 + function previewWithdraw(uint256 assets) public view virtual returns (uint256) { + return _convertToShares(assets, Rounding.UP); + } + + ///@inheritdoc IERC4626 + function previewDeposit(uint256 assets) public view virtual returns (uint256) { + return _convertToShares(assets, Rounding.DOWN); + } + + ///@inheritdoc IStaticATokenV3LM + function rate() public view virtual returns (uint256) { + return POOL.getReserveNormalizedIncome(_aTokenUnderlying); + } + + ///@inheritdoc IStaticATokenV3LM + function collectAndUpdateRewards(address reward) public returns (uint256) { + if (reward == address(0)) { + return 0; + } + + address[] memory assets = new address[](1); + assets[0] = address(_aToken); + + return INCENTIVES_CONTROLLER.claimRewards(assets, type(uint256).max, address(this), reward); + } + + ///@inheritdoc IStaticATokenV3LM + function claimRewardsOnBehalf( + address onBehalfOf, + address receiver, + address[] memory rewards + ) external { + require( + msg.sender == onBehalfOf || msg.sender == INCENTIVES_CONTROLLER.getClaimer(onBehalfOf), + StaticATokenErrors.INVALID_CLAIMER + ); + _claimRewardsOnBehalf(onBehalfOf, receiver, rewards); + } + + ///@inheritdoc IStaticATokenV3LM + function claimRewards(address receiver, address[] memory rewards) external { + _claimRewardsOnBehalf(msg.sender, receiver, rewards); + } + + /// @dev Added by Reserve + function claimRewards() external { + address[] memory rewardsList = INCENTIVES_CONTROLLER.getRewardsList(); + + for (uint256 i = 0; i < rewardsList.length; i++) { + address currentReward = rewardsList[i]; + + uint256 prevBalance = IERC20(currentReward).balanceOf(msg.sender); + + address[] memory rewardsToCollect = new address[](1); + rewardsToCollect[0] = currentReward; + _claimRewardsOnBehalf(msg.sender, msg.sender, rewardsToCollect); + + emit RewardsClaimed( + IERC20(currentReward), + IERC20(currentReward).balanceOf(msg.sender) - prevBalance + ); + } + } + + ///@inheritdoc IStaticATokenV3LM + function claimRewardsToSelf(address[] memory rewards) external { + _claimRewardsOnBehalf(msg.sender, msg.sender, rewards); + } + + ///@inheritdoc IStaticATokenV3LM + function getCurrentRewardsIndex(address reward) public view returns (uint256) { + if (address(reward) == address(0)) { + return 0; + } + (, uint256 nextIndex) = INCENTIVES_CONTROLLER.getAssetIndex(address(_aToken), reward); + return nextIndex; + } + + ///@inheritdoc IStaticATokenV3LM + function getTotalClaimableRewards(address reward) external view returns (uint256) { + if (reward == address(0)) { + return 0; + } + + address[] memory assets = new address[](1); + assets[0] = address(_aToken); + uint256 freshRewards = INCENTIVES_CONTROLLER.getUserRewards(assets, address(this), reward); + return IERC20(reward).balanceOf(address(this)) + freshRewards; + } + + ///@inheritdoc IStaticATokenV3LM + function getClaimableRewards(address user, address reward) external view returns (uint256) { + return _getClaimableRewards(user, reward, balanceOf[user], getCurrentRewardsIndex(reward)); + } + + ///@inheritdoc IStaticATokenV3LM + function getUnclaimedRewards(address user, address reward) external view returns (uint256) { + return _userRewardsData[user][reward].unclaimedRewards; + } + + ///@inheritdoc IERC4626 + function asset() external view returns (address) { + return address(_aTokenUnderlying); + } + + ///@inheritdoc IStaticATokenV3LM + function aToken() external view returns (IERC20) { + return _aToken; + } + + ///@inheritdoc IStaticATokenV3LM + function rewardTokens() external view returns (address[] memory) { + return _rewardTokens; + } + + ///@inheritdoc IERC4626 + function totalAssets() external view returns (uint256) { + return _aToken.balanceOf(address(this)); + } + + ///@inheritdoc IERC4626 + function convertToShares(uint256 assets) external view returns (uint256) { + return _convertToShares(assets, Rounding.DOWN); + } + + ///@inheritdoc IERC4626 + function convertToAssets(uint256 shares) external view returns (uint256) { + return _convertToAssets(shares, Rounding.DOWN); + } + + ///@inheritdoc IERC4626 + function maxMint(address) public view virtual returns (uint256) { + uint256 assets = maxDeposit(address(0)); + return _convertToShares(assets, Rounding.DOWN); + } + + ///@inheritdoc IERC4626 + function maxWithdraw(address owner) public view virtual returns (uint256) { + uint256 shares = maxRedeem(owner); + return _convertToAssets(shares, Rounding.DOWN); + } + + ///@inheritdoc IERC4626 + function maxRedeem(address owner) public view virtual returns (uint256) { + address cachedATokenUnderlying = _aTokenUnderlying; + DataTypes.ReserveData memory reserveData = POOL.getReserveData(cachedATokenUnderlying); + + // if paused or inactive users cannot withdraw underlying + if ( + !ReserveConfiguration.getActive(reserveData.configuration) || + ReserveConfiguration.getPaused(reserveData.configuration) + ) { + return 0; + } + + // otherwise users can withdraw up to the available amount + uint256 underlyingTokenBalanceInShares = _convertToShares( + IERC20(cachedATokenUnderlying).balanceOf(reserveData.aTokenAddress), + Rounding.DOWN + ); + uint256 cachedUserBalance = balanceOf[owner]; + return + underlyingTokenBalanceInShares >= cachedUserBalance + ? cachedUserBalance + : underlyingTokenBalanceInShares; + } + + ///@inheritdoc IERC4626 + function maxDeposit(address) public view virtual returns (uint256) { + DataTypes.ReserveData memory reserveData = POOL.getReserveData(_aTokenUnderlying); + + // if inactive, paused or frozen users cannot deposit underlying + if ( + !ReserveConfiguration.getActive(reserveData.configuration) || + ReserveConfiguration.getPaused(reserveData.configuration) || + ReserveConfiguration.getFrozen(reserveData.configuration) + ) { + return 0; + } + + uint256 supplyCap = ReserveConfiguration.getSupplyCap(reserveData.configuration) * + (10**ReserveConfiguration.getDecimals(reserveData.configuration)); + // if no supply cap deposit is unlimited + if (supplyCap == 0) return type(uint256).max; + // return remaining supply cap margin + uint256 currentSupply = (IAToken(reserveData.aTokenAddress).scaledTotalSupply() + + reserveData.accruedToTreasury) + .rayMulRoundUp(_getNormalizedIncome(reserveData)); + return currentSupply > supplyCap ? 0 : supplyCap - currentSupply; + } + + ///@inheritdoc IERC4626 + function deposit(uint256 assets, address receiver) external virtual returns (uint256) { + (uint256 shares, ) = _deposit(msg.sender, receiver, 0, assets, 0, true); + return shares; + } + + ///@inheritdoc IERC4626 + function mint(uint256 shares, address receiver) external virtual returns (uint256) { + (, uint256 assets) = _deposit(msg.sender, receiver, shares, 0, 0, true); + + return assets; + } + + ///@inheritdoc IERC4626 + function withdraw( + uint256 assets, + address receiver, + address owner + ) external virtual returns (uint256) { + (uint256 shares, ) = _withdraw(owner, receiver, 0, assets, true); + + return shares; + } + + ///@inheritdoc IERC4626 + function redeem( + uint256 shares, + address receiver, + address owner + ) external virtual returns (uint256) { + (, uint256 assets) = _withdraw(owner, receiver, shares, 0, true); + + return assets; + } + + ///@inheritdoc IStaticATokenV3LM + function redeem( + uint256 shares, + address receiver, + address owner, + bool withdrawFromAave + ) external virtual returns (uint256, uint256) { + return _withdraw(owner, receiver, shares, 0, withdrawFromAave); + } + + function _deposit( + address depositor, + address receiver, + uint256 _shares, + uint256 _assets, + uint16 referralCode, + bool depositToAave + ) internal returns (uint256, uint256) { + require(receiver != address(0), StaticATokenErrors.INVALID_RECIPIENT); + require(_shares == 0 || _assets == 0, StaticATokenErrors.ONLY_ONE_AMOUNT_FORMAT_ALLOWED); + + uint256 assets = _assets; + uint256 shares = _shares; + if (shares > 0) { + if (depositToAave) { + require(shares <= maxMint(receiver), "ERC4626: mint more than max"); + } + assets = previewMint(shares); + } else { + if (depositToAave) { + require(assets <= maxDeposit(receiver), "ERC4626: deposit more than max"); + } + shares = previewDeposit(assets); + } + require(shares != 0, StaticATokenErrors.INVALID_ZERO_AMOUNT); + + if (depositToAave) { + address cachedATokenUnderlying = _aTokenUnderlying; + IERC20(cachedATokenUnderlying).safeTransferFrom(depositor, address(this), assets); + POOL.deposit(cachedATokenUnderlying, assets, address(this), referralCode); + } else { + _aToken.safeTransferFrom(depositor, address(this), assets); + } + + _mint(receiver, shares); + + emit Deposit(depositor, receiver, assets, shares); + + return (shares, assets); + } + + function _withdraw( + address owner, + address receiver, + uint256 _shares, + uint256 _assets, + bool withdrawFromAave + ) internal returns (uint256, uint256) { + require(receiver != address(0), StaticATokenErrors.INVALID_RECIPIENT); + require(_shares == 0 || _assets == 0, StaticATokenErrors.ONLY_ONE_AMOUNT_FORMAT_ALLOWED); + require(_shares != _assets, StaticATokenErrors.INVALID_ZERO_AMOUNT); + + uint256 assets = _assets; + uint256 shares = _shares; + + if (shares > 0) { + if (withdrawFromAave) { + require(shares <= maxRedeem(owner), "ERC4626: redeem more than max"); + } + assets = previewRedeem(shares); + } else { + if (withdrawFromAave) { + require(assets <= maxWithdraw(owner), "ERC4626: withdraw more than max"); + } + shares = previewWithdraw(assets); + } + + if (msg.sender != owner) { + uint256 allowed = allowance[owner][msg.sender]; // Saves gas for limited approvals. + + if (allowed != type(uint256).max) allowance[owner][msg.sender] = allowed - shares; + } + + _burn(owner, shares); + + emit Withdraw(msg.sender, receiver, owner, assets, shares); + + if (withdrawFromAave) { + POOL.withdraw(_aTokenUnderlying, assets, receiver); + } else { + _aToken.safeTransfer(receiver, assets); + } + + return (shares, assets); + } + + /** + * @notice Updates rewards for senders and receiver in a transfer (not updating rewards for address(0)) + * @param from The address of the sender of tokens + * @param to The address of the receiver of tokens + */ + function _beforeTokenTransfer( + address from, + address to, + uint256 + ) internal override { + for (uint256 i = 0; i < _rewardTokens.length; i++) { + address rewardToken = address(_rewardTokens[i]); + uint256 rewardsIndex = getCurrentRewardsIndex(rewardToken); + if (from != address(0)) { + _updateUser(from, rewardsIndex, rewardToken); + } + if (to != address(0) && from != to) { + _updateUser(to, rewardsIndex, rewardToken); + } + } + } + + /** + * @notice Adding the pending rewards to the unclaimed for specific user and updating user index + * @param user The address of the user to update + * @param currentRewardsIndex The current rewardIndex + * @param rewardToken The address of the reward token + */ + function _updateUser( + address user, + uint256 currentRewardsIndex, + address rewardToken + ) internal { + uint256 balance = balanceOf[user]; + if (balance > 0) { + _userRewardsData[user][rewardToken].unclaimedRewards = _getClaimableRewards( + user, + rewardToken, + balance, + currentRewardsIndex + ).toUint128(); + } + _userRewardsData[user][rewardToken].rewardsIndexOnLastInteraction = currentRewardsIndex + .toUint128(); + } + + /** + * @notice Compute the pending in WAD. Pending is the amount to add (not yet unclaimed) rewards in WAD. + * @param balance The balance of the user + * @param rewardsIndexOnLastInteraction The index which was on the last interaction of the user + * @param currentRewardsIndex The current rewards index in the system + * @param assetUnit One unit of asset (10**decimals) + * @return The amount of pending rewards in WAD + */ + function _getPendingRewards( + uint256 balance, + uint256 rewardsIndexOnLastInteraction, + uint256 currentRewardsIndex, + uint256 assetUnit + ) internal pure returns (uint256) { + if (balance == 0) { + return 0; + } + return (balance * (currentRewardsIndex - rewardsIndexOnLastInteraction)) / assetUnit; + } + + /** + * @notice Compute the claimable rewards for a user + * @param user The address of the user + * @param reward The address of the reward + * @param balance The balance of the user in WAD + * @param currentRewardsIndex The current rewards index + * @return The total rewards that can be claimed by the user (if `fresh` flag true, after updating rewards) + */ + function _getClaimableRewards( + address user, + address reward, + uint256 balance, + uint256 currentRewardsIndex + ) internal view returns (uint256) { + RewardIndexCache memory rewardsIndexCache = _startIndex[reward]; + require(rewardsIndexCache.isRegistered == true, StaticATokenErrors.REWARD_NOT_INITIALIZED); + UserRewardsData memory currentUserRewardsData = _userRewardsData[user][reward]; + uint256 assetUnit = 10**decimals; + return + currentUserRewardsData.unclaimedRewards + + _getPendingRewards( + balance, + currentUserRewardsData.rewardsIndexOnLastInteraction == 0 + ? rewardsIndexCache.lastUpdatedIndex + : currentUserRewardsData.rewardsIndexOnLastInteraction, + currentRewardsIndex, + assetUnit + ); + } + + /** + * @notice Claim rewards on behalf of a user and send them to a receiver + * @param onBehalfOf The address to claim on behalf of + * @param rewards The addresses of the rewards + * @param receiver The address to receive the rewards + */ + function _claimRewardsOnBehalf( + address onBehalfOf, + address receiver, + address[] memory rewards + ) internal { + for (uint256 i = 0; i < rewards.length; i++) { + if (address(rewards[i]) == address(0)) { + continue; + } + uint256 currentRewardsIndex = getCurrentRewardsIndex(rewards[i]); + uint256 balance = balanceOf[onBehalfOf]; + uint256 userReward = _getClaimableRewards( + onBehalfOf, + rewards[i], + balance, + currentRewardsIndex + ); + uint256 totalRewardTokenBalance = IERC20(rewards[i]).balanceOf(address(this)); + uint256 unclaimedReward = 0; + + if (userReward > totalRewardTokenBalance) { + totalRewardTokenBalance += collectAndUpdateRewards(address(rewards[i])); + } + + if (userReward > totalRewardTokenBalance) { + unclaimedReward = userReward - totalRewardTokenBalance; + userReward = totalRewardTokenBalance; + } + if (userReward > 0) { + _userRewardsData[onBehalfOf][rewards[i]].unclaimedRewards = unclaimedReward + .toUint128(); + _userRewardsData[onBehalfOf][rewards[i]] + .rewardsIndexOnLastInteraction = currentRewardsIndex.toUint128(); + IERC20(rewards[i]).safeTransfer(receiver, userReward); + } + } + } + + function _convertToShares(uint256 assets, Rounding rounding) internal view returns (uint256) { + if (rounding == Rounding.UP) return assets.rayDivRoundUp(rate()); + return assets.rayDivRoundDown(rate()); + } + + function _convertToAssets(uint256 shares, Rounding rounding) internal view returns (uint256) { + if (rounding == Rounding.UP) return shares.rayMulRoundUp(rate()); + return shares.rayMulRoundDown(rate()); + } + + /** + * @notice Initializes a new rewardToken + * @param reward The reward token to be registered + */ + function _registerRewardToken(address reward) internal { + if (isRegisteredRewardToken(reward)) return; + uint256 startIndex = getCurrentRewardsIndex(reward); + + _rewardTokens.push(reward); + _startIndex[reward] = RewardIndexCache(true, startIndex.toUint240()); + + emit RewardTokenRegistered(reward, startIndex); + } + + /** + * @notice Returns the ongoing normalized income for the reserve. + * @dev A value of 1e27 means there is no income. As time passes, the income is accrued + * @dev A value of 2*1e27 means for each unit of asset one unit of income has been accrued + * @param reserve The reserve object + * @return The normalized income, expressed in ray + */ + function _getNormalizedIncome(DataTypes.ReserveData memory reserve) + internal + view + returns (uint256) + { + uint40 timestamp = reserve.lastUpdateTimestamp; + + //solium-disable-next-line + if (timestamp == block.timestamp) { + //if the index was updated in the same block, no need to perform any calculation + return reserve.liquidityIndex; + } else { + return + MathUtils.calculateLinearInterest(reserve.currentLiquidityRate, timestamp).rayMul( + reserve.liquidityIndex + ); + } + } +} + +/* solhint-enable */ diff --git a/contracts/plugins/assets/aave-v3/vendor/interfaces/IAToken.sol b/contracts/plugins/assets/aave-v3/vendor/interfaces/IAToken.sol new file mode 100644 index 0000000000..76943cd02e --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/interfaces/IAToken.sol @@ -0,0 +1,22 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.8.10; + +/* solhint-disable */ + +import { IAaveIncentivesController } from "@aave/core-v3/contracts/interfaces/IAaveIncentivesController.sol"; + +interface IAToken { + function POOL() external view returns (address); + + function getIncentivesController() external view returns (address); + + function UNDERLYING_ASSET_ADDRESS() external view returns (address); + + /** + * @notice Returns the scaled total supply of the scaled balance token. Represents sum(debt/index) + * @return The scaled total supply + */ + function scaledTotalSupply() external view returns (uint256); +} + +/* solhint-enable */ diff --git a/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol b/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol new file mode 100644 index 0000000000..0444cac97b --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol @@ -0,0 +1,245 @@ +// SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v4.7.0) (interfaces/IERC4626.sol) + +pragma solidity ^0.8.10; + +/* solhint-disable max-line-length */ + +/** + * @dev Interface of the ERC4626 "Tokenized Vault Standard", as defined in + * https://eips.ethereum.org/EIPS/eip-4626[ERC-4626]. + * + * _Available since v4.7._ + */ +interface IERC4626 { + event Deposit(address indexed sender, address indexed owner, uint256 assets, uint256 shares); + + event Withdraw( + address indexed sender, + address indexed receiver, + address indexed owner, + uint256 assets, + uint256 shares + ); + + /** + * @dev Returns the address of the underlying token used for the Vault for accounting, depositing, and withdrawing. + * + * - MUST be an ERC-20 token contract. + * - MUST NOT revert. + */ + function asset() external view returns (address assetTokenAddress); + + /** + * @dev Returns the total amount of the underlying asset that is “managed” by Vault. + * + * - SHOULD include any compounding that occurs from yield. + * - MUST be inclusive of any fees that are charged against assets in the Vault. + * - MUST NOT revert. + */ + function totalAssets() external view returns (uint256 totalManagedAssets); + + /** + * @dev Returns the amount of shares that the Vault would exchange for the amount of assets provided, in an ideal + * scenario where all the conditions are met. + * + * - MUST NOT be inclusive of any fees that are charged against assets in the Vault. + * - MUST NOT show any variations depending on the caller. + * - MUST NOT reflect slippage or other on-chain conditions, when performing the actual exchange. + * - MUST NOT revert. + * + * NOTE: This calculation MAY NOT reflect the “per-user” price-per-share, and instead should reflect the + * “average-user’s” price-per-share, meaning what the average user should expect to see when exchanging to and + * from. + */ + function convertToShares(uint256 assets) external view returns (uint256 shares); + + /** + * @dev Returns the amount of assets that the Vault would exchange for the amount of shares provided, in an ideal + * scenario where all the conditions are met. + * + * - MUST NOT be inclusive of any fees that are charged against assets in the Vault. + * - MUST NOT show any variations depending on the caller. + * - MUST NOT reflect slippage or other on-chain conditions, when performing the actual exchange. + * - MUST NOT revert unless due to integer overflow caused by an unreasonably large input. + * + * NOTE: This calculation MAY NOT reflect the “per-user” price-per-share, and instead should reflect the + * “average-user’s” price-per-share, meaning what the average user should expect to see when exchanging to and + * from. + */ + function convertToAssets(uint256 shares) external view returns (uint256 assets); + + /** + * @dev Returns the maximum amount of the underlying asset that can be deposited into the Vault for the receiver, + * through a deposit call. + * While deposit of aToken is not affected by aave pool configrations, deposit of the aTokenUnderlying will need to deposit to aave + * so it is affected by current aave pool configuration. + * Reference: https://github.com/aave/aave-v3-core/blob/29ff9b9f89af7cd8255231bc5faf26c3ce0fb7ce/contracts/protocol/libraries/logic/ValidationLogic.sol#L57 + * - MUST return a limited value if receiver is subject to some deposit limit. + * - MUST return 2 ** 256 - 1 if there is no limit on the maximum amount of assets that may be deposited. + * - MUST NOT revert unless due to integer overflow caused by an unreasonably large input. + */ + function maxDeposit(address receiver) external view returns (uint256 maxAssets); + + /** + * @dev Allows an on-chain or off-chain user to simulate the effects of their deposit at the current block, given + * current on-chain conditions. + * + * - MUST return as close to and no more than the exact amount of Vault shares that would be minted in a deposit + * call in the same transaction. I.e. deposit should return the same or more shares as previewDeposit if called + * in the same transaction. + * - MUST NOT account for deposit limits like those returned from maxDeposit and should always act as though the + * deposit would be accepted, regardless if the user has enough tokens approved, etc. + * - MUST be inclusive of deposit fees. Integrators should be aware of the existence of deposit fees. + * - MUST NOT revert. + * + * NOTE: any unfavorable discrepancy between convertToShares and previewDeposit SHOULD be considered slippage in + * share price or some other type of condition, meaning the depositor will lose assets by depositing. + */ + function previewDeposit(uint256 assets) external view returns (uint256 shares); + + /** + * @dev Mints shares Vault shares to receiver by depositing exactly amount of underlying tokens. + * + * - MUST emit the Deposit event. + * - MAY support an additional flow in which the underlying tokens are owned by the Vault contract before the + * deposit execution, and are accounted for during deposit. + * - MUST revert if all of assets cannot be deposited (due to deposit limit being reached, slippage, the user not + * approving enough underlying tokens to the Vault contract, etc). + * + * NOTE: most implementations will require pre-approval of the Vault with the Vault’s underlying asset token. + */ + function deposit(uint256 assets, address receiver) external returns (uint256 shares); + + /** + * @dev Returns the maximum amount of the Vault shares that can be minted for the receiver, through a mint call. + * - MUST return a limited value if receiver is subject to some mint limit. + * - MUST return 2 ** 256 - 1 if there is no limit on the maximum amount of shares that may be minted. + * - MUST NOT revert. + */ + function maxMint(address receiver) external view returns (uint256 maxShares); + + /** + * @dev Allows an on-chain or off-chain user to simulate the effects of their mint at the current block, given + * current on-chain conditions. + * + * - MUST return as close to and no fewer than the exact amount of assets that would be deposited in a mint call + * in the same transaction. I.e. mint should return the same or fewer assets as previewMint if called in the + * same transaction. + * - MUST NOT account for mint limits like those returned from maxMint and should always act as though the mint + * would be accepted, regardless if the user has enough tokens approved, etc. + * - MUST be inclusive of deposit fees. Integrators should be aware of the existence of deposit fees. + * - MUST NOT revert. + * + * NOTE: any unfavorable discrepancy between convertToAssets and previewMint SHOULD be considered slippage in + * share price or some other type of condition, meaning the depositor will lose assets by minting. + */ + function previewMint(uint256 shares) external view returns (uint256 assets); + + /** + * @dev Mints exactly shares Vault shares to receiver by depositing amount of underlying tokens. + * + * - MUST emit the Deposit event. + * - MAY support an additional flow in which the underlying tokens are owned by the Vault contract before the mint + * execution, and are accounted for during mint. + * - MUST revert if all of shares cannot be minted (due to deposit limit being reached, slippage, the user not + * approving enough underlying tokens to the Vault contract, etc). + * + * NOTE: most implementations will require pre-approval of the Vault with the Vault’s underlying asset token. + */ + function mint(uint256 shares, address receiver) external returns (uint256 assets); + + /** + * @dev Returns the maximum amount of the underlying asset that can be withdrawn from the owner balance in the + * Vault, through a withdraw call. + * + * - MUST return a limited value if owner is subject to some withdrawal limit or timelock. + * - MUST NOT revert. + */ + function maxWithdraw(address owner) external view returns (uint256 maxAssets); + + /** + * @dev Allows an on-chain or off-chain user to simulate the effects of their withdrawal at the current block, + * given current on-chain conditions. + * + * - MUST return as close to and no fewer than the exact amount of Vault shares that would be burned in a withdraw + * call in the same transaction. I.e. withdraw should return the same or fewer shares as previewWithdraw if + * called + * in the same transaction. + * - MUST NOT account for withdrawal limits like those returned from maxWithdraw and should always act as though + * the withdrawal would be accepted, regardless if the user has enough shares, etc. + * - MUST be inclusive of withdrawal fees. Integrators should be aware of the existence of withdrawal fees. + * - MUST NOT revert. + * + * NOTE: any unfavorable discrepancy between convertToShares and previewWithdraw SHOULD be considered slippage in + * share price or some other type of condition, meaning the depositor will lose assets by depositing. + */ + function previewWithdraw(uint256 assets) external view returns (uint256 shares); + + /** + * @dev Burns shares from owner and sends exactly assets of underlying tokens to receiver. + * + * - MUST emit the Withdraw event. + * - MAY support an additional flow in which the underlying tokens are owned by the Vault contract before the + * withdraw execution, and are accounted for during withdraw. + * - MUST revert if all of assets cannot be withdrawn (due to withdrawal limit being reached, slippage, the owner + * not having enough shares, etc). + * + * Note that some implementations will require pre-requesting to the Vault before a withdrawal may be performed. + * Those methods should be performed separately. + */ + function withdraw( + uint256 assets, + address receiver, + address owner + ) external returns (uint256 shares); + + /** + * @dev Returns the maximum amount of Vault shares that can be redeemed from the owner balance in the Vault, + * through a redeem call to the aToken underlying. + * While redeem of aToken is not affected by aave pool configrations, redeeming of the aTokenUnderlying will need to redeem from aave + * so it is affected by current aave pool configuration. + * Reference: https://github.com/aave/aave-v3-core/blob/29ff9b9f89af7cd8255231bc5faf26c3ce0fb7ce/contracts/protocol/libraries/logic/ValidationLogic.sol#L87 + * - MUST return a limited value if owner is subject to some withdrawal limit or timelock. + * - MUST return balanceOf(owner) if owner is not subject to any withdrawal limit or timelock. + * - MUST NOT revert. + */ + function maxRedeem(address owner) external view returns (uint256 maxShares); + + /** + * @dev Allows an on-chain or off-chain user to simulate the effects of their redeemption at the current block, + * given current on-chain conditions. + * + * - MUST return as close to and no more than the exact amount of assets that would be withdrawn in a redeem call + * in the same transaction. I.e. redeem should return the same or more assets as previewRedeem if called in the + * same transaction. + * - MUST NOT account for redemption limits like those returned from maxRedeem and should always act as though the + * redemption would be accepted, regardless if the user has enough shares, etc. + * - MUST be inclusive of withdrawal fees. Integrators should be aware of the existence of withdrawal fees. + * - MUST NOT revert. + * + * NOTE: any unfavorable discrepancy between convertToAssets and previewRedeem SHOULD be considered slippage in + * share price or some other type of condition, meaning the depositor will lose assets by redeeming. + */ + function previewRedeem(uint256 shares) external view returns (uint256 assets); + + /** + * @dev Burns exactly shares from owner and sends assets of underlying tokens to receiver. + * + * - MUST emit the Withdraw event. + * - MAY support an additional flow in which the underlying tokens are owned by the Vault contract before the + * redeem execution, and are accounted for during redeem. + * - MUST revert if all of shares cannot be redeemed (due to withdrawal limit being reached, slippage, the owner + * not having enough shares, etc). + * + * NOTE: some implementations will require pre-requesting to the Vault before a withdrawal may be performed. + * Those methods should be performed separately. + */ + function redeem( + uint256 shares, + address receiver, + address owner + ) external returns (uint256 assets); +} + +/* solhint-enable max-line-length */ diff --git a/contracts/plugins/assets/aave-v3/vendor/interfaces/IInitializableStaticATokenLM.sol b/contracts/plugins/assets/aave-v3/vendor/interfaces/IInitializableStaticATokenLM.sol new file mode 100644 index 0000000000..7e1eb865ea --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/interfaces/IInitializableStaticATokenLM.sol @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.8.10; + +/* solhint-disable max-line-length */ + +import { IPool } from "@aave/core-v3/contracts/interfaces/IPool.sol"; +import { IAaveIncentivesController } from "@aave/core-v3/contracts/interfaces/IAaveIncentivesController.sol"; + +/** + * @title IInitializableStaticATokenLM + * @notice Interface for the initialize function on StaticATokenLM + * @author Aave + **/ +interface IInitializableStaticATokenLM { + /** + * @dev Emitted when a StaticATokenLM is initialized + * @param aToken The address of the underlying aToken (aWETH) + * @param staticATokenName The name of the Static aToken + * @param staticATokenSymbol The symbol of the Static aToken + * @dev Used to be `Initialized` but changed to avoid duplicate events + **/ + event InitializedStaticATokenLM( + address indexed aToken, + string staticATokenName, + string staticATokenSymbol + ); + + /** + * @dev Initializes the StaticATokenLM + * @param aToken The address of the underlying aToken (aWETH) + * @param staticATokenName The name of the Static aToken + * @param staticATokenSymbol The symbol of the Static aToken + */ + function initialize( + address aToken, + string calldata staticATokenName, + string calldata staticATokenSymbol + ) external; +} + +/* solhint-enable max-line-length */ diff --git a/contracts/plugins/assets/aave-v3/vendor/interfaces/IStaticATokenV3LM.sol b/contracts/plugins/assets/aave-v3/vendor/interfaces/IStaticATokenV3LM.sol new file mode 100644 index 0000000000..074affbeff --- /dev/null +++ b/contracts/plugins/assets/aave-v3/vendor/interfaces/IStaticATokenV3LM.sol @@ -0,0 +1,220 @@ +// SPDX-License-Identifier: agpl-3.0 +pragma solidity ^0.8.10; + +/* solhint-disable max-line-length */ + +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { IPool } from "@aave/core-v3/contracts/interfaces/IPool.sol"; +import { IAaveIncentivesController } from "@aave/core-v3/contracts/interfaces/IAaveIncentivesController.sol"; +import { IInitializableStaticATokenLM } from "./IInitializableStaticATokenLM.sol"; + +interface IStaticATokenV3LM is IInitializableStaticATokenLM { + struct SignatureParams { + uint8 v; + bytes32 r; + bytes32 s; + } + + struct PermitParams { + address owner; + address spender; + uint256 value; + uint256 deadline; + uint8 v; + bytes32 r; + bytes32 s; + } + + struct UserRewardsData { + uint128 rewardsIndexOnLastInteraction; // (in RAYs) + uint128 unclaimedRewards; // (in RAYs) + } + + struct RewardIndexCache { + bool isRegistered; + uint248 lastUpdatedIndex; + } + + event RewardTokenRegistered(address indexed reward, uint256 startIndex); + + /** + * @notice Burns `amount` of static aToken, with receiver receiving the corresponding amount of `ASSET` + * @param shares The amount to withdraw, in static balance of StaticAToken + * @param receiver The address that will receive the amount of `ASSET` withdrawn from the Aave protocol + * @param withdrawFromAave bool + * - `true` for the receiver to get underlying tokens (e.g. USDC) + * - `false` for the receiver to get aTokens (e.g. aUSDC) + * @return amountToBurn: StaticATokens burnt, static balance + * @return amountToWithdraw: underlying/aToken send to `receiver`, dynamic balance + **/ + function redeem( + uint256 shares, + address receiver, + address owner, + bool withdrawFromAave + ) external returns (uint256, uint256); + + /** + * @notice Deposits `ASSET` in the Aave protocol and mints static aTokens to msg.sender + * @param assets The amount of underlying `ASSET` to deposit (e.g. deposit of 100 USDC) + * @param receiver The address that will receive the static aTokens + * @param referralCode Code used to register the integrator originating the operation, for potential rewards. + * 0 if the action is executed directly by the user, without any middle-man + * @param depositToAave bool + * - `true` if the msg.sender comes with underlying tokens (e.g. USDC) + * - `false` if the msg.sender comes already with aTokens (e.g. aUSDC) + * @return uint256 The amount of StaticAToken minted, static balance + **/ + function deposit( + uint256 assets, + address receiver, + uint16 referralCode, + bool depositToAave + ) external returns (uint256); + + /** + * @notice Allows to deposit on Aave via meta-transaction + * https://github.com/ethereum/EIPs/blob/8a34d644aacf0f9f8f00815307fd7dd5da07655f/EIPS/eip-2612.md + * @param depositor Address from which the funds to deposit are going to be pulled + * @param receiver Address that will receive the staticATokens, in the average case, same as the `depositor` + * @param assets The amount to deposit + * @param referralCode Code used to register the integrator originating the operation, for potential rewards. + * 0 if the action is executed directly by the user, without any middle-man + * @param depositToAave bool + * - `true` if the msg.sender comes with underlying tokens (e.g. USDC) + * - `false` if the msg.sender comes already with aTokens (e.g. aUSDC) + * @param deadline The deadline timestamp, type(uint256).max for max deadline + * @param sigParams Signature params: v,r,s + * @return uint256 The amount of StaticAToken minted, static balance + */ + function metaDeposit( + address depositor, + address receiver, + uint256 assets, + uint16 referralCode, + bool depositToAave, + uint256 deadline, + PermitParams calldata permit, + SignatureParams calldata sigParams + ) external returns (uint256); + + /** + * @notice Allows to withdraw from Aave via meta-transaction + * https://github.com/ethereum/EIPs/blob/8a34d644aacf0f9f8f00815307fd7dd5da07655f/EIPS/eip-2612.md + * @param owner Address owning the staticATokens + * @param receiver Address that will receive the underlying withdrawn from Aave + * @param shares The amount of staticAToken to withdraw. If > 0, `assets` needs to be 0 + * @param assets The amount of underlying/aToken to withdraw. If > 0, `shares` needs to be 0 + * @param withdrawFromAave bool + * - `true` for the receiver to get underlying tokens (e.g. USDC) + * - `false` for the receiver to get aTokens (e.g. aUSDC) + * @param deadline The deadline timestamp, type(uint256).max for max deadline + * @param sigParams Signature params: v,r,s + * @return amountToBurn: StaticATokens burnt, static balance + * @return amountToWithdraw: underlying/aToken send to `receiver`, dynamic balance + */ + function metaWithdraw( + address owner, + address receiver, + uint256 shares, + uint256 assets, + bool withdrawFromAave, + uint256 deadline, + SignatureParams calldata sigParams + ) external returns (uint256, uint256); + + /** + * @notice Returns the Aave liquidity index of the underlying aToken, denominated rate here + * as it can be considered as an ever-increasing exchange rate + * @return The liquidity index + **/ + function rate() external view returns (uint256); + + /** + * @notice Claims rewards from `INCENTIVES_CONTROLLER` and updates internal accounting of rewards. + * @param reward The reward to claim + * @return uint256 Amount collected + */ + function collectAndUpdateRewards(address reward) external returns (uint256); + + /** + * @notice Claim rewards on behalf of a user and send them to a receiver + * @dev Only callable by if sender is onBehalfOf or sender is approved claimer + * @param onBehalfOf The address to claim on behalf of + * @param receiver The address to receive the rewards + * @param rewards The rewards to claim + */ + function claimRewardsOnBehalf( + address onBehalfOf, + address receiver, + address[] memory rewards + ) external; + + /** + * @notice Claim rewards and send them to a receiver + * @param receiver The address to receive the rewards + * @param rewards The rewards to claim + */ + function claimRewards(address receiver, address[] memory rewards) external; + + /** + * @notice Claim rewards + * @param rewards The rewards to claim + */ + function claimRewardsToSelf(address[] memory rewards) external; + + /** + * @notice Get the total claimable rewards of the contract. + * @param reward The reward to claim + * @return uint256 The current balance + pending rewards from the `_incentivesController` + */ + function getTotalClaimableRewards(address reward) external view returns (uint256); + + /** + * @notice Get the total claimable rewards for a user in WAD + * @param user The address of the user + * @param reward The reward to claim + * @return uint256 The claimable amount of rewards in WAD + */ + function getClaimableRewards(address user, address reward) external view returns (uint256); + + /** + * @notice The unclaimed rewards for a user in WAD + * @param user The address of the user + * @param reward The reward to claim + * @return uint256 The unclaimed amount of rewards in WAD + */ + function getUnclaimedRewards(address user, address reward) external view returns (uint256); + + /** + * @notice The underlying asset reward index in RAY + * @param reward The reward to claim + * @return uint256 The underlying asset reward index in RAY + */ + function getCurrentRewardsIndex(address reward) external view returns (uint256); + + /** + * @notice The aToken used inside the 4626 vault. + * @return IERC20 The aToken IERC20. + */ + function aToken() external view returns (IERC20); + + /** + * @notice The IERC20s that are currently rewarded to addresses of the vault via LM on incentivescontroller. + * @return IERC20 The IERC20s of the rewards. + */ + function rewardTokens() external view returns (address[] memory); + + /** + * @notice Fetches all rewardTokens from the incentivecontroller and registers the missing ones. + */ + function refreshRewardTokens() external; + + /** + * @notice Checks if the passed token is a registered reward. + * @return bool signaling if token is a registered reward. + */ + function isRegisteredRewardToken(address reward) external view returns (bool); +} + +/* solhint-enable max-line-length */ diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index f9aec23f54..5c190e6050 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -5,16 +5,7 @@ import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/I import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; - -interface CBEth is IERC20Metadata { - function mint(address account, uint256 amount) external returns (bool); - - function updateExchangeRate(uint256 exchangeRate) external; - - function configureMinter(address minter, uint256 minterAllowedAmount) external returns (bool); - - function exchangeRate() external view returns (uint256 _exchangeRate); -} +import { ICBEth } from "./vendor/ICBEth.sol"; /** * @title CBEthCollateral @@ -76,6 +67,6 @@ contract CBEthCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - return _safeWrap(CBEth(address(erc20)).exchangeRate()); + return _safeWrap(ICBEth(address(erc20)).exchangeRate()); } } diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol new file mode 100644 index 0000000000..b745028f54 --- /dev/null +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -0,0 +1,76 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; +import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; +import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; +import { L2LSDCollateral } from "../L2LSDCollateral.sol"; + +/** + * @title CBEthCollateral + * @notice Collateral plugin for Coinbase's staked ETH + * tok = cbETH + * ref = ETH2 + * tar = ETH + * UoA = USD + */ +contract CBEthCollateralL2 is L2LSDCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + AggregatorV3Interface public immutable targetPerTokChainlinkFeed; // {target/tok} + uint48 public immutable targetPerTokChainlinkTimeout; + + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param _targetPerTokChainlinkFeed {target/tok} price of cbETH in ETH terms + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + AggregatorV3Interface _targetPerTokChainlinkFeed, + uint48 _targetPerTokChainlinkTimeout, + AggregatorV3Interface _exchangeRateChainlinkFeed, + uint48 _exchangeRateChainlinkTimeout + ) + L2LSDCollateral( + config, + revenueHiding, + _exchangeRateChainlinkFeed, + _exchangeRateChainlinkTimeout + ) + { + require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); + require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + + targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; + targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; + } + + /// Can revert, used by other contract functions in order to catch errors + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return pegPrice {target/ref} The actual price observed in the peg + function tryPrice() + external + view + override + returns ( + uint192 low, + uint192 high, + uint192 pegPrice + ) + { + uint192 targetPerTok = targetPerTokChainlinkFeed.price(targetPerTokChainlinkTimeout); + + // {UoA/tok} = {UoA/target} * {target/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(targetPerTok); + uint192 err = p.mul(oracleError, CEIL); + + high = p + err; + low = p - err; + // assert(low <= high); obviously true just by inspection + + // {target/ref} = {target/tok} / {ref/tok} + pegPrice = targetPerTok.div(_underlyingRefPerTok()); + } +} diff --git a/contracts/plugins/assets/cbeth/README.md b/contracts/plugins/assets/cbeth/README.md index aa654f92eb..351074009d 100644 --- a/contracts/plugins/assets/cbeth/README.md +++ b/contracts/plugins/assets/cbeth/README.md @@ -16,4 +16,6 @@ This plugin allows `CBETH` holders to use their tokens as collateral in the Rese #### refPerTok {ref/tok} -`return _safeWrap(token.exchange_rate());` +The L1 implementation (CBETHCollateral.sol) uses `token.exchange_rate()` to get the cbETH/ETH {ref/tok} contract exchange rate. + +The L2 implementation (CBETHCollateralL2.sol) uses the relevant chainlink oracle to get the cbETH/ETH {ref/tok} contract exchange rate (oraclized from the L1). diff --git a/contracts/plugins/assets/cbeth/vendor/ICBEth.sol b/contracts/plugins/assets/cbeth/vendor/ICBEth.sol new file mode 100644 index 0000000000..a842a59f3e --- /dev/null +++ b/contracts/plugins/assets/cbeth/vendor/ICBEth.sol @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; + +interface ICBEth is IERC20Metadata { + function mint(address account, uint256 amount) external returns (bool); + + function updateExchangeRate(uint256 exchangeRate) external; + + function configureMinter(address minter, uint256 minterAllowedAmount) external returns (bool); + + function exchangeRate() external view returns (uint256 _exchangeRate); +} diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index 78d37b5bcb..a60744893a 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -12,7 +12,7 @@ import "./ICToken.sol"; * @title CTokenFiatCollateral * @notice Collateral plugin for a cToken of fiat collateral, like cUSDC or cUSDP * Expected: {tok} != {ref}, {ref} is pegged to {target} unless defaulting, {target} == {UoA} - * Also used for FluxFinance + * Also used for FluxFinance. Flexible enough to work with and without CTokenWrapper. */ contract CTokenFiatCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; @@ -24,13 +24,25 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { ICToken public immutable cToken; // gas-optimization: access underlying cToken directly - /// @param config.erc20 Should be a CTokenWrapper + /// @param config.erc20 May be a CTokenWrapper or the cToken itself /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - cToken = ICToken(address(RewardableERC20Wrapper(address(config.erc20)).underlying())); - referenceERC20Decimals = IERC20Metadata(cToken.underlying()).decimals(); + ICToken _cToken = ICToken(address(config.erc20)); + address _underlying = _cToken.underlying(); + uint8 _referenceERC20Decimals; + + // _underlying might be a wrapper at this point, try to go one level further + try ICToken(_underlying).underlying() returns (address _mostUnderlying) { + _cToken = ICToken(_underlying); + _referenceERC20Decimals = IERC20Metadata(_mostUnderlying).decimals(); + } catch { + _referenceERC20Decimals = IERC20Metadata(_underlying).decimals(); + } + + cToken = _cToken; + referenceERC20Decimals = _referenceERC20Decimals; require(referenceERC20Decimals > 0, "referenceERC20Decimals missing"); } @@ -67,6 +79,8 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { /// Claim rewards earned by holding a balance of the ERC20 token /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins function claimRewards() external virtual override(Asset, IRewardable) { - IRewardable(address(erc20)).claimRewards(); + // solhint-ignore-next-line no-empty-blocks + try IRewardable(address(erc20)).claimRewards() {} catch {} + // erc20 may not be a CTokenWrapper } } diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index fb6b12065a..4d7b92ebac 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -289,15 +289,14 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { } function _checkpoint(address[2] memory _accounts) internal nonReentrant { - //if shutdown, no longer checkpoint in case there are problems - if (isShutdown()) return; - uint256 supply = _getTotalSupply(); uint256[2] memory depositedBalance; depositedBalance[0] = _getDepositedBalance(_accounts[0]); depositedBalance[1] = _getDepositedBalance(_accounts[1]); - IRewardStaking(convexPool).getReward(address(this), true); + if (!isShutdown()) { + IRewardStaking(convexPool).getReward(address(this), true); + } _claimExtras(); diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 778725866c..5959b944ec 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -21,8 +21,8 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { uint256 private immutable oneShare; int8 private immutable refDecimals; - /// @param config Configuration of this collateral /// config.erc20 must be a MorphoTokenisedDeposit + /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index b37db03207..27449c2883 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -19,8 +19,8 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {target/ref} uint48 public immutable targetUnitOracleTimeout; // {s} - /// @param config Configuration of this collateral. - /// config.erc20 must be a MorphoTokenisedDeposit + /// @dev config.erc20 must be a MorphoTokenisedDeposit + /// @param config.chainlinkFeed Feed units: {UoA/target} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide /// @param targetUnitChainlinkFeed_ Feed units: {target/ref} /// @param targetUnitOracleTimeout_ {s} oracle timeout to use for targetUnitChainlinkFeed @@ -51,8 +51,8 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { // {tar/ref} Get current market peg pegPrice = targetUnitChainlinkFeed.price(targetUnitOracleTimeout); - // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); high = p + err; diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index 941320bcdf..e1f1ec17b3 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -22,8 +22,8 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { uint256 private immutable oneShare; int8 private immutable refDecimals; - /// @param config Configuration of this collateral. /// config.erc20 must be a MorphoTokenisedDeposit + /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index ba647e95a8..dc4a563dc6 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -56,9 +56,7 @@ uint192 constant ONE_POINT_FIVE = 150e16; // {1} 1.5 * exists to handle cases where prices change after the auction is started, naturally. * * Case 3: Over the next 50% of the auction the price falls from the best plausible price to the - * worst price, linearly. The worst price is further discounted by the maxTradeSlippage as a - * fraction of how far from minTradeVolume to maxTradeVolume the trade lies. - * At maxTradeVolume, no additonal discount beyond the oracle errors is applied. + * worst price, linearly. The worst price is further discounted by the maxTradeSlippage. * This is the phase of the auction where bids will typically occur. * * Case 4: Lastly the price stays at the worst price for the final 5% of the auction to allow @@ -96,7 +94,6 @@ contract DutchTrade is ITrade { uint192 public bestPrice; // {buyTok/sellTok} The best plausible price based on oracle data uint192 public worstPrice; // {buyTok/sellTok} The worst plausible price based on oracle data - // and further discounted by a fraction of maxTradeSlippage based on auction volume. // === Bid === address public bidder; @@ -172,17 +169,14 @@ contract DutchTrade is ITrade { uint256 _endBlock = _startBlock + auctionLength / ONE_BLOCK; // FLOOR; endBlock is inclusive endBlock = _endBlock; // gas-saver - endTime = uint48(block.timestamp + ONE_BLOCK * (_endBlock - _startBlock)); - - // {1} - uint192 slippage = _slippage( - sellAmount.mul(prices.sellHigh, FLOOR), // auctionVolume - origin.minTradeVolume(), // minTradeVolume - fixMin(sell_.maxTradeVolume(), buy_.maxTradeVolume()) // maxTradeVolume - ); + endTime = uint48(block.timestamp + ONE_BLOCK * (_endBlock - _startBlock + 1)); // {buyTok/sellTok} = {UoA/sellTok} * {1} / {UoA/buyTok} - uint192 _worstPrice = prices.sellLow.mulDiv(FIX_ONE - slippage, prices.buyHigh, FLOOR); + uint192 _worstPrice = prices.sellLow.mulDiv( + FIX_ONE - origin.maxTradeSlippage(), + prices.buyHigh, + FLOOR + ); uint192 _bestPrice = prices.sellHigh.div(prices.buyLow, CEIL); // no additional slippage assert(_worstPrice <= _bestPrice); worstPrice = _worstPrice; // gas-saver @@ -260,30 +254,6 @@ contract DutchTrade is ITrade { // === Private === - /// Return a sliding % from 0 (at maxTradeVolume) to maxTradeSlippage (at minTradeVolume) - /// @param auctionVolume {UoA} The actual auction volume - /// @param minTradeVolume {UoA} The minimum trade volume - /// @param maxTradeVolume {UoA} The maximum trade volume - /// @return slippage {1} The fraction of auctionVolume that should be permitted as slippage - function _slippage( - uint192 auctionVolume, - uint192 minTradeVolume, - uint192 maxTradeVolume - ) private view returns (uint192 slippage) { - slippage = origin.maxTradeSlippage(); // {1} - if (maxTradeVolume <= minTradeVolume || auctionVolume < minTradeVolume) return slippage; - - // untestable: - // auctionVolume already sized based on maxTradeVolume, so this will not be true - if (auctionVolume > maxTradeVolume) return 0; // 0% slippage beyond maxTradeVolume - - // {1} = {1} * ({UoA} - {UoA}} / ({UoA} - {UoA}) - return - slippage.mul( - FIX_ONE - divuu(auctionVolume - minTradeVolume, maxTradeVolume - minTradeVolume) - ); - } - /// Return the price of the auction at a particular timestamp /// @param blockNumber {block} The block number to get price for /// @return {buyTok/sellTok} diff --git a/docs/collateral.md b/docs/collateral.md index a2fb80adc4..b5e367555c 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -11,17 +11,19 @@ The core protocol depends on two plugin types: 2. _Trading_ (not discussed here) `contracts/plugins/trading` -In our inheritance tree, Collateral is a subtype of Asset (i.e. `ICollateral is IAsset`). An Asset describes how to interact with and price an ERC20 token. An instance of the Reserve Protocol can use an ERC20 token if and only if its `AssetRegistry` contains an asset modeling that token. An Asset provides the Reserve Protocol with information about the token: +In our inheritance tree, Collateral is a subtype of Asset (i.e. `ICollateral is IAsset`). An Asset describes how to treat and price an ERC20 token, allowing the protocol to buy and sell the token. An instance of the Reserve Protocol can use an ERC20 token iff its `AssetRegistry` contains an asset modeling that token. An Asset provides the Reserve Protocol with: -- How to get its price +- How to get its (USD) price - A maximum volume per trade +- A `refresh()` mutator function -A Collateral contract is a subtype of Asset (i.e. `ICollateral is IAsset`), so it does everything as Asset does. Beyond that, a Collateral plugin provides the Reserve Protocol with the information it needs to use its token as collateral -- as backing, held in the RToken's basket. +A Collateral contract is a subtype of Asset (i.e. `ICollateral is IAsset`), so it does everything as Asset does. Beyond that, a Collateral plugin provides the Reserve Protocol with the information it needs to use its token as collateral -- as backing, held in the RToken's basket. Mainly this involves the addition of 2 exchange rates and a `Collateral Status`. + +For a collateral: - Its ERC20 token can be used to back an RToken, not just be bought and sold -- A Collateral has a `refresh()` method that is called at the start of any significant system interaction (i.e. `@custom:interaction`). - A Collateral has a `status()` view that returns a `CollateralStatus` value, which is one of `SOUND`, `IFFY`, or `DISABLED`. -- A Collateral provides 3 exchange rates in addition to the `{UoA/tok}` prices provided by an Asset: `{ref/tok}`, `{target/ref}`, and `{UoA/target}`. A large part of designing a collateral plugin is deciding how these exchange rates should be computed. This is discussed below, under [Accounting Units and Exchange Rates](#Accounting_Units_and_Exchange_Rates). If this notation for units is entirely new to you, first read [our explanation of this unit notation](solidity-style.md#Units-in-comments). +- A Collateral provides 2 exchange rates in addition to the `{UoA/tok}` price provided by an Asset: `{ref/tok}` and `{target/ref}` (to understand this notation, see: [here](solidity-style.md#Units-in-comments). A large part of designing a collateral plugin is deciding how these exchange rates should be computed. This is discussed further below, under [Accounting Units and Exchange Rates](#Accounting_Units_and_Exchange_Rates). The IAsset and ICollateral interfaces, from `IAsset.sol`, are as follows: @@ -108,97 +110,85 @@ interface ICollateral is IAsset { ``` -## Some security considerations +## Types of Default + +Broadly speaking there are two ways a collateral can default: + +1. Fast: `refresh()` detects a clear problem with its defi protocol, and triggers in an immediate default. For instance, anytime the `refPerTok()` exchange rate falls between calls to `refresh()`, the collateral should immediately default. +2. Slow: `refresh()` detects a error condition that will _probably_ recover, but which should cause a default eventually. For instance, if the Collateral relies on USDT, and our price feed says that USDT trades at less than \$0.95 for (say) 24 hours, the Collateral should default. If a needed price feed is out-of-date or reverting for a similar period, the Collateral should default. + + In either of these cases, the collateral should first become `IFFY` and only move to `DISABLED` after the problem becomes sustained. In general, any pathway for default that cannot be assessed immediately should go through this delayed flow. + +## Security: Callbacks The protocol specifically does not allow the use of any assets that have a callback mechanism, such as ERC777 or native ETH. In order to support these assets, they must be wrapped in an ERC20 contract that does not have a callback mechanism. This is a security consideration to prevent reentrancy attacks. This recommendation extends to LP tokens that contain assets with callback mechanisms (Such as Curve raw ETH pools - CRV/ETH for example) as well as tokens/LPs that involve WETH with unwrapping built-in. ## Accounting Units and Exchange Rates -To create a Collateral plugin, you need to select its accounting units (`{tok}`, `{ref}`, `{target}`, and `{UoA}`), and implement views of the exchange rates: `refPerTok()` and `targetPerRef()`. +To create a Collateral plugin, you need to select its accounting units (`{tok}`, `{ref}`, and `{target}`), and implement views of the exchange rates: `refPerTok()` and `targetPerRef()`. Wherever `{UoA}` is used, you can assume this represents USD, the modern-day typical unit of account. -Typical accounting units in this sense are things like ETH, USD, USDC -- tokens, assets, currencies; anything that can be used as a measure of value. In general, a valid accounting unit is a linear combination of any number of assets; so (1 USDC + 0.5 USDP + 0.25 TUSD) is a valid unit, as is (say) (0.5 USD + 0.5 EUR), though such units will probably only arise in particularly tricky cases. Each Collateral plugin should describe in its documentation each of its four accounting units +Typical accounting units in this sense are things like ETH, USD, USDC -- tokens, assets, currencies; anything that can be used as a measure of value. In general, a valid accounting unit is a linear combination of any number of assets; so (1 USDC + 0.5 USDP + 0.25 TUSD) is a valid unit, as is (say) (0.5 USD + 0.5 EUR), though such units will probably only arise in particularly tricky cases. Each Collateral plugin should describe in its documentation each of its three accounting units. As a quick overview: -- The unit `{tok}` is just the concrete token being modeled. +- The unit `{tok}` is just the concrete token being modeled. If a wrapper needs to be involved, it is the wrapper. - The protocol measures growth as the increase of the value of `{tok}` against the value of `{ref}`, and treats that growth as revenue. - If two Collateral plugins have the same `{target}`, then when one defaults, the other one can serve as backup collateral. -- The unit `{UoA}` is a common accounting unit across all collateral in an RToken. +- The unit `{UoA}` is a common accounting unit across all assets, and always means USD (for now). ### Collateral unit `{tok}` -The collateral unit `{tok}` is just 1 of the ERC20 token that the Collateral plugin models. The protocol directly holds this unit of value. +The collateral unit `{tok}` is just the ERC20 token that the Collateral plugin models, or its wrapper, if a wrapper is involved. The protocol directly holds this unit of value. This is typically a token that is interesting to hold because it allows the accumulation of ever-increasing amounts of some other more-fundamental unit, called the reference unit. It's also possible for collateral to be non-appreciating, in which case it may still make sense to hold the collateral either because it allows the claiming of rewards over time, or simply because the protocol strongly requires stability (usually, short-term). -Note that a value denoted `{tok}` is a number of "whole tokens" with 18 decimals. So even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working with `uint192` values with the unit `{tok}`. For context on our approach for handling decimal-fixed-point, see [The Fix Library](solidity-style.md#The-Fix-Library). +Note that a value denoted `{tok}` is a number of "whole tokens" with 18 decimals. Even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working with `uint192` representations with the unit `{tok}`. For context on our approach for handling decimal-fixed-point, see [The Fix Library](solidity-style.md#The-Fix-Library). In-short, `uint192` is a special-cased uint size that always represents fractional values with 18 decimals. ### Reference unit `{ref}` -The _reference unit_, `{ref}`, is the measure of value that the protocol computes revenue against. When the exchange rate `refPerTok()` rises, the protocol keeps a constant amount of `{ref}` as backing, and sells the rest of the token it holds as revenue. - -There's room for flexibility and creativity in the choice of a Collateral's reference unit. The chief constraints are: +The _reference unit_, `{ref}`, is the measure of value that the protocol computes revenue against. When the exchange rate `refPerTok()` rises, the protocol keeps a constant amount of `{ref}` as backing, and considers any surplus balance of the token revenue. -- `refPerTok() {ref}` should always be a good market rate for 1 `{tok}` -- `refPerTok()` must be nondecreasing over time, at least on some sensible model of the collateral token's economics. If that model is violated, the Collateral plugin should immediately default. (i.e, permanently set `status()` to `DISABLED`) +There's room for flexibility and creativity in the choice of a Collateral's reference unit. The chief constraints is that `refPerTok()` must be nondecreasing over time, and as soon as this fails to be the case the `CollateralStatus` should become permanently `DISABLED`. -In many cases, the choice of reference unit is clear. +In many cases, the choice of reference unit is clear. For example: - The collateral token cUSDC (compound USDC) has a natural reference unit of USDC. cUSDC is permissionlessly redeemable in the Compound protocol for an ever-increasing amount of USDC. -- The collateral token USDT is its own natural reference unit. It's not natively redeemable for anything else on-chain, and we think of it as non-appreciating collateral. (Consider: what would it mean for USDT to "appreciate"?) +- The collateral token USDT is its own natural reference unit. It's not natively redeemable for anything else on-chain, and we think of it as non-appreciating collateral. The reference unit is not USD, because the USDT/USD exchange rate often has small fluctuations in both direction which would otherwise cause `refPerTok()` to decrease. -Often, the collateral token is directly redeemable for the reference unit in the token's protocol. (When this is the case, you can usually implement `refPerTok()` by looking up the redemption rate between the collateral token and its underlying token!) If you want to keep things simple, stick to "natural" collateral produced by protocols with nondecreasing exchange rates. +Often, the collateral token is directly redeemable for the reference unit in the token's protocol. (When this is the case, you can usually implement `refPerTok()` by looking up the redemption rate between the collateral token and its underlying token!). -However, the protocol never tries to handle reference-unit tokens itself, and in fact reference-unit tokens don't even need to exist. Thus, a Collateral can have a _synthetic_ reference unit for which there exists no corresponding underlying token. For some worked-out examples, read [Synthetic Unit Examples](#Synthetic_Unit_Example) below. +However, the protocol never tries to handle reference-unit tokens itself, and in fact the reference-unit doesn't even need to necessarily exist, it can simply be a measure. For example, AMM LP tokens would use their invariant measure as the reference unit, and their exchange between the LP token and the invariant measure would be the `refPerTok()` exchange rate (i.e. get_virtual_price() in Curve). ### Target unit `{target}` -The _target unit_, `{target}`, is the type of value that the Collateral is expected by users to represent over time. For instance, an RToken intended to be a USD stablecoin probably has a basket made of Collateral for which `{target} = USD`. When the protocol must reconfigure the basket, it will replace defaulting "prime" Collateral with other "backup" Collateral if and only if they have the same target unit. - -The target unit has to do with a concept called the Target Basket, and ultimately comes down to the reasons why this collateral might be chosen as backing in the first place. For instance, if you create an RToken in Register, the deployer selects a linear combination of target units such as: - -- 1 USD -- 0.5 USD + 0.55 EUR -- 0.5 USD + 0.35 EUR + 0.00001 BTC - -These Target Baskets have been selected to start with a market price of about \$1, assuming a slightly weak EUR and \$20k BTC. Over time, these RTokens would each have very different overall price trajectories. - -(Note: the Target Basket never manifests in the code directly. In the code, we have a slightly more specific concept called the Prime Basket. But the Target Basket is a coherent concept for someone thinking about the UX of an RToken. You can think of it like a simplified view of the Prime Basket.) +The _target unit_, `{target}`, is the type of value that the Collateral is expected by users to match over time. For instance, an RToken intended to be a USD stablecoin must necessarily have a basket of Collateral for which `{target} = USD`. When the protocol must reconfigure the basket, it will replace defaulting Collateral with other backup Collateral that share `USD` as their target unit. The target unit and reference unit must be even more tightly connected than the reference unit and collateral unit. The chief constraints on `{target}` are: -- `targetPerRef() {target}` should always be a reasonable market rate for 1 `{ref}`, ignoring short-term price fluxuations. -- `targetPerRef()` must be a _constant_. - -Moreover, `{target}` should be the simplest and most common unit that can satisfy those constraints. A major purpose of the Reserve protocol is to automatically move funds stored in a defaulting token into backup positions. Collateral A can have Collateral B as a backup token if and only if they have the same target unit. +- `targetPerRef()` must be _constant_ +- `targetPerRef()` should not diverge too much from the actual measured exchange rate on secondary markets. Divergence for periods of time is acceptable, but during these times the collateral should be marked `IFFY`. If the divergence is sustained long enough, the collateral should be permanently marked `DISABLED`. -Given those desired properties, after you've selected a collateral unit and reference unit, it's typically simple to choose a sensible target unit. For USDC the target unit would be USD; for EURT it would be the EUR; for WBTC it would be BTC. +For USDC the target unit would be USD; for EURT it would be the EUR; for WBTC it would be BTC. ### Unit of Account `{UoA}` -The Unit of Account `{UoA}` for a collateral plugin is simply a measure of value in which asset prices can be commonly denominated and compared. In principle, it's totally arbitrary, but all collateral plugins registered with an RToken must have the same unit of account. As of the current writing (October 2022), given the price information currently available on-chain, just use `USD` for the Unit of Account. +`{UoA} = USD` -Note, this doesn't disqualify collateral with USD as its target unit! It's fine for the target unit to be the unit of account. This doesn't disqualify collateral with a non-USD target unit either! It's fine for the target unit to be different from the unit of account. These two concepts are totally orthogonal. +The Unit of Account `{UoA}` for a collateral plugin is simply a measure of value in which asset prices can be commonly denominated and compared. In principle it's totally arbitrary, but all collateral plugins registered with an RToken must have the same unit of account. As of the current writing (September 2023), USD is the dominant common measure. We prefer to use `{UoA}` instead of USD in our code, because it's possible that in the future the dominant unit of account may change. -### Representing Fractional Values +Note, this doesn't disqualify collateral with USD as its target unit! It's fine for the target unit to be the unit of account. This doesn't disqualify collateral with a non-USD target unit either! It's fine for the target unit to be `BTC` and for the unit of account to be `USD`. -Wherever contract variables have these units, it's understood that even though they're handled as `uint192`s, they represent fractional values with 18 decimals. In particular, a `{tok}` value is a number of "whole tokens" with 18 decimals. So even though DAI has 18 decimals and USDC has 6 decimals, $1 in either token would be 1e18 when working in units of `{tok}`. +## Synthetic Units (Advanced) -For more about our approach for handling decimal-fixed-point, see our [docs on the Fix Library](solidity-style.md#The-Fix-Library). Ideally a user-defined type would be used but we found static analyses tools had trouble with that. - -## Synthetic Units - -Some collateral positions require a synthetic reference unit. Here are 3 ways one might do this (more are probably possible): +Some collateral positions require a synthetic reference unit. The two most common cases are: 1. [Defi Protocol Invariant](#defi-protocol-invariant) - Good for: bespoke LP tokens -2. [Demurrage Collateral](#demurrage-collateral) - Good for: tokens without obvious revenue mechanisms on their own -3. [Revenue Hiding](#revenue-hiding) + Good for: LP tokens +2. [Revenue Hiding](#revenue-hiding) Good for: tokens that _almost_ have a nondecreasing exchange rate but not quite - Update: Most of our collateral now have revenue hiding by default. See [AppreciatingFiatCollateral.sol](../contracts/plugins/AppreciatingFiatCollateral.sol) + Update: All of our appreciating collateral now have (a small amount of) revenue hiding by default, as an additional safety measure. See [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol) -In general these approaches can be combined, though we don't recommend it! +These approaches can be combined. For example: [CurveStableCollateral.sol](../contracts/plugins/assets/curve/CurveStableCollateral.sol) ### Defi Protocol Invariant @@ -208,68 +198,23 @@ Consider the Uniswap V2 LP token, **UNI-V2**, for the USDC/USDT pair. (The follo A position's "natural" reference unit is whatever it's directly redeemable for. However, a Uniswap v2 LP token is not redeemable for any fixed, concrete unit. Rather, it's redeemable _pro rata_ for a share of the tokens in the liquidity pool, which can constantly change their proportion as trading occurs. -To demonstrate this difficulty, imagine we choose "1 USD" for the reference unit. We presume in this design that 1 USDC and 1 USDT are continuously redeemable for 1 USD each -- the Collateral can watch that assumption on price feeds and default if it fails, this is fine -- and we implement `refPerTok()` by computing the present redemption value of an LP token in USD. _This won't work_, because the redemption value of the LP token increases any time trading moves the pool's proportion of USDC to USDT tokens briefly away from the 1:1 point, and then decreases as trading brings the pool's proportion back to the 1:1 point. The protocol requires that `refPerTok()` never decreases, so this will cause immediate defaults. +To demonstrate this difficulty, imagine we choose "1 USD" for the reference unit. We presume in this design that 1 USDC and 1 USDT are continuously redeemable for 1 USD each and we implement `refPerTok()` by computing the present redemption value of an LP token in USD. _This won't work_, because the redemption value of the LP token increases any time trading moves the pool's proportion of USDC to USDT tokens briefly away from the 1:1 point and decreases when balances return to the 1:1 point. The protocol requires that `refPerTok()` never decreases, so this will cause defaults. Even with a large amount of revenue hiding, it may be possible for a griefer to flash loan enough USDC to intentionally swing the pool enough to trigger a default. -Instead, you might imagine that we choose "1 USDC + 1 USDT" as the reference unit. We compute `refPerTok()` at any moment by observing that we can redeem the `L` LP tokens in existence for `x` USDC and `y` USDT, and returning `min(x, y)/L`. _This also won't work_, because now `refPerTok()` will decrease any time the pool's proportion moves away from the 1:1 point, and it will increase whenever the proportion moves back. +Alternatively, you might imagine "0.5 USDC + 0.5 USDT" could be the reference unit. _This also won't work_, because now `refPerTok()` will decrease any time the pool's proportion moves away from the 1:1 point, and it will increase whenever the proportion moves back, as before. To make this Collateral position actually work, we have to account revenues against the pool's invariant. Assuming that there's a supply of `L` LP tokens for a pool with `x` USDC and `y` USDT, the strange-looking reference unit `sqrt(USDC * USDT)`, with corresponding `refPerTok() = sqrt(x * y)/L`, works exactly as desired. Without walking through the algebra, we can reason our way heuristically towards this design. The exchange rate `refPerTok()` should be a value that only ever increases. In UNI V2, that means it must not change when LP tokens are deposited or withdrawn; and it must not change due to trading, except insofar as it increases due to the protocol's fees. Deposit and withdrawal change all of `x`, `y`, and `L`, but in a lawful way: `x * y / (L * L)` is invariant even when the LP supply is changed due deposits or withdrawals. If there were zero fees, the same expression would be invariant during trading; with fees, `x * y` only increases, and so `x * y / (L * L)` only increases. However, this expression has bizarre units. However, this expression cannot possibly be a rate "per LP token", it's a rate per square of the LP token. Taking the square root gives us a rate per token of `sqrt(x * y) / L`. -[^comment]: tbh it's be a _good idea_ to walk through the algebra here, I'm just ... very busy right now! - After this choice after reference unit, we have two reasonable choices for target units. The simplest choice is to assert that the target unit is essentially unique to this particular instance of UNI v2 -- named by some horrible unique string like `UNIV2SQRTUSDTCUSDT` -- and that its redemption position cannot be traded, for certain, for any other backup position, so it cannot be backed up by a sensible basket. -This would be sensible for many UNI v2 pools, but someone holding value in a two-sided USD-fiatcoin pool probably intends to represent a USD position with those holdings, and so it'd be better for the Collateral plugin to have a target of USD. This is coherent so long as the Collateral plugin is setup to default under any of the following conditions: - -- According to a trusted oracle, USDC is far from \$1 for some time -- According a trusted oracle, USDT is far from \$1 for some time -- The UNI v2 pool is far from the 1:1 point for some time - -And even then, it would be somewhat dangerous for an RToken designer to use this LP token as a _backup_ Collateral position -- because whenever the pool's proportion is away from 1:1 at all, it'll take more than \$1 of collateral to buy an LP position that can reliably convert to \$1 later. - -### Demurrage Collateral - -If the collateral token does not have a reference unit it is nondecreasing against except for itself, a revenue stream can be created by composing a synthetic reference unit that refers to a falling quantity of the collateral token. This causes the reference unit to become inflationary with respect to the collateral unit, resulting in a monotonically increasing `refPerTok()` and allowing the protocol to recognize revenue. - -Plan: To ensure `refPerTok()` is nondecreasing, the reference unit is defined as a falling quantity of the collateral unit. As the reference unit "gets smaller", `refPerTok()` increases. This is viewed by the protocol as appreciation, allowing it to decrease how much `tok` is required per basket unit (`BU`). - -**Reference Unit** - -The equation below describes the relationship between the collateral unit and an inflationary reference unit. Over time there come to be more reference units per collateral token, allowing the protocol to identify revenue. - -``` -refPerTok(): (1 + demurrage_rate_per_second) ^ t - where t is seconds since 01/01/2020 00:00:00 GMT+0000 -``` - -The timestamp of 01/01/2020 00:00:00 GMT+0000 is chosen arbitrarily. It's not important what this value is, generally, but it's going to wind up being important that this anchor timestamp is the same _for all_ demurrage collateral, so we suggest just sticking with the provided timestamp. In unix time this is `1640995200`. - -(Note: In practice this equation will also have to be adjusted to account for the limited computation available on Ethereum. While the equation is expressed in terms of seconds, a larger granularity is likely necessary, such as hours or days. Exponentiation is expensive!) - -**Target Unit** - -A [constraint on the target unit](#target-unit-target) is that it should have a roughly constant exchange rate to the reference unit, modulo short-term price movements. In order to maintain this property, the target unit should be set to inflate at the same rate as the reference unit. This yields a trivial `targetPerRef()`. - -``` -targetPerRef(): 1 -``` - -The target unit must be named in a way that distinguishes it from the non-demurrage version of itself. We suggest the following naming scheme: - -`DMR{annual_demurrage_in_basis_points}{token_symbol}` or `DMR100wstETH` in this example. - -The `DMR` prefix is short for demurrage; the `annual_demurrage_in_basis_points` is a number such as 100 for 1% annually; the `token_symbol` is the symbol the collateral. - -Downside: Collateral can only be automatically substituted in the basket with collateral that share the same target unit. +This would be sensible for many UNI v2 pools, but someone holding value in a two-sided USD-fiatcoin pool probably intends to represent a USD position with those holdings, and so it'd be better for the Collateral plugin to have a target of USD. This is coherent so long as all tokens in the pool are pegged to USD. ### Revenue Hiding -An alternative to demurrage is to hide revenue from the protocol via a discounted `refPerTok()` function. `refPerTok()` should return X% less than the largest _actual_ refPerTok exchange rate that has been observed in the underlying Defi protocol. When the actual rate falls below this value, the collateral should be marked defaulted via the `refresh()` function. - -When implementing Revenue Hiding, the `price()/strictPrice()` functions should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. As such, it's best if the amount of hiding necessary is small. If the token will only rarely decrease in exchange rate---and only then a little---then revenue-hiding may be a good fit. +Revenue Hiding should be employed when the function underlying `refPerTok()` is not necessarily _strongly_ non-decreasing, or simply if there is uncertainty surrounding the guarantee. In general we recommend including a very small amount (1e-6) of revenue hiding for all appreciating collateral. This is already implemented in [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol). -We already have an implementation of a Revenue Hiding contract at `contracts/plugins/assets/AppreciatingFiatCollateral.sol` that can be inherited from to create Revenue Hiding +When implementing Revenue Hiding, the `price/lotPrice()` functions should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. ## Important Properties for Collateral Plugins @@ -278,13 +223,13 @@ We already have an implementation of a Revenue Hiding contract at `contracts/plu Collateral plugins should be safe to reuse by many different Reserve Protocol instances. So: - Collateral plugins should neither require governance nor give special permissions to any particular accounts. -- Collateral plugins should not pull information from an RToken instance that they expect to use them directly. (There is already an RToken Asset that uses price information from the protocol directly; but it must not be extended for use as Collateral in its own basket!) +- Collateral plugins should not pull information from an RToken instance that they expect to use them directly. Check out [CurveStableRTokenMetapoolCollateral.sol](../contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol) for an example of a collateral plugin that allows one RToken instance to use another RToken instance as collateral, through an LP token. ### Token balances must be transferrable Collateral tokens must be tokens in the formal sense. That is: they must provide balances to holders, and these balances must be transferrable. -Some tokens may not be transferrable. Worse still, some positions in defi are not tokenized to begin with: take for example DSR-locked DAI or Convex's boosted staking positions. In these cases tokenization can be achieved by wrapping the position. In this kind of setup the wrapping contract issues tokens that correspond to pro-rata shares of the overall defi position, which it maintains under the hood in relation with the defi protocol. +Some positions may not be transferrable: take for example DSR-locked DAI or Convex's boosted staking positions. In these cases tokenization can be achieved by wrapping the position. In this kind of setup the wrapping contract issues tokens that correspond to pro-rata shares of the overall defi position, which it maintains under the hood in relation with the defi protocol. Here are some examples of what this looks like in Convex's case [here](https://github.com/convex-eth/platform/tree/main/contracts/contracts/wrappers). @@ -294,11 +239,9 @@ Some defi protocols yield returns by increasing the token balances of users, cal The Reserve Protocol cannot directly hold rebasing tokens. However, the protocol can indirectly hold a rebasing token, if it's wrapped by another token that does not itself rebase, but instead appreciates only through exchange-rate increases. Any rebasing token can be wrapped to be turned into an appreciating exchange-rate token, and vice versa. -To use a rebasing token as collateral backing, the rebasing ERC20 needs to be replaced with an ERC20 that is non-rebasing. This is _not_ a change to the collateral plugin contract itself. Instead, the collateral plugin designer needs to provide a wrapping ERC20 contract that RToken issuers or redeemers will have to deposit into or withdraw from. We expect to automate these transformations as zaps in the future, but at the time of this writing everything is still manual. +To use a rebasing token as collateral backing, the rebasing ERC20 needs to be replaced with an ERC20 that is non-rebasing. This is _not_ a change to the collateral plugin contract itself. Instead, the collateral plugin designer needs to provide a wrapping ERC20 contract that RToken issuers or redeemers will have to deposit into or withdraw from. -For an example of a token wrapper that performs this transformation, see [StaticATokenLM.sol](../contracts/plugins/aave/StaticATokenLM.sol). This is a standard wrapper to wrap Aave ATokens into StaticATokens. A thinned-down version of this contract makes a good starting point for developing other ERC20 wrappers -- but if the token is well-integrated in defi, a wrapping contract probably already exists. - -The same wrapper approach is easily used to tokenize positions in protocols that do not produce tokenized or transferrable positions. +There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20Wrapper.sol](../contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol). You may add additional logic by extending `_afterDeposit()` or `_beforeWithdraw()`. ### `refresh()` should never revert @@ -316,7 +259,7 @@ Unless there's a good reason for a specific collateral to use a different mechan If `price()` returns 0 for the lower-bound price estimate `low`, the collateral should pass-through the [slow default](#types-of-default) process where it is first marked `IFFY` and eventually transitioned to `DISABLED` if the behavior is sustained. `status()` should NOT return `SOUND`. -If a collateral implementor extends [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol), the logic inherited in the `refresh()` function already satisfies this property. +If a collateral implementor extends [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) or [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol), the logic inherited in the `refresh()` function already satisfies this property. ### Collateral must default if `refPerTok()` falls. @@ -324,7 +267,7 @@ Notice that `refresh()` is the only non-view method on the ICollateral interface If `refresh()` is called twice, and `refPerTok()` just after the second call is lower than `refPerTok()` just after the first call, then `status()` must change to `CollateralStatus.DISABLED` immediately. This is true for any collateral plugin. For some collateral plugins it will be obvious that `refPerTok()` cannot decrease, in which case no checks are required. -If a collateral implementor extends [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol), the logic inherited in the `refresh()` function already satisfies this property. +If a collateral implementor extends [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol), the logic inherited in the `refresh()` function already satisfies this property. ### Defaulted Collateral must stay defaulted. @@ -332,7 +275,7 @@ If `status()` ever returns `CollateralStatus.DISABLED`, then it must always retu ### Token rewards should be claimable. -Protocol contracts that hold an asset for any significant amount of time must be able to call `claimRewards()` on the ERC20 itself (previously on the asset/collateral plugin via delegatecall). The erc20 should include whatever logic is necessary to claim rewards from all relevant defi protocols. These rewards are often emissions from other protocols, but may also be something like trading fees in the case of UNIV3 collateral. To take advantage of this: +Protocol contracts that hold an asset for any significant amount of time must be able to call `claimRewards()` _on the ERC20 itself_, if there are token rewards. The ERC20 should include whatever logic is necessary to claim rewards from all relevant defi protocols. These rewards are often emissions from other protocols, but may also be something like trading fees in the case of UNIV3 collateral. To take advantage of this: - `claimRewards()` must claim all rewards that may be earned by holding the asset ERC20 and send them to the holder, in the correct proportions based on amount of time held. - The `RewardsClaimed` event should be emitted for each token type claimed. @@ -349,7 +292,7 @@ The values returned by the following view methods should never change: ## Function-by-function walkthrough -Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can restrict their attention to overriding the following four functions: +Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) or [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol) can restrict their attention to overriding the following three functions: - `tryPrice()` (not on the ICollateral interface; used by `price()`/`refresh()`) - `refPerTok()` @@ -382,15 +325,6 @@ It's common for a Collateral plugin to reply on economic or technical assumption `status()` should trigger `DISABLED` when `refresh()` can tell that its assumptions are definitely being violated, and `status()` should trigger `IFFY` if it cannot tell that its assumptions _aren't_ being violated, such as if an oracle is reverting or has become stale. -#### Types of Default - -Broadly speaking there are two ways a collateral can default: - -1. Fast: `refresh()` detects a clear problem with its defi protocol, and triggers in an immediate default. For instance, anytime the `refPerTok()` exchange rate falls between calls to `refresh()`, the collateral should immediately default. -2. Slow: `refresh()` detects a error condition that will _probably_ recover, but which should cause a default eventually. For instance, if the Collateral relies on USDT, and our price feed says that USDT trades at less than \$0.95 for (say) 24 hours, the Collateral should default. If a needed price feed is out-of-date or reverting for a similar period, the Collateral should default. - - In either of these cases, the collateral should first become `IFFY` and only move to `DISABLED` after the problem becomes sustained. In general, any pathway for default that cannot be assessed immediately should go through this delayed flow. - ### status() `function status() external view returns (CollateralStatus)` @@ -407,7 +341,7 @@ enum CollateralStatus { #### Reasons to default -After a call to `refresh()`, it is expected the collateral is either `IFFY` or `DISABLED` if either `refPerTok()` or `targetPerRef()` might revert, of if `price()` would return a 0 value for `low`. +After a call to `refresh()`, it is expected the collateral is either `IFFY` or `DISABLED` if either `refPerTok()` or `targetPerRef()` might revert, or if `price()` would return a 0 value for `low`. The collateral should also be immediately set to `DISABLED` if `refPerTok()` has fallen. @@ -421,7 +355,7 @@ Lastly, once a collateral becomes `DISABLED`, it must remain `DISABLED`. Should never revert. -Should return a lower and upper estimate for the price of the token on secondary markets. +Should return the tightest possible lower and upper estimate for the price of the token on secondary markets. The difference between the upper and lower estimate should not exceed 5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. @@ -433,6 +367,18 @@ Recommend decaying low estimate downwards and high estimate upwards over time. Should be gas-efficient. +The difference between the upper and lower estimate should not exceed ~5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. + +### lotPrice() `{UoA/tok}` + +Should never revert. + +Lower estimate must be <= upper estimate. + +The low estimate should be nonzero while the asset is worth selling. + +Should be gas-efficient. + ### refPerTok() `{ref/tok}` Should never revert. @@ -443,7 +389,7 @@ Should be gas-efficient. ### targetPerRef() `{target/ref}` -Should never revert. Must return a constant value. +Should never revert. Must return a constant value. Almost always `FIX_ONE`, but can be different in principle. Should be gas-efficient. @@ -462,10 +408,8 @@ The target name is just a bytes32 serialization of the target unit string. Here For a collateral plugin that uses a novel target unit, get the targetName with `ethers.utils.formatBytes32String(unitName)`. -If implementing a demurrage-based collateral plugin, make sure your targetName follows the pattern laid out in [Demurrage Collateral](#demurrage-collateral). - ## Practical Advice from Previous Work -In most cases [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of three functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`. +In most cases [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) or [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of three functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`. -If you're quite stuck, you might also find it useful to read through our other Collateral plugins as models, found in our repository in `/contracts/plugins/assets`. +If you're quite stuck, you might also find it useful to read through our existing Collateral plugins, found at `/contracts/plugins/assets`. diff --git a/docs/deployed-addresses/1-ETH+.md b/docs/deployed-addresses/1-ETH+.md new file mode 100644 index 0000000000..cbb06461a1 --- /dev/null +++ b/docs/deployed-addresses/1-ETH+.md @@ -0,0 +1,24 @@ +# [ETH+ (ETHPlus)](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) | [0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1](https://etherscan.io/address/0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1#code) | 2.1.0 | +| Main | [0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2](https://etherscan.io/address/0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2) | [0x143c35bfe04720394ebd18abeca83ea9d8bede2f](https://etherscan.io/address/0x143c35bfe04720394ebd18abeca83ea9d8bede2f#code) | 2.0.0 | +| AssetRegistry | [0xf526f058858E4cD060cFDD775077999562b31bE0](https://etherscan.io/address/0xf526f058858E4cD060cFDD775077999562b31bE0) | [0x5a004f70b2450e909b4048050c585549ab8afeb8](https://etherscan.io/address/0x5a004f70b2450e909b4048050c585549ab8afeb8#code) | 2.0.0 | +| BackingManager | [0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B](https://etherscan.io/address/0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B) | [0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc](https://etherscan.io/address/0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc#code) | 2.0.0 | +| BasketHandler | [0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194](https://etherscan.io/address/0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194) | [0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030](https://etherscan.io/address/0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030#code) | 2.1.0 | +| Broker | [0x6ca42ce37e5ece334066C504ba37144b4f14D50a](https://etherscan.io/address/0x6ca42ce37e5ece334066C504ba37144b4f14D50a) | [0x89209a52d085d975b14555f3e828f43fb7eaf3b7](https://etherscan.io/address/0x89209a52d085d975b14555f3e828f43fb7eaf3b7#code) | 2.1.0 | +| RSRTrader | [0x6E20823cA50aA026b99789c8D468a01f8aA3581C](https://etherscan.io/address/0x6E20823cA50aA026b99789c8D468a01f8aA3581C) | [](https://etherscan.io/address/#code) | 2.0.0 | +| RTokenTrader | [0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9](https://etherscan.io/address/0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | +| Distributor | [0x954B4770462e8894BcD2451543482F11DC160e1e](https://etherscan.io/address/0x954B4770462e8894BcD2451543482F11DC160e1e) | [](https://etherscan.io/address/#code) | 2.0.0 | +| Furnace | [0x9862efAB36F81524B24F787e07C97e2F5A6c206e](https://etherscan.io/address/0x9862efAB36F81524B24F787e07C97e2F5A6c206e) | [](https://etherscan.io/address/#code) | 2.0.0 | +| StRSR | [0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd](https://etherscan.io/address/0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd) | [0xfda8c62d86e426d5fb653b6c44a455bb657b693f](https://etherscan.io/address/0xfda8c62d86e426d5fb653b6c44a455bb657b693f#code) | 2.1.0 | + + +## Governance Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| Governor Alexios | [0x239cDcBE174B4728c870A24F77540dAB3dC5F981](https://etherscan.io/address/0x239cDcBE174B4728c870A24F77540dAB3dC5F981) | [](https://etherscan.io/address/#code) | 1 | +| Timelock | [0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B](https://etherscan.io/address/0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B) | [](https://etherscan.io/address/#code) | N/A | + + \ No newline at end of file diff --git a/docs/deployed-addresses/1-assets-2.1.0.md b/docs/deployed-addresses/1-assets-2.1.0.md new file mode 100644 index 0000000000..9547526591 --- /dev/null +++ b/docs/deployed-addresses/1-assets-2.1.0.md @@ -0,0 +1,44 @@ +# Assets (Mainnet 2.1.0) +## Assets +| Contract | Address | +| --- | --- | +| stkAAVE | [0x5cAF60bf01A5ecd436b2Cd0b68e4c04547eCb872](https://etherscan.io/address/0x5cAF60bf01A5ecd436b2Cd0b68e4c04547eCb872) | +| COMP | [0x159Af360D99b3dd6c4a47Cd08b730Ff7C9d113CC](https://etherscan.io/address/0x159Af360D99b3dd6c4a47Cd08b730Ff7C9d113CC) | +| CRV | [0x3752098adf2C9E1E17e48D9cE2Ea48961905064A](https://etherscan.io/address/0x3752098adf2C9E1E17e48D9cE2Ea48961905064A) | +| CVX | [0xbE301280e593d1665A2D54DA65687E92f46D5c44](https://etherscan.io/address/0xbE301280e593d1665A2D54DA65687E92f46D5c44) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0xB03A029FF70d7c4c53bb3C4288a87aCFea0Ee8FE](https://etherscan.io/address/0xB03A029FF70d7c4c53bb3C4288a87aCFea0Ee8FE) | +| USDC | [0x951d32B449D5D5cE53DA3a5C1E22b37ec0f2E387](https://etherscan.io/address/0x951d32B449D5D5cE53DA3a5C1E22b37ec0f2E387) | +| USDT | [0x7fc1c34782888a076d3c88c0cce27b75892ee85d](https://etherscan.io/address/0x7fc1c34782888a076d3c88c0cce27b75892ee85d) | +| USDP | [0xeD67e489E7aA622380288557FABfA6Be246dE776](https://etherscan.io/address/0xeD67e489E7aA622380288557FABfA6Be246dE776) | +| TUSD | [0x9cCc7B600F80ed6F3d997698e01301D9016F8656](https://etherscan.io/address/0x9cCc7B600F80ed6F3d997698e01301D9016F8656) | +| BUSD | [0x07cDEA861B2A231e249E220A553D9A38ba7383D6](https://etherscan.io/address/0x07cDEA861B2A231e249E220A553D9A38ba7383D6) | +| aDAI | [0x2cAF7BB8C9651377cc7DBd8dc297b58F67D8A816](https://etherscan.io/address/0x2cAF7BB8C9651377cc7DBd8dc297b58F67D8A816) | +| aUSDC | [0xE19ae8D1f3FFf987aaEaa65248BAB3A0d1FDC809](https://etherscan.io/address/0xE19ae8D1f3FFf987aaEaa65248BAB3A0d1FDC809) | +| aUSDT | [0x44AB1cB3C9f25A928E39A4eDE3CA08B52b4cdE24](https://etherscan.io/address/0x44AB1cB3C9f25A928E39A4eDE3CA08B52b4cdE24) | +| aBUSD | [0x002835840A6CB5dd3f73e78A21eF41db4C66948e](https://etherscan.io/address/0x002835840A6CB5dd3f73e78A21eF41db4C66948e) | +| aUSDP | [0x50f4991BE43a631f5BEDB5C39e45FF3E57Fa783e](https://etherscan.io/address/0x50f4991BE43a631f5BEDB5C39e45FF3E57Fa783e) | +| cDAI | [0xe11b8943b6C9abfc9D729306029f7401205bAa9B](https://etherscan.io/address/0xe11b8943b6C9abfc9D729306029f7401205bAa9B) | +| cUSDC | [0x7FC2df2B27220D9F23Fbd8C21b1f7b0CaEB6fE15](https://etherscan.io/address/0x7FC2df2B27220D9F23Fbd8C21b1f7b0CaEB6fE15) | +| cUSDT | [0x1F1941eE0B3CCb4Ff2135D31103C59F2E53C34B5](https://etherscan.io/address/0x1F1941eE0B3CCb4Ff2135D31103C59F2E53C34B5) | +| cUSDP | [0xD9438B058Ce83925E4AC0834744fC0b573A7AFbB](https://etherscan.io/address/0xD9438B058Ce83925E4AC0834744fC0b573A7AFbB) | +| cWBTC | [0xC3481edefE16599701940a71B7a488605803D4cB](https://etherscan.io/address/0xC3481edefE16599701940a71B7a488605803D4cB) | +| cETH | [0xA88304757c00D45b24eea13568bd346C4a49053C](https://etherscan.io/address/0xA88304757c00D45b24eea13568bd346C4a49053C) | +| WBTC | [0xe9c6bF8536e2Af014a54651F0dd6c74A18D13e70](https://etherscan.io/address/0xe9c6bF8536e2Af014a54651F0dd6c74A18D13e70) | +| WETH | [0xBd941FA60b6E2AcCa15afB8962f6B4795c848b8D](https://etherscan.io/address/0xBd941FA60b6E2AcCa15afB8962f6B4795c848b8D) | +| EURT | [0x14d5b63e8FfDDDB590C88d9A258461CbEfbB8d56](https://etherscan.io/address/0x14d5b63e8FfDDDB590C88d9A258461CbEfbB8d56) | +| wstETH | [0x3879C820c3cC4547Cb76F8dC842005946Cedb385](https://etherscan.io/address/0x3879C820c3cC4547Cb76F8dC842005946Cedb385) | +| rETH | [0xD2270A3E17DBeA5Cb491E0120441bFD0177Da913](https://etherscan.io/address/0xD2270A3E17DBeA5Cb491E0120441bFD0177Da913) | +| fUSDC | [0x1289a753e0BaE82CF7f87747f22Eaf8E4eb7C216](https://etherscan.io/address/0x1289a753e0BaE82CF7f87747f22Eaf8E4eb7C216) | +| fUSDT | [0x5F471bDE4950CdB00714A6dD033cA7f912a4f9Ee](https://etherscan.io/address/0x5F471bDE4950CdB00714A6dD033cA7f912a4f9Ee) | +| fDAI | [0xA4410B71033fFE8fA41c6096332Be58E3641326d](https://etherscan.io/address/0xA4410B71033fFE8fA41c6096332Be58E3641326d) | +| fFRAX | [0xcd46Ff27c0d6F088FB94896dcE8F17491BD84c75](https://etherscan.io/address/0xcd46Ff27c0d6F088FB94896dcE8F17491BD84c75) | +| cUSDCv3 | [0x615D92fAF203Faa9ea7a4D8cdDC49b2Ad0702a1f](https://etherscan.io/address/0x615D92fAF203Faa9ea7a4D8cdDC49b2Ad0702a1f) | +| cvx3Pool | [0xC34E547D66B5a57B370217aAe4F34b882a9933Dc](https://etherscan.io/address/0xC34E547D66B5a57B370217aAe4F34b882a9933Dc) | +| cvxTriCrypto | [0xb2EeD19C381b71d0f54327D61596312144f66fA7](https://etherscan.io/address/0xb2EeD19C381b71d0f54327D61596312144f66fA7) | +| cvxeUSDFRAXBP | [0x0D41E86D019cadaAA32a5a12A35d456711879770](https://etherscan.io/address/0x0D41E86D019cadaAA32a5a12A35d456711879770) | +| cvxMIM3Pool | [0x9866020B7A59022C2F017C6d358868cB11b86E2d](https://etherscan.io/address/0x9866020B7A59022C2F017C6d358868cB11b86E2d) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-2.1.0.md b/docs/deployed-addresses/1-components-2.1.0.md new file mode 100644 index 0000000000..4ead783227 --- /dev/null +++ b/docs/deployed-addresses/1-components-2.1.0.md @@ -0,0 +1,31 @@ +# Component Implementations (Mainnet 2.1.0) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| AssetRegistry | [0x5a004F70b2450E909B4048050c585549Ab8afeB8](https://etherscan.io/address/0x5a004F70b2450E909B4048050c585549Ab8afeB8) | +| BackingManager | [0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC](https://etherscan.io/address/0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC) | +| BasketHandler | [0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030](https://etherscan.io/address/0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030) | +| Broker | [0x89209a52d085D975b14555F3e828F43fb7EaF3B7](https://etherscan.io/address/0x89209a52d085D975b14555F3e828F43fb7EaF3B7) | +| CvxMiningLib | [0xA6B8934a82874788043A75d50ca74a18732DC660](https://etherscan.io/address/0xA6B8934a82874788043A75d50ca74a18732DC660) | +| Deployer | [0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB](https://etherscan.io/address/0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB) | +| Distributor | [0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569](https://etherscan.io/address/0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569) | +| DutchTrade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | +| FacadeAct | [0x933c5DBdA80f03C102C560e9ed0c29812998fA78](https://etherscan.io/address/0x933c5DBdA80f03C102C560e9ed0c29812998fA78) | +| FacadeMonitor | [0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6](https://etherscan.io/address/0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6) | +| FacadeRead | [0xf535Cab96457558eE3eeAF1402fCA6441E832f08](https://etherscan.io/address/0xf535Cab96457558eE3eeAF1402fCA6441E832f08) | +| FacadeWrite | [0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629](https://etherscan.io/address/0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629) | +| FacadeWriteLib | [0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8](https://etherscan.io/address/0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8) | +| Furnace | [0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96](https://etherscan.io/address/0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96) | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | +| GnosisTrade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | +| Main | [0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F](https://etherscan.io/address/0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F) | +| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | +| RsrAsset | [0x9cd0F8387672fEaaf7C269b62c34C53590d7e948](https://etherscan.io/address/0x9cd0F8387672fEaaf7C269b62c34C53590d7e948) | +| RsrTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | +| RToken | [0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1](https://etherscan.io/address/0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1) | +| RTokenTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | +| StRSR | [0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f](https://etherscan.io/address/0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f) | +| Trade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | +| TradingLib | [0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478](https://etherscan.io/address/0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-eUSD.md b/docs/deployed-addresses/1-eUSD.md new file mode 100644 index 0000000000..d07209e433 --- /dev/null +++ b/docs/deployed-addresses/1-eUSD.md @@ -0,0 +1,24 @@ +# [eUSD (Electronic Dollar)](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) | [0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1](https://etherscan.io/address/0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1#code) | 2.1.0 | +| Main | [0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a](https://etherscan.io/address/0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a) | [0x143c35bfe04720394ebd18abeca83ea9d8bede2f](https://etherscan.io/address/0x143c35bfe04720394ebd18abeca83ea9d8bede2f#code) | 2.0.0 | +| AssetRegistry | [0x9B85aC04A09c8C813c37de9B3d563C2D3F936162](https://etherscan.io/address/0x9B85aC04A09c8C813c37de9B3d563C2D3F936162) | [0x5a004f70b2450e909b4048050c585549ab8afeb8](https://etherscan.io/address/0x5a004f70b2450e909b4048050c585549ab8afeb8#code) | 2.0.0 | +| BackingManager | [0xF014FEF41cCB703975827C8569a3f0940cFD80A4](https://etherscan.io/address/0xF014FEF41cCB703975827C8569a3f0940cFD80A4) | [0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc](https://etherscan.io/address/0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc#code) | 2.0.0 | +| BasketHandler | [0x6d309297ddDFeA104A6E89a132e2f05ce3828e07](https://etherscan.io/address/0x6d309297ddDFeA104A6E89a132e2f05ce3828e07) | [0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030](https://etherscan.io/address/0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030#code) | 2.1.0 | +| Broker | [0x90EB22A31b69C29C34162E0E9278cc0617aA2B50](https://etherscan.io/address/0x90EB22A31b69C29C34162E0E9278cc0617aA2B50) | [0x89209a52d085d975b14555f3e828f43fb7eaf3b7](https://etherscan.io/address/0x89209a52d085d975b14555f3e828f43fb7eaf3b7#code) | 2.1.0 | +| RSRTrader | [0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f](https://etherscan.io/address/0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | +| RTokenTrader | [0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A](https://etherscan.io/address/0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | +| Distributor | [0x8a77980f82A1d537600891D782BCd8bd41B85472](https://etherscan.io/address/0x8a77980f82A1d537600891D782BCd8bd41B85472) | [0xc78c5a84f30317b5f7d87170ec21dc73df38d569](https://etherscan.io/address/0xc78c5a84f30317b5f7d87170ec21dc73df38d569#code) | 2.0.0 | +| Furnace | [0x57084b3a6317bea01bA8f7c582eD033d9345c2B2](https://etherscan.io/address/0x57084b3a6317bea01bA8f7c582eD033d9345c2B2) | [0x393002573ea4a3d74a80f3b1af436a3ee3a30c96](https://etherscan.io/address/0x393002573ea4a3d74a80f3b1af436a3ee3a30c96#code) | 2.0.0 | +| StRSR | [0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8](https://etherscan.io/address/0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8) | [0xfda8c62d86e426d5fb653b6c44a455bb657b693f](https://etherscan.io/address/0xfda8c62d86e426d5fb653b6c44a455bb657b693f#code) | 2.1.0 | + + +## Governance Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| Governor Alexios | [0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6](https://etherscan.io/address/0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6) | [](https://etherscan.io/address/#code) | 1 | +| Timelock | [0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c](https://etherscan.io/address/0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c) | [](https://etherscan.io/address/#code) | N/A | + + \ No newline at end of file diff --git a/docs/deployed-addresses/1-hyUSD.md b/docs/deployed-addresses/1-hyUSD.md new file mode 100644 index 0000000000..7d23c9ae09 --- /dev/null +++ b/docs/deployed-addresses/1-hyUSD.md @@ -0,0 +1,24 @@ +# [hyUSD (High Yield USD)](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xaCdf0DBA4B9839b96221a8487e9ca660a48212be](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) | [0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1](https://etherscan.io/address/0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1#code) | 2.1.0 | +| Main | [0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37](https://etherscan.io/address/0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37) | [0x143c35bfe04720394ebd18abeca83ea9d8bede2f](https://etherscan.io/address/0x143c35bfe04720394ebd18abeca83ea9d8bede2f#code) | 2.0.0 | +| AssetRegistry | [0xaCacddeE9b900b7535B13Cd8662df130265b8c78](https://etherscan.io/address/0xaCacddeE9b900b7535B13Cd8662df130265b8c78) | [0x5a004f70b2450e909b4048050c585549ab8afeb8](https://etherscan.io/address/0x5a004f70b2450e909b4048050c585549ab8afeb8#code) | 2.0.0 | +| BackingManager | [0x61691c4181F876Dd7e19D6742B367B48AA280ed3](https://etherscan.io/address/0x61691c4181F876Dd7e19D6742B367B48AA280ed3) | [0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc](https://etherscan.io/address/0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc#code) | 2.0.0 | +| BasketHandler | [0x9119DB28432bd97aBF4c3D81B929849e0490c7A6](https://etherscan.io/address/0x9119DB28432bd97aBF4c3D81B929849e0490c7A6) | [0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030](https://etherscan.io/address/0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030#code) | 2.1.0 | +| Broker | [0x44344ca9014BE4bB622037224d107493586f35ed](https://etherscan.io/address/0x44344ca9014BE4bB622037224d107493586f35ed) | [0x89209a52d085d975b14555f3e828f43fb7eaf3b7](https://etherscan.io/address/0x89209a52d085d975b14555f3e828f43fb7eaf3b7#code) | 2.1.0 | +| RSRTrader | [0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7](https://etherscan.io/address/0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | +| RTokenTrader | [0x4886f5549d3b25adCFaC68E40062c735faf81378](https://etherscan.io/address/0x4886f5549d3b25adCFaC68E40062c735faf81378) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | +| Distributor | [0x0297941cCB71f5595072C4fA34CE443b6C5b47A0](https://etherscan.io/address/0x0297941cCB71f5595072C4fA34CE443b6C5b47A0) | [0xc78c5a84f30317b5f7d87170ec21dc73df38d569](https://etherscan.io/address/0xc78c5a84f30317b5f7d87170ec21dc73df38d569#code) | 2.0.0 | +| Furnace | [0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8](https://etherscan.io/address/0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8) | [0x393002573ea4a3d74a80f3b1af436a3ee3a30c96](https://etherscan.io/address/0x393002573ea4a3d74a80f3b1af436a3ee3a30c96#code) | 2.0.0 | +| StRSR | [0x7Db3C57001c80644208fb8AA81bA1200C7B0731d](https://etherscan.io/address/0x7Db3C57001c80644208fb8AA81bA1200C7B0731d) | [0xfda8c62d86e426d5fb653b6c44a455bb657b693f](https://etherscan.io/address/0xfda8c62d86e426d5fb653b6c44a455bb657b693f#code) | 2.1.0 | + + +## Governance Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| Governor Alexios | [0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1](https://etherscan.io/address/0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1) | [](https://etherscan.io/address/#code) | 1 | +| Timelock | [0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C](https://etherscan.io/address/0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C) | [](https://etherscan.io/address/#code) | N/A | + + \ No newline at end of file diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index 30a80c383b..5671f02154 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -41,9 +41,9 @@ Dimension: `{1}` The `rewardRatio` is the fraction of the current reward amount that should be handed out per block. -Default value: `68764601000000` = a half life of 14 days. +Default value: `6876460100000` = a half life of 14 days. -Mainnet reasonable range: 1e11 to 1e13 +Mainnet reasonable range: 1e12 to 1e14 To calculate: `ln(2) / (60*60*24*desired_days_in_half_life/12)`, and then multiply by 1e18. diff --git a/docs/mev.md b/docs/mev.md index 7d32e64687..f0579c8c3b 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -51,6 +51,8 @@ To participate: 5. Wait until the desired block is reached (hopefully not in the first 40% of the auction) 6. Call `bid()`. If someone else completes the auction first, this will revert with the error message "bid already received". Approvals do not have to be revoked in the event that another MEV searcher wins the auction. (Though ideally the searcher includes the approval in the same tx they `bid()`) +For a sample price curve, see [docs/system-design.md](./system-design.md#sample-price-curve) + #### GnosisTrade `GnosisTrade.sol` implements a batch auction on top of Gnosis's [EasyAuction](https://github.com/gnosis/ido-contracts/blob/main/contracts/EasyAuction.sol) platform. In general a batch auction is designed to minimize MEV, and indeed that's why it was chosen in the first place. Both types of auctions (batch + dutch) can be opened at anytime, but the expectation is that dutch auctions will be preferred by MEV searchers because they are more likely to be profitable. diff --git a/docs/plugin-addresses.md b/docs/plugin-addresses.md index 4771abe3b6..15c2b973f5 100644 --- a/docs/plugin-addresses.md +++ b/docs/plugin-addresses.md @@ -4,45 +4,55 @@ Following are the addresses of non-collateral asset plugins. | Plugin | Feed | Underlying | | ---------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | -| [COMP](https://etherscan.io/address/0x159Af360D99b3dd6c4a47Cd08b730Ff7C9d113CC) | [0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5](https://etherscan.io/address/0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5) | [0xc00e94Cb662C3520282E6f5717214004A7f26888](https://etherscan.io/address/0xc00e94Cb662C3520282E6f5717214004A7f26888) | -| [stkAAVE](https://etherscan.io/address/0x5cAF60bf01A5ecd436b2Cd0b68e4c04547eCb872) | [0x547a514d5e3769680Ce22B2361c10Ea13619e8a9](https://etherscan.io/address/0x547a514d5e3769680Ce22B2361c10Ea13619e8a9) | [0x4da27a545c0c5B758a6BA100e3a049001de870f5](https://etherscan.io/address/0x4da27a545c0c5B758a6BA100e3a049001de870f5) | -| [CRV](https://etherscan.io/address/0x3752098adf2C9E1E17e48D9cE2Ea48961905064A) | [0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f](https://etherscan.io/address/0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f) | [0xD533a949740bb3306d119CC777fa900bA034cd52](https://etherscan.io/address/0xD533a949740bb3306d119CC777fa900bA034cd52) | -| [CVX](https://etherscan.io/address/0xbE301280e593d1665A2D54DA65687E92f46D5c44) | [0xd962fC30A72A84cE50161031391756Bf2876Af5D](https://etherscan.io/address/0xd962fC30A72A84cE50161031391756Bf2876Af5D) | [0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B](https://etherscan.io/address/0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B) | +| [COMP](https://etherscan.io/address/0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1) | [0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5](https://etherscan.io/address/0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5) | [0xc00e94Cb662C3520282E6f5717214004A7f26888](https://etherscan.io/address/0xc00e94Cb662C3520282E6f5717214004A7f26888) | +| [stkAAVE](https://etherscan.io/address/0x6647c880Eb8F57948AF50aB45fca8FE86C154D24) | [0x547a514d5e3769680Ce22B2361c10Ea13619e8a9](https://etherscan.io/address/0x547a514d5e3769680Ce22B2361c10Ea13619e8a9) | [0x4da27a545c0c5B758a6BA100e3a049001de870f5](https://etherscan.io/address/0x4da27a545c0c5B758a6BA100e3a049001de870f5) | +| [CRV](https://etherscan.io/address/0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA) | [0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f](https://etherscan.io/address/0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f) | [0xD533a949740bb3306d119CC777fa900bA034cd52](https://etherscan.io/address/0xD533a949740bb3306d119CC777fa900bA034cd52) | +| [CVX](https://etherscan.io/address/0x4024c00bBD0C420E719527D88781bc1543e63dd5) | [0xd962fC30A72A84cE50161031391756Bf2876Af5D](https://etherscan.io/address/0xd962fC30A72A84cE50161031391756Bf2876Af5D) | [0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B](https://etherscan.io/address/0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B) | ## Collateral Plugin Addresses Following are the addresses and configuration parameters of collateral plugins deployed to mainnet. -| Plugin | Tolerance | Delay (hrs) | Oracle(s) | Underlying | -| ---------------------------------------------------------------------------------------- | --------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | -| [DAI](https://etherscan.io/address/0xB03A029FF70d7c4c53bb3C4288a87aCFea0Ee8FE) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x6B175474E89094C44Da98b954EedeAC495271d0F](https://etherscan.io/address/0x6B175474E89094C44Da98b954EedeAC495271d0F) | -| [USDC](https://etherscan.io/address/0x951d32B449D5D5cE53DA3a5C1E22b37ec0f2E387) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | -| [USDT](https://etherscan.io/address/0x7fc1c34782888a076d3c88c0cce27b75892ee85d) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xdAC17F958D2ee523a2206206994597C13D831ec7](https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7) | -| [USDP](https://etherscan.io/address/0xeD67e489E7aA622380288557FABfA6Be246dE776) | 2% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x8E870D67F660D95d5be530380D0eC0bd388289E1](https://etherscan.io/address/0x8E870D67F660D95d5be530380D0eC0bd388289E1) | -| [TUSD](https://etherscan.io/address/0x9cCc7B600F80ed6F3d997698e01301D9016F8656) | 1.3% | 24 | [0xec746eCF986E2927Abd291a2A1716c940100f8Ba](https://etherscan.io/address/0xec746eCF986E2927Abd291a2A1716c940100f8Ba) | [0x0000000000085d4780B73119b644AE5ecd22b376](https://etherscan.io/address/0x0000000000085d4780B73119b644AE5ecd22b376) | -| [BUSD](https://etherscan.io/address/0x07cDEA861B2A231e249E220A553D9A38ba7383D6) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0x4Fabb145d64652a948d72533023f6E7A623C7C53](https://etherscan.io/address/0x4Fabb145d64652a948d72533023f6E7A623C7C53) | -| [aDAI](https://etherscan.io/address/0x2cAF7BB8C9651377cc7DBd8dc297b58F67D8A816) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xF6147b4B44aE6240F7955803B2fD5E15c77bD7ea](https://etherscan.io/address/0xF6147b4B44aE6240F7955803B2fD5E15c77bD7ea) | -| [aUSDC](https://etherscan.io/address/0xE19ae8D1f3FFf987aaEaa65248BAB3A0d1FDC809) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x60C384e226b120d93f3e0F4C502957b2B9C32B15](https://etherscan.io/address/0x60C384e226b120d93f3e0F4C502957b2B9C32B15) | -| [aUSDT](https://etherscan.io/address/0x44AB1cB3C9f25A928E39A4eDE3CA08B52b4cdE24) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9](https://etherscan.io/address/0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9) | -| [aBUSD](https://etherscan.io/address/0x002835840A6CB5dd3f73e78A21eF41db4C66948e) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0x83DAc0593BD7dE8fa7137D65Fb898B7b7FF6ede6](https://etherscan.io/address/0x83DAc0593BD7dE8fa7137D65Fb898B7b7FF6ede6) | -| [aUSDP](https://etherscan.io/address/0x50f4991BE43a631f5BEDB5C39e45FF3E57Fa783e) | 2% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x0Ab24b246f80da96e4f826684218BdaA7E61F2a5](https://etherscan.io/address/0x0Ab24b246f80da96e4f826684218BdaA7E61F2a5) | -| [cDAI](https://etherscan.io/address/0xe11b8943b6C9abfc9D729306029f7401205bAa9B) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643](https://etherscan.io/address/0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643) | -| [cUSDC](https://etherscan.io/address/0x7FC2df2B27220D9F23Fbd8C21b1f7b0CaEB6fE15) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x39AA39c021dfbaE8faC545936693aC917d5E7563](https://etherscan.io/address/0x39AA39c021dfbaE8faC545936693aC917d5E7563) | -| [cUSDT](https://etherscan.io/address/0x1F1941eE0B3CCb4Ff2135D31103C59F2E53C34B5) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9](https://etherscan.io/address/0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9) | -| [cUSDP](https://etherscan.io/address/0xD9438B058Ce83925E4AC0834744fC0b573A7AFbB) | 2% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x041171993284df560249B57358F931D9eB7b925D](https://etherscan.io/address/0x041171993284df560249B57358F931D9eB7b925D) | -| [cWBTC](https://etherscan.io/address/0xC3481edefE16599701940a71B7a488605803D4cB) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0xccF4429DB6322D5C611ee964527D42E5d685DD6a](https://etherscan.io/address/0xccF4429DB6322D5C611ee964527D42E5d685DD6a) | -| [cETH](https://etherscan.io/address/0xA88304757c00D45b24eea13568bd346C4a49053C) | % | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5](https://etherscan.io/address/0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5) | -| [WBTC](https://etherscan.io/address/0xe9c6bF8536e2Af014a54651F0dd6c74A18D13e70) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599](https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599) | -| [WETH](https://etherscan.io/address/0xBd941FA60b6E2AcCa15afB8962f6B4795c848b8D) | | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2](https://etherscan.io/address/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2) | -| [EURT](https://etherscan.io/address/0x14d5b63e8FfDDDB590C88d9A258461CbEfbB8d56) | 3% | 24 | [0x01D391A48f4F7339aC64CA2c83a07C22F95F587a](https://etherscan.io/address/0x01D391A48f4F7339aC64CA2c83a07C22F95F587a) | [0xC581b735A1688071A1746c968e0798D642EDE491](https://etherscan.io/address/0xC581b735A1688071A1746c968e0798D642EDE491) | -| [wstETH](https://etherscan.io/address/0x3879C820c3cC4547Cb76F8dC842005946Cedb385) | 15% | 24 | [0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8](https://etherscan.io/address/0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8) | [0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0](https://etherscan.io/address/0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0) | -| [rETH](https://etherscan.io/address/0xD2270A3E17DBeA5Cb491E0120441bFD0177Da913) | 15% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xae78736Cd615f374D3085123A210448E74Fc6393](https://etherscan.io/address/0xae78736Cd615f374D3085123A210448E74Fc6393) | -| [fUSDC](https://etherscan.io/address/0x1289a753e0BaE82CF7f87747f22Eaf8E4eb7C216) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x465a5a630482f3abD6d3b84B39B29b07214d19e5](https://etherscan.io/address/0x465a5a630482f3abD6d3b84B39B29b07214d19e5) | -| [fUSDT](https://etherscan.io/address/0x5F471bDE4950CdB00714A6dD033cA7f912a4f9Ee) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7](https://etherscan.io/address/0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7) | -| [fDAI](https://etherscan.io/address/0xA4410B71033fFE8fA41c6096332Be58E3641326d) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xe2bA8693cE7474900A045757fe0efCa900F6530b](https://etherscan.io/address/0xe2bA8693cE7474900A045757fe0efCa900F6530b) | -| [fFRAX](https://etherscan.io/address/0xcd46Ff27c0d6F088FB94896dcE8F17491BD84c75) | 2% | 24 | [0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD](https://etherscan.io/address/0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD) | [0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B](https://etherscan.io/address/0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B) | -| [cUSDCv3](https://etherscan.io/address/0x615D92fAF203Faa9ea7a4D8cdDC49b2Ad0702a1f) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x45fd57EFd43f9Cf96859e38C15380A822C3c2352](https://etherscan.io/address/0x45fd57EFd43f9Cf96859e38C15380A822C3c2352) | -| [cvx3Pool](https://etherscan.io/address/0x14548a0aEcA46418cD9cFd08c6Bf8E02FbE53B5E) | 2% | 24 | [USDC: 0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) [DAI: 0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) [USDT: 0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x3d08EF64830137FBd426CBe3153a404104E4b103](https://etherscan.io/address/0x3d08EF64830137FBd426CBe3153a404104E4b103) | -| [cvxTriCrypto](https://etherscan.io/address/0xb2EeD19C381b71d0f54327D61596312144f66fA7) | 2% | 24 | [USDT: 0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) [ETH: 0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) [BTC: 0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0xF68F5cde346729ADB14a89402605a26c5C8Bf028](https://etherscan.io/address/0xF68F5cde346729ADB14a89402605a26c5C8Bf028) | -| [cvxeUSDFRAXBP](https://etherscan.io/address/0x8DC1750B1fe69e940f570c021d658C14D8041834) | 2% | 72 | [eUSD: 0x6E3B6b31c910253fEf7314b4247823bf18d174d9](https://etherscan.io/address/0x6E3B6b31c910253fEf7314b4247823bf18d174d9)) [USDC: 0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) [fFRAX: 0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD](https://etherscan.io/address/0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD) | [0x83cD6Bd8591Ac6090Bd336C96e61062C103F0AD9](https://etherscan.io/address/0x83cD6Bd8591Ac6090Bd336C96e61062C103F0AD9) | -| [cvxMIM3Pool](https://etherscan.io/address/0xD5BE0AeC2b537481A4fE2EcF52422a24644e1EF3) | 6.25% | 24 | [MIM: 0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) [USDC: 0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) [DAI: 0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) [USDT: 0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x1B05624Bd47d0C69cFf2A4ae7Ef139A8166213ed](https://etherscan.io/address/0x1B05624Bd47d0C69cFf2A4ae7Ef139A8166213ed) | +| Plugin | Tolerance | Delay (hrs) | Oracle(s) | Underlying | +| ---------------------------------------------------------------------------------------- | --------- | ----------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | +| [DAI](https://etherscan.io/address/0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x6B175474E89094C44Da98b954EedeAC495271d0F](https://etherscan.io/address/0x6B175474E89094C44Da98b954EedeAC495271d0F) | +| [USDC](https://etherscan.io/address/0xBE9D23040fe22E8Bd8A88BF5101061557355cA04) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | +| [USDT](https://etherscan.io/address/0x58D7bF13D3572b08dE5d96373b8097d94B1325ad) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xdAC17F958D2ee523a2206206994597C13D831ec7](https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7) | +| [USDP](https://etherscan.io/address/0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x8E870D67F660D95d5be530380D0eC0bd388289E1](https://etherscan.io/address/0x8E870D67F660D95d5be530380D0eC0bd388289E1) | +| [TUSD](https://etherscan.io/address/0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2) | 1.3% | 24 | [0xec746eCF986E2927Abd291a2A1716c940100f8Ba](https://etherscan.io/address/0xec746eCF986E2927Abd291a2A1716c940100f8Ba) | [0x0000000000085d4780B73119b644AE5ecd22b376](https://etherscan.io/address/0x0000000000085d4780B73119b644AE5ecd22b376) | +| [BUSD](https://etherscan.io/address/0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0x4Fabb145d64652a948d72533023f6E7A623C7C53](https://etherscan.io/address/0x4Fabb145d64652a948d72533023f6E7A623C7C53) | +| [aDAI](https://etherscan.io/address/0x256b89658bD831CC40283F42e85B1fa8973Db0c9) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985](https://etherscan.io/address/0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985) | +| [aUSDC](https://etherscan.io/address/0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x60C384e226b120d93f3e0F4C502957b2B9C32B15](https://etherscan.io/address/0x60C384e226b120d93f3e0F4C502957b2B9C32B15) | +| [aUSDT](https://etherscan.io/address/0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9](https://etherscan.io/address/0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9) | +| [aBUSD](https://etherscan.io/address/0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D](https://etherscan.io/address/0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D) | +| [aUSDP](https://etherscan.io/address/0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x80A574cC2B369dc496af6655f57a16a4f180BfAF](https://etherscan.io/address/0x80A574cC2B369dc496af6655f57a16a4f180BfAF) | +| [cDAI](https://etherscan.io/address/0x440A634DdcFb890BCF8b0Bf07Ef2AaBB37dd5F8C) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x3043be171e846c33D5f06864Cc045d9Fc799aF52](https://etherscan.io/address/0x3043be171e846c33D5f06864Cc045d9Fc799aF52) | +| [cUSDC](https://etherscan.io/address/0x50a9d529EA175CdE72525Eaa809f5C3c47dAA1bB) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022](https://etherscan.io/address/0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022) | +| [cUSDT](https://etherscan.io/address/0x5757fF814da66a2B4f9D11d48570d742e246CfD9) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x4Be33630F92661afD646081BC29079A38b879aA0](https://etherscan.io/address/0x4Be33630F92661afD646081BC29079A38b879aA0) | +| [cUSDP](https://etherscan.io/address/0x99bD63BF7e2a69822cD73A82d42cF4b5501e5E50) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0xF69c995129CC16d0F577C303091a400cC1879fFa](https://etherscan.io/address/0xF69c995129CC16d0F577C303091a400cC1879fFa) | +| [cWBTC](https://etherscan.io/address/0x688c95461d611Ecfc423A8c87caCE163C6B40384) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0xF2A309bc36A504c772B416a4950d5d0021219745](https://etherscan.io/address/0xF2A309bc36A504c772B416a4950d5d0021219745) | +| [cETH](https://etherscan.io/address/0x357d4dB0c2179886334cC33B8528048F7E1D3Fe3) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F](https://etherscan.io/address/0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F) | +| [WBTC](https://etherscan.io/address/0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599](https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599) | +| [WETH](https://etherscan.io/address/0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2](https://etherscan.io/address/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2) | +| [EURT](https://etherscan.io/address/0xEBD07CE38e2f46031c982136012472A4D24AE070) | 3.0% | 24 | [0x01D391A48f4F7339aC64CA2c83a07C22F95F587a](https://etherscan.io/address/0x01D391A48f4F7339aC64CA2c83a07C22F95F587a) | [0xC581b735A1688071A1746c968e0798D642EDE491](https://etherscan.io/address/0xC581b735A1688071A1746c968e0798D642EDE491) | +| [wstETH](https://etherscan.io/address/0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C) | 2.5% | 24 | [0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8](https://etherscan.io/address/0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8) | [0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0](https://etherscan.io/address/0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0) | +| [rETH](https://etherscan.io/address/0x1103851D1FCDD3f88096fbed812c8FF01949cF9d) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xae78736Cd615f374D3085123A210448E74Fc6393](https://etherscan.io/address/0xae78736Cd615f374D3085123A210448E74Fc6393) | +| [fUSDC](https://etherscan.io/address/0x1FFA5955D64Ee32cB1BF7104167b81bb085b0c8d) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9](https://etherscan.io/address/0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9) | +| [fUSDT](https://etherscan.io/address/0xF73EB45d83AC86f8a6F75a6252ca1a59a9A3aED3) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7](https://etherscan.io/address/0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7) | +| [fDAI](https://etherscan.io/address/0xE1fcCf8e23713Ed0497ED1a0E6Ae2b19ED443eCd) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x714341800AD1913B5FCCBFd5d136553Ad1C314d6](https://etherscan.io/address/0x714341800AD1913B5FCCBFd5d136553Ad1C314d6) | +| [fFRAX](https://etherscan.io/address/0x8b06c065b4b44B310442d4ee98777BF7a1EBC6E3) | 2.0% | 24 | [0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD](https://etherscan.io/address/0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD) | [0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13](https://etherscan.io/address/0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13) | +| [cUSDCv3](https://etherscan.io/address/0x85b256e9051B781A0BC0A987857AD6166C94040a) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab](https://etherscan.io/address/0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab) | +| [cvx3Pool](https://etherscan.io/address/0x62C394620f674e85768a7618a6C202baE7fB8Dd1) | 2.0% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xaBd7E7a5C846eD497681a590feBED99e7157B6a3](https://etherscan.io/address/0xaBd7E7a5C846eD497681a590feBED99e7157B6a3) | +| [cvxeUSDFRAXBP](https://etherscan.io/address/0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122) | 2.0% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5](https://etherscan.io/address/0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5) | +| [cvxMIM3Pool](https://etherscan.io/address/0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7) | 6.25% | 24 | [0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) | [0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F](https://etherscan.io/address/0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F) | +| [crv3Pool](https://etherscan.io/address/0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D) | 2.0% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xC9c37FC53682207844B058026024853A9C0b8c7B](https://etherscan.io/address/0xC9c37FC53682207844B058026024853A9C0b8c7B) | +| [crveUSDFRAXBP](https://etherscan.io/address/0xC87CDFFD680D57BF50De4C364BF4277B8A90098E) | 2.0% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A](https://etherscan.io/address/0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A) | +| [crvMIM3Pool](https://etherscan.io/address/0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa) | 6.25% | 24 | [0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) | [0xe8461dB45A7430AA7aB40346E68821284980FdFD](https://etherscan.io/address/0xe8461dB45A7430AA7aB40346E68821284980FdFD) | +| [sDAI](https://etherscan.io/address/0xde0e2f0c9792617d3908d92a024caa846354cea2) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x83F20F44975D03b1b09e64809B757c47f942BEeA](https://etherscan.io/address/0x83F20F44975D03b1b09e64809B757c47f942BEeA) | +| [cbETH](https://etherscan.io/address/0x3962695aCce0Efce11cFf997890f3D1D7467ec40) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xBe9895146f7AF43049ca1c1AE358B0541Ea49704](https://etherscan.io/address/0xBe9895146f7AF43049ca1c1AE358B0541Ea49704) | +| [maUSDT](https://etherscan.io/address/0xd000a79bd2a07eb6d2e02ecad73437de40e52d69) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2](https://etherscan.io/address/0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2) | +| [maUSDC](https://etherscan.io/address/0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x7f7B77e49d5b30445f222764a794AFE14af062eB](https://etherscan.io/address/0x7f7B77e49d5b30445f222764a794AFE14af062eB) | +| [maDAI](https://etherscan.io/address/0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb](https://etherscan.io/address/0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb) | +| [maWBTC](https://etherscan.io/address/0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250) | 3.51% | 24 | [0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c](https://etherscan.io/address/0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c) | [0xe0E1d3c6f09DA01399e84699722B11308607BBfC](https://etherscan.io/address/0xe0E1d3c6f09DA01399e84699722B11308607BBfC) | +| [maWETH](https://etherscan.io/address/0x878b995bDD2D9900BEE896Bd78ADd877672e1637) | 0.0% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0x291ed25eB61fcc074156eE79c5Da87e5DA94198F](https://etherscan.io/address/0x291ed25eB61fcc074156eE79c5Da87e5DA94198F) | +| [maStETH](https://etherscan.io/address/0x33E840e5711549358f6d4D11F9Ab2896B36E9822) | 2.0025% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0x97F9d5ed17A0C99B279887caD5254d15fb1B619B](https://etherscan.io/address/0x97F9d5ed17A0C99B279887caD5254d15fb1B619B) | diff --git a/docs/solidity-style.md b/docs/solidity-style.md index ad3d1a5f2e..90b386b82e 100644 --- a/docs/solidity-style.md +++ b/docs/solidity-style.md @@ -303,7 +303,7 @@ The **recommended** process to perform an upgrade is the following: - Ensure metadata of the existing/deployed implementations is created for the required network. This is located in a folder names `.openzeppelin`, which should be persisted in `git` for Production networks. This can be done for prior versions using the `upgrades/force-import.ts` task in our repository. This task is limited to be run only on Mainnet. -- Create the new implementation version of the contract. This should follow all the recommendations from the article linked above, to make sure the implementation is "Upgrade Safe". At anytime you can check for compatibility by running the `upgrades/validate-upgrade.ts` task in our repo, in a Mainnet fork. This task would compare the current code vs. a previously deployed implementation and validate if it is "upgrade safe". Make sure the MAINNET_BLOCK is set up appropiately. +- Create the new implementation version of the contract. This should follow all the recommendations from the article linked above, to make sure the implementation is "Upgrade Safe". At anytime you can check for compatibility by running the `upgrades/validate-upgrade.ts` task in our repo, in a Mainnet fork. This task would compare the current code vs. a previously deployed implementation and validate if it is "upgrade safe". Make sure the FORK_BLOCK is set up appropiately. - To deploy to Mainnet the new version, make sure you use the script provided in `scripts/deployment/phase1-common/2_deploy_implementations.ts`. If you are upgrading a previous version you need to specify the `LAST_VERSION_DEPLOYED` value at the top of the script. For new, clean deployments just leave that empty. This script will perform all validations on the new code, deploy the new implementation contracts, and register the deployment in the network file. It relies on the `deployImplementation` (for new deployments) or `prepareUpgrade` functions of the OZ Plugin. diff --git a/docs/system-design.md b/docs/system-design.md index 76c746a2db..a2116c359b 100644 --- a/docs/system-design.md +++ b/docs/system-design.md @@ -164,8 +164,176 @@ The Dutch auction occurs in two phases: Geometric/Exponential Phase (first 40% of auction): The price starts at about 1000x the best plausible price and decays down to the best plausible price following a geometric/exponential series. The price decreases by the same percentage each time. This phase is primarily defensive, and it's not expected to receive a bid; it merely protects against manipulated prices. -Linear Phase (last 60% of auction): During this phase, the price decreases linearly from the best plausible price to the worst plausible price. The worst price is further discounted based on maxTradeSlippage, which considers how far from minTradeVolume to maxTradeVolume the trade lies. No further discount is applied at maxTradeVolume. +Linear Phase (last 60% of auction): During this phase, the price decreases linearly from the best plausible price to the worst plausible price. The `dutchAuctionLength` can be configured to be any value. The suggested default is 30 minutes for a blockchain with a 12-second blocktime. At this ratio of blocktime to auction length, there is a 10.87% price drop per block during the geometric/exponential period and a 0.05% drop during the linear period. The duration of the auction can be adjusted, which will impact the size of the price decreases per block. -The "best plausible price" is equal to the exchange rate at the high price of the sell token and the low price of the buy token. The "worst-case price" is equal to the exchange rate at the low price of the sell token and the high price of the sell token, plus an additional discount ranging from 0 to `maxTradeSlippage()`. At minimum auction size the full `maxTradeSlippage()` is applied, while at max auction size no further discount is applied. +The "best plausible price" is equal to the exchange rate at the high price of the sell token and the low price of the buy token. The "worst-case price" is equal to the exchange rate at the low price of the sell token and the high price of the sell token, plus an additional discount equal to `maxTradeSlippage`. + +#### Trade violation fallback + +Dutch auctions become disabled for an asset being traded if a trade clears in the geometric phase. The rationale is that a trade that clears in this range (multiples above the plausible price) only does so because either 1) the auctioned asset's price was manipulated downwards, or 2) the bidding asset was manipulated upwards, such that the protocol accepts an unfavorable trade. All subsequent trades for that particular trading pair will be forced to use the batch auctions as a result. Dutch auctions for disabled assets must be manually re-enabled by governance. + +Take for example the scenario of an RToken basket change requiring a trade of 5M USDC for 5M USDT, where the `maxTradeSize` is $1M (therefore requiring at least 5 auctions). If the system's price inputs for USDC was manipulated to read a price of $0.001/USDC, settling the auction in the geometric phase at any multiple less than 1000x will yield a profit for the trader, at a cost to the RToken system. Accordingly, Dutch auctions become disabled for the subsequent trades to swap USDC to USDT. + +Dutch auctions for other assets that have not cleared in the geometric zone will remain enabled. + +#### Sample price curve + +This price curve is for two assets with 1% oracleError, and with a 1% maxTradeSlippage, during a 30-minute auction. The token has 6 decimals and the "even price" occurs at 100,000,000. The phase changes between different portions of the auction are shown with `============` dividers. + +``` +BigNumber { value: "102020210210" } +BigNumber { value: "82140223099" } +BigNumber { value: "66134114376" } +BigNumber { value: "53247007608" } +BigNumber { value: "42871124018" } +BigNumber { value: "34517153077" } +BigNumber { value: "27791029333" } +BigNumber { value: "22375579749" } +BigNumber { value: "18015402132" } +BigNumber { value: "14504862785" } +BigNumber { value: "11678398454" } +BigNumber { value: "9402708076" } +BigNumber { value: "7570466062" } +BigNumber { value: "6095260636" } +BigNumber { value: "4907518495" } +BigNumber { value: "3951227569" } +BigNumber { value: "3181278625" } +BigNumber { value: "2561364414" } +BigNumber { value: "2062248686" } +BigNumber { value: "1660392258" } +BigNumber { value: "1336842869" } +BigNumber { value: "1076341357" } +BigNumber { value: "866602010" } +BigNumber { value: "697733148" } +BigNumber { value: "561770617" } +BigNumber { value: "452302636" } +BigNumber { value: "364165486" } +BigNumber { value: "293203025" } +BigNumber { value: "236068538" } +BigNumber { value: "190067462" } +BigNumber { value: "153030304" } +============ +BigNumber { value: "151670034" } +BigNumber { value: "150309765" } +BigNumber { value: "148949495" } +BigNumber { value: "147589226" } +BigNumber { value: "146228957" } +BigNumber { value: "144868687" } +BigNumber { value: "143508418" } +BigNumber { value: "142148149" } +BigNumber { value: "140787879" } +BigNumber { value: "139427610" } +BigNumber { value: "138067341" } +BigNumber { value: "136707071" } +BigNumber { value: "135346802" } +BigNumber { value: "133986532" } +BigNumber { value: "132626263" } +BigNumber { value: "131265994" } +BigNumber { value: "129905724" } +BigNumber { value: "128545455" } +BigNumber { value: "127185186" } +BigNumber { value: "125824916" } +BigNumber { value: "124464647" } +BigNumber { value: "123104378" } +BigNumber { value: "121744108" } +BigNumber { value: "120383839" } +BigNumber { value: "119023570" } +BigNumber { value: "117663300" } +BigNumber { value: "116303031" } +BigNumber { value: "114942761" } +BigNumber { value: "113582492" } +BigNumber { value: "112222223" } +BigNumber { value: "110861953" } +BigNumber { value: "109501684" } +BigNumber { value: "108141415" } +BigNumber { value: "106781145" } +BigNumber { value: "105420876" } +BigNumber { value: "104060607" } +BigNumber { value: "102700337" } +============ +BigNumber { value: "101986999" } +BigNumber { value: "101920591" } +BigNumber { value: "101854183" } +BigNumber { value: "101787775" } +BigNumber { value: "101721367" } +BigNumber { value: "101654959" } +BigNumber { value: "101588551" } +BigNumber { value: "101522143" } +BigNumber { value: "101455735" } +BigNumber { value: "101389327" } +BigNumber { value: "101322919" } +BigNumber { value: "101256511" } +BigNumber { value: "101190103" } +BigNumber { value: "101123695" } +BigNumber { value: "101057287" } +BigNumber { value: "100990879" } +BigNumber { value: "100924471" } +BigNumber { value: "100858063" } +BigNumber { value: "100791655" } +BigNumber { value: "100725247" } +BigNumber { value: "100658839" } +BigNumber { value: "100592431" } +BigNumber { value: "100526023" } +BigNumber { value: "100459615" } +BigNumber { value: "100393207" } +BigNumber { value: "100326799" } +BigNumber { value: "100260391" } +BigNumber { value: "100193983" } +BigNumber { value: "100127575" } +BigNumber { value: "100061167" } +BigNumber { value: "99994759" } +BigNumber { value: "99928351" } +BigNumber { value: "99861943" } +BigNumber { value: "99795535" } +BigNumber { value: "99729127" } +BigNumber { value: "99662719" } +BigNumber { value: "99596311" } +BigNumber { value: "99529903" } +BigNumber { value: "99463496" } +BigNumber { value: "99397088" } +BigNumber { value: "99330680" } +BigNumber { value: "99264272" } +BigNumber { value: "99197864" } +BigNumber { value: "99131456" } +BigNumber { value: "99065048" } +BigNumber { value: "98998640" } +BigNumber { value: "98932232" } +BigNumber { value: "98865824" } +BigNumber { value: "98799416" } +BigNumber { value: "98733008" } +BigNumber { value: "98666600" } +BigNumber { value: "98600192" } +BigNumber { value: "98533784" } +BigNumber { value: "98467376" } +BigNumber { value: "98400968" } +BigNumber { value: "98334560" } +BigNumber { value: "98268152" } +BigNumber { value: "98201744" } +BigNumber { value: "98135336" } +BigNumber { value: "98068928" } +BigNumber { value: "98002520" } +BigNumber { value: "97936112" } +BigNumber { value: "97869704" } +BigNumber { value: "97803296" } +BigNumber { value: "97736888" } +BigNumber { value: "97670480" } +BigNumber { value: "97604072" } +BigNumber { value: "97537664" } +BigNumber { value: "97471256" } +BigNumber { value: "97404848" } +BigNumber { value: "97338440" } +BigNumber { value: "97272032" } +BigNumber { value: "97205624" } +BigNumber { value: "97139216" } +BigNumber { value: "97072808" } +============ +BigNumber { value: "97039604" } +BigNumber { value: "97039604" } +BigNumber { value: "97039604" } +BigNumber { value: "97039604" } +BigNumber { value: "97039604" } +BigNumber { value: "97039604" } +BigNumber { value: "97039604" } +``` diff --git a/hardhat.config.ts b/hardhat.config.ts index e9364399e1..7b540748d4 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -11,6 +11,7 @@ import 'solidity-coverage' import * as tenderly from '@tenderly/hardhat-tenderly' import { useEnv } from '#/utils/env' +import { forkRpcs, Network } from '#/utils/fork' import { HardhatUserConfig } from 'hardhat/types' import forkBlockNumber from '#/test/integration/fork-block-numbers' @@ -23,6 +24,7 @@ const MAINNET_RPC_URL = useEnv(['MAINNET_RPC_URL', 'ALCHEMY_MAINNET_RPC_URL']) const TENDERLY_RPC_URL = useEnv('TENDERLY_RPC_URL') const GOERLI_RPC_URL = useEnv('GOERLI_RPC_URL') const BASE_GOERLI_RPC_URL = useEnv('BASE_GOERLI_RPC_URL') +const BASE_RPC_URL = useEnv('BASE_RPC_URL') const MNEMONIC = useEnv('MNEMONIC') ?? 'test test test test test test test test test test test junk' const TIMEOUT = useEnv('SLOW') ? 6_000_000 : 600_000 @@ -36,8 +38,8 @@ const config: HardhatUserConfig = { // network for tests/in-process stuff forking: useEnv('FORK') ? { - url: MAINNET_RPC_URL, - blockNumber: Number(useEnv('MAINNET_BLOCK', forkBlockNumber['default'].toString())), + url: forkRpcs[(useEnv('FORK_NETWORK') ?? 'mainnet') as Network], + blockNumber: Number(useEnv(`FORK_BLOCK`, forkBlockNumber['default'].toString())), } : undefined, gas: 0x1ffffffff, @@ -69,6 +71,13 @@ const config: HardhatUserConfig = { mnemonic: MNEMONIC, }, }, + base: { + chainId: 8453, + url: BASE_RPC_URL, + accounts: { + mnemonic: MNEMONIC, + }, + }, mainnet: { chainId: 1, url: MAINNET_RPC_URL, @@ -76,7 +85,7 @@ const config: HardhatUserConfig = { mnemonic: MNEMONIC, }, // gasPrice: 30_000_000_000, - gasMultiplier: 1.05, // 5% buffer; seen failures on RToken deployment and asset refreshes otherwise + gasMultiplier: 2, // 100% buffer; seen failures on RToken deployment and asset refreshes otherwise }, tenderly: { chainId: 3, @@ -85,7 +94,7 @@ const config: HardhatUserConfig = { mnemonic: MNEMONIC, }, // gasPrice: 10_000_000_000, - gasMultiplier: 1.05, // 5% buffer; seen failures on RToken deployment and asset refreshes otherwise + gasMultiplier: 2, // 100% buffer; seen failures on RToken deployment and asset refreshes otherwise }, }, solidity: { @@ -133,6 +142,14 @@ const config: HardhatUserConfig = { etherscan: { apiKey: useEnv('ETHERSCAN_API_KEY'), customChains: [ + { + network: 'base', + chainId: 8453, + urls: { + apiURL: 'https://api.basescan.org/api', + browserURL: 'https://basescan.org', + }, + }, { network: 'base-goerli', chainId: 84531, diff --git a/package.json b/package.json index 1d6413e41f..c4c37617a1 100644 --- a/package.json +++ b/package.json @@ -111,6 +111,8 @@ }, "packageManager": "yarn@3.3.1", "dependencies": { + "@aave/core-v3": "^1.18.0", + "@aave/periphery-v3": "^2.5.0", "@nomicfoundation/hardhat-toolbox": "^2.0.1", "@types/isomorphic-fetch": "^0.0.36", "isomorphic-fetch": "^3.0.0" diff --git a/scripts/addresses/84531-tmp-assets-collateral.json b/scripts/addresses/84531-tmp-assets-collateral.json index 6e8bbc2523..c7e0351b15 100644 --- a/scripts/addresses/84531-tmp-assets-collateral.json +++ b/scripts/addresses/84531-tmp-assets-collateral.json @@ -1,9 +1,9 @@ { "assets": {}, "collateral": { - "DAI": "0x89B2eF0dd1422F482617eE8B01E57ef5f778E612", - "USDC": "0x0908A3193D14064f5831cbAFc47703f001313Ff6", - "USDT": "0xB5e44CbbC77D23e4C973a27Db5AE59AcE4c46a87" + "DAI": "0xdD740A7C787B0f3500977c9e14BB9a91057e38e7", + "USDC": "0x10D7A1ED1c431Ced12888fe90acEFD898eFaf2ba", + "USDT": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b" }, "erc20s": { "DAI": "0xDA2eA2f60545555e268124E51EA27bc97DE78E9c", diff --git a/scripts/addresses/84531-tmp-deployments.json b/scripts/addresses/84531-tmp-deployments.json index 71e44eaf32..72ffc5d6f9 100644 --- a/scripts/addresses/84531-tmp-deployments.json +++ b/scripts/addresses/84531-tmp-deployments.json @@ -4,32 +4,32 @@ "RSR_FEED": "0xbEfB78358eAaaCAa083C2dff5D2Ed6e7e32b2d3A", "GNOSIS_EASY_AUCTION": "0xcdf32E323e69090eCA17adDeF058A6A921c3e75A" }, - "tradingLib": "0x8d68d450a33ea275edE80Efc82D8cd208DAe4402", - "cvxMiningLib": "0xF64A5C1329Ad224B0E50C4640f4bBd677a5cb391", - "facadeRead": "0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF", - "facadeAct": "0x3d6D679c863858E89e35c925F937F5814ca687F3", - "facadeWriteLib": "0x29e9740275D26fdeDBb0ABA8129C74c15c393027", - "basketLib": "0x25Aa9878a97948f9908DB4325dc20e5635023Ee2", - "facadeWrite": "0x0903048fD4E948c60451B41A48B35E0bafc0967F", - "deployer": "0xf1B06c2305445E34CF0147466352249724c2EAC1", - "rsrAsset": "0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B", + "tradingLib": "0x662608C6dDb54C426899126bEEF96011fB700a3A", + "cvxMiningLib": "0xf584f06759d0E32f74C5B18C9Dcbd03503936518", + "facadeRead": "0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB", + "facadeAct": "0x5fE248625aC2AB0e17A115fef288f17AF1952402", + "facadeWriteLib": "0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3", + "basketLib": "0xE90457dd23C27CD4955bFc056744e1C9D790f771", + "facadeWrite": "0xc87800FC32dd93b0584bb696326ED6a11Ef5221b", + "deployer": "0xE77c43F499524FF354D2aFFbE815729613d8F856", + "rsrAsset": "0x5EBE8927e5495e0A7731888C81AF463cD63602fb", "implementations": { - "main": "0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B", + "main": "0x7B04De7DCa80e7C1ed5E0F41B2fD3C1C3588436C", "trading": { - "gnosisTrade": "0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7", - "dutchTrade": "0x9c387fc258061bd3E02c851F36aE227DB03a396C" + "gnosisTrade": "0xbC0033679AEf41Fb9FeB553Fdf55a8Bb2fC5B29e", + "dutchTrade": "0x451C1702d95877A51a816489315B8Cb1C6c0367a" }, "components": { - "assetRegistry": "0xD4e1D5b1311C992b2735710D46A10284Bcd7D39F", - "backingManager": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE", - "basketHandler": "0x25E92785C1AC01B397224E0534f3D626868A1Cbf", - "broker": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba", - "distributor": "0xd31de64957b79435bfc702044590ac417e02c19B", - "furnace": "0x45D7dFE976cdF80962d863A66918346a457b87Bd", - "rsrTrader": "0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09", - "rTokenTrader": "0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09", - "rToken": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", - "stRSR": "0x53321f03A7cce52413515DFD0527e0163ec69A46" + "assetRegistry": "0xB333C42A9075d725c927EBDa95C325E49A07DA46", + "backingManager": "0x7d45524B9C3D7d77940FDda4a59be05f2EFc6c7a", + "basketHandler": "0x7FC3aDB139f8C473E705E82c91d23C18f4De968E", + "broker": "0xDdcba8fafDb0854Ac1368C686C0c90Eaa2992A98", + "distributor": "0x4D1658ee58ddf467c23bF31D55E02AB5186e8031", + "furnace": "0x308447562442Cc43978f8274fA722C9C14BafF8b", + "rsrTrader": "0x6272D1d531bD844d52b5244505fd0EE59841E167", + "rTokenTrader": "0x6272D1d531bD844d52b5244505fd0EE59841E167", + "rToken": "0x876057B2aeFC3e5CFEB712EcE7A07E4Cc5F1fe3A", + "stRSR": "0x973A81A6D21dC02Ab2FaF1e9FF71771E8426c568" } } } diff --git a/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json new file mode 100644 index 0000000000..ec42edd113 --- /dev/null +++ b/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json @@ -0,0 +1,22 @@ +{ + "assets": { + "COMP": "0x277FD5f51fE53a9B3707a0383bF930B149C74ABf" + }, + "collateral": { + "DAI": "0x5EBE8927e5495e0A7731888C81AF463cD63602fb", + "WETH": "0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3", + "USDbC": "0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB", + "cbETH": "0x5fE248625aC2AB0e17A115fef288f17AF1952402", + "cUSDbCv3": "0xa372EC846131FBf9AE8b589efa3D041D9a94dF41", + "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b" + }, + "erc20s": { + "COMP": "0x9e1028F5F1D5eDE59748FFceE5532509976840E0", + "DAI": "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb", + "WETH": "0x4200000000000000000000000000000000000006", + "USDbC": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", + "cbETH": "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22", + "cUSDbCv3": "0xbC0033679AEf41Fb9FeB553Fdf55a8Bb2fC5B29e", + "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b" + } +} diff --git a/scripts/addresses/base-3.0.0/8453-tmp-deployments.json b/scripts/addresses/base-3.0.0/8453-tmp-deployments.json new file mode 100644 index 0000000000..1cc9767524 --- /dev/null +++ b/scripts/addresses/base-3.0.0/8453-tmp-deployments.json @@ -0,0 +1,35 @@ +{ + "prerequisites": { + "RSR": "0xaB36452DbAC151bE02b16Ca17d8919826072f64a", + "RSR_FEED": "0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1", + "GNOSIS_EASY_AUCTION": "0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02" + }, + "tradingLib": "0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B", + "cvxMiningLib": "", + "facadeRead": "0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF", + "facadeAct": "0x3d6D679c863858E89e35c925F937F5814ca687F3", + "facadeWriteLib": "0x29e9740275D26fdeDBb0ABA8129C74c15c393027", + "basketLib": "0x199E12d58B36deE2D2B3dD2b91aD7bb25c787a71", + "facadeWrite": "0x0903048fD4E948c60451B41A48B35E0bafc0967F", + "deployer": "0xf1B06c2305445E34CF0147466352249724c2EAC1", + "rsrAsset": "0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B", + "implementations": { + "main": "0x1D6d0B74E7A701aE5C2E11967b242E9861275143", + "trading": { + "gnosisTrade": "0xD4e1D5b1311C992b2735710D46A10284Bcd7D39F", + "dutchTrade": "0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7" + }, + "components": { + "assetRegistry": "0x9c387fc258061bd3E02c851F36aE227DB03a396C", + "backingManager": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE", + "basketHandler": "0x25E92785C1AC01B397224E0534f3D626868A1Cbf", + "broker": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba", + "distributor": "0xd31de64957b79435bfc702044590ac417e02c19B", + "furnace": "0x45D7dFE976cdF80962d863A66918346a457b87Bd", + "rsrTrader": "0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09", + "rTokenTrader": "0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09", + "rToken": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", + "stRSR": "0x53321f03A7cce52413515DFD0527e0163ec69A46" + } + } +} diff --git a/scripts/addresses/mainnet-3.0.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.0.0/1-tmp-assets-collateral.json new file mode 100644 index 0000000000..7cb86310ed --- /dev/null +++ b/scripts/addresses/mainnet-3.0.0/1-tmp-assets-collateral.json @@ -0,0 +1,100 @@ +{ + "assets": { + "stkAAVE": "0x6647c880Eb8F57948AF50aB45fca8FE86C154D24", + "COMP": "0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1", + "CRV": "0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA", + "CVX": "0x4024c00bBD0C420E719527D88781bc1543e63dd5" + }, + "collateral": { + "DAI": "0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833", + "USDC": "0xBE9D23040fe22E8Bd8A88BF5101061557355cA04", + "USDT": "0x58D7bF13D3572b08dE5d96373b8097d94B1325ad", + "USDP": "0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89", + "TUSD": "0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2", + "BUSD": "0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423", + "aDAI": "0x256b89658bD831CC40283F42e85B1fa8973Db0c9", + "aUSDC": "0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51", + "aUSDT": "0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef", + "aBUSD": "0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05", + "aUSDP": "0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd", + "cDAI": "0x440A634DdcFb890BCF8b0Bf07Ef2AaBB37dd5F8C", + "cUSDC": "0x50a9d529EA175CdE72525Eaa809f5C3c47dAA1bB", + "cUSDT": "0x5757fF814da66a2B4f9D11d48570d742e246CfD9", + "cUSDP": "0x99bD63BF7e2a69822cD73A82d42cF4b5501e5E50", + "cWBTC": "0x688c95461d611Ecfc423A8c87caCE163C6B40384", + "cETH": "0x357d4dB0c2179886334cC33B8528048F7E1D3Fe3", + "WBTC": "0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4", + "WETH": "0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3", + "EURT": "0xEBD07CE38e2f46031c982136012472A4D24AE070", + "wstETH": "0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C", + "rETH": "0x1103851D1FCDD3f88096fbed812c8FF01949cF9d", + "fUSDC": "0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA", + "fUSDT": "0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A", + "fDAI": "0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875", + "fFRAX": "0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92", + "cUSDCv3": "0x85b256e9051B781A0BC0A987857AD6166C94040a", + "cvx3Pool": "0x62C394620f674e85768a7618a6C202baE7fB8Dd1", + "cvxeUSDFRAXBP": "0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122", + "cvxMIM3Pool": "0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7", + "crv3Pool": "0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D", + "crveUSDFRAXBP": "0xC87CDFFD680D57BF50De4C364BF4277B8A90098E", + "crvMIM3Pool": "0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa", + "sDAI": "0xde0e2f0c9792617d3908d92a024caa846354cea2", + "cbETH": "0x3962695aCce0Efce11cFf997890f3D1D7467ec40", + "maUSDT": "0xd000a79bd2a07eb6d2e02ecad73437de40e52d69", + "maUSDC": "0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7", + "maDAI": "0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB", + "maWBTC": "0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250", + "maWETH": "0x878b995bDD2D9900BEE896Bd78ADd877672e1637", + "maStETH": "0x33E840e5711549358f6d4D11F9Ab2896B36E9822", + "aEthUSDC": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba" + }, + "erc20s": { + "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B", + "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7", + "USDP": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", + "TUSD": "0x0000000000085d4780B73119b644AE5ecd22b376", + "BUSD": "0x4Fabb145d64652a948d72533023f6E7A623C7C53", + "aDAI": "0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985", + "aUSDC": "0x60C384e226b120d93f3e0F4C502957b2B9C32B15", + "aUSDT": "0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9", + "aBUSD": "0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D", + "aUSDP": "0x80A574cC2B369dc496af6655f57a16a4f180BfAF", + "cDAI": "0x3043be171e846c33D5f06864Cc045d9Fc799aF52", + "cUSDC": "0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022", + "cUSDT": "0x4Be33630F92661afD646081BC29079A38b879aA0", + "cUSDP": "0xF69c995129CC16d0F577C303091a400cC1879fFa", + "cWBTC": "0xF2A309bc36A504c772B416a4950d5d0021219745", + "cETH": "0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F", + "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", + "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "EURT": "0xC581b735A1688071A1746c968e0798D642EDE491", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "fUSDC": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", + "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7", + "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b", + "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B", + "cUSDCv3": "0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab", + "cvx3Pool": "0xaBd7E7a5C846eD497681a590feBED99e7157B6a3", + "cvxeUSDFRAXBP": "0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5", + "cvxMIM3Pool": "0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F", + "crv3Pool": "0xC9c37FC53682207844B058026024853A9C0b8c7B", + "crveUSDFRAXBP": "0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A", + "crvMIM3Pool": "0xe8461dB45A7430AA7aB40346E68821284980FdFD", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704", + "maUSDT": "0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2", + "maUSDC": "0x7f7b77e49d5b30445f222764a794afe14af062eb", + "maDAI": "0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb", + "maWBTC": "0xe0E1d3c6f09DA01399e84699722B11308607BBfC", + "maWETH": "0x291ed25eB61fcc074156eE79c5Da87e5DA94198F", + "maStETH": "0x97F9d5ed17A0C99B279887caD5254d15fb1B619B", + "aEthUSDC": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE" + } +} \ No newline at end of file diff --git a/scripts/addresses/mainnet-3.0.0/1-tmp-deployments.json b/scripts/addresses/mainnet-3.0.0/1-tmp-deployments.json index 48f2121bd0..aa505c83ff 100644 --- a/scripts/addresses/mainnet-3.0.0/1-tmp-deployments.json +++ b/scripts/addresses/mainnet-3.0.0/1-tmp-deployments.json @@ -4,32 +4,32 @@ "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" }, - "tradingLib": "", - "cvxMiningLib": "", - "facadeRead": "0xcb71dDa3BdB1208B8bf18554Aab8CCF9bDe3e53D", - "facadeAct": "0x98f292e6Bb4722664fEffb81448cCFB5B7211469", - "facadeWriteLib": "", - "basketLib": "", - "facadeWrite": "", - "deployer": "", - "rsrAsset": "0x9cd0F8387672fEaaf7C269b62c34C53590d7e948", + "tradingLib": "0xB81a1fa9A497953CEC7f370CACFA5cc364871A73", + "cvxMiningLib": "0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472", + "facadeRead": "0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C", + "facadeAct": "0x801fF27bacc7C00fBef17FC901504c79D59E845C", + "facadeWriteLib": "0x0776Ad71Ae99D759354B3f06fe17454b94837B0D", + "basketLib": "0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8", + "facadeWrite": "0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c", + "deployer": "0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e", + "rsrAsset": "0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6", "implementations": { - "main": "", + "main": "0xF5366f67FF66A3CefcB18809a762D5b5931FebF8", "trading": { - "gnosisTrade": "", - "dutchTrade": "" + "gnosisTrade": "0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630", + "dutchTrade": "0x2387C22727ACb91519b80A15AEf393ad40dFdb2F" }, "components": { - "assetRegistry": "", - "backingManager": "", - "basketHandler": "", - "broker": "", - "distributor": "", - "furnace": "", - "rsrTrader": "", - "rTokenTrader": "", - "rToken": "", - "stRSR": "" + "assetRegistry": "0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450", + "backingManager": "0x0A388FC05AA017b31fb084e43e7aEaFdBc043080", + "basketHandler": "0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc", + "broker": "0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04", + "distributor": "0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac", + "furnace": "0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c", + "rsrTrader": "0x1cCa3FBB11C4b734183f997679d52DeFA74b613A", + "rTokenTrader": "0x1cCa3FBB11C4b734183f997679d52DeFA74b613A", + "rToken": "0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F", + "stRSR": "0xC98eaFc9F249D90e3E35E729e3679DD75A899c10" } } } diff --git a/scripts/collateral-params.ts b/scripts/collateral-params.ts index 45ebbe86da..847e84ec9d 100644 --- a/scripts/collateral-params.ts +++ b/scripts/collateral-params.ts @@ -10,12 +10,12 @@ import { // This prints an MD table of all the collateral plugin parameters // Usage: npx hardhat run --network mainnet scripts/collateral-params.ts async function main() { - const header = ['Plugin', 'Tolerance', 'Delay (hrs)', 'Oracle(s)', 'Underlying'] + const header = ['Plugin', 'Peg Tolerance', 'Delay (hrs)', 'Oracle(s)', 'Underlying'] const body: string[][] = [] const chainId = await getChainId(hre) // Get deployed collateral - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId, 'mainnet-2.1.0') + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId, 'mainnet-3.0.0') const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) const { collateral: collaterals } = assetCollDeployments @@ -34,7 +34,7 @@ async function main() { const underlyingMd = getEtherscanMd(underlyingAddr) const clFeedMd = getEtherscanMd(chainlinkFeed) - const NEEDS_ATTENTION = ['[cvxMIM3'] // first 8 chars only + const NEEDS_ATTENTION = ['[cvxMIM3', '[crvMIM3'] // first 8 chars only body.push([ collateralMd, diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 39739b1c5c..12e104aeed 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -1,7 +1,7 @@ /* eslint-disable no-process-exit */ import hre from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { networkConfig } from '../common/configuration' +import { baseL2Chains, networkConfig } from '../common/configuration' import { sh } from './deployment/utils' async function main() { @@ -25,7 +25,8 @@ async function main() { // Part 1/3 of the *overall* deployment process: Deploy all contracts // See `confirm.ts` for part 2 - const scripts = [ + // Phase 1- Implementations + let scripts = [ 'phase1-common/0_setup_deployments.ts', 'phase1-common/1_deploy_libraries.ts', 'phase1-common/2_deploy_implementations.ts', @@ -34,35 +35,55 @@ async function main() { 'phase1-common/5_deploy_deployer.ts', 'phase1-common/6_deploy_facadeWrite.ts', 'phase1-common/7_deploy_facadeAct.ts', - // ============================================= - 'phase2-assets/0_setup_deployments.ts', - 'phase2-assets/1_deploy_assets.ts', - 'phase2-assets/assets/deploy_crv.ts', - 'phase2-assets/assets/deploy_cvx.ts', - 'phase2-assets/2_deploy_collateral.ts', - 'phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts', - 'phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts', - 'phase2-assets/collaterals/deploy_flux_finance_collateral.ts', - 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', - 'phase2-assets/collaterals/deploy_convex_stable_plugin.ts', - // 'phase2-assets/collaterals/deploy_convex_volatile_plugin.ts', // tricrypto on hold - 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', - 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', - 'phase2-assets/collaterals/deploy_curve_stable_plugin.ts', - // 'phase2-assets/collaterals/deploy_curve_volatile_plugin.ts', // tricrypto on hold - 'phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts', - 'phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts', - 'phase2-assets/collaterals/deploy_dsr_sdai.ts', - 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', - // =============================================== - // These phase3 scripts will not deploy functional RTokens or Governance. They deploy bricked - // versions that are used for verification only. Further deployment is left up to the Register. - // 'phase3-rtoken/0_setup_deployments.ts', - // 'phase3-rtoken/1_deploy_rtoken.ts', - // 'phase3-rtoken/2_deploy_governance.ts', - // We can uncomment this section whenever we update governance, which will be rarely ] + // ============================================= + + // Phase 2 - Assets/Collateral + if (!baseL2Chains.includes(hre.network.name)) { + scripts.push( + 'phase2-assets/0_setup_deployments.ts', + 'phase2-assets/1_deploy_assets.ts', + 'phase2-assets/assets/deploy_crv.ts', + 'phase2-assets/assets/deploy_cvx.ts', + 'phase2-assets/2_deploy_collateral.ts', + 'phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts', + 'phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts', + 'phase2-assets/collaterals/deploy_flux_finance_collateral.ts', + 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', + 'phase2-assets/collaterals/deploy_convex_stable_plugin.ts', + 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', + 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', + 'phase2-assets/collaterals/deploy_curve_stable_plugin.ts', + 'phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts', + 'phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts', + 'phase2-assets/collaterals/deploy_dsr_sdai.ts', + 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', + 'phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts', + 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts' + ) + } else if (chainId == '8453' || chainId == '84531') { + // Base L2 chains + scripts.push( + 'phase2-assets/0_setup_deployments.ts', + 'phase2-assets/1_deploy_assets.ts', + 'phase2-assets/2_deploy_collateral.ts', + 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', + 'phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts', + 'phase2-assets/collaterals/deploy_aave_v3_usdbc.ts' + ) + } + + // =============================================== + + // Phase 3 - RTokens + // These phase3 scripts will not deploy functional RTokens or Governance. They deploy bricked + // versions that are used for verification only. Further deployment is left up to the Register. + // 'phase3-rtoken/0_setup_deployments.ts', + // 'phase3-rtoken/1_deploy_rtoken.ts', + // 'phase3-rtoken/2_deploy_governance.ts', + // We can uncomment and prepare this section whenever we update governance, which will be rarely + for (const script of scripts) { console.log('\n===========================================\n', script, '') await sh(`hardhat run scripts/deployment/${script}`) diff --git a/scripts/deployment/phase1-common/1_deploy_libraries.ts b/scripts/deployment/phase1-common/1_deploy_libraries.ts index 764676c327..35fc34e373 100644 --- a/scripts/deployment/phase1-common/1_deploy_libraries.ts +++ b/scripts/deployment/phase1-common/1_deploy_libraries.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { networkConfig } from '../../../common/configuration' +import { baseL2Chains, networkConfig } from '../../../common/configuration' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' import { validatePrerequisites } from '../utils' import { BasketLibP1, CvxMining, RecollateralizationLibP1 } from '../../../typechain' @@ -47,17 +47,19 @@ async function main() { fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) // Deploy CvxMining external library - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - cvxMiningLib = await CvxMiningFactory.connect(burner).deploy() - await cvxMiningLib.deployed() - deployments.cvxMiningLib = cvxMiningLib.address + if (!baseL2Chains.includes(hre.network.name)) { + const CvxMiningFactory = await ethers.getContractFactory('CvxMining') + cvxMiningLib = await CvxMiningFactory.connect(burner).deploy() + await cvxMiningLib.deployed() + deployments.cvxMiningLib = cvxMiningLib.address - fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) + fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) + } console.log(`Deployed to ${hre.network.name} (${chainId}): TradingLib: ${tradingLib.address} BasketLib: ${basketLib.address} - CvxMiningLib: ${cvxMiningLib.address} + CvxMiningLib: ${cvxMiningLib ? cvxMiningLib.address : 'N/A'} Deployment file: ${deploymentFilename}`) } diff --git a/scripts/deployment/phase2-assets/1_deploy_assets.ts b/scripts/deployment/phase2-assets/1_deploy_assets.ts index 67d0c52b76..cab49a5515 100644 --- a/scripts/deployment/phase2-assets/1_deploy_assets.ts +++ b/scripts/deployment/phase2-assets/1_deploy_assets.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { networkConfig } from '../../../common/configuration' +import { baseL2Chains, networkConfig } from '../../../common/configuration' import { fp } from '../../../common/numbers' import { getDeploymentFile, @@ -37,19 +37,21 @@ async function main() { const deployedAssets: string[] = [] /******** Deploy StkAAVE Asset **************************/ - const { asset: stkAAVEAsset } = await hre.run('deploy-asset', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.AAVE, - oracleError: fp('0.01').toString(), // 1% - tokenAddress: networkConfig[chainId].tokens.stkAAVE, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - }) - await (await ethers.getContractAt('Asset', stkAAVEAsset)).refresh() + if (!baseL2Chains.includes(hre.network.name)) { + const { asset: stkAAVEAsset } = await hre.run('deploy-asset', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.AAVE, + oracleError: fp('0.01').toString(), // 1% + tokenAddress: networkConfig[chainId].tokens.stkAAVE, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + }) + await (await ethers.getContractAt('Asset', stkAAVEAsset)).refresh() - assetCollDeployments.assets.stkAAVE = stkAAVEAsset - assetCollDeployments.erc20s.stkAAVE = networkConfig[chainId].tokens.stkAAVE - deployedAssets.push(stkAAVEAsset.toString()) + assetCollDeployments.assets.stkAAVE = stkAAVEAsset + assetCollDeployments.erc20s.stkAAVE = networkConfig[chainId].tokens.stkAAVE + deployedAssets.push(stkAAVEAsset.toString()) + } /******** Deploy Comp Asset **************************/ const { asset: compAsset } = await hre.run('deploy-asset', { diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index 475dd1d5c2..b232dc5ed1 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -2,7 +2,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { expect } from 'chai' import { getChainId } from '../../../common/blockchain-utils' -import { networkConfig } from '../../../common/configuration' +import { baseL2Chains, networkConfig } from '../../../common/configuration' import { bn, fp } from '../../../common/numbers' import { CollateralStatus } from '../../../common/constants' import { @@ -40,655 +40,733 @@ async function main() { // Get Oracle Lib address if previously deployed (can override with arbitrary address) const deployedCollateral: string[] = [] + let collateral: ICollateral + /******** Deploy Fiat Collateral - DAI **************************/ - const { collateral: daiCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - tokenAddress: networkConfig[chainId].tokens.DAI, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - }) - let collateral = await ethers.getContractAt('ICollateral', daiCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - assetCollDeployments.collateral.DAI = daiCollateral - assetCollDeployments.erc20s.DAI = networkConfig[chainId].tokens.DAI - deployedCollateral.push(daiCollateral.toString()) + const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? 86400 : 3600 // 24 hr (Base) or 1 hour + const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + if (networkConfig[chainId].tokens.DAI && networkConfig[chainId].chainlinkFeeds.DAI) { + const { collateral: daiCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: daiOracleError.toString(), + tokenAddress: networkConfig[chainId].tokens.DAI, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(daiOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', daiCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.DAI = daiCollateral + assetCollDeployments.erc20s.DAI = networkConfig[chainId].tokens.DAI + deployedCollateral.push(daiCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% /******** Deploy Fiat Collateral - USDC **************************/ - const { collateral: usdcCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25% - tokenAddress: networkConfig[chainId].tokens.USDC, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', usdcCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - assetCollDeployments.collateral.USDC = usdcCollateral - assetCollDeployments.erc20s.USDC = networkConfig[chainId].tokens.USDC - deployedCollateral.push(usdcCollateral.toString()) + if (networkConfig[chainId].tokens.USDC && networkConfig[chainId].chainlinkFeeds.USDC) { + const { collateral: usdcCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: usdcOracleError.toString(), + tokenAddress: networkConfig[chainId].tokens.USDC, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', usdcCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.USDC = usdcCollateral + assetCollDeployments.erc20s.USDC = networkConfig[chainId].tokens.USDC + deployedCollateral.push(usdcCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } /******** Deploy Fiat Collateral - USDT **************************/ - const { collateral: usdtCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, - oracleError: fp('0.0025').toString(), // 0.25% - tokenAddress: networkConfig[chainId].tokens.USDT, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', usdtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - assetCollDeployments.collateral.USDT = usdtCollateral - assetCollDeployments.erc20s.USDT = networkConfig[chainId].tokens.USDT - deployedCollateral.push(usdtCollateral.toString()) + const usdtOracleTimeout = 86400 // 24 hr + const usdtOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + if (networkConfig[chainId].tokens.USDT && networkConfig[chainId].chainlinkFeeds.USDT) { + const { collateral: usdtCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, + oracleError: usdtOracleError.toString(), + tokenAddress: networkConfig[chainId].tokens.USDT, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, usdtOracleTimeout).toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdtOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', usdtCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.USDT = usdtCollateral + assetCollDeployments.erc20s.USDT = networkConfig[chainId].tokens.USDT + deployedCollateral.push(usdtCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } /******** Deploy Fiat Collateral - USDP **************************/ - const { collateral: usdpCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, - oracleError: fp('0.01').toString(), // 1% - tokenAddress: networkConfig[chainId].tokens.USDP, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.02').toString(), // 2% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', usdpCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - assetCollDeployments.collateral.USDP = usdpCollateral - assetCollDeployments.erc20s.USDP = networkConfig[chainId].tokens.USDP - deployedCollateral.push(usdpCollateral.toString()) - /******** Deploy Fiat Collateral - TUSD **************************/ - const { collateral: tusdCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.TUSD, - oracleError: fp('0.003').toString(), // 0.3% - tokenAddress: networkConfig[chainId].tokens.TUSD, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.013').toString(), // 1.3% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', tusdCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.TUSD = tusdCollateral - assetCollDeployments.erc20s.TUSD = networkConfig[chainId].tokens.TUSD - deployedCollateral.push(tusdCollateral.toString()) + if (networkConfig[chainId].tokens.USDP && networkConfig[chainId].chainlinkFeeds.USDP) { + const { collateral: usdpCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, + oracleError: fp('0.01').toString(), // 1% + tokenAddress: networkConfig[chainId].tokens.USDP, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', usdpCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.USDP = usdpCollateral + assetCollDeployments.erc20s.USDP = networkConfig[chainId].tokens.USDP + deployedCollateral.push(usdpCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + /******** Deploy Fiat Collateral - TUSD **************************/ + if (networkConfig[chainId].tokens.TUSD && networkConfig[chainId].chainlinkFeeds.TUSD) { + const { collateral: tusdCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.TUSD, + oracleError: fp('0.003').toString(), // 0.3% + tokenAddress: networkConfig[chainId].tokens.TUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.013').toString(), // 1.3% + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', tusdCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.TUSD = tusdCollateral + assetCollDeployments.erc20s.TUSD = networkConfig[chainId].tokens.TUSD + deployedCollateral.push(tusdCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } /******** Deploy Fiat Collateral - BUSD **************************/ - const { collateral: busdCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.BUSD, - oracleError: fp('0.005').toString(), // 0.5% - tokenAddress: networkConfig[chainId].tokens.BUSD, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.015').toString(), // 1.5% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', busdCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - assetCollDeployments.collateral.BUSD = busdCollateral - assetCollDeployments.erc20s.BUSD = networkConfig[chainId].tokens.BUSD - deployedCollateral.push(busdCollateral.toString()) - - /******** Deploy AToken Fiat Collateral - aDAI **************************/ - - // Get AToken to retrieve name and symbol - let aToken: ATokenMock = ( - await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aDAI as string) - ) - - // Wrap in StaticAToken - const StaticATokenFactory = await ethers.getContractFactory('StaticATokenLM') - const adaiStaticToken: StaticATokenLM = ( - await StaticATokenFactory.connect(burner).deploy( - networkConfig[chainId].AAVE_LENDING_POOL as string, - aToken.address, - 'Static ' + (await aToken.name()), - 's' + (await aToken.symbol()) + if (networkConfig[chainId].tokens.BUSD && networkConfig[chainId].chainlinkFeeds.BUSD) { + const { collateral: busdCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.BUSD, + oracleError: fp('0.005').toString(), // 0.5% + tokenAddress: networkConfig[chainId].tokens.BUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.015').toString(), // 1.5% + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', busdCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.BUSD = busdCollateral + assetCollDeployments.erc20s.BUSD = networkConfig[chainId].tokens.BUSD + deployedCollateral.push(busdCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + + /******** Base L2 - Deploy Fiat Collateral - USDbC **************************/ + if (networkConfig[chainId].tokens.USDbC && networkConfig[chainId].chainlinkFeeds.USDC) { + const { collateral: usdcCollateral } = await hre.run('deploy-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: usdcOracleError.toString(), + tokenAddress: networkConfig[chainId].tokens.USDbC, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1.3% + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', usdcCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.USDbC = usdcCollateral + assetCollDeployments.erc20s.USDbC = networkConfig[chainId].tokens.USDbC + deployedCollateral.push(usdcCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + + /*** AAVE V2 not available in Base L2s */ + if (!baseL2Chains.includes(hre.network.name)) { + /******** Deploy AToken Fiat Collateral - aDAI **************************/ + + // Get AToken to retrieve name and symbol + let aToken: ATokenMock = ( + await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aDAI as string) + ) + + // Wrap in StaticAToken + const StaticATokenFactory = await ethers.getContractFactory('StaticATokenLM') + const adaiStaticToken: StaticATokenLM = ( + await StaticATokenFactory.connect(burner).deploy( + networkConfig[chainId].AAVE_LENDING_POOL as string, + aToken.address, + 'Static ' + (await aToken.name()), + 's' + (await aToken.symbol()) + ) ) - ) - await adaiStaticToken.deployed() - console.log( - `Deployed StaticAToken for aDAI on ${hre.network.name} (${chainId}): ${adaiStaticToken.address} ` - ) - - const { collateral: aDaiCollateral } = await hre.run('deploy-atoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - staticAToken: adaiStaticToken.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', aDaiCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - assetCollDeployments.collateral.aDAI = aDaiCollateral - assetCollDeployments.erc20s.aDAI = adaiStaticToken.address - deployedCollateral.push(aDaiCollateral.toString()) - - /******** Deploy AToken Fiat Collateral - aUSDC **************************/ - - // Get AToken to retrieve name and symbol - aToken = ( - await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aUSDC as string) - ) - - // Wrap in StaticAToken - const ausdcStaticToken: StaticATokenLM = ( - await StaticATokenFactory.connect(burner).deploy( - networkConfig[chainId].AAVE_LENDING_POOL as string, - aToken.address, - 'Static ' + (await aToken.name()), - 's' + (await aToken.symbol()) + await adaiStaticToken.deployed() + console.log( + `Deployed StaticAToken for aDAI on ${hre.network.name} (${chainId}): ${adaiStaticToken.address} ` ) - ) - await ausdcStaticToken.deployed() - - console.log( - `Deployed StaticAToken for aUSDC on ${hre.network.name} (${chainId}): ${ausdcStaticToken.address} ` - ) - - const { collateral: aUsdcCollateral } = await hre.run('deploy-atoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25% - staticAToken: ausdcStaticToken.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', aUsdcCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.aUSDC = aUsdcCollateral - assetCollDeployments.erc20s.aUSDC = ausdcStaticToken.address - deployedCollateral.push(aUsdcCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy AToken Fiat Collateral - aUSDT **************************/ - - // Get AToken to retrieve name and symbol - aToken = ( - await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aUSDT as string) - ) - - // Wrap in StaticAToken - const ausdtStaticToken: StaticATokenLM = ( - await StaticATokenFactory.connect(burner).deploy( - networkConfig[chainId].AAVE_LENDING_POOL as string, - aToken.address, - 'Static ' + (await aToken.name()), - 's' + (await aToken.symbol()) + + const { collateral: aDaiCollateral } = await hre.run('deploy-atoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: fp('0.0025').toString(), // 0.25% + staticAToken: adaiStaticToken.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', aDaiCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.aDAI = aDaiCollateral + assetCollDeployments.erc20s.aDAI = adaiStaticToken.address + deployedCollateral.push(aDaiCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy AToken Fiat Collateral - aUSDC **************************/ + + // Get AToken to retrieve name and symbol + aToken = ( + await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aUSDC as string) ) - ) - await ausdtStaticToken.deployed() - - console.log( - `Deployed StaticAToken for aUSDT on ${hre.network.name} (${chainId}): ${ausdtStaticToken.address} ` - ) - - const { collateral: aUsdtCollateral } = await hre.run('deploy-atoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, - oracleError: fp('0.0025').toString(), // 0.25% - staticAToken: ausdtStaticToken.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', aUsdtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.aUSDT = aUsdtCollateral - assetCollDeployments.erc20s.aUSDT = ausdtStaticToken.address - deployedCollateral.push(aUsdtCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy AToken Fiat Collateral - aBUSD **************************/ - - // Get AToken to retrieve name and symbol - aToken = ( - await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aBUSD as string) - ) - - const abusdStaticToken: StaticATokenLM = ( - await StaticATokenFactory.connect(burner).deploy( - networkConfig[chainId].AAVE_LENDING_POOL as string, - aToken.address, - 'Static ' + (await aToken.name()), - 's' + (await aToken.symbol()) + + // Wrap in StaticAToken + const ausdcStaticToken: StaticATokenLM = ( + await StaticATokenFactory.connect(burner).deploy( + networkConfig[chainId].AAVE_LENDING_POOL as string, + aToken.address, + 'Static ' + (await aToken.name()), + 's' + (await aToken.symbol()) + ) ) - ) - await abusdStaticToken.deployed() - - console.log( - `Deployed StaticAToken for aBUSD on ${hre.network.name} (${chainId}): ${abusdStaticToken.address} ` - ) - - const { collateral: aBusdCollateral } = await hre.run('deploy-atoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.BUSD, - oracleError: fp('0.005').toString(), // 0.5% - staticAToken: abusdStaticToken.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.015').toString(), // 1.5% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', aBusdCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.aBUSD = aBusdCollateral - assetCollDeployments.erc20s.aBUSD = abusdStaticToken.address - deployedCollateral.push(aBusdCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy AToken Fiat Collateral - aUSDP **************************/ - - // Get AToken to retrieve name and symbol - aToken = ( - await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aUSDP as string) - ) - - // Wrap in StaticAToken - const ausdpStaticToken: StaticATokenLM = ( - await StaticATokenFactory.connect(burner).deploy( - networkConfig[chainId].AAVE_LENDING_POOL as string, - aToken.address, - 'Static ' + (await aToken.name()), - 's' + (await aToken.symbol()) + await ausdcStaticToken.deployed() + + console.log( + `Deployed StaticAToken for aUSDC on ${hre.network.name} (${chainId}): ${ausdcStaticToken.address} ` ) - ) - await ausdpStaticToken.deployed() - - console.log( - `Deployed StaticAToken for aUSDP on ${hre.network.name} (${chainId}): ${ausdpStaticToken.address} ` - ) - - const { collateral: aUsdpCollateral } = await hre.run('deploy-atoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, - oracleError: fp('0.01').toString(), // 1% - staticAToken: ausdpStaticToken.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.02').toString(), // 2% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', aUsdpCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.aUSDP = aUsdpCollateral - assetCollDeployments.erc20s.aUSDP = ausdpStaticToken.address - deployedCollateral.push(aUsdpCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cDAI **************************/ - const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') - const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) - - const cDaiVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cDAI!, - `${await cDai.name()} Vault`, - `${await cDai.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cDaiVault.deployed() - - console.log(`Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} `) - - const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cDaiVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cDaiCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cDAI = cDaiCollateral - assetCollDeployments.erc20s.cDAI = cDaiVault.address - deployedCollateral.push(cDaiCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDC **************************/ - const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) - - const cUsdcVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDC!, - `${await cUsdc.name()} Vault`, - `${await cUsdc.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdcVault.deployed() - - console.log( - `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` - ) - - const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdcVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdcCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDC = cUsdcCollateral - assetCollDeployments.erc20s.cUSDC = cUsdcVault.address - deployedCollateral.push(cUsdcCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDT **************************/ - const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) - - const cUsdtVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDT!, - `${await cUsdt.name()} Vault`, - `${await cUsdt.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdtVault.deployed() - - console.log( - `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` - ) - - const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdtVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDT = cUsdtCollateral - assetCollDeployments.erc20s.cUSDT = cUsdtVault.address - deployedCollateral.push(cUsdtCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDP **************************/ - const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) - - const cUsdpVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDP!, - `${await cUsdp.name()} Vault`, - `${await cUsdp.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdpVault.deployed() - - console.log( - `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` - ) - - const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, - oracleError: fp('0.01').toString(), // 1% - cToken: cUsdpVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.02').toString(), // 2% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdpCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDP = cUsdpCollateral - assetCollDeployments.erc20s.cUSDP = cUsdpVault.address - deployedCollateral.push(cUsdpCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ - const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) - - const cWBTCVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cWBTC!, - `${await cWBTC.name()} Vault`, - `${await cWBTC.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cWBTCVault.deployed() - - console.log( - `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` - ) + + const { collateral: aUsdcCollateral } = await hre.run('deploy-atoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: fp('0.0025').toString(), // 0.25% + staticAToken: ausdcStaticToken.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', aUsdcCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.aUSDC = aUsdcCollateral + assetCollDeployments.erc20s.aUSDC = ausdcStaticToken.address + deployedCollateral.push(aUsdcCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy AToken Fiat Collateral - aUSDT **************************/ + + // Get AToken to retrieve name and symbol + aToken = ( + await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aUSDT as string) + ) + + // Wrap in StaticAToken + const ausdtStaticToken: StaticATokenLM = ( + await StaticATokenFactory.connect(burner).deploy( + networkConfig[chainId].AAVE_LENDING_POOL as string, + aToken.address, + 'Static ' + (await aToken.name()), + 's' + (await aToken.symbol()) + ) + ) + await ausdtStaticToken.deployed() + + console.log( + `Deployed StaticAToken for aUSDT on ${hre.network.name} (${chainId}): ${ausdtStaticToken.address} ` + ) + + const { collateral: aUsdtCollateral } = await hre.run('deploy-atoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, + oracleError: fp('0.0025').toString(), // 0.25% + staticAToken: ausdtStaticToken.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', aUsdtCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.aUSDT = aUsdtCollateral + assetCollDeployments.erc20s.aUSDT = ausdtStaticToken.address + deployedCollateral.push(aUsdtCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy AToken Fiat Collateral - aBUSD **************************/ + + // Get AToken to retrieve name and symbol + aToken = ( + await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aBUSD as string) + ) + + const abusdStaticToken: StaticATokenLM = ( + await StaticATokenFactory.connect(burner).deploy( + networkConfig[chainId].AAVE_LENDING_POOL as string, + aToken.address, + 'Static ' + (await aToken.name()), + 's' + (await aToken.symbol()) + ) + ) + await abusdStaticToken.deployed() + + console.log( + `Deployed StaticAToken for aBUSD on ${hre.network.name} (${chainId}): ${abusdStaticToken.address} ` + ) + + const { collateral: aBusdCollateral } = await hre.run('deploy-atoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.BUSD, + oracleError: fp('0.005').toString(), // 0.5% + staticAToken: abusdStaticToken.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.015').toString(), // 1.5% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', aBusdCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.aBUSD = aBusdCollateral + assetCollDeployments.erc20s.aBUSD = abusdStaticToken.address + deployedCollateral.push(aBusdCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy AToken Fiat Collateral - aUSDP **************************/ + + // Get AToken to retrieve name and symbol + aToken = ( + await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aUSDP as string) + ) + + // Wrap in StaticAToken + const ausdpStaticToken: StaticATokenLM = ( + await StaticATokenFactory.connect(burner).deploy( + networkConfig[chainId].AAVE_LENDING_POOL as string, + aToken.address, + 'Static ' + (await aToken.name()), + 's' + (await aToken.symbol()) + ) + ) + await ausdpStaticToken.deployed() + + console.log( + `Deployed StaticAToken for aUSDP on ${hre.network.name} (${chainId}): ${ausdpStaticToken.address} ` + ) + + const { collateral: aUsdpCollateral } = await hre.run('deploy-atoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, + oracleError: fp('0.01').toString(), // 1% + staticAToken: ausdpStaticToken.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', aUsdpCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.aUSDP = aUsdpCollateral + assetCollDeployments.erc20s.aUSDP = ausdpStaticToken.address + deployedCollateral.push(aUsdpCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } const wbtcOracleError = fp('0.02') // 2% const btcOracleError = fp('0.005') // 0.5% const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) - const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { - priceTimeout: priceTimeout.toString(), - referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, - targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, - combinedOracleError: combinedBTCWBTCError.toString(), - cToken: cWBTCVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cWBTCCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cWBTC = cWBTCCollateral - assetCollDeployments.erc20s.cWBTC = cWBTCVault.address - deployedCollateral.push(cWBTCCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Self-Referential Collateral - cETH **************************/ - const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) - - const cETHVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cETH!, - `${await cETH.name()} Vault`, - `${await cETH.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cETHVault.deployed() - - console.log(`Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} `) - - const { collateral: cETHCollateral } = await hre.run('deploy-ctoken-selfreferential-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: fp('0.005').toString(), // 0.5% - cToken: cETHVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('ETH'), - revenueHiding: revenueHiding.toString(), - referenceERC20Decimals: '18', - }) - collateral = await ethers.getContractAt('ICollateral', cETHCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cETH = cETHCollateral - assetCollDeployments.erc20s.cETH = cETHVault.address - deployedCollateral.push(cETHCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + /*** Compound V2 not available in Base L2s */ + if (!baseL2Chains.includes(hre.network.name)) { + /******** Deploy CToken Fiat Collateral - cDAI **************************/ + const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') + const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) + + const cDaiVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cDAI!, + `${await cDai.name()} Vault`, + `${await cDai.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) - /******** Deploy Non-Fiat Collateral - wBTC **************************/ - const { collateral: wBTCCollateral } = await hre.run('deploy-nonfiat-collateral', { - priceTimeout: priceTimeout.toString(), - referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, - targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, - combinedOracleError: combinedBTCWBTCError.toString(), - tokenAddress: networkConfig[chainId].tokens.WBTC, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', wBTCCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.WBTC = wBTCCollateral - assetCollDeployments.erc20s.WBTC = networkConfig[chainId].tokens.WBTC - deployedCollateral.push(wBTCCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await cDaiVault.deployed() + + console.log( + `Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} ` + ) + + const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cDaiVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cDaiCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cDAI = cDaiCollateral + assetCollDeployments.erc20s.cDAI = cDaiVault.address + deployedCollateral.push(cDaiCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDC **************************/ + const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) + + const cUsdcVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDC!, + `${await cUsdc.name()} Vault`, + `${await cUsdc.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdcVault.deployed() + + console.log( + `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` + ) + + const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cUsdcVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdcCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDC = cUsdcCollateral + assetCollDeployments.erc20s.cUSDC = cUsdcVault.address + deployedCollateral.push(cUsdcCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDT **************************/ + const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) + + const cUsdtVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDT!, + `${await cUsdt.name()} Vault`, + `${await cUsdt.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdtVault.deployed() + + console.log( + `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` + ) + + const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cUsdtVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdtCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDT = cUsdtCollateral + assetCollDeployments.erc20s.cUSDT = cUsdtVault.address + deployedCollateral.push(cUsdtCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDP **************************/ + const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) + + const cUsdpVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDP!, + `${await cUsdp.name()} Vault`, + `${await cUsdp.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdpVault.deployed() + + console.log( + `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` + ) + const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, + oracleError: fp('0.01').toString(), // 1% + cToken: cUsdpVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdpCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDP = cUsdpCollateral + assetCollDeployments.erc20s.cUSDP = cUsdpVault.address + deployedCollateral.push(cUsdpCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ + const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) + + const cWBTCVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cWBTC!, + `${await cWBTC.name()} Vault`, + `${await cWBTC.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cWBTCVault.deployed() + + console.log( + `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` + ) + + const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { + priceTimeout: priceTimeout.toString(), + referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, + targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, + combinedOracleError: combinedBTCWBTCError.toString(), + cToken: cWBTCVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cWBTCCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cWBTC = cWBTCCollateral + assetCollDeployments.erc20s.cWBTC = cWBTCVault.address + deployedCollateral.push(cWBTCCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Self-Referential Collateral - cETH **************************/ + const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) + + const cETHVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cETH!, + `${await cETH.name()} Vault`, + `${await cETH.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cETHVault.deployed() + + console.log( + `Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} ` + ) + + const { collateral: cETHCollateral } = await hre.run( + 'deploy-ctoken-selfreferential-collateral', + { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: fp('0.005').toString(), // 0.5% + cToken: cETHVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + revenueHiding: revenueHiding.toString(), + referenceERC20Decimals: '18', + } + ) + collateral = await ethers.getContractAt('ICollateral', cETHCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cETH = cETHCollateral + assetCollDeployments.erc20s.cETH = cETHVault.address + deployedCollateral.push(cETHCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + + /******** Deploy Non-Fiat Collateral - wBTC **************************/ + if ( + networkConfig[chainId].tokens.WBTC && + networkConfig[chainId].chainlinkFeeds.BTC && + networkConfig[chainId].chainlinkFeeds.WBTC + ) { + const { collateral: wBTCCollateral } = await hre.run('deploy-nonfiat-collateral', { + priceTimeout: priceTimeout.toString(), + referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, + targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, + combinedOracleError: combinedBTCWBTCError.toString(), + tokenAddress: networkConfig[chainId].tokens.WBTC, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', wBTCCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.WBTC = wBTCCollateral + assetCollDeployments.erc20s.WBTC = networkConfig[chainId].tokens.WBTC + deployedCollateral.push(wBTCCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } /******** Deploy Self Referential Collateral - wETH **************************/ - const { collateral: wETHCollateral } = await hre.run('deploy-selfreferential-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: fp('0.005').toString(), // 0.5% - tokenAddress: networkConfig[chainId].tokens.WETH, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr - targetName: hre.ethers.utils.formatBytes32String('ETH'), - }) - collateral = await ethers.getContractAt('ICollateral', wETHCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.WETH = wETHCollateral - assetCollDeployments.erc20s.WETH = networkConfig[chainId].tokens.WETH - deployedCollateral.push(wETHCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + if (networkConfig[chainId].tokens.WETH && networkConfig[chainId].chainlinkFeeds.ETH) { + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr + const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% + + const { collateral: wETHCollateral } = await hre.run('deploy-selfreferential-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: ethOracleError.toString(), + tokenAddress: networkConfig[chainId].tokens.WETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), + targetName: hre.ethers.utils.formatBytes32String('ETH'), + }) + collateral = await ethers.getContractAt('ICollateral', wETHCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.WETH = wETHCollateral + assetCollDeployments.erc20s.WETH = networkConfig[chainId].tokens.WETH + deployedCollateral.push(wETHCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } /******** Deploy EUR Fiat Collateral - EURT **************************/ const eurtError = fp('0.02') // 2% - const { collateral: eurtCollateral } = await hre.run('deploy-eurfiat-collateral', { - priceTimeout: priceTimeout.toString(), - referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.EURT, - targetUnitFeed: networkConfig[chainId].chainlinkFeeds.EUR, - oracleError: eurtError.toString(), // 2% - tokenAddress: networkConfig[chainId].tokens.EURT, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetName: ethers.utils.formatBytes32String('EUR'), - defaultThreshold: fp('0.03').toString(), // 3% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', eurtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.EURT = eurtCollateral - assetCollDeployments.erc20s.EURT = networkConfig[chainId].tokens.EURT - deployedCollateral.push(eurtCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + if ( + networkConfig[chainId].tokens.EURT && + networkConfig[chainId].chainlinkFeeds.EUR && + networkConfig[chainId].chainlinkFeeds.EURT + ) { + const { collateral: eurtCollateral } = await hre.run('deploy-eurfiat-collateral', { + priceTimeout: priceTimeout.toString(), + referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.EURT, + targetUnitFeed: networkConfig[chainId].chainlinkFeeds.EUR, + oracleError: eurtError.toString(), // 2% + tokenAddress: networkConfig[chainId].tokens.EURT, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetUnitOracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetName: ethers.utils.formatBytes32String('EUR'), + defaultThreshold: fp('0.03').toString(), // 3% + delayUntilDefault: bn('86400').toString(), // 24h + }) + collateral = await ethers.getContractAt('ICollateral', eurtCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.EURT = eurtCollateral + assetCollDeployments.erc20s.EURT = networkConfig[chainId].tokens.EURT + deployedCollateral.push(eurtCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } console.log(`Deployed collateral to ${hre.network.name} (${chainId}) New deployments: ${deployedCollateral} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts new file mode 100644 index 0000000000..e7fbc98512 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts @@ -0,0 +1,110 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { baseL2Chains, networkConfig } from '../../../../common/configuration' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { bn, fp } from '#/common/numbers' +import { AaveV3FiatCollateral } from '../../../../typechain' +import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' + +// This file specifically deploys Aave V3 USDC collateral + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Only exists on Base L2 + if (!baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Base`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Aave V3 USDbC wrapper **************************/ + + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + const erc20 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + await erc20.deployed() + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aBasUSDbC!, + 'Static Aave Base USDbC', + 'saBasUSDbC' + ) + ).wait() + + console.log( + `Deployed wrapper for Aave V3 USDbC on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + + /******** Deploy Aave V3 USDbC collateral plugin **************************/ + + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const collateral = await CollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: fp('0.003'), // 3% + erc20: erc20.address, + maxTradeVolume: fp('1e6'), + oracleTimeout: oracleTimeout(chainId, bn('86400')), // 24 hr + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.013'), + delayUntilDefault: bn('86400'), + }, + revenueHiding + ) + + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Aave V3 USDbC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.aBasUSDbC = collateral.address + assetCollDeployments.erc20s.aBasUSDbC = erc20.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts new file mode 100644 index 0000000000..2d56f9d3f9 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -0,0 +1,111 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { baseL2Chains, networkConfig } from '../../../../common/configuration' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { bn, fp } from '#/common/numbers' +import { AaveV3FiatCollateral } from '../../../../typechain' +import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' + +// This file specifically deploys Aave V3 USDC collateral + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Only exists on Mainnet + if (baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Mainnet`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Aave V3 USDC wrapper **************************/ + + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + const erc20 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + await erc20.deployed() + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aEthUSDC!, + 'Static Aave Ethereum USDC', + 'saEthUSDC' + ) + ).wait() + + console.log( + `Deployed wrapper for Aave V3 USDC on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + + /******** Deploy Aave V3 USDC collateral plugin **************************/ + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const collateral = await CollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: usdcOracleError, + erc20: erc20.address, + maxTradeVolume: fp('1e6'), + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError), + delayUntilDefault: bn('86400'), + }, + revenueHiding + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.aEthUSDC = collateral.address + assetCollDeployments.erc20s.aEthUSDC = erc20.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts index a3a562d7f8..eab6850157 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' +import { baseL2Chains, networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus } from '../../../../common/constants' @@ -13,7 +13,12 @@ import { fileExists, } from '../../common' import { priceTimeout, oracleTimeout, combinedError } from '../../utils' -import { CBEthCollateral__factory } from '../../../../typechain' +import { + CBEthCollateral, + CBEthCollateralL2, + CBEthCollateralL2__factory, + CBEthCollateral__factory, +} from '../../../../typechain' async function main() { // ==== Read Configuration ==== @@ -41,29 +46,66 @@ async function main() { /******** Deploy Coinbase ETH Collateral - CBETH **************************/ - const CBETHCollateralFactory: CBEthCollateral__factory = (await hre.ethers.getContractFactory( - 'CBEthCollateral' - )) as CBEthCollateral__factory - - const collateral = await CBETHCollateralFactory.connect(deployer).deploy( - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, - oracleError: combinedError(fp('0.005'), fp('0.02')).toString(), // 0.5% & 2%, - erc20: networkConfig[chainId].tokens.cbETH!, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.15').toString(), // 15% - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-4').toString(), // revenueHiding = 0.01% - networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + let collateral: CBEthCollateral | CBEthCollateralL2 + + if (!baseL2Chains.includes(hre.network.name)) { + const CBETHCollateralFactory: CBEthCollateral__factory = (await hre.ethers.getContractFactory( + 'CBEthCollateral' + )) as CBEthCollateral__factory + + const oracleError = combinedError(fp('0.005'), fp('0.02')) // 0.5% & 2% + + collateral = await CBETHCollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + oracleError: oracleError.toString(), // 0.5% & 2%, + erc20: networkConfig[chainId].tokens.cbETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed + oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + } else if (chainId == '8453' || chainId == '84531') { + // Base L2 chains + const CBETHCollateralFactory: CBEthCollateralL2__factory = (await hre.ethers.getContractFactory( + 'CBEthCollateralL2' + )) as CBEthCollateralL2__factory + + const oracleError = combinedError(fp('0.0015'), fp('0.005')) // 0.15% & 0.5% + + collateral = await CBETHCollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + oracleError: oracleError.toString(), // 0.15% & 0.5%, + erc20: networkConfig[chainId].tokens.cbETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed + oracleTimeout(chainId, '86400').toString() // exchangeRateChainlinkTimeout + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + } else { + throw new Error(`Unsupported chainId: ${chainId}`) + } console.log(`Deployed Coinbase cbETH to ${hre.network.name} (${chainId}): ${collateral.address}`) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts new file mode 100644 index 0000000000..3f4755ff72 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts @@ -0,0 +1,104 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { baseL2Chains, networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { CTokenV3Collateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Only exists on Base L2 + if (!baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Base`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy CompoundV3 USDC - cUSDbCv3 **************************/ + + const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('CusdcV3Wrapper') + const erc20 = await WrapperFactory.deploy( + networkConfig[chainId].tokens.cUSDbCv3, + networkConfig[chainId].COMET_REWARDS, + networkConfig[chainId].tokens.COMP + ) + await erc20.deployed() + + console.log( + `Deployed wrapper for cUSDbCv3 on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + + const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') + + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = fp('0.003') // 0.3% (Base) + + const collateral = await CTokenV3Factory.connect(deployer).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: usdcOracleError.toString(), + erc20: erc20.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% + delayUntilDefault: bn('86400').toString(), // 24h + }, + revenueHiding.toString(), + bn('10000e6').toString() // $10k + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed CompoundV3 USDbC to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.cUSDbCv3 = collateral.address + assetCollDeployments.erc20s.cUSDbCv3 = erc20.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts index a6d0bd5e86..873b8fbcc0 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' +import { baseL2Chains, networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus } from '../../../../common/constants' @@ -29,6 +29,11 @@ async function main() { throw new Error(`Missing network configuration for ${hre.network.name}`) } + // Only exists on Mainnet + if (baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Mainnet`) + } + // Get phase1 deployment const phase1File = getDeploymentFilename(chainId) if (!fileExists(phase1File)) { @@ -40,13 +45,12 @@ async function main() { const deployedCollateral: string[] = [] - /******** Deploy CompoundV3 USDC - cUSDCv3 **************************/ + /******** Deploy CompoundV3 USDC - cUSDCv3 **************************/ const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('CusdcV3Wrapper') - const erc20 = await WrapperFactory.deploy( networkConfig[chainId].tokens.cUSDCv3, - '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + networkConfig[chainId].COMET_REWARDS, networkConfig[chainId].tokens.COMP ) await erc20.deployed() @@ -55,16 +59,19 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const collateral = await CTokenV3Factory.connect(deployer).deploy( { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25%, + oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1% + 0.25% + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding.toString(), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts index 3bc89cb18f..b2d6462d6c 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts @@ -110,13 +110,14 @@ async function main() { } ) await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) console.log( `Deployed Curve Stable Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` ) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + assetCollDeployments.collateral.cvx3Pool = collateral.address assetCollDeployments.erc20s.crv3Pool = w3Pool.address deployedCollateral.push(collateral.address.toString()) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts index c3fa6bbe40..26ab8341ac 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts @@ -63,12 +63,12 @@ async function main() { POT ) await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) console.log( `Deployed DSR-wrapping sDAI to ${hre.network.name} (${chainId}): ${collateral.address}` ) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.sDAI = collateral.address assetCollDeployments.erc20s.sDAI = networkConfig[chainId].tokens.sDAI diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts index 0aeb08cefa..af7258ec4c 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts @@ -41,27 +41,13 @@ async function main() { const deployedCollateral: string[] = [] /******** Deploy FToken Fiat Collateral - fUSDC **************************/ - const FTokenFactory = await ethers.getContractFactory('CTokenWrapper') const fUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.fUSDC!) - const fUsdcVault = await FTokenFactory.deploy( - networkConfig[chainId].tokens.fUSDC!, - `${await fUsdc.name()} Vault`, - `${await fUsdc.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await fUsdcVault.deployed() - - console.log( - `Deployed Vault for fUSDC on ${hre.network.name} (${chainId}): ${fUsdcVault.address} ` - ) - const { collateral: fUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, oracleError: fp('0.0025').toString(), // 0.25% - cToken: fUsdcVault.address, + cToken: fUsdc.address, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -74,7 +60,7 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.fUSDC = fUsdcCollateral - assetCollDeployments.erc20s.fUSDC = fUsdcVault.address + assetCollDeployments.erc20s.fUSDC = fUsdc.address deployedCollateral.push(fUsdcCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) @@ -82,24 +68,11 @@ async function main() { /******** Deploy FToken Fiat Collateral - fUSDT **************************/ const fUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.fUSDT!) - const fUsdtVault = await FTokenFactory.deploy( - networkConfig[chainId].tokens.fUSDT!, - `${await fUsdt.name()} Vault`, - `${await fUsdt.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await fUsdtVault.deployed() - - console.log( - `Deployed Vault for fUSDT on ${hre.network.name} (${chainId}): ${fUsdtVault.address} ` - ) - const { collateral: fUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, oracleError: fp('0.0025').toString(), // 0.25% - cToken: fUsdtVault.address, + cToken: fUsdt.address, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -112,7 +85,7 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.fUSDT = fUsdtCollateral - assetCollDeployments.erc20s.fUSDT = fUsdtVault.address + assetCollDeployments.erc20s.fUSDT = fUsdt.address deployedCollateral.push(fUsdtCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) @@ -120,22 +93,11 @@ async function main() { /******** Deploy FToken Fiat Collateral - fDAI **************************/ const fDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.fDAI!) - const fDaiVault = await FTokenFactory.deploy( - networkConfig[chainId].tokens.fDAI!, - `${await fDai.name()} Vault`, - `${await fDai.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await fDaiVault.deployed() - - console.log(`Deployed Vault for fDAI on ${hre.network.name} (${chainId}): ${fDaiVault.address} `) - const { collateral: fDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, oracleError: fp('0.0025').toString(), // 0.25% - cToken: fDaiVault.address, + cToken: fDai.address, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -148,7 +110,7 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.fDAI = fDaiCollateral - assetCollDeployments.erc20s.fDAI = fDaiVault.address + assetCollDeployments.erc20s.fDAI = fDai.address deployedCollateral.push(fDaiCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) @@ -156,24 +118,11 @@ async function main() { /******** Deploy FToken Fiat Collateral - fFRAX **************************/ const fFrax = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.fFRAX!) - const fFraxVault = await FTokenFactory.deploy( - networkConfig[chainId].tokens.fFRAX!, - `${await fFrax.name()} Vault`, - `${await fFrax.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await fFraxVault.deployed() - - console.log( - `Deployed Vault for fFRAX on ${hre.network.name} (${chainId}): ${fFraxVault.address} ` - ) - const { collateral: fFRAXCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.FRAX, oracleError: fp('0.01').toString(), // 1% - cToken: fFraxVault.address, + cToken: fFrax.address, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -186,7 +135,7 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.fFRAX = fFRAXCollateral - assetCollDeployments.erc20s.fFRAX = fFraxVault.address + assetCollDeployments.erc20s.fFRAX = fFrax.address deployedCollateral.push(fFRAXCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts index 7381cf92e8..bc6a8b160a 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts @@ -81,7 +81,7 @@ async function main() { maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.15').toString(), // 15% + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index 429eac9944..19962dd88f 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -143,6 +143,8 @@ async function main() { ) assetCollDeployments.collateral.maUSDT = collateral.address deployedCollateral.push(collateral.address.toString()) + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await (await collateral.refresh()).wait() } { const collateral = await FiatCollateralFactory.connect(deployer).deploy( @@ -155,6 +157,8 @@ async function main() { ) assetCollDeployments.collateral.maUSDC = collateral.address deployedCollateral.push(collateral.address.toString()) + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await (await collateral.refresh()).wait() } { const collateral = await FiatCollateralFactory.connect(deployer).deploy( @@ -167,6 +171,8 @@ async function main() { ) assetCollDeployments.collateral.maDAI = collateral.address deployedCollateral.push(collateral.address.toString()) + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await (await collateral.refresh()).wait() } { @@ -182,15 +188,17 @@ async function main() { targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} erc20: maWBTC.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.wBTCBTC!, + networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} oracleTimeout(chainId, '86400').toString() // 1 hr ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await (await collateral.refresh()).wait() } { @@ -201,15 +209,17 @@ async function main() { maxTradeVolume: fp('1e6'), // $1m, oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.05'), // 5% + defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, - erc20: maWBTC.address, + erc20: maWETH.address, }, revenueHiding ) assetCollDeployments.collateral.maWETH = collateral.address deployedCollateral.push(collateral.address.toString()) + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await (await collateral.refresh()).wait() } { @@ -230,19 +240,19 @@ async function main() { targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} erc20: maStETH.address, }, revenueHiding, networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} oracleTimeout(chainId, '86400').toString() // 1 hr ) - assetCollDeployments.collateral.maWBTC = collateral.address + assetCollDeployments.collateral.maStETH = collateral.address deployedCollateral.push(collateral.address.toString()) + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + await (await collateral.refresh()).wait() } - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) New deployments: ${deployedCollateral} Deployment file: ${assetCollDeploymentFilename}`) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts index 386985881f..6d39259061 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts @@ -61,16 +61,18 @@ async function main() { 'RethCollateral' ) + const oracleError = combinedError(fp('0.005'), fp('0.02')) // 0.5% & 2% + const collateral = await RethCollateralFactory.connect(deployer).deploy( { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: combinedError(fp('0.005'), fp('0.02')).toString(), // 0.5% & 2%, + oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.15').toString(), // 15% + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index a76d0f4e6a..84dad2be5e 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -17,7 +17,7 @@ export const longOracleTimeout = bn('4294967296') // Returns the base plus 1 minute export const oracleTimeout = (chainId: string, base: BigNumberish) => { - return chainId == '1' ? bn('60').add(base) : longOracleTimeout + return chainId == '1' || chainId == '8453' ? bn('60').add(base) : longOracleTimeout } export const combinedError = (x: BigNumber, y: BigNumber): BigNumber => { diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index a5377340a2..9da0d9791d 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -1,7 +1,7 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../common/configuration' +import { baseL2Chains, developmentChains, networkConfig } from '../../common/configuration' import { fp, bn } from '../../common/numbers' import { getDeploymentFile, @@ -34,6 +34,9 @@ async function main() { deployments = getDeploymentFile(assetCollDeploymentFilename) /******** Verify Fiat Collateral - DAI **************************/ + const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? 86400 : 3600 // 24 hr (Base) or 1 hour + const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + await verifyContract( chainId, deployments.collateral.DAI, @@ -41,17 +44,43 @@ async function main() { { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% + oracleError: daiOracleError.toString(), erc20: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% + defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, ], 'contracts/plugins/assets/FiatCollateral.sol:FiatCollateral' ) + + /******** Verify Fiat Collateral - USDbC **************************/ + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + if (baseL2Chains.includes(hre.network.name)) { + await verifyContract( + chainId, + deployments.collateral.USDbC, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: usdcOracleError.toString(), + erc20: networkConfig[chainId].tokens.USDbC, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }, + ], + 'contracts/plugins/assets/FiatCollateral.sol:FiatCollateral' + ) + } + /******** Verify StaticATokenLM - aDAI **************************/ // Get AToken to retrieve name and symbol const aToken: ATokenMock = ( @@ -200,7 +229,11 @@ async function main() { ], 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' ) + /********************** Verify SelfReferentialCollateral - WETH ****************************************/ + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr + const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% + await verifyContract( chainId, deployments.collateral.WETH, @@ -208,10 +241,10 @@ async function main() { { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: fp('0.005').toString(), // 0.5% + oracleError: ethOracleError.toString(), // 0.5% erc20: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), + oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts new file mode 100644 index 0000000000..edb092d1af --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts @@ -0,0 +1,71 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { fp, bn } from '../../../common/numbers' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + // Only exists on Base L2 + if (!baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Base`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify Wrapper **************************/ + const erc20 = await ethers.getContractAt( + 'StaticATokenV3LM', + deployments.erc20s.aBasUSDbC as string + ) + + await verifyContract( + chainId, + deployments.erc20s.aBasUSDbC, + [await erc20.POOL(), await erc20.INCENTIVES_CONTROLLER()], + 'contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol:StaticATokenV3LM' + ) + + /******** Verify Aave V3 USDbC plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.aBasUSDbC, + [ + { + erc20: erc20.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: fp('0.003').toString(), // 3% + oracleTimeout: oracleTimeout(chainId, bn('86400')).toString(), // 24 hr + maxTradeVolume: fp('1e6').toString(), + defaultThreshold: fp('0.013').toString(), + delayUntilDefault: bn('86400').toString(), + }, + revenueHiding.toString(), + ], + 'contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol:AaveV3FiatCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts new file mode 100644 index 0000000000..1486c37cab --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -0,0 +1,69 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { fp, bn } from '../../../common/numbers' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify Wrapper **************************/ + const erc20 = await ethers.getContractAt( + 'StaticATokenV3LM', + deployments.erc20s.aEthUSDC as string + ) + + await verifyContract( + chainId, + deployments.erc20s.aEthUSDC, + [await erc20.POOL(), await erc20.INCENTIVES_CONTROLLER()], + 'contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol:StaticATokenV3LM' + ) + + /******** Verify Aave V3 USDC plugin **************************/ + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + await verifyContract( + chainId, + deployments.collateral.aEthUSDC, + [ + { + erc20: erc20.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: usdcOracleError.toString(), + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + maxTradeVolume: fp('1e6').toString(), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), + }, + revenueHiding.toString(), + ], + 'contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol:AaveV3FiatCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_cbeth.ts b/scripts/verification/collateral-plugins/verify_cbeth.ts index abe6322e57..4e58ad88d5 100644 --- a/scripts/verification/collateral-plugins/verify_cbeth.ts +++ b/scripts/verification/collateral-plugins/verify_cbeth.ts @@ -1,6 +1,6 @@ import hre from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' import { fp, bn } from '../../../common/numbers' import { getDeploymentFile, @@ -26,27 +26,57 @@ async function main() { deployments = getDeploymentFile(assetCollDeploymentFilename) /******** Verify Coinbase staked ETH - CBETH **************************/ - await verifyContract( - chainId, - deployments.collateral.cbETH, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: combinedError(fp('0.005'), fp('0.02')).toString(), // 0.5% & 2%, - erc20: networkConfig[chainId].tokens.cbETH!, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.15').toString(), // 15% - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-4'), // revenueHiding = 0.01% - networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout - ], - 'contracts/plugins/assets/cbeth/CBEthCollateral.sol:CBEthCollateral' - ) + + if (!baseL2Chains.includes(hre.network.name)) { + const oracleError = combinedError(fp('0.005'), fp('0.02')) // 0.5% & 2% + + await verifyContract( + chainId, + deployments.collateral.cbETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: oracleError.toString(), // 0.5% & 2% + erc20: networkConfig[chainId].tokens.cbETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4'), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + ], + 'contracts/plugins/assets/cbeth/CBETHCollateral.sol:CBEthCollateral' + ) + } else if (chainId == '8453' || chainId == '84531') { + const oracleError = combinedError(fp('0.0015'), fp('0.005')) // 0.15% & 0.5% + await verifyContract( + chainId, + deployments.collateral.cbETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: oracleError.toString(), // 0.15% & 0.5%, + erc20: networkConfig[chainId].tokens.cbETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4'), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed + oracleTimeout(chainId, '86400').toString(), // exchangeRateChainlinkTimeout + ], + 'contracts/plugins/assets/cbeth/CBETHCollateralL2.sol:CBEthCollateralL2' + ) + } } main().catch((error) => { diff --git a/scripts/verification/collateral-plugins/verify_convex_stable.ts b/scripts/verification/collateral-plugins/verify_convex_stable.ts index b26f111b39..3c22ae2557 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable.ts @@ -61,7 +61,7 @@ async function main() { chainId, await w3PoolCollateral.erc20(), [], - 'contracts/plugins/assets/convex/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper', + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper', { CvxMining: coreDeployments.cvxMiningLib } ) @@ -71,7 +71,7 @@ async function main() { chainId, coreDeployments.cvxMiningLib, [], - 'contracts/plugins/assets/convex/vendor/CvxMining.sol:CvxMining' + 'contracts/plugins/assets/curve/cvx/vendor/CvxMining.sol:CvxMining' ) /******** Verify 3Pool plugin **************************/ @@ -85,7 +85,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -105,7 +105,7 @@ async function main() { lpToken: THREE_POOL_TOKEN, }, ], - 'contracts/plugins/assets/convex/CurveStableCollateral.sol:CurveStableCollateral' + 'contracts/plugins/assets/curve/CurveStableCollateral.sol:CurveStableCollateral' ) } diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts index 417ff521c6..440f8854b2 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts @@ -86,7 +86,7 @@ async function main() { MIM_THREE_POOL, MIM_DEFAULT_THRESHOLD, ], - 'contracts/plugins/assets/convex/CurveStableMetapoolCollateral.sol:CurveStableMetapoolCollateral' + 'contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol:CurveStableMetapoolCollateral' ) } diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts index 00d7ae5b37..771f6bc767 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -80,7 +80,7 @@ async function main() { eUSD_FRAX_BP, DEFAULT_THRESHOLD, // 2% ], - 'contracts/plugins/assets/convex/CurveStableRTokenMetapoolCollateral.sol:CurveStableRTokenMetapoolCollateral' + 'contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol:CurveStableRTokenMetapoolCollateral' ) } diff --git a/scripts/verification/collateral-plugins/verify_curve_stable.ts b/scripts/verification/collateral-plugins/verify_curve_stable.ts index e43317350d..ce1120f618 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable.ts @@ -72,7 +72,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts index 45101d93fd..a48df02d1f 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, diff --git a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts new file mode 100644 index 0000000000..c3a6cb314e --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts @@ -0,0 +1,81 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + // Only exists on Base L2 + if (!baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Base`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const collateral = await ethers.getContractAt( + 'CTokenV3Collateral', + deployments.collateral.cUSDbCv3 as string + ) + + /******** Verify Wrapper token - wcUSDCv3 **************************/ + + await verifyContract( + chainId, + await collateral.erc20(), + [ + networkConfig[chainId].tokens.cUSDbCv3, + networkConfig[chainId].COMET_REWARDS, + networkConfig[chainId].tokens.COMP, + ], + 'contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol:CusdcV3Wrapper' + ) + + /******** Verify Collateral - wcUSDbCv3 **************************/ + + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = fp('0.003') // 0.3% (Base) + + await verifyContract( + chainId, + deployments.collateral.cUSDbCv3, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: usdcOracleError.toString(), + erc20: await collateral.erc20(), + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% + delayUntilDefault: bn('86400').toString(), // 24h + }, + revenueHiding, + bn('10000e6'), // $10k + ], + 'contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol:CTokenV3Collateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_cusdcv3.ts b/scripts/verification/collateral-plugins/verify_cusdcv3.ts index 6632edbac4..62c1389289 100644 --- a/scripts/verification/collateral-plugins/verify_cusdcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdcv3.ts @@ -1,6 +1,6 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' import { fp, bn } from '../../../common/numbers' import { getDeploymentFile, @@ -37,7 +37,7 @@ async function main() { await collateral.erc20(), [ networkConfig[chainId].tokens.cUSDCv3, - '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + networkConfig[chainId].COMET_REWARDS, networkConfig[chainId].tokens.COMP, ], 'contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol:CusdcV3Wrapper' @@ -45,6 +45,9 @@ async function main() { /******** Verify Collateral - wcUSDCv3 **************************/ + const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + await verifyContract( chainId, deployments.collateral.cUSDCv3, @@ -52,12 +55,12 @@ async function main() { { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25%, + oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1% + 0.25% + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding, diff --git a/scripts/verification/collateral-plugins/verify_morpho.ts b/scripts/verification/collateral-plugins/verify_morpho.ts new file mode 100644 index 0000000000..ba7658f5af --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_morpho.ts @@ -0,0 +1,140 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { + combinedError, + priceTimeout, + oracleTimeout, + verifyContract, + revenueHiding, +} from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** MorphoAaveV2TokenisedDeposit **************************/ + + await verifyContract( + chainId, + deployments.erc20s.maUSDT, + [ + { + morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, + underlyingERC20: networkConfig[chainId].tokens.USDT!, + poolToken: networkConfig[chainId].tokens.aUSDT!, + rewardToken: networkConfig[chainId].tokens.MORPHO!, + }, + ], + 'contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol:MorphoAaveV2TokenisedDeposit' + ) + + /******** MorphoFiatCollateral **************************/ + + const maUSDT = await ethers.getContractAt( + 'MorphoFiatCollateral', + deployments.collateral.maUSDT as string + ) + + await verifyContract( + chainId, + maUSDT.address, + [ + { + priceTimeout: priceTimeout.toString(), + oracleError: fp('0.0025').toString(), // 0.25% + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0025').add(fp('0.01')).toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDT!, + erc20: await maUSDT.erc20(), + }, + revenueHiding, + ], + 'contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol:MorphoFiatCollateral' + ) + + /******** MorphoNonFiatCollateral **************************/ + + const maWBTC = await ethers.getContractAt( + 'MorphoNonFiatCollateral', + deployments.collateral.maWBTC as string + ) + const combinedBTCWBTCError = combinedError(fp('0.02'), fp('0.005')) + + await verifyContract( + chainId, + maWBTC.address, + [ + { + priceTimeout: priceTimeout.toString(), + oracleError: combinedBTCWBTCError.toString(), // 0.25% + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.BTC!, + erc20: await maWBTC.erc20(), + }, + revenueHiding, + networkConfig[chainId].chainlinkFeeds.WBTC!, + oracleTimeout(chainId, '86400').toString(), // 1 hr + ], + 'contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol:MorphoNonFiatCollateral' + ) + + /******** MorphoSelfReferentialCollateral **************************/ + + const maWETH = await ethers.getContractAt( + 'MorphoSelfReferentialCollateral', + deployments.collateral.maWETH as string + ) + + await verifyContract( + chainId, + maWETH.address, + [ + { + priceTimeout: priceTimeout, + oracleError: fp('0.005'), + maxTradeVolume: fp('1e6'), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral + delayUntilDefault: bn('86400'), // 24h + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + erc20: await maWETH.erc20(), + }, + revenueHiding, + ], + 'contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol:MorphoSelfReferentialCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_reth.ts b/scripts/verification/collateral-plugins/verify_reth.ts index 5dca337e0b..324a081859 100644 --- a/scripts/verification/collateral-plugins/verify_reth.ts +++ b/scripts/verification/collateral-plugins/verify_reth.ts @@ -26,6 +26,7 @@ async function main() { deployments = getDeploymentFile(assetCollDeploymentFilename) /******** Verify Rocket-Pool ETH - rETH **************************/ + const oracleError = combinedError(fp('0.005'), fp('0.02')) // 0.5% & 2% await verifyContract( chainId, deployments.collateral.rETH, @@ -33,12 +34,12 @@ async function main() { { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: combinedError(fp('0.005'), fp('0.02')).toString(), // 0.5% & 2%, + oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.15').toString(), // 15% + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% diff --git a/scripts/verification/collateral-plugins/verify_wsteth.ts b/scripts/verification/collateral-plugins/verify_wsteth.ts index 5ddc2291cf..c0b73b2fb0 100644 --- a/scripts/verification/collateral-plugins/verify_wsteth.ts +++ b/scripts/verification/collateral-plugins/verify_wsteth.ts @@ -40,7 +40,7 @@ async function main() { maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.15').toString(), // 15% + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethETH feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 0769abafa8..6014dfcfb3 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -1,7 +1,7 @@ /* eslint-disable no-process-exit */ import hre from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { developmentChains, networkConfig } from '../common/configuration' +import { baseL2Chains, developmentChains, networkConfig } from '../common/configuration' import { sh } from './deployment/utils' import { getDeploymentFile, @@ -35,6 +35,7 @@ async function main() { // This process is intelligent enough that it can be run on all verify scripts, // even if some portions have already been verified + // Phase 1- Common const scripts = [ '0_verify_libraries.ts', '1_verify_implementations.ts', @@ -42,23 +43,39 @@ async function main() { '3_verify_deployer.ts', '4_verify_facade.ts', '5_verify_facadeWrite.ts', - '6_verify.ts', - '7_verify_rToken.ts', - '8_verify_governance.ts', - 'collateral-plugins/verify_convex_stable.ts', - 'collateral-plugins/verify_convex_stable_metapool.ts', - 'collateral-plugins/verify_convex_volatile.ts', - 'collateral-plugins/verify_convex_stable_rtoken_metapool.ts', - 'collateral-plugins/verify_curve_stable.ts', - 'collateral-plugins/verify_curve_stable_metapool.ts', - 'collateral-plugins/verify_curve_volatile.ts', - 'collateral-plugins/verify_curve_stable_rtoken_metapool.ts', - 'collateral-plugins/verify_cusdcv3.ts', - 'collateral-plugins/verify_reth.ts', - 'collateral-plugins/verify_wsteth.ts', - 'collateral-plugins/verify_cbeth.ts', + '6_verify_collateral.ts', ] + // Phase 2 - Individual Plugins + if (!baseL2Chains.includes(hre.network.name)) { + scripts.push( + 'collateral-plugins/verify_convex_stable.ts', + 'collateral-plugins/verify_convex_stable_metapool.ts', + 'collateral-plugins/verify_convex_stable_rtoken_metapool.ts', + 'collateral-plugins/verify_curve_stable.ts', + 'collateral-plugins/verify_curve_stable_metapool.ts', + 'collateral-plugins/verify_curve_stable_rtoken_metapool.ts', + 'collateral-plugins/verify_cusdcv3.ts', + 'collateral-plugins/verify_reth.ts', + 'collateral-plugins/verify_wsteth.ts', + 'collateral-plugins/verify_cbeth.ts', + 'collateral-plugins/verify_sdai.ts', + 'collateral-plugins/verify_morpho.ts', + 'collateral-plugins/verify_aave_v3_usdc.ts' + ) + } else if (chainId == '8453' || chainId == '84531') { + // Base L2 chains + scripts.push( + 'collateral-plugins/verify_cbeth.ts', + 'collateral-plugins/verify_cusdbcv3.ts', + 'collateral-plugins/verify_aave_v3_usdbc' + ) + } + + // Phase 3 - RTokens and Governance + // '7_verify_rToken.ts', + // '8_verify_governance.ts', + for (const script of scripts) { console.log('\n===========================================\n', script, '') await sh(`hardhat run scripts/verification/${script}`) diff --git a/tasks/deployment/get-addresses.ts b/tasks/deployment/get-addresses.ts new file mode 100644 index 0000000000..c7423cb198 --- /dev/null +++ b/tasks/deployment/get-addresses.ts @@ -0,0 +1,269 @@ +import { getChainId } from '../../common/blockchain-utils' +import { task, types } from 'hardhat/config' +import fs from 'fs' +import { + IAssetCollDeployments, + getAssetCollDeploymentFilename, + getDeploymentFile, + getDeploymentFilename, +} from '#/scripts/deployment/common' +import { ITokens } from '#/common/configuration' +import { MainP1 } from '@typechain/MainP1' +import { Contract } from 'ethers' + +task('get-addys', 'Compile the deployed addresses of an RToken deployment') + .addOptionalParam('rtoken', 'The address of the RToken', undefined, types.string) + .addOptionalParam('gov', 'The address of the RToken Governance', undefined, types.string) + .addOptionalParam('ver', 'The target version', undefined, types.string) + .setAction(async (params, hre) => { + /* + Helper functions + */ + const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1) + + const etherscanUrl = 'https://etherscan.io/address/' + + const getVersion = async (c: Contract) => { + try { + return await c.version() + } catch (e) { + return 'N/A' + } + } + + const createRTokenTableRow = async (name: string, address: string) => { + const url = `https://api.etherscan.io/api?module=contract&action=getsourcecode&address=${address}&apikey=${process.env.ETHERSCAN_API_KEY}` + const response = await fetch(url) + const data = await response.json() + const implementation = data.result[0].Implementation + const component = await hre.ethers.getContractAt('ComponentP1', address) + return `| ${name} | [${address}](${etherscanUrl}${address}) | [${implementation}](${etherscanUrl}${implementation}#code) | ${await getVersion( + component + )} |` + } + + const createAssetTableRow = async (name: string, address: string) => { + return `| ${name} | [${address}](${etherscanUrl}${address}) |` + } + + const createTableRows = async ( + components: { name: string; address: string }[], + isRToken: boolean + ) => { + const rows = [] + for (const component of components) { + isRToken + ? rows.push(await createRTokenTableRow(component.name, component.address)) + : rows.push(await createAssetTableRow(component.name, component.address)) + } + return rows.join('\n') + } + + const createRTokenMarkdown = async ( + name: string, + address: string, + rows: string, + govRows: string | undefined + ) => { + return `# [${name}](${etherscanUrl}${address}) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +${rows} + +${ + govRows && + ` +## Governance Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +${govRows} +` +} + ` + } + + const createAssetMarkdown = async (name: string, assets: string, collaterals: string) => { + return `# ${name} +## Assets +| Contract | Address | +| --- | --- | +${assets} + +## Collaterals +| Contract | Address | +| --- | --- | +${collaterals} + ` + } + + const getRTokenFileName = async (rtoken: string) => { + const chainId = await getChainId(hre) + const rToken = await hre.ethers.getContractAt('IRToken', rtoken) + const rTokenSymbol = await rToken.symbol() + return `${outputDir}${chainId}-${rTokenSymbol}.md` + } + + const getAssetFileName = async (version: string) => { + const chainId = await getChainId(hre) + return `${outputDir}${chainId}-assets-${version}.md` + } + + const getComponentFileName = async (version: string) => { + const chainId = await getChainId(hre) + return `${outputDir}${chainId}-components-${version}.md` + } + + const getActiveRoleHolders = async (main: MainP1, role: string) => { + // get active owners + // + const grantedFilter = main.filters.RoleGranted(role) + const revokedFilter = main.filters.RoleRevoked(role) + + // get granted owners + const ownersGranted = await main.queryFilter(grantedFilter) + let owners = ownersGranted.map((event) => { + return event.args![1] + }) + interface OwnerCount { + [key: string]: number + } + + // count granted owners + let ownerCount: OwnerCount = {} + owners.forEach((owner: string) => { + ownerCount[owner] = (ownerCount[owner] || 0) + 1 + }) + + // reduce counts by revoked owners + const ownersRevoked = await main.queryFilter(revokedFilter) + ownersRevoked.forEach((event) => { + const owner = event.args![1] + ownerCount[owner] = (ownerCount[owner] || 0) - 1 + }) + return Object.keys(ownerCount).filter((owner) => ownerCount[owner] > 0) + } + + /* + Compile target addresses and create markdown files + */ + + const outputDir = 'docs/deployed-addresses/' + + if (params.rtoken && params.gov) { + // if rtoken address is provided, print component addresses + + const rToken = await hre.ethers.getContractAt('IRToken', params.rtoken) + const mainAddress = await rToken.main() + const main = await hre.ethers.getContractAt('MainP1', mainAddress) + const backingManagerAddress = await main.backingManager() + const basketHandlerAddress = await main.basketHandler() + const brokerAddress = await main.broker() + const rsrTraderAddress = await main.rsrTrader() + const rTokenTraderAddress = await main.rTokenTrader() + const furnaceAddress = await main.furnace() + const assetRegistryAddress = await main.assetRegistry() + const distributorAddress = await main.distributor() + const stRSRAddress = await main.stRSR() + + const components = [ + { name: 'RToken', address: params.rtoken }, + { name: 'Main', address: mainAddress }, + { name: 'AssetRegistry', address: assetRegistryAddress }, + { name: 'BackingManager', address: backingManagerAddress }, + { name: 'BasketHandler', address: basketHandlerAddress }, + { name: 'Broker', address: brokerAddress }, + { name: 'RSRTrader', address: rsrTraderAddress }, + { name: 'RTokenTrader', address: rTokenTraderAddress }, + { name: 'Distributor', address: distributorAddress }, + { name: 'Furnace', address: furnaceAddress }, + { name: 'StRSR', address: stRSRAddress }, + ] + + const governance = await hre.ethers.getContractAt('Governance', params.gov) + const timelock = await governance.timelock() + + // confirm timelock is in fact owner of main + const isOwner = await main.hasRole(await main.OWNER_ROLE(), timelock) + if (!isOwner) { + throw new Error('Wrong governance address (Timelock is not owner of Main)') + } + + const govComponents = [ + { name: 'Governor Alexios', address: params.gov }, + { name: 'Timelock', address: timelock }, + ] + + const rTokenName = await rToken.name() + const rTokenSymbol = await rToken.symbol() + + const rows = await createTableRows(components, true) + const govRows = await createTableRows(govComponents, true) + const markdown = await createRTokenMarkdown( + `${rTokenSymbol} (${rTokenName})`, + params.rtoken, + rows, + govRows + ) + fs.writeFileSync(await getRTokenFileName(params.rtoken), markdown) + } else if (params.ver) { + // if version is provided, print implementation addresses + const version = `${hre.network.name}-${params.ver}` + const collateralDepl = getDeploymentFile( + getAssetCollDeploymentFilename(await getChainId(hre), version) + ) as IAssetCollDeployments + + const collaterals = Object.keys(collateralDepl.collateral).map((coll) => { + const key = coll as keyof ITokens + return { name: coll, address: collateralDepl.collateral[key]! } + }) + const collateralRows = await createTableRows(collaterals, false) + + const assets = Object.keys(collateralDepl.assets).map((ass) => { + const key = ass as keyof ITokens + return { name: ass, address: collateralDepl.assets[key]! } + }) + const assetRows = await createTableRows(assets, false) + + const assetMarkdown = await createAssetMarkdown( + `Assets (${capitalize(hre.network.name)} ${params.ver})`, + assetRows, + collateralRows + ) + fs.writeFileSync(await getAssetFileName(params.ver), assetMarkdown) + + const componentDepl = getDeploymentFile(getDeploymentFilename(await getChainId(hre), version)) + const recursiveDestructure = ( + obj: string | { [key: string]: string }, + key: string + ): Array<{ name: string; address: string }> | { name: string; address: string } => { + if (typeof obj === 'string') { + return { name: capitalize(key), address: obj } + } else { + return Object.keys(obj) + .map((k) => { + return recursiveDestructure(obj[k], k) + }) + .flat() + } + } + + let components = recursiveDestructure(componentDepl as {}, '') as Array<{ + name: string + address: string + }> + components = components.sort((a, b) => a.name.localeCompare(b.name)) + const componentMarkdown = await createRTokenMarkdown( + `Component Implementations (${capitalize(hre.network.name)} ${params.ver})`, + params.version, + await createTableRows(components, false), + undefined + ) + fs.writeFileSync(await getComponentFileName(params.ver), componentMarkdown) + } else { + // if neither rtoken address nor version number is provided, throw error + throw new Error( + 'must provide either RToken address (--rtoken) and RToken governance (--gov), or Version (--ver)' + ) + } + }) diff --git a/tasks/index.ts b/tasks/index.ts index 74d51bf9b8..4f167da7a5 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -19,6 +19,7 @@ import './deployment/create-deployer-registry' import './deployment/empty-wallet' import './deployment/cancel-tx' import './deployment/sign-msg' +import './deployment/get-addresses' import './upgrades/force-import' import './upgrades/validate-upgrade' import './testing/mint-tokens' diff --git a/tasks/testing/upgrade-checker-utils/constants.ts b/tasks/testing/upgrade-checker-utils/constants.ts index 518a48adc3..602c245d47 100644 --- a/tasks/testing/upgrade-checker-utils/constants.ts +++ b/tasks/testing/upgrade-checker-utils/constants.ts @@ -8,16 +8,14 @@ export const whales: { [key: string]: string } = { [networkConfig['1'].tokens.aUSDT!.toLowerCase()]: '0x0B6B712B0f3998961Cd3109341b00c905b16124A', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: '0x5754284f345afc66a98fbB0a0Afe71e0F007B949', // saUSDT - // TODO: Replace with real address - ['0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038'.toLowerCase()]: + ['0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase()]: '0x5754284f345afc66a98fbB0a0Afe71e0F007B949', // cUSDTVault [networkConfig['1'].tokens.aUSDC!.toLowerCase()]: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', [networkConfig['1'].tokens.cUSDC!.toLowerCase()]: '0x97D868b5C2937355Bf89C5E5463d52016240fE86', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', // saUSDC - // TODO: Replace with real address - ['0xf201fFeA8447AB3d43c98Da3349e0749813C9009'.toLowerCase()]: + ['0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', // cUSDCVault [networkConfig['1'].tokens.RSR!.toLowerCase()]: '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1', diff --git a/tasks/testing/upgrade-checker-utils/logs.ts b/tasks/testing/upgrade-checker-utils/logs.ts index 756c7594d5..a601fdf2b3 100644 --- a/tasks/testing/upgrade-checker-utils/logs.ts +++ b/tasks/testing/upgrade-checker-utils/logs.ts @@ -44,8 +44,8 @@ const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.DAI!.toLowerCase()]: 'DAI', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: 'saUSDC', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: 'saUSDT', - ['0xf201fFeA8447AB3d43c98Da3349e0749813C9009'.toLowerCase()]: 'cUSDCVault', // TODO: Replace with real address - ['0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038'.toLowerCase()]: 'cUSDTVault', // TODO: Replace with real address + ['0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase()]: 'cUSDCVault', + ['0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase()]: 'cUSDTVault', } export const logToken = (tokenAddress: string) => { diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index d45a377e54..564e91b037 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -178,9 +178,8 @@ export const getTokens = async ( case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9': // saUSDT await getStaticAToken(hre, tokenAddress, amount, recipient) break - // TODO: Replace with real addresses - case '0xf201fFeA8447AB3d43c98Da3349e0749813C9009': // cUSDCVault - case '0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038': // cUSDTVault + case '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022': // cUSDCVault + case '0x4Be33630F92661afD646081BC29079A38b879aA0': // cUSDTVault await getCTokenVault(hre, tokenAddress, amount, recipient) break default: diff --git a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts index 49d5fc4753..82e7892e64 100644 --- a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts +++ b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts @@ -2,33 +2,14 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types' import { expect } from 'chai' import { ProposalBuilder, buildProposal } from '../governance' import { Proposal } from '#/utils/subgraph' -import { IImplementations, networkConfig } from '#/common/configuration' +import { networkConfig } from '#/common/configuration' import { bn, fp, toBNDecimals } from '#/common/numbers' import { CollateralStatus, TradeKind, ZERO_ADDRESS } from '#/common/constants' import { pushOraclesForward, setOraclePrice } from '../oracles' import { whileImpersonating } from '#/utils/impersonation' import { whales } from '../constants' import { getTokens, runDutchTrade } from '../trades' -import { - AssetRegistryP1, - BackingManagerP1, - BasketHandlerP1, - BasketLibP1, - BrokerP1, - CTokenFiatCollateral, - DistributorP1, - EURFiatCollateral, - FurnaceP1, - MockV3Aggregator, - GnosisTrade, - IERC20Metadata, - DutchTrade, - RevenueTraderP1, - RTokenP1, - StRSRP1Votes, - MainP1, - RecollateralizationLibP1, -} from '../../../../typechain' +import { EURFiatCollateral, MockV3Aggregator } from '../../../../typechain' import { advanceTime, advanceToTimestamp, @@ -47,6 +28,8 @@ export default async ( const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const governor = await hre.ethers.getContractAt('Governance', governorAddress) const timelockAddress = await governor.timelock() + const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) + const assetRegistry = await hre.ethers.getContractAt( 'AssetRegistryP1', await main.assetRegistry() @@ -155,15 +138,17 @@ export default async ( console.log(`successfully tested issuance and trading pause`) /* - New setters for enabling auctions + New getters/setters for auctions */ - // Auction setters + // Auction getters/setters await whileImpersonating(hre, timelockAddress, async (tl) => { await broker.connect(tl).enableBatchTrade() await broker.connect(tl).enableDutchTrade(rsr.address) }) + expect(await broker.batchTradeDisabled()).to.equal(false) + expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) - console.log(`successfully tested new auction setters`) + console.log(`successfully tested new auction getters/setters`) /* Dust Auctions @@ -328,51 +313,27 @@ export default async ( }) console.log(`successfully tested withrawalLeak`) - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, rTokenAddress) - /* - RToken Asset + Governance changes */ - console.log(`swapping RTokenAsset...`) - - const rTokenAsset = await hre.ethers.getContractAt( - 'TestIAsset', - await assetRegistry.toAsset(rToken.address) - ) - const maxTradeVolumePrev = await rTokenAsset.maxTradeVolume() - - const newRTokenAsset = await ( - await hre.ethers.getContractFactory('RTokenAsset') - ).deploy(rToken.address, maxTradeVolumePrev) - - // Swap RToken Asset - await whileImpersonating(hre, timelockAddress, async (tl) => { - await assetRegistry.connect(tl).swapRegistered(newRTokenAsset.address) - }) - await assetRegistry.refresh() + console.log(`testing governance...`) - // Check interface behaves properly - expect(await newRTokenAsset.isCollateral()).to.equal(false) - expect(await newRTokenAsset.erc20()).to.equal(rToken.address) - expect(await rToken.decimals()).to.equal(18) - expect(await newRTokenAsset.version()).to.equal('3.0.0') - expect(await newRTokenAsset.maxTradeVolume()).to.equal(maxTradeVolumePrev) + const EXECUTOR_ROLE = await timelock.EXECUTOR_ROLE() + expect(await timelock.hasRole(EXECUTOR_ROLE, governor.address)).to.equal(true) + expect(await timelock.hasRole(EXECUTOR_ROLE, ZERO_ADDRESS)).to.equal(false) - const [lowPricePrev, highPricePrev] = await rTokenAsset.price() - const [lowPrice, highPrice] = await newRTokenAsset.price() - expect(lowPrice).to.equal(lowPricePrev) - expect(highPrice).to.equal(highPricePrev) + console.log(`successfully tested governance`) - await expect(rTokenAsset.claimRewards()).to.not.emit(rTokenAsset, 'RewardsClaimed') - console.log(`successfully tested RTokenAsset`) + // we pushed the chain forward, so we need to keep the rToken SOUND + await pushOraclesForward(hre, rTokenAddress) console.log('\n3.0.0 check succeeded!') } export const proposal_3_0_0: ProposalBuilder = async ( hre: HardhatRuntimeEnvironment, - rTokenAddress: string + rTokenAddress: string, + governorAddress: string ): Promise => { const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) @@ -395,225 +356,109 @@ export const proposal_3_0_0: ProposalBuilder = async ( const rTokenTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rTokenTrader()) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - // TODO: Uncomment and replace with deployed addresses once they are available - /* - const mainImplAddr = '0x...' - const batchTradeImplAddr = '0x...' - const dutchTradeImplAddr = '0x...' - const assetRegImplAddr = '0x...' - const bckMgrImplAddr = '0x...' - const bsktHdlImplAddr = '0x...' - const brokerImplAddr = '0x...' - const distImplAddr = '0x...' - const furnaceImplAddr = '0x...' - const rsrTraderImplAddr = '0x...' - const rTokenTraderImplAddr = '0x...' - const rTokenImplAddr = '0x...' - const stRSRImplAddr = '0x...' - */ - - // TODO: Remove code once addresses are available - const implementations: IImplementations = await deployNewImplementations(hre) - const mainImplAddr = implementations.main - const batchTradeImplAddr = implementations.trading.gnosisTrade - const dutchTradeImplAddr = implementations.trading.dutchTrade - const assetRegImplAddr = implementations.components.assetRegistry - const bckMgrImplAddr = implementations.components.backingManager - const bsktHdlImplAddr = implementations.components.basketHandler - const brokerImplAddr = implementations.components.broker - const distImplAddr = implementations.components.distributor - const furnaceImplAddr = implementations.components.furnace - const rsrTraderImplAddr = implementations.components.rsrTrader - const rTokenTraderImplAddr = implementations.components.rTokenTrader - const rTokenImplAddr = implementations.components.rToken - const stRSRImplAddr = implementations.components.stRSR - - // TODO: Uncomment and replace with deployed addresses once they are available - /* - const cUSDCVaultAddr = '0x...' - const cUSDCNewCollateralAddr = '0x...' - const cUSDTVaultAddr = '0x...' - const cUSDTNewCollateralAddr = '0x...' - */ - const saUSDCCollateralAddr = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15' - const saUSDTCollateralAddr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' - - // TODO: Remove code once addresses are available - // CUSDC Vault and collateral - const [cUSDCVaultAddr, cUSDCVaultCollateralAddr] = await makeCTokenVaultCollateral( - hre, - networkConfig['1'].tokens.cUSDC!, - await assetRegistry.toColl(networkConfig['1'].tokens.cUSDC!), - networkConfig['1'].COMPTROLLER! - ) - const [cUSDTVaultAddr, cUSDTVaultCollateralAddr] = await makeCTokenVaultCollateral( - hre, - networkConfig['1'].tokens.cUSDT!, - await assetRegistry.toColl(networkConfig['1'].tokens.cUSDT!), - networkConfig['1'].COMPTROLLER! - ) - - // Step 1 - Update implementations and config + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const timelock = await hre.ethers.getContractAt('TimelockController', await governor.timelock()) + + const mainImplAddr = '0xF5366f67FF66A3CefcB18809a762D5b5931FebF8' + const batchTradeImplAddr = '0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630' + const dutchTradeImplAddr = '0x2387C22727ACb91519b80A15AEf393ad40dFdb2F' + const assetRegImplAddr = '0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450' + const bckMgrImplAddr = '0x0A388FC05AA017b31fb084e43e7aEaFdBc043080' + const bsktHdlImplAddr = '0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc' + const brokerImplAddr = '0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04' + const distImplAddr = '0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac' + const furnaceImplAddr = '0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c' + const rsrTraderImplAddr = '0x1cCa3FBB11C4b734183f997679d52DeFA74b613A' + const rTokenTraderImplAddr = '0x1cCa3FBB11C4b734183f997679d52DeFA74b613A' + const rTokenImplAddr = '0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F' + const stRSRImplAddr = '0xC98eaFc9F249D90e3E35E729e3679DD75A899c10' + + const cUSDCVaultAddr = '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022' + const cUSDCVaultCollateralAddr = '0x50a9d529EA175CdE72525Eaa809f5C3c47dAA1bB' + const cUSDTVaultAddr = '0x4Be33630F92661afD646081BC29079A38b879aA0' + const cUSDTVaultCollateralAddr = '0x5757fF814da66a2B4f9D11d48570d742e246CfD9' + const saUSDCAddr = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15' + const aUSDCCollateralAddr = '0x7CD9CA6401f743b38B3B16eA314BbaB8e9c1aC51' + const saUSDTAddr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' + const aUSDTCollateralAddr = '0xE39188Ddd4eb27d1D25f5f58cC6A5fD9228EEdeF' + + const RSRAssetAddr = '0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6' + const TUSDCollateralAddr = '0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2' + const USDPCollateralAddr = '0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89' + const DAICollateralAddr = '0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833' + const USDTCollateralAddr = '0x58D7bF13D3572b08dE5d96373b8097d94B1325ad' + const USDCCollateralAddr = '0xBE9D23040fe22E8Bd8A88BF5101061557355cA04' + const COMPAssetAddr = '0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1' + const stkAAVEAssetAddr = '0x6647c880Eb8F57948AF50aB45fca8FE86C154D24' + const RTokenAssetAddr = '0x70C34352a73b76322cEc6bB965B9fd1a95C77A61' + + // Step 1 - Update implementations const txs = [ - await main.populateTransaction.upgradeTo(mainImplAddr), await assetRegistry.populateTransaction.upgradeTo(assetRegImplAddr), await backingManager.populateTransaction.upgradeTo(bckMgrImplAddr), await basketHandler.populateTransaction.upgradeTo(bsktHdlImplAddr), await broker.populateTransaction.upgradeTo(brokerImplAddr), await distributor.populateTransaction.upgradeTo(distImplAddr), await furnace.populateTransaction.upgradeTo(furnaceImplAddr), + await main.populateTransaction.upgradeTo(mainImplAddr), await rsrTrader.populateTransaction.upgradeTo(rsrTraderImplAddr), await rTokenTrader.populateTransaction.upgradeTo(rTokenTraderImplAddr), await rToken.populateTransaction.upgradeTo(rTokenImplAddr), await stRSR.populateTransaction.upgradeTo(stRSRImplAddr), - await broker.populateTransaction.setBatchTradeImplementation(batchTradeImplAddr), - await broker.populateTransaction.setDutchTradeImplementation(dutchTradeImplAddr), + ] + + // Step 2 - Cache components + txs.push( await backingManager.populateTransaction.cacheComponents(), - await rsrTrader.populateTransaction.cacheComponents(), - await rTokenTrader.populateTransaction.cacheComponents(), await distributor.populateTransaction.cacheComponents(), - await basketHandler.populateTransaction.setWarmupPeriod(900), - await stRSR.populateTransaction.setWithdrawalLeak(bn('5e16')), - await broker.populateTransaction.setDutchAuctionLength(1800), - ] + await rsrTrader.populateTransaction.cacheComponents(), + await rTokenTrader.populateTransaction.cacheComponents() + ) - // Step 2 - Basket change + // Step 3 - Register and swap assets txs.push( await assetRegistry.populateTransaction.register(cUSDCVaultCollateralAddr), await assetRegistry.populateTransaction.register(cUSDTVaultCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(aUSDCCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(aUSDTCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(RSRAssetAddr), + await assetRegistry.populateTransaction.swapRegistered(TUSDCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(USDPCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(DAICollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(USDTCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(USDCCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(COMPAssetAddr), + await assetRegistry.populateTransaction.swapRegistered(stkAAVEAssetAddr), + await assetRegistry.populateTransaction.swapRegistered(RTokenAssetAddr) + ) + + // Step 4 - Basket change + txs.push( await basketHandler.populateTransaction.setPrimeBasket( - [saUSDCCollateralAddr, cUSDCVaultAddr, saUSDTCollateralAddr, cUSDTVaultAddr], + [cUSDCVaultAddr, cUSDTVaultAddr, saUSDCAddr, saUSDTAddr], [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] ), await basketHandler.populateTransaction.refreshBasket() ) - const description = - 'Upgrade implementations, set trade plugins, components, config values, and update basket' - - return buildProposal(txs, description) -} - -// TODO: Remove once final addresses exist on Mainnet -const deployNewImplementations = async ( - hre: HardhatRuntimeEnvironment -): Promise => { - // Deploy new implementations - const MainImplFactory = await hre.ethers.getContractFactory('MainP1') - const mainImpl: MainP1 = await MainImplFactory.deploy() - - // Deploy TradingLib external library - const TradingLibFactory = await hre.ethers.getContractFactory('RecollateralizationLibP1') - const tradingLib: RecollateralizationLibP1 = ( - await TradingLibFactory.deploy() - ) - - // Deploy BasketLib external library - const BasketLibFactory = await hre.ethers.getContractFactory('BasketLibP1') - const basketLib: BasketLibP1 = await BasketLibFactory.deploy() - - const AssetRegImplFactory = await hre.ethers.getContractFactory('AssetRegistryP1') - const assetRegImpl: AssetRegistryP1 = await AssetRegImplFactory.deploy() - - const BackingMgrImplFactory = await hre.ethers.getContractFactory('BackingManagerP1', { - libraries: { - RecollateralizationLibP1: tradingLib.address, - }, - }) - const backingMgrImpl: BackingManagerP1 = await BackingMgrImplFactory.deploy() - - const BskHandlerImplFactory = await hre.ethers.getContractFactory('BasketHandlerP1', { - libraries: { BasketLibP1: basketLib.address }, - }) - const bskHndlrImpl: BasketHandlerP1 = await BskHandlerImplFactory.deploy() - - const DistribImplFactory = await hre.ethers.getContractFactory('DistributorP1') - const distribImpl: DistributorP1 = await DistribImplFactory.deploy() - - const RevTraderImplFactory = await hre.ethers.getContractFactory('RevenueTraderP1') - const revTraderImpl: RevenueTraderP1 = await RevTraderImplFactory.deploy() - - const FurnaceImplFactory = await hre.ethers.getContractFactory('FurnaceP1') - const furnaceImpl: FurnaceP1 = await FurnaceImplFactory.deploy() - - const GnosisTradeImplFactory = await hre.ethers.getContractFactory('GnosisTrade') - const gnosisTrade: GnosisTrade = await GnosisTradeImplFactory.deploy() - - const DutchTradeImplFactory = await hre.ethers.getContractFactory('DutchTrade') - const dutchTrade: DutchTrade = await DutchTradeImplFactory.deploy() - - const BrokerImplFactory = await hre.ethers.getContractFactory('BrokerP1') - const brokerImpl: BrokerP1 = await BrokerImplFactory.deploy() - - const RTokenImplFactory = await hre.ethers.getContractFactory('RTokenP1') - const rTokenImpl: RTokenP1 = await RTokenImplFactory.deploy() - - const StRSRImplFactory = await hre.ethers.getContractFactory('StRSRP1Votes') - const stRSRImpl: StRSRP1Votes = await StRSRImplFactory.deploy() - - return { - main: mainImpl.address, - trading: { gnosisTrade: gnosisTrade.address, dutchTrade: dutchTrade.address }, - components: { - assetRegistry: assetRegImpl.address, - backingManager: backingMgrImpl.address, - basketHandler: bskHndlrImpl.address, - broker: brokerImpl.address, - distributor: distribImpl.address, - furnace: furnaceImpl.address, - rsrTrader: revTraderImpl.address, - rTokenTrader: revTraderImpl.address, - rToken: rTokenImpl.address, - stRSR: stRSRImpl.address, - }, - } -} - -// TODO: Remove once final addresses exist on Mainnet -const makeCTokenVaultCollateral = async ( - hre: HardhatRuntimeEnvironment, - tokenAddress: string, - collAddress: string, - comptrollerAddr: string -): Promise<[string, string]> => { - const CTokenWrapperFactory = await hre.ethers.getContractFactory('CTokenWrapper') - const CTokenCollateralFactory = await hre.ethers.getContractFactory('CTokenFiatCollateral') - - const erc20: IERC20Metadata = ( - await hre.ethers.getContractAt('CTokenMock', tokenAddress) - ) - - const currentColl: CTokenFiatCollateral = ( - await hre.ethers.getContractAt('CTokenFiatCollateral', collAddress) - ) - - const vault = await CTokenWrapperFactory.deploy( - erc20.address, - `${await erc20.name()} Vault`, - `${await erc20.symbol()}-VAULT`, - comptrollerAddr + // Step 5 - Governance + const EXECUTOR_ROLE = await timelock.EXECUTOR_ROLE() + txs.push( + await timelock.populateTransaction.grantRole(EXECUTOR_ROLE, governor.address), + await timelock.populateTransaction.revokeRole(EXECUTOR_ROLE, ZERO_ADDRESS) ) - await vault.deployed() - - const coll = await CTokenCollateralFactory.deploy( - { - priceTimeout: await currentColl.priceTimeout(), - chainlinkFeed: await currentColl.chainlinkFeed(), - oracleError: await currentColl.oracleError(), - erc20: vault.address, - maxTradeVolume: await currentColl.maxTradeVolume(), - oracleTimeout: await currentColl.oracleTimeout(), - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), - delayUntilDefault: await currentColl.delayUntilDefault(), - }, - fp('1e-6') + // Step 6 - Initializations + txs.push( + await basketHandler.populateTransaction.setWarmupPeriod(900), + await stRSR.populateTransaction.setWithdrawalLeak(bn('5e16')), + await broker.populateTransaction.setBatchTradeImplementation(batchTradeImplAddr), + await broker.populateTransaction.setDutchTradeImplementation(dutchTradeImplAddr), + await broker.populateTransaction.setDutchAuctionLength(1800) ) - await coll.deployed() - - await (await coll.refresh()).wait() + const description = + 'Upgrade implementations, assets, set trade plugins, config values, and update basket' - return [vault.address, coll.address] + return buildProposal(txs, description) } diff --git a/tasks/testing/upgrade-checker.ts b/tasks/testing/upgrade-checker.ts index 9ee7df67a7..0cc0f5436d 100644 --- a/tasks/testing/upgrade-checker.ts +++ b/tasks/testing/upgrade-checker.ts @@ -47,7 +47,7 @@ task('upgrade-checker', 'Mints all the tokens to an address') .addParam('governor', 'the address of the OWNER of the RToken being upgraded') .addOptionalParam('proposalid', 'the ID of the governance proposal', undefined) .setAction(async (params, hre) => { - await resetFork(hre, Number(useEnv('MAINNET_BLOCK'))) + await resetFork(hre, Number(useEnv('FORK_BLOCK'))) const [tester] = await hre.ethers.getSigners() const chainId = await getChainId(hre) @@ -118,8 +118,8 @@ task('upgrade-checker', 'Mints all the tokens to an address') const usdcAddress = networkConfig['1'].tokens.USDC! const cUsdtAddress = networkConfig['1'].tokens.cUSDT! const cUsdcAddress = networkConfig['1'].tokens.cUSDC! - const cUsdtVaultAddress = '0x840748F7Fd3EA956E5f4c88001da5CC1ABCBc038'.toLowerCase() - const cUsdcVaultAddress = '0xf201fFeA8447AB3d43c98Da3349e0749813C9009'.toLowerCase() + const cUsdtVaultAddress = '0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase() + const cUsdcVaultAddress = '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase() /* diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 46c5d69280..90a34a56e2 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1178,12 +1178,18 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.startBlock()).to.equal((await getLatestBlockNumber()) + 1) const tradeLen = (await trade.endBlock()).sub(await trade.startBlock()) expect(await trade.endTime()).to.equal( - tradeLen.mul(12).add(await getLatestBlockTimestamp()) + tradeLen + .add(1) + .mul(12) + .add(await getLatestBlockTimestamp()) ) expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) - expect(await trade.worstPrice()).to.equal(prices.sellLow.mul(fp('1')).div(prices.buyHigh)) + const worstPrice = prices.sellLow + .mul(fp('1').sub(await backingManager.maxTradeSlippage())) + .div(prices.buyHigh) + expect(await trade.worstPrice()).to.equal(worstPrice) expect(await trade.canSettle()).to.equal(false) // Attempt to initialize again diff --git a/test/Deployer.test.ts b/test/Deployer.test.ts index e46f5adfca..39a2ecf8de 100644 --- a/test/Deployer.test.ts +++ b/test/Deployer.test.ts @@ -373,7 +373,9 @@ describe(`DeployerP${IMPLEMENTATION} contract #fast`, () => { rToken.address, bn('1e27') ) - await deployer.deployRTokenAsset(rToken.address, bn('1e27')) // fp('1e9') + await expect(deployer.deployRTokenAsset(rToken.address, bn('1e27'))) + .to.emit(deployer, 'RTokenAssetCreated') + .withArgs(rToken.address, newRTokenAssetAddr) // fp('1e9') const newRTokenAsset = await ethers.getContractAt('RTokenAsset', newRTokenAssetAddr) expect(await newRTokenAsset.maxTradeVolume()).to.equal(bn('1e27')) // fp('1e9') }) diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 2618e777da..97210ce749 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -688,6 +688,9 @@ describe('FacadeWrite contract', () => { timelock = ( await ethers.getContractAt('TimelockController', timelockAddr) ) + expect(await timelock.hasRole(await timelock.EXECUTOR_ROLE(), governor.address)).to.equal( + true + ) }) it('Should setup owner, freezer and pauser correctly', async () => { @@ -773,6 +776,9 @@ describe('FacadeWrite contract', () => { timelock = ( await ethers.getContractAt('TimelockController', timelockAddr) ) + expect(await timelock.hasRole(await timelock.EXECUTOR_ROLE(), governor.address)).to.equal( + true + ) }) it('Should setup owner, freezer and pauser correctly', async () => { diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 0247d8040f..83dffb413a 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -104,8 +104,8 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Setup Governor as only proposer await timelock.grantRole(proposerRole, governor.address) - // Setup anyone as executor - await timelock.grantRole(executorRole, ZERO_ADDRESS) + // Setup Governor as only executor + await timelock.grantRole(executorRole, governor.address) // Setup guardian as canceller await timelock.grantRole(cancellerRole, guardian.address) @@ -504,6 +504,23 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await advanceTime(MIN_DELAY + 1) await advanceBlocks(1) + // Regression test -- Should fail to execute from random EOA + await expect( + timelock + .connect(addr3) + .executeBatch( + [backingManager.address], + [0], + [encodedFunctionCall], + '0x0000000000000000000000000000000000000000000000000000000000000000', + proposalDescHash + ) + ).to.be.revertedWith( + 'AccessControl: account ' + + addr3.address.toLowerCase() + + ' is missing role 0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63' // executor role + ) + // Execute await governor .connect(addr1) diff --git a/test/Main.test.ts b/test/Main.test.ts index 7556200088..2871945e37 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2904,6 +2904,35 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(highPrice).to.equal(MAX_UINT192) }) + it('Should distinguish between price/lotPrice', async () => { + // Set basket with single collateral + await basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await basketHandler.refreshBasket() + + await collateral0.refresh() + const [low, high] = await collateral0.price() + await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // oracle error + + // lotPrice() should begin at 100% + let [lowPrice, highPrice] = await basketHandler.price() + let [lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() + expect(lowPrice).to.equal(0) + expect(highPrice).to.equal(MAX_UINT192) + expect(lotLowPrice).to.be.eq(low) + expect(lotHighPrice).to.be.eq(high) + + // Advance time past 100% period -- lotPrice() should begin to fall + await advanceTime(await collateral0.oracleTimeout()) + ;[lowPrice, highPrice] = await basketHandler.price() + ;[lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() + expect(lowPrice).to.equal(0) + expect(highPrice).to.equal(MAX_UINT192) + expect(lotLowPrice).to.be.closeTo(low, low.div(bn('1e5'))) // small decay expected + expect(lotLowPrice).to.be.lt(low) + expect(lotHighPrice).to.be.closeTo(high, high.div(bn('1e5'))) // small decay expected + expect(lotHighPrice).to.be.lt(high) + }) + it('Should disable basket on asset deregistration + return quantities correctly', async () => { // Check values expect(await facadeTest.wholeBasketsHeldBy(rToken.address, addr1.address)).to.equal( diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index f55c9f619e..229960812c 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -153,6 +153,8 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + // Recharge throttle + await advanceTime(3600) await advanceTime(await basketHandler.warmupPeriod()) // ==== Issue the "initial" rtoken supply to owner diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 6fc7a8ec71..3dbabd518a 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1050,6 +1050,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { minBuyAmtRToken.div(bn('1e15')) ) }) + it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { + const minTrade = bn('1e18') it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { const minTrade = bn('1e18') diff --git a/test/ZTradingExtremes.test.ts b/test/ZTradingExtremes.test.ts index 77ca05227d..de63aea75b 100644 --- a/test/ZTradingExtremes.test.ts +++ b/test/ZTradingExtremes.test.ts @@ -342,6 +342,8 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, const noThrottle = { amtRate: MAX_THROTTLE_AMT_RATE, pctRate: 0 } await rToken.setIssuanceThrottleParams(noThrottle) await rToken.setRedemptionThrottleParams(noThrottle) + // Recharge throttle + await advanceTime(3600) await rToken.connect(addr1).issue(rTokenSupply) expect(await rToken.balanceOf(addr1.address)).to.equal(rTokenSupply) diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index a4980f89e4..fc823d852b 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -1,12 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `259526`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `251984`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `374517`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `361087`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `376632`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `363202`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `378770`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `365340`; exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index ce8f9fa1c2..848354f559 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,7 +1,7 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8314897`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8393668`; -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464235`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Without governance 1`] = `114895`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 160af5632c..06ba9d68c7 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357566`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357705`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `195889`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167023`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167045`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80532`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70022`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70044`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index a893a4a2dc..f50430c9b4 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787379`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787453`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614383`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614457`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589091`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589230`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index c03809a471..9e0d532f8e 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1375510`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1384418`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1511188`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1510705`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `747257`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `747331`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1664434`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1680908`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1606646`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1613640`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1695120`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1702037`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index f4c0f2c10c..81fa8bb746 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -12,16 +12,16 @@ exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1030919`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1008567`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `773978`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `773918`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1180719`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1181227`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739778`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739718`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index c2e974d064..dbc65bb91d 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -2,7 +2,7 @@ exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; -exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; +exports[`StRSRP1 contract Gas Reporting Stake 2`] = `151759`; exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63409`; @@ -14,6 +14,6 @@ exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `571937`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `572011`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `525941`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `526015`; diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index a10b4ce63d..55c2eaa66f 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -336,6 +336,12 @@ describe('Assets contracts #fast', () => { config.minTradeVolume.mul((await assetRegistry.erc20s()).length) ) expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) + + // Should have lot price, equal to price when feed works OK + const [lowPrice, highPrice] = await rTokenAsset.price() + const [lotLow, lotHigh] = await rTokenAsset.lotPrice() + expect(lotLow).to.equal(lowPrice) + expect(lotHigh).to.equal(highPrice) }) it('Should calculate trade min correctly', async () => { diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index d62e3f7c53..a4da2cd3e1 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -1660,6 +1660,38 @@ describe('Collateral contracts', () => { expect(newHigh).to.equal(currHigh) }) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cNonFiatTokenVault.exchangeRateStored() + const [currLow, currHigh] = await cTokenNonFiatCollateral.price() + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenNonFiatCollateral.refresh()) + .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenNonFiatCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { const invalidChainlinkFeed: InvalidMockV3Aggregator = ( await InvalidMockV3AggregatorFactory.deploy(8, bn('1e8')) @@ -2081,6 +2113,38 @@ describe('Collateral contracts', () => { expect(newHigh).to.equal(currHigh) }) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cSelfRefToken.exchangeRateStored() + const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenSelfReferentialCollateral.refresh()) + .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { const invalidChainlinkFeed: InvalidMockV3Aggregator = ( await InvalidMockV3AggregatorFactory.deploy(8, bn('1e8')) diff --git a/test/plugins/__snapshots__/Asset.test.ts.snap b/test/plugins/__snapshots__/Asset.test.ts.snap index 2889fd482e..bc2103db48 100644 --- a/test/plugins/__snapshots__/Asset.test.ts.snap +++ b/test/plugins/__snapshots__/Asset.test.ts.snap @@ -8,6 +8,6 @@ exports[`Assets contracts #fast Gas Reporting refresh() refresh() after oracle t exports[`Assets contracts #fast Gas Reporting refresh() refresh() after oracle timeout 2`] = `38605`; -exports[`Assets contracts #fast Gas Reporting refresh() refresh() during SOUND 1`] = `51027`; +exports[`Assets contracts #fast Gas Reporting refresh() refresh() during SOUND 1`] = `51050`; -exports[`Assets contracts #fast Gas Reporting refresh() refresh() during SOUND 2`] = `51027`; +exports[`Assets contracts #fast Gas Reporting refresh() refresh() during SOUND 2`] = `51050`; diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index 399bd37b97..83c6bf2eb6 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,23 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting refresh() after full price timeout 1`] = `46228`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71881`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71836`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75163`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75118`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `61571`; -exports[`Collateral contracts Gas Reporting refresh() after oracle timeout 1`] = `46228`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 2`] = `54303`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `61548`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 3`] = `54021`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 2`] = `54280`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 4`] = `53962`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 3`] = `53998`; +exports[`Collateral contracts Gas Reporting refresh() during + after soft default 5`] = `54021`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 4`] = `53939`; +exports[`Collateral contracts Gas Reporting refresh() during SOUND 1`] = `54021`; -exports[`Collateral contracts Gas Reporting refresh() during + after soft default 5`] = `53998`; - -exports[`Collateral contracts Gas Reporting refresh() during SOUND 1`] = `53998`; - -exports[`Collateral contracts Gas Reporting refresh() during SOUND 2`] = `53998`; +exports[`Collateral contracts Gas Reporting refresh() during SOUND 2`] = `54021`; diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts new file mode 100644 index 0000000000..cb7876809f --- /dev/null +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -0,0 +1,219 @@ +import collateralTests from '../collateralTests' +import { CollateralFixtureContext, MintCollateralFunc } from '../pluginTestTypes' +import { ethers } from 'hardhat' +import { BigNumberish, BigNumber } from 'ethers' +import { + TestICollateral, + AaveV3FiatCollateral__factory, + IERC20Metadata, + MockStaticATokenV3LM, +} from '@typechain/index' +import { bn, fp } from '#/common/numbers' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { noop } from 'lodash' +import { PRICE_TIMEOUT } from '#/test/fixtures' +import { networkConfig } from '#/common/configuration' +import { getResetFork } from '../helpers' +import { whileImpersonating } from '#/test/utils/impersonation' +import { AAVE_V3_USDC_POOL, AAVE_V3_INCENTIVES_CONTROLLER } from './constants' + +interface AaveV3FiatCollateralFixtureContext extends CollateralFixtureContext { + staticWrapper: MockStaticATokenV3LM + baseToken: IERC20Metadata +} + +/* + Define deployment functions +*/ + +type CollateralParams = Parameters[0] & { + revenueHiding?: BigNumberish +} + +// This defines options for the Aave V3 USDC Market +export const defaultCollateralOpts: CollateralParams = { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[1].chainlinkFeeds.USDC!, + oracleError: fp('0.0025'), + erc20: '', // to be set + maxTradeVolume: fp('1e6'), + oracleTimeout: bn('86400'), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125'), + delayUntilDefault: bn('86400'), +} + +export const deployCollateral = async (opts: Partial = {}) => { + const combinedOpts = { ...defaultCollateralOpts, ...opts } + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + + if (!combinedOpts.erc20 || combinedOpts.erc20 === '') { + const V3LMFactory = await ethers.getContractFactory('MockStaticATokenV3LM') + const staticWrapper = await V3LMFactory.deploy(AAVE_V3_USDC_POOL, AAVE_V3_INCENTIVES_CONTROLLER) + await staticWrapper.deployed() + await staticWrapper.initialize( + networkConfig[1].tokens.aEthUSDC!, + 'Static Aave Ethereum USDC', + 'saEthUSDC' + ) + + combinedOpts.erc20 = staticWrapper.address + } + + const collateral = await CollateralFactory.deploy( + combinedOpts, + opts.revenueHiding ?? fp('0'), // change this to test with revenueHiding + { + gasLimit: 30000000, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + // our tools really suck don't they + return collateral as unknown as TestICollateral +} + +type Fixture = () => Promise + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts = {} +): Fixture => { + const collateralOpts = { ...defaultCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await deployCollateral({ + ...collateralOpts, + chainlinkFeed: chainlinkFeed.address, + }) + + const staticWrapper = await ethers.getContractAt( + 'MockStaticATokenV3LM', + await collateral.erc20() + ) + + return { + collateral, + staticWrapper, + chainlinkFeed, + tok: await ethers.getContractAt('IERC20Metadata', await collateral.erc20()), + baseToken: await ethers.getContractAt('IERC20Metadata', await staticWrapper.asset()), + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCollateralFunc = async ( + ctx: AaveV3FiatCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + const requiredCollat = await ctx.staticWrapper.previewMint(amount) + + // USDC Richie Rich + await whileImpersonating('0x0A59649758aa4d66E25f08Dd01271e891fe52199', async (signer) => { + await ctx.baseToken + .connect(signer) + .approve(ctx.staticWrapper.address, ethers.constants.MaxUint256) + await ctx.staticWrapper + .connect(signer) + ['deposit(uint256,address,uint16,bool)'](requiredCollat, recipient, 0, true) + }) +} + +const modifyRefPerTok = async (ctx: AaveV3FiatCollateralFixtureContext, changeFactor = 100) => { + const staticWrapper = ctx.staticWrapper + const currentRate = await staticWrapper.rate() + + await staticWrapper.mockSetCustomRate(currentRate.mul(changeFactor).div(100)) +} + +const reduceRefPerTok = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + await modifyRefPerTok(ctx, 100 - Number(pctDecrease.toString())) +} + +const increaseRefPerTok = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + await modifyRefPerTok(ctx, 100 + Number(pctIncrease.toString())) +} + +const getExpectedPrice = async (ctx: AaveV3FiatCollateralFixtureContext): Promise => { + const initRefPerTok = await ctx.collateral.refPerTok() + const decimals = await ctx.chainlinkFeed.decimals() + + const initData = await ctx.chainlinkFeed.latestRoundData() + return initData.answer + .mul(bn(10).pow(18 - decimals)) + .mul(initRefPerTok) + .div(fp('1')) +} + +const reduceTargetPerRef = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +const increaseTargetPerRef = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +/* + Run the test suite +*/ + +export const stableOpts = { + deployCollateral, + collateralSpecificConstructorTests: noop, + collateralSpecificStatusTests: noop, + beforeEachRewardsTest: noop, + makeCollateralFixtureContext, + mintCollateralTo, + reduceRefPerTok, + increaseRefPerTok, + resetFork: getResetFork(18000000), + collateralName: 'Aave V3 Fiat Collateral (USDC)', + reduceTargetPerRef, + increaseTargetPerRef, + itClaimsRewards: it.skip, // untested: very complicated to get Aave to handout rewards, and none are live currently. + // The StaticATokenV3LM contract is formally verified and the function we added for claimRewards() is pretty obviously correct. + itChecksTargetPerRefDefault: it, + itChecksRefPerTokDefault: it, + itHasRevenueHiding: it, + itIsPricedByPeg: true, + chainlinkDefaultAnswer: 1e8, + itChecksPriceChanges: it, + getExpectedPrice, + toleranceDivisor: bn('1e9'), // 1e15 adjusted for ((x + 1)/x) timestamp precision +} + +collateralTests(stableOpts) diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap new file mode 100644 index 0000000000..607d7bd001 --- /dev/null +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69299`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67631`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72125`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64443`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69299`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67631`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `67290`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `67290`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87706`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87706`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89730`; + +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87988`; diff --git a/test/plugins/individual-collateral/aave-v3/constants.ts b/test/plugins/individual-collateral/aave-v3/constants.ts new file mode 100644 index 0000000000..37e6c70f75 --- /dev/null +++ b/test/plugins/individual-collateral/aave-v3/constants.ts @@ -0,0 +1,2 @@ +export const AAVE_V3_USDC_POOL = '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2' +export const AAVE_V3_INCENTIVES_CONTROLLER = '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb' diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 9b578e0fa7..79711c5fe3 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74354`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74365`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72686`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72697`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72915`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72960`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65233`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65278`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74354`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74365`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72686`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72697`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91124`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91095`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91050`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91095`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92188`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92307`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92262`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92233`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127259`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127304`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91465`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91510`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index aeb5818f7b..37480626fe 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60326`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60337`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55857`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55868`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99345`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99413`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91662`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91730`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60326`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60337`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55857`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55868`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55516`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55527`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55516`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55527`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91589`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91657`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91589`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91657`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99140`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99208`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91871`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91939`; diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 47ca9b8da1..2dc585a5b8 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -20,13 +20,13 @@ import { ethers } from 'hardhat' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { MockV3Aggregator } from '@typechain/MockV3Aggregator' -import { CBEth, ERC20Mock, MockV3Aggregator__factory } from '@typechain/index' +import { ICBEth, ERC20Mock, MockV3Aggregator__factory } from '@typechain/index' import { mintCBETH, resetFork } from './helpers' import { whileImpersonating } from '#/utils/impersonation' import hre from 'hardhat' interface CbEthCollateralFixtureContext extends CollateralFixtureContext { - cbETH: CBEth + cbETH: ICBEth targetPerTokChainlinkFeed: MockV3Aggregator } @@ -97,7 +97,7 @@ const makeCollateralFixtureContext = ( collateralOpts.targetPerTokChainlinkFeed = targetPerTokChainlinkFeed.address collateralOpts.targetPerTokChainlinkTimeout = ORACLE_TIMEOUT - const cbETH = (await ethers.getContractAt('CBEth', CB_ETH)) as unknown as CBEth + const cbETH = (await ethers.getContractAt('ICBEth', CB_ETH)) as unknown as ICBEth const collateral = await deployCollateral(collateralOpts) return { diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts new file mode 100644 index 0000000000..489f89d3df --- /dev/null +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -0,0 +1,287 @@ +import collateralTests from '../collateralTests' +import { CollateralFixtureContext, CollateralOpts, MintCollateralFunc } from '../pluginTestTypes' +import { + CBETH_ETH_PRICE_FEED_BASE, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, + CBETH_ETH_EXCHANGE_RATE_FEED_BASE, + FORK_BLOCK_BASE, + CB_ETH_BASE, + ETH_USD_PRICE_FEED_BASE, +} from './constants' +import { BigNumber, BigNumberish, ContractFactory } from 'ethers' +import { bn, fp } from '#/common/numbers' +import { TestICollateral } from '@typechain/TestICollateral' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { MockV3Aggregator } from '@typechain/MockV3Aggregator' +import { ICBEth, CBEthCollateralL2, ERC20Mock, MockV3Aggregator__factory } from '@typechain/index' +import { mintCBETHBase } from './helpers' +import { pushOracleForward } from '../../../utils/oracles' +import { getResetFork } from '../helpers' + +interface CbEthCollateralL2FixtureContext extends CollateralFixtureContext { + cbETH: ICBEth + targetPerTokChainlinkFeed: MockV3Aggregator + exchangeRateChainlinkFeed: MockV3Aggregator +} + +interface CbEthCollateralL2Opts extends CollateralOpts { + targetPerTokChainlinkFeed?: string + targetPerTokChainlinkTimeout?: BigNumberish + exchangeRateChainlinkFeed?: string + exchangeRateChainlinkTimeout?: BigNumberish +} + +export const deployCollateral = async ( + opts: CbEthCollateralL2Opts = {} +): Promise => { + opts = { ...defaultCBEthCollateralL2Opts, ...opts } + + const CBETHCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'CBEthCollateralL2' + ) + + const collateral = await CBETHCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + opts.targetPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED_BASE, + opts.targetPerTokChainlinkTimeout ?? ORACLE_TIMEOUT, + opts.exchangeRateChainlinkFeed ?? CBETH_ETH_EXCHANGE_RATE_FEED_BASE, + opts.exchangeRateChainlinkTimeout ?? ORACLE_TIMEOUT, + { gasLimit: 2000000000 } + ) + await collateral.deployed() + + await pushOracleForward(opts.chainlinkFeed!) + await pushOracleForward(opts.targetPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED_BASE) + await pushOracleForward(opts.exchangeRateChainlinkFeed ?? CBETH_ETH_EXCHANGE_RATE_FEED_BASE) + + await expect(collateral.refresh()) + + return collateral +} + +const chainlinkDefaultAnswer = bn('1600e8') +const targetPerTokChainlinkDefaultAnswer = bn('1e18') +const exchangeRateChainlinkFeedDefaultAnswer = bn('1e18') + +type Fixture = () => Promise + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CbEthCollateralL2Opts = {} +): Fixture => { + const collateralOpts = { ...defaultCBEthCollateralL2Opts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, chainlinkDefaultAnswer) + ) + collateralOpts.chainlinkFeed = chainlinkFeed.address + + const targetPerTokChainlinkFeed = ( + await MockV3AggregatorFactory.deploy(18, targetPerTokChainlinkDefaultAnswer) + ) + collateralOpts.targetPerTokChainlinkFeed = targetPerTokChainlinkFeed.address + collateralOpts.targetPerTokChainlinkTimeout = ORACLE_TIMEOUT + + const exchangeRateChainlinkFeed = ( + await MockV3AggregatorFactory.deploy(18, exchangeRateChainlinkFeedDefaultAnswer) + ) + collateralOpts.exchangeRateChainlinkFeed = exchangeRateChainlinkFeed.address + collateralOpts.exchangeRateChainlinkTimeout = ORACLE_TIMEOUT + + const cbETH = (await ethers.getContractAt('ICBEth', CB_ETH_BASE)) as unknown as ICBEth + const collateral = await deployCollateral(collateralOpts) + + return { + alice, + collateral, + chainlinkFeed, + targetPerTokChainlinkFeed, + exchangeRateChainlinkFeed, + cbETH, + tok: cbETH as unknown as ERC20Mock, + } + } + + return makeCollateralFixtureContext +} +/* + Define helper functions +*/ + +const mintCollateralTo: MintCollateralFunc = async ( + ctx: CbEthCollateralL2FixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintCBETHBase(amount, recipient) +} + +const changeTargetPerRef = async ( + ctx: CbEthCollateralL2FixtureContext, + percentChange: BigNumber +) => { + const lastRound = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await ctx.targetPerTokChainlinkFeed.updateAnswer(nextAnswer) +} + +const reduceTargetPerRef = async ( + ctx: CbEthCollateralL2FixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) +} + +const increaseTargetPerRef = async ( + ctx: CbEthCollateralL2FixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease)) +} + +const changeRefPerTok = async (ctx: CbEthCollateralL2FixtureContext, percentChange: BigNumber) => { + const collateral = ctx.collateral as unknown as CBEthCollateralL2 + const exchangeRateOracle = await ethers.getContractAt( + 'MockV3Aggregator', + await collateral.exchangeRateChainlinkFeed() + ) + const lastRound = await exchangeRateOracle.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(percentChange).div(100)) + await exchangeRateOracle.updateAnswer(nextAnswer) + + const targetPerTokOracle = await ethers.getContractAt( + 'MockV3Aggregator', + await collateral.targetPerTokChainlinkFeed() + ) + const lastRoundtpt = await targetPerTokOracle.latestRoundData() + const nextAnswertpt = lastRoundtpt.answer.add(lastRoundtpt.answer.mul(percentChange).div(100)) + await targetPerTokOracle.updateAnswer(nextAnswertpt) +} + +const reduceRefPerTok = async (ctx: CbEthCollateralL2FixtureContext, pctDecrease: BigNumberish) => { + await changeRefPerTok(ctx, bn(pctDecrease).mul(-1)) +} + +const increaseRefPerTok = async ( + ctx: CbEthCollateralL2FixtureContext, + pctIncrease: BigNumberish +) => { + await changeRefPerTok(ctx, bn(pctIncrease)) +} +const getExpectedPrice = async (ctx: CbEthCollateralL2FixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() + + const clRptData = await ctx.targetPerTokChainlinkFeed.latestRoundData() + const clRptDecimals = await ctx.targetPerTokChainlinkFeed.decimals() + + return clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) + .div(fp('1')) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => { + it('does not allow missing targetPerTok chainlink feed', async () => { + await expect( + deployCollateral({ targetPerTokChainlinkFeed: ethers.constants.AddressZero }) + ).to.be.revertedWith('missing targetPerTok feed') + }) + + it('does not allow targetPerTok oracle timeout at 0', async () => { + await expect(deployCollateral({ targetPerTokChainlinkTimeout: 0 })).to.be.revertedWith( + 'targetPerTokChainlinkTimeout zero' + ) + }) + + it('does not allow missing exchangeRate chainlink feed', async () => { + await expect( + deployCollateral({ exchangeRateChainlinkFeed: ethers.constants.AddressZero }) + ).to.be.revertedWith('missing exchangeRate feed') + }) + + it('does not allow exchangeRate oracle timeout at 0', async () => { + await expect(deployCollateral({ exchangeRateChainlinkTimeout: 0 })).to.be.revertedWith( + 'exchangeRateChainlinkTimeout zero' + ) + }) +} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => {} +// eslint-disable-next-line @typescript-eslint/no-empty-function +const beforeEachRewardsTest = async () => {} + +export const defaultCBEthCollateralL2Opts: CollateralOpts = { + erc20: CB_ETH_BASE, + targetName: ethers.utils.formatBytes32String('ETH'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ETH_USD_PRICE_FEED_BASE, + oracleTimeout: ORACLE_TIMEOUT, + oracleError: ORACLE_ERROR, + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: fp('0'), +} + +export const resetFork = getResetFork(FORK_BLOCK_BASE) + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itHasRevenueHiding: it, + resetFork, + collateralName: 'CBEthCollateralL2', + chainlinkDefaultAnswer, + itIsPricedByPeg: true, + targetNetwork: 'base', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index 73e13d7e26..bf09f1f35e 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59813`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59824`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55344`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55355`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98249`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98317`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90566`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90634`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59813`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59824`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55344`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55355`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55003`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55014`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55003`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55014`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90563`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90631`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90563`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90631`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98114`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98182`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90845`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90913`; diff --git a/test/plugins/individual-collateral/cbeth/constants.ts b/test/plugins/individual-collateral/cbeth/constants.ts index 887a8db617..19324775f7 100644 --- a/test/plugins/individual-collateral/cbeth/constants.ts +++ b/test/plugins/individual-collateral/cbeth/constants.ts @@ -9,6 +9,14 @@ export const WETH = networkConfig['31337'].tokens.WETH as string export const CB_ETH_MINTER = '0xd0F73E06E7b88c8e1da291bB744c4eEBAf9Af59f' export const CB_ETH_ORACLE = '0x9b37180d847B27ADC13C2277299045C1237Ae281' +export const ETH_USD_PRICE_FEED_BASE = networkConfig['8453'].chainlinkFeeds.ETH as string +export const CBETH_ETH_PRICE_FEED_BASE = networkConfig['8453'].chainlinkFeeds.cbETH as string +export const CB_ETH_BASE = networkConfig['8453'].tokens.cbETH as string +export const WETH_BASE = networkConfig['8453'].tokens.WETH as string +export const CBETH_ETH_EXCHANGE_RATE_FEED_BASE = networkConfig['8453'].chainlinkFeeds + .cbETHETHexr as string +export const CB_ETH_MINTER_BASE = '0x4200000000000000000000000000000000000010' + export const PRICE_TIMEOUT = bn('604800') // 1 week export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds export const ORACLE_ERROR = fp('0.005') @@ -17,3 +25,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000) export const FORK_BLOCK = 17479312 +export const FORK_BLOCK_BASE = 4446300 diff --git a/test/plugins/individual-collateral/cbeth/helpers.ts b/test/plugins/individual-collateral/cbeth/helpers.ts index 0b90ef4285..0658af4971 100644 --- a/test/plugins/individual-collateral/cbeth/helpers.ts +++ b/test/plugins/individual-collateral/cbeth/helpers.ts @@ -1,17 +1,25 @@ import { ethers } from 'hardhat' -import { CBEth } from '../../../../typechain' +import { ICBEth } from '../../../../typechain' import { BigNumberish } from 'ethers' -import { CB_ETH_MINTER, CB_ETH, FORK_BLOCK } from './constants' +import { CB_ETH, CB_ETH_BASE, CB_ETH_MINTER, CB_ETH_MINTER_BASE, FORK_BLOCK } from './constants' import { getResetFork } from '../helpers' import { whileImpersonating } from '#/utils/impersonation' import hre from 'hardhat' export const resetFork = getResetFork(FORK_BLOCK) export const mintCBETH = async (amount: BigNumberish, recipient: string) => { - const cbETH: CBEth = await ethers.getContractAt('CBEth', CB_ETH) + const cbETH: ICBEth = await ethers.getContractAt('ICBEth', CB_ETH) await whileImpersonating(hre, CB_ETH_MINTER, async (minter) => { await cbETH.connect(minter).configureMinter(CB_ETH_MINTER, amount) await cbETH.connect(minter).mint(recipient, amount) }) } + +export const mintCBETHBase = async (amount: BigNumberish, recipient: string) => { + const cbETH: ICBEth = await ethers.getContractAt('ICBEth', CB_ETH_BASE) + + await whileImpersonating(hre, CB_ETH_MINTER_BASE, async (minter) => { + await cbETH.connect(minter).mint(recipient, amount) + }) +} diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 7be0cd4520..c174f8f143 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -34,7 +34,10 @@ import { import snapshotGasCost from '../../utils/snapshotGasCost' import { IMPLEMENTATION, Implementation } from '../../fixtures' -const describeFork = useEnv('FORK') ? describe : describe.skip +// const describeFork = useEnv('FORK') ? describe : describe.skip +const getDescribeFork = (targetNetwork = 'mainnet') => { + return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip +} const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip @@ -63,9 +66,11 @@ export default function fn( resetFork, collateralName, chainlinkDefaultAnswer, + toleranceDivisor, + targetNetwork, } = fixtures - describeFork(`Collateral: ${collateralName}`, () => { + getDescribeFork(targetNetwork)(`Collateral: ${collateralName}`, () => { before(resetFork) describe('constructor validation', () => { @@ -191,7 +196,7 @@ export default function fn( itChecksPriceChanges('prices change as USD feed price changes', async () => { const oracleError = await collateral.oracleError() const expectedPrice = await getExpectedPrice(ctx) - await expectPrice(collateral.address, expectedPrice, oracleError, true) + await expectPrice(collateral.address, expectedPrice, oracleError, true, toleranceDivisor) // Update values in Oracles increase by 10-20% const newPrice = BigNumber.from(chainlinkDefaultAnswer).mul(11).div(10) @@ -202,7 +207,13 @@ export default function fn( await collateral.refresh() const newExpectedPrice = await getExpectedPrice(ctx) expect(newExpectedPrice).to.be.gt(expectedPrice) - await expectPrice(collateral.address, newExpectedPrice, oracleError, true) + await expectPrice( + collateral.address, + newExpectedPrice, + oracleError, + true, + toleranceDivisor + ) }) // all our collateral that have targetPerRef feeds use them only for soft default checks @@ -211,7 +222,13 @@ export default function fn( async () => { const oracleError = await collateral.oracleError() const expectedPrice = await getExpectedPrice(ctx) - await expectPrice(collateral.address, expectedPrice, oracleError, true) + await expectPrice( + collateral.address, + expectedPrice, + oracleError, + true, + toleranceDivisor + ) // Get refPerTok initial values const initialRefPerTok = await collateral.refPerTok() @@ -223,13 +240,19 @@ export default function fn( if (itIsPricedByPeg) { // Check new prices -- increase expected const newPrice = await getExpectedPrice(ctx) - await expectPrice(collateral.address, newPrice, oracleError, true) + await expectPrice(collateral.address, newPrice, oracleError, true, toleranceDivisor) const [newLow, newHigh] = await collateral.price() expect(oldLow).to.be.lt(newLow) expect(oldHigh).to.be.lt(newHigh) } else { // Check new prices -- no increase expected - await expectPrice(collateral.address, expectedPrice, oracleError, true) + await expectPrice( + collateral.address, + expectedPrice, + oracleError, + true, + toleranceDivisor + ) const [newLow, newHigh] = await collateral.price() expect(oldLow).to.equal(newLow) expect(oldHigh).to.equal(newHigh) @@ -249,7 +272,7 @@ export default function fn( const [initLow, initHigh] = await collateral.price() const expectedPrice = await getExpectedPrice(ctx) - await expectPrice(collateral.address, expectedPrice, oracleError, true) + await expectPrice(collateral.address, expectedPrice, oracleError, true, toleranceDivisor) // need to deposit in order to get an exchange rate const amount = bn('200').mul(bn(10).pow(await ctx.tok.decimals())) @@ -362,6 +385,8 @@ export default function fn( await advanceTime(await collateral.oracleTimeout()) + await advanceTime(await collateral.oracleTimeout()) + // Should be roughly half, after half of priceTimeout const priceTimeout = await collateral.priceTimeout() await advanceTime(priceTimeout / 2) diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index b30c8694f3..ed6522b5ce 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119336`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119347`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117668`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117679`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76197`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76242`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68515`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68560`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119336`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119347`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117668`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117679`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138736`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138781`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138662`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138707`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139800`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139845`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139800`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139845`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174945`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174990`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139003`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139048`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index fe068917ae..be30eecd44 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109052`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109063`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104315`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104326`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134426`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134471`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126743`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126788`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109052`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109063`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104315`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104326`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107042`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107053`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103974`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103985`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126740`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126785`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126740`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126785`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134291`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134336`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127022`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127067`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index 3d8979d19d..adac76df06 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `80257`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `75789`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `252516`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `247634`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `80257`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `75789`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `75448`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `75448`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `247631`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `247631`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `255209`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247941`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 26d549a418..74b5d0e51d 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `105255`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `100861`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `227702`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222820`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `102235`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `97767`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `97426`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `97426`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `222817`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `222817`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `210256`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202988`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index 9fda0fffcd..d725ca2610 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199422`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194540`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194537`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194537`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181728`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174460`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index ba3e7b7180..09fde97a48 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -9,6 +9,7 @@ import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { ERC20Mock, + IERC20, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -42,6 +43,7 @@ import { CRV, THREE_POOL_HOLDER, } from '../constants' +import { whileImpersonating } from '#/test/utils/impersonation' type Fixture = () => Promise @@ -130,7 +132,7 @@ export const deployMaxTokensCollateral = async ( const maxTokenCollOpts = { ...defaultCvxStableCollateralOpts, ...{ - nTokens: bn('4'), + nTokens: 4, erc20: fix.wrapper.address, curvePool: fix.curvePool.address, lpToken: SUSD_POOL_TOKEN, @@ -244,7 +246,6 @@ const mintCollateralTo: MintCurveCollateralFunc = Define collateral-specific tests */ -// eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificConstructorTests = () => { describe('Handles constructor with 4 tokens (max allowed) - sUSD', () => { let collateral: TestICollateral @@ -359,7 +360,6 @@ const collateralSpecificConstructorTests = () => { }) } -// eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => { it('handles properly multiple price feeds', async () => { const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') @@ -413,6 +413,53 @@ const collateralSpecificStatusTests = () => { const finalRefPerTok = await multiFeedCollateral.refPerTok() expect(finalRefPerTok).to.equal(initialRefPerTok) }) + + it('handles shutdown correctly', async () => { + const fix = await makeW3PoolStable() + const [, alice, bob] = await ethers.getSigners() + const amount = fp('100') + const rewardPerBlock = bn('83197823300') + + const lpToken = ( + await ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', + await fix.wrapper.curveToken() + ) + ) + const CRV = ( + await ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', + '0xD533a949740bb3306d119CC777fa900bA034cd52' + ) + ) + await whileImpersonating(THREE_POOL_HOLDER, async (signer) => { + await lpToken.connect(signer).transfer(alice.address, amount.mul(2)) + }) + + await lpToken.connect(alice).approve(fix.wrapper.address, ethers.constants.MaxUint256) + await fix.wrapper.connect(alice).deposit(amount, alice.address) + + // let's shutdown! + await fix.wrapper.shutdown() + + const prevBalance = await CRV.balanceOf(alice.address) + await fix.wrapper.connect(alice).claimRewards() + expect(await CRV.balanceOf(alice.address)).to.be.eq(prevBalance.add(rewardPerBlock)) + + const prevBalanceBob = await CRV.balanceOf(bob.address) + + // transfer to bob + await fix.wrapper + .connect(alice) + .transfer(bob.address, await fix.wrapper.balanceOf(alice.address)) + + await fix.wrapper.connect(bob).claimRewards() + expect(await CRV.balanceOf(bob.address)).to.be.eq(prevBalanceBob.add(rewardPerBlock)) + + await expect(fix.wrapper.connect(alice).deposit(amount, alice.address)).to.be.reverted + await expect(fix.wrapper.connect(bob).withdraw(await fix.wrapper.balanceOf(bob.address))).to.not + .be.reverted + }) } /* diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 6ccf76eb1a..699536b70f 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `80257`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `75789`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `252516`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `247634`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `80257`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `75789`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `75448`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `75448`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `247631`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `247631`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `255209`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247941`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index dcc8149e3b..34a9b7f027 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `105329`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `100861`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `227702`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222820`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `102235`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `97767`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `97426`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `97426`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `222817`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `222817`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `210256`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202988`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index f28ce6cb13..8b01856f7e 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199422`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194540`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194537`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194537`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181728`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174460`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index 686a2d8f8f..77081254f6 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -11,7 +11,6 @@ import { ERC20Mock, ICurvePool, MockV3Aggregator, - RewardableERC4626Vault, } from '../../../../../typechain' import { getResetFork } from '../../helpers' import { @@ -88,7 +87,7 @@ export const makeW3PoolStable = async (): Promise => usdc, usdt, curvePool, - wrapper: wrapper as unknown as RewardableERC4626Vault, + wrapper: wrapper as unknown as ConvexStakingWrapper, } } @@ -136,7 +135,7 @@ export const makeWSUSDPoolStable = async (): Promise { - const cvxWrapper = ctx.wrapper as ConvexStakingWrapper + const cvxWrapper = ctx.wrapper const lpToken = await ethers.getContractAt( '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', await cvxWrapper.curveToken() diff --git a/test/plugins/individual-collateral/curve/pluginTestTypes.ts b/test/plugins/individual-collateral/curve/pluginTestTypes.ts index 8714a502fd..b4502bf73a 100644 --- a/test/plugins/individual-collateral/curve/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/curve/pluginTestTypes.ts @@ -1,7 +1,6 @@ import { BigNumberish } from 'ethers' import { ConvexStakingWrapper, - CurveGaugeWrapper, CurvePoolMock, ERC20Mock, MockV3Aggregator, @@ -15,7 +14,7 @@ type Fixture = () => Promise export interface CurveBase { curvePool: CurvePoolMock - wrapper: CurveGaugeWrapper | ConvexStakingWrapper + wrapper: ConvexStakingWrapper } // The basic fixture context used in the Curve collateral plugin tests diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index d4baa3fc3f..178c2fa1e9 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116743`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116754`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108431`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108442`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `131238`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `131283`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `123278`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `123323`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `116562`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `116573`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `108431`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `108442`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `111417`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `111428`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108090`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108101`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `123275`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `123320`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `123275`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `123320`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131177`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131148`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `123631`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `123602`; diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index f3f15a53cf..51ab3b2c47 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -4,7 +4,7 @@ import { CollateralFixtureContext, CollateralOpts, MintCollateralFunc } from '.. import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { - CTokenWrapper, + ICToken, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -12,7 +12,6 @@ import { import { pushOracleForward } from '../../../utils/oracles' import { networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' -import { ZERO_ADDRESS } from '../../../../common/constants' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { @@ -173,10 +172,7 @@ all.forEach((curr: FTokenEnumeration) => { collateralOpts.chainlinkFeed = chainlinkFeed.address const collateral = await deployCollateral(collateralOpts) - const erc20 = await ethers.getContractAt( - 'CTokenWrapper', - (await collateral.erc20()) as string - ) // the fToken + const erc20 = await ethers.getContractAt('ICToken', (await collateral.erc20()) as string) // the fToken return { alice, @@ -218,22 +214,18 @@ all.forEach((curr: FTokenEnumeration) => { } const increaseRefPerTok = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { - const tok = ctx.tok as CTokenWrapper - const fToken = await ethers.getContractAt('ICToken', await tok.underlying()) - const totalSupply = await fToken.totalSupply() + const totalSupply = await ctx.tok.totalSupply() await setStorageAt( - fToken.address, + ctx.tok.address, 13, // interesting, the storage slot is 13 for fTokens and 14 for cTokens totalSupply.sub(totalSupply.mul(pctIncrease).div(100)) ) // expand supply by pctDecrease, since it's denominator of exchange rate calculation } const reduceRefPerTok = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { - const tok = ctx.tok as CTokenWrapper - const fToken = await ethers.getContractAt('ICToken', await tok.underlying()) - const totalSupply = await fToken.totalSupply() + const totalSupply = await ctx.tok.totalSupply() await setStorageAt( - fToken.address, + ctx.tok.address, 13, // interesting, the storage slot is 13 for fTokens and 14 for cTokens totalSupply.add(totalSupply.mul(pctDecrease).div(100)) ) // expand supply by pctDecrease, since it's denominator of exchange rate calculation diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index 556dc87aef..35d0ae91c9 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -1,97 +1,97 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117336`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117347`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115668`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115679`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140936`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140981`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139122`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139167`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117336`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117347`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115668`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115679`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115327`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115338`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115327`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115338`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139119`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139164`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139119`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139164`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141069`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141114`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139475`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139520`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117528`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117539`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115860`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115871`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141192`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141237`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139378`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139423`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117528`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117539`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115860`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115871`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115519`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115530`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115519`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115530`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139375`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139420`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139375`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139420`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141325`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141370`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139657`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139702`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125818`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125829`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124150`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124161`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149904`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149949`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148160`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148205`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125818`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125829`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124150`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124161`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123809`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123820`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123809`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123820`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148157`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148202`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148157`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148202`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150037`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150082`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148439`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148484`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120466`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120477`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118798`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118809`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144338`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144383`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142524`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142569`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120466`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120477`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118798`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118809`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118457`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118468`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118457`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118468`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142451`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142496`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142521`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142566`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144401`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144446`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142803`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142848`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index f277b7eed1..04d291e85c 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58984`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58995`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54247`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54258`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59684`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59695`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58015`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58026`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73786`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73831`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73786`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73831`; diff --git a/test/plugins/individual-collateral/helpers.ts b/test/plugins/individual-collateral/helpers.ts index 341d5ee385..721209d081 100644 --- a/test/plugins/individual-collateral/helpers.ts +++ b/test/plugins/individual-collateral/helpers.ts @@ -1,5 +1,6 @@ import hre from 'hardhat' import { useEnv } from '#/utils/env' +import { forkRpcs, Network } from '#/utils/fork' export const getResetFork = (forkBlock: number) => { return async () => { @@ -11,7 +12,7 @@ export const getResetFork = (forkBlock: number) => { params: [ { forking: { - jsonRpcUrl: useEnv('MAINNET_RPC_URL'), + jsonRpcUrl: forkRpcs[(useEnv('FORK_NETWORK') as Network) ?? 'mainnet'], blockNumber: forkBlock, }, }, diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index 99ff840eac..09f0a2c8ad 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88033`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88044`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83564`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83575`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132830`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132898`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125147`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125215`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88033`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88044`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83564`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83575`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83223`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83234`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83223`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83234`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125144`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125212`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125144`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125212`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129895`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129963`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125426`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125494`; diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 36dbf620c2..5d5a91ee51 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -236,6 +236,7 @@ const makeAaveNonFiatCollateralTestSuite = ( itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itIsPricedByPeg: true, resetFork: getResetFork(FORK_BLOCK), collateralName, chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, @@ -252,8 +253,8 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - WBTC', { underlyingToken: configToUse.tokens.WBTC!, poolToken: configToUse.tokens.aWBTC!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.WBTC!, - targetPrRefFeed: configToUse.chainlinkFeeds.wBTCBTC!, + chainlinkFeed: configToUse.chainlinkFeeds.BTC!, + targetPrRefFeed: configToUse.chainlinkFeeds.WBTC!, oracleTimeout: ORACLE_TIMEOUT, oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 4fdabac216..97e0228cdb 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -1,73 +1,73 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134211`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134222`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129742`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129753`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179789`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179834`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172106`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172151`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134211`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134222`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129742`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129753`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129401`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129412`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129401`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129412`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172103`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172148`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172103`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172148`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179654`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179699`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172385`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172430`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134414`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134425`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129945`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129956`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180195`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180240`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172512`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172557`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134414`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134425`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129945`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129956`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129604`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129615`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129604`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129615`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172509`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172554`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172509`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172554`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180060`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180105`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172791`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172836`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133567`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133578`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129098`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129109`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178501`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178546`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170818`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170863`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133567`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133578`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129098`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129109`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128757`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128768`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128757`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128768`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170815`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170860`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170815`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170860`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178366`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178411`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171097`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171142`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index a96dc4d339..2c8af6504a 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -1,49 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133634`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133645`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129165`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129176`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199032`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199843`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `191349`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192160`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182849`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182889`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178380`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178420`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178039`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178079`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178039`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178079`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `191346`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192157`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `191346`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192157`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `196097`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199708`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `191628`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192439`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167266`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167277`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162797`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162808`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `238296`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239107`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `230613`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231424`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222113`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222153`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217644`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217684`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217303`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217343`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217303`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217343`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `230610`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231421`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `230610`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231421`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `235361`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238972`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `230892`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231703`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index 115445294b..8bc1fa5575 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201552`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201563`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197083`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197094`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217740`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217785`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210057`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210102`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201552`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201563`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197083`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197094`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210054`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210099`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210054`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210099`; diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 445a237284..11b73fbaa1 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -111,6 +111,12 @@ export interface CollateralTestSuiteFixtures // the default answer that will come from the chainlink feed after deployment chainlinkDefaultAnswer: BigNumberish + + // the default tolerance divisor that will be used in expectPrice checks + toleranceDivisor?: BigNumber + + // the target network to run the collaterals tests on (only runs if forking this network) + targetNetwork?: string } export enum CollateralStatus { diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index 3673cdefcb..e39347b7d9 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -148,56 +148,6 @@ const makeCollateralFixtureContext = ( return makeCollateralFixtureContext } -// const deployCollateralCometMockContext = async ( -// opts: CometCollateralOpts = {} -// ): Promise => { -// const collateralOpts = { ...defaultCometCollateralOpts, ...opts } - -// const MockV3AggregatorFactory = ( -// await ethers.getContractFactory('MockV3Aggregator') -// ) -// const chainlinkFeed = await MockV3AggregatorFactory.deploy(6, bn('1e6')) -// collateralOpts.chainlinkFeed = chainlinkFeed.address - -// const CometFactory = await ethers.getContractFactory('CometMock') -// const cusdcV3 = await CometFactory.deploy(bn('5e15'), bn('1e15'), CUSDC_V3) - -// const CusdcV3WrapperFactory = ( -// await ethers.getContractFactory('CusdcV3Wrapper') -// ) -// const wcusdcV3 = ( -// await CusdcV3WrapperFactory.deploy(cusdcV3.address, REWARDS, COMP) -// ) -// const CusdcV3WrapperMockFactory = ( -// await ethers.getContractFactory('CusdcV3WrapperMock') -// ) -// const wcusdcV3Mock = await (( -// await CusdcV3WrapperMockFactory.deploy(wcusdcV3.address) -// )) - -// const realMock = (await ethers.getContractAt( -// 'ICusdcV3WrapperMock', -// wcusdcV3Mock.address -// )) as ICusdcV3WrapperMock -// collateralOpts.erc20 = wcusdcV3.address -// collateralOpts.erc20 = realMock.address -// const usdc = await ethers.getContractAt('ERC20Mock', USDC) -// const collateral = await deployCollateral(collateralOpts) - -// const rewardToken = await ethers.getContractAt('ERC20Mock', COMP) - -// return { -// collateral, -// chainlinkFeed, -// cusdcV3, -// wcusdcV3: wcusdcV3Mock, -// wcusdcV3Mock, -// usdc, -// tok: wcusdcV3, -// rewardToken, -// } -// } - /* Define helper functions */ diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap index bd6260705b..4c876c0ecb 100644 --- a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `70876`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `70887`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `66407`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `66418`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `113875`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `113943`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `106192`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `106260`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `70876`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `70887`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `66407`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `66418`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 1`] = `66066`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 1`] = `66077`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 2`] = `66066`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 2`] = `66077`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `106189`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `106257`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `106189`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `106257`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 1`] = `113740`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 1`] = `113808`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 2`] = `106471`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 2`] = `106539`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap index e6a60268e6..3eb6942200 100644 --- a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap @@ -4,9 +4,9 @@ exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting re exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `50795`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `68976`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `68999`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66362`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66385`; exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `55263`; @@ -16,21 +16,21 @@ exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting re exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `50454`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66237`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66260`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66237`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66260`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `73787`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `73810`; -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `66519`; +exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `66542`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `55263`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `50795`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `68976`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `68999`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66362`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66385`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `55263`; @@ -40,10 +40,10 @@ exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting r exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `50454`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66237`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66260`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66237`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66260`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `73787`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `73810`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `66519`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `66542`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 39422b06f6..89a9ca08e6 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12087808`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12092382`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9839121`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9830758`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13612503`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13617164`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20688918`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20897690`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10989496`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10991870`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8723721`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8713158`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6559535`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6561504`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14445209`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15130053`; diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 440acf6d3d..2444878fe4 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -31,7 +31,7 @@ export const expectPrice = async ( const expectedHigh = avgPrice.add(delta) if (near) { - const tolerance = avgPrice.div(overrideToleranceDiv || toleranceDivisor) + const tolerance = avgPrice.div(overrideToleranceDiv ?? toleranceDivisor) expect(lowPrice).to.be.closeTo(expectedLow, tolerance) expect(highPrice).to.be.closeTo(expectedHigh, tolerance) } else { diff --git a/test/utils/trades.ts b/test/utils/trades.ts index 7c7e75d394..b952deabfe 100644 --- a/test/utils/trades.ts +++ b/test/utils/trades.ts @@ -81,7 +81,6 @@ export const dutchBuyAmount = async ( assetInAddr: string, assetOutAddr: string, outAmount: BigNumber, - minTradeVolume: BigNumber, maxTradeSlippage: BigNumber ): Promise => { const assetIn = await ethers.getContractAt('IAsset', assetInAddr) @@ -93,18 +92,7 @@ export const dutchBuyAmount = async ( let maxTradeVolume = await assetOut.maxTradeVolume() if (inMaxTradeVolume.lt(maxTradeVolume)) maxTradeVolume = inMaxTradeVolume - const auctionVolume = outAmount.mul(sellHigh).div(fp('1')) - const slippage1e18 = maxTradeSlippage.mul( - fp('1').sub( - auctionVolume.sub(minTradeVolume).mul(fp('1')).div(maxTradeVolume.sub(minTradeVolume)) - ) - ) - - // Adjust for rounding - const leftover = slippage1e18.mod(fp('1')) - const slippage = slippage1e18.div(fp('1')).add(leftover.gte(fp('0.5')) ? 1 : 0) - - const worstPrice = sellLow.mul(fp('1').sub(slippage)).div(buyHigh) + const worstPrice = sellLow.mul(fp('1').sub(maxTradeSlippage)).div(buyHigh) const bestPrice = divCeil(sellHigh.mul(fp('1')), buyLow) const highPrice = divCeil(sellHigh.mul(fp('1.5')), buyLow) diff --git a/tools/docgen/custom.css b/tools/docgen/custom.css new file mode 100644 index 0000000000..cf3177ffac --- /dev/null +++ b/tools/docgen/custom.css @@ -0,0 +1,116 @@ +:root { + font-size: 62.5%; + --rp-blue: rgb(1, 81, 175); + --rp-offwhite: #F9EDDD; + --rp-black: #000000; + --rp-cream: #F9EDDD; + --white: #ffffff; +} + +html { + font-family: "Arial"; + color: var(--rp-black); + background-color: var(--white); + text-size-adjust: none; + -webkit-text-size-adjust: none; +} + +body { + margin: 0; + font-size: 2rem; + line-height: 1.6; + overflow-x: hidden; + background-color: var(--white); +} + +/* Typography */ +h1 a, h2 a, h3 a, body h4, body header { + color: var(--rp-blue) !important; +} + +.menu-title { + color: var(--rp-black); + opacity: 70%; + font-size: larger; + font-family: "Open Sans"; +} + +.chapter li a.active { + font-weight: bold; + color: var(--rp-cream); +} + +/* Table Styles */ +table thead { + background-color: var(--rp-blue) !important; +} + +table tbody tr { + background-color: var(--rp-cream) !important; +} + +tr th { + color: var(--rp-offwhite); +} + +/* Blockquote Style */ +blockquote { + margin: 20px 0; + padding: 0 20px; + color: var(--rp-black); + background-color: var(--rp-cream); + border-top: 0.1em solid var(--rp-blue); + border-bottom: 0.1em solid var(--rp-blue); +} + +/* Code Style */ +code.hljs { + background-color: var(--rp-offwhite); + color: var(--rp-blue) !important; +} + +/* Form Styles */ +textarea { + background-color: var(--white); + color: var(--rp-black); +} + +#searchbar { + background-color: var(--rp-cream); +} + +#searchbar:focus { + box-shadow: 0 0 2px var(--rp-blue); +} + +#searchbar:focus-visible { + outline: var(--rp-blue) solid 0.5px; + outline-offset: 0px; +} + +/* Navigation Styles */ +#menu-bar { + background-color: var(--rp-offwhite); + border: none; +} + +.nav-chapters:hover, .mobile-nav-chapters { + background-color: var(--rp-offwhite) !important; +} + +.chapter-item { + font-size: larger; +} + +.sidebar-scrollbox, .fa-copy:hover { + background-color: var(--rp-blue) !important; +} + +/* Icon Styles */ +.fa-copy { + background-color: var(--rp-cream) !important; +} + +i.fa-paint-brush { + display: none !important; +} \ No newline at end of file diff --git a/tools/docgen/foundry.toml b/tools/docgen/foundry.toml new file mode 100644 index 0000000000..91664f1de0 --- /dev/null +++ b/tools/docgen/foundry.toml @@ -0,0 +1,7 @@ +[profile.default] +src="tools/docgen" + +[doc] +out = "tools/docgen" +book = "tools/docgen" +ignore = ["**/node_modules/**/*"] \ No newline at end of file diff --git a/utils/env.ts b/utils/env.ts index 9f07c74e1b..0944189851 100644 --- a/utils/env.ts +++ b/utils/env.ts @@ -14,7 +14,6 @@ type IEnvVars = | 'PROTO_IMPL' | 'ETHERSCAN_API_KEY' | 'NO_OPT' - | 'MAINNET_BLOCK' | 'ONLY_FAST' | 'JOBS' | 'EXTREME' @@ -22,6 +21,9 @@ type IEnvVars = | 'TENDERLY_RPC_URL' | 'SKIP_PROMPT' | 'BASE_GOERLI_RPC_URL' + | 'BASE_RPC_URL' + | 'FORK_NETWORK' + | 'FORK_BLOCK' export function useEnv(key: IEnvVars | IEnvVars[], _default = ''): string { if (typeof key === 'string') { diff --git a/utils/fork.ts b/utils/fork.ts new file mode 100644 index 0000000000..6749b5054d --- /dev/null +++ b/utils/fork.ts @@ -0,0 +1,12 @@ +import { useEnv } from './env' + +const MAINNET_RPC_URL = useEnv(['MAINNET_RPC_URL', 'ALCHEMY_MAINNET_RPC_URL']) +const TENDERLY_RPC_URL = useEnv('TENDERLY_RPC_URL') +const GOERLI_RPC_URL = useEnv('GOERLI_RPC_URL') +const BASE_GOERLI_RPC_URL = useEnv('BASE_GOERLI_RPC_URL') +const BASE_RPC_URL = useEnv('BASE_RPC_URL') +export type Network = 'mainnet' | 'base' +export const forkRpcs = { + mainnet: MAINNET_RPC_URL, + base: BASE_RPC_URL, +} diff --git a/yarn.lock b/yarn.lock index cd38842265..7b7e7a4873 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,6 +12,22 @@ __metadata: languageName: node linkType: hard +"@aave/core-v3@npm:1.19.0, @aave/core-v3@npm:^1.18.0": + version: 1.19.0 + resolution: "@aave/core-v3@npm:1.19.0" + checksum: 42470788f81e85945c4722d6578add6d4ba0070faabb322e1d2db038c2bf637177feefe86af9bb4b9691d39e4027c76845ad836bd06bc16b221cb16e2e768ffe + languageName: node + linkType: hard + +"@aave/periphery-v3@npm:^2.5.0": + version: 2.5.0 + resolution: "@aave/periphery-v3@npm:2.5.0" + dependencies: + "@aave/core-v3": 1.19.0 + checksum: 4af7a07181097e5fdbda9e1012b8e81c868e447b2050418cd051edcac324db6d0033200bcb5e4d6031bc818613ccf9f2e758fb9e97c94a283d1fbec51ba8404e + languageName: node + linkType: hard + "@aave/protocol-v2@npm:^1.0.1": version: 1.0.1 resolution: "@aave/protocol-v2@npm:1.0.1" @@ -8819,6 +8835,8 @@ __metadata: version: 0.0.0-use.local resolution: "reserve-protocol@workspace:." dependencies: + "@aave/core-v3": ^1.18.0 + "@aave/periphery-v3": ^2.5.0 "@aave/protocol-v2": ^1.0.1 "@chainlink/contracts": ^0.5.1 "@ethersproject/providers": ^5.7.2 From 04e4e5a84eb70a721a38bcbd5e6f9e433b98ff19 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 2 Oct 2023 19:38:15 -0400 Subject: [PATCH 085/450] cleanup --- CHANGELOG.md | 116 ++---------------------------------------- docs/collateral.md | 13 +---- test/Revenues.test.ts | 4 -- 3 files changed, 6 insertions(+), 127 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fedf2f6832..156df3212c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,5 @@ # Changelog -<<<<<<< HEAD # 3.1.0 - Unreleased ### Upgrade Steps -- Required @@ -49,30 +48,6 @@ _All_ asset plugins (and their corresponding ERC20s) must be upgraded. The only Call the following functions, once it is desired to turn on the new features: -======= -# 3.0.0 - -### Upgrade Steps - -#### Required Steps - -Update _all_ component contracts, including Main. - -Call the following functions: - -- `BackingManager.cacheComponents()` -- `RevenueTrader.cacheComponents()` (for both rsrTrader and rTokenTrader) -- `Distributor.cacheComponents()` - -_All_ asset plugins (and their corresponding ERC20s) must be upgraded. The only exception is the `StaticATokenLM` ERC20s from Aave V2. These can be left the same, however their assets should upgraded. - -- Note: Make sure to use `Deployer.deployRTokenAsset()` to create new `RTokenAsset` instances. This asset should be swapped too. - -#### Optional Steps - -Call the following functions, once it is desired to turn on the new features: - ->>>>>>> master - `BasketHandler.setWarmupPeriod()` - `StRSR.setWithdrawalLeak()` - `Broker.setDutchAuctionLength()` @@ -83,9 +58,7 @@ It is acceptable to leave these function calls out of the initial upgrade tx and ### Core Protocol Contracts - `AssetRegistry` [+1 slot] - Summary: StRSR contract need to know when refresh() was last called - - # Add last refresh timestamp tracking and expose via `lastRefresh()` getter - Summary: Other component contracts need to know when refresh() was last called + Summary: Other component contracts need to know when refresh() was last called - Add `lastRefresh()` timestamp getter - Add `size()` getter for number of registered assets - Require asset is SOUND on registration @@ -204,8 +177,6 @@ It is acceptable to leave these function calls out of the initial upgrade tx and - Add `UnstakingCancelled()` event - Allow payout of (already acquired) RSR rewards while frozen - Add ability for governance to `resetStakes()` when stake rate falls outside (1e12, 1e24) -<<<<<<< HEAD - <<<<<<< HEAD - `StRSRVotes` [+0 slots] - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking @@ -227,33 +198,10 @@ Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` a - `FacadeRead` Summary: Add new data summary views frontends may be interested in -======= - -- `StRSRVotes` [+0 slots] - - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking - -### Facades - -Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` and `revenueOverview()` - -- `FacadeAct` - Summary: Remove unused `getActCalldata()` and add way to run revenue auctions - - - Remove `getActCalldata(..)` - - Remove `canRunRecollateralizationAuctions(..)` - - Remove `runRevenueAuctions(..)` - - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` - - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` - - Modify all functions to work on both 3.0.0 and 2.1.0 RTokens - -- `FacadeRead` - Summary: Add new data summary views frontends may be interested in - ->>>>>>> master - - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` - - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions - - Remove `traderBalances(..)` - - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` +- Remove `basketNonce` from `redeem(.., uint48 basketNonce)` +- Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions +- Remove `traderBalances(..)` +- Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - `FacadeWrite` Summary: More expressive and fine-grained control over the set of pausers and freezers @@ -317,7 +265,6 @@ Duration: 30 min (default) - Modify `backingOverview() to handle unpriced cases` - `FacadeAct` - Add `runRevenueAuctions()` -<<<<<<< HEAD ### Plugins @@ -406,65 +353,12 @@ Duration: 30 min (default) - Bugfix: Adjust `Curve*Collateral` and `RTokenAsset` to treat FIX_MAX correctly as +inf - Bugfix: Continue updating cached price after collateral default (impacts all appreciating collateral) -# 2.1.0 - -### Core protocol contracts - -- `BasketHandler` - - Bugfix for `getPrimeBasket()` view - - Minor change to `_price()` rounding - - Minor natspec improvement to `refreshBasket()` -- `Broker` - - Fix `GnosisTrade` trade implemention to treat defensive rounding by EasyAuction correctly - - Add `setGnosis()` and `setTradeImplementation()` governance functions -- `RToken` - - Minor gas optimization added to `redeemTo` to use saved `assetRegistry` variable -- `StRSR` - - Expose RSR variables via `getDraftRSR()`, `getStakeRSR()`, and `getTotalDrafts()` views - -### Facades - -- `FacadeRead` - - Extend `issue()` to return the estimated USD value of deposits as `depositsUoA` - - Add `traderBalances()` - - Add `auctionsSettleable()` - - Add `nextRecollateralizationAuction()` - - Modify `backingOverview() to handle unpriced cases` -- `FacadeAct` - - Add `runRevenueAuctions()` - -======= - ->>>>>>> master -### Plugins - -#### Assets and Collateral - -Across all collateral, `tryPrice()` was updated to exclude revenueHiding considerations - -- Deploy CRV + CVX plugins -- Add `AnkrStakedEthCollateral` + tests + deployment/verification scripts for ankrETH -- Add FluxFinance collateral tests + deployment/verification scripts for fUSDC, fUSDT, fDAI, and fFRAX -- Add CompoundV3 `CTokenV3Collateral` + tests + deployment/verification scripts for cUSDCV3 -- Add Convex `CvxStableCollateral` + tests + deployment/verification scripts for 3Pool -- Add Convex `CvxVolatileCollateral` + tests + deployment/verification scripts for Tricrypto -- Add Convex `CvxStableMetapoolCollateral` + tests + deployment/verification scripts for MIM/3Pool -- Add Convex `CvxStableRTokenMetapoolCollateral` + tests + deployment/verification scripts for eUSD/fraxBP -- Add Frax `SFraxEthCollateral` + tests + deployment/verification scripts for sfrxETH -- Add Lido `LidoStakedEthCollateral` + tests + deployment/verification scripts for wstETH -- Add RocketPool `RethCollateral` + tests + deployment/verification scripts for rETH - ### Testing - Add generic collateral testing suite at `test/plugins/individual-collateral/collateralTests.ts` - Add EasyAuction regression test for Broker false positive (observed during USDC de-peg) - Add EasyAuction extreme tests -<<<<<<< HEAD -> > > > > > > master - -======= ->>>>>>> master ### Documentation - Add `docs/plugin-addresses.md` as well as accompanying script for generation at `scripts/collateral-params.ts` diff --git a/docs/collateral.md b/docs/collateral.md index 146fb630db..baae8c4389 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -147,16 +147,10 @@ Note that a value denoted `{tok}` is a number of "whole tokens" with 18 decimals ### Reference unit `{ref}` The _reference unit_, `{ref}`, is the measure of value that the protocol computes revenue against. When the exchange rate `refPerTok()` rises, the protocol keeps a constant amount of `{ref}` as backing, and considers any surplus balance of the token revenue. -<<<<<<< HEAD There's room for flexibility and creativity in the choice of a Collateral's reference unit. The chief constraints is that `refPerTok()` must be nondecreasing over time, and as soon as this fails to be the case the `CollateralStatus` should become permanently `DISABLED`. -======= - -There's room for flexibility and creativity in the choice of a Collateral's reference unit. The chief constraints is that `refPerTok()` must be nondecreasing over time, and as soon as this fails to be the case the `CollateralStatus` should become permanently `DISABLED`. - -> > > > > > > master -> > > > > > > In many cases, the choice of reference unit is clear. For example: +In many cases, the choice of reference unit is clear. For example: - The collateral token cUSDC (compound USDC) has a natural reference unit of USDC. cUSDC is permissionlessly redeemable in the Compound protocol for an ever-increasing amount of USDC. - The collateral token USDT is its own natural reference unit. It's not natively redeemable for anything else on-chain, and we think of it as non-appreciating collateral. The reference unit is not USD, because the USDT/USD exchange rate often has small fluctuations in both direction which would otherwise cause `refPerTok()` to decrease. @@ -253,12 +247,7 @@ There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20W Because it’s called at the beginning of many transactions, `refresh()` should never revert. If `refresh()` encounters a critical error, it should change the Collateral contract’s state so that `status()` becomes `DISABLED`. -<<<<<<< HEAD To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. -======= -To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`lotPrice()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. - -> > > > > > > master ### The `IFFY` status should be temporary. diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 3dbabd518a..8c85df62d4 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1050,8 +1050,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { minBuyAmtRToken.div(bn('1e15')) ) }) - it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { - const minTrade = bn('1e18') it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { const minTrade = bn('1e18') @@ -3026,7 +3024,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rTokenAsset.address, collateral0.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ) expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) @@ -3086,7 +3083,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rTokenAsset.address, collateral0.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ) expect(await rTokenTrader.tradesOpen()).to.equal(0) From 4106b1a9f5f1d74425319ebd61bc22fe1c52cad1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 2 Oct 2023 19:59:18 -0400 Subject: [PATCH 086/450] more cleanup --- contracts/p0/mixins/TradingLib.sol | 4 +--- docs/collateral.md | 2 +- test/plugins/Asset.test.ts | 8 +------- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index fd9ea5aa19..e43c2a800d 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -304,9 +304,7 @@ library TradingLibP0 { } (uint192 low, uint192 high) = asset.price(); // {UoA/tok} - // price() is better than lotPrice() here: it's important to not underestimate how - // much value could be in a token that is unpriced by using a decaying high lotPrice. - // price() will return [0, FIX_MAX] in this case, which is preferable. + // low decays down; high decays up // Skip over dust-balance assets not in the basket // Intentionally include value of IFFY/DISABLED collateral diff --git a/docs/collateral.md b/docs/collateral.md index baae8c4389..c5289dd1f5 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -214,7 +214,7 @@ This would be sensible for many UNI v2 pools, but someone holding value in a two Revenue Hiding should be employed when the function underlying `refPerTok()` is not necessarily _strongly_ non-decreasing, or simply if there is uncertainty surrounding the guarantee. In general we recommend including a very small amount (1e-6) of revenue hiding for all appreciating collateral. This is already implemented in [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol). -When implementing Revenue Hiding, the `price/lotPrice()` functions should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. +When implementing Revenue Hiding, the `price` function should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. ## Important Properties for Collateral Plugins diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 55c2eaa66f..c0a49a79a5 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -324,7 +324,7 @@ describe('Assets contracts #fast', () => { ) }) - it('Should not revert during RToken price() if supply is zero', async () => { + it('Should not revert RToken price if supply is zero', async () => { // Redeem RToken to make price function revert // Note: To get RToken price to 0, a full basket refresh needs to occur (covered in RToken tests) await rToken.connect(wallet).redeem(amt) @@ -336,12 +336,6 @@ describe('Assets contracts #fast', () => { config.minTradeVolume.mul((await assetRegistry.erc20s()).length) ) expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) - - // Should have lot price, equal to price when feed works OK - const [lowPrice, highPrice] = await rTokenAsset.price() - const [lotLow, lotHigh] = await rTokenAsset.lotPrice() - expect(lotLow).to.equal(lowPrice) - expect(lotHigh).to.equal(highPrice) }) it('Should calculate trade min correctly', async () => { From 7262b6c1768b89f56985da7dfd12eb56eda6b106 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 2 Oct 2023 20:08:35 -0400 Subject: [PATCH 087/450] more cleanup --- test/plugins/individual-collateral/collateralTests.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index ac77ffea8c..8af1117c26 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -385,10 +385,6 @@ export default function fn( await advanceTime(await collateral.oracleTimeout()) - await advanceTime(await collateral.oracleTimeout()) - - await advanceTime(await collateral.oracleTimeout()) - // Should be roughly half, after half of priceTimeout const priceTimeout = await collateral.priceTimeout() await advanceTime(priceTimeout / 2) From 7de788551557885e60bc6aa5bb0a362c3b74a7bb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 2 Oct 2023 20:58:13 -0400 Subject: [PATCH 088/450] fix broken tests --- .../aave-v3/AaveV3FiatCollateral.test.ts | 4 ++++ .../flux-finance/FTokenFiatCollateral.test.ts | 1 - test/plugins/individual-collateral/flux-finance/helpers.ts | 6 ++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index cb7876809f..8566f70d76 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -17,6 +17,7 @@ import { networkConfig } from '#/common/configuration' import { getResetFork } from '../helpers' import { whileImpersonating } from '#/test/utils/impersonation' import { AAVE_V3_USDC_POOL, AAVE_V3_INCENTIVES_CONTROLLER } from './constants' +import { pushOracleForward } from '../../../utils/oracles' interface AaveV3FiatCollateralFixtureContext extends CollateralFixtureContext { staticWrapper: MockStaticATokenV3LM @@ -70,6 +71,9 @@ export const deployCollateral = async (opts: Partial = {}) => ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(combinedOpts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index 1f1d2ca6ad..d38beecde3 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -12,7 +12,6 @@ import { import { pushOracleForward } from '../../../utils/oracles' import { networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' -import { ZERO_ADDRESS } from '../../../../common/constants' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { diff --git a/test/plugins/individual-collateral/flux-finance/helpers.ts b/test/plugins/individual-collateral/flux-finance/helpers.ts index 74cb8d9614..7f1838aea8 100644 --- a/test/plugins/individual-collateral/flux-finance/helpers.ts +++ b/test/plugins/individual-collateral/flux-finance/helpers.ts @@ -1,4 +1,4 @@ -import { CTokenWrapper, ICToken, IERC20Metadata } from '../../../../typechain' +import { ICToken, IERC20Metadata } from '../../../../typechain' import { whileImpersonating } from '../../../utils/impersonation' import { BigNumberish } from 'ethers' import { getResetFork } from '../helpers' @@ -8,7 +8,6 @@ export const mintFToken = async ( underlying: IERC20Metadata, holderUnderlying: string, fToken: ICToken, - fTokenVault: CTokenWrapper, amount: BigNumberish, recipient: string ) => { @@ -16,8 +15,7 @@ export const mintFToken = async ( const balUnderlying = await underlying.balanceOf(signer.address) await underlying.connect(signer).approve(fToken.address, balUnderlying) await fToken.connect(signer).mint(balUnderlying) - await fToken.connect(signer).approve(fTokenVault.address, amount) - await fTokenVault.connect(signer).deposit(amount, recipient) + await fToken.connect(signer).transfer(recipient, amount) }) } From 14a46aed071baf6a52e15b25a668b6a3a91c4bc1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 2 Oct 2023 20:58:16 -0400 Subject: [PATCH 089/450] gas snapshots --- test/__snapshots__/Broker.test.ts.snap | 6 +- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Main.test.ts.snap | 8 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 12 +-- test/__snapshots__/Revenues.test.ts.snap | 8 +- test/__snapshots__/ZZStRSR.test.ts.snap | 10 +- .../__snapshots__/Collateral.test.ts.snap | 8 +- .../AaveV3FiatCollateral.test.ts.snap | 24 ++--- .../ATokenFiatCollateral.test.ts.snap | 24 ++--- .../AnkrEthCollateralTestSuite.test.ts.snap | 24 ++--- .../CBETHCollateral.test.ts.snap | 24 ++--- .../CTokenFiatCollateral.test.ts.snap | 24 ++--- .../__snapshots__/CometTestSuite.test.ts.snap | 24 ++--- .../CrvStableMetapoolSuite.test.ts.snap | 24 ++--- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 ++--- .../CrvStableTestSuite.test.ts.snap | 24 ++--- .../CvxStableMetapoolSuite.test.ts.snap | 24 ++--- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 ++--- .../CvxStableTestSuite.test.ts.snap | 24 ++--- .../SDaiCollateralTestSuite.test.ts.snap | 24 ++--- .../FTokenFiatCollateral.test.ts.snap | 96 +++++++++---------- .../SFrxEthTestSuite.test.ts.snap | 12 +-- .../LidoStakedEthTestSuite.test.ts.snap | 24 ++--- .../MorphoAAVEFiatCollateral.test.ts.snap | 72 +++++++------- .../MorphoAAVENonFiatCollateral.test.ts.snap | 48 +++++----- ...AAVESelfReferentialCollateral.test.ts.snap | 16 ++-- .../RethCollateralTestSuite.test.ts.snap | 24 ++--- .../__snapshots__/MaxBasketSize.test.ts.snap | 16 ++-- 29 files changed, 342 insertions(+), 338 deletions(-) diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index fc823d852b..635ba04aab 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -2,11 +2,11 @@ exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `251984`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `361087`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `366975`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `363202`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `369090`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `365340`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `371228`; exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 848354f559..4b4c7894ff 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8393668`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8497592`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 06ba9d68c7..9591a27626 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357705`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357740`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `195889`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167045`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167023`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80532`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70044`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70022`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index f50430c9b4..ee00025ae6 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787453`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787553`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614457`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614557`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589230`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589266`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 9e0d532f8e..4222c553e9 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1384418`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1370490`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1510705`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1506234`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `747331`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `760457`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1680908`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1665048`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1613640`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1607593`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1702037`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1695355`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 81fa8bb746..4275db1832 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -12,16 +12,16 @@ exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1008567`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1025829`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `773918`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `774070`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1181227`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1181105`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739718`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739870`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index dbc65bb91d..f4ec1f241e 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `156559`; -exports[`StRSRP1 contract Gas Reporting Stake 2`] = `151759`; +exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63409`; @@ -10,10 +10,10 @@ exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41509`; exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58621`; -exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; +exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `241951`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `572011`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `572112`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `526015`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `526116`; diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index 83c6bf2eb6..926d33902f 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,8 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71881`; +exports[`Collateral contracts Gas Reporting refresh() after full price timeout 1`] = `46228`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75163`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71859`; + +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75141`; + +exports[`Collateral contracts Gas Reporting refresh() after oracle timeout 1`] = `46228`; exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `61571`; diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap index 607d7bd001..9900368976 100644 --- a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69299`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69288`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67631`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67620`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72125`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72103`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64443`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64421`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69299`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69288`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67631`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67620`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `67290`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `67279`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `67290`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `67279`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87706`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87684`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87706`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87684`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89730`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89634`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87988`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87966`; diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 79711c5fe3..70324e7f45 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74365`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74354`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72697`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72686`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72960`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72938`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65278`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65256`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74365`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74354`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72697`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72686`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91095`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91147`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91095`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91073`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92307`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92285`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92233`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92211`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127304`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127356`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91510`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91414`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index 37480626fe..01c0ef5979 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60337`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60326`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55868`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55857`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99413`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99391`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91730`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91708`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60337`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60326`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55868`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55857`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55527`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55516`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55527`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55516`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91657`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91635`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91657`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91635`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99208`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99186`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91939`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91917`; diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index bf09f1f35e..0bde8f5436 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59824`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59813`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55355`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55344`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98317`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98295`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90634`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90612`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59824`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59813`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55355`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55344`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55014`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55003`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55014`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55003`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90631`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90609`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90631`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90609`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98182`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98160`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90913`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90891`; diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index ed6522b5ce..053ccfb3b7 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119347`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119350`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117679`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117681`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76242`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76220`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68560`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68538`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119347`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119350`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117679`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117681`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138781`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138759`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138707`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138685`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139845`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139836`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139845`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139836`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174990`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174982`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139048`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139039`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index be30eecd44..45d7e08f78 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109063`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109052`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104326`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104315`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134471`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134449`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126788`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126766`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109063`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109052`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104326`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104315`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107053`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107042`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103985`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103974`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126785`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126763`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126785`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126763`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134336`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134314`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127067`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127045`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index adac76df06..cc198f1a9e 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251771`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246889`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47904`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47904`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254482`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247214`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 74b5d0e51d..1023f3eb49 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `104049`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `99581`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226544`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `221662`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101430`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96962`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96621`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96621`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221659`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221659`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209203`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `201935`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index d725ca2610..69fbe0cd6b 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199560`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194678`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194675`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194675`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181820`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174552`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 699536b70f..85b9903370 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251771`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246889`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47904`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47904`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254482`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247214`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index 34a9b7f027..c5b9191271 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `104049`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `99581`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226544`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `221662`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101430`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96962`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96621`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96621`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221659`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221659`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209203`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `201935`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index 8b01856f7e..ba0b229d7d 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199560`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194678`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194675`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194675`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181820`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174552`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index 178c2fa1e9..08efe17a75 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116754`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116743`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108442`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108431`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `131283`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `131261`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `123323`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `123301`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `116573`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `116562`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `108442`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `108431`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `111428`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `111417`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108101`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108090`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `123320`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `123298`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `123320`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `123298`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131148`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131126`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `123602`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `123580`; diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index 35d0ae91c9..fdf9179172 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -1,97 +1,97 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117347`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117350`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115679`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115681`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140981`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140959`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139167`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139145`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117347`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117350`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115679`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115681`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115338`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115327`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115338`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115327`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139164`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139155`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139164`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139155`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141114`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141106`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139520`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139511`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117539`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117542`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115871`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115873`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141237`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141215`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139423`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139401`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117539`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117542`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115871`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115873`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115530`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115519`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115530`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115519`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139420`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139411`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139420`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139411`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141370`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141362`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139702`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139693`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125829`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125832`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124161`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149949`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149927`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148205`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148183`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125829`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125832`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124161`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123820`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123809`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123820`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123809`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148202`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148193`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148202`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148193`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150082`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150074`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148484`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148475`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120477`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120480`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118809`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118811`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144383`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144361`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142569`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142547`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120477`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120480`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118809`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118811`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118468`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118457`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118468`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118457`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142496`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142487`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142566`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142557`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144446`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144438`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142848`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142839`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index 04d291e85c..a4797620cc 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58995`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58984`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54258`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54247`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59695`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59684`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58026`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58015`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73831`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73809`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73831`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73809`; diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index 09f0a2c8ad..97b5bdc2e6 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88044`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88033`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83575`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132898`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132876`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125215`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125193`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88044`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88033`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83575`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83234`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83223`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83234`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83223`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125212`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125190`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125212`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125190`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129963`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129941`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125494`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125472`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 97e0228cdb..1dc9e48d20 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -1,73 +1,73 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134222`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134211`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129753`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129742`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179834`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179812`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172151`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172129`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134222`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134211`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129753`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129742`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129412`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129401`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129412`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129401`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172148`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172126`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172148`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172126`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179699`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179677`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172430`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172408`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134425`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134414`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129956`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129945`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180240`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180218`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172557`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172535`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134425`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134414`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129956`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129945`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129615`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129604`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129615`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129604`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172554`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172532`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172554`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172532`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180105`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180083`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172836`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172814`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133578`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133567`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129109`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129098`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178546`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178524`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170863`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170841`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133578`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133567`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129109`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129098`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128768`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128757`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128768`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128757`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170860`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170838`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170860`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170838`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178411`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178389`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171142`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171120`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index 2c8af6504a..f767cb5650 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -1,49 +1,49 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133645`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133634`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129176`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129165`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199843`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199810`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192160`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192127`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182889`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182878`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178420`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178409`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178079`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178068`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178079`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178068`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192157`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192124`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192157`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192124`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199708`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199675`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192439`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192406`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167277`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167266`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162808`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162797`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239107`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239074`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231424`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231391`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222153`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222142`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217684`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217673`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217343`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217332`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217343`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217332`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231421`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231388`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231421`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231388`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238972`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238939`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231703`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231670`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index 8bc1fa5575..c0751869de 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -1,17 +1,17 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201563`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201552`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197094`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197083`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217785`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217763`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210102`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210080`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201563`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201552`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197094`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197083`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210099`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210077`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210099`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210077`; diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap index 4c876c0ecb..1827ad33b7 100644 --- a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -1,25 +1,25 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `70887`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `70876`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `66418`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `66407`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `113943`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 1`] = `113921`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `106260`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after hard default 2`] = `106238`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `70887`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `70876`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `66418`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `66407`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 1`] = `66077`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 1`] = `66066`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 2`] = `66077`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after soft default 2`] = `66066`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `106257`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `106235`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `106257`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `106235`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 1`] = `113808`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 1`] = `113786`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 2`] = `106539`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() during soft default 2`] = `106517`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 89a9ca08e6..fa7f07dd1b 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12092382`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12090932`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9830758`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9829293`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13617164`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13615367`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20897690`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20701409`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10991870`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10991970`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8713158`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8713193`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6561504`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6561514`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15130053`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14454943`; From 1adc381a6702074e2cf6990f14f98078b7ad91a5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 3 Oct 2023 10:24:16 -0400 Subject: [PATCH 090/450] remove some bad merge kruft --- CHANGELOG.md | 69 ---------------------------------------------------- 1 file changed, 69 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 156df3212c..95af3e13a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -290,75 +290,6 @@ Across all collateral, `tryPrice()` was updated to exclude revenueHiding conside - Add EasyAuction regression test for Broker false positive (observed during USDC de-peg) - Add EasyAuction extreme tests -======= - -- `StRSRVotes` [+0 slots] - - Add `stakeAndDelegate(uint256 rsrAmount, address delegate)` function to encourage people to receive voting weight upon staking - -### Facades - -Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` and `revenueOverview()` - -- `FacadeAct` - Summary: Remove unused `getActCalldata()` and add way to run revenue auctions - - - Remove `getActCalldata(..)` - - Remove `canRunRecollateralizationAuctions(..)` - - Remove `runRevenueAuctions(..)` - - Add `revenueOverview(IRevenueTrader) returns ( IERC20[] memory erc20s, bool[] memory canStart, uint256[] memory surpluses, uint256[] memory minTradeAmounts)` - - Add `nextRecollateralizationAuction(..) returns (bool canStart, IERC20 sell, IERC20 buy, uint256 sellAmount)` - - Modify all functions to work on both 3.0.0 and 2.1.0 RTokens - -- `FacadeRead` - Summary: Add new data summary views frontends may be interested in - - - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` - - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions - - Remove `traderBalances(..)` - - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - -- `FacadeWrite` - Summary: More expressive and fine-grained control over the set of pausers and freezers - - - Do not automatically grant Guardian PAUSER/SHORT_FREEZER/LONG_FREEZER - - Do not automatically grant Owner PAUSER/SHORT_FREEZER/LONG_FREEZER - - Add ability to initialize with multiple pausers, short freezers, and long freezers - - Modify `setupGovernance(.., address owner, address guardian, address pauser)` -> `setupGovernance(.., GovernanceRoles calldata govRoles)` - -## Plugins - -### DutchTrade - -A cheaper, simpler, trading method. Intended to be the new dominant trading method, with GnosisTrade (batch auctions) available as a backup option. Generally speaking the batch auction length can be kept shorter than the dutch auction length. - -DutchTrade implements a four-stage, single-lot, falling price dutch auction: - -1. In the first 20% of the auction, the price falls from 1000x the best price to the best price in a geometric/exponential decay as a price manipulation defense mechanism. Bids are not expected to occur (but note: unlike the GnosisTrade batch auction, this mechanism is not resistant to _arbitrary_ price manipulation). If a bid occurs, then trading for the pair of tokens is disabled as long as the trade was started by the BackingManager. -2. Between 20% and 45%, the price falls linearly from 1.5x the best price to the best price. -3. Between 45% and 95%, the price falls linearly from the best price to the worst price. -4. Over the last 5% of the auction, the price remains constant at the worst price. - -Duration: 30 min (default) - -### Assets and Collateral - -- Add `version() return (string)` getter to pave way for separation of asset versioning and core protocol versioning -- Deprecate `claimRewards()` -- Add `lastSave()` to `RTokenAsset` -- Remove `CurveVolatileCollateral` -- Switch `CToken*Collateral` (Compound V2) to using a CTokenVault ERC20 rather than the raw cToken -- Bugfix: `lotPrice()` now begins at 100% the lastSavedPrice, instead of below 100%. It can be at 100% for up to the oracleTimeout in the worst-case. -- Bugfix: Handle oracle deprecation as indicated by the `aggregator()` being set to the zero address -- Bugfix: `AnkrStakedETHCollateral`/`CBETHCollateral`/`RethCollateral` now correctly detects soft default (note that Ankr still requires a new oracle before it can be deployed) -- Bugfix: Adjust `Curve*Collateral` and `RTokenAsset` to treat FIX_MAX correctly as +inf -- Bugfix: Continue updating cached price after collateral default (impacts all appreciating collateral) - -### Testing - -- Add generic collateral testing suite at `test/plugins/individual-collateral/collateralTests.ts` -- Add EasyAuction regression test for Broker false positive (observed during USDC de-peg) -- Add EasyAuction extreme tests - ### Documentation - Add `docs/plugin-addresses.md` as well as accompanying script for generation at `scripts/collateral-params.ts` From 9a67530411c9659ff30347d80e9f43ba4e0229bb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 3 Oct 2023 10:31:57 -0400 Subject: [PATCH 091/450] comments and cosmetics --- contracts/p0/Broker.sol | 6 +++--- contracts/p0/mixins/TradingLib.sol | 2 +- contracts/p1/Broker.sol | 6 +++--- docs/collateral.md | 6 +++--- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 51fcf6ac10..d3e0da2041 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -240,7 +240,7 @@ contract BrokerP0 is ComponentP0, IBroker { ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); require( - priceIsCurrent(req.sell) && priceIsCurrent(req.buy), + priceNotDecayed(req.sell) && priceNotDecayed(req.buy), "dutch auctions require live prices" ); @@ -257,8 +257,8 @@ contract BrokerP0 is ComponentP0, IBroker { return trade; } - /// @return true if the price is current, or it's the RTokenAsset - function priceIsCurrent(IAsset asset) private view returns (bool) { + /// @return true iff the price is not decayed, or it's the RTokenAsset + function priceNotDecayed(IAsset asset) private view returns (bool) { return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(main.rToken()); } diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index e43c2a800d..b9dc3ca787 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -348,7 +348,7 @@ library TradingLibP0 { // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price (low, technically), + // A: Our use of isEnoughToSell always uses the low price, // so min trade volumes are always assesed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index a83603c226..2f9a222145 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -266,7 +266,7 @@ contract BrokerP1 is ComponentP1, IBroker { ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); require( - priceIsCurrent(req.sell) && priceIsCurrent(req.buy), + priceNotDecayed(req.sell) && priceNotDecayed(req.buy), "dutch auctions require live prices" ); @@ -284,8 +284,8 @@ contract BrokerP1 is ComponentP1, IBroker { return trade; } - /// @return true if the price is current, or it's the RTokenAsset - function priceIsCurrent(IAsset asset) private view returns (bool) { + /// @return true iff the price is not decayed, or it's the RTokenAsset + function priceNotDecayed(IAsset asset) private view returns (bool) { return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(rToken); } diff --git a/docs/collateral.md b/docs/collateral.md index c5289dd1f5..9655107da4 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -247,7 +247,7 @@ There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20W Because it’s called at the beginning of many transactions, `refresh()` should never revert. If `refresh()` encounters a critical error, it should change the Collateral contract’s state so that `status()` becomes `DISABLED`. -To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/asset/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. +To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. ### The `IFFY` status should be temporary. @@ -361,9 +361,9 @@ The difference between the upper and lower estimate should not exceed 5%, though Lower estimate must be <= upper estimate. -Should return `(0, FIX_MAX)` if pricing data is unavailable or stale. +Under no price data, the low estimate shoulddecay downwards and high estimate upwards. -Recommend decaying low estimate downwards and high estimate upwards over time. +Should return `(0, FIX_MAX)` if pricing data is _completely_ unavailable or stale. Should be gas-efficient. From 6a8a2bfa5cb5f7730203332b9d56d465aa72278d Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 9 Oct 2023 13:30:54 -0300 Subject: [PATCH 092/450] Trust M-01 & M-02: RevenueTrader.settleTrade() (#966) --- contracts/p0/RevenueTrader.sol | 20 ++- contracts/p1/RevenueTrader.sol | 13 +- test/Revenues.test.ts | 313 +++++++++++++++++++++++++++++++++ 3 files changed, 338 insertions(+), 8 deletions(-) diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 1d47a5e494..7a7ee84dd8 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -32,14 +32,12 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) - public - override(ITrading, TradingP0) - notTradingPausedOrFrozen - returns (ITrade trade) - { + function settleTrade(IERC20 sell) public override(ITrading, TradingP0) returns (ITrade trade) { trade = super.settleTrade(sell); - _distributeTokenToBuy(); + if ((!main.tradingPausedOrFrozen()) && _nonZeroDistribution()) { + _distributeTokenToBuy(); + } + // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -80,6 +78,7 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { { require(erc20s.length > 0, "empty erc20s list"); require(erc20s.length == kinds.length, "length mismatch"); + require(_nonZeroDistribution(), "zero distribution"); main.assetRegistry().refresh(); IAsset assetToBuy = main.assetRegistry().toAsset(tokenToBuy); @@ -132,4 +131,11 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { tokenToBuy.safeApprove(address(main.distributor()), bal); main.distributor().distribute(tokenToBuy, bal); } + + function _nonZeroDistribution() private view returns (bool) { + RevenueTotals memory revTotals = main.distributor().totals(); + return + (tokenToBuy == main.rsr() && revTotals.rsrTotal > 0) || + (address(tokenToBuy) == address(main.rToken()) && revTotals.rTokenTotal > 0); + } } diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 1065fb96e7..a5e65e984a 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -53,7 +53,10 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant - _distributeTokenToBuy(); + if ((!main.tradingPausedOrFrozen()) && _nonZeroDistribution()) { + _distributeTokenToBuy(); + } + // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -107,6 +110,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { uint256 len = erc20s.length; require(len > 0, "empty erc20s list"); require(len == kinds.length, "length mismatch"); + require(_nonZeroDistribution(), "zero distribution"); // Calculate if the trade involves any RToken // Distribute tokenToBuy if supplied in ERC20s list @@ -182,6 +186,13 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { distributor.distribute(tokenToBuy, bal); } + function _nonZeroDistribution() private view returns (bool) { + RevenueTotals memory revTotals = distributor.totals(); + return + (tokenToBuy == rsr && revTotals.rsrTotal > 0) || + (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal > 0); + } + /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 8c85df62d4..33905d7d78 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -2126,6 +2126,319 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) + it('Should not start trades if no distribution defined', async () => { + // Check funds in Backing Manager and destinations + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + await expect( + rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) + ).to.be.revertedWith('zero distribution') + + // Check funds, nothing changed + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + }) + + it('Should handle no distribution defined when settling trade', async () => { + // Set COMP tokens as reward + rewardAmountCOMP = bn('0.8e18') + + // COMP Rewards + await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) + + // Collect revenue + // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, rewardAmountCOMP], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, bn(0)], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + compToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // COMP -> RSR Auction + await expectTrade(rsrTrader, { + sell: compToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // COMP -> RToken Auction + await expectTrade(rTokenTrader, { + sell: compToken.address, + buy: rToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check funds in Market + expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken, + }) + + // Set no distribution for StRSR + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check balances + // StRSR - Still in trader, was not distributed due to zero distribution + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + + // Furnace - RTokens transferred to destination + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(furnace.address)).to.closeTo( + minBuyAmtRToken, + minBuyAmtRToken.div(bn('1e15')) + ) + }) + + it('Should allow to settle trade (and not distribute) even if trading paused or frozen', async () => { + // Set COMP tokens as reward + rewardAmountCOMP = bn('0.8e18') + + // COMP Rewards + await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) + + // Collect revenue + // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, rewardAmountCOMP], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, bn(0)], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + compToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // COMP -> RSR Auction + await expectTrade(rsrTrader, { + sell: compToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // COMP -> RToken Auction + await expectTrade(rTokenTrader, { + sell: compToken.address, + buy: rToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check funds in Market + expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken, + }) + + // Pause Trading + await main.connect(owner).pauseTrading() + + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Distribution did not occurr, funds are in Traders + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(minBuyAmtRToken) + + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(furnace.address)).to.equal(bn(0)) + }) + it('Should trade even if price for buy token = 0', async () => { // Set AAVE tokens as reward rewardAmountAAVE = bn('1e18') From ae598c6876a47c53d54dd7edb9c93d832770c1e2 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 9 Oct 2023 13:40:56 -0300 Subject: [PATCH 093/450] Trust M-11: Fix storage slots (#968) --- contracts/p1/Broker.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 2f9a222145..0c233a8020 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -294,5 +294,5 @@ contract BrokerP1 is ComponentP1, IBroker { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[42] private __gap; + uint256[41] private __gap; } From ce38d3bd9bc16cf06f8064038355752a2c8a53e8 Mon Sep 17 00:00:00 2001 From: Julian R <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 9 Oct 2023 15:28:24 -0300 Subject: [PATCH 094/450] Revert "Trust M-01 & M-02: RevenueTrader.settleTrade() (#966)" This reverts commit 6a8a2bfa5cb5f7730203332b9d56d465aa72278d. --- contracts/p0/RevenueTrader.sol | 20 +-- contracts/p1/RevenueTrader.sol | 13 +- test/Revenues.test.ts | 313 --------------------------------- 3 files changed, 8 insertions(+), 338 deletions(-) diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 7a7ee84dd8..1d47a5e494 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -32,12 +32,14 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) public override(ITrading, TradingP0) returns (ITrade trade) { + function settleTrade(IERC20 sell) + public + override(ITrading, TradingP0) + notTradingPausedOrFrozen + returns (ITrade trade) + { trade = super.settleTrade(sell); - if ((!main.tradingPausedOrFrozen()) && _nonZeroDistribution()) { - _distributeTokenToBuy(); - } - + _distributeTokenToBuy(); // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -78,7 +80,6 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { { require(erc20s.length > 0, "empty erc20s list"); require(erc20s.length == kinds.length, "length mismatch"); - require(_nonZeroDistribution(), "zero distribution"); main.assetRegistry().refresh(); IAsset assetToBuy = main.assetRegistry().toAsset(tokenToBuy); @@ -131,11 +132,4 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { tokenToBuy.safeApprove(address(main.distributor()), bal); main.distributor().distribute(tokenToBuy, bal); } - - function _nonZeroDistribution() private view returns (bool) { - RevenueTotals memory revTotals = main.distributor().totals(); - return - (tokenToBuy == main.rsr() && revTotals.rsrTotal > 0) || - (address(tokenToBuy) == address(main.rToken()) && revTotals.rTokenTotal > 0); - } } diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index a5e65e984a..1065fb96e7 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -53,10 +53,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant - if ((!main.tradingPausedOrFrozen()) && _nonZeroDistribution()) { - _distributeTokenToBuy(); - } - + _distributeTokenToBuy(); // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -110,7 +107,6 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { uint256 len = erc20s.length; require(len > 0, "empty erc20s list"); require(len == kinds.length, "length mismatch"); - require(_nonZeroDistribution(), "zero distribution"); // Calculate if the trade involves any RToken // Distribute tokenToBuy if supplied in ERC20s list @@ -186,13 +182,6 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { distributor.distribute(tokenToBuy, bal); } - function _nonZeroDistribution() private view returns (bool) { - RevenueTotals memory revTotals = distributor.totals(); - return - (tokenToBuy == rsr && revTotals.rsrTotal > 0) || - (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal > 0); - } - /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 33905d7d78..8c85df62d4 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -2126,319 +2126,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) - it('Should not start trades if no distribution defined', async () => { - // Check funds in Backing Manager and destinations - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - - await expect( - rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) - ).to.be.revertedWith('zero distribution') - - // Check funds, nothing changed - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - }) - - it('Should handle no distribution defined when settling trade', async () => { - // Set COMP tokens as reward - rewardAmountCOMP = bn('0.8e18') - - // COMP Rewards - await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) - - // Collect revenue - // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% - const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) - - const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder - const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) - - await expectEvents(backingManager.claimRewards(), [ - { - contract: token3, - name: 'RewardsClaimed', - args: [compToken.address, rewardAmountCOMP], - emitted: true, - }, - { - contract: token2, - name: 'RewardsClaimed', - args: [aaveToken.address, bn(0)], - emitted: true, - }, - ]) - - // Check status of destinations at this point - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - args: [ - anyValue, - compToken.address, - rToken.address, - sellAmtRToken, - withinQuad(minBuyAmtRToken), - ], - emitted: true, - }, - ]) - - const auctionTimestamp: number = await getLatestBlockTimestamp() - - // Check auctions registered - // COMP -> RSR Auction - await expectTrade(rsrTrader, { - sell: compToken.address, - buy: rsr.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('0'), - }) - - // COMP -> RToken Auction - await expectTrade(rTokenTrader, { - sell: compToken.address, - buy: rToken.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('1'), - }) - - // Check funds in Market - expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Perform Mock Bids for RSR and RToken (addr1 has balance) - await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) - await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) - await gnosis.placeBid(0, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt, - }) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmtRToken, - buyAmount: minBuyAmtRToken, - }) - - // Set no distribution for StRSR - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - - // Close auctions - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - emitted: false, - }, - ]) - - // Check balances - // StRSR - Still in trader, was not distributed due to zero distribution - expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) - expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) - - // Furnace - RTokens transferred to destination - expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) - expect(await rToken.balanceOf(furnace.address)).to.closeTo( - minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e15')) - ) - }) - - it('Should allow to settle trade (and not distribute) even if trading paused or frozen', async () => { - // Set COMP tokens as reward - rewardAmountCOMP = bn('0.8e18') - - // COMP Rewards - await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) - - // Collect revenue - // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% - const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) - - const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder - const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) - - await expectEvents(backingManager.claimRewards(), [ - { - contract: token3, - name: 'RewardsClaimed', - args: [compToken.address, rewardAmountCOMP], - emitted: true, - }, - { - contract: token2, - name: 'RewardsClaimed', - args: [aaveToken.address, bn(0)], - emitted: true, - }, - ]) - - // Check status of destinations at this point - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - args: [ - anyValue, - compToken.address, - rToken.address, - sellAmtRToken, - withinQuad(minBuyAmtRToken), - ], - emitted: true, - }, - ]) - - const auctionTimestamp: number = await getLatestBlockTimestamp() - - // Check auctions registered - // COMP -> RSR Auction - await expectTrade(rsrTrader, { - sell: compToken.address, - buy: rsr.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('0'), - }) - - // COMP -> RToken Auction - await expectTrade(rTokenTrader, { - sell: compToken.address, - buy: rToken.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('1'), - }) - - // Check funds in Market - expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Perform Mock Bids for RSR and RToken (addr1 has balance) - await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) - await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) - await gnosis.placeBid(0, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt, - }) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmtRToken, - buyAmount: minBuyAmtRToken, - }) - - // Pause Trading - await main.connect(owner).pauseTrading() - - // Close auctions - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - emitted: false, - }, - ]) - - // Distribution did not occurr, funds are in Traders - expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) - expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(minBuyAmtRToken) - - expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) - expect(await rToken.balanceOf(furnace.address)).to.equal(bn(0)) - }) - it('Should trade even if price for buy token = 0', async () => { // Set AAVE tokens as reward rewardAmountAAVE = bn('1e18') From 7affc8544ed4e3f7ad0cfccfe1f5d99044ad3a3b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 11 Oct 2023 11:01:54 -0400 Subject: [PATCH 095/450] Max approval erc20s (#971) Co-authored-by: Akshat Mittal Co-authored-by: Patrick McKelvy --- CHANGELOG.md | 6 ++++ contracts/libraries/Allowance.sol | 43 +++++++++++++++++++++++ contracts/p0/RevenueTrader.sol | 3 ++ contracts/p0/mixins/Trading.sol | 13 +++++-- contracts/p1/RevenueTrader.sol | 3 ++ contracts/p1/mixins/Trading.sol | 9 +++-- contracts/plugins/mocks/BadERC20.sol | 10 ++++++ contracts/plugins/trading/GnosisTrade.sol | 10 ++++-- hardhat.config.ts | 2 +- test/scenario/BadERC20.test.ts | 35 ++++++++++++++++++ 10 files changed, 126 insertions(+), 8 deletions(-) create mode 100644 contracts/libraries/Allowance.sol diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c40e6a6de..693d32bd91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +# 3.0.1 + +### Upgrade steps + +Update `BackingManager`, both `RevenueTraders` (rTokenTrader/rsrTrader), and call `Broker.setBatchTradeImplementation()` passing in the new `GnosisTrade` address. + # 3.0.0 ### Upgrade Steps diff --git a/contracts/libraries/Allowance.sol b/contracts/libraries/Allowance.sol new file mode 100644 index 0000000000..c3e5f62e5d --- /dev/null +++ b/contracts/libraries/Allowance.sol @@ -0,0 +1,43 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +interface IERC20ApproveOnly { + function approve(address spender, uint256 value) external; + + function allowance(address owner, address spender) external view returns (uint256); +} + +library AllowanceLib { + /// An approve helper that: + /// 1. Sets initial allowance to 0 + /// 2. Tries to set the provided allowance + /// 3. Falls back to setting a maximum allowance, if (2) fails + /// Context: Some new-age ERC20s think it's a good idea to revert for allowances + /// that are > 0 but < type(uint256).max. + function safeApproveFallbackToMax( + address tokenAddress, + address spender, + uint256 value + ) internal { + IERC20ApproveOnly token = IERC20ApproveOnly(tokenAddress); + + // 1. Set initial allowance to 0 + token.approve(spender, 0); + require(token.allowance(address(this), spender) == 0, "allowance not 0"); + + if (value == 0) return; + + // 2. Try to set the provided allowance + bool success; // bool success = false; + try token.approve(spender, value) { + success = token.allowance(address(this), spender) == value; + // solhint-disable-next-line no-empty-blocks + } catch {} + + // 3. Fall-back to setting a maximum allowance + if (!success) { + token.approve(spender, type(uint256).max); + require(token.allowance(address(this), spender) >= value, "allowance missing"); + } + } +} diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 2f380927fe..a62cf8bd18 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -130,6 +130,9 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { uint256 bal = tokenToBuy.balanceOf(address(this)); tokenToBuy.safeApprove(address(main.distributor()), 0); tokenToBuy.safeApprove(address(main.distributor()), bal); + // do not need to use AllowanceLib.safeApproveFallbackToCustom here because + // tokenToBuy can be assumed to be either RSR or the RToken + main.distributor().distribute(tokenToBuy, bal); } } diff --git a/contracts/p0/mixins/Trading.sol b/contracts/p0/mixins/Trading.sol index b49aee3f11..52fc993eea 100644 --- a/contracts/p0/mixins/Trading.sol +++ b/contracts/p0/mixins/Trading.sol @@ -6,6 +6,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/IMain.sol"; import "../../interfaces/ITrade.sol"; +import "../../libraries/Allowance.sol"; import "../../libraries/Fixed.sol"; import "./Rewardable.sol"; @@ -68,8 +69,16 @@ abstract contract TradingP0 is RewardableP0, ITrading { IBroker broker = main.broker(); assert(address(trades[req.sell.erc20()]) == address(0)); - req.sell.erc20().safeApprove(address(broker), 0); - req.sell.erc20().safeApprove(address(broker), req.sellAmount); + // Set allowance via custom approval -- first sets allowance to 0, then sets allowance + // to either the requested amount or the maximum possible amount, if that fails. + // + // Context: wcUSDCv3 has a non-standard approve() function that reverts if the approve + // amount is > 0 and < type(uint256).max. + AllowanceLib.safeApproveFallbackToMax( + address(req.sell.erc20()), + address(broker), + req.sellAmount + ); trade = broker.openTrade(kind, req, prices); trades[req.sell.erc20()] = trade; diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index fe7b409b50..43253c6b0e 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -179,6 +179,9 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { uint256 bal = tokenToBuy.balanceOf(address(this)); tokenToBuy.safeApprove(address(distributor), 0); tokenToBuy.safeApprove(address(distributor), bal); + + // do not need to use AllowanceLib.safeApproveFallbackToCustom here because + // tokenToBuy can be assumed to be either RSR or the RToken distributor.distribute(tokenToBuy, bal); } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 863f7ab113..24b2044d38 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -7,6 +7,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/utils/Multicall.sol"; import "../../interfaces/ITrade.sol"; import "../../interfaces/ITrading.sol"; +import "../../libraries/Allowance.sol"; import "../../libraries/Fixed.sol"; import "./Component.sol"; import "./RewardableLib.sol"; @@ -120,8 +121,12 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl IERC20 sell = req.sell.erc20(); assert(address(trades[sell]) == address(0)); - IERC20Upgradeable(address(sell)).safeApprove(address(broker), 0); - IERC20Upgradeable(address(sell)).safeApprove(address(broker), req.sellAmount); + // Set allowance via custom approval -- first sets allowance to 0, then sets allowance + // to either the requested amount or the maximum possible amount, if that fails. + // + // Context: wcUSDCv3 has a non-standard approve() function that reverts if the approve + // amount is > 0 and < type(uint256).max. + AllowanceLib.safeApproveFallbackToMax(address(sell), address(broker), req.sellAmount); trade = broker.openTrade(kind, req, prices); trades[sell] = trade; diff --git a/contracts/plugins/mocks/BadERC20.sol b/contracts/plugins/mocks/BadERC20.sol index 99c7791e84..11570a4e4c 100644 --- a/contracts/plugins/mocks/BadERC20.sol +++ b/contracts/plugins/mocks/BadERC20.sol @@ -11,6 +11,7 @@ contract BadERC20 is ERC20Mock { uint8 private _decimals; uint192 public transferFee; // {1} bool public revertDecimals; + bool public revertApprove; // if true, reverts for any approve > 0 and < type(uint256).max mapping(address => bool) public censored; @@ -34,6 +35,10 @@ contract BadERC20 is ERC20Mock { censored[account] = val; } + function setRevertApprove(bool newRevertApprove) external { + revertApprove = newRevertApprove; + } + function decimals() public view override returns (uint8) { bytes memory data = abi.encodePacked((bytes4(keccak256("absentDecimalsFn()")))); @@ -42,6 +47,11 @@ contract BadERC20 is ERC20Mock { return _decimals; } + function approve(address spender, uint256 amount) public virtual override returns (bool) { + if (revertApprove && amount > 0 && amount < type(uint256).max) revert("revertApprove"); + return super.approve(spender, amount); + } + function transfer(address to, uint256 amount) public virtual override returns (bool) { address owner = _msgSender(); if (censored[owner] || censored[to]) revert("censored"); diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index e8413c5fea..9f52e6387a 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -4,6 +4,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "@openzeppelin/contracts/utils/math/Math.sol"; import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol"; +import "../../libraries/Allowance.sol"; import "../../libraries/Fixed.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/IGnosis.sol"; @@ -130,9 +131,12 @@ contract GnosisTrade is ITrade { // == Interactions == - // Set allowance (two safeApprove calls to support USDT) - IERC20Upgradeable(address(sell)).safeApprove(address(gnosis), 0); - IERC20Upgradeable(address(sell)).safeApprove(address(gnosis), initBal); + // Set allowance via custom approval -- first sets allowance to 0, then sets allowance + // to either the requested amount or the maximum possible amount, if that fails. + // + // Context: wcUSDCv3 has a non-standard approve() function that reverts if the approve + // amount is > 0 and < type(uint256).max. + AllowanceLib.safeApproveFallbackToMax(address(sell), address(gnosis), initBal); auctionId = gnosis.initiateAuction( sell, diff --git a/hardhat.config.ts b/hardhat.config.ts index 7b540748d4..9dddd006bf 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -38,7 +38,7 @@ const config: HardhatUserConfig = { // network for tests/in-process stuff forking: useEnv('FORK') ? { - url: forkRpcs[(useEnv('FORK_NETWORK') ?? 'mainnet') as Network], + url: forkRpcs[useEnv('FORK_NETWORK', 'mainnet') as Network], blockNumber: Number(useEnv(`FORK_BLOCK`, forkBlockNumber['default'].toString())), } : undefined, diff --git a/test/scenario/BadERC20.test.ts b/test/scenario/BadERC20.test.ts index 6874a021ca..220ed60d0f 100644 --- a/test/scenario/BadERC20.test.ts +++ b/test/scenario/BadERC20.test.ts @@ -396,4 +396,39 @@ describe(`Bad ERC20 - P${IMPLEMENTATION}`, () => { ) }) }) + + describe('with fussy approvals', function () { + let issueAmt: BigNumber + + beforeEach(async () => { + issueAmt = initialBal.div(100) + await token0.connect(addr1).approve(rToken.address, issueAmt) + await token0.setRevertApprove(true) + await rToken.connect(addr1).issue(issueAmt) + }) + + context('Regression tests wcUSDCv3 10/10/2023', () => { + it('should not revert during recollateralization', async () => { + await basketHandler.setPrimeBasket( + [token0.address, backupToken.address], + [fp('0.5'), fp('0.5')] + ) + await basketHandler.refreshBasket() + + // Should launch recollateralization auction successfully + await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)) + .to.emit(backingManager, 'TradeStarted') + .withArgs(anyValue, token0.address, backupToken.address, anyValue, anyValue) + }) + + it('should not revert during revenue auction', async () => { + await token0.mint(rsrTrader.address, issueAmt) + + // Should launch revenue auction successfully + await expect(rsrTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])) + .to.emit(rsrTrader, 'TradeStarted') + .withArgs(anyValue, token0.address, rsr.address, anyValue, anyValue) + }) + }) + }) }) From 6d850fe6e99ee85d805f117cf156798cd99ec6d6 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 11 Oct 2023 22:19:40 -0400 Subject: [PATCH 096/450] Deploy 3.0.1 (#974) --- .github/workflows/tests.yml | 4 +- .openzeppelin/mainnet.json | 631 +++++++++++++++++- contracts/mixins/Versioned.sol | 2 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- .../1-tmp-assets-collateral.json | 100 +++ .../mainnet-3.0.1/1-tmp-deployments.json | 35 + test/fixtures.ts | 2 +- 7 files changed, 769 insertions(+), 7 deletions(-) create mode 100644 scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json create mode 100644 scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ca7fc0ee67..ea26bf7dda 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,7 @@ jobs: - run: yarn devchain & env: MAINNET_RPC_URL: https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161 - FORK_BLOCK: 18114118 + FORK_BLOCK: 18329921 FORK_NETWORK: mainnet - run: yarn deploy:run --network localhost env: @@ -65,7 +65,7 @@ jobs: TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet - + plugin-tests-base: name: 'Plugin Tests (Base)' runs-on: ubuntu-latest diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index cb33be3859..8ae5721830 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -3747,7 +3747,10 @@ }, "t_enum(TradeKind)25002": { "label": "enum TradeKind", - "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { @@ -4040,7 +4043,11 @@ }, "t_enum(CollateralStatus)24460": { "label": "enum CollateralStatus", - "members": ["SOUND", "IFFY", "DISABLED"], + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -6025,6 +6032,626 @@ } } } + }, + "3b1dde5cc620e2ea43113b74fad027134074d4a72f87ddc30eb639812531857a": { + "address": "0xBbC532A80DD141449330c1232C953Da6801Aed01", + "txHash": "0xfd804f0edbb9ac92c5829b542e8dc8a97490d1fcaed4987343d9901225a6b732", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)19008", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)17878", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:28" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:32" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:36" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:39" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:160" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)17420", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)17729", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)18192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)19228", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:33" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)11113", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)19569", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:35" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)19357", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)19357", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:42" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)18564", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:45" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)17751,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "312", + "type": "t_array(t_uint256)39_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:310" + } + ], + "types": { + "t_array(t_uint256)39_storage": { + "label": "uint256[39]", + "numberOfBytes": "1248" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)17420": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)17729": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)17878": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)18192": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)18564": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)19008": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)19228": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)19357": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)19569": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)19704": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)17751": { + "label": "enum TradeKind", + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)17751,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "7c15ec8db2e19d549d8d3c16622ef1159b0b2d57e4c276018be8aed2cfbabcc3": { + "address": "0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF", + "txHash": "0x74f0c8120f6b59c5c5c493325aa6f6c5633db83bab754a79495dba762c0d0db1", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)19008", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)17878", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:28" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:32" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:36" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:39" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:160" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)11113", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)17420", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)18192", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)17482", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)18564", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)19228", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)11113", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:193" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)17420": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)17482": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)17878": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)18192": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)18564": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)19008": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)19228": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)19704": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index 54c5f75da0..7518551125 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.0.0"; +string constant VERSION = "3.0.1"; /** * @title Versioned diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index f3fc5e30a3..ac8371e7f2 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.0.0"; +string constant ASSET_VERSION = "3.0.1"; /** * @title VersionedAsset diff --git a/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json new file mode 100644 index 0000000000..d03e354462 --- /dev/null +++ b/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json @@ -0,0 +1,100 @@ +{ + "assets": { + "stkAAVE": "0x6647c880Eb8F57948AF50aB45fca8FE86C154D24", + "COMP": "0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1", + "CRV": "0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA", + "CVX": "0x4024c00bBD0C420E719527D88781bc1543e63dd5" + }, + "collateral": { + "DAI": "0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833", + "USDC": "0xBE9D23040fe22E8Bd8A88BF5101061557355cA04", + "USDT": "0x58D7bF13D3572b08dE5d96373b8097d94B1325ad", + "USDP": "0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89", + "TUSD": "0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2", + "BUSD": "0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423", + "aDAI": "0x256b89658bD831CC40283F42e85B1fa8973Db0c9", + "aUSDC": "0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51", + "aUSDT": "0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef", + "aBUSD": "0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05", + "aUSDP": "0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd", + "cDAI": "0x33A8d92B2BE84755441C2b6e39715c4b8938242c", + "cUSDC": "0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D", + "cUSDT": "0x0EEa20c426EcE7D3dA5b73946bb1626697aA7c59", + "cUSDP": "0xA7eCF508CdF5a88ae93b899DE4fcACcB43112Ce8", + "cWBTC": "0xa570BF93FC51406809dBf52aB898913541C91C20", + "cETH": "0xeC12e8412a7AE4598d754f4016D487c269719856", + "WBTC": "0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4", + "WETH": "0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3", + "EURT": "0xEBD07CE38e2f46031c982136012472A4D24AE070", + "wstETH": "0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C", + "rETH": "0x1103851D1FCDD3f88096fbed812c8FF01949cF9d", + "fUSDC": "0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA", + "fUSDT": "0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A", + "fDAI": "0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875", + "fFRAX": "0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92", + "cUSDCv3": "0x85b256e9051B781A0BC0A987857AD6166C94040a", + "cvx3Pool": "0x62C394620f674e85768a7618a6C202baE7fB8Dd1", + "cvxeUSDFRAXBP": "0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122", + "cvxMIM3Pool": "0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7", + "crv3Pool": "0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D", + "crveUSDFRAXBP": "0xC87CDFFD680D57BF50De4C364BF4277B8A90098E", + "crvMIM3Pool": "0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa", + "sDAI": "0xde0e2f0c9792617d3908d92a024caa846354cea2", + "cbETH": "0x3962695aCce0Efce11cFf997890f3D1D7467ec40", + "maUSDT": "0xd000a79bd2a07eb6d2e02ecad73437de40e52d69", + "maUSDC": "0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7", + "maDAI": "0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB", + "maWBTC": "0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250", + "maWETH": "0x878b995bDD2D9900BEE896Bd78ADd877672e1637", + "maStETH": "0x33E840e5711549358f6d4D11F9Ab2896B36E9822", + "aEthUSDC": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba" + }, + "erc20s": { + "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B", + "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7", + "USDP": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", + "TUSD": "0x0000000000085d4780B73119b644AE5ecd22b376", + "BUSD": "0x4Fabb145d64652a948d72533023f6E7A623C7C53", + "aDAI": "0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985", + "aUSDC": "0x60C384e226b120d93f3e0F4C502957b2B9C32B15", + "aUSDT": "0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9", + "aBUSD": "0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D", + "aUSDP": "0x80A574cC2B369dc496af6655f57a16a4f180BfAF", + "cDAI": "0xD048934408bb0e39F23c7ff5C1ac5F773D16D2df", + "cUSDC": "0x1c21E28F6cd7C4Be734cb60f9c6451484803924d", + "cUSDT": "0xD971Fd59e90E836eCF2b8adE76374102025084A1", + "cUSDP": "0xbe7B053E820c5FBe70a0f075DA0C931aD8816e4F", + "cWBTC": "0xb120c3429900DDF665b34882d7685e39BB01897B", + "cETH": "0xd0cb758e918ac6973a2959343ECa4F333d8d25B1", + "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", + "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "EURT": "0xC581b735A1688071A1746c968e0798D642EDE491", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "fUSDC": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", + "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7", + "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b", + "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B", + "cUSDCv3": "0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab", + "cvx3Pool": "0xaBd7E7a5C846eD497681a590feBED99e7157B6a3", + "cvxeUSDFRAXBP": "0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5", + "cvxMIM3Pool": "0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F", + "crv3Pool": "0xC9c37FC53682207844B058026024853A9C0b8c7B", + "crveUSDFRAXBP": "0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A", + "crvMIM3Pool": "0xe8461dB45A7430AA7aB40346E68821284980FdFD", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704", + "maUSDT": "0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2", + "maUSDC": "0x7f7b77e49d5b30445f222764a794afe14af062eb", + "maDAI": "0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb", + "maWBTC": "0xe0E1d3c6f09DA01399e84699722B11308607BBfC", + "maWETH": "0x291ed25eB61fcc074156eE79c5Da87e5DA94198F", + "maStETH": "0x97F9d5ed17A0C99B279887caD5254d15fb1B619B", + "aEthUSDC": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE" + } +} \ No newline at end of file diff --git a/scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json b/scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json new file mode 100644 index 0000000000..33f9664624 --- /dev/null +++ b/scripts/addresses/mainnet-3.0.1/1-tmp-deployments.json @@ -0,0 +1,35 @@ +{ + "prerequisites": { + "RSR": "0x320623b8e4ff03373931769a31fc52a4e78b5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "0xB81a1fa9A497953CEC7f370CACFA5cc364871A73", + "cvxMiningLib": "0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472", + "facadeRead": "0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C", + "facadeAct": "0x801fF27bacc7C00fBef17FC901504c79D59E845C", + "facadeWriteLib": "0x908Cd3B4B4B6c60d5EB7d1Ca7ECda0e7ceCd6dB1", + "basketLib": "0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8", + "facadeWrite": "0x3312507BC3F22430B34D5841A472c767DC5C36e4", + "deployer": "0x43587CAA7dE69C3c2aD0fb73D4C9da67A8E35b0b", + "rsrAsset": "0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6", + "implementations": { + "main": "0xF5366f67FF66A3CefcB18809a762D5b5931FebF8", + "trading": { + "gnosisTrade": "0x4e9B97957a0d1F4c25E42Ccc69E4d2665433FEA3", + "dutchTrade": "0x2387C22727ACb91519b80A15AEf393ad40dFdb2F" + }, + "components": { + "assetRegistry": "0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450", + "backingManager": "0xBbC532A80DD141449330c1232C953Da6801Aed01", + "basketHandler": "0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc", + "broker": "0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04", + "distributor": "0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac", + "furnace": "0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c", + "rsrTrader": "0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF", + "rTokenTrader": "0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF", + "rToken": "0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F", + "stRSR": "0xC98eaFc9F249D90e3E35E729e3679DD75A899c10" + } + } +} \ No newline at end of file diff --git a/test/fixtures.ts b/test/fixtures.ts index 15944a43b8..ff881e60d0 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -78,7 +78,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.0.0' +export const VERSION = '3.0.1' export type Collateral = | FiatCollateral From 0e03983e6089317b0f5b1d0d32ac3ae08f0c8e5a Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 11 Oct 2023 23:20:03 -0300 Subject: [PATCH 097/450] aavev3 and compoundv3 base tests (#965) Co-authored-by: Patrick McKelvy --- .github/workflows/tests.yml | 2 +- common/configuration.ts | 15 +++++++ .../aave-v3/AaveV3FiatCollateral.test.ts | 27 +++++++----- .../aave-v3/constants.ts | 34 +++++++++++++- .../individual-collateral/aave-v3/helpers.ts | 4 ++ .../compoundv3/CometTestSuite.test.ts | 2 + .../compoundv3/CusdcV3Wrapper.test.ts | 17 ++++--- .../compoundv3/constants.ts | 44 ++++++++++++++----- 8 files changed, 112 insertions(+), 33 deletions(-) create mode 100644 test/plugins/individual-collateral/aave-v3/helpers.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ea26bf7dda..e715f6d8e8 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -84,7 +84,7 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: npx hardhat test ./test/plugins/individual-collateral/cbeth/*.test.ts + - run: npx hardhat test ./test/plugins/individual-collateral/{cbeth,aave-v3,compoundv3}/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true diff --git a/common/configuration.ts b/common/configuration.ts index c9b10de792..e9af499437 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -110,6 +110,9 @@ interface INetworkConfig { MORPHO_REWARDS_DISTRIBUTOR?: string MORPHO_AAVE_LENS?: string COMET_REWARDS?: string + COMET_CONFIGURATOR?: string + COMET_PROXY_ADMIN?: string + COMET_EXT?: string AAVE_V3_INCENTIVES_CONTROLLER?: string AAVE_V3_POOL?: string } @@ -216,6 +219,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + COMET_CONFIGURATOR: '0x316f9708bB98af7dA9c68C1C3b5e79039cD336E3', + COMET_PROXY_ADMIN: '0x1EC63B5883C3481134FD50D5DAebc83Ecd2E8779', + COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', }, @@ -311,6 +317,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + COMET_CONFIGURATOR: '0x316f9708bB98af7dA9c68C1C3b5e79039cD336E3', + COMET_PROXY_ADMIN: '0x1EC63B5883C3481134FD50D5DAebc83Ecd2E8779', + COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', }, @@ -406,6 +415,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', + COMET_CONFIGURATOR: '0x316f9708bB98af7dA9c68C1C3b5e79039cD336E3', + COMET_PROXY_ADMIN: '0x1EC63B5883C3481134FD50D5DAebc83Ecd2E8779', + COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', }, @@ -525,6 +537,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, GNOSIS_EASY_AUCTION: '0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02', // mock COMET_REWARDS: '0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1', + COMET_CONFIGURATOR: '0x45939657d1CA34A8FA39A924B71D28Fe8431e581', + COMET_PROXY_ADMIN: '0xbdE8F31D2DdDA895264e27DD990faB3DC87b372d', + COMET_EXT: '0x2F9E3953b2Ef89fA265f2a32ed9F80D00229125B', AAVE_V3_POOL: '0xA238Dd80C259a72e81d7e4664a9801593F98d1c5', AAVE_V3_INCENTIVES_CONTROLLER: '0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44', }, diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index cb7876809f..89bc877c66 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -13,10 +13,16 @@ import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { noop } from 'lodash' import { PRICE_TIMEOUT } from '#/test/fixtures' -import { networkConfig } from '#/common/configuration' -import { getResetFork } from '../helpers' +import { resetFork } from './helpers' import { whileImpersonating } from '#/test/utils/impersonation' -import { AAVE_V3_USDC_POOL, AAVE_V3_INCENTIVES_CONTROLLER } from './constants' +import { + forkNetwork, + AUSDC_V3, + AAVE_V3_USDC_POOL, + AAVE_V3_INCENTIVES_CONTROLLER, + USDC_USD_PRICE_FEED, + USDC_HOLDER, +} from './constants' interface AaveV3FiatCollateralFixtureContext extends CollateralFixtureContext { staticWrapper: MockStaticATokenV3LM @@ -34,7 +40,7 @@ type CollateralParams = Parameters[0] & // This defines options for the Aave V3 USDC Market export const defaultCollateralOpts: CollateralParams = { priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: networkConfig[1].chainlinkFeeds.USDC!, + chainlinkFeed: USDC_USD_PRICE_FEED, oracleError: fp('0.0025'), erc20: '', // to be set maxTradeVolume: fp('1e6'), @@ -52,11 +58,7 @@ export const deployCollateral = async (opts: Partial = {}) => const V3LMFactory = await ethers.getContractFactory('MockStaticATokenV3LM') const staticWrapper = await V3LMFactory.deploy(AAVE_V3_USDC_POOL, AAVE_V3_INCENTIVES_CONTROLLER) await staticWrapper.deployed() - await staticWrapper.initialize( - networkConfig[1].tokens.aEthUSDC!, - 'Static Aave Ethereum USDC', - 'saEthUSDC' - ) + await staticWrapper.initialize(AUSDC_V3, 'Static Aave Ethereum USDC', 'saEthUSDC') combinedOpts.erc20 = staticWrapper.address } @@ -124,8 +126,8 @@ const mintCollateralTo: MintCollateralFunc = ) => { const requiredCollat = await ctx.staticWrapper.previewMint(amount) - // USDC Richie Rich - await whileImpersonating('0x0A59649758aa4d66E25f08Dd01271e891fe52199', async (signer) => { + // Impersonate holder + await whileImpersonating(USDC_HOLDER, async (signer) => { await ctx.baseToken .connect(signer) .approve(ctx.staticWrapper.address, ethers.constants.MaxUint256) @@ -200,7 +202,7 @@ export const stableOpts = { mintCollateralTo, reduceRefPerTok, increaseRefPerTok, - resetFork: getResetFork(18000000), + resetFork, collateralName: 'Aave V3 Fiat Collateral (USDC)', reduceTargetPerRef, increaseTargetPerRef, @@ -214,6 +216,7 @@ export const stableOpts = { itChecksPriceChanges: it, getExpectedPrice, toleranceDivisor: bn('1e9'), // 1e15 adjusted for ((x + 1)/x) timestamp precision + targetNetwork: forkNetwork, } collateralTests(stableOpts) diff --git a/test/plugins/individual-collateral/aave-v3/constants.ts b/test/plugins/individual-collateral/aave-v3/constants.ts index 37e6c70f75..0de2aef4f6 100644 --- a/test/plugins/individual-collateral/aave-v3/constants.ts +++ b/test/plugins/individual-collateral/aave-v3/constants.ts @@ -1,2 +1,32 @@ -export const AAVE_V3_USDC_POOL = '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2' -export const AAVE_V3_INCENTIVES_CONTROLLER = '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb' +import { networkConfig } from '../../../../common/configuration' +import { useEnv } from '#/utils/env' + +export const forkNetwork = useEnv('FORK_NETWORK') ?? 'mainnet' +let chainId + +switch (forkNetwork) { + case 'mainnet': + chainId = '1' + break + case 'base': + chainId = '8453' + break + default: + chainId = '1' + break +} + +const aUSDC_NAME = chainId == '8453' ? 'aBasUSDbC' : 'aEthUSDC' + +export const AUSDC_V3 = networkConfig[chainId].tokens[aUSDC_NAME]! +export const USDC_USD_PRICE_FEED = networkConfig[chainId].chainlinkFeeds['USDC']! // currently same key for USDC and USDbC + +export const USDC_HOLDER = + chainId == '8453' + ? '0x4c80E24119CFB836cdF0a6b53dc23F04F7e652CA' + : '0x0A59649758aa4d66E25f08Dd01271e891fe52199' + +export const AAVE_V3_USDC_POOL = networkConfig[chainId].AAVE_V3_POOL! +export const AAVE_V3_INCENTIVES_CONTROLLER = networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + +export const FORK_BLOCK = chainId == '8453' ? 4446300 : 18000000 diff --git a/test/plugins/individual-collateral/aave-v3/helpers.ts b/test/plugins/individual-collateral/aave-v3/helpers.ts new file mode 100644 index 0000000000..c6c430bc8a --- /dev/null +++ b/test/plugins/individual-collateral/aave-v3/helpers.ts @@ -0,0 +1,4 @@ +import { getResetFork } from '../helpers' +import { FORK_BLOCK } from './constants' + +export const resetFork = getResetFork(FORK_BLOCK) diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 3ea997da0d..45f9e0cc8e 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -33,6 +33,7 @@ import { setNextBlockTimestamp, } from '../../../utils/time' import { + forkNetwork, ORACLE_ERROR, ORACLE_TIMEOUT, PRICE_TIMEOUT, @@ -400,6 +401,7 @@ const opts = { resetFork, collateralName: 'CompoundV3USDC', chainlinkDefaultAnswer, + targetNetwork: forkNetwork, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index 8a44e447af..b47b71bff9 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -5,7 +5,7 @@ import { useEnv } from '#/utils/env' import { whileImpersonating } from '../../../utils/impersonation' import { advanceTime, advanceBlocks } from '../../../utils/time' import { allocateUSDC, enableRewardsAccrual, mintWcUSDC, makewCSUDC, resetFork } from './helpers' -import { COMP, REWARDS } from './constants' +import { forkNetwork, COMP, REWARDS } from './constants' import { ERC20Mock, CometInterface, @@ -20,6 +20,8 @@ import { MAX_UINT256, ZERO_ADDRESS } from '../../../../common/constants' const describeFork = useEnv('FORK') ? describe : describe.skip +const itL1 = forkNetwork != 'base' ? it : it.skip + describeFork('Wrapped CUSDCv3', () => { let bob: SignerWithAddress let charles: SignerWithAddress @@ -555,7 +557,7 @@ describeFork('Wrapped CUSDCv3', () => { const baseIndexScale = await cusdcV3.baseIndexScale() const expectedExchangeRate = totalsBasic.baseSupplyIndex.mul(bn('1e6')).div(baseIndexScale) expect(await cusdcV3.balanceOf(wcusdcV3.address)).to.equal(0) - expect(await wcusdcV3.exchangeRate()).to.equal(expectedExchangeRate) + expect(await wcusdcV3.exchangeRate()).to.be.closeTo(expectedExchangeRate, 1) }) it('returns the correct exchange rate with a positive balance', async () => { @@ -639,15 +641,16 @@ describeFork('Wrapped CUSDCv3', () => { await advanceBlocks(1) expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(0) - expect(await compToken.balanceOf(bob.address)).to.equal( - await compToken.balanceOf(don.address) - ) + const balanceBob = await compToken.balanceOf(bob.address) + const balanceDon = await compToken.balanceOf(don.address) + expect(balanceDon).lessThanOrEqual(balanceBob) + expect(balanceBob).to.be.closeTo(balanceDon, balanceBob.mul(5).div(1000)) // within 0.5% }) // In this forked block, rewards accrual is not yet enabled in Comet - it('claims no rewards when rewards accrual is not enabled', async () => { + // Only applies to Mainnet forks (L1) + itL1('claims no rewards when rewards accrual is not enabled', async () => { const compToken = await ethers.getContractAt('ERC20Mock', COMP) - await advanceTime(1000) await wcusdcV3.connect(bob).claimTo(bob.address, bob.address) expect(await compToken.balanceOf(bob.address)).to.equal(0) diff --git a/test/plugins/individual-collateral/compoundv3/constants.ts b/test/plugins/individual-collateral/compoundv3/constants.ts index 0847fe2ae9..f6cbb6ff43 100644 --- a/test/plugins/individual-collateral/compoundv3/constants.ts +++ b/test/plugins/individual-collateral/compoundv3/constants.ts @@ -1,17 +1,39 @@ import { bn, fp } from '../../../../common/numbers' import { networkConfig } from '../../../../common/configuration' +import { useEnv } from '#/utils/env' + +export const forkNetwork = useEnv('FORK_NETWORK') ?? 'mainnet' +let chainId + +switch (forkNetwork) { + case 'mainnet': + chainId = '1' + break + case 'base': + chainId = '8453' + break + default: + chainId = '1' + break +} + +const USDC_NAME = chainId == '8453' ? 'USDbC' : 'USDC' +const CUSDC_NAME = chainId == '8453' ? 'cUSDbCv3' : 'cUSDCv3' // Mainnet Addresses -export const RSR = networkConfig['31337'].tokens.RSR as string -export const USDC_USD_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.USDC as string -export const CUSDC_V3 = networkConfig['31337'].tokens.cUSDCv3 as string -export const COMP = networkConfig['31337'].tokens.COMP as string -export const REWARDS = '0x1B0e765F6224C21223AeA2af16c1C46E38885a40' -export const USDC = networkConfig['31337'].tokens.USDC as string -export const USDC_HOLDER = '0x0a59649758aa4d66e25f08dd01271e891fe52199' -export const COMET_CONFIGURATOR = '0x316f9708bB98af7dA9c68C1C3b5e79039cD336E3' -export const COMET_PROXY_ADMIN = '0x1EC63B5883C3481134FD50D5DAebc83Ecd2E8779' -export const COMET_EXT = '0x285617313887d43256F852cAE0Ee4de4b68D45B0' +export const RSR = networkConfig[chainId].tokens.RSR as string +export const USDC_USD_PRICE_FEED = networkConfig[chainId].chainlinkFeeds.USDC as string +export const CUSDC_V3 = networkConfig[chainId].tokens[CUSDC_NAME]! +export const COMP = networkConfig[chainId].tokens.COMP as string +export const REWARDS = networkConfig[chainId].COMET_REWARDS! +export const USDC = networkConfig[chainId].tokens[USDC_NAME]! +export const USDC_HOLDER = + chainId == '8453' + ? '0x4c80E24119CFB836cdF0a6b53dc23F04F7e652CA' + : '0x0a59649758aa4d66e25f08dd01271e891fe52199' +export const COMET_CONFIGURATOR = networkConfig[chainId].COMET_CONFIGURATOR! +export const COMET_PROXY_ADMIN = networkConfig[chainId].COMET_PROXY_ADMIN! +export const COMET_EXT = networkConfig[chainId].COMET_EXT! export const PRICE_TIMEOUT = bn(604800) // 1 week export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds @@ -21,4 +43,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000000) export const USDC_DECIMALS = bn(6) -export const FORK_BLOCK = 15850930 +export const FORK_BLOCK = chainId == '8453' ? 4446300 : 15850930 From ef0a1c3f15c39ef05e20c574f6bdce7ed64c60f7 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 12 Oct 2023 12:26:14 -0300 Subject: [PATCH 098/450] Trust M-01 & M-02: RevenueTrader.settleTrade() (#969) Co-authored-by: Taylor Brent --- contracts/p0/RevenueTrader.sol | 20 ++- contracts/p1/RevenueTrader.sol | 11 +- test/Revenues.test.ts | 313 +++++++++++++++++++++++++++++++++ 3 files changed, 336 insertions(+), 8 deletions(-) diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 1d47a5e494..a1186f2924 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -32,14 +32,12 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) - public - override(ITrading, TradingP0) - notTradingPausedOrFrozen - returns (ITrade trade) - { + function settleTrade(IERC20 sell) public override(ITrading, TradingP0) returns (ITrade trade) { trade = super.settleTrade(sell); - _distributeTokenToBuy(); + try this.distributeTokenToBuy() {} catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + } // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -80,6 +78,14 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { { require(erc20s.length > 0, "empty erc20s list"); require(erc20s.length == kinds.length, "length mismatch"); + + RevenueTotals memory revTotals = main.distributor().totals(); + require( + (tokenToBuy == main.rsr() && revTotals.rsrTotal > 0) || + (address(tokenToBuy) == address(main.rToken()) && revTotals.rTokenTotal > 0), + "zero distribution" + ); + main.assetRegistry().refresh(); IAsset assetToBuy = main.assetRegistry().toAsset(tokenToBuy); diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 1065fb96e7..577babb963 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -53,7 +53,10 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant - _distributeTokenToBuy(); + try this.distributeTokenToBuy() {} catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + } // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -107,6 +110,12 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { uint256 len = erc20s.length; require(len > 0, "empty erc20s list"); require(len == kinds.length, "length mismatch"); + RevenueTotals memory revTotals = distributor.totals(); + require( + (tokenToBuy == rsr && revTotals.rsrTotal > 0) || + (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal > 0), + "zero distribution" + ); // Calculate if the trade involves any RToken // Distribute tokenToBuy if supplied in ERC20s list diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 8c85df62d4..33905d7d78 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -2126,6 +2126,319 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) + it('Should not start trades if no distribution defined', async () => { + // Check funds in Backing Manager and destinations + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + await expect( + rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) + ).to.be.revertedWith('zero distribution') + + // Check funds, nothing changed + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + }) + + it('Should handle no distribution defined when settling trade', async () => { + // Set COMP tokens as reward + rewardAmountCOMP = bn('0.8e18') + + // COMP Rewards + await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) + + // Collect revenue + // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, rewardAmountCOMP], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, bn(0)], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + compToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // COMP -> RSR Auction + await expectTrade(rsrTrader, { + sell: compToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // COMP -> RToken Auction + await expectTrade(rTokenTrader, { + sell: compToken.address, + buy: rToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check funds in Market + expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken, + }) + + // Set no distribution for StRSR + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check balances + // StRSR - Still in trader, was not distributed due to zero distribution + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + + // Furnace - RTokens transferred to destination + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(furnace.address)).to.closeTo( + minBuyAmtRToken, + minBuyAmtRToken.div(bn('1e15')) + ) + }) + + it('Should allow to settle trade (and not distribute) even if trading paused or frozen', async () => { + // Set COMP tokens as reward + rewardAmountCOMP = bn('0.8e18') + + // COMP Rewards + await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) + + // Collect revenue + // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, rewardAmountCOMP], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, bn(0)], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + compToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // COMP -> RSR Auction + await expectTrade(rsrTrader, { + sell: compToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // COMP -> RToken Auction + await expectTrade(rTokenTrader, { + sell: compToken.address, + buy: rToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check funds in Market + expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken, + }) + + // Pause Trading + await main.connect(owner).pauseTrading() + + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Distribution did not occurr, funds are in Traders + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(minBuyAmtRToken) + + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(furnace.address)).to.equal(bn(0)) + }) + it('Should trade even if price for buy token = 0', async () => { // Set AAVE tokens as reward rewardAmountAAVE = bn('1e18') From f4fa0cd482e395c57de2688e683666106f90da08 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 13 Oct 2023 09:42:13 +0530 Subject: [PATCH 099/450] Add Fork Oracle Support (#978) --- contracts/forknet/ForkedOracle.sol | 52 ++++++++++++++++++++++++++ scripts/replaceOracles.ts | 60 ++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+) create mode 100644 contracts/forknet/ForkedOracle.sol create mode 100644 scripts/replaceOracles.ts diff --git a/contracts/forknet/ForkedOracle.sol b/contracts/forknet/ForkedOracle.sol new file mode 100644 index 0000000000..cb0f4b0d99 --- /dev/null +++ b/contracts/forknet/ForkedOracle.sol @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +interface AggregatorV3MixedInterface { + function decimals() external view returns (uint8); + + function description() external view returns (string memory); + + function latestRoundData() + external + view + returns ( + uint80 roundId, + int256 answer, + uint256 startedAt, + uint256 updatedAt, + uint80 answeredInRound + ); + + function aggregator() external view returns (address); +} + +contract ForkedOracle is AggregatorV3MixedInterface { + address public constant aggregator = address(0x1); + string public constant description = "FORKED"; + + uint8 public decimals; + int256 private answerInternal; + + function setData(uint8 _decimals, int256 _answer) external { + decimals = _decimals; + answerInternal = _answer; + } + + function latestRoundData() + external + view + returns ( + uint80 roundId, + int256 answer, + uint256 startedAt, + uint256 updatedAt, + uint80 answeredInRound + ) + { + roundId = 1; + answer = answerInternal; + startedAt = 0; + updatedAt = block.timestamp - 1; + answeredInRound = 1; + } +} diff --git a/scripts/replaceOracles.ts b/scripts/replaceOracles.ts new file mode 100644 index 0000000000..e9a72a8225 --- /dev/null +++ b/scripts/replaceOracles.ts @@ -0,0 +1,60 @@ +import hre, { ethers } from 'hardhat' + +const supportedNodes = ['anvil', 'hardhat'] +const oracleList = [ + '0x759bbc1be8f90ee6457c44abc7d443842a976d02', + '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9', + '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6', + '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D', + '0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A', + '0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3', + '0xec746eCF986E2927Abd291a2A1716c940100f8Ba', + '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', + '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', + '0x7A364e8770418566e3eb2001A96116E6138Eb32F', + '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', + '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', + '0x01D391A48f4F7339aC64CA2c83a07C22F95F587a', + '0xb49f677943BC038e9857d61E7d053CaA2C1734C1', + '0x86392dc19c0b719886221c78ab11eb8cf5c52812', + '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', + '0x536218f9E9Eb48863970252233c8F271f554C2d0', + '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', + '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', +] + +async function main() { + const clientVersion = await hre.ethers.provider.send('web3_clientVersion', []) + const isSupported = supportedNodes.some((node) => clientVersion.toLowerCase().includes(node)) + console.log({ clientVersion, isSupported }) + + if (!isSupported) { + throw Error('Unsupported Network') + } + + const forkedOracleArtifact = await hre.artifacts.readArtifact('ForkedOracle') + + for (const oracleAddress of oracleList) { + const oracle = await hre.ethers.getContractAt('ForkedOracle', oracleAddress) + + const description = await oracle.description() + const decimals = await oracle.decimals() + const roundData = await oracle.latestRoundData() + + console.log(`-------- Updating ${description} (${oracle.address}) Oracle...`) + console.log(`>>>> Current Answer:`, ethers.utils.formatUnits(roundData.answer, decimals)) + + console.log('>>>> Updating code...') + await hre.ethers.provider.send('hardhat_setCode', [ + oracle.address, + forkedOracleArtifact.deployedBytecode, + ]) + console.log('>>>> Updating data...') + await oracle.setData(decimals, roundData.answer, { + gasLimit: 10_000_000, + }) + console.log('>>>> Done!') + } +} + +main().catch((e) => console.error(e)) From 535dbc3f28d307817088374b1145cb92a5e08886 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:47:50 -0300 Subject: [PATCH 100/450] TRUST M-06: Keep buffer when minting rtoken revenue (#972) --- contracts/p0/BackingManager.sol | 11 ++-- contracts/p1/BackingManager.sol | 9 +-- test/Revenues.test.ts | 100 ++++++++++++++++++++++++++++++++ 3 files changed, 112 insertions(+), 8 deletions(-) diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index c22df732c7..18e2427b8f 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -170,12 +170,15 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // Mint revenue RToken // Keep backingBuffer worth of collateral before recognizing revenue - uint192 needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // {BU} - if (basketsHeld.bottom.gt(needed)) { - main.rToken().mint(basketsHeld.bottom.minus(needed)); - needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // keep buffer + { + uint192 baskets = (basketsHeld.bottom.div(FIX_ONE + backingBuffer)); + if (baskets > main.rToken().basketsNeeded()) { + main.rToken().mint(baskets - main.rToken().basketsNeeded()); + } } + uint192 needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // {BU} + // Handout excess assets above what is needed, including any newly minted RToken RevenueTotals memory totals = main.distributor().totals(); for (uint256 i = 0; i < erc20s.length; i++) { diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index a64ff3f412..edb22151d2 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -220,12 +220,13 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // Mint revenue RToken // Keep backingBuffer worth of collateral before recognizing revenue - uint192 needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // {BU} - if (basketsHeld.bottom > needed) { - rToken.mint(basketsHeld.bottom - needed); - needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // keep buffer + uint192 baskets = (basketsHeld.bottom.div(FIX_ONE + backingBuffer)); + if (baskets > rToken.basketsNeeded()) { + rToken.mint(baskets - rToken.basketsNeeded()); } + uint192 needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // {BU} + // At this point, even though basketsNeeded may have changed, we are: // - We're fully collateralized // - The BU exchange rate {BU/rTok} did not decrease diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 33905d7d78..b8526f1395 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -4172,6 +4172,106 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await token2.balanceOf(rsrTrader.address)).to.equal(0) expect(await token2.balanceOf(rTokenTrader.address)).to.equal(0) }) + + it('Should handle backingBuffer when minting RTokens from collateral appreciation', async () => { + // Set distribution for RToken only (f=0) + await distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + + await distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + + // Set Backing buffer + const backingBuffer = fp('0.05') + await backingManager.connect(owner).setBackingBuffer(backingBuffer) + + // Issue additional RTokens + const newIssueAmount = bn('900e18') + await rToken.connect(addr1).issue(newIssueAmount) + + // Check Price and Assets value + const totalIssuedAmount = issueAmount.add(newIssueAmount) + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount + ) + expect(await rToken.totalSupply()).to.equal(totalIssuedAmount) + + // Change redemption rate for AToken and CToken to double + await token2.setExchangeRate(fp('1.10')) + await token3.setExchangeRate(fp('1.10')) + await collateral2.refresh() + await collateral3.refresh() + + // Check Price (unchanged) and Assets value (now 10% higher) + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount.mul(110).div(100) + ) + expect(await rToken.totalSupply()).to.equal(totalIssuedAmount) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set expected minting, based on f = 0.6 + const excessRevenue = totalIssuedAmount + .mul(110) + .div(100) + .mul(BN_SCALE_FACTOR) + .div(fp('1').add(backingBuffer)) + .sub(await rToken.basketsNeeded()) + + // Set expected auction values + const expectedToFurnace = excessRevenue + const currentTotalSupply: BigNumber = await rToken.totalSupply() + const newTotalSupply: BigNumber = currentTotalSupply.add(excessRevenue) + + // Collect revenue and mint new tokens + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rToken, + name: 'Transfer', + args: [ZERO_ADDRESS, backingManager.address, withinQuad(excessRevenue)], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check Price (unchanged) and Assets value - Supply has increased 10% + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount.mul(110).div(100) + ) + expect(await rToken.totalSupply()).to.be.closeTo( + newTotalSupply, + newTotalSupply.mul(5).div(1000) + ) // within 0.5% + + // Check destinations after newly minted tokens + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( + expectedToFurnace, + expectedToFurnace.mul(5).div(1000) + ) + + // Check Price and Assets value - RToken price increases due to melting + const updatedRTokenPrice: BigNumber = newTotalSupply + .mul(BN_SCALE_FACTOR) + .div(await rToken.totalSupply()) + await expectRTokenPrice(rTokenAsset.address, updatedRTokenPrice, ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount.mul(110).div(100) + ) + }) }) context('With simple basket of ATokens and CTokens: no issued RTokens', function () { From ab79276de8f10727e83ee175ea19ed7587fda334 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 16 Oct 2023 13:48:33 -0300 Subject: [PATCH 101/450] TRUST Recommendation 1: reward and underlying checks in RewardERC20 wrappers (#976) --- .../assets/erc20/RewardableERC20Wrapper.sol | 4 ++++ .../assets/erc20/RewardableERC4626Vault.sol | 4 +++- test/plugins/RewardableERC20.test.ts | 23 ++++++++++++++++++- 3 files changed, 29 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol index e2a4ec927f..6ae34a21a8 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol @@ -30,6 +30,10 @@ abstract contract RewardableERC20Wrapper is RewardableERC20 { string memory _symbol, IERC20 _rewardToken ) ERC20(_name, _symbol) RewardableERC20(_rewardToken, _underlying.decimals()) { + require( + address(_rewardToken) != address(_underlying), + "reward and underlying cannot match" + ); underlying = _underlying; underlyingDecimals = _underlying.decimals(); } diff --git a/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol b/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol index 284f717c2e..3966e66ea9 100644 --- a/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol +++ b/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol @@ -27,7 +27,9 @@ abstract contract RewardableERC4626Vault is ERC4626, RewardableERC20 { ) ERC4626(_asset, _name, _symbol) RewardableERC20(_rewardToken, _asset.decimals() + _decimalsOffset()) - {} + { + require(address(_rewardToken) != address(_asset), "reward and asset cannot match"); + } // solhint-enable no-empty-blocks diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index abc94deb66..55d71e5698 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -24,6 +24,7 @@ interface RewardableERC20Fixture { rewardableVault: RewardableERC4626VaultTest | RewardableERC20WrapperTest rewardableAsset: ERC20MockRewarding rewardToken: ERC20MockDecimals + rewardableVaultFactory: ContractFactory } // 18 cases: test two wrappers with 2 combinations of decimals [6, 8, 18] @@ -76,6 +77,7 @@ for (const wrapperName of wrapperNames) { rewardableVault, rewardableAsset, rewardToken, + rewardableVaultFactory, } } return fixture @@ -123,6 +125,7 @@ for (const wrapperName of wrapperNames) { let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest let rewardableAsset: ERC20MockRewarding let rewardToken: ERC20MockDecimals + let rewardableVaultFactory: ContractFactory // Main let alice: Wallet @@ -141,7 +144,8 @@ for (const wrapperName of wrapperNames) { beforeEach(async () => { // Deploy fixture - ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) + ;({ rewardableVault, rewardableAsset, rewardToken, rewardableVaultFactory } = + await loadFixture(fixture)) await rewardableAsset.mint(alice.address, initBalance) await rewardableAsset.connect(alice).approve(rewardableVault.address, initBalance) @@ -223,6 +227,23 @@ for (const wrapperName of wrapperNames) { ) }) + it('checks reward and underlying token are not the same', async () => { + const errorMsg = + wrapperName == Wrapper.ERC4626 + ? 'reward and asset cannot match' + : 'reward and underlying cannot match' + + // Attempt to deploy with same reward and underlying + await expect( + rewardableVaultFactory.deploy( + rewardableAsset.address, + 'Rewarding Test Asset Vault', + 'vrewardTEST', + rewardableAsset.address + ) + ).to.be.revertedWith(errorMsg) + }) + it('1 wei supply', async () => { await rewardableVault.connect(alice).deposit('1', alice.address) expect(await rewardableVault.rewardsPerShare()).to.equal(bn(0)) From 9335ad1f73c3f2c69c9abe6a5965c6d7a9f10080 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Mon, 16 Oct 2023 17:01:32 -0400 Subject: [PATCH 102/450] Deploy stargate (#963) --- .github/workflows/tests.yml | 2 +- common/configuration.ts | 10 ++ .../stargate/StargateRewardableWrapper.sol | 7 +- .../interfaces/IStargateLPStaking.sol | 4 +- .../stargate/mocks/StargateLPStakingMock.sol | 6 +- .../8453-tmp-assets-collateral.json | 8 +- .../deploy_stargate_usdc_collateral.ts | 49 +++++--- .../deploy_stargate_usdt_collateral.ts | 2 +- .../verify_stargate_usdc.ts | 114 ++++++++++++++++++ .../individual-collateral/collateralTests.ts | 12 +- .../stargate/StargateUSDCTestSuite.test.ts | 71 +++++++++-- .../stargate/constants.ts | 53 ++++++-- 12 files changed, 288 insertions(+), 50 deletions(-) create mode 100644 scripts/verification/collateral-plugins/verify_stargate_usdc.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e715f6d8e8..62e19d8665 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -84,7 +84,7 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: npx hardhat test ./test/plugins/individual-collateral/{cbeth,aave-v3,compoundv3}/*.test.ts + - run: npx hardhat test ./test/plugins/individual-collateral/{cbeth,aave-v3,compoundv3,stargate}/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true diff --git a/common/configuration.ts b/common/configuration.ts index e9af499437..e6e1f846e3 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -62,10 +62,13 @@ export interface ITokens { cbETH?: string STG?: string sUSDC?: string + sUSDbC?: string sUSDT?: string sETH?: string MORPHO?: string astETH?: string + wsgUSDC?: string + wsgUSDbC?: string // Morpho Aave maUSDC?: string @@ -115,6 +118,7 @@ interface INetworkConfig { COMET_EXT?: string AAVE_V3_INCENTIVES_CONTROLLER?: string AAVE_V3_POOL?: string + STARGATE_STAKING_CONTRACT?: string } export const networkConfig: { [key: string]: INetworkConfig } = { @@ -224,6 +228,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', + STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' }, '1': { name: 'mainnet', @@ -322,6 +327,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', + STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' }, '3': { name: 'tenderly', @@ -420,6 +426,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', + STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' }, '5': { name: 'goerli', @@ -522,6 +529,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aBasUSDbC: '0x0a1d576f3eFeF75b330424287a95A366e8281D54', aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', + sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', + STG: '0xE3B53AF74a4BF62Ae5511055290838050bf764Df' }, chainlinkFeeds: { DAI: '0x591e79239a7d679378ec8c847e5038150364c78f', // 0.3%, 24hr @@ -542,6 +551,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x2F9E3953b2Ef89fA265f2a32ed9F80D00229125B', AAVE_V3_POOL: '0xA238Dd80C259a72e81d7e4664a9801593F98d1c5', AAVE_V3_INCENTIVES_CONTROLLER: '0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44', + STARGATE_STAKING_CONTRACT: '0x06Eb48763f117c7Be887296CDcdfad2E4092739C' }, } diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 9252a9985f..838695d183 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -23,7 +23,12 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { address(pool_) != address(0), "Invalid address" ); - require(address(stargate_) == address(stakingContract_.stargate()), "Wrong stargate"); + try stakingContract_.stargate() returns (address stargateAddress) { + require(stargateAddress == address(stargate_), "Wrong stargate"); + } catch { + // using LPStakingTime contract instead + require(stakingContract_.eToken() == address(stargate_), "Wrong stargate"); + } uint256 poolLength = stakingContract_.poolLength(); uint256 pid = type(uint256).max; diff --git a/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol b/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol index 1dada23b04..dc9e62ff5e 100644 --- a/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol +++ b/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol @@ -6,7 +6,9 @@ import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; interface IStargateLPStaking { function poolLength() external view returns (uint256); - function stargate() external view returns (IERC20); + function stargate() external view returns (address); + + function eToken() external view returns (address); // Info of each pool. struct PoolInfo { diff --git a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol index 3ab7898697..2123564b67 100644 --- a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol +++ b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol @@ -10,13 +10,15 @@ contract StargateLPStakingMock is IStargateLPStaking { mapping(uint256 => mapping(address => uint256)) poolToUserBalance; ERC20Mock public immutable stargateMock; - IERC20 public immutable stargate; + address public immutable stargate; + address public immutable eToken; uint256 public totalAllocPoint = 0; constructor(ERC20Mock stargateMock_) { stargateMock = stargateMock_; - stargate = stargateMock_; + stargate = address(stargateMock_); + eToken = address(stargateMock_); } function poolLength() external view override returns (uint256) { diff --git a/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json index ec42edd113..60168a94a2 100644 --- a/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json +++ b/scripts/addresses/base-3.0.0/8453-tmp-assets-collateral.json @@ -8,7 +8,8 @@ "USDbC": "0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB", "cbETH": "0x5fE248625aC2AB0e17A115fef288f17AF1952402", "cUSDbCv3": "0xa372EC846131FBf9AE8b589efa3D041D9a94dF41", - "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b" + "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b", + "wsgUSDbC": "0x15395aCCbF8c6b28671fe41624D599624709a2D6" }, "erc20s": { "COMP": "0x9e1028F5F1D5eDE59748FFceE5532509976840E0", @@ -17,6 +18,7 @@ "USDbC": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", "cbETH": "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22", "cUSDbCv3": "0xbC0033679AEf41Fb9FeB553Fdf55a8Bb2fC5B29e", - "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b" + "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b", + "wsgUSDbC": "0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D" } -} +} \ No newline at end of file diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts index 6ba2fee7b1..5db4436ea9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts @@ -23,6 +23,7 @@ import { STAKING_CONTRACT, SUSDC, } from '../../../../test/plugins/individual-collateral/stargate/constants' +import { useEnv } from '#/utils/env' async function main() { // ==== Read Configuration ==== @@ -50,19 +51,34 @@ async function main() { /******** Deploy Stargate USDC Wrapper **************************/ - const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargatePoolWrapper') + const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') + let chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' + let USDC_NAME = 'USDC' + let name = 'Wrapped Stargate USDC' + let symbol = 'wsgUSDC' + let sUSDC = networkConfig[chainIdKey].tokens.sUSDC + let oracleError = fp('0.0025') + + if (chainIdKey == '8453') { + USDC_NAME = 'USDbC' + name = 'Wrapped Stargate USDbC' + symbol = 'wsgUSDbC' + sUSDC = networkConfig[chainIdKey].tokens.sUSDbC + + oracleError = fp('0.003') + } const erc20 = await WrapperFactory.deploy( - 'Wrapped Stargate USDC', - 'wSTG-USDC', - networkConfig[chainId].tokens.STG, - STAKING_CONTRACT, - SUSDC + name, + symbol, + networkConfig[chainIdKey].tokens.STG, + networkConfig[chainIdKey].STARGATE_STAKING_CONTRACT, + sUSDC ) await erc20.deployed() console.log( - `Deployed Wrapper for Stargate USDC on ${hre.network.name} (${chainId}): ${erc20.address} ` + `Deployed Wrapper for Stargate ${USDC_NAME} on ${hre.network.name} (${chainIdKey}): ${erc20.address} ` ) const StargateCollateralFactory: StargatePoolFiatCollateral__factory = @@ -73,13 +89,13 @@ async function main() { ).deploy( { priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: fp('0.0025').toString(), // 0.25%, + chainlinkFeed: networkConfig[chainIdKey].chainlinkFeeds.USDC!, + oracleError: oracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, + oracleTimeout: oracleTimeout(chainIdKey, '86400').toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% + defaultThreshold: fp('0.01').add(oracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding.toString() @@ -88,10 +104,15 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - console.log(`Deployed Stargate USDC to ${hre.network.name} (${chainId}): ${collateral.address}`) + console.log(`Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}`) - assetCollDeployments.collateral.sUSDC = collateral.address - assetCollDeployments.erc20s.sUSDC = erc20.address + if (chainIdKey == '8453') { + assetCollDeployments.collateral.wsgUSDbC = collateral.address + assetCollDeployments.erc20s.wsgUSDbC = erc20.address + } else { + assetCollDeployments.collateral.wsgUSDC = collateral.address + assetCollDeployments.erc20s.wsgUSDC = erc20.address + } deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts index 2d317a40c3..8a43556a52 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts @@ -50,7 +50,7 @@ async function main() { /******** Deploy Stargate USDT Wrapper **************************/ - const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargatePoolWrapper') + const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') const erc20 = await WrapperFactory.deploy( 'Wrapped Stargate USDT', diff --git a/scripts/verification/collateral-plugins/verify_stargate_usdc.ts b/scripts/verification/collateral-plugins/verify_stargate_usdc.ts new file mode 100644 index 0000000000..3973a5ee55 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_stargate_usdc.ts @@ -0,0 +1,114 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { priceTimeout, oracleTimeout, verifyContract, combinedError, revenueHiding } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify Stargate USDC - wsgUSDC **************************/ + + if (!baseL2Chains.includes(hre.network.name)) { + const name = 'Wrapped Stargate USDC' + const symbol = 'wsgUSDC' + const sUSDC = networkConfig[chainId].tokens.sUSDC + + await verifyContract( + chainId, + deployments.erc20s.wsgUSDC, + [ + name, + symbol, + networkConfig[chainId].tokens.STG, + networkConfig[chainId].STARGATE_STAKING_CONTRACT, + sUSDC + ], + 'contracts/plugins/assets/stargate/StargateRewardableWrapper.sol:StargateRewardableWrapper' + ) + + const oracleError = fp('0.0025') // 0.25% + + await verifyContract( + chainId, + deployments.collateral.wsgUSDC, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: oracleError, // 0.25% + erc20: deployments.erc20s.wsgUSDC!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(oracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }, + revenueHiding.toString() + ], + 'contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol:StargatePoolFiatCollateral' + ) + } else if (chainId == '8453' || chainId == '84531') { + const name = 'Wrapped Stargate USDbC' + const symbol = 'wsgUSDbC' + const sUSDC = networkConfig[chainId].tokens.sUSDbC + + await verifyContract( + chainId, + deployments.erc20s.wsgUSDbC, + [ + name, + symbol, + networkConfig[chainId].tokens.STG, + networkConfig[chainId].STARGATE_STAKING_CONTRACT, + sUSDC + ], + 'contracts/plugins/assets/stargate/StargateRewardableWrapper.sol:StargateRewardableWrapper' + ) + + const oracleError = fp('0.003') // 0.3% + + await verifyContract( + chainId, + deployments.collateral.wsgUSDbC, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig['8453'].chainlinkFeeds.USDC!, + oracleError: oracleError.toString(), + erc20: deployments.erc20s.wsgUSDbC!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout('8453', '86400').toString(), // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + revenueHiding.toString() + ], + 'contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol:StargatePoolFiatCollateral' + ) + } +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 471a39b64e..40465f48dc 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -159,13 +159,17 @@ export default function fn( itClaimsRewards('claims rewards (via collateral.claimRewards())', async () => { const amount = bn('20').mul(bn(10).pow(await ctx.tok.decimals())) - await mintCollateralTo(ctx, amount, alice, collateral.address) + await mintCollateralTo(ctx, amount, alice, ctx.collateral.address) await advanceBlocks(1000) await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12000) - const balBefore = await (ctx.rewardToken as IERC20Metadata).balanceOf(collateral.address) - await expect(collateral.claimRewards()).to.emit(ctx.tok, 'RewardsClaimed') - const balAfter = await (ctx.rewardToken as IERC20Metadata).balanceOf(collateral.address) + const balBefore = await (ctx.rewardToken as IERC20Metadata).balanceOf( + ctx.collateral.address + ) + await expect(ctx.collateral.claimRewards()).to.emit(ctx.tok, 'RewardsClaimed') + const balAfter = await (ctx.rewardToken as IERC20Metadata).balanceOf( + ctx.collateral.address + ) expect(balAfter).gt(balBefore) }) diff --git a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts index 9db7362b1e..f09e2d21c0 100644 --- a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts @@ -12,6 +12,7 @@ import { IStargateLPStaking, StargateRewardableWrapper, StargateRewardableWrapper__factory, + IStargatePool, } from '@typechain/index' import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '#/common/numbers' @@ -26,15 +27,20 @@ import { SUSDC, ORACLE_TIMEOUT, ORACLE_ERROR, + STAKING_CONTRACT, + STARGATE_ROUTER, + USDC_NAME, } from './constants' import { noop } from 'lodash' +import { whileImpersonating } from '#/test/utils/impersonation' +import { useEnv } from '#/utils/env' /* Define interfaces */ interface StargateCollateralFixtureContext extends CollateralFixtureContext { - pool: StargatePoolMock + pool: StargatePoolMock | IStargatePool wpool: StargateRewardableWrapper stargate: ERC20Mock stakingContract: IStargateLPStaking @@ -138,6 +144,7 @@ const deployCollateralStargateMockContext = async ( const StargateRewardableWrapperFactory = ( await ethers.getContractFactory('StargateRewardableWrapper') ) + const stargate = await ( await ethers.getContractFactory('ERC20Mock') ).deploy('Stargate Mocked token', 'S*MT') @@ -150,12 +157,14 @@ const deployCollateralStargateMockContext = async ( await stakingContract.add(bn('5000'), mockPool.address) await mockPool.mint(stakingContract.address, bn(1e6)) await mockPool.setExchangeRate(fp(1)) + const pool = mockPool + const wrapper = await StargateRewardableWrapperFactory.deploy( - 'wMocked Pool', - 'wMSP', + 'Wrapped Stargate USDC TEST', + 'wsgUSDbC-TEST', stargate.address, stakingContract.address, - mockPool.address + pool.address ) collateralOpts.erc20 = wrapper.address collateralOpts.rewardERC20 = stargate.address @@ -169,7 +178,7 @@ const deployCollateralStargateMockContext = async ( chainlinkFeed, tok: wrapper, rewardToken, - pool: mockPool, + pool, wpool: wrapper, stargate, stakingContract, @@ -188,13 +197,15 @@ const mintCollateralTo: MintCollateralFunc = a ) => { const currentExchangeRate = await ctx.collateral.refPerTok() - // ctx.stakingContract - + await whileImpersonating(STARGATE_ROUTER, async (router) => { + await ctx.pool.connect(router).mint(user.address, amount) + }) await ctx.pool.connect(user).approve(ctx.wpool.address, ethers.constants.MaxUint256) - await ctx.pool.mint(user.address, amount) await ctx.wpool.connect(user).deposit(amount, user.address) await ctx.wpool.connect(user).transfer(recipient, amount) - await ctx.pool.setExchangeRate(currentExchangeRate.add(fp('0.000001'))) + if (ctx.pool.address != SUSDC) { + ctx.pool.setExchangeRate(currentExchangeRate.add(fp('0.000001'))) + } } const reduceRefPerTok = async ( @@ -247,6 +258,41 @@ const increaseTargetPerRef = async ( await ctx.chainlinkFeed.updateAnswer(nextAnswer) } +const beforeEachRewardsTest = async (ctx: StargateCollateralFixtureContext) => { + // switch to propoer network rewards setup + + const stargate = await ethers.getContractAt('ERC20Mock', STARGATE) + const stakingContract = ( + await ethers.getContractAt('IStargateLPStaking', STAKING_CONTRACT) + ) + const pool: StargatePoolMock | IStargatePool = await ethers.getContractAt('IStargatePool', SUSDC) + + const StargateRewardableWrapperFactory = ( + await ethers.getContractFactory('StargateRewardableWrapper') + ) + + const wrapper = await StargateRewardableWrapperFactory.deploy( + 'Wrapped Stargate USDC TEST', + 'wsgUSDbC-TEST', + stargate.address, + stakingContract.address, + pool.address + ) + const opts = { + erc20: wrapper.address, + rewardERC20: stargate.address, + } + + const collateral = await deployCollateral(opts) + + ctx.collateral = collateral + ctx.pool = pool + ctx.stakingContract = stakingContract + ctx.stargate = stargate + ctx.tok = wrapper + ctx.wpool = wrapper +} + /* Run the test suite */ @@ -255,16 +301,16 @@ export const stableOpts = { deployCollateral, collateralSpecificConstructorTests: noop, collateralSpecificStatusTests: noop, - beforeEachRewardsTest: noop, + beforeEachRewardsTest, makeCollateralFixtureContext, mintCollateralTo, reduceRefPerTok, increaseRefPerTok, resetFork, - collateralName: 'Stargate USDC Pool', + collateralName: `Stargate ${USDC_NAME} Pool`, reduceTargetPerRef, increaseTargetPerRef, - itClaimsRewards: it.skip, // reward growth not supported in mock + itClaimsRewards: it, // reward growth not supported in mock itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, @@ -272,6 +318,7 @@ export const stableOpts = { chainlinkDefaultAnswer: 1e8, itChecksPriceChanges: it, getExpectedPrice, + targetNetwork: useEnv('FORK_NETWORK') ?? 'mainnet', } collateralTests(stableOpts) diff --git a/test/plugins/individual-collateral/stargate/constants.ts b/test/plugins/individual-collateral/stargate/constants.ts index 0407dcdc98..fa88507d3e 100644 --- a/test/plugins/individual-collateral/stargate/constants.ts +++ b/test/plugins/individual-collateral/stargate/constants.ts @@ -1,19 +1,50 @@ import { bn, fp } from '#/common/numbers' import { networkConfig } from '#/common/configuration' +import { useEnv } from '#/utils/env' -export const STARGATE = networkConfig['1'].tokens['STG']! -export const STAKING_CONTRACT = '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' -export const SUSDC = networkConfig['1'].tokens['sUSDC']! -export const SUSDT = networkConfig['1'].tokens['sUSDT']! -export const SETH = networkConfig['1'].tokens['sETH']! -export const USDC = networkConfig['1'].tokens['USDC']! -export const USDT = networkConfig['1'].tokens['USDT']! -export const USDC_HOLDER = '0x0a59649758aa4d66e25f08dd01271e891fe52199' -export const USDC_USD_PRICE_FEED = networkConfig['1'].chainlinkFeeds['USDC']! -export const ETH_USD_PRICE_FEED = networkConfig['1'].chainlinkFeeds['ETH']! +const forkNetwork = useEnv('FORK_NETWORK') ?? 'mainnet' +let chainId + +switch (forkNetwork) { + case 'mainnet': + chainId = '1' + break + case 'base': + chainId = '8453' + break + default: + chainId = '1' + break +} + +export const USDC_NAME = chainId == '8453' ? 'USDbC' : 'USDC' +const sUSDC_NAME = chainId == '8453' ? 'sUSDbC' : 'sUSDC' + +export const STARGATE = networkConfig[chainId].tokens['STG']! +export const STAKING_CONTRACT = networkConfig[chainId].STARGATE_STAKING_CONTRACT! +export const SUSDC = networkConfig[chainId].tokens[sUSDC_NAME]! +export const SUSDT = networkConfig[chainId].tokens['sUSDT']! +export const SETH = networkConfig[chainId].tokens['sETH']! +export const USDC = networkConfig[chainId].tokens[USDC_NAME]! +export const USDT = networkConfig[chainId].tokens['USDT']! +export const USDC_HOLDER = + chainId == '8453' + ? '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca' + : '0x0a59649758aa4d66e25f08dd01271e891fe52199' +export const USDC_USD_PRICE_FEED = networkConfig[chainId].chainlinkFeeds['USDC']! // currently same key for USDC and USDbC +export const ETH_USD_PRICE_FEED = networkConfig[chainId].chainlinkFeeds['ETH']! export const SUSDC_POOL_ID = bn('1') export const WSUSDC_NAME = 'Wrapped S*USDC' export const WSUSDC_SYMBOL = 'wS*USDC' +export const STARGATE_ROUTER = + chainId == '8453' + ? '0x45f1A95A4D3f3836523F5c83673c797f4d4d263B' + : '0x8731d54E9D02c286767d56ac03e8037C07e01e98' + +export const USDbC = networkConfig[chainId].tokens['USDbC']! +export const SUSDbC = networkConfig[chainId].tokens['sUSDbC']! +export const USDbC_HOLDER = '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca' +// export const USDbC_USD_PRICE_FEED = networkConfig[chainId].chainlinkFeeds['USDbC']! export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds export const ORACLE_ERROR = fp('0.005') @@ -22,4 +53,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000000) export const USDC_DECIMALS = bn(6) -export const FORK_BLOCK = 18170484 +export const FORK_BLOCK = chainId == '8453' ? 4873094 : 17289300 From a7cf86512168390930759bcf3c6e854347a1bbf1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 16 Oct 2023 17:08:22 -0400 Subject: [PATCH 103/450] 3.0.1 base addresses (#977) --- .../8453-tmp-assets-collateral.json | 22 ++++++++++++ .../base-3.0.1/8453-tmp-deployments.json | 35 +++++++++++++++++++ 2 files changed, 57 insertions(+) create mode 100644 scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json create mode 100644 scripts/addresses/base-3.0.1/8453-tmp-deployments.json diff --git a/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json new file mode 100644 index 0000000000..ec42edd113 --- /dev/null +++ b/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json @@ -0,0 +1,22 @@ +{ + "assets": { + "COMP": "0x277FD5f51fE53a9B3707a0383bF930B149C74ABf" + }, + "collateral": { + "DAI": "0x5EBE8927e5495e0A7731888C81AF463cD63602fb", + "WETH": "0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3", + "USDbC": "0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB", + "cbETH": "0x5fE248625aC2AB0e17A115fef288f17AF1952402", + "cUSDbCv3": "0xa372EC846131FBf9AE8b589efa3D041D9a94dF41", + "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b" + }, + "erc20s": { + "COMP": "0x9e1028F5F1D5eDE59748FFceE5532509976840E0", + "DAI": "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb", + "WETH": "0x4200000000000000000000000000000000000006", + "USDbC": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", + "cbETH": "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22", + "cUSDbCv3": "0xbC0033679AEf41Fb9FeB553Fdf55a8Bb2fC5B29e", + "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b" + } +} diff --git a/scripts/addresses/base-3.0.1/8453-tmp-deployments.json b/scripts/addresses/base-3.0.1/8453-tmp-deployments.json new file mode 100644 index 0000000000..51e21b3e9f --- /dev/null +++ b/scripts/addresses/base-3.0.1/8453-tmp-deployments.json @@ -0,0 +1,35 @@ +{ + "prerequisites": { + "RSR": "0xaB36452DbAC151bE02b16Ca17d8919826072f64a", + "RSR_FEED": "0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1", + "GNOSIS_EASY_AUCTION": "0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02" + }, + "tradingLib": "0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B", + "cvxMiningLib": "", + "facadeRead": "0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF", + "facadeAct": "0x3d6D679c863858E89e35c925F937F5814ca687F3", + "facadeWriteLib": "0x13B63e7094B61CCbe79CAe3fb602DFd12D59314a", + "basketLib": "0x199E12d58B36deE2D2B3dD2b91aD7bb25c787a71", + "facadeWrite": "0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb", + "deployer": "0x9C75314AFD011F22648ca9C655b61674e27bA4AC", + "rsrAsset": "0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B", + "implementations": { + "main": "0x1D6d0B74E7A701aE5C2E11967b242E9861275143", + "trading": { + "gnosisTrade": "0xcD033976a011F41D2AB6ef47984041568F818E73", + "dutchTrade": "0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7" + }, + "components": { + "assetRegistry": "0x9c387fc258061bd3E02c851F36aE227DB03a396C", + "backingManager": "0x8569D60Df34354CDd1115b90de832845b31C28d2", + "basketHandler": "0x25E92785C1AC01B397224E0534f3D626868A1Cbf", + "broker": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba", + "distributor": "0xd31de64957b79435bfc702044590ac417e02c19B", + "furnace": "0x45D7dFE976cdF80962d863A66918346a457b87Bd", + "rsrTrader": "0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16", + "rTokenTrader": "0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16", + "rToken": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", + "stRSR": "0x53321f03A7cce52413515DFD0527e0163ec69A46" + } + } +} \ No newline at end of file From 2de6b0d2bb75c4ccd30bfa0128b4d932b91a3b5a Mon Sep 17 00:00:00 2001 From: Julian R <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 17 Oct 2023 10:31:17 -0300 Subject: [PATCH 104/450] fix lint in Revenue traders --- contracts/p0/RevenueTrader.sol | 2 ++ contracts/p1/RevenueTrader.sol | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index a1186f2924..21fa3994ab 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -34,6 +34,8 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP0) returns (ITrade trade) { trade = super.settleTrade(sell); + + // solhint-disable-next-line no-empty-blocks try this.distributeTokenToBuy() {} catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 577babb963..bda4be0793 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -53,6 +53,8 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant + + // solhint-disable-next-line no-empty-blocks try this.distributeTokenToBuy() {} catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string From 29c0f4c34f3fb84fb096d870c2048197348c5969 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 17 Oct 2023 11:38:09 -0300 Subject: [PATCH 105/450] TRUST QA-2: DefaultThreshold check for Non-Self referential (#980) --- .../plugins/assets/EURFiatCollateral.sol | 2 + contracts/plugins/assets/FiatCollateral.sol | 4 + contracts/plugins/assets/L2LSDCollateral.sol | 1 + .../plugins/assets/NonFiatCollateral.sol | 2 + .../assets/aave-v3/AaveV3FiatCollateral.sol | 4 +- .../assets/aave/ATokenFiatCollateral.sol | 4 +- .../assets/ankr/AnkrStakedEthCollateral.sol | 1 + .../plugins/assets/cbeth/CBETHCollateral.sol | 1 + .../assets/cbeth/CBETHCollateralL2.sol | 1 + .../compoundv2/CTokenFiatCollateral.sol | 2 + .../compoundv2/CTokenNonFiatCollateral.sol | 1 + .../assets/compoundv3/CTokenV3Collateral.sol | 1 + .../plugins/assets/dsr/SDaiCollateral.sol | 1 + .../assets/frax-eth/SFraxEthCollateral.sol | 4 +- .../assets/lido/LidoStakedEthCollateral.sol | 2 + .../morpho-aave/MorphoFiatCollateral.sol | 1 + .../assets/rocket-eth/RethCollateral.sol | 1 + .../stargate/StargatePoolFiatCollateral.sol | 1 + test/plugins/Collateral.test.ts | 99 +++++++++++++++++++ .../aave-v3/AaveV3FiatCollateral.test.ts | 1 + .../aave/ATokenFiatCollateral.test.ts | 20 +++- .../ankr/AnkrEthCollateralTestSuite.test.ts | 1 + .../cbeth/CBETHCollateral.test.ts | 1 + .../cbeth/CBETHCollateralL2.test.ts | 1 + .../individual-collateral/collateralTests.ts | 7 ++ .../compoundv2/CTokenFiatCollateral.test.ts | 18 ++++ .../compoundv3/CometTestSuite.test.ts | 1 + .../dsr/SDaiCollateralTestSuite.test.ts | 1 + .../flux-finance/FTokenFiatCollateral.test.ts | 1 + .../frax-eth/SFrxEthTestSuite.test.ts | 1 + .../lido/LidoStakedEthTestSuite.test.ts | 1 + .../MorphoAAVEFiatCollateral.test.ts | 1 + .../MorphoAAVENonFiatCollateral.test.ts | 1 + ...orphoAAVESelfReferentialCollateral.test.ts | 1 + .../individual-collateral/pluginTestTypes.ts | 3 + .../RethCollateralTestSuite.test.ts | 1 + .../stargate/StargateUSDCTestSuite.test.ts | 1 + 37 files changed, 191 insertions(+), 4 deletions(-) diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index 67d0c12f34..dfc36ff73e 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -27,6 +27,8 @@ contract EURFiatCollateral is FiatCollateral { ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index ac6e4576bd..d3afad43c5 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -75,6 +75,10 @@ contract FiatCollateral is ICollateral, Asset { } require(config.delayUntilDefault <= 1209600, "delayUntilDefault too long"); + // Note: This contract is designed to allow setting defaultThreshold = 0 to disable + // default checks. You can apply the check below to child contracts when required + // require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetName = config.targetName; delayUntilDefault = config.delayUntilDefault; diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index 0fc8e40884..c2d7cd3cd6 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -30,6 +30,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_exchangeRateChainlinkFeed) != address(0), "missing exchangeRate feed"); require(_exchangeRateChainlinkTimeout != 0, "exchangeRateChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); exchangeRateChainlinkFeed = _exchangeRateChainlinkFeed; exchangeRateChainlinkTimeout = _exchangeRateChainlinkTimeout; diff --git a/contracts/plugins/assets/NonFiatCollateral.sol b/contracts/plugins/assets/NonFiatCollateral.sol index 2e6b3c531f..1923dea24a 100644 --- a/contracts/plugins/assets/NonFiatCollateral.sol +++ b/contracts/plugins/assets/NonFiatCollateral.sol @@ -27,6 +27,8 @@ contract NonFiatCollateral is FiatCollateral { ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index 2edfd5d65b..ba1843351c 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -20,7 +20,9 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index f6e98c267e..14e72a72ca 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -41,7 +41,9 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 594db5465e..59e921e774 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -33,6 +33,7 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 5c190e6050..40eb3a9d6e 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -32,6 +32,7 @@ contract CBEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index b745028f54..4e98b7c3f2 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -41,6 +41,7 @@ contract CBEthCollateralL2 is L2LSDCollateral { { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index a60744893a..ce76a72635 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -29,6 +29,8 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + ICToken _cToken = ICToken(address(config.erc20)); address _underlying = _cToken.underlying(); uint8 _referenceERC20Decimals; diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index f0a44584b5..3d7dcae18f 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -30,6 +30,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { ) CTokenFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 5e7bd1238c..281688968c 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -39,6 +39,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { uint192 revenueHiding, uint256 reservesThresholdIffy_ ) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); rewardERC20 = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); reservesThresholdIffy = reservesThresholdIffy_; diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 8e7643575f..5401b2ad5f 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -35,6 +35,7 @@ contract SDaiCollateral is AppreciatingFiatCollateral { uint192 revenueHiding, IPot _pot ) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); pot = _pot; } diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 4697ec0da0..c318a047e3 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -23,7 +23,9 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { /// @param config.chainlinkFeed Feed units: {UoA/target} constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 783896f2c0..9267f40e76 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -35,6 +35,8 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerRefChainlinkFeed) != address(0), "missing targetPerRef feed"); require(_targetPerRefChainlinkTimeout > 0, "targetPerRefChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetPerRefChainlinkFeed = _targetPerRefChainlinkFeed; targetPerRefChainlinkTimeout = _targetPerRefChainlinkTimeout; } diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 5959b944ec..248c24084c 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -28,6 +28,7 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20)); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index f7f4386650..97c58aaef4 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -31,6 +31,7 @@ contract RethCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 8aaf4b2381..d31d7b04df 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -22,6 +22,7 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); pool = StargateRewardableWrapper(address(config.erc20)).pool(); } diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 1ab4d36a39..f7337177e1 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -262,6 +262,44 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetName missing') }) + it('Should not allow 0 defaultThreshold', async () => { + // ATokenFiatCollateral + await expect( + ATokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await tokenCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: aToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') + + // CTokenFiatCollateral + await expect( + CTokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await tokenCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: cToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should not allow missing delayUntilDefault', async () => { await expect( FiatCollateralFactory.deploy({ @@ -1236,6 +1274,26 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) + it('Should not allow 0 defaultThreshold', async () => { + await expect( + NonFiatCollFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: referenceUnitOracle.address, + oracleError: ORACLE_ERROR, + erc20: nonFiatToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should setup collateral correctly', async function () { // Non-Fiat Token expect(await nonFiatCollateral.isCollateral()).to.equal(true) @@ -1530,6 +1588,27 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) + it('Should not allow 0 defaultThreshold', async () => { + await expect( + CTokenNonFiatFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: referenceUnitOracle.address, + oracleError: ORACLE_ERROR, + erc20: cNonFiatTokenVault.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should setup collateral correctly', async function () { // Non-Fiat Token expect(await cTokenNonFiatCollateral.isCollateral()).to.equal(true) @@ -2366,6 +2445,26 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) + it('Should not allow 0 defaultThreshold', async () => { + await expect( + EURFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: referenceUnitOracle.address, + oracleError: ORACLE_ERROR, + erc20: eurFiatToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should not revert during refresh when price2 is 0', async () => { const targetFeedAddr = await eurFiatCollateral.targetUnitChainlinkFeed() const targetFeed = await ethers.getContractAt('MockV3Aggregator', targetFeedAddr) diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index 8566f70d76..687ab7a073 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -213,6 +213,7 @@ export const stableOpts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, itIsPricedByPeg: true, chainlinkDefaultAnswer: 1e8, itChecksPriceChanges: it, diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 8e38035704..91713c469d 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -428,7 +428,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Validate constructor arguments // Note: Adapt it to your plugin constructor validations it('Should validate constructor arguments correctly', async () => { - // stkAAVEtroller + // Missing erc20 await expect( ATokenFiatCollateralFactory.deploy( { @@ -445,6 +445,24 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi REVENUE_HIDING ) ).to.be.revertedWith('missing erc20') + + // defaultThreshold = 0 + await expect( + ATokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, + oracleError: ORACLE_ERROR, + erc20: staticAToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') }) }) diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index 0635aba4c3..e21a0f66a0 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -289,6 +289,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'AnkrStakedETH', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 2dc585a5b8..8f5bb5efe1 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -246,6 +246,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'CBEthCollateral', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts index 489f89d3df..fbc3f6874b 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -277,6 +277,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'CBEthCollateralL2', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 8af1117c26..9de866af6a 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -61,6 +61,7 @@ export default function fn( itChecksTargetPerRefDefault, itChecksRefPerTokDefault, itChecksPriceChanges, + itChecksNonZeroDefaultThreshold, itHasRevenueHiding, itIsPricedByPeg, resetFork, @@ -110,6 +111,12 @@ export default function fn( ) }) + itChecksNonZeroDefaultThreshold('does not allow 0 defaultThreshold', async () => { + await expect(deployCollateral({ defaultThreshold: bn('0') })).to.be.revertedWith( + 'defaultThreshold zero' + ) + }) + describe('collateral-specific tests', collateralSpecificConstructorTests) }) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index d3d0af540e..3725338def 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -474,6 +474,24 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi REVENUE_HIDING ) ).to.be.revertedWith('referenceERC20Decimals missing') + + // defaultThreshold = 0 + await expect( + CTokenCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, + oracleError: ORACLE_ERROR, + erc20: cDaiVault.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') }) }) diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 22365aaab9..66af764996 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -399,6 +399,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemented in this file itIsPricedByPeg: true, resetFork, diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 43b5f8593a..f604c19eb2 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -213,6 +213,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: 'SDaiCollateral', diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index d38beecde3..ea7c5554f2 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -256,6 +256,7 @@ all.forEach((curr: FTokenEnumeration) => { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: curr.testName, diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index 701789f733..681f53ae1b 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -249,6 +249,7 @@ const opts = { itChecksTargetPerRefDefault: it.skip, itChecksRefPerTokDefault: it.skip, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemnted in this file resetFork, collateralName: 'SFraxEthCollateral', diff --git a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts index 2d44d02990..1f4213ac61 100644 --- a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts @@ -267,6 +267,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: 'LidoStakedETH', diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index a62a4c84ba..a1c99cfffa 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -330,6 +330,7 @@ const makeAaveFiatCollateralTestSuite = ( itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork: getResetFork(FORK_BLOCK), collateralName, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 5d5a91ee51..f9a0339f9a 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -235,6 +235,7 @@ const makeAaveNonFiatCollateralTestSuite = ( itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, itIsPricedByPeg: true, resetFork: getResetFork(FORK_BLOCK), diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 6a5b06d5a2..8e934cedca 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -229,6 +229,7 @@ const opts = { itChecksTargetPerRefDefault: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it.skip, itHasRevenueHiding: it, resetFork: getResetFork(FORK_BLOCK), collateralName: 'MorphoAAVEV2SelfReferentialCollateral - WETH', diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 11b73fbaa1..34bfefbb20 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -100,6 +100,9 @@ export interface CollateralTestSuiteFixtures // toggle on or off: tests that focus on revenue hiding (off if plugin does not hide revenue) itHasRevenueHiding: Mocha.TestFunction | Mocha.PendingTestFunction + // toggle on or off: tests that check that defaultThreshold is not zero + itChecksNonZeroDefaultThreshold: Mocha.TestFunction | Mocha.PendingTestFunction + // does the peg price matter for the results of tryPrice()? itIsPricedByPeg?: boolean diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index e39347b7d9..d10488770e 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -274,6 +274,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: 'RocketPoolETH', diff --git a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts index 9db7362b1e..e6353d174c 100644 --- a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts @@ -267,6 +267,7 @@ export const stableOpts = { itClaimsRewards: it.skip, // reward growth not supported in mock itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, itIsPricedByPeg: true, chainlinkDefaultAnswer: 1e8, From a007c472a0603a31e9b12d18c082a71686f14229 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 18 Oct 2023 14:21:39 -0400 Subject: [PATCH 106/450] Trust M-07: RTokenAsset.refresh() (#964) --- CHANGELOG.md | 4 +- README.md | 1 + contracts/facade/FacadeRead.sol | 6 +- contracts/facade/FacadeTest.sol | 1 - contracts/interfaces/IAssetRegistry.sol | 2 +- contracts/p0/BackingManager.sol | 2 - contracts/p0/Furnace.sol | 12 +-- contracts/p0/Main.sol | 3 +- contracts/p1/AssetRegistry.sol | 2 + contracts/p1/BackingManager.sol | 2 - contracts/p1/Furnace.sol | 12 +-- contracts/p1/Main.sol | 3 +- contracts/p1/RToken.sol | 5 -- contracts/p1/RevenueTrader.sol | 6 +- contracts/plugins/assets/RTokenAsset.sol | 5 ++ docs/pause-freeze-states.md | 73 +++++++++++++++++++ test/Furnace.test.ts | 49 +++++++++---- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Furnace.test.ts.snap | 34 ++++----- test/__snapshots__/Main.test.ts.snap | 2 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 12 +-- test/__snapshots__/Revenues.test.ts.snap | 4 +- test/__snapshots__/ZZStRSR.test.ts.snap | 8 +- test/plugins/Asset.test.ts | 24 ++++++ .../ATokenFiatCollateral.test.ts.snap | 8 +- .../SDaiCollateralTestSuite.test.ts.snap | 2 +- .../StargateETHTestSuite.test.ts.snap | 49 ------------- .../StargateUSDCTestSuite.test.ts.snap | 25 +++++++ .../__snapshots__/MaxBasketSize.test.ts.snap | 16 ++-- 30 files changed, 225 insertions(+), 155 deletions(-) create mode 100644 docs/pause-freeze-states.md delete mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap diff --git a/CHANGELOG.md b/CHANGELOG.md index 95af3e13a9..1b73a106a7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ ### Upgrade Steps -- Required -Upgrade `BackingManager`, `Broker`, and _all_ assets. ERC20s do not need to be upgraded. +Upgrade all core contracts and _all_ assets. ERC20s do not need to be upgraded. Use `Deployer.deployRTokenAsset()` to create a new `RTokenAsset` instance. This asset should be swapped too. Then, call `Broker.cacheComponents()`. @@ -16,6 +16,8 @@ Then, call `Broker.cacheComponents()`. - Remove `lotPrice()` - `Broker` [+1 slot] - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` +- `Furnace` + - Allow melting while frozen ## Plugins diff --git a/README.md b/README.md index 1c569eb492..e8ab78faec 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ For a much more detailed explanation of the economic design, including an hour-l - [Testing with Echidna](https://github.com/reserve-protocol/protocol/blob/master/docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) - [Deployment](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment.md): How to do test deployments in our environment. - [System Design](https://github.com/reserve-protocol/protocol/blob/master/docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. +- [Pause and Freeze States](https://github.com/reserve-protocol/protocol/blob/master/docs/pause-freeze-states.md): An overview of which protocol functions are halted in the paused and frozen states. - [Deployment Variables](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment-variables.md) A detailed description of the governance variables of the protocol. - [Our Solidity Style](https://github.com/reserve-protocol/protocol/blob/master/docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. - [Writing Collateral Plugins](https://github.com/reserve-protocol/protocol/blob/master/docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 10f60d9182..a42d5c6135 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -33,7 +33,6 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); - main.furnace().melt(); // {BU} BasketRange memory basketsHeld = main.basketHandler().basketsHeldBy(account); @@ -74,7 +73,6 @@ contract FacadeRead is IFacadeRead { // Poke Main reg.refresh(); - main.furnace().melt(); // Compute # of baskets to create `amount` qRTok uint192 baskets = (rTok.totalSupply() > 0) // {BU} @@ -120,7 +118,6 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); - main.furnace().melt(); uint256 supply = rTok.totalSupply(); @@ -202,7 +199,7 @@ contract FacadeRead is IFacadeRead { IBasketHandler basketHandler = rToken.main().basketHandler(); // solhint-disable-next-line no-empty-blocks - try rToken.main().furnace().melt() {} catch {} + try rToken.main().furnace().melt() {} catch {} // <3.1.0 RTokens may revert while frozen (erc20s, deposits) = basketHandler.quote(FIX_ONE, CEIL); @@ -241,7 +238,6 @@ contract FacadeRead is IFacadeRead { { IMain main = rToken.main(); main.assetRegistry().refresh(); - main.furnace().melt(); erc20s = main.assetRegistry().erc20s(); balances = new uint256[](erc20s.length); diff --git a/contracts/facade/FacadeTest.sol b/contracts/facade/FacadeTest.sol index d16c6ab6d3..78ee2173e0 100644 --- a/contracts/facade/FacadeTest.sol +++ b/contracts/facade/FacadeTest.sol @@ -97,7 +97,6 @@ contract FacadeTest is IFacadeTest { // Poke Main reg.refresh(); - main.furnace().melt(); address backingManager = address(main.backingManager()); IERC20 rsr = main.rsr(); diff --git a/contracts/interfaces/IAssetRegistry.sol b/contracts/interfaces/IAssetRegistry.sol index caeaac2f3e..add18d69b5 100644 --- a/contracts/interfaces/IAssetRegistry.sol +++ b/contracts/interfaces/IAssetRegistry.sol @@ -34,7 +34,7 @@ interface IAssetRegistry is IComponent { function init(IMain main_, IAsset[] memory assets_) external; /// Fully refresh all asset state - /// @custom:interaction + /// @custom:refresher function refresh() external; /// Register `asset` diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 18e2427b8f..2d4bb0de23 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -86,7 +86,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { /// @custom:interaction function rebalance(TradeKind kind) external notTradingPausedOrFrozen { main.assetRegistry().refresh(); - main.furnace().melt(); // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( @@ -149,7 +148,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { require(ArrayLib.allUnique(erc20s), "duplicate tokens"); main.assetRegistry().refresh(); - main.furnace().melt(); require(tradesOpen == 0, "trade open"); require(main.basketHandler().isReady(), "basket not ready"); diff --git a/contracts/p0/Furnace.sol b/contracts/p0/Furnace.sol index aa99a8140c..ea0a404a2e 100644 --- a/contracts/p0/Furnace.sol +++ b/contracts/p0/Furnace.sol @@ -36,7 +36,7 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Performs any melting that has vested since last call. /// @custom:refresher - function melt() public notFrozen { + function melt() public { if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; // # of whole periods that have passed since lastPayout @@ -58,15 +58,9 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { - if (lastPayout > 0) { - // solhint-disable-next-line no-empty-blocks - try this.melt() {} catch { - uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; - lastPayout += numPeriods * PERIOD; - lastPayoutBal = main.rToken().balanceOf(address(this)); - } - } require(ratio_ <= MAX_RATIO, "invalid ratio"); + melt(); // cannot revert + // The ratio can safely be set to 0, though it is not recommended emit RatioSet(ratio, ratio_); ratio = ratio_; diff --git a/contracts/p0/Main.sol b/contracts/p0/Main.sol index 9493b72c5c..1859ad8ecb 100644 --- a/contracts/p0/Main.sol +++ b/contracts/p0/Main.sol @@ -37,8 +37,7 @@ contract MainP0 is Versioned, Initializable, Auth, ComponentRegistry, IMain { /// @custom:refresher function poke() external { - assetRegistry.refresh(); - if (!frozen()) furnace.melt(); + assetRegistry.refresh(); // runs furnace.melt() stRSR.payoutRewards(); // NOT basketHandler.refreshBasket } diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 098e47f93a..c556a96120 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -57,6 +57,8 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { // tracks basket status on basketHandler function refresh() public { // It's a waste of gas to require notPausedOrFrozen because assets can be updated directly + // Assuming an RTokenAsset is registered, furnace.melt() will also be called + uint256 length = _erc20s.length(); for (uint256 i = 0; i < length; ++i) { assets[IERC20(_erc20s.at(i))].refresh(); diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index edb22151d2..da8473e662 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -113,7 +113,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { function rebalance(TradeKind kind) external nonReentrant notTradingPausedOrFrozen { // == Refresh == assetRegistry.refresh(); - furnace.melt(); // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( @@ -184,7 +183,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { require(ArrayLib.allUnique(erc20s), "duplicate tokens"); assetRegistry.refresh(); - furnace.melt(); BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(this)); diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 923ba33737..63dcc695d4 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -71,7 +71,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { // actions: // rToken.melt(payoutAmount), paying payoutAmount to RToken holders - function melt() external notFrozen { + function melt() public { if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; // # of whole periods that have passed since lastPayout @@ -90,15 +90,9 @@ contract FurnaceP1 is ComponentP1, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { - if (lastPayout > 0) { - // solhint-disable-next-line no-empty-blocks - try this.melt() {} catch { - uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; - lastPayout += numPeriods * PERIOD; - lastPayoutBal = rToken.balanceOf(address(this)); - } - } require(ratio_ <= MAX_RATIO, "invalid ratio"); + melt(); // cannot revert + // The ratio can safely be set to 0 to turn off payouts, though it is not recommended emit RatioSet(ratio, ratio_); ratio = ratio_; diff --git a/contracts/p1/Main.sol b/contracts/p1/Main.sol index 43bddcaed7..21781ca082 100644 --- a/contracts/p1/Main.sol +++ b/contracts/p1/Main.sol @@ -43,10 +43,9 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad /// @dev Not intended to be used in production, only for equivalence with P0 function poke() external { // == Refresher == - assetRegistry.refresh(); + assetRegistry.refresh(); // runs furnace.melt() // == CE block == - if (!frozen()) furnace.melt(); stRSR.payoutRewards(); } diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 77f15bef54..cfbbdcd923 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -108,7 +108,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Refresh == assetRegistry.refresh(); - furnace.melt(); // == Checks-effects block == @@ -182,8 +181,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { function redeemTo(address recipient, uint256 amount) public notFrozen { // == Refresh == assetRegistry.refresh(); - // solhint-disable-next-line no-empty-blocks - try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == @@ -254,8 +251,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { ) external notFrozen { // == Refresh == assetRegistry.refresh(); - // solhint-disable-next-line no-empty-blocks - try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index bda4be0793..a220e6ca10 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -134,10 +134,8 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { IAsset assetToBuy = assetRegistry.toAsset(tokenToBuy); // Refresh everything if RToken is involved - if (involvesRToken) { - assetRegistry.refresh(); - furnace.melt(); - } else { + if (involvesRToken) assetRegistry.refresh(); + else { // Otherwise: refresh just the needed assets and nothing more for (uint256 i = 0; i < len; ++i) { assetRegistry.toAsset(erc20s[i]).refresh(); diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index 2dd0010f07..f187651e34 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -22,6 +22,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { IBasketHandler public immutable basketHandler; IAssetRegistry public immutable assetRegistry; IBackingManager public immutable backingManager; + IFurnace public immutable furnace; IERC20Metadata public immutable erc20; @@ -41,6 +42,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { basketHandler = main.basketHandler(); assetRegistry = main.assetRegistry(); backingManager = main.backingManager(); + furnace = main.furnace(); erc20 = IERC20Metadata(address(erc20_)); erc20Decimals = erc20_.decimals(); @@ -81,6 +83,9 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { function refresh() public virtual override { // No need to save lastPrice; can piggyback off the backing collateral's saved prices + if (msg.sender != address(assetRegistry)) assetRegistry.refresh(); + furnace.melt(); + cachedOracleData.cachedAtTime = 0; // force oracle refresh } diff --git a/docs/pause-freeze-states.md b/docs/pause-freeze-states.md new file mode 100644 index 0000000000..009ab64b20 --- /dev/null +++ b/docs/pause-freeze-states.md @@ -0,0 +1,73 @@ +# Pause Freeze States + +Some protocol functions may be halted while the protocol is either (i) issuance-paused; (ii) trading-paused; or (iii) frozen. Below is a table that shows which protocol interactions (`@custom:interaction`) and refreshers (`@custom:refresher`) execute during paused/frozen states, as of the 3.1.0 release. + +All governance functions (`@custom:governance`) remain enabled during all paused/frozen states. They are not mentioned here. + +A :heavy_check_mark: indicates the function still executes in this state. +A :x: indicates it reverts. + +| Function | Issuance-Paused | Trading-Paused | Frozen | +| --------------------------------------- | ------------------ | ----------------------- | ----------------------- | +| `BackingManager.claimRewards()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.claimRewardsSingle()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.grantRTokenAllowance()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `BackingManager.forwardRevenue()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.rebalance()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `BasketHandler.refreshBasket()` | :heavy_check_mark: | :x: (unless governance) | :x: (unless governance) | +| `Broker.openTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Broker.reportViolation()` | :heavy_check_mark: | :x: | :x: | +| `Distributor.distribute()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Furnace.melt()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Main.poke()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `RevenueTrader.claimRewards()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.claimRewardsSingle()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.distributeTokenToBuy()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.manageTokens()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.returnTokens()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `RToken.issue()` | :x: | :heavy_check_mark: | :x: | +| `RToken.issueTo()` | :x: | :heavy_check_mark: | :x: | +| `RToken.redeem()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `RToken.redeemTo()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `RToken.redeemCustom()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `StRSR.cancelUnstake()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `StRSR.payoutRewards()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `StRSR.stake()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `StRSR.seizeRSR()` | :heavy_check_mark: | :x: | :x: | +| `StRSR.unstake()` | :heavy_check_mark: | :x: | :x: | +| `StRSR.withdraw()` | :heavy_check_mark: | :x: | :x: | + +## Issuance-pause + +The issuance-paused states indicates that RToken issuance should be paused, and _only_ that. It is a narrow control knob that is designed solely to protect against a case where bad debt is being injected into the protocol, say, because default detection for an asset has a false negative. + +## Trading-pause + +The trading-paused state has significantly more scope than the issuance-paused state. It is designed to prevent against cases where the protocol may trade unneccesarily. Many other functions in addition to just `BackingManager.rebalance()` and `RevenueTrader.manageTokens()` are halted. In general anything that manages the backing and revenue for an RToken is halted. This may become neccessary to use due to (among other things): + +- An asset's `price()` malfunctions or is manipulated +- A collateral's default detection has a false positive or negative + +## Freezing + +The scope of freezing is the largest, and it should be used least frequently. Nearly all protocol interactions (`@custom:interaction`) are halted. Any refreshers (`@custom:refresher`) remain enabled, as well as `StRSR.stake()` and the "wrap up" routine `*.settleTrade()`. + +An important function of freezing is to provide a finite time for governance to push through a repair proposal an RToken in the event that a 0-day is discovered that requires a contract upgrade. + +### `Furnace.melt()` + +It is necessary for `Furnace.melt()` to remain emabled in order to allow `RTokenAsset.refresh()` to update its `price()`. Any revenue RToken that has already accumulated at the Furnace will continue to be melted, but the flow of new revenue RToken into the contract is halted. + +### `StRSR.payoutRewards()` + +It is necessary for `StRSR.payoutRewards()` to remain enabled in order for `StRSR.stake()` to use the up-to-date StRSR-RSR exchange rate. If it did not, then in the event of freezing there would be an unfair benefit to new stakers. Any revenue RSR that has already accumulated at the StRSR contract will continue to be paid out, but the flow of new revenue RSR into the contract is halted. + +### `StRSR.stake()` + +It is important for `StRSR.stake()` to remain emabled while frozen in order to allow honest RSR to flow into an RToken to vote against malicious governance proposals. + +### `*.settleTrade()` + +The settleTrade functionality must remain enabled in order to maintain the property that dutch auctions will discover the optimal price. If settleTrade were halted, it could become possible for a dutch auction to clear at a much lower price than it should have, simply because bidding was disabled during the earlier portion of the auction. diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 15776210be..84d16f32c7 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -204,9 +204,9 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await furnace.connect(addr1).melt() }) - it('Should not melt if frozen #fast', async () => { + it('Should melt if frozen #fast', async () => { await main.connect(owner).freezeShort() - await expect(furnace.connect(addr1).melt()).to.be.revertedWith('frozen') + await furnace.connect(addr1).melt() }) it('Should not melt any funds in the initial block #fast', async () => { @@ -450,40 +450,57 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { it('Regression test -- C4 June 2023 Issue #29', async () => { // https://github.com/code-423n4/2023-06-reserve-findings/issues/29 + const firstRatio = fp('1e-6') + const secondRatio = fp('1e-4') + const mintAmount = fp('100') + + // Set ratio to something cleaner + await expect(furnace.connect(owner).setRatio(firstRatio)) + .to.emit(furnace, 'RatioSet') + .withArgs(config.rewardRatio, firstRatio) + // Transfer to Furnace and do first melt - await rToken.connect(addr1).transfer(furnace.address, bn('10e18')) + await rToken.connect(addr1).transfer(furnace.address, mintAmount) await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) await furnace.melt() // Should have updated lastPayout + lastPayoutBal expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) + expect(await furnace.lastPayoutBal()).to.equal(mintAmount) - // Advance 99 periods -- should melt at old ratio - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 99 * Number(ONE_PERIOD)) + // Advance 100 periods -- should melt at old ratio + await setNextBlockTimestamp( + Number(await getLatestBlockTimestamp()) + 100 * Number(ONE_PERIOD) + ) - // Freeze and change ratio + // Freeze and change ratio (melting as a pre-step) await main.connect(owner).freezeForever() - const maxRatio = bn('1e14') - await expect(furnace.connect(owner).setRatio(maxRatio)) + await expect(furnace.connect(owner).setRatio(secondRatio)) .to.emit(furnace, 'RatioSet') - .withArgs(config.rewardRatio, maxRatio) + .withArgs(firstRatio, secondRatio) - // Should have updated lastPayout + lastPayoutBal + // Should have melted expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) // no change + expect(await furnace.lastPayoutBal()).to.eq(fp('99.990000494983830300')) - // Unfreeze and advance 1 period + // Unfreeze and advance 100 periods await main.connect(owner).unfreeze() - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp( + Number(await getLatestBlockTimestamp()) + 100 * Number(ONE_PERIOD) + ) await expect(furnace.melt()).to.emit(rToken, 'Melted') - // Should have updated lastPayout + lastPayoutBal + // Should have updated lastPayout + lastPayoutBal and melted at new ratio expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(bn('9.999e18')) + expect(await furnace.lastPayoutBal()).to.equal(fp('98.995033865808581644')) + // if the ratio were not increased 100x, this would be more like 99.980001989868666200 + + // Total supply should have decreased by the cumulative melted amount + expect(await rToken.totalSupply()).to.equal(mintAmount.add(await furnace.lastPayoutBal())) + expect(await rToken.basketsNeeded()).to.equal(mintAmount.mul(2)) }) }) diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 4b4c7894ff..143651b3a3 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8497592`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8572904`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Furnace.test.ts.snap b/test/__snapshots__/Furnace.test.ts.snap index af06969a2f..e905f3eec0 100644 --- a/test/__snapshots__/Furnace.test.ts.snap +++ b/test/__snapshots__/Furnace.test.ts.snap @@ -1,35 +1,35 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `83931`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `71626`; -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `89820`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `77515`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `83931`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `71626`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `64031`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `51726`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `80663`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `68358`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `40761`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `28452`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 9591a27626..ffecb35bc5 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357740`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393837`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index ee00025ae6..c725eeb995 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787553`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782158`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614557`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609158`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589266`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583862`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 4222c553e9..ddde5b4fe3 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1370490`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1365473`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1506234`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1500861`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `760457`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `755062`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1665048`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1659319`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1607593`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1602220`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1695355`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1689982`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 4275db1832..bb7a77e725 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -12,11 +12,11 @@ exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1025829`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1020522`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `774070`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1181105`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1175816`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index f4ec1f241e..63500d7165 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `156559`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; @@ -10,10 +10,10 @@ exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41509`; exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58621`; -exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `241951`; +exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `572112`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606273`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `526116`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536407`; diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index c0a49a79a5..95ad7cd34b 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -34,6 +34,7 @@ import { RTokenAsset, StaticATokenMock, TestIBackingManager, + TestIFurnace, TestIRToken, USDCMock, UnpricedAssetMock, @@ -88,6 +89,7 @@ describe('Assets contracts #fast', () => { let wallet: Wallet let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager + let furnace: TestIFurnace // Factory let AssetFactory: ContractFactory @@ -112,6 +114,7 @@ describe('Assets contracts #fast', () => { assetRegistry, backingManager, config, + furnace, rToken, rTokenAsset, } = await loadFixture(defaultFixture)) @@ -481,6 +484,27 @@ describe('Assets contracts #fast', () => { await expectUnpriced(rTokenAsset.address) }) + it('Regression test -- RTokenAsset.refresh() should refresh everything', async () => { + // AssetRegistry should refresh + const lastRefreshed = await assetRegistry.lastRefresh() + await rTokenAsset.refresh() + expect(await assetRegistry.lastRefresh()).to.be.gt(lastRefreshed) + + // Furnace should melt + const lastPayout = await furnace.lastPayout() + await advanceTime(12) + await rTokenAsset.refresh() + expect(await furnace.lastPayout()).to.be.gt(lastPayout) + + // Should clear oracle cache + await rTokenAsset.forceUpdatePrice() + let [, cachedAtTime] = await rTokenAsset.cachedOracleData() + expect(cachedAtTime).to.be.gt(0) + await rTokenAsset.refresh() + ;[, cachedAtTime] = await rTokenAsset.cachedOracleData() + expect(cachedAtTime).to.eq(0) + }) + it('Should be able to refresh saved prices', async () => { // Check initial prices - use RSR as example let currBlockTimestamp: number = await getLatestBlockTimestamp() diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 70324e7f45..579773bc8c 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -14,12 +14,12 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91147`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91073`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91147`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92285`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92211`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92211`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92285`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127356`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91414`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91488`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index 08efe17a75..eb9ff18626 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116743`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116848`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108431`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap deleted file mode 100644 index 3eb6942200..0000000000 --- a/test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap +++ /dev/null @@ -1,49 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `55263`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `50795`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `68999`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66385`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `55263`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `50795`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `50454`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `50454`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66260`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66260`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `73810`; - -exports[`Collateral: Stargate ETH Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `66542`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `55263`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `50795`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `68999`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66385`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `55263`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `50795`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `50454`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `50454`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66260`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66260`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `73810`; - -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `66542`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap new file mode 100644 index 0000000000..fc27356e8c --- /dev/null +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56094`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51626`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 1`] = `74579`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after hard default 2`] = `66897`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `56094`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51626`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `51285`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `51285`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66894`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 2`] = `66894`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 1`] = `74444`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during soft default 2`] = `67176`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index fa7f07dd1b..156f632337 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12090932`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082293`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9829293`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9836895`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13615367`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653640`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20701409`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20688663`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10991970`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984043`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8713193`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8707789`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6561514`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592417`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14454943`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14441485`; From de352e1eadb169961ab722496a2aa5bd21663508 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 19 Oct 2023 11:06:39 -0300 Subject: [PATCH 107/450] TRUST L-7: Restriction on reportViolation (#981) Co-authored-by: Taylor Brent --- contracts/p0/Broker.sol | 2 +- contracts/p1/Broker.sol | 4 +- docs/pause-freeze-states.md | 2 +- test/Broker.test.ts | 22 ------- test/Revenues.test.ts | 122 ++++++++++++++++++++++++++++++++++++ 5 files changed, 126 insertions(+), 26 deletions(-) diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index d3e0da2041..b53c2e0417 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -92,7 +92,7 @@ contract BrokerP0 is ComponentP0, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected - function reportViolation() external notTradingPausedOrFrozen { + function reportViolation() external { require(trades[_msgSender()], "unrecognized trade contract"); ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0c233a8020..0111d25bc3 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -136,9 +136,9 @@ contract BrokerP1 is ComponentP1, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected - // checks: not paused (trading), not frozen, caller is a Trade this contract cloned + // checks: caller is a Trade this contract cloned // effects: disabled' = true - function reportViolation() external notTradingPausedOrFrozen { + function reportViolation() external { require(trades[_msgSender()], "unrecognized trade contract"); ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); diff --git a/docs/pause-freeze-states.md b/docs/pause-freeze-states.md index 009ab64b20..17b2785fcd 100644 --- a/docs/pause-freeze-states.md +++ b/docs/pause-freeze-states.md @@ -17,7 +17,7 @@ A :x: indicates it reverts. | `BackingManager.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | `BasketHandler.refreshBasket()` | :heavy_check_mark: | :x: (unless governance) | :x: (unless governance) | | `Broker.openTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `Broker.reportViolation()` | :heavy_check_mark: | :x: | :x: | +| `Broker.reportViolation()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | `Distributor.distribute()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | `Furnace.melt()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | | `Main.poke()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 90a34a56e2..251d0e1a5b 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -574,28 +574,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Check nothing changed expect(await broker.batchTradeDisabled()).to.equal(false) }) - - it('Should not allow to report violation if paused or frozen', async () => { - // Check not disabled - expect(await broker.batchTradeDisabled()).to.equal(false) - - await main.connect(owner).pauseTrading() - - await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( - 'frozen or trading paused' - ) - - await main.connect(owner).unpauseTrading() - - await main.connect(owner).freezeShort() - - await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( - 'frozen or trading paused' - ) - - // Check nothing changed - expect(await broker.batchTradeDisabled()).to.equal(false) - }) }) describe('Trades', () => { diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index b8526f1395..d631a6f2ed 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -2627,11 +2627,133 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { }, ]) + // Check broker disabled (batch) + expect(await broker.batchTradeDisabled()).to.equal(true) + // Check funds at destinations expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt.sub(10), 50) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) }) + it('Should report violation even if paused or frozen', async () => { + // This test needs to be in this file and not Broker.test.ts because settleTrade() + // requires the BackingManager _actually_ started the trade + + rewardAmountAAVE = bn('0.5e18') + + // AAVE Rewards + await token2.setRewards(backingManager.address, rewardAmountAAVE) + + // Collect revenue + // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + // Claim rewards + await facadeTest.claimRewards(rToken.address) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Run auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + // In order to force deactivation we provide an amount below minBuyAmt, this will represent for our tests an invalid behavior although in a real scenario would retrigger auction + // NOTE: DIFFERENT BEHAVIOR WILL BE OBSERVED ON PRODUCTION GNOSIS AUCTIONS + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt.sub(10), // Forces in our mock an invalid behavior + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken.sub(10), // Forces in our mock an invalid behavior + }) + + // Freeze protocol + await main.connect(owner).freezeShort() + + // Close auctions - Will end trades and also report violation + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: broker, + name: 'BatchTradeDisabledSet', + args: [false, true], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, aaveToken.address, rsr.address, sellAmt, minBuyAmt.sub(10)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmtRToken, + minBuyAmtRToken.sub(10), + ], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check broker disabled (batch) + expect(await broker.batchTradeDisabled()).to.equal(true) + + // Funds are not distributed if paused or frozen + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(minBuyAmt.sub(10), 50) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo( + minBuyAmtRToken.sub(10), + 50 + ) + }) + it('Should not report violation when Dutch Auction clears in geometric phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade From fcade85cbcd00d7b485453caf2b076ae199c2bdb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 19 Oct 2023 10:08:15 -0400 Subject: [PATCH 108/450] Trst-M-11 (#979) --- contracts/plugins/assets/RTokenAsset.sol | 34 +++++++++++------- .../CurveStableRTokenMetapoolCollateral.sol | 5 +++ contracts/plugins/mocks/AssetMock.sol | 9 ++++- .../CrvStableRTokenMetapoolTestSuite.test.ts | 35 +++++++++++++++++++ .../CvxStableRTokenMetapoolTestSuite.test.ts | 35 +++++++++++++++++++ 5 files changed, 104 insertions(+), 14 deletions(-) diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index f187651e34..f82f2ee185 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -19,12 +19,14 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // Component addresses are not mutable in protocol, so it's safe to cache these IMain public immutable main; - IBasketHandler public immutable basketHandler; IAssetRegistry public immutable assetRegistry; IBackingManager public immutable backingManager; + IBasketHandler public immutable basketHandler; IFurnace public immutable furnace; + IERC20 public immutable rsr; + IStRSR public immutable stRSR; - IERC20Metadata public immutable erc20; + IERC20Metadata public immutable erc20; // The RToken uint8 public immutable erc20Decimals; @@ -39,10 +41,12 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { require(maxTradeVolume_ > 0, "invalid max trade volume"); main = erc20_.main(); - basketHandler = main.basketHandler(); assetRegistry = main.assetRegistry(); backingManager = main.backingManager(); + basketHandler = main.basketHandler(); furnace = main.furnace(); + rsr = main.rsr(); + stRSR = main.stRSR(); erc20 = IERC20Metadata(address(erc20_)); erc20Decimals = erc20_.decimals(); @@ -79,18 +83,15 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { assert(low <= high); // not obviously true } - // solhint-disable no-empty-blocks function refresh() public virtual override { // No need to save lastPrice; can piggyback off the backing collateral's saved prices - if (msg.sender != address(assetRegistry)) assetRegistry.refresh(); furnace.melt(); + if (msg.sender != address(assetRegistry)) assetRegistry.refresh(); cachedOracleData.cachedAtTime = 0; // force oracle refresh } - // solhint-enable no-empty-blocks - /// Should not revert /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return {UoA/tok} The lower end of the price estimate @@ -130,10 +131,15 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-enable no-empty-blocks + /// Force an update to the cache, including refreshing underlying assets + /// @dev Can revert if RToken is unpriced function forceUpdatePrice() external { _updateCachedPrice(); } + /// @dev Can revert if RToken is unpriced + /// @return rTokenPrice {UoA/tok} The mean price estimate + /// @return updatedAt {s} The timestamp of the cache update function latestPrice() external returns (uint192 rTokenPrice, uint256 updatedAt) { // Situations that require an update, from most common to least common. if ( @@ -145,15 +151,17 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { _updateCachedPrice(); } - return (cachedOracleData.cachedPrice, cachedOracleData.cachedAtTime); + rTokenPrice = cachedOracleData.cachedPrice; + updatedAt = cachedOracleData.cachedAtTime; } // ==== Private ==== // Update Oracle Data function _updateCachedPrice() internal { - (uint192 low, uint192 high) = price(); + assetRegistry.refresh(); // will call furnace.melt() + (uint192 low, uint192 high) = price(); require(low != 0 && high != FIX_MAX, "invalid price"); cachedOracleData = CachedOracleData( @@ -183,12 +191,12 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { TradingContext memory ctx; ctx.basketsHeld = basketsHeld; + ctx.ar = assetRegistry; ctx.bm = backingManager; ctx.bh = basketHandler; - ctx.ar = assetRegistry; - ctx.stRSR = main.stRSR(); - ctx.rsr = main.rsr(); - ctx.rToken = main.rToken(); + ctx.rsr = rsr; + ctx.rToken = IRToken(address(erc20)); + ctx.stRSR = stRSR; ctx.minTradeVolume = backingManager.minTradeVolume(); ctx.maxTradeSlippage = backingManager.maxTradeSlippage(); diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 420e002f4a..780a083a8b 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -42,6 +42,11 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { pairedAssetRegistry = IRToken(address(pairedToken)).main().assetRegistry(); } + function refresh() public override { + pairedAssetRegistry.refresh(); // refresh all registered assets + super.refresh(); // already handles all necessary default checks + } + /// Can revert, used by `_anyDepeggedOutsidePool()` /// Should not return FIX_MAX for low /// @return lowPaired {UoA/pairedTok} The low price estimate of the paired token diff --git a/contracts/plugins/mocks/AssetMock.sol b/contracts/plugins/mocks/AssetMock.sol index c1b495380f..0396a5ea35 100644 --- a/contracts/plugins/mocks/AssetMock.sol +++ b/contracts/plugins/mocks/AssetMock.sol @@ -4,6 +4,8 @@ pragma solidity 0.8.19; import "../assets/Asset.sol"; contract AssetMock is Asset { + bool public stale; + uint192 private lowPrice; uint192 private highPrice; @@ -40,13 +42,18 @@ contract AssetMock is Asset { uint192 ) { + require(!stale, "stale price"); return (lowPrice, highPrice, 0); } /// Should not revert /// Refresh saved prices function refresh() public virtual override { - // pass + stale = false; + } + + function setStale(bool _stale) external { + stale = _stale; } function setPrice(uint192 low, uint192 high) external { diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index a97702d5af..fd62e8ee75 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -241,6 +241,41 @@ const collateralSpecificStatusTests = () => { // refresh() should not revert await collateral.refresh() }) + + it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out eUSD's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + eUSD, + bn('1'), // unused + bn('1') // unused + ) + const eUSDAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { + await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset price to stale + await mockRTokenAsset.setStale(true) + expect(await mockRTokenAsset.stale()).to.be.true + + // Refresh CurveStableRTokenMetapoolCollateral + await collateral.refresh() + + // Stale should be false again + expect(await mockRTokenAsset.stale()).to.be.false + }) } /* diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index bfb1f30180..ab50ef36a4 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -243,6 +243,41 @@ const collateralSpecificStatusTests = () => { // refresh() should not revert await collateral.refresh() }) + + it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out eUSD's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + eUSD, + bn('1'), // unused + bn('1') // unused + ) + const eUSDAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { + await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset price to stale + await mockRTokenAsset.setStale(true) + expect(await mockRTokenAsset.stale()).to.be.true + + // Refresh CurveStableRTokenMetapoolCollateral + await collateral.refresh() + + // Stale should be false again + expect(await mockRTokenAsset.stale()).to.be.false + }) } /* From 35b063c281418991f320aecfb9f84528032b5bf9 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 20 Oct 2023 10:51:54 -0300 Subject: [PATCH 109/450] TRUST M-4: Call reward accounting functions (#984) Co-authored-by: Taylor Brent --- contracts/p0/BackingManager.sol | 1 + contracts/p0/Distributor.sol | 13 +++++++++ contracts/p1/BackingManager.sol | 4 ++- contracts/p1/Distributor.sol | 13 +++++++++ test/Revenues.test.ts | 48 +++++++++++++++++++++++++++++++-- 5 files changed, 76 insertions(+), 3 deletions(-) diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 2d4bb0de23..946534141e 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -164,6 +164,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { uint256 rsrBal = main.rsr().balanceOf(address(this)); if (rsrBal > 0) { main.rsr().safeTransfer(address(main.stRSR()), rsrBal); + main.stRSR().payoutRewards(); } // Mint revenue RToken diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 8c5f429b69..9f43240c5e 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -70,6 +70,8 @@ contract DistributorP0 is ComponentP0, IDistributor { // Evenly distribute revenue tokens per distribution share. // This rounds "early", and that's deliberate! + bool accountRewards = false; + for (uint256 i = 0; i < destinations.length(); i++) { address addrTo = destinations.at(i); @@ -81,12 +83,23 @@ contract DistributorP0 is ComponentP0, IDistributor { if (addrTo == FURNACE) { addrTo = address(main.furnace()); + if (transferAmt > 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = address(main.stRSR()); + if (transferAmt > 0) accountRewards = true; } erc20.safeTransferFrom(_msgSender(), addrTo, transferAmt); } emit RevenueDistributed(erc20, _msgSender(), amount); + + // Perform reward accounting + if (accountRewards) { + if (isRSR) { + main.stRSR().payoutRewards(); + } else { + main.furnace().melt(); + } + } } /// Returns the rsr + rToken shareTotals diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index da8473e662..7763ddb771 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -210,10 +210,12 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * RToken traders according to the distribution totals. */ - // Forward any RSR held to StRSR pool; RSR should never be sold for RToken yield + // Forward any RSR held to StRSR pool and payout rewards + // RSR should never be sold for RToken yield if (rsr.balanceOf(address(this)) > 0) { // For CEI, this is an interaction "within our system" even though RSR is already live IERC20(address(rsr)).safeTransfer(address(stRSR), rsr.balanceOf(address(this))); + stRSR.payoutRewards(); } // Mint revenue RToken diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index bce53c5eff..04fedb57ee 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -112,6 +112,8 @@ contract DistributorP1 is ComponentP1, IDistributor { address furnaceAddr = furnace; // gas-saver address stRSRAddr = stRSR; // gas-saver + bool accountRewards = false; + for (uint256 i = 0; i < destinations.length(); ++i) { address addrTo = destinations.at(i); @@ -123,8 +125,10 @@ contract DistributorP1 is ComponentP1, IDistributor { if (addrTo == FURNACE) { addrTo = furnaceAddr; + if (transferAmt > 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = stRSRAddr; + if (transferAmt > 0) accountRewards = true; } transfers[numTransfers] = Transfer({ @@ -141,6 +145,15 @@ contract DistributorP1 is ComponentP1, IDistributor { Transfer memory t = transfers[i]; IERC20Upgradeable(address(t.erc20)).safeTransferFrom(caller, t.addrTo, t.amount); } + + // Perform reward accounting + if (accountRewards) { + if (isRSR) { + main.stRSR().payoutRewards(); + } else { + main.furnace().melt(); + } + } } /// The rsr and rToken shareTotals diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index d631a6f2ed..f4bcf4b8d0 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -13,6 +13,7 @@ import { CollateralStatus, TradeKind, MAX_UINT192, + ONE_PERIOD, } from '../common/constants' import { expectEvents } from '../common/events' import { bn, divCeil, fp, near } from '../common/numbers' @@ -554,7 +555,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) }) - it('Should forward RSR revenue directly to StRSR', async () => { + it('Should forward RSR revenue directly to StRSR and call payoutRewards()', async () => { const amount = bn('2000e18') await rsr.connect(owner).mint(backingManager.address, amount) expect(await rsr.balanceOf(backingManager.address)).to.equal(amount) @@ -562,7 +563,23 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(0) - await expect(backingManager.forwardRevenue([rsr.address])).to.emit(rsr, 'Transfer') + // Advance to the end of noop period + await advanceTime(Number(ONE_PERIOD)) + + await expectEvents(backingManager.forwardRevenue([rsr.address]), [ + { + contract: rsr, + name: 'Transfer', + args: [backingManager.address, stRSR.address, amount], + emitted: true, + }, + { + contract: stRSR, + name: 'RewardsPaid', + emitted: true, + }, + ]) + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) expect(await rsr.balanceOf(stRSR.address)).to.equal(amount) expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) @@ -688,6 +705,33 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(newRTokenTotal).equal(bn(0)) }) + it('Should account rewards when distributing tokenToBuy', async () => { + // 1. StRSR.payoutRewards() + const stRSRBal = await rsr.balanceOf(stRSR.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + await advanceTime(Number(ONE_PERIOD)) + await expect(rsrTrader.distributeTokenToBuy()).to.emit(stRSR, 'RewardsPaid') + const expectedAmountStRSR = stRSRBal.add(issueAmount) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountStRSR, 100) + + // 2. Furnace.melt() + // Transfer RTokens to Furnace (to trigger melting later) + const hndAmt: BigNumber = bn('10e18') + await rToken.connect(addr1).transfer(furnace.address, hndAmt) + await advanceTime(Number(ONE_PERIOD)) + await furnace.melt() + + // Transfer and distribute tokens in Trader (will melt) + await advanceTime(Number(ONE_PERIOD)) + await rToken.connect(addr1).transfer(rTokenTrader.address, hndAmt) + await expect(rTokenTrader.distributeTokenToBuy()).to.emit(rToken, 'Melted') + const expectedAmountFurnace = hndAmt.mul(2) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( + expectedAmountFurnace, + expectedAmountFurnace.div(1000) + ) // within 0.1% + }) + it('Should update distribution even if distributeTokenToBuy() reverts', async () => { // Check initial status const [rTokenTotal, rsrTotal] = await distributor.totals() From 124e40115d1b2d1cd628901f83c56516b66ab1f7 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 20 Oct 2023 19:09:58 -0400 Subject: [PATCH 110/450] gas snapshots --- test/__snapshots__/Broker.test.ts.snap | 10 +-- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Main.test.ts.snap | 2 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 18 ++--- test/__snapshots__/Revenues.test.ts.snap | 26 +++---- test/__snapshots__/ZZStRSR.test.ts.snap | 8 +-- .../__snapshots__/CTokenVaultGas.test.ts.snap | 25 ------- .../AaveV3FiatCollateral.test.ts.snap | 12 +--- .../ATokenFiatCollateral.test.ts.snap | 17 +++-- .../AnkrEthCollateralTestSuite.test.ts.snap | 2 +- .../CBETHCollateral.test.ts.snap | 2 +- .../CTokenFiatCollateral.test.ts.snap | 16 ++--- .../__snapshots__/CometTestSuite.test.ts.snap | 2 +- .../CrvStableMetapoolSuite.test.ts.snap | 2 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +++---- .../CrvStableTestSuite.test.ts.snap | 2 +- .../CvxStableMetapoolSuite.test.ts.snap | 2 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +++---- .../CvxStableTestSuite.test.ts.snap | 2 +- .../SDaiCollateralTestSuite.test.ts.snap | 6 +- .../FTokenFiatCollateral.test.ts.snap | 68 +++++++++---------- .../SFrxEthTestSuite.test.ts.snap | 2 +- .../LidoStakedEthTestSuite.test.ts.snap | 2 +- .../MorphoAAVEFiatCollateral.test.ts.snap | 6 +- .../MorphoAAVENonFiatCollateral.test.ts.snap | 4 +- ...AAVESelfReferentialCollateral.test.ts.snap | 2 +- .../RethCollateralTestSuite.test.ts.snap | 2 +- .../StargateUSDCTestSuite.test.ts.snap | 4 ++ .../__snapshots__/MaxBasketSize.test.ts.snap | 18 ++--- 30 files changed, 144 insertions(+), 174 deletions(-) delete mode 100644 test/integration/__snapshots__/CTokenVaultGas.test.ts.snap diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index 635ba04aab..ceb61ab16e 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -10,12 +10,12 @@ exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `371 exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `451427`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `449950`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `541279`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `539802`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `529117`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `527640`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `531255`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `529778`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113056`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113028`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 143651b3a3..71ba5454b2 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8572904`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8532211`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index ffecb35bc5..80025274f2 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393837`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393877`; exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index c725eeb995..78da6ac501 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782158`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782198`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609158`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609198`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583862`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583902`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index ddde5b4fe3..6b70c5b36c 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1365473`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1363847`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1500861`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1499568`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `755062`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `738601`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1659319`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1656950`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174781`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1602220`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1599095`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174781`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1689982`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1687568`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202854`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index bb7a77e725..ac389f42c3 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -1,27 +1,27 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `164974`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `168005`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165027`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `168058`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165027`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `168058`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208624`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `211655`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `232408`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `215308`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1020522`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1044877`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `774070`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `796514`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1175816`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1198554`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `367726`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `317915`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739870`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `762314`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `284933`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 63500d7165..08449237d2 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `156559`; exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; @@ -10,10 +10,10 @@ exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41509`; exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58621`; -exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; +exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `241951`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606273`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606313`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536407`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536447`; diff --git a/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap b/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap deleted file mode 100644 index a9ec5a85ce..0000000000 --- a/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap +++ /dev/null @@ -1,25 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Issue RToken 1`] = `816857`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Issue RToken 2`] = `677455`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Redeem RToken 1`] = `679421`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 1`] = `159307`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 2`] = `127937`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 3`] = `110849`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Issue RToken 1`] = `965241`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Issue RToken 2`] = `753143`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Redeem RToken 1`] = `748958`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 1`] = `310005`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 2`] = `193085`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 3`] = `175997`; diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap index e3fbc7a99f..75cffdf3ef 100644 --- a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -1,14 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -<<<<<<< HEAD -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69288`; -======= exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting ERC20 transfer 1`] = `53509`; exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting ERC20 transfer 2`] = `36409`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69299`; ->>>>>>> master +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69288`; exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67620`; @@ -28,10 +24,6 @@ exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87684`; -<<<<<<< HEAD exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89634`; -======= -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89656`; ->>>>>>> master -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87966`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `88040`; diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 2b2ca446a4..236eb477ff 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -4,7 +4,7 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 Wrapper t exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 Wrapper transfer 2`] = `53409`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74365`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74354`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72686`; @@ -16,15 +16,14 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72686`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91169`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91073`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91147`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91073`; -<<<<<<< HEAD -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92211`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92285`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92285`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127378`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92211`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91436`; ->>>>>>> master +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127282`; + +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91414`; diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index 4dca33bfd7..64458dcd1a 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting ERC20 exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting ERC20 transfer 2`] = `43994`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60337`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60326`; exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55857`; diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index aeedbbd68d..f7366a3fb9 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting ERC2 exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `48379`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59824`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59813`; exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55344`; diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index 35e48fb603..23638304fb 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 transfer exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 transfer 2`] = `173113`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119361`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119350`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117692`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117681`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76220`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68538`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119361`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119350`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117692`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117681`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138759`; exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138685`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139858`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139836`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139858`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139836`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175004`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174982`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139061`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139039`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index 0d9ab7955c..68d964d679 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting ERC20 exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `90521`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109063`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109052`; exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104315`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index 92e650e5ae..0181aff186 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collatera exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `360937`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 2108bd826b..d4cbecc6e1 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper col exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `385743`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485294`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `99581`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480900`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226544`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594808`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `221662`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589778`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101430`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478472`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96962`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474078`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96621`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544737`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96621`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221659`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713285`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221659`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713507`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209203`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701199`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `201935`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693635`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index 4d56f35fab..ffa84bf243 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functi exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `369452`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index f66c4f606f..9b9c0827d4 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collat exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `172551`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index 20ba537bf2..c1e15dc5e3 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `175188`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485294`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `99581`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480826`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226544`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `221662`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589852`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101430`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478546`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96962`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474078`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96621`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544811`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96621`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221659`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713211`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221659`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713581`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209203`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701125`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `201935`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693635`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index de3a1022a7..80285bbb17 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral fun exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `123705`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index 744ad759c1..c999a57b94 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting ERC20 exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `34259`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116754`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116743`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108431`; @@ -24,6 +24,6 @@ exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refre exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `123298`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131222`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `131126`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `123676`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `123580`; diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index e1abcec332..e9d415b72d 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -4,110 +4,110 @@ exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting ERC2 exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117361`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117350`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115692`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115681`; exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140959`; exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139145`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117361`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117350`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115692`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115681`; exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115327`; exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115327`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139177`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139155`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139177`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139155`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141202`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141106`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139459`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139511`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117553`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117542`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115884`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115873`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141215`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139401`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117553`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117542`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115884`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115873`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115519`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115519`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139433`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139411`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139433`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139411`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141458`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141362`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139789`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139693`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125843`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125832`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124174`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150019`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149927`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148135`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148183`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125843`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125832`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124174`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124163`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123809`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123809`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148215`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148193`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148145`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148193`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150096`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150074`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148427`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148475`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120491`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120480`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118822`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118811`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144361`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142547`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120491`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120480`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118822`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118811`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118457`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118457`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142579`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142487`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142509`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142557`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144530`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144438`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142861`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142839`; diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index e5ccda2c70..58a27e8317 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting E exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `34204`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58995`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58984`; exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54247`; diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index ef1848e9b3..7abbfa8057 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting ERC20 exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting ERC20 transfer 2`] = `34564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88044`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88033`; exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83564`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index b87d60f332..48f07dc32e 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality G exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134222`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134211`; exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129742`; @@ -32,7 +32,7 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134425`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134414`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129945`; @@ -60,7 +60,7 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133578`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133567`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129098`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index 145a8cd7a9..a89c7240b4 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionali exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133645`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133634`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129165`; @@ -32,7 +32,7 @@ exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functional exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167277`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167266`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162797`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index 1b16470a46..a420cba2b6 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral fun exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201563`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201552`; exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197083`; diff --git a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap index a4cdca2e47..93f294ae7d 100644 --- a/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/rocket-eth/__snapshots__/RethCollateralTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting ERC20 exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting ERC20 transfer 2`] = `42321`; -exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `70887`; +exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `70876`; exports[`Collateral: RocketPoolETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `66407`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap index fc27356e8c..3afcb28f2e 100644 --- a/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap @@ -1,5 +1,9 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting ERC20 transfer 1`] = `109345`; + +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting ERC20 transfer 2`] = `92245`; + exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 1`] = `56094`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after full price timeout 2`] = `51626`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 156f632337..73f9cbd319 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082293`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082333`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9836895`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9823929`; -exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; +exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2436571`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653640`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653680`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20688663`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20685978`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984043`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984083`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8707789`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8720835`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592417`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592449`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14441485`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14438756`; From 6fccc54b0deac8fba7ef4f5fa461c01c2e94a1f1 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 23 Oct 2023 20:10:15 -0300 Subject: [PATCH 111/450] TRUST QA-4: Smoother exposedRefPrice in case of default (#987) Co-authored-by: Taylor Brent --- .../assets/AppreciatingFiatCollateral.sol | 2 +- contracts/plugins/assets/L2LSDCollateral.sol | 2 +- .../assets/compoundv3/CTokenV3Collateral.sol | 2 +- .../assets/curve/CurveStableCollateral.sol | 2 +- .../individual-collateral/collateralTests.ts | 15 +++++++++++++++ .../compoundv3/CometTestSuite.test.ts | 9 +++++++++ .../curve/collateralTests.ts | 7 +++++++ .../frax-eth/SFrxEthTestSuite.test.ts | 18 ++++++++++++++---- 8 files changed, 49 insertions(+), 8 deletions(-) diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index bf7cef6022..60e575cf71 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -88,7 +88,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index c2d7cd3cd6..60b0bd8329 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -53,7 +53,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 281688968c..92f8a2d203 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -77,7 +77,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index f5706f75e6..8a21dfda9b 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -88,7 +88,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 2abd30838e..e077f3567f 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -343,14 +343,29 @@ export default function fn( }) // Should remain SOUND after a 1% decrease + let refPerTok = await ctx.collateral.refPerTok() await reduceRefPerTok(ctx, 1) // 1% decrease await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) + // refPerTok should be unchanged + expect(await ctx.collateral.refPerTok()).to.be.closeTo( + refPerTok, + refPerTok.div(bn('1e3')) + ) // within 1-part-in-1-thousand + // Should become DISABLED if drops more than that + refPerTok = await ctx.collateral.refPerTok() await reduceRefPerTok(ctx, 1) // another 1% decrease await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await ctx.collateral.refPerTok()).to.be.closeTo( + refPerTok, + refPerTok.div(bn('1e3')) + ) // within 1-part-in-1-thousand }) it('reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index ccc8a97982..7c91bd2064 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -357,6 +357,7 @@ const collateralSpecificStatusTests = () => { }) // Should remain SOUND after a 1% decrease + let refPerTok = await collateral.refPerTok() let currentExchangeRate = await wcusdcV3Mock.exchangeRate() await wcusdcV3Mock.setMockExchangeRate( true, @@ -365,7 +366,11 @@ const collateralSpecificStatusTests = () => { await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + // refPerTok should be unchanged + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand + // Should become DISABLED if drops more than that + refPerTok = await collateral.refPerTok() currentExchangeRate = await wcusdcV3Mock.exchangeRate() await wcusdcV3Mock.setMockExchangeRate( true, @@ -373,6 +378,10 @@ const collateralSpecificStatusTests = () => { ) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) } diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 2770210796..3f9628fc7c 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -638,6 +638,7 @@ export default function fn( expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) // Decrease refPerTok by 1 part in a million + const refPerTok = await ctx.collateral.refPerTok() const currentExchangeRate = await ctx.curvePool.get_virtual_price() const newVirtualPrice = currentExchangeRate.sub(currentExchangeRate.div(bn('1e6'))) await ctx.curvePool.setVirtualPrice(newVirtualPrice) @@ -650,11 +651,17 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) + // refPerTok should be unchanged + expect(await ctx.collateral.refPerTok()).to.equal(refPerTok) + // One quanta more of decrease results in default await ctx.curvePool.setVirtualPrice(newVirtualPrice.sub(2)) // sub 2 to compenstate for rounding await expect(ctx.collateral.refresh()).to.emit(ctx.collateral, 'CollateralStatusChanged') expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) + + // refPerTok should have fallen exactly 2e-18 + expect(await ctx.collateral.refPerTok()).to.equal(refPerTok.sub(2)) }) describe('collateral-specific tests', collateralSpecificStatusTests) diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index 681f53ae1b..7ac77c01d1 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -198,7 +198,7 @@ const collateralSpecificConstructorTests = () => {} // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => { - it('does revenue hiding', async () => { + it('does revenue hiding correctly', async () => { const MockFactory = await ethers.getContractFactory('SfraxEthMock') const erc20 = (await MockFactory.deploy()) as SfraxEthMock let currentPPS = await (await ethers.getContractAt('IsfrxEth', SFRX_ETH)).pricePerShare() @@ -215,14 +215,24 @@ const collateralSpecificStatusTests = () => { }) // Should remain SOUND after a 1% decrease - await erc20.setPricePerShare(currentPPS.sub(currentPPS.div(100))) + let refPerTok = await collateral.refPerTok() + const newPPS = currentPPS.sub(currentPPS.div(100)) + await erc20.setPricePerShare(newPPS) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - // Should become DISABLED if drops more than that - await erc20.setPricePerShare(currentPPS.sub(currentPPS.div(99))) + // refPerTok should be unchanged + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand + + // Should become DISABLED if drops another 1% + refPerTok = await collateral.refPerTok() + await erc20.setPricePerShare(newPPS.sub(newPPS.div(100))) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) } From c1e9f043ec617485cc1f35d4ea7e9828208b0800 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 23 Oct 2023 20:50:00 -0400 Subject: [PATCH 112/450] Trst m 14 (#982) --- .github/workflows/tests.yml | 1 - common/configuration.ts | 2 +- contracts/plugins/assets/Asset.sol | 4 +- .../phase1-common/3_deploy_rsrAsset.ts | 4 +- .../phase2-assets/1_deploy_assets.ts | 6 +- .../phase2-assets/2_deploy_collateral.ts | 280 ++++++++++++++++-- .../phase2-assets/assets/deploy_crv.ts | 4 +- .../phase2-assets/assets/deploy_cvx.ts | 4 +- .../collaterals/deploy_aave_v3_usdbc.ts | 4 +- .../collaterals/deploy_aave_v3_usdc.ts | 6 +- .../collaterals/deploy_cbeth_collateral.ts | 12 +- .../deploy_compound_v2_collateral.ts | 18 +- .../deploy_convex_rToken_metapool_plugin.ts | 9 +- .../deploy_convex_stable_metapool_plugin.ts | 8 +- .../deploy_convex_stable_plugin.ts | 10 +- .../deploy_convex_volatile_plugin.ts | 142 --------- .../deploy_ctokenv3_usdbc_collateral.ts | 6 +- .../deploy_ctokenv3_usdc_collateral.ts | 6 +- .../deploy_curve_rToken_metapool_plugin.ts | 9 +- .../deploy_curve_stable_metapool_plugin.ts | 8 +- .../collaterals/deploy_curve_stable_plugin.ts | 10 +- .../deploy_curve_volatile_plugin.ts | 142 --------- .../collaterals/deploy_dsr_sdai.ts | 4 +- .../deploy_flux_finance_collateral.ts | 10 +- .../deploy_lido_wsteth_collateral.ts | 6 +- .../deploy_morpho_aavev2_plugin.ts | 14 +- .../deploy_rocket_pool_reth_collateral.ts | 8 +- .../deploy_stargate_usdc_collateral.ts | 19 +- .../deploy_stargate_usdt_collateral.ts | 4 +- scripts/deployment/utils.ts | 9 +- scripts/verification/6_verify_collateral.ts | 32 +- .../verify_aave_v3_usdbc.ts | 4 +- .../collateral-plugins/verify_aave_v3_usdc.ts | 6 +- .../collateral-plugins/verify_cbeth.ts | 12 +- .../verify_convex_stable.ts | 10 +- .../verify_convex_stable_metapool.ts | 8 +- .../verify_convex_stable_rtoken_metapool.ts | 9 +- .../verify_convex_volatile.ts | 98 ------ .../collateral-plugins/verify_curve_stable.ts | 10 +- .../verify_curve_stable_metapool.ts | 8 +- .../verify_curve_stable_rtoken_metapool.ts | 9 +- .../verify_curve_volatile.ts | 98 ------ .../collateral-plugins/verify_cusdbcv3.ts | 6 +- .../collateral-plugins/verify_cusdcv3.ts | 6 +- .../collateral-plugins/verify_morpho.ts | 16 +- .../collateral-plugins/verify_reth.ts | 6 +- .../collateral-plugins/verify_wsteth.ts | 6 +- test/Broker.test.ts | 8 +- test/Main.test.ts | 25 +- test/RTokenExtremes.test.ts | 4 +- test/Recollateralization.test.ts | 9 +- test/Revenues.test.ts | 17 +- test/fixtures.ts | 20 +- test/integration/AssetPlugins.test.ts | 25 +- test/integration/EasyAuction.test.ts | 4 +- test/integration/fixtures.ts | 30 +- test/integration/fork-block-numbers.ts | 2 +- test/plugins/Asset.test.ts | 9 +- test/plugins/Collateral.test.ts | 129 ++++---- .../aave/ATokenFiatCollateral.test.ts | 20 +- .../compoundv2/CTokenFiatCollateral.test.ts | 22 +- .../plugins/individual-collateral/fixtures.ts | 4 +- .../MorphoAaveV2TokenisedDeposit.test.ts | 5 +- test/scenario/BadCollateralPlugin.test.ts | 4 +- test/scenario/ComplexBasket.test.ts | 26 +- test/scenario/MaxBasketSize.test.ts | 8 +- test/scenario/NestedRTokens.test.ts | 4 +- test/scenario/NontrivialPeg.test.ts | 6 +- test/scenario/RevenueHiding.test.ts | 4 +- test/scenario/SetProtocol.test.ts | 8 +- 70 files changed, 611 insertions(+), 895 deletions(-) delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts delete mode 100644 scripts/verification/collateral-plugins/verify_convex_volatile.ts delete mode 100644 scripts/verification/collateral-plugins/verify_curve_volatile.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 62e19d8665..8c1d16e8da 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,6 @@ jobs: - run: yarn devchain & env: MAINNET_RPC_URL: https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161 - FORK_BLOCK: 18329921 FORK_NETWORK: mainnet - run: yarn deploy:run --network localhost env: diff --git a/common/configuration.ts b/common/configuration.ts index e6e1f846e3..f17059cb08 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -675,7 +675,7 @@ 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) +export const MAX_ORACLE_TIMEOUT = BigNumber.from(2).pow(48).sub(1).sub(300) export const MAX_TRADING_DELAY = 31536000 // 1 year export const MIN_WARMUP_PERIOD = 60 // 1 minute export const MAX_WARMUP_PERIOD = 31536000 // 1 year diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index ed98e9a1d7..3b858a9eab 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -7,6 +7,8 @@ import "../../interfaces/IAsset.sol"; import "./OracleLib.sol"; import "./VersionedAsset.sol"; +uint48 constant ORACLE_TIMEOUT_BUFFER = 300; // {s} 5 minutes + contract Asset is IAsset, VersionedAsset { using FixLib for uint192; using OracleLib for AggregatorV3Interface; @@ -62,7 +64,7 @@ contract Asset is IAsset, VersionedAsset { erc20 = erc20_; erc20Decimals = erc20.decimals(); maxTradeVolume = maxTradeVolume_; - oracleTimeout = oracleTimeout_; + oracleTimeout = oracleTimeout_ + ORACLE_TIMEOUT_BUFFER; // add 300s as a buffer } /// Can revert, used by other contract functions in order to catch errors diff --git a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts b/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts index e67a33f602..f33da05e81 100644 --- a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts +++ b/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts @@ -6,7 +6,7 @@ import { networkConfig } from '../../../common/configuration' import { ZERO_ADDRESS } from '../../../common/constants' import { fp } from '../../../common/numbers' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../../deployment/common' -import { priceTimeout, oracleTimeout, validateImplementations } from '../../deployment/utils' +import { priceTimeout, validateImplementations } from '../../deployment/utils' import { Asset } from '../../../typechain' let rsrAsset: Asset @@ -36,7 +36,7 @@ async function main() { tokenAddress: deployments.prerequisites.RSR, rewardToken: ZERO_ADDRESS, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h + oracleTimeout: '86400', // 24h }) rsrAsset = await ethers.getContractAt('Asset', rsrAssetAddr) diff --git a/scripts/deployment/phase2-assets/1_deploy_assets.ts b/scripts/deployment/phase2-assets/1_deploy_assets.ts index cab49a5515..93a8a69392 100644 --- a/scripts/deployment/phase2-assets/1_deploy_assets.ts +++ b/scripts/deployment/phase2-assets/1_deploy_assets.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../deployment/utils' +import { priceTimeout } from '../../deployment/utils' import { Asset } from '../../../typechain' async function main() { @@ -44,7 +44,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.stkAAVE, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr }) await (await ethers.getContractAt('Asset', stkAAVEAsset)).refresh() @@ -60,7 +60,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.COMP, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr }) await (await ethers.getContractAt('Asset', compAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index cd8fdaa334..5a58c3bea8 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../common' -import { combinedError, priceTimeout, oracleTimeout, revenueHiding } from '../utils' +import { combinedError, priceTimeout, revenueHiding } from '../utils' import { ICollateral, ATokenMock, StaticATokenLM } from '../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { let collateral: ICollateral /******** Deploy Fiat Collateral - DAI **************************/ - const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? 86400 : 3600 // 24 hr (Base) or 1 hour + const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? '86400' : '3600' // 24 hr (Base) or 1 hour const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% if (networkConfig[chainId].tokens.DAI && networkConfig[chainId].chainlinkFeeds.DAI) { @@ -53,7 +53,7 @@ async function main() { oracleError: daiOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), + oracleTimeout: daiOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -69,7 +69,7 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% /******** Deploy Fiat Collateral - USDC **************************/ @@ -80,7 +80,7 @@ async function main() { oracleError: usdcOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + oracleTimeout: usdcOracleTimeout, // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -97,7 +97,7 @@ async function main() { } /******** Deploy Fiat Collateral - USDT **************************/ - const usdtOracleTimeout = 86400 // 24 hr + const usdtOracleTimeout = '86400' // 24 hr const usdtOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% if (networkConfig[chainId].tokens.USDT && networkConfig[chainId].chainlinkFeeds.USDT) { @@ -107,7 +107,7 @@ async function main() { oracleError: usdtOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdtOracleTimeout).toString(), // 24 hr + oracleTimeout: usdtOracleTimeout, // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdtOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -132,7 +132,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.USDP, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -156,7 +156,7 @@ async function main() { oracleError: fp('0.003').toString(), // 0.3% tokenAddress: networkConfig[chainId].tokens.TUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.013').toString(), // 1.3% delayUntilDefault: bn('86400').toString(), // 24h @@ -179,7 +179,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% tokenAddress: networkConfig[chainId].tokens.BUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -203,7 +203,7 @@ async function main() { oracleError: usdcOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDbC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + oracleTimeout: usdcOracleTimeout, // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1.3% delayUntilDefault: bn('86400').toString(), // 24h @@ -249,7 +249,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: adaiStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -293,7 +293,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: ausdcStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -337,7 +337,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: ausdtStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -380,7 +380,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% staticAToken: abusdStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -424,7 +424,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% staticAToken: ausdpStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -445,6 +445,242 @@ async function main() { const btcOracleError = fp('0.005') // 0.5% const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) + /*** Compound V2 not available in Base L2s */ + if (!baseL2Chains.includes(hre.network.name)) { + /******** Deploy CToken Fiat Collateral - cDAI **************************/ + const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') + const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) + + const cDaiVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cDAI!, + `${await cDai.name()} Vault`, + `${await cDai.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cDaiVault.deployed() + + console.log( + `Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} ` + ) + + const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cDaiVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cDaiCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cDAI = cDaiCollateral + assetCollDeployments.erc20s.cDAI = cDaiVault.address + deployedCollateral.push(cDaiCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDC **************************/ + const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) + + const cUsdcVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDC!, + `${await cUsdc.name()} Vault`, + `${await cUsdc.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdcVault.deployed() + + console.log( + `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` + ) + + const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cUsdcVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdcCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDC = cUsdcCollateral + assetCollDeployments.erc20s.cUSDC = cUsdcVault.address + deployedCollateral.push(cUsdcCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDT **************************/ + const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) + + const cUsdtVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDT!, + `${await cUsdt.name()} Vault`, + `${await cUsdt.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdtVault.deployed() + + console.log( + `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` + ) + + const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cUsdtVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdtCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDT = cUsdtCollateral + assetCollDeployments.erc20s.cUSDT = cUsdtVault.address + deployedCollateral.push(cUsdtCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDP **************************/ + const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) + + const cUsdpVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDP!, + `${await cUsdp.name()} Vault`, + `${await cUsdp.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdpVault.deployed() + + console.log( + `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` + ) + + const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, + oracleError: fp('0.01').toString(), // 1% + cToken: cUsdpVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdpCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDP = cUsdpCollateral + assetCollDeployments.erc20s.cUSDP = cUsdpVault.address + deployedCollateral.push(cUsdpCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ + const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) + + const cWBTCVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cWBTC!, + `${await cWBTC.name()} Vault`, + `${await cWBTC.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cWBTCVault.deployed() + + console.log( + `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` + ) + + const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { + priceTimeout: priceTimeout.toString(), + referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, + targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, + combinedOracleError: combinedBTCWBTCError.toString(), + cToken: cWBTCVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cWBTCCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cWBTC = cWBTCCollateral + assetCollDeployments.erc20s.cWBTC = cWBTCVault.address + deployedCollateral.push(cWBTCCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Self-Referential Collateral - cETH **************************/ + const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) + + const cETHVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cETH!, + `${await cETH.name()} Vault`, + `${await cETH.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cETHVault.deployed() + + console.log( + `Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} ` + ) + + const { collateral: cETHCollateral } = await hre.run( + 'deploy-ctoken-selfreferential-collateral', + { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: fp('0.005').toString(), // 0.5% + cToken: cETHVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + revenueHiding: revenueHiding.toString(), + referenceERC20Decimals: '18', + } + ) + collateral = await ethers.getContractAt('ICollateral', cETHCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cETH = cETHCollateral + assetCollDeployments.erc20s.cETH = cETHVault.address + deployedCollateral.push(cETHCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + /******** Deploy Non-Fiat Collateral - wBTC **************************/ if ( networkConfig[chainId].tokens.WBTC && @@ -458,8 +694,8 @@ async function main() { combinedOracleError: combinedBTCWBTCError.toString(), tokenAddress: networkConfig[chainId].tokens.WBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -477,7 +713,7 @@ async function main() { /******** Deploy Self Referential Collateral - wETH **************************/ if (networkConfig[chainId].tokens.WETH && networkConfig[chainId].chainlinkFeeds.ETH) { - const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? '1200' : '3600' // 20 min (Base) or 1 hr const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% const { collateral: wETHCollateral } = await hre.run('deploy-selfreferential-collateral', { @@ -486,7 +722,7 @@ async function main() { oracleError: ethOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), + oracleTimeout: ethOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('ETH'), }) collateral = await ethers.getContractAt('ICollateral', wETHCollateral) @@ -515,8 +751,8 @@ async function main() { oracleError: eurtError.toString(), // 2% tokenAddress: networkConfig[chainId].tokens.EURT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: fp('0.03').toString(), // 3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/assets/deploy_crv.ts b/scripts/deployment/phase2-assets/assets/deploy_crv.ts index f0db202b9b..80eb3f6c19 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_crv.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_crv.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../../deployment/utils' +import { priceTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.CRV, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr }) await (await ethers.getContractAt('Asset', crvAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/assets/deploy_cvx.ts b/scripts/deployment/phase2-assets/assets/deploy_cvx.ts index 1c5aaa57ce..cb7eb2d5d2 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_cvx.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_cvx.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../../deployment/utils' +import { priceTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.02').toString(), // 2% tokenAddress: networkConfig[chainId].tokens.CVX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr }) await (await ethers.getContractAt('Asset', cvxAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts index e7fbc98512..f930201a21 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts @@ -13,7 +13,7 @@ import { } from '../../common' import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' -import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' // This file specifically deploys Aave V3 USDC collateral @@ -77,7 +77,7 @@ async function main() { oracleError: fp('0.003'), // 3% erc20: erc20.address, maxTradeVolume: fp('1e6'), - oracleTimeout: oracleTimeout(chainId, bn('86400')), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.013'), delayUntilDefault: bn('86400'), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts index 2d56f9d3f9..2d4eb8112d 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -13,7 +13,7 @@ import { } from '../../common' import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' -import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' // This file specifically deploys Aave V3 USDC collateral @@ -68,7 +68,7 @@ async function main() { ) /******** Deploy Aave V3 USDC collateral plugin **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') @@ -79,7 +79,7 @@ async function main() { oracleError: usdcOracleError, erc20: erc20.address, maxTradeVolume: fp('1e6'), - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout), + oracleTimeout: usdcOracleTimeout, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError), delayUntilDefault: bn('86400'), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts index eab6850157..18984099fe 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, combinedError } from '../../utils' +import { priceTimeout, combinedError } from '../../utils' import { CBEthCollateral, CBEthCollateralL2, @@ -62,14 +62,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout + '86400' // refPerTokChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() @@ -89,16 +89,16 @@ async function main() { oracleError: oracleError.toString(), // 0.15% & 0.5%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + oracleTimeout: '1200', // 20 min targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed - oracleTimeout(chainId, '86400').toString() // exchangeRateChainlinkTimeout + '86400' // exchangeRateChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts index d328a311dd..89b2464c55 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts @@ -12,8 +12,8 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { combinedError, priceTimeout, oracleTimeout, revenueHiding } from '../../utils' -import { ICollateral, ATokenMock, StaticATokenLM } from '../../../../typechain' +import { combinedError, priceTimeout, revenueHiding } from '../../utils' +import { ICollateral } from '../../../../typechain' async function main() { // ==== Read Configuration ==== @@ -71,7 +71,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cDaiVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -109,7 +109,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cUsdcVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -147,7 +147,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cUsdtVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -185,7 +185,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% cToken: cUsdpVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -224,8 +224,8 @@ async function main() { combinedOracleError: combinedBTCWBTCError.toString(), cToken: cWBTCVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -265,7 +265,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% cToken: cETHVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: revenueHiding.toString(), referenceERC20Decimals: '18', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts index dae7875b30..e7b53d4f51 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts @@ -14,7 +14,7 @@ import { fileExists, } from '../../common' import { CurveStableRTokenMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -87,7 +87,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -98,10 +98,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts index 72d0f7debe..4a2c1c6eab 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CurvePoolType, DELAY_UNTIL_DEFAULT, @@ -105,11 +105,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts index 97a8fc4f2b..bc52c467c9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts @@ -14,7 +14,7 @@ import { fileExists, } from '../../common' import { CurveStableCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -88,7 +88,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -99,11 +99,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts deleted file mode 100644 index ab71316676..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts +++ /dev/null @@ -1,142 +0,0 @@ -import fs from 'fs' -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' -import { bn } from '../../../../common/numbers' -import { expect } from 'chai' -import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - IDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { CurveVolatileCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' -import { - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - TRI_CRYPTO_CVX_POOL_ID, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../../test/plugins/individual-collateral/curve/constants' - -// This file specifically deploys Convex Volatile Plugin for Tricrypto - -async function main() { - // ==== Read Configuration ==== - const [deployer] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${deployer.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - const deployments = getDeploymentFile(phase1File) - - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - const deployedCollateral: string[] = [] - - /******** Deploy Convex Volatile Pool for 3pool **************************/ - - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) - const CurveVolatileCollateralFactory = await hre.ethers.getContractFactory( - 'CurveVolatileCollateral' - ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) - - const w3Pool = await ConvexStakingWrapperFactory.deploy() - await w3Pool.deployed() - await (await w3Pool.initialize(TRI_CRYPTO_CVX_POOL_ID)).wait() - - console.log( - `Deployed wrapper for Convex Volatile TriCrypto on ${hre.network.name} (${chainId}): ${w3Pool.address} ` - ) - - const collateral = await CurveVolatileCollateralFactory.connect( - deployer - ).deploy( - { - erc20: w3Pool.address, - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDT_ORACLE_TIMEOUT), // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - } - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - console.log( - `Deployed Convex Volatile Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - - assetCollDeployments.collateral.cvxTriCrypto = collateral.address - assetCollDeployments.erc20s.cvxTriCrypto = w3Pool.address - deployedCollateral.push(collateral.address.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts index 3f4755ff72..21e78893af 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -61,7 +61,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = fp('0.003') // 0.3% (Base) const collateral = await CTokenV3Factory.connect(deployer).deploy( @@ -71,7 +71,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts index 873b8fbcc0..a05ac5bbc7 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -59,7 +59,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% const collateral = await CTokenV3Factory.connect(deployer).deploy( @@ -69,7 +69,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts index e886d6d806..c2d760a2f9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableRTokenMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CRV, CurvePoolType, @@ -88,7 +88,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -99,10 +99,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts index f97882d214..e62840d7e1 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts @@ -12,7 +12,7 @@ import { fileExists, } from '../../common' import { CurveStableMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CRV, CurvePoolType, @@ -105,11 +105,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts index b2d6462d6c..6b9f415d01 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CRV, CurvePoolType, @@ -89,7 +89,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -100,11 +100,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts deleted file mode 100644 index f3b6e3e615..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts +++ /dev/null @@ -1,142 +0,0 @@ -import fs from 'fs' -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' -import { bn } from '../../../../common/numbers' -import { expect } from 'chai' -import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { CurveVolatileCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' -import { - CRV, - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - TRI_CRYPTO_GAUGE, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../../test/plugins/individual-collateral/curve/constants' - -// Deploy Curve Volatile Plugin for Tricrypto - -async function main() { - // ==== Read Configuration ==== - const [deployer] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${deployer.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - const deployedCollateral: string[] = [] - - /******** Deploy Curve Volatile Pool for 3pool **************************/ - - const CurveVolatileCollateralFactory = await hre.ethers.getContractFactory( - 'CurveVolatileCollateral' - ) - const CurveStakingWrapperFactory = await ethers.getContractFactory('CurveGaugeWrapper') - const w3Pool = await CurveStakingWrapperFactory.deploy( - TRI_CRYPTO_TOKEN, - 'Wrapped Curve.fi USD-BTC-ETH', - 'wcrv3crypto', - CRV, - TRI_CRYPTO_GAUGE - ) - await w3Pool.deployed() - - console.log( - `Deployed wrapper for Curve Volatile TriCrypto on ${hre.network.name} (${chainId}): ${w3Pool.address} ` - ) - - const collateral = await CurveVolatileCollateralFactory.connect( - deployer - ).deploy( - { - erc20: w3Pool.address, - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDT_ORACLE_TIMEOUT), // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - } - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - console.log( - `Deployed Curve Volatile Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - - assetCollDeployments.collateral.crvTriCrypto = collateral.address - assetCollDeployments.erc20s.crvTriCrypto = w3Pool.address - deployedCollateral.push(collateral.address.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts index 26ab8341ac..d06853b7ce 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts @@ -13,7 +13,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { SDaiCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -54,7 +54,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: networkConfig[chainId].tokens.sDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts index af7258ec4c..6acbcccf8f 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' import { ICollateral } from '../../../../typechain' async function main() { @@ -49,7 +49,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fUsdc.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -74,7 +74,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fUsdt.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -99,7 +99,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fDai.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -124,7 +124,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% cToken: fFrax.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts index bc6a8b160a..30884eae2d 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { LidoStakedEthCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -79,14 +79,14 @@ async function main() { oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% stethEthOracleAddress, // targetPerRefChainlinkFeed - oracleTimeout(chainId, '86400').toString() // targetPerRefChainlinkTimeout + '86400' // targetPerRefChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index 19962dd88f..4c74574653 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -11,7 +11,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, combinedError } from '../../utils' +import { priceTimeout, combinedError } from '../../utils' async function main() { // ==== Read Configuration ==== @@ -126,7 +126,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: stablesOracleError.toString(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr + oracleTimeout: '86400', // 1 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: stablesOracleError.add(fp('0.01')), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -184,7 +184,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedBTCWBTCError, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h @@ -193,7 +193,7 @@ async function main() { }, revenueHiding, networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} - oracleTimeout(chainId, '86400').toString() // 1 hr + '86400' // 1 hr ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) @@ -207,7 +207,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: fp('0.005'), maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h @@ -236,7 +236,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedOracleErrors, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% delayUntilDefault: bn('86400'), // 24h @@ -245,7 +245,7 @@ async function main() { }, revenueHiding, networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} - oracleTimeout(chainId, '86400').toString() // 1 hr + '86400' // 1 hr ) assetCollDeployments.collateral.maStETH = collateral.address deployedCollateral.push(collateral.address.toString()) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts index 6d39259061..d90520b97a 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts @@ -12,8 +12,8 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, combinedError } from '../../utils' -import { MockV3Aggregator, RethCollateral } from '../../../../typechain' +import { priceTimeout, combinedError } from '../../utils' +import { RethCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' async function main() { @@ -70,14 +70,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% rethOracleAddress, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout + '86400' // refPerTokChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts index 5db4436ea9..dfd837767f 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts @@ -12,17 +12,12 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { revenueHiding, priceTimeout, oracleTimeout } from '../../utils' +import { revenueHiding, priceTimeout } from '../../utils' import { StargatePoolFiatCollateral, StargatePoolFiatCollateral__factory, } from '../../../../typechain' import { ContractFactory } from 'ethers' - -import { - STAKING_CONTRACT, - SUSDC, -} from '../../../../test/plugins/individual-collateral/stargate/constants' import { useEnv } from '#/utils/env' async function main() { @@ -51,8 +46,10 @@ async function main() { /******** Deploy Stargate USDC Wrapper **************************/ - const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') - let chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' + const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory( + 'StargateRewardableWrapper' + ) + const chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' let USDC_NAME = 'USDC' let name = 'Wrapped Stargate USDC' let symbol = 'wsgUSDC' @@ -93,7 +90,7 @@ async function main() { oracleError: oracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainIdKey, '86400').toString(), // 24h hr, + oracleTimeout: '86400', // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(oracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -104,7 +101,9 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - console.log(`Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}`) + console.log( + `Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}` + ) if (chainIdKey == '8453') { assetCollDeployments.collateral.wsgUSDbC = collateral.address diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts index 8a43556a52..4ac4e4c6c8 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { revenueHiding, priceTimeout, oracleTimeout } from '../../utils' +import { revenueHiding, priceTimeout } from '../../utils' import { StargatePoolFiatCollateral, StargatePoolFiatCollateral__factory, @@ -77,7 +77,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25%, erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, + oracleTimeout: '86400', // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index 84dad2be5e..a8c2083e09 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -2,7 +2,7 @@ import hre, { tenderly } from 'hardhat' import * as readline from 'readline' import axios from 'axios' import { exec } from 'child_process' -import { BigNumber, BigNumberish } from 'ethers' +import { BigNumber } from 'ethers' import { bn, fp } from '../../common/numbers' import { IComponents, baseL2Chains } from '../../common/configuration' import { isValidContract } from '../../common/blockchain-utils' @@ -13,13 +13,6 @@ export const priceTimeout = bn('604800') // 1 week export const revenueHiding = fp('1e-6') // 1 part in a million -export const longOracleTimeout = bn('4294967296') - -// Returns the base plus 1 minute -export const oracleTimeout = (chainId: string, base: BigNumberish) => { - return chainId == '1' || chainId == '8453' ? bn('60').add(base) : longOracleTimeout -} - export const combinedError = (x: BigNumber, y: BigNumber): BigNumber => { return fp('1').add(x).mul(fp('1').add(y)).div(fp('1')).sub(fp('1')) } diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index 9da0d9791d..fbcfe84d23 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -8,13 +8,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../deployment/common' -import { - combinedError, - priceTimeout, - oracleTimeout, - revenueHiding, - verifyContract, -} from '../deployment/utils' +import { combinedError, priceTimeout, revenueHiding, verifyContract } from '../deployment/utils' import { ATokenMock, ATokenFiatCollateral, ICToken, CTokenFiatCollateral } from '../../typechain' let deployments: IAssetCollDeployments @@ -47,7 +41,7 @@ async function main() { oracleError: daiOracleError.toString(), erc20: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), + oracleTimeout: daiOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -71,7 +65,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: networkConfig[chainId].tokens.USDbC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), + oracleTimeout: usdcOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -112,7 +106,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: await aTokenCollateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -151,7 +145,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: deployments.erc20s.cDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -176,13 +170,13 @@ async function main() { oracleError: combinedBTCWBTCError.toString(), erc20: deployments.erc20s.cWBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.BTC, - oracleTimeout(chainId, '3600').toString(), + '3600', revenueHiding.toString(), ], 'contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol:CTokenNonFiatCollateral' @@ -198,7 +192,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% erc20: deployments.erc20s.cETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', @@ -219,13 +213,13 @@ async function main() { oracleError: combinedBTCWBTCError.toString(), erc20: networkConfig[chainId].tokens.WBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), + oracleTimeout: '86400', // 24h targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.BTC, - oracleTimeout(chainId, '3600').toString(), + '3600', ], 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' ) @@ -244,7 +238,7 @@ async function main() { oracleError: ethOracleError.toString(), // 0.5% erc20: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), + oracleTimeout: ethOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', @@ -264,13 +258,13 @@ async function main() { oracleError: fp('0.02').toString(), // 2% erc20: networkConfig[chainId].tokens.EURT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), + oracleTimeout: '86400', // 24hr targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: fp('0.03').toString(), // 3% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.EUR, - oracleTimeout(chainId, '86400').toString(), + '86400', ], 'contracts/plugins/assets/EURFiatCollateral.sol:EURFiatCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts index edb092d1af..3a373573dc 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { fp, bn } from '../../../common/numbers' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -54,7 +54,7 @@ async function main() { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: fp('0.003').toString(), // 3% - oracleTimeout: oracleTimeout(chainId, bn('86400')).toString(), // 24 hr + oracleTimeout: '86400', // 24 hr maxTradeVolume: fp('1e6').toString(), defaultThreshold: fp('0.013').toString(), delayUntilDefault: bn('86400').toString(), diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts index 1486c37cab..3ffce9a0a5 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { fp, bn } from '../../../common/numbers' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -39,7 +39,7 @@ async function main() { ) /******** Verify Aave V3 USDC plugin **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% await verifyContract( @@ -52,7 +52,7 @@ async function main() { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: usdcOracleError.toString(), - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + oracleTimeout: usdcOracleTimeout, // 24 hr maxTradeVolume: fp('1e6').toString(), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), diff --git a/scripts/verification/collateral-plugins/verify_cbeth.ts b/scripts/verification/collateral-plugins/verify_cbeth.ts index 4e58ad88d5..9b52d6323b 100644 --- a/scripts/verification/collateral-plugins/verify_cbeth.ts +++ b/scripts/verification/collateral-plugins/verify_cbeth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -40,14 +40,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout ], 'contracts/plugins/assets/cbeth/CBETHCollateral.sol:CBEthCollateral' ) @@ -63,16 +63,16 @@ async function main() { oracleError: oracleError.toString(), // 0.15% & 0.5%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + oracleTimeout: '1200', // 20 min targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // exchangeRateChainlinkTimeout + '86400', // exchangeRateChainlinkTimeout ], 'contracts/plugins/assets/cbeth/CBETHCollateralL2.sol:CBEthCollateralL2' ) diff --git a/scripts/verification/collateral-plugins/verify_convex_stable.ts b/scripts/verification/collateral-plugins/verify_convex_stable.ts index 3c22ae2557..cd7ffc0e86 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable.ts @@ -11,7 +11,7 @@ import { IDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -85,7 +85,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -96,11 +96,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts index 440f8854b2..fedb2d418a 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -75,11 +75,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts index 771f6bc767..400c23d10e 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), + oracleTimeout: USDC_ORACLE_TIMEOUT, maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -70,10 +70,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_volatile.ts b/scripts/verification/collateral-plugins/verify_convex_volatile.ts deleted file mode 100644 index 8c48da0e56..0000000000 --- a/scripts/verification/collateral-plugins/verify_convex_volatile.ts +++ /dev/null @@ -1,98 +0,0 @@ -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' -import { bn } from '../../../common/numbers' -import { ONE_ADDRESS } from '../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, -} from '../../deployment/common' -import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' -import { - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../test/plugins/individual-collateral/curve/constants' - -let deployments: IAssetCollDeployments - -async function main() { - // ********** Read config ********** - const chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (developmentChains.includes(hre.network.name)) { - throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) - } - - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - deployments = getDeploymentFile(assetCollDeploymentFilename) - - const wTriCrypto = await ethers.getContractAt( - 'CurveVolatileCollateral', - deployments.collateral.cvxTriCrypto as string - ) - - /******** Verify TriCrypto plugin **************************/ - await verifyContract( - chainId, - deployments.collateral.cvxTriCrypto, - [ - { - erc20: await wTriCrypto.erc20(), - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - }, - ], - 'contracts/plugins/assets/convex/CurveVolatileCollateral.sol:CurveVolatileCollateral' - ) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verification/collateral-plugins/verify_curve_stable.ts b/scripts/verification/collateral-plugins/verify_curve_stable.ts index ce1120f618..3f4b66190a 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CRV, CurvePoolType, @@ -72,7 +72,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -83,11 +83,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts index 60be29f1e0..e1b433bbd5 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -75,11 +75,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts index a48df02d1f..43d2172f10 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -70,10 +70,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_volatile.ts b/scripts/verification/collateral-plugins/verify_curve_volatile.ts deleted file mode 100644 index 2f5c53b2c1..0000000000 --- a/scripts/verification/collateral-plugins/verify_curve_volatile.ts +++ /dev/null @@ -1,98 +0,0 @@ -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' -import { bn } from '../../../common/numbers' -import { ONE_ADDRESS } from '../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, -} from '../../deployment/common' -import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' -import { - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../test/plugins/individual-collateral/curve/constants' - -let deployments: IAssetCollDeployments - -async function main() { - // ********** Read config ********** - const chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (developmentChains.includes(hre.network.name)) { - throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) - } - - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - deployments = getDeploymentFile(assetCollDeploymentFilename) - - const wTriCrypto = await ethers.getContractAt( - 'CurveVolatileCollateral', - deployments.collateral.crvTriCrypto as string - ) - - /******** Verify TriCrypto plugin **************************/ - await verifyContract( - chainId, - deployments.collateral.crvTriCrypto, - [ - { - erc20: await wTriCrypto.erc20(), - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - }, - ], - 'contracts/plugins/assets/convex/CurveVolatileCollateral.sol:CurveVolatileCollateral' - ) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts index c3a6cb314e..d0eb672ef2 100644 --- a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -50,7 +50,7 @@ async function main() { /******** Verify Collateral - wcUSDbCv3 **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = fp('0.003') // 0.3% (Base) await verifyContract( @@ -63,7 +63,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_cusdcv3.ts b/scripts/verification/collateral-plugins/verify_cusdcv3.ts index 62c1389289..09a6eceb34 100644 --- a/scripts/verification/collateral-plugins/verify_cusdcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdcv3.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -45,7 +45,7 @@ async function main() { /******** Verify Collateral - wcUSDCv3 **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% await verifyContract( @@ -58,7 +58,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_morpho.ts b/scripts/verification/collateral-plugins/verify_morpho.ts index ba7658f5af..4f9e6d832b 100644 --- a/scripts/verification/collateral-plugins/verify_morpho.ts +++ b/scripts/verification/collateral-plugins/verify_morpho.ts @@ -7,13 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { - combinedError, - priceTimeout, - oracleTimeout, - verifyContract, - revenueHiding, -} from '../../deployment/utils' +import { combinedError, priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -64,7 +58,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: fp('0.0025').toString(), // 0.25% maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr + oracleTimeout: '86400', // 1 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0025').add(fp('0.01')).toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -92,7 +86,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: combinedBTCWBTCError.toString(), // 0.25% maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h @@ -101,7 +95,7 @@ async function main() { }, revenueHiding, networkConfig[chainId].chainlinkFeeds.WBTC!, - oracleTimeout(chainId, '86400').toString(), // 1 hr + '86400', // 1 hr ], 'contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol:MorphoNonFiatCollateral' ) @@ -121,7 +115,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: fp('0.005'), maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h diff --git a/scripts/verification/collateral-plugins/verify_reth.ts b/scripts/verification/collateral-plugins/verify_reth.ts index 324a081859..077cc76e0d 100644 --- a/scripts/verification/collateral-plugins/verify_reth.ts +++ b/scripts/verification/collateral-plugins/verify_reth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -37,14 +37,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.rETH, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout ], 'contracts/plugins/assets/rocket-eth/RethCollateral.sol:RethCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_wsteth.ts b/scripts/verification/collateral-plugins/verify_wsteth.ts index c0b73b2fb0..b84c9aad57 100644 --- a/scripts/verification/collateral-plugins/verify_wsteth.ts +++ b/scripts/verification/collateral-plugins/verify_wsteth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { priceTimeout, verifyContract } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -38,14 +38,14 @@ async function main() { oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethETH feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.stETHETH, // targetPerRefChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // targetPerRefChainlinkTimeout + '86400', // targetPerRefChainlinkTimeout ], 'contracts/plugins/assets/lido/LidoStakedEthCollateral.sol:LidoStakedEthCollateral' ) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 251d0e1a5b..633d1fed48 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -42,7 +42,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, SLOW, } from './fixtures' @@ -1251,7 +1251,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: bn(500), - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1416,7 +1416,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: bn('1'), // minimize erc20: sellTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -1428,7 +1428,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: bn('1'), // minimize erc20: buyTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter diff --git a/test/Main.test.ts b/test/Main.test.ts index 7556200088..de7d519b73 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -71,6 +71,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from './fixtures' @@ -1181,7 +1182,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1203,7 +1204,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1229,7 +1230,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await gasGuzzlingColl.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1628,7 +1629,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20s[5].address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -1724,7 +1725,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: eurToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -1947,7 +1948,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('NEW_TARGET'), defaultThreshold: fp('0.01'), delayUntilDefault: await collateral0.delayUntilDefault(), @@ -2802,7 +2803,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2837,7 +2838,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2862,7 +2863,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3084,7 +3085,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3128,7 +3129,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3158,7 +3159,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('NEW TARGET'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index 229960812c..f5c8afa994 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -21,7 +21,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, SLOW, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, defaultFixtureNoBasket, } from './fixtures' @@ -66,7 +66,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: fp('1e36'), - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), delayUntilDefault: bn(86400), diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 37cfe6955e..30796f9b8d 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -51,6 +51,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' @@ -643,7 +644,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -656,7 +657,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: backupToken1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -2145,7 +2146,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: fp('25'), - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -3248,7 +3249,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { collateral1.address, collateral0.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ), bn('1e12') @@ -3312,7 +3312,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { collateral0.address, collateral1.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ), bn('1e12') // decimals diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index f4bcf4b8d0..1c7ad79df4 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -60,6 +60,7 @@ import { REVENUE_HIDING, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import { expectRTokenPrice, setOraclePrice } from './utils/oracles' @@ -1214,7 +1215,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, bn(606), // 2 qTok auction at $300 (after accounting for price.high) - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) // Set a very high price @@ -1295,7 +1296,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, MAX_UINT192, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1306,7 +1307,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_UINT192, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1474,7 +1475,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1673,7 +1674,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1872,7 +1873,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -3376,7 +3377,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.05'), delayUntilDefault: await collateral2.delayUntilDefault(), @@ -4578,7 +4579,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) diff --git a/test/fixtures.ts b/test/fixtures.ts index da44a54b75..8726a3e434 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -71,7 +71,9 @@ export const SLOW = !!useEnv('SLOW') export const PRICE_TIMEOUT = bn('604800') // 1 week -export const ORACLE_TIMEOUT = bn('281474976710655').div(100) // type(uint48).max / 100 +export const ORACLE_TIMEOUT_PRE_BUFFER = bn('281474976710655').div(100) // type(uint48).max / 100 + +export const ORACLE_TIMEOUT = ORACLE_TIMEOUT_PRE_BUFFER.add(300) export const ORACLE_ERROR = fp('0.01') // 1% oracle error @@ -183,7 +185,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -203,7 +205,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -223,7 +225,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -252,7 +254,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -280,7 +282,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -499,7 +501,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await rsrAsset.refresh() @@ -631,7 +633,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await aaveAsset.refresh() @@ -646,7 +648,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await compAsset.refresh() diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 1729c21c9b..71ae4bf11d 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -8,6 +8,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -1122,7 +1123,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, ORACLE_ERROR, networkConfig[chainId].tokens.stkAAVE || '', config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await setOraclePrice(zeroPriceAsset.address, bn('1e10')) @@ -1202,7 +1203,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: dai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -1288,7 +1289,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -1376,7 +1377,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: stataDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -1455,13 +1456,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: wbtc.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await setOraclePrice(zeroPriceNonFiatCollateral.address, bn('1e10')) await zeroPriceNonFiatCollateral.refresh() @@ -1535,13 +1536,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cWBTCVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ) @@ -1610,7 +1611,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: weth.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1693,7 +1694,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cETHVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1776,13 +1777,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: eurt.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await setOraclePrice(invalidPriceEURCollateral.address, bn('1e10')) await invalidPriceEURCollateral.refresh() diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index af2f439042..355d92f00c 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -753,7 +753,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function oracleError: ORACLE_ERROR, // shouldn't matter erc20: sellTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -765,7 +765,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function oracleError: ORACLE_ERROR, // shouldn't matter erc20: buyTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index f22f9a1f1e..206cfb2afe 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -60,7 +60,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -190,7 +190,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -219,7 +219,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -254,7 +254,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: staticErc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -280,13 +280,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await coll.refresh() return [erc20, coll] @@ -314,13 +314,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) await coll.refresh() @@ -339,7 +339,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -371,7 +371,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -399,13 +399,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await coll.refresh() return [erc20, coll] @@ -696,7 +696,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await rsrAsset.refresh() @@ -820,7 +820,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await aaveAsset.refresh() @@ -834,7 +834,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await compAsset.refresh() diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index cf5b9d0336..30df303eda 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -5,7 +5,7 @@ const forkBlockNumber = { 'mainnet-deployment': 15690042, // Ethereum 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum - default: 16934828, // Ethereum + default: 18371215, // Ethereum } export default forkBlockNumber diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 95ad7cd34b..4dd32dc769 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -45,6 +45,7 @@ import { IMPLEMENTATION, Implementation, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, VERSION, @@ -430,7 +431,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -467,7 +468,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -555,7 +556,7 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -640,7 +641,7 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index f7337177e1..e52458f39e 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -52,6 +52,7 @@ import { Collateral, defaultFixture, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, REVENUE_HIDING, @@ -254,7 +255,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.constants.HashZero, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -272,7 +273,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -290,7 +291,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -308,7 +309,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -324,7 +325,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -342,7 +343,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -360,7 +361,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -376,7 +377,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -394,7 +395,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -413,7 +414,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -429,7 +430,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -447,7 +448,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -466,7 +467,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -482,7 +483,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -500,7 +501,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -521,7 +522,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -539,7 +540,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -775,7 +776,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1180,13 +1181,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await nonFiatCollateral.refresh() @@ -1203,13 +1204,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('delayUntilDefault zero') }) @@ -1223,13 +1224,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('missing targetUnit feed') }) @@ -1243,13 +1244,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('missing chainlink feed') }) @@ -1263,7 +1264,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1283,13 +1284,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('defaultThreshold zero') }) @@ -1379,13 +1380,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1407,13 +1408,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, invalidChainlinkFeed.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) // Reverting with no reason @@ -1468,13 +1469,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) await cTokenNonFiatCollateral.refresh() @@ -1492,13 +1493,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('delayUntilDefault zero') @@ -1513,13 +1514,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, fp('1') ) ).to.be.revertedWith('revenueHiding out of range') @@ -1534,13 +1535,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('missing chainlink feed') @@ -1555,13 +1556,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('missing targetUnit feed') @@ -1576,7 +1577,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1597,13 +1598,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('defaultThreshold zero') @@ -1816,7 +1817,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1845,7 +1846,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1887,7 +1888,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1927,7 +1928,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(100), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1992,7 +1993,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2042,7 +2043,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2066,7 +2067,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2086,7 +2087,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2106,7 +2107,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(200), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2301,7 +2302,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2351,7 +2352,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2374,7 +2375,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -2394,7 +2395,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2414,7 +2415,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2434,7 +2435,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2454,7 +2455,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2557,7 +2558,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2585,7 +2586,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 952114c5fb..0ba9baf74e 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -10,7 +10,13 @@ import { PRICE_TIMEOUT, REVENUE_HIDING, } from '../../../fixtures' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { + DefaultFixture, + Fixture, + getDefaultFixture, + ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, +} from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' import { @@ -209,7 +215,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, stkAave.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -233,7 +239,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -437,7 +443,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -455,7 +461,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault, @@ -699,7 +705,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -724,7 +730,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 7b09c9e880..aefae34d5a 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -10,7 +10,13 @@ import { PRICE_TIMEOUT, REVENUE_HIDING, } from '../../../fixtures' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { + DefaultFixture, + Fixture, + getDefaultFixture, + ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, +} from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' import { @@ -212,7 +218,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -235,7 +241,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -430,7 +436,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -466,7 +472,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -484,7 +490,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault, @@ -712,7 +718,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -737,7 +743,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, diff --git a/test/plugins/individual-collateral/fixtures.ts b/test/plugins/individual-collateral/fixtures.ts index b1b5e9e1fa..19897cfd91 100644 --- a/test/plugins/individual-collateral/fixtures.ts +++ b/test/plugins/individual-collateral/fixtures.ts @@ -31,7 +31,9 @@ import { RecollateralizationLibP1, } from '../../../typechain' -export const ORACLE_TIMEOUT = bn('500000000') // 5700d - large for tests only +export const ORACLE_TIMEOUT_PRE_BUFFER = bn('500000000') // 5700d - large for tests only + +export const ORACLE_TIMEOUT = ORACLE_TIMEOUT_PRE_BUFFER.add(300) export type Fixture = () => Promise diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index 20d9a1406a..e40322631c 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -7,6 +7,8 @@ import { formatUnits, parseUnits } from 'ethers/lib/utils' import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { bn } from '#/common/numbers' +import { getResetFork } from '../helpers' +import { FORK_BLOCK } from './constants' type ITokenSymbol = keyof ITokens const networkConfigToUse = networkConfig[31337] @@ -179,7 +181,8 @@ const execTestForToken = ({ type ITestContext = ReturnType extends Promise ? U : never let context: ITestContext - // const resetFork = getResetFork(17591000) + before(getResetFork(FORK_BLOCK)) + beforeEach(async () => { context = await loadFixture(beforeEachFn) }) diff --git a/test/scenario/BadCollateralPlugin.test.ts b/test/scenario/BadCollateralPlugin.test.ts index ec2e04c0ee..9745c962b5 100644 --- a/test/scenario/BadCollateralPlugin.test.ts +++ b/test/scenario/BadCollateralPlugin.test.ts @@ -27,7 +27,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -104,7 +104,7 @@ describe(`Bad Collateral Plugin - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 9dd384a82c..6b7479212c 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -34,7 +34,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -172,7 +172,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_TRADE_VOLUME, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await assetRegistry.connect(owner).swapRegistered(newRSRAsset.address) @@ -203,7 +203,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: usdToken.address, // DAI Token maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -227,8 +227,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: eurToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -248,7 +248,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cUSDTokenVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -269,7 +269,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), staticAToken: aUSDToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -293,8 +293,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), tokenAddress: wbtc.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -323,8 +323,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), cToken: cWBTCVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -349,7 +349,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: weth.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), noOutput: true, }) @@ -380,7 +380,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cETHVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: REVENUE_HIDING.toString(), referenceERC20Decimals: bn(18).toString(), diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index a3ab632140..f1380b63f7 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -28,7 +28,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -158,7 +158,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -198,7 +198,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: atoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -245,7 +245,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: ctoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NestedRTokens.test.ts b/test/scenario/NestedRTokens.test.ts index 6386b158fd..38b11aba25 100644 --- a/test/scenario/NestedRTokens.test.ts +++ b/test/scenario/NestedRTokens.test.ts @@ -22,7 +22,7 @@ import { DefaultFixture, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -119,7 +119,7 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: staticATokenERC20.address, maxTradeVolume: one.config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NontrivialPeg.test.ts b/test/scenario/NontrivialPeg.test.ts index 70e0fa263f..c247b1cf98 100644 --- a/test/scenario/NontrivialPeg.test.ts +++ b/test/scenario/NontrivialPeg.test.ts @@ -23,7 +23,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from '../fixtures' @@ -82,7 +82,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -124,7 +124,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 8b1cfa00fb..815ff2f7fb 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from '../fixtures' @@ -116,7 +116,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME oracleError: ORACLE_ERROR, erc20: cDAI.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/SetProtocol.test.ts b/test/scenario/SetProtocol.test.ts index a2a67dd94a..a9021be240 100644 --- a/test/scenario/SetProtocol.test.ts +++ b/test/scenario/SetProtocol.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from '../fixtures' @@ -91,7 +91,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -106,7 +106,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('MKR'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -121,7 +121,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('COMP'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, From 6bc0b02db25828b389048d228d1bfbf0607bc3b4 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:34:30 -0300 Subject: [PATCH 113/450] TRUST QA-3: Set correct version (#985) --- contracts/mixins/Versioned.sol | 2 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- test/fixtures.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index 7518551125..c70c7a8857 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.0.1"; +string constant VERSION = "3.1.0"; /** * @title Versioned diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index ac8371e7f2..b36945769d 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.0.1"; +string constant ASSET_VERSION = "3.1.0"; /** * @title VersionedAsset diff --git a/test/fixtures.ts b/test/fixtures.ts index 8726a3e434..6244d68ff3 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -80,7 +80,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.0.1' +export const VERSION = '3.1.0' export type Collateral = | FiatCollateral From 8d96002a90ceb7cc60accf4292e957e008496c23 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:34:54 -0300 Subject: [PATCH 114/450] TRUST QA-5/10/11: Optimizations on BasketHandler (#986) --- contracts/p0/BasketHandler.sol | 4 +++- contracts/p1/BasketHandler.sol | 6 ++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 7cec1d292d..03e99b1401 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -183,6 +183,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; + + trackStatus(); } /// Switch the basket, only callable directly by governance or after a default @@ -199,7 +201,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { require( main.hasRole(OWNER, _msgSender()) || - (status() == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), + (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); _switchBasket(); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index ebcfb1dca2..6a0753c1b6 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -121,6 +121,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 i = 0; i < len; ++i) refAmts[i] = basket.refAmts[basket.erc20s[i]]; emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; + + trackStatus(); } /// Switch the basket, only callable directly by governance or after a default @@ -137,7 +139,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { require( main.hasRole(OWNER, _msgSender()) || - (status() == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), + (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); _switchBasket(); @@ -403,7 +405,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 k = 0; k < len; ++k) { if (b.erc20s[j] == erc20sAll[k]) { erc20Index = k; - continue; + break; } } From c20ea916ee5655c9d4b71219908a993db207f7c4 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 24 Oct 2023 13:19:52 -0300 Subject: [PATCH 115/450] TRUST QA-6/7: Optimizations in Distributor (#988) Co-authored-by: Taylor Brent --- contracts/facade/FacadeTest.sol | 3 +++ contracts/p0/Distributor.sol | 4 ++-- contracts/p1/Distributor.sol | 13 ++++--------- contracts/plugins/mocks/RevenueTraderBackComp.sol | 4 +++- test/Revenues.test.ts | 11 +++++++++++ 5 files changed, 23 insertions(+), 12 deletions(-) diff --git a/contracts/facade/FacadeTest.sol b/contracts/facade/FacadeTest.sol index 78ee2173e0..9b57538a4c 100644 --- a/contracts/facade/FacadeTest.sol +++ b/contracts/facade/FacadeTest.sol @@ -66,6 +66,7 @@ contract FacadeTest is IFacadeTest { erc20s ); try main.rsrTrader().manageTokens(rsrERC20s, rsrKinds) {} catch {} + try main.rsrTrader().distributeTokenToBuy() {} catch {} // Start exact RToken auctions (IERC20[] memory rTokenERC20s, TradeKind[] memory rTokenKinds) = traderERC20s( @@ -74,6 +75,7 @@ contract FacadeTest is IFacadeTest { erc20s ); try main.rTokenTrader().manageTokens(rTokenERC20s, rTokenKinds) {} catch {} + try main.rTokenTrader().distributeTokenToBuy() {} catch {} // solhint-enable no-empty-blocks } @@ -133,6 +135,7 @@ contract FacadeTest is IFacadeTest { IERC20[] memory traderERC20sAll = new IERC20[](erc20sAll.length); for (uint256 i = 0; i < erc20sAll.length; ++i) { if ( + erc20sAll[i] != trader.tokenToBuy() && address(trader.trades(erc20sAll[i])) == address(0) && erc20sAll[i].balanceOf(address(trader)) > 1 ) { diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 9f43240c5e..264d7bfe7e 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -63,8 +63,8 @@ contract DistributorP0 is ComponentP0, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - require(totalShares > 0, "nothing to distribute"); - tokensPerShare = amount / totalShares; + if (totalShares > 0) tokensPerShare = amount / totalShares; + require(tokensPerShare > 0, "nothing to distribute"); } // Evenly distribute revenue tokens per distribution share. diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 04fedb57ee..776e19fe5a 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -68,7 +68,6 @@ contract DistributorP1 is ComponentP1, IDistributor { } struct Transfer { - IERC20 erc20; address addrTo; uint256 amount; } @@ -99,8 +98,8 @@ contract DistributorP1 is ComponentP1, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - require(totalShares > 0, "nothing to distribute"); - tokensPerShare = amount / totalShares; + if (totalShares > 0) tokensPerShare = amount / totalShares; + require(tokensPerShare > 0, "nothing to distribute"); } // Evenly distribute revenue tokens per distribution share. @@ -131,11 +130,7 @@ contract DistributorP1 is ComponentP1, IDistributor { if (transferAmt > 0) accountRewards = true; } - transfers[numTransfers] = Transfer({ - erc20: erc20, - addrTo: addrTo, - amount: transferAmt - }); + transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); numTransfers++; } emit RevenueDistributed(erc20, caller, amount); @@ -143,7 +138,7 @@ contract DistributorP1 is ComponentP1, IDistributor { // == Interactions == for (uint256 i = 0; i < numTransfers; i++) { Transfer memory t = transfers[i]; - IERC20Upgradeable(address(t.erc20)).safeTransferFrom(caller, t.addrTo, t.amount); + IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); } // Perform reward accounting diff --git a/contracts/plugins/mocks/RevenueTraderBackComp.sol b/contracts/plugins/mocks/RevenueTraderBackComp.sol index ed76f53346..73069f15ad 100644 --- a/contracts/plugins/mocks/RevenueTraderBackComp.sol +++ b/contracts/plugins/mocks/RevenueTraderBackComp.sol @@ -14,8 +14,10 @@ contract RevenueTraderCompatibleV2 is RevenueTraderP1, IRevenueTraderComp { erc20s[0] = sell; TradeKind[] memory kinds = new TradeKind[](1); kinds[0] = TradeKind.DUTCH_AUCTION; + // Mirror V3 logic (only the section relevant to tests) - this.manageTokens(erc20s, kinds); + // solhint-disable-next-line no-empty-blocks + try this.manageTokens(erc20s, kinds) {} catch {} } function version() public pure virtual override(Versioned, IVersioned) returns (string memory) { diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 1c7ad79df4..3858ba4290 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -706,6 +706,17 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(newRTokenTotal).equal(bn(0)) }) + it('Should avoid zero transfers when distributing tokenToBuy', async () => { + // Distribute with no balance + await expect(rsrTrader.distributeTokenToBuy()).to.be.revertedWith('nothing to distribute') + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + + // Small amount which ends in zero distribution due to rounding + await rsr.connect(owner).mint(rsrTrader.address, bn(1)) + await expect(rsrTrader.distributeTokenToBuy()).to.be.revertedWith('nothing to distribute') + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + }) + it('Should account rewards when distributing tokenToBuy', async () => { // 1. StRSR.payoutRewards() const stRSRBal = await rsr.balanceOf(stRSR.address) From c7e65a3088810a7c8f8d6aee44384e04fbfaa222 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 25 Oct 2023 22:00:56 +0530 Subject: [PATCH 116/450] Remove Forknet Stuff (#992) --- contracts/forknet/ForkedOracle.sol | 52 -------------------------- hardhat.config.ts | 3 -- scripts/replaceOracles.ts | 60 ------------------------------ 3 files changed, 115 deletions(-) delete mode 100644 contracts/forknet/ForkedOracle.sol delete mode 100644 scripts/replaceOracles.ts diff --git a/contracts/forknet/ForkedOracle.sol b/contracts/forknet/ForkedOracle.sol deleted file mode 100644 index cb0f4b0d99..0000000000 --- a/contracts/forknet/ForkedOracle.sol +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -interface AggregatorV3MixedInterface { - function decimals() external view returns (uint8); - - function description() external view returns (string memory); - - function latestRoundData() - external - view - returns ( - uint80 roundId, - int256 answer, - uint256 startedAt, - uint256 updatedAt, - uint80 answeredInRound - ); - - function aggregator() external view returns (address); -} - -contract ForkedOracle is AggregatorV3MixedInterface { - address public constant aggregator = address(0x1); - string public constant description = "FORKED"; - - uint8 public decimals; - int256 private answerInternal; - - function setData(uint8 _decimals, int256 _answer) external { - decimals = _decimals; - answerInternal = _answer; - } - - function latestRoundData() - external - view - returns ( - uint80 roundId, - int256 answer, - uint256 startedAt, - uint256 updatedAt, - uint80 answeredInRound - ) - { - roundId = 1; - answer = answerInternal; - startedAt = 0; - updatedAt = block.timestamp - 1; - answeredInRound = 1; - } -} diff --git a/hardhat.config.ts b/hardhat.config.ts index 9dddd006bf..d4c23bc1b9 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -54,9 +54,6 @@ const config: HardhatUserConfig = { blockGasLimit: 0x1fffffffffffff, allowUnlimitedContractSize: true, }, - // anvil: { - // url: 'http://127.0.0.1:8545/', - // }, goerli: { chainId: 5, url: GOERLI_RPC_URL, diff --git a/scripts/replaceOracles.ts b/scripts/replaceOracles.ts deleted file mode 100644 index e9a72a8225..0000000000 --- a/scripts/replaceOracles.ts +++ /dev/null @@ -1,60 +0,0 @@ -import hre, { ethers } from 'hardhat' - -const supportedNodes = ['anvil', 'hardhat'] -const oracleList = [ - '0x759bbc1be8f90ee6457c44abc7d443842a976d02', - '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9', - '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6', - '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D', - '0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A', - '0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3', - '0xec746eCF986E2927Abd291a2A1716c940100f8Ba', - '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', - '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', - '0x7A364e8770418566e3eb2001A96116E6138Eb32F', - '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', - '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', - '0x01D391A48f4F7339aC64CA2c83a07C22F95F587a', - '0xb49f677943BC038e9857d61E7d053CaA2C1734C1', - '0x86392dc19c0b719886221c78ab11eb8cf5c52812', - '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', - '0x536218f9E9Eb48863970252233c8F271f554C2d0', - '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', - '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', -] - -async function main() { - const clientVersion = await hre.ethers.provider.send('web3_clientVersion', []) - const isSupported = supportedNodes.some((node) => clientVersion.toLowerCase().includes(node)) - console.log({ clientVersion, isSupported }) - - if (!isSupported) { - throw Error('Unsupported Network') - } - - const forkedOracleArtifact = await hre.artifacts.readArtifact('ForkedOracle') - - for (const oracleAddress of oracleList) { - const oracle = await hre.ethers.getContractAt('ForkedOracle', oracleAddress) - - const description = await oracle.description() - const decimals = await oracle.decimals() - const roundData = await oracle.latestRoundData() - - console.log(`-------- Updating ${description} (${oracle.address}) Oracle...`) - console.log(`>>>> Current Answer:`, ethers.utils.formatUnits(roundData.answer, decimals)) - - console.log('>>>> Updating code...') - await hre.ethers.provider.send('hardhat_setCode', [ - oracle.address, - forkedOracleArtifact.deployedBytecode, - ]) - console.log('>>>> Updating data...') - await oracle.setData(decimals, roundData.answer, { - gasLimit: 10_000_000, - }) - console.log('>>>> Done!') - } -} - -main().catch((e) => console.error(e)) From 5aa2d4ee67fd3fb967c775a662d62713e828e1b3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 25 Oct 2023 10:06:50 -0700 Subject: [PATCH 117/450] gas snapshots --- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Main.test.ts.snap | 6 +++--- .../Recollateralization.test.ts.snap | 10 +++++----- test/__snapshots__/Revenues.test.ts.snap | 6 +++--- test/__snapshots__/ZZStRSR.test.ts.snap | 4 ++-- .../AaveV3FiatCollateral.test.ts.snap | 4 ++-- .../ATokenFiatCollateral.test.ts.snap | 4 ++-- .../__snapshots__/CometTestSuite.test.ts.snap | 4 ++-- .../CrvStableMetapoolSuite.test.ts.snap | 4 ++-- ...StableRTokenMetapoolTestSuite.test.ts.snap | 18 ++++++++--------- .../CvxStableMetapoolSuite.test.ts.snap | 4 ++-- ...StableRTokenMetapoolTestSuite.test.ts.snap | 6 +++--- .../SDaiCollateralTestSuite.test.ts.snap | 8 ++++---- .../FTokenFiatCollateral.test.ts.snap | 20 +++++++++---------- .../MorphoAAVEFiatCollateral.test.ts.snap | 12 +++++------ .../MorphoAAVENonFiatCollateral.test.ts.snap | 8 ++++---- .../StargateUSDCTestSuite.test.ts.snap | 4 ++-- .../__snapshots__/MaxBasketSize.test.ts.snap | 8 ++++---- 18 files changed, 66 insertions(+), 66 deletions(-) diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 71ba5454b2..76f00fe010 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8532211`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8464999`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 80025274f2..cbee6c9389 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -2,11 +2,11 @@ exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393877`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `245334`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `195889`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `245334`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167023`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `223993`; exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 6b70c5b36c..236df3d703 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1363847`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1364203`; exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1499568`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `738601`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `751607`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1656950`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1656594`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174781`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1599095`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1599451`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174781`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1687568`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1687212`; exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202854`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index ac389f42c3..575c2d39f9 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -18,10 +18,10 @@ exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `796514` exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1198554`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `367726`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `367672`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `317915`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `317861`; exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `762314`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `284933`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `284880`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 08449237d2..3af605e7b9 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`StRSRP1 contract Gas Reporting Stake 1`] = `156559`; +exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; @@ -10,7 +10,7 @@ exports[`StRSRP1 contract Gas Reporting Transfer 2`] = `41509`; exports[`StRSRP1 contract Gas Reporting Transfer 3`] = `58621`; -exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `241951`; +exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap index 75cffdf3ef..9f00d8e491 100644 --- a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67620`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `67279`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `87625`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `67279`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `87625`; exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87684`; diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 236eb477ff..13f8ae6777 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -22,8 +22,8 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92285`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92211`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92285`; exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127282`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91414`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91488`; diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index 68d964d679..d2dee358c6 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refre exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104315`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107042`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `132572`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103974`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `126704`; exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126763`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index 0181aff186..4e3d02729f 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collatera exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47904`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `79713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47904`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `79713`; exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index d4cbecc6e1..acdeaf5b1f 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,17 +4,17 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper col exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `385743`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485294`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480900`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480752`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594808`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589778`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589852`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478472`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474078`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474226`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544737`; @@ -22,8 +22,8 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper col exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713285`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713507`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713359`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701199`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701051`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693635`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693709`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 9b9c0827d4..7920079d2a 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collat exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47904`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `79713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47904`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `79713`; exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index c1e15dc5e3..5470886e16 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,17 +4,17 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `175188`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485294`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480826`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589852`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589778`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478546`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474078`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474004`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544811`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index c999a57b94..b8cde38466 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -4,7 +4,7 @@ exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting ERC20 exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `34259`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `116743`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117203`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `108431`; @@ -12,13 +12,13 @@ exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refre exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `123301`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `116562`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `116802`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `108431`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `111417`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `126640`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `108090`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123313`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `123298`; diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index e9d415b72d..da1cb92e3a 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refr exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115681`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115327`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `139157`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115327`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `139083`; exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139155`; @@ -44,9 +44,9 @@ exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ref exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115873`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115519`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `139413`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115519`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `139339`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139411`; @@ -64,7 +64,7 @@ exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ref exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149927`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149997`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148183`; @@ -72,9 +72,9 @@ exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ref exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123809`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `148121`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123809`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `148121`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148193`; @@ -94,15 +94,15 @@ exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ref exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144361`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142547`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142477`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120480`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118811`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118457`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `142485`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118457`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `142415`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142487`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 48f07dc32e..049d644503 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality G exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129742`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129401`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `172067`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129401`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `172067`; exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172126`; @@ -44,9 +44,9 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129945`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129604`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `172473`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129604`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `172473`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172532`; @@ -72,9 +72,9 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129098`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128757`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `170779`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128757`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `170779`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170838`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index a89c7240b4..26e77e6a88 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionali exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178409`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178068`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `192065`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178068`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `192065`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192124`; @@ -44,9 +44,9 @@ exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functional exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217673`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217332`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `231329`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217332`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `231329`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231388`; diff --git a/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap b/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap index 3afcb28f2e..8f043c0861 100644 --- a/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting r exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `51626`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `51285`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 1`] = `66835`; -exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `51285`; +exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() after soft default 2`] = `66835`; exports[`Collateral: Stargate USDC Pool collateral functionality Gas Reporting refresh() during SOUND 1`] = `66894`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 73f9cbd319..3be1a0a11c 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -2,13 +2,13 @@ exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082333`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9823929`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9836935`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2436571`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653680`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653324`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20685978`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21071119`; exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984083`; @@ -16,4 +16,4 @@ exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket corr exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592449`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14438756`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14823897`; From a7f76a70c4c5e12e3afa79624ea1793601881030 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 25 Oct 2023 17:17:45 -0300 Subject: [PATCH 118/450] TRUST QA-21: minimum voting delay (#990) --- contracts/plugins/governance/Governance.sol | 23 ++- test/FacadeWrite.test.ts | 4 +- test/Governance.test.ts | 172 +++++++++++++++++++- 3 files changed, 191 insertions(+), 8 deletions(-) diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index c20978fa02..96de231912 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -8,6 +8,9 @@ import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.so import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../../interfaces/IStRSRVotes.sol"; +import "../../libraries/NetworkConfigLib.sol"; + +uint256 constant ONE_DAY = 86400; // {s} /* * @title Governance @@ -30,7 +33,9 @@ contract Governance is // 100% uint256 public constant ONE_HUNDRED_PERCENT = 1e8; // {micro %} - // solhint-disable no-empty-blocks + // solhint-disable-next-line var-name-mixedcase + uint256 public immutable MIN_VOTING_DELAY; // {block} equal to ONE_DAY + constructor( IStRSRVotes token_, TimelockController timelock_, @@ -44,7 +49,12 @@ contract Governance is GovernorVotes(IVotes(address(token_))) GovernorVotesQuorumFraction(quorumPercent) GovernorTimelockControl(timelock_) - {} + { + MIN_VOTING_DELAY = + (ONE_DAY + NetworkConfigLib.blocktime() - 1) / + NetworkConfigLib.blocktime(); // ONE_DAY, in blocks + requireValidVotingDelay(votingDelay_); + } // solhint-enable no-empty-blocks @@ -56,6 +66,11 @@ contract Governance is return super.votingPeriod(); } + function setVotingDelay(uint256 newVotingDelay) public override { + requireValidVotingDelay(newVotingDelay); + super.setVotingDelay(newVotingDelay); // has onlyGovernance modifier + } + /// @return {qStRSR} The number of votes required in order for a voter to become a proposer function proposalThreshold() public @@ -175,4 +190,8 @@ contract Governance is uint256 currentEra = IStRSRVotes(address(token)).currentEra(); return currentEra == pastEra; } + + function requireValidVotingDelay(uint256 newVotingDelay) private view { + require(newVotingDelay >= MIN_VOTING_DELAY, "invalid votingDelay"); + } } diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 97210ce749..9176c71ac0 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -195,8 +195,8 @@ describe('FacadeWrite contract', () => { // Set governance params govParams = { - votingDelay: bn(5), // 5 blocks - votingPeriod: bn(100), // 100 blocks + votingDelay: bn(7200), // 1 day + votingPeriod: bn(21600), // 3 days proposalThresholdAsMicroPercent: bn(1e6), // 1% quorumPercent: bn(4), // 4% timelockDelay: bn(60 * 60 * 24), // 1 day diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 83dffb413a..53b7f7d2f1 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -59,8 +59,8 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { let initialBal: BigNumber const MIN_DELAY = 7 * 60 * 60 * 24 // 7 days - const VOTING_DELAY = 5 // 5 blocks - const VOTING_PERIOD = 100 // 100 blocks + const VOTING_DELAY = 7200 // 1 day (in blocks) + const VOTING_PERIOD = 21600 // 3 days (in blocks) const PROPOSAL_THRESHOLD = 1e6 // 1% const QUORUM_PERCENTAGE = 4 // 4% @@ -306,13 +306,39 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { expect(await governor.supportsInterface(interfaceID._hex)).to.equal(true) }) + + it('Should perform validations on votingDelay at deployment', async () => { + // Attempt to deploy with 0 voting delay + await expect( + GovernorFactory.deploy( + stRSRVotes.address, + timelock.address, + bn(0), + VOTING_PERIOD, + PROPOSAL_THRESHOLD, + QUORUM_PERCENTAGE + ) + ).to.be.revertedWith('invalid votingDelay') + + // Attempt to deploy with voting delay below minium (1 day) + await expect( + GovernorFactory.deploy( + stRSRVotes.address, + timelock.address, + bn(2000), // less than 1 day + VOTING_PERIOD, + PROPOSAL_THRESHOLD, + QUORUM_PERCENTAGE + ) + ).to.be.revertedWith('invalid votingDelay') + }) }) describe('Proposals', () => { // Proposal details const newValue: BigNumber = bn('360') - const proposalDescription = 'Proposal #1 - Update Trading Delay to 360' - const proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + let proposalDescription = 'Proposal #1 - Update Trading Delay to 360' + let proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) let encodedFunctionCall: string let stkAmt1: BigNumber let stkAmt2: BigNumber @@ -873,5 +899,143 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Check role was granted expect(await main.hasRole(SHORT_FREEZER, other.address)).to.equal(true) }) + + it('Should allow to update GovernorSettings via governance', async () => { + // Attempt to update if not governance + await expect(governor.setVotingDelay(bn(14400))).to.be.revertedWith( + 'Governor: onlyGovernance' + ) + + // Attempt to update without governance process in place + await whileImpersonating(timelock.address, async (signer) => { + await expect(governor.connect(signer).setVotingDelay(bn(14400))).to.be.reverted + }) + + // Update votingDelay via proposal + encodedFunctionCall = governor.interface.encodeFunctionData('setVotingDelay', [ + VOTING_DELAY * 2, + ]) + proposalDescription = 'Proposal #2 - Update Voting Delay to double' + proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + + // Check current value + expect(await governor.votingDelay()).to.equal(VOTING_DELAY) + + // Propose + const proposeTx = await governor + .connect(addr1) + .propose([governor.address], [0], [encodedFunctionCall], proposalDescription) + + const proposeReceipt = await proposeTx.wait(1) + const proposalId = proposeReceipt.events![0].args!.proposalId + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) + + // Advance time to start voting + await advanceBlocks(VOTING_DELAY + 1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + const voteWay = 1 // for + + // vote + await governor.connect(addr1).castVote(proposalId, voteWay) + await advanceBlocks(1) + + // Advance time till voting is complete + await advanceBlocks(VOTING_PERIOD + 1) + + // Finished voting - Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) + + // Queue propoal + await governor + .connect(addr1) + .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Advance time required by timelock + await advanceTime(MIN_DELAY + 1) + await advanceBlocks(1) + + // Execute + await governor + .connect(addr1) + .execute([governor.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Executed) + + // Check value was updated + expect(await governor.votingDelay()).to.equal(VOTING_DELAY * 2) + }) + + it('Should perform validations on votingDelay when updating', async () => { + // Update via proposal - Invalid value + encodedFunctionCall = governor.interface.encodeFunctionData('setVotingDelay', [bn(7100)]) + proposalDescription = 'Proposal #2 - Update Voting Delay to invalid' + proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + + // Check current value + expect(await governor.votingDelay()).to.equal(VOTING_DELAY) + + // Propose + const proposeTx = await governor + .connect(addr1) + .propose([governor.address], [0], [encodedFunctionCall], proposalDescription) + + const proposeReceipt = await proposeTx.wait(1) + const proposalId = proposeReceipt.events![0].args!.proposalId + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) + + // Advance time to start voting + await advanceBlocks(VOTING_DELAY + 1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + const voteWay = 1 // for + + // vote + await governor.connect(addr1).castVote(proposalId, voteWay) + await advanceBlocks(1) + + // Advance time till voting is complete + await advanceBlocks(VOTING_PERIOD + 1) + + // Finished voting - Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) + + // Queue propoal + await governor + .connect(addr1) + .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Advance time required by timelock + await advanceTime(MIN_DELAY + 1) + await advanceBlocks(1) + + // Execute + await expect( + governor + .connect(addr1) + .execute([governor.address], [0], [encodedFunctionCall], proposalDescHash) + ).to.be.revertedWith('TimelockController: underlying transaction reverted') + + // Check proposal state, still queued + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Check value was not updated + expect(await governor.votingDelay()).to.equal(VOTING_DELAY) + }) }) }) From 89128e3933ff0aaeca6d40c05545673d071db861 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 30 Oct 2023 12:37:32 -0400 Subject: [PATCH 119/450] Trust M-03: track balances out on trade for RTokenAsset.price() (#973) --- CHANGELOG.md | 4 +- contracts/interfaces/IBackingManager.sol | 37 +++++ contracts/interfaces/ITrade.sol | 3 + contracts/p0/BackingManager.sol | 40 +++++- contracts/p0/mixins/TradingLib.sol | 21 ++- contracts/p1/BackingManager.sol | 52 ++++++- .../p1/mixins/RecollateralizationLib.sol | 129 ++++++------------ contracts/p1/mixins/Trading.sol | 2 +- contracts/plugins/assets/RTokenAsset.sol | 28 +--- contracts/plugins/trading/GnosisTrade.sol | 12 +- test/Recollateralization.test.ts | 19 ++- test/__snapshots__/Broker.test.ts.snap | 8 +- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Main.test.ts.snap | 8 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 18 +-- test/__snapshots__/Revenues.test.ts.snap | 14 +- test/__snapshots__/ZZStRSR.test.ts.snap | 4 +- test/plugins/Asset.test.ts | 104 +++++++++++++- .../AaveV3FiatCollateral.test.ts.snap | 6 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 10 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 6 +- .../SDaiCollateralTestSuite.test.ts.snap | 4 +- .../__snapshots__/MaxBasketSize.test.ts.snap | 16 +-- 24 files changed, 355 insertions(+), 198 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index da54bc365c..4b453fff3a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,9 +8,11 @@ Upgrade all core contracts and _all_ assets. ERC20s do not need to be upgraded. Then, call `Broker.cacheComponents()`. +Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. + ### Core Protocol Contracts -- `BackingManager` +- `BackingManager` [+2 slots] - Replace use of `lotPrice()` with `price()` - `BasketHandler` - Remove `lotPrice()` diff --git a/contracts/interfaces/IBackingManager.sol b/contracts/interfaces/IBackingManager.sol index 0699da6d6c..b9b3c5beca 100644 --- a/contracts/interfaces/IBackingManager.sol +++ b/contracts/interfaces/IBackingManager.sol @@ -2,10 +2,38 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "./IAssetRegistry.sol"; +import "./IBasketHandler.sol"; import "./IBroker.sol"; import "./IComponent.sol"; +import "./IRToken.sol"; +import "./IStRSR.sol"; import "./ITrading.sol"; +/// Memory struct for RecollateralizationLibP1 + RTokenAsset +/// Struct purposes: +/// 1. Configure trading +/// 2. Stay under stack limit with fewer vars +/// 3. Cache information such as component addresses and basket quantities, to save on gas +struct TradingContext { + BasketRange basketsHeld; // {BU} + // basketsHeld.top is the number of partial baskets units held + // basketsHeld.bottom is the number of full basket units held + + // Components + IBasketHandler bh; + IAssetRegistry ar; + IStRSR stRSR; + IERC20 rsr; + IRToken rToken; + // Gov Vars + uint192 minTradeVolume; // {UoA} + uint192 maxTradeSlippage; // {1} + // Cached values + uint192[] quantities; // {tok/BU} basket quantities + uint192[] bals; // {tok} balances in BackingManager + out on trades +} + /** * @title IBackingManager * @notice The BackingManager handles changes in the ERC20 balances that back an RToken. @@ -48,6 +76,15 @@ interface IBackingManager is IComponent, ITrading { /// @param erc20s The tokens to forward /// @custom:interaction RCEI function forwardRevenue(IERC20[] calldata erc20s) external; + + /// Structs for trading + /// @param basketsHeld The number of baskets held by the BackingManager + /// @return ctx The TradingContext + /// @return reg Contents of AssetRegistry.getRegistry() + function tradingContext(BasketRange memory basketsHeld) + external + view + returns (TradingContext memory ctx, Registry memory reg); } interface TestIBackingManager is IBackingManager, TestITrading { diff --git a/contracts/interfaces/ITrade.sol b/contracts/interfaces/ITrade.sol index d05e3028f6..f9e95114f9 100644 --- a/contracts/interfaces/ITrade.sol +++ b/contracts/interfaces/ITrade.sol @@ -27,6 +27,9 @@ interface ITrade { function buy() external view returns (IERC20Metadata); + /// @return {tok} The sell amount of the trade, in whole tokens + function sellAmount() external view returns (uint192); + /// @return The timestamp at which the trade is projected to become settle-able function endTime() external view returns (uint48); diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 946534141e..34a28ce66a 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -32,6 +32,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager { mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind + mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades + constructor() { ONE_BLOCK = NetworkConfigLib.blocktime(); } @@ -69,6 +71,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { returns (ITrade trade) { trade = super.settleTrade(sell); + delete tokensOut[trade.sell()]; // if the settler is the trade contract itself, try chaining with another rebalance() if (_msgSender() == address(trade)) { @@ -134,7 +137,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // Execute Trade ITrade trade = tryTrade(kind, req, prices); - tradeEnd[kind] = trade.endTime(); + tradeEnd[kind] = trade.endTime(); // {s} + tokensOut[trade.sell()] = trade.sellAmount(); // {tok} } else { // Haircut time compromiseBasketsNeeded(basketsHeld.bottom); @@ -205,6 +209,40 @@ contract BackingManagerP0 is TradingP0, IBackingManager { } } + // === View === + + /// Structs for trading + /// @param basketsHeld The number of baskets held by the BackingManager + /// @return ctx The TradingContext + /// @return reg Contents of AssetRegistry.getRegistry() + function tradingContext(BasketRange memory basketsHeld) + public + view + returns (TradingContext memory ctx, Registry memory reg) + { + reg = main.assetRegistry().getRegistry(); + + ctx.basketsHeld = basketsHeld; + ctx.bh = main.basketHandler(); + ctx.ar = main.assetRegistry(); + ctx.stRSR = main.stRSR(); + ctx.rsr = main.rsr(); + ctx.rToken = main.rToken(); + ctx.minTradeVolume = minTradeVolume; + ctx.maxTradeSlippage = maxTradeSlippage; + ctx.quantities = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.quantities[i] = ctx.bh.quantity(reg.erc20s[i]); + } + ctx.bals = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.bals[i] = reg.assets[i].bal(address(this)) + tokensOut[reg.erc20s[i]]; + + // include StRSR's balance for RSR + if (reg.erc20s[i] == ctx.rsr) ctx.bals[i] += reg.assets[i].bal(address(ctx.stRSR)); + } + } + // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index b9dc3ca787..6fe87988d1 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -145,7 +145,7 @@ library TradingLibP0 { /// 2. Stay under stack limit with fewer vars /// 3. Cache information such as component addresses to save on gas - struct TradingContext { + struct TradingContextP0 { BasketRange basketsHeld; // {BU} // basketsHeld.top is the number of partial baskets units held // basketsHeld.bottom is the number of full basket units held @@ -190,7 +190,7 @@ library TradingLibP0 { // === Prepare cached values === IMain main = bm.main(); - TradingContext memory ctx = TradingContext({ + TradingContextP0 memory ctx = TradingContextP0({ basketsHeld: basketsHeld, bm: bm, bh: main.basketHandler(), @@ -241,14 +241,9 @@ library TradingLibP0 { // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty // the largest amount possible with each trade. // - // How do we know this algorithm converges? - // Assumption: constant oracle prices; monotonically increasing refPerTok() - // Any volume traded narrows the BU band. Why: - // - We might increase `basketsHeld.bottom` from run-to-run, but will never decrease it - // - We might decrease the UoA amount of excess balances beyond `basketsHeld.bottom` from - // run-to-run, but will never increase it - // - We might decrease the UoA amount of missing balances up-to `basketsHeld.top` from - // run-to-run, but will never increase it + // Algorithm Invariant: every increase of basketsHeld.bottom causes basketsRange().low to + // reach a new maximum. Note that basketRange().low may decrease slightly along the way. + // Assumptions: constant oracle prices; monotonically increasing refPerTok; no supply changes // // Preconditions: // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top @@ -269,7 +264,7 @@ library TradingLibP0 { // - range.bottom = min(rToken.basketsNeeded, basketsHeld.bottom + least baskets purchaseable) // where "least baskets purchaseable" involves trading at the worst price, // incurring the full maxTradeSlippage, and taking up to a minTradeVolume loss due to dust. - function basketRange(TradingContext memory ctx, IERC20[] memory erc20s) + function basketRange(TradingContextP0 memory ctx, IERC20[] memory erc20s) internal view returns (BasketRange memory range) @@ -428,10 +423,12 @@ library TradingLibP0 { // Sell IFFY last because it may recover value in the future. // All collateral in the basket have already been guaranteed to be SOUND by upstream checks. function nextTradePair( - TradingContext memory ctx, + TradingContextP0 memory ctx, IERC20[] memory erc20s, BasketRange memory range ) private view returns (TradeInfo memory trade) { + // assert(tradesOpen == 0); // guaranteed by BackingManager.rebalance() + MaxSurplusDeficit memory maxes; maxes.surplusStatus = CollateralStatus.IFFY; // least-desirable sell status diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 7763ddb771..5771587195 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -45,6 +45,9 @@ contract BackingManagerP1 is TradingP1, IBackingManager { IFurnace private furnace; mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind + // === 3.0.1 === + mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades + // ==== Invariants ==== // tradingDelay <= MAX_TRADING_DELAY and backingBuffer <= MAX_BACKING_BUFFER @@ -90,6 +93,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// @return trade The ITrade contract settled /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { + delete tokensOut[sell]; trade = super.settleTrade(sell); // nonReentrant // if the settler is the trade contract itself, try chaining with another rebalance() @@ -148,22 +152,26 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * rToken.basketsNeeded to the current basket holdings. Haircut time. */ + (TradingContext memory ctx, Registry memory reg) = tradingContext(basketsHeld); ( bool doTrade, TradeRequest memory req, TradePrices memory prices - ) = RecollateralizationLibP1.prepareRecollateralizationTrade(this, basketsHeld); + ) = RecollateralizationLibP1.prepareRecollateralizationTrade(ctx, reg); if (doTrade) { + IERC20 sellERC20 = req.sell.erc20(); + // Seize RSR if needed - if (req.sell.erc20() == rsr) { - uint256 bal = req.sell.erc20().balanceOf(address(this)); + if (sellERC20 == rsr) { + uint256 bal = sellERC20.balanceOf(address(this)); if (req.sellAmount > bal) stRSR.seizeRSR(req.sellAmount - bal); } // Execute Trade ITrade trade = tryTrade(kind, req, prices); - tradeEnd[kind] = trade.endTime(); + tradeEnd[kind] = trade.endTime(); // {s} + tokensOut[sellERC20] = trade.sellAmount(); // {tok} } else { // Haircut time compromiseBasketsNeeded(basketsHeld.bottom); @@ -264,6 +272,40 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // It's okay if there is leftover dust for RToken or a surplus asset (not RSR) } + // === View === + + /// Structs for trading + /// @param basketsHeld The number of baskets held by the BackingManager + /// @return ctx The TradingContext + /// @return reg Contents of AssetRegistry.getRegistry() + function tradingContext(BasketRange memory basketsHeld) + public + view + returns (TradingContext memory ctx, Registry memory reg) + { + reg = assetRegistry.getRegistry(); + + ctx.basketsHeld = basketsHeld; + ctx.bh = basketHandler; + ctx.ar = assetRegistry; + ctx.stRSR = stRSR; + ctx.rsr = rsr; + ctx.rToken = rToken; + ctx.minTradeVolume = minTradeVolume; + ctx.maxTradeSlippage = maxTradeSlippage; + ctx.quantities = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.quantities[i] = basketHandler.quantityUnsafe(reg.erc20s[i], reg.assets[i]); + } + ctx.bals = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.bals[i] = reg.assets[i].bal(address(this)) + tokensOut[reg.erc20s[i]]; + + // include StRSR's balance for RSR + if (reg.erc20s[i] == rsr) ctx.bals[i] += reg.assets[i].bal(address(stRSR)); + } + } + // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting @@ -308,5 +350,5 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[39] private __gap; + uint256[37] private __gap; } diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index ac5deeb3f5..8edb10f86c 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -8,29 +8,6 @@ import "../../interfaces/IBackingManager.sol"; import "../../libraries/Fixed.sol"; import "./TradeLib.sol"; -/// Struct purposes: -/// 1. Configure trading -/// 2. Stay under stack limit with fewer vars -/// 3. Cache information such as component addresses and basket quantities, to save on gas -struct TradingContext { - BasketRange basketsHeld; // {BU} - // basketsHeld.top is the number of partial baskets units held - // basketsHeld.bottom is the number of full basket units held - - // Components - IBackingManager bm; - IBasketHandler bh; - IAssetRegistry ar; - IStRSR stRSR; - IERC20 rsr; - IRToken rToken; - // Gov Vars - uint192 minTradeVolume; // {UoA} - uint192 maxTradeSlippage; // {1} - // Cached values - uint192[] quantities; // {tok/BU} basket quantities -} - /** * @title RecollateralizationLibP1 * @notice An informal extension of BackingManager that implements the rebalancing logic @@ -56,7 +33,7 @@ library RecollateralizationLibP1 { // let trade = nextTradePair(...) // if trade.sell is not a defaulted collateral, prepareTradeToCoverDeficit(...) // otherwise, prepareTradeSell(...) taking the minBuyAmount as the dependent variable - function prepareRecollateralizationTrade(IBackingManager bm, BasketRange memory basketsHeld) + function prepareRecollateralizationTrade(TradingContext memory ctx, Registry memory reg) external view returns ( @@ -65,30 +42,6 @@ library RecollateralizationLibP1 { TradePrices memory prices ) { - IMain main = bm.main(); - - // === Prepare TradingContext cache === - TradingContext memory ctx; - - ctx.basketsHeld = basketsHeld; - ctx.bm = bm; - ctx.bh = main.basketHandler(); - ctx.ar = main.assetRegistry(); - ctx.stRSR = main.stRSR(); - ctx.rsr = main.rsr(); - ctx.rToken = main.rToken(); - ctx.minTradeVolume = bm.minTradeVolume(); - ctx.maxTradeSlippage = bm.maxTradeSlippage(); - - // Cache quantities - Registry memory reg = ctx.ar.getRegistry(); - ctx.quantities = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.quantities[i] = ctx.bh.quantityUnsafe(reg.erc20s[i], reg.assets[i]); - } - - // ============================ - // Compute a target basket range for trading - {BU} // The basket range is the full range of projected outcomes for the rebalancing process BasketRange memory range = basketRange(ctx, reg); @@ -132,14 +85,9 @@ library RecollateralizationLibP1 { // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty // the largest amount possible with each trade. // - // How do we know this algorithm converges? - // Assumption: constant oracle prices; monotonically increasing refPerTok() - // Any volume traded narrows the BU band. Why: - // - We might increase `basketsHeld.bottom` from run-to-run, but will never decrease it - // - We might decrease the UoA amount of excess balances beyond `basketsHeld.bottom` from - // run-to-run, but will never increase it - // - We might decrease the UoA amount of missing balances up-to `basketsHeld.top` from - // run-to-run, but will never increase it + // Algorithm Invariant: every increase of basketsHeld.bottom causes basketsRange().low to + // reach a new maximum. Note that basketRange().low may decrease slightly along the way. + // Assumptions: constant oracle prices; monotonically increasing refPerTok; no supply changes // // Preconditions: // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top @@ -165,6 +113,9 @@ library RecollateralizationLibP1 { view returns (BasketRange memory range) { + // tradesOpen will be 0 when called by prepareRecollateralizationTrade() + // tradesOpen can be > 0 when called by RTokenAsset.basketRange() + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} require(buPriceLow > 0 && buPriceHigh < FIX_MAX, "BUs unpriced"); @@ -192,20 +143,13 @@ library RecollateralizationLibP1 { // Exclude RToken balances to avoid double counting value if (reg.erc20s[i] == IERC20(address(ctx.rToken))) continue; - uint192 bal = reg.assets[i].bal(address(ctx.bm)); // {tok} - - // For RSR, include the staking balance - if (reg.erc20s[i] == ctx.rsr) { - bal = bal.plus(reg.assets[i].bal(address(ctx.stRSR))); - } - (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} // Skip over dust-balance assets not in the basket // Intentionally include value of IFFY/DISABLED collateral if ( ctx.quantities[i] == 0 && - !TradeLib.isEnoughToSell(reg.assets[i], bal, low, ctx.minTradeVolume) + !TradeLib.isEnoughToSell(reg.assets[i], ctx.bals[i], low, ctx.minTradeVolume) ) { continue; } @@ -219,17 +163,21 @@ library RecollateralizationLibP1 { // {tok} = {tok/BU} * {BU} uint192 anchor = ctx.quantities[i].mul(ctx.basketsHeld.top, CEIL); - if (anchor > bal) { + if (anchor > ctx.bals[i]) { // deficit: deduct optimistic estimate of baskets missing // {BU} = {UoA/tok} * {tok} / {UoA/BU} - deltaTop -= int256(uint256(low.mulDiv(anchor - bal, buPriceHigh, FLOOR))); + deltaTop -= int256( + uint256(low.mulDiv(anchor - ctx.bals[i], buPriceHigh, FLOOR)) + ); // does not need underflow protection: using low price of asset } else { // surplus: add-in optimistic estimate of baskets purchaseable // {BU} = {UoA/tok} * {tok} / {UoA/BU} - deltaTop += int256(uint256(high.safeMulDiv(bal - anchor, buPriceLow, CEIL))); + deltaTop += int256( + uint256(high.safeMulDiv(ctx.bals[i] - anchor, buPriceLow, CEIL)) + ); } } @@ -241,7 +189,7 @@ library RecollateralizationLibP1 { // (1) Sum token value at low price // {UoA} = {UoA/tok} * {tok} - uint192 val = low.mul(bal - anchor, FLOOR); + uint192 val = low.mul(ctx.bals[i] - anchor, FLOOR); // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? @@ -329,26 +277,33 @@ library RecollateralizationLibP1 { Registry memory reg, BasketRange memory range ) private view returns (TradeInfo memory trade) { + // assert(tradesOpen == 0); // guaranteed by BackingManager.rebalance() + MaxSurplusDeficit memory maxes; maxes.surplusStatus = CollateralStatus.IFFY; // least-desirable sell status + uint256 rsrIndex = reg.erc20s.length; // invalid index, to-start + // Iterate over non-RSR/non-RToken assets // (no space on the stack to cache erc20s.length) for (uint256 i = 0; i < reg.erc20s.length; ++i) { - if (reg.erc20s[i] == ctx.rsr || address(reg.erc20s[i]) == address(ctx.rToken)) continue; - - uint192 bal = reg.assets[i].bal(address(ctx.bm)); // {tok} + if (address(reg.erc20s[i]) == address(ctx.rToken)) continue; + else if (reg.erc20s[i] == ctx.rsr) { + rsrIndex = i; + continue; + } // {tok} = {BU} * {tok/BU} // needed(Top): token balance needed for range.top baskets: quantity(e) * range.top uint192 needed = range.top.mul(ctx.quantities[i], CEIL); // {tok} - if (bal.gt(needed)) { + if (ctx.bals[i].gt(needed)) { (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/sellTok} + if (high == 0) continue; // skip over worthless assets // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = bal.minus(needed).mul(low, FLOOR); + uint192 delta = ctx.bals[i].minus(needed).mul(low, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -362,13 +317,13 @@ library RecollateralizationLibP1 { isBetterSurplus(maxes, status, delta) && TradeLib.isEnoughToSell( reg.assets[i], - bal.minus(needed), + ctx.bals[i].minus(needed), low, ctx.minTradeVolume ) ) { trade.sell = reg.assets[i]; - trade.sellAmount = bal.minus(needed); + trade.sellAmount = ctx.bals[i].minus(needed); trade.prices.sellLow = low; trade.prices.sellHigh = high; @@ -379,8 +334,8 @@ library RecollateralizationLibP1 { // needed(Bottom): token balance needed at bottom of the basket range needed = range.bottom.mul(ctx.quantities[i], CEIL); // {buyTok}; - if (bal.lt(needed)) { - uint192 amtShort = needed.minus(bal); // {buyTok} + if (ctx.bals[i].lt(needed)) { + uint192 amtShort = needed.minus(ctx.bals[i]); // {buyTok} (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} @@ -401,18 +356,20 @@ library RecollateralizationLibP1 { // Use RSR if needed if (address(trade.sell) == address(0) && address(trade.buy) != address(0)) { - IAsset rsrAsset = ctx.ar.toAsset(ctx.rsr); - - uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( - rsrAsset.bal(address(ctx.stRSR)) - ); - (uint192 low, uint192 high) = rsrAsset.price(); // {UoA/RSR} + (uint192 low, uint192 high) = reg.assets[rsrIndex].price(); // {UoA/RSR} + // if rsr does not have a registered asset the below array accesses will revert if ( - high > 0 && TradeLib.isEnoughToSell(rsrAsset, rsrAvailable, low, ctx.minTradeVolume) + high > 0 && + TradeLib.isEnoughToSell( + reg.assets[rsrIndex], + ctx.bals[rsrIndex], + low, + ctx.minTradeVolume + ) ) { - trade.sell = rsrAsset; - trade.sellAmount = rsrAvailable; + trade.sell = reg.assets[rsrIndex]; + trade.sellAmount = ctx.bals[rsrIndex]; trade.prices.sellLow = low; trade.prices.sellHigh = high; } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 7b38c7c305..1c6217e8ec 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -97,7 +97,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl // == Interactions == (uint256 soldAmt, uint256 boughtAmt) = trade.settle(); - emit TradeSettled(trade, trade.sell(), trade.buy(), soldAmt, boughtAmt); + emit TradeSettled(trade, sell, trade.buy(), soldAmt, boughtAmt); } /// Try to initiate a trade with a trading partner provided by the broker diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index f82f2ee185..fdacf7ddb5 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -18,10 +18,9 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { using OracleLib for AggregatorV3Interface; // Component addresses are not mutable in protocol, so it's safe to cache these - IMain public immutable main; IAssetRegistry public immutable assetRegistry; - IBackingManager public immutable backingManager; IBasketHandler public immutable basketHandler; + IBackingManager public immutable backingManager; IFurnace public immutable furnace; IERC20 public immutable rsr; IStRSR public immutable stRSR; @@ -40,10 +39,10 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { require(address(erc20_) != address(0), "missing erc20"); require(maxTradeVolume_ > 0, "invalid max trade volume"); - main = erc20_.main(); + IMain main = erc20_.main(); assetRegistry = main.assetRegistry(); - backingManager = main.backingManager(); basketHandler = main.basketHandler(); + backingManager = main.backingManager(); furnace = main.furnace(); rsr = main.rsr(); stRSR = main.stRSR(); @@ -188,24 +187,9 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // the absence of an external price feed. Any RToken that gets reasonably big // should switch over to an asset with a price feed. - TradingContext memory ctx; - - ctx.basketsHeld = basketsHeld; - ctx.ar = assetRegistry; - ctx.bm = backingManager; - ctx.bh = basketHandler; - ctx.rsr = rsr; - ctx.rToken = IRToken(address(erc20)); - ctx.stRSR = stRSR; - ctx.minTradeVolume = backingManager.minTradeVolume(); - ctx.maxTradeSlippage = backingManager.maxTradeSlippage(); - - // Calculate quantities - Registry memory reg = ctx.ar.getRegistry(); - ctx.quantities = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.quantities[i] = ctx.bh.quantityUnsafe(reg.erc20s[i], reg.assets[i]); - } + (TradingContext memory ctx, Registry memory reg) = backingManager.tradingContext( + basketsHeld + ); // will exclude UoA value from RToken balances at BackingManager range = RecollateralizationLibP1.basketRange(ctx, reg); diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 9f52e6387a..c494ecee57 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -43,7 +43,8 @@ contract GnosisTrade is ITrade { address public origin; IERC20Metadata public sell; // address of token this trade is selling IERC20Metadata public buy; // address of token this trade is buying - uint256 public initBal; // {qTok}, this trade's balance of `sell` when init() was called + uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called + uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold; dup with initBal uint48 public endTime; // timestamp after which this trade's auction can be settled uint192 public worstCasePrice; // {buyTok/sellTok}, the worst price we expect to get at Auction // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` @@ -89,7 +90,8 @@ contract GnosisTrade is ITrade { sell = req.sell.erc20(); buy = req.buy.erc20(); - initBal = sell.balanceOf(address(this)); + initBal = sell.balanceOf(address(this)); // {qSellTok} + sellAmount = shiftl_toFix(initBal, -int8(sell.decimals())); // {sellTok} require(initBal <= type(uint96).max, "initBal too large"); require(initBal >= req.sellAmount, "unfunded trade"); @@ -107,8 +109,8 @@ contract GnosisTrade is ITrade { ); // Downsize our sell amount to adjust for fee - // {qTok} = {qTok} * {1} / {1} - uint96 sellAmount = uint96( + // {qSellTok} = {qSellTok} * {1} / {1} + uint96 _sellAmount = uint96( _divrnd( req.sellAmount * FEE_DENOMINATOR, FEE_DENOMINATOR + gnosis.feeNumerator(), @@ -143,7 +145,7 @@ contract GnosisTrade is ITrade { buy, endTime, endTime, - sellAmount, + _sellAmount, minBuyAmount, minBuyAmtPerOrder, 0, diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 30796f9b8d..83d0b04af6 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -1350,11 +1350,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- no backing currently - const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR + // Check price in USD of the current RToken -- should track backing out on auction await expectRTokenPrice( rTokenAsset.address, - rTokenPrice, + fp('1'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -1474,11 +1473,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- no backing currently - const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR + // Check price in USD of the current RToken -- should track balances out on trade await expectRTokenPrice( rTokenAsset.address, - rTokenPrice, + fp('1'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -1608,11 +1606,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- no backing currently - const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR + // Check price in USD of the current RToken -- backing is tracked while out on trade await expectRTokenPrice( rTokenAsset.address, - rTokenPrice, + fp('1'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -4464,10 +4461,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }, ]) - // Check price in USD of the current RToken - capital out on auction + // Check price in USD of the current RToken - should track the capital out on auction await expectRTokenPrice( rTokenAsset.address, - fp('0.5'), + fp('0.625'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index ceb61ab16e..634c60aac7 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -10,12 +10,12 @@ exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `371 exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `449950`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `453893`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `539802`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `543745`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `527640`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `531583`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `529778`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `533721`; exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113028`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 76f00fe010..5318fd2f61 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8464999`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8330567`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index cbee6c9389..0771900efd 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,12 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393877`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393855`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `245334`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `245356`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `245334`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `245356`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `223993`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `224015`; exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index 78da6ac501..600063cf88 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782198`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782176`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609198`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609176`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583902`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583880`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 236df3d703..1bcce9471c 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1364203`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1396756`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1499568`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1518120`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `751607`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `750910`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1656594`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1715195`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174781`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `179696`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1599451`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1657793`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174781`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `179696`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1687212`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1733823`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202854`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `207769`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 575c2d39f9..24037c7f9a 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -12,16 +12,16 @@ exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `232408`; exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `215308`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1044877`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1044935`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `796514`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `820357`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1198554`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1222455`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `367672`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `368496`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `317861`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `318685`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `762314`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `786157`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `284880`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `285704`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 3af605e7b9..36ee8b72fa 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -14,6 +14,6 @@ exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606313`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606291`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536447`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536425`; diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 4dd32dc769..ad8c967def 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -7,9 +7,10 @@ import { advanceBlocks, advanceTime, getLatestBlockTimestamp, + getLatestBlockNumber, setNextBlockTimestamp, } from '../utils/time' -import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../common/constants' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192, TradeKind } from '../../common/constants' import { bn, fp } from '../../common/numbers' import { expectDecayedPrice, @@ -28,12 +29,14 @@ import { CTokenWrapperMock, ERC20Mock, FiatCollateral, + GnosisMock, IAssetRegistry, InvalidFiatCollateral, InvalidMockV3Aggregator, RTokenAsset, StaticATokenMock, TestIBackingManager, + TestIBasketHandler, TestIFurnace, TestIRToken, USDCMock, @@ -50,6 +53,7 @@ import { PRICE_TIMEOUT, VERSION, } from '../fixtures' +import { getTrade } from '../utils/trades' import { useEnv } from '#/utils/env' import snapshotGasCost from '../utils/snapshotGasCost' @@ -90,12 +94,16 @@ describe('Assets contracts #fast', () => { let wallet: Wallet let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler let furnace: TestIFurnace // Factory let AssetFactory: ContractFactory let RTokenAssetFactory: ContractFactory + // Gnosis + let gnosis: GnosisMock + const amt = fp('1e4') before('create fixture loader', async () => { @@ -114,7 +122,9 @@ describe('Assets contracts #fast', () => { basket, assetRegistry, backingManager, + basketHandler, config, + gnosis, furnace, rToken, rTokenAsset, @@ -421,7 +431,7 @@ describe('Assets contracts #fast', () => { await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) - it('Should handle reverting edge cases for RToken', async () => { + it('Should handle reverting edge cases for RTokenAsset', async () => { // Swap one of the collaterals for an invalid one const InvalidFiatCollateralFactory = await ethers.getContractFactory('InvalidFiatCollateral') const invalidFiatCollateral: InvalidFiatCollateral = ( @@ -456,7 +466,7 @@ describe('Assets contracts #fast', () => { await expect(rTokenAsset.price()).to.be.reverted }) - it('Regression test -- Should handle unpriced collateral for RToken', async () => { + it('Regression test -- Should handle unpriced collateral for RTokenAsset', async () => { // https://github.com/code-423n4/2023-07-reserve-findings/issues/20 // Swap one of the collaterals for an invalid one @@ -506,6 +516,94 @@ describe('Assets contracts #fast', () => { expect(cachedAtTime).to.eq(0) }) + it('Should handle tokens being out on trade for RTokenAsset', async () => { + // Summary: + // - Run a dutch auction that does not fill + // - Run a batch auction that fills for partial volume + // - Run a dutch auction that fills for full volume + + const low0 = fp('0.99') + const low1 = bn('975344098811881188') // after a 50% basket change + const low2 = bn('975343128415841584') // after batch auction at half volume + const low3 = bn('975560049627103964') // after dutch auction at full volume + + // Price should be [$0.99, $1.01] to start + await expectExactPrice(rTokenAsset.address, [low0, fp('1.01')]) + + // After 50% basket change, expected trading should decrease the lower price to ~$0.9753 + // Upper price remains $1.01 because of uncertainty around how trading will go + await basketHandler + .connect(wallet) + .setPrimeBasket([token.address, usdc.address], [fp('0.5'), fp('0.5')]) + await basketHandler.connect(wallet).refreshBasket() + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // After launching a trade token price should not change + // Regression -- I've confirmed the lower price drops to ~$0.7352 when not tracking balances out on trade + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(1) + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // Settling trade without bidding should not change price + let trade = await ethers.getContractAt( + 'DutchTrade', + await backingManager.trades(aToken.address) + ) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber())) + await expect(backingManager.settleTrade(aToken.address)).to.emit( + backingManager, + 'TradeSettled' + ) + expect(await backingManager.tradesOpen()).to.equal(0) + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // Launching the trade a second time, this time Batch Auction, should not change price + await setNextBlockTimestamp((await trade.endTime()) + 13) + await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(1) + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // Bid in Gnosis for half volume at even prices + const t = await getTrade(backingManager, aToken.address) + const sellAmt = (await t.initBal()).div(2) // half volume + await token.connect(wallet).approve(gnosis.address, sellAmt) + await gnosis.placeBid(0, { + bidder: wallet.address, + sellAmount: sellAmt, + buyAmount: sellAmt, + }) + await advanceTime(config.batchAuctionLength.toNumber()) + await expect(backingManager.settleTrade(aToken.address)).not.to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(0) + await expectExactPrice(rTokenAsset.address, [low2, fp('1.01')]) + + // Starting a 3rd auction should not change balances + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(1) + await expectExactPrice(rTokenAsset.address, [low2, fp('1.01')]) + + // Settle 3rd auction for full volume + trade = await ethers.getContractAt('DutchTrade', await backingManager.trades(cToken.address)) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await usdc.approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await expect(trade.bid()).to.emit(backingManager, 'TradeSettled') + expect(await backingManager.tradesOpen()).to.equal(1) // launches another trade! + await expectExactPrice(rTokenAsset.address, [low3, bn('1007427552565834095')]) // high end starts to fall + }) + it('Should be able to refresh saved prices', async () => { // Check initial prices - use RSR as example let currBlockTimestamp: number = await getLatestBlockTimestamp() diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap index 9f00d8e491..996921a268 100644 --- a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -16,7 +16,7 @@ exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67620`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `87625`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `87699`; exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `87625`; @@ -24,6 +24,6 @@ exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87684`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89634`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89708`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `88040`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87966`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index acdeaf5b1f..b1bc4df8a7 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -10,19 +10,19 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper col exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589852`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589926`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478768`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474226`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544737`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544663`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713285`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713211`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713359`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713581`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701051`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index 5470886e16..876202c6a6 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -6,7 +6,7 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480826`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480900`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; @@ -20,9 +20,9 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713211`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713433`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713581`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713507`; exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701125`; diff --git a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap index b8cde38466..d5951594c9 100644 --- a/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/dsr/__snapshots__/SDaiCollateralTestSuite.test.ts.snap @@ -16,9 +16,9 @@ exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refre exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `108431`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `126640`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `126566`; -exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123313`; +exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123239`; exports[`Collateral: SDaiCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `123298`; diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 3be1a0a11c..22ad1e5662 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082333`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082311`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9836935`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9823907`; exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2436571`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653324`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653658`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21071119`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21271957`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984083`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984061`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8720835`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8720813`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592449`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592432`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `14823897`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15036720`; From 819446b43aa0841abaf3fe423dd80a7091b50f5f Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 12:38:10 -0300 Subject: [PATCH 120/450] TRUST QA-12: default decimals (#991) --- contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol | 2 +- contracts/plugins/assets/compoundv3/WrappedERC20.sol | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 9234322186..69791aac72 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -43,7 +43,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { } /// @return number of decimals - function decimals() public pure override returns (uint8) { + function decimals() public pure override(IERC20Metadata, WrappedERC20) returns (uint8) { return 6; } diff --git a/contracts/plugins/assets/compoundv3/WrappedERC20.sol b/contracts/plugins/assets/compoundv3/WrappedERC20.sol index b3287711d7..290a2da080 100644 --- a/contracts/plugins/assets/compoundv3/WrappedERC20.sol +++ b/contracts/plugins/assets/compoundv3/WrappedERC20.sol @@ -75,6 +75,13 @@ abstract contract WrappedERC20 is IWrappedERC20 { return _symbol; } + /** + * @dev Returns the decimals places of the token. + */ + function decimals() public pure virtual returns (uint8) { + return 18; + } + /** * @dev See {IERC20-totalSupply}. */ From cbbc0b4f152906787248f66330605dd77d7caf21 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:00:43 -0300 Subject: [PATCH 121/450] TRUST QA-20: Fix morpho DAI oracle timeout mainnet (#995) --- .../phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index 4c74574653..fd7a1e96b9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -126,7 +126,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: stablesOracleError.toString(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 1 hr + oracleTimeout: '86400', // 24h targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: stablesOracleError.add(fp('0.01')), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -164,6 +164,7 @@ async function main() { const collateral = await FiatCollateralFactory.connect(deployer).deploy( { ...baseStableConfig, + oracleTimeout: '3600', // 1 hr chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI!, erc20: maDAI.address, }, From 237c0c3c712d04a1b219d1b98510cca84f67e6f0 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:04:38 -0300 Subject: [PATCH 122/450] TRUST L-5: add comment for non supported metapools (#997) --- .../plugins/assets/curve/CurveStableMetapoolCollateral.sol | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 7fd4fe005b..ad3cd6ac8e 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -13,6 +13,9 @@ interface ICurveMetaPool is ICurvePool, IERC20Metadata { * This plugin contract is intended for 2-fiattoken stable metapools that * DO NOT involve RTokens, such as LUSD-fraxBP or MIM-3CRV. * + * Does not support older metapools that have a separate contract for the + * metapool's LP token. + * * tok = ConvexStakingWrapper(PairedUSDToken/USDBasePool) * ref = PairedUSDToken/USDBasePool pool invariant * tar = USD From 27522afef315dfd04e782c515232966393adf615 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:07:20 -0300 Subject: [PATCH 123/450] TRUST QA-13/14: Compoundv3 tweaks (#999) --- .../plugins/assets/compoundv3/CTokenV3Collateral.sol | 10 ---------- .../plugins/assets/compoundv3/ICusdcV3Wrapper.sol | 2 +- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 92f8a2d203..17d46dc908 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -19,12 +19,6 @@ import "./vendor/IComet.sol"; * UoA = USD */ contract CTokenV3Collateral is AppreciatingFiatCollateral { - struct CometCollateralConfig { - IERC20 rewardERC20; - uint256 reservesThresholdIffy; - uint256 reservesThresholdDisabled; - } - using OracleLib for AggregatorV3Interface; using FixLib for uint192; @@ -46,10 +40,6 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { cometDecimals = comet.decimals(); } - function bal(address account) external view override(Asset, IAsset) returns (uint192) { - return shiftl_toFix(erc20.balanceOf(account), -int8(erc20Decimals)); - } - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins function claimRewards() external override(Asset, IRewardable) { IRewardable(address(erc20)).claimRewards(); diff --git a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol index f1514ec8e8..52226458c6 100644 --- a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol @@ -10,8 +10,8 @@ import "../../../interfaces/IRewardable.sol"; interface ICusdcV3Wrapper is IWrappedERC20, IRewardable { struct UserBasic { uint104 principal; - uint64 baseTrackingAccrued; uint64 baseTrackingIndex; + uint64 baseTrackingAccrued; uint256 rewardsClaimed; } From 75ffbea0118409ca6e40596008caebecfb0c699e Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:11:27 -0300 Subject: [PATCH 124/450] TRUST QA-15: Compoundv2 claiming (#1000) --- contracts/plugins/assets/compoundv2/CTokenWrapper.sol | 4 +++- contracts/plugins/assets/compoundv2/ICToken.sol | 7 ++++++- contracts/plugins/mocks/CTokenWrapperMock.sol | 4 +++- contracts/plugins/mocks/ComptrollerMock.sol | 8 +++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol index 286787d42a..27b37d8382 100644 --- a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol +++ b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol @@ -35,9 +35,11 @@ contract CTokenWrapper is RewardableERC20Wrapper { // === Overrides === function _claimAssetRewards() internal virtual override { + address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); + holders[0] = address(this); cTokens[0] = address(underlying); - comptroller.claimComp(address(this), cTokens); + comptroller.claimComp(holders, cTokens, false, true); } // No overrides of _deposit()/_withdraw() necessary: no staking required diff --git a/contracts/plugins/assets/compoundv2/ICToken.sol b/contracts/plugins/assets/compoundv2/ICToken.sol index 9dafd86c80..609ea37112 100644 --- a/contracts/plugins/assets/compoundv2/ICToken.sol +++ b/contracts/plugins/assets/compoundv2/ICToken.sol @@ -35,7 +35,12 @@ interface ICToken is IERC20Metadata { interface IComptroller { /// Claim comp for an account, to an account - function claimComp(address account, address[] memory cTokens) external; + function claimComp( + address[] memory holders, + address[] memory cTokens, + bool borrowers, + bool suppliers + ) external; /// @return The address for COMP token function getCompAddress() external view returns (address); diff --git a/contracts/plugins/mocks/CTokenWrapperMock.sol b/contracts/plugins/mocks/CTokenWrapperMock.sol index c0cd0922a6..78a93b44af 100644 --- a/contracts/plugins/mocks/CTokenWrapperMock.sol +++ b/contracts/plugins/mocks/CTokenWrapperMock.sol @@ -42,9 +42,11 @@ contract CTokenWrapperMock is ERC20Mock, IRewardable { revert("reverting claim rewards"); } uint256 oldBal = comp.balanceOf(msg.sender); + address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); + holders[0] = msg.sender; cTokens[0] = address(underlying); - comptroller.claimComp(msg.sender, cTokens); + comptroller.claimComp(holders, cTokens, false, true); emit RewardsClaimed(IERC20(address(comp)), comp.balanceOf(msg.sender) - oldBal); } diff --git a/contracts/plugins/mocks/ComptrollerMock.sol b/contracts/plugins/mocks/ComptrollerMock.sol index 9f95726479..49c46df9c9 100644 --- a/contracts/plugins/mocks/ComptrollerMock.sol +++ b/contracts/plugins/mocks/ComptrollerMock.sol @@ -19,8 +19,14 @@ contract ComptrollerMock is IComptroller { compBalances[recipient] = amount; } - function claimComp(address holder, address[] memory) external { + function claimComp( + address[] memory holders, + address[] memory, + bool, + bool + ) external { // Mint amount and update internal balances + address holder = holders[0]; if (address(compToken) != address(0)) { uint256 amount = compBalances[holder]; compBalances[holder] = 0; From 6c7e44945776f97e165bee83b2231dc7efab051d Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 13:12:28 -0300 Subject: [PATCH 125/450] TRUST QA-8: No revenue hiding in SDAI (#1001) --- scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts | 2 +- scripts/verification/collateral-plugins/verify_sdai.ts | 2 +- .../individual-collateral/dsr/SDaiCollateralTestSuite.test.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts index d06853b7ce..aa6e840436 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts @@ -59,7 +59,7 @@ async function main() { defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }, - fp('1e-6').toString(), // revenueHiding = 0.0001% + bn(0), // does not require revenue hiding POT ) await collateral.deployed() diff --git a/scripts/verification/collateral-plugins/verify_sdai.ts b/scripts/verification/collateral-plugins/verify_sdai.ts index e5d9290c39..393c6264b3 100644 --- a/scripts/verification/collateral-plugins/verify_sdai.ts +++ b/scripts/verification/collateral-plugins/verify_sdai.ts @@ -42,7 +42,7 @@ async function main() { defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }, - fp('1e-6').toString(), // revenueHiding = 0.0001% + bn(0), POT, ], 'contracts/plugins/assets/dsr/SDaiCollateral.sol:SDaiCollateral' diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index f604c19eb2..4d539a4a25 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -214,7 +214,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, - itHasRevenueHiding: it, + itHasRevenueHiding: it.skip, resetFork, collateralName: 'SDaiCollateral', chainlinkDefaultAnswer, From 6318c6850a8e9480c33f39af1a02ac63fb5fedb6 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 31 Oct 2023 14:18:54 -0300 Subject: [PATCH 126/450] TRUST H-3: calling incorrect hasPermission() function (#1003) --- .../assets/compoundv3/CusdcV3Wrapper.sol | 2 +- .../compoundv3/vendor/CometExtInterface.sol | 8 +++++ .../compoundv3/CusdcV3Wrapper.test.ts | 33 ++++++++++++++++++- 3 files changed, 41 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 69791aac72..3706d9d339 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -81,7 +81,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { address dst, uint256 amount ) internal { - if (!hasPermission(src, operator)) revert Unauthorized(); + if (!underlyingComet.hasPermission(src, operator)) revert Unauthorized(); // {Comet} uint256 srcBal = underlyingComet.balanceOf(src); if (amount > srcBal) amount = srcBal; diff --git a/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol b/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol index a144d69112..70d9664aac 100644 --- a/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol +++ b/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol @@ -95,4 +95,12 @@ abstract contract CometExtInterface { function allowance(address owner, address spender) external view virtual returns (uint256); event Approval(address indexed owner, address indexed spender, uint256 amount); + + /** + * @notice Determine if the manager has permission to act on behalf of the owner + * @param owner The owner account + * @param manager The manager account + * @return Whether or not the manager has permission + */ + function hasPermission(address owner, address manager) external view virtual returns (bool); } diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index b47b71bff9..7a1babf104 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -103,12 +103,43 @@ describeFork('Wrapped CUSDCv3', () => { expect(await wcusdcV3.balanceOf(don.address)).to.eq(expectedAmount) }) + it('checks for correct approval on deposit - regression test', async () => { + await expect( + wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) + ).revertedWithCustomError(wcusdcV3, 'Unauthorized') + + // Provide approval on the wrapper + await wcusdcV3.connect(bob).allow(don.address, true) + + const expectedAmount = await wcusdcV3.convertDynamicToStatic( + await cusdcV3.balanceOf(bob.address) + ) + + // This should fail even when bob approved wcusdcv3 to spend his tokens, + // because there is no explicit approval of cUSDCv3 from bob to don, only + // approval on the wrapper + await expect( + wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) + ).to.be.revertedWithCustomError(cusdcV3, 'Unauthorized') + + // Add explicit approval of cUSDCv3 and retry + await cusdcV3.connect(bob).allow(don.address, true) + await wcusdcV3 + .connect(don) + .depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) + + expect(await wcusdcV3.balanceOf(bob.address)).to.eq(0) + expect(await wcusdcV3.balanceOf(charles.address)).to.eq(expectedAmount) + }) + it('deposits from a different account', async () => { expect(await wcusdcV3.balanceOf(charles.address)).to.eq(0) await expect( wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) ).revertedWithCustomError(wcusdcV3, 'Unauthorized') - await wcusdcV3.connect(bob).connect(bob).allow(don.address, true) + + // Approval has to be on cUsdcV3, not the wrapper + await cusdcV3.connect(bob).allow(don.address, true) const expectedAmount = await wcusdcV3.convertDynamicToStatic( await cusdcV3.balanceOf(bob.address) ) From b8f4d84b8be0cb3022eeef00fa671cb1ef2e8602 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 31 Oct 2023 14:39:23 -0400 Subject: [PATCH 127/450] CHANGELOG: add ERC20 upgrades --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b453fff3a..4fa4815b9e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,13 @@ ### Upgrade Steps -- Required -Upgrade all core contracts and _all_ assets. ERC20s do not need to be upgraded. Use `Deployer.deployRTokenAsset()` to create a new `RTokenAsset` instance. This asset should be swapped too. +Upgrade all core contracts and _all_ assets. Most ERC20s do not need to be upgraded. Use `Deployer.deployRTokenAsset()` to create a new `RTokenAsset` instance. This asset should be swapped too. + +ERC20s that _do_ need to be upgraded: + +- Morpho +- Convex +- CompoundV3 Then, call `Broker.cacheComponents()`. From 7af3d3157f04470a612ca2bb9ba26f462ae3dc66 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 1 Nov 2023 12:34:02 -0400 Subject: [PATCH 128/450] Collateral plugin integration tests (#989) --- common/numbers.ts | 4 +- .../individual-collateral/collateralTests.ts | 406 +++++++++++++++++- .../curve/collateralTests.ts | 405 ++++++++++++++++- .../plugins/individual-collateral/fixtures.ts | 9 +- 4 files changed, 801 insertions(+), 23 deletions(-) diff --git a/common/numbers.ts b/common/numbers.ts index 6d53f464d1..d49a2a6606 100644 --- a/common/numbers.ts +++ b/common/numbers.ts @@ -16,7 +16,9 @@ export const pow10 = (exponent: BigNumberish): BigNumber => { // Convert `x` to a new BigNumber with decimals = `decimals`. // Input should have SCALE_DECIMALS (18) decimal places, and `decimals` should be less than 18. export const toBNDecimals = (x: BigNumberish, decimals: number): BigNumber => { - return BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) + return decimals < SCALE_DECIMALS + ? BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) + : BigNumber.from(x).mul(pow10(decimals - SCALE_DECIMALS)) } // Convert to the BigNumber representing a Fix from a BigNumberish. diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index e077f3567f..da6b098630 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -1,25 +1,30 @@ import { expect } from 'chai' import hre, { ethers } from 'hardhat' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { BigNumber } from 'ethers' +import { BigNumber, ContractFactory } from 'ethers' import { useEnv } from '#/utils/env' import { getChainId } from '../../../common/blockchain-utils' -import { networkConfig } from '../../../common/configuration' -import { bn, fp } from '../../../common/numbers' -import { - IERC20Metadata, - InvalidMockV3Aggregator, - MockV3Aggregator, - TestICollateral, -} from '../../../typechain' +import { bn, fp, toBNDecimals } from '../../../common/numbers' +import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from './fixtures' +import { expectInIndirectReceipt } from '../../../common/events' +import { whileImpersonating } from '../../utils/impersonation' +import { IGovParams, IGovRoles, IRTokenSetup, networkConfig } from '../../../common/configuration' import { advanceTime, advanceBlocks, + getLatestBlockNumber, getLatestBlockTimestamp, setNextBlockTimestamp, } from '../../utils/time' -import { MAX_UINT48, MAX_UINT192 } from '../../../common/constants' +import { + MAX_UINT48, + MAX_UINT192, + MAX_UINT256, + TradeKind, + ZERO_ADDRESS, +} from '../../../common/constants' import { CollateralFixtureContext, CollateralTestSuiteFixtures, @@ -31,10 +36,24 @@ import { expectPrice, expectUnpriced, } from '../../utils/oracles' +import { + ERC20Mock, + FacadeWrite, + IAssetRegistry, + IERC20Metadata, + InvalidMockV3Aggregator, + MockV3Aggregator, + TestIBackingManager, + TestIBasketHandler, + TestICollateral, + TestIDeployer, + TestIMain, + TestIRevenueTrader, + TestIRToken, +} from '../../../typechain' import snapshotGasCost from '../../utils/snapshotGasCost' -import { IMPLEMENTATION, Implementation } from '../../fixtures' +import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../../fixtures' -// const describeFork = useEnv('FORK') ? describe : describe.skip const getDescribeFork = (targetNetwork = 'mainnet') => { return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip } @@ -605,5 +624,368 @@ export default function fn( }) }) }) + + describe('integration tests', () => { + before(resetFork) + + let ctx: X + let owner: SignerWithAddress + let addr1: SignerWithAddress + + let chainId: number + + let defaultFixture: Fixture + + let supply: BigNumber + + // Tokens/Assets + let pairedColl: TestICollateral + let pairedERC20: ERC20Mock + let collateralERC20: IERC20Metadata + let collateral: TestICollateral + + // Core Contracts + let main: TestIMain + let rToken: TestIRToken + let assetRegistry: IAssetRegistry + let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler + let rTokenTrader: TestIRevenueTrader + + let deployer: TestIDeployer + let facadeWrite: FacadeWrite + let govParams: IGovParams + let govRoles: IGovRoles + + const config = { + dist: { + rTokenDist: bn(100), // 100% RToken + rsrDist: bn(0), // 0% RSR + }, + minTradeVolume: bn('0'), // $0 + rTokenMaxTradeVolume: MAX_UINT192, // +inf + shortFreeze: bn('259200'), // 3 days + longFreeze: bn('2592000'), // 30 days + rewardRatio: bn('1069671574938'), // approx. half life of 90 days + unstakingDelay: bn('1209600'), // 2 weeks + withdrawalLeak: fp('0'), // 0%; always refresh + warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) + tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) + batchAuctionLength: bn('900'), // 15 minutes + dutchAuctionLength: bn('1800'), // 30 minutes + backingBuffer: fp('0'), // 0% + maxTradeSlippage: fp('0.01'), // 1% + issuanceThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + redemptionThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + } + + interface IntegrationFixture { + ctx: X + protocol: DefaultFixture + } + + const integrationFixture: Fixture = + async function (): Promise { + return { + ctx: await loadFixture( + makeCollateralFixtureContext(owner, { maxTradeVolume: MAX_UINT192 }) + ), + protocol: await loadFixture(defaultFixture), + } + } + + before(async () => { + defaultFixture = await getDefaultFixture(collateralName) + chainId = await getChainId(hre) + if (useEnv('FORK_NETWORK').toLowerCase() === 'base') chainId = 8453 + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + ;[, owner, addr1] = await ethers.getSigners() + }) + + beforeEach(async () => { + let protocol: DefaultFixture + ;({ ctx, protocol } = await loadFixture(integrationFixture)) + ;({ collateral } = ctx) + ;({ deployer, facadeWrite, govParams } = protocol) + + supply = fp('1') + + // Create a paired collateral of the same targetName + pairedColl = await makePairedCollateral(await collateral.targetName()) + await pairedColl.refresh() + expect(await pairedColl.status()).to.equal(CollateralStatus.SOUND) + pairedERC20 = await ethers.getContractAt('ERC20Mock', await pairedColl.erc20()) + + // Prep collateral + collateralERC20 = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + await mintCollateralTo( + ctx, + toBNDecimals(fp('1'), await collateralERC20.decimals()), + addr1, + addr1.address + ) + + // Set primary basket + const rTokenSetup: IRTokenSetup = { + assets: [], + primaryBasket: [collateral.address, pairedColl.address], + weights: [fp('0.5e-4'), fp('0.5e-4')], + backups: [], + beneficiaries: [], + } + + // Deploy RToken via FacadeWrite + const receipt = await ( + await facadeWrite.connect(owner).deployRToken( + { + name: 'RTKN RToken', + symbol: 'RTKN', + mandate: 'mandate', + params: config, + }, + rTokenSetup + ) + ).wait() + + // Get Main + const mainAddr = expectInIndirectReceipt(receipt, deployer.interface, 'RTokenCreated').args + .main + main = await ethers.getContractAt('TestIMain', mainAddr) + + // Get core contracts + assetRegistry = ( + await ethers.getContractAt('IAssetRegistry', await main.assetRegistry()) + ) + backingManager = ( + await ethers.getContractAt('TestIBackingManager', await main.backingManager()) + ) + basketHandler = ( + await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) + ) + rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) + rTokenTrader = ( + await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) + ) + + // Set initial governance roles + govRoles = { + owner: owner.address, + guardian: ZERO_ADDRESS, + pausers: [], + shortFreezers: [], + longFreezers: [], + } + // Setup owner and unpause + await facadeWrite.connect(owner).setupGovernance( + rToken.address, + false, // do not deploy governance + true, // unpaused + govParams, // mock values, not relevant + govRoles + ) + + // Advance past warmup period + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) + ) + + // Should issue + await collateralERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await pairedERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await rToken.connect(addr1).issue(supply) + }) + + it('can be put into an RToken basket', async () => { + await assetRegistry.refresh() + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + }) + + it('issues', async () => { + // Issuance in beforeEach + expect(await rToken.totalSupply()).to.equal(supply) + }) + + it('redeems', async () => { + await rToken.connect(addr1).redeem(supply) + expect(await rToken.totalSupply()).to.equal(0) + const initialCollBal = toBNDecimals(fp('1'), await collateralERC20.decimals()) + expect(await collateralERC20.balanceOf(addr1.address)).to.be.closeTo( + initialCollBal, + initialCollBal.div(bn('1e5')) // 1-part-in-100k + ) + }) + + it('rebalances out of the collateral', async () => { + // Remove collateral from basket + await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) + await expect(basketHandler.connect(owner).refreshBasket()) + .to.emit(basketHandler, 'BasketSet') + .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() + ) + + // Run rebalancing auction + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) + .to.emit(backingManager, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, pairedERC20.address, anyValue, anyValue) + const tradeAddr = await backingManager.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(pairedERC20.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await pairedERC20.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + const pairedBal = await pairedERC20.balanceOf(backingManager.address) + await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) + expect(await backingManager.tradesOpen()).to.equal(0) + }) + + it('forwards revenue and sells in a revenue auction', async () => { + // Send excess collateral to the RToken trader via forwardRevenue() + const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) + await mintCollateralTo( + ctx, + mintAmt.gt('150') ? mintAmt : bn('150'), + addr1, + backingManager.address + ) + await backingManager.forwardRevenue([collateralERC20.address]) + expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) + + // Run revenue auction + await expect( + rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) + ) + .to.emit(rTokenTrader, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) + const tradeAddr = await rTokenTrader.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(rToken.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await rToken.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') + expect(await rTokenTrader.tradesOpen()).to.equal(0) + }) + + // === Integration Test Helpers === + + const makePairedCollateral = async (target: string): Promise => { + const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' + const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( + 'MockV3Aggregator' + ) + const chainlinkFeed: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + + if (target == ethers.utils.formatBytes32String('USD')) { + // USD + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + onBase ? networkConfig[chainId].tokens.USDbC! : networkConfig[chainId].tokens.USDC! + ) + const whale = onBase + ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' + : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' + await whileImpersonating(whale, async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'FiatCollateral' + ) + return await FiatCollateralFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }) + } else if (target == ethers.utils.formatBytes32String('ETH')) { + // ETH + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WETH! + ) + const whale = onBase + ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' + : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' + await whileImpersonating(whale, async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const SelfReferentialFactory: ContractFactory = await ethers.getContractFactory( + 'SelfReferentialCollateral' + ) + return await SelfReferentialFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0'), // 0% + delayUntilDefault: bn('0'), // 0, + }) + } else if (target == ethers.utils.formatBytes32String('BTC')) { + // No official WBTC on base yet + if (onBase) throw new Error('no WBTC on base') + // BTC + const targetUnitOracle: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WBTC! + ) + await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const NonFiatFactory: ContractFactory = await ethers.getContractFactory( + 'NonFiatCollateral' + ) + return await NonFiatFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + } else { + throw new Error(`Unknown target: ${target}`) + } + } + }) }) } diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 3f9628fc7c..cd7d2d4e69 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -4,29 +4,67 @@ import { CurveCollateralTestSuiteFixtures, } from './pluginTestTypes' import { CollateralStatus } from '../pluginTestTypes' -import { ethers } from 'hardhat' -import { ERC20Mock, InvalidMockV3Aggregator } from '../../../../typechain' -import { BigNumber } from 'ethers' -import { bn, fp } from '../../../../common/numbers' -import { MAX_UINT48, MAX_UINT192, ZERO_ADDRESS, ONE_ADDRESS } from '../../../../common/constants' +import hre, { ethers } from 'hardhat' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { BigNumber, ContractFactory } from 'ethers' +import { getChainId } from '../../../../common/blockchain-utils' +import { bn, fp, toBNDecimals } from '../../../../common/numbers' +import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { expectInIndirectReceipt } from '../../../../common/events' +import { whileImpersonating } from '../../../utils/impersonation' +import { + MAX_UINT48, + MAX_UINT192, + MAX_UINT256, + TradeKind, + ZERO_ADDRESS, + ONE_ADDRESS, +} from '../../../../common/constants' import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { useEnv } from '#/utils/env' import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../utils/oracles' +import { + IGovParams, + IGovRoles, + IRTokenSetup, + networkConfig, +} from '../../../../common/configuration' import { advanceBlocks, advanceTime, + getLatestBlockNumber, getLatestBlockTimestamp, setNextBlockTimestamp, } from '#/test/utils/time' +import { + ERC20Mock, + FacadeWrite, + IAssetRegistry, + IERC20Metadata, + InvalidMockV3Aggregator, + MockV3Aggregator, + TestIBackingManager, + TestIBasketHandler, + TestICollateral, + TestIDeployer, + TestIMain, + TestIRevenueTrader, + TestIRToken, +} from '../../../../typechain' import snapshotGasCost from '../../../utils/snapshotGasCost' -import { IMPLEMENTATION, Implementation } from '../../../fixtures' +import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../../../fixtures' const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip const describeFork = useEnv('FORK') ? describe : describe.skip +const getDescribeFork = (targetNetwork = 'mainnet') => { + return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip +} + export default function fn( fixtures: CurveCollateralTestSuiteFixtures ) { @@ -735,5 +773,360 @@ export default function fn( }) }) }) + + // Only run full protocol integration tests on mainnet + // Protocol integration fixture not currently set up to deploy onto base + getDescribeFork('mainnet')('integration tests', () => { + before(resetFork) + + let ctx: X + let owner: SignerWithAddress + let addr1: SignerWithAddress + + let chainId: number + + let defaultFixture: Fixture + + let supply: BigNumber + + // Tokens/Assets + let pairedColl: TestICollateral + let pairedERC20: ERC20Mock + let collateralERC20: IERC20Metadata + let collateral: TestICollateral + + // Core Contracts + let main: TestIMain + let rToken: TestIRToken + let assetRegistry: IAssetRegistry + let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler + let rTokenTrader: TestIRevenueTrader + + let deployer: TestIDeployer + let facadeWrite: FacadeWrite + let govParams: IGovParams + let govRoles: IGovRoles + + const config = { + dist: { + rTokenDist: bn(100), // 100% RToken + rsrDist: bn(0), // 0% RSR + }, + minTradeVolume: bn('0'), // $0 + rTokenMaxTradeVolume: MAX_UINT192, // +inf + shortFreeze: bn('259200'), // 3 days + longFreeze: bn('2592000'), // 30 days + rewardRatio: bn('1069671574938'), // approx. half life of 90 days + unstakingDelay: bn('1209600'), // 2 weeks + withdrawalLeak: fp('0'), // 0%; always refresh + warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) + tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) + batchAuctionLength: bn('900'), // 15 minutes + dutchAuctionLength: bn('1800'), // 30 minutes + backingBuffer: fp('0'), // 0% + maxTradeSlippage: fp('0.01'), // 1% + issuanceThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + redemptionThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + } + + interface IntegrationFixture { + ctx: X + protocol: DefaultFixture + } + + const integrationFixture: Fixture = + async function (): Promise { + return { + ctx: await loadFixture( + makeCollateralFixtureContext(owner, { maxTradeVolume: MAX_UINT192 }) + ), + protocol: await loadFixture(defaultFixture), + } + } + + before(async () => { + defaultFixture = await getDefaultFixture(collateralName) + chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + ;[, owner, addr1] = await ethers.getSigners() + }) + + beforeEach(async () => { + let protocol: DefaultFixture + ;({ ctx, protocol } = await loadFixture(integrationFixture)) + ;({ collateral } = ctx) + ;({ deployer, facadeWrite, govParams } = protocol) + + supply = fp('1') + + // Create a paired collateral of the same targetName + pairedColl = await makePairedCollateral(await collateral.targetName()) + await pairedColl.refresh() + expect(await pairedColl.status()).to.equal(CollateralStatus.SOUND) + pairedERC20 = await ethers.getContractAt('ERC20Mock', await pairedColl.erc20()) + + // Prep collateral + collateralERC20 = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + await mintCollateralTo( + ctx, + toBNDecimals(fp('1'), await collateralERC20.decimals()), + addr1, + addr1.address + ) + + // Set primary basket + const rTokenSetup: IRTokenSetup = { + assets: [], + primaryBasket: [collateral.address, pairedColl.address], + weights: [fp('0.5e-4'), fp('0.5e-4')], + backups: [], + beneficiaries: [], + } + + // Deploy RToken via FacadeWrite + const receipt = await ( + await facadeWrite.connect(owner).deployRToken( + { + name: 'RTKN RToken', + symbol: 'RTKN', + mandate: 'mandate', + params: config, + }, + rTokenSetup + ) + ).wait() + + // Get Main + const mainAddr = expectInIndirectReceipt(receipt, deployer.interface, 'RTokenCreated').args + .main + main = await ethers.getContractAt('TestIMain', mainAddr) + + // Get core contracts + assetRegistry = ( + await ethers.getContractAt('IAssetRegistry', await main.assetRegistry()) + ) + backingManager = ( + await ethers.getContractAt('TestIBackingManager', await main.backingManager()) + ) + basketHandler = ( + await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) + ) + rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) + rTokenTrader = ( + await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) + ) + + // Set initial governance roles + govRoles = { + owner: owner.address, + guardian: ZERO_ADDRESS, + pausers: [], + shortFreezers: [], + longFreezers: [], + } + // Setup owner and unpause + await facadeWrite.connect(owner).setupGovernance( + rToken.address, + false, // do not deploy governance + true, // unpaused + govParams, // mock values, not relevant + govRoles + ) + + // Advance past warmup period + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) + ) + + // Should issue + await collateralERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await pairedERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await rToken.connect(addr1).issue(supply) + }) + + it('can be put into an RToken basket', async () => { + await assetRegistry.refresh() + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + }) + + it('issues', async () => { + // Issuance in beforeEach + expect(await rToken.totalSupply()).to.equal(supply) + }) + + it('redeems', async () => { + await rToken.connect(addr1).redeem(supply) + expect(await rToken.totalSupply()).to.equal(0) + const initialCollBal = toBNDecimals(fp('1'), await collateralERC20.decimals()) + expect(await collateralERC20.balanceOf(addr1.address)).to.be.closeTo( + initialCollBal, + initialCollBal.div(bn('1e5')) // 1-part-in-100k + ) + }) + + it('rebalances out of the collateral', async () => { + // Remove collateral from basket + await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) + await expect(basketHandler.connect(owner).refreshBasket()) + .to.emit(basketHandler, 'BasketSet') + .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() + ) + + // Run rebalancing auction + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) + .to.emit(backingManager, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, pairedERC20.address, anyValue, anyValue) + const tradeAddr = await backingManager.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(pairedERC20.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await pairedERC20.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + const pairedBal = await pairedERC20.balanceOf(backingManager.address) + await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) + expect(await backingManager.tradesOpen()).to.equal(0) + }) + + it('forwards revenue and sells in a revenue auction', async () => { + // Send excess collateral to the RToken trader via forwardRevenue() + const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) + await mintCollateralTo( + ctx, + mintAmt.gt('150') ? mintAmt : bn('150'), + addr1, + backingManager.address + ) + await backingManager.forwardRevenue([collateralERC20.address]) + expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) + + // Run revenue auction + await expect( + rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) + ) + .to.emit(rTokenTrader, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) + const tradeAddr = await rTokenTrader.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(rToken.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await rToken.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') + expect(await rTokenTrader.tradesOpen()).to.equal(0) + }) + + // === Integration Test Helpers === + + const makePairedCollateral = async (target: string): Promise => { + const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( + 'MockV3Aggregator' + ) + const chainlinkFeed: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + + if (target == ethers.utils.formatBytes32String('USD')) { + // USD + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.USDC! + ) + await whileImpersonating('0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'FiatCollateral' + ) + return await FiatCollateralFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }) + } else if (target == ethers.utils.formatBytes32String('ETH')) { + // ETH + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WETH! + ) + await whileImpersonating('0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const SelfReferentialFactory: ContractFactory = await ethers.getContractFactory( + 'SelfReferentialCollateral' + ) + return await SelfReferentialFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0'), // 0% + delayUntilDefault: bn('0'), // 0, + }) + } else if (target == ethers.utils.formatBytes32String('BTC')) { + // BTC + const targetUnitOracle: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WBTC! + ) + await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const NonFiatFactory: ContractFactory = await ethers.getContractFactory( + 'NonFiatCollateral' + ) + return await NonFiatFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + } else { + throw new Error(`Unknown target: ${target}`) + } + } + }) }) } diff --git a/test/plugins/individual-collateral/fixtures.ts b/test/plugins/individual-collateral/fixtures.ts index 19897cfd91..ae2e4a6da3 100644 --- a/test/plugins/individual-collateral/fixtures.ts +++ b/test/plugins/individual-collateral/fixtures.ts @@ -3,6 +3,7 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' import { IImplementations, IGovParams, networkConfig } from '../../../common/configuration' import { bn, fp } from '../../../common/numbers' +import { useEnv } from '#/utils/env' import { Implementation, IMPLEMENTATION, ORACLE_ERROR, PRICE_TIMEOUT } from '../../fixtures' import { Asset, @@ -41,8 +42,7 @@ interface RSRFixture { rsr: ERC20Mock } -async function rsrFixture(): Promise { - const chainId = await getChainId(hre) +async function rsrFixture(chainId: number): Promise { const rsr: ERC20Mock = ( await ethers.getContractAt('ERC20Mock', networkConfig[chainId].tokens.RSR || '') ) @@ -74,9 +74,10 @@ export interface DefaultFixture extends RSRAndModuleFixture { export const getDefaultFixture = async function (salt: string) { const defaultFixture: Fixture = async function (): Promise { - const { rsr } = await rsrFixture() + let chainId = await getChainId(hre) + if (useEnv('FORK_NETWORK').toLowerCase() == 'base') chainId = 8453 + const { rsr } = await rsrFixture(chainId) const { gnosis } = await gnosisFixture() - const chainId = await getChainId(hre) if (!networkConfig[chainId]) { throw new Error(`Missing network configuration for ${hre.network.name}`) } From 64684ff726478884c6c92385780b44f49c1a78d0 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 1 Nov 2023 18:19:31 -0300 Subject: [PATCH 129/450] TRUST M-8: Reward distribution in `RewardableERC20` (#994) Co-authored-by: Taylor Brent --- .../plugins/assets/erc20/RewardableERC20.sol | 26 +- test/plugins/RewardableERC20.test.ts | 240 ++++++++++++++++-- 2 files changed, 229 insertions(+), 37 deletions(-) diff --git a/contracts/plugins/assets/erc20/RewardableERC20.sol b/contracts/plugins/assets/erc20/RewardableERC20.sol index 58fd23855c..ed3d39de15 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20.sol @@ -7,6 +7,8 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../../interfaces/IRewardable.sol"; +uint256 constant SHARE_DECIMAL_OFFSET = 9; // to prevent reward rounding issues + /** * @title RewardableERC20 * @notice An abstract class that can be extended to create rewardable wrapper. @@ -19,11 +21,11 @@ import "../../../interfaces/IRewardable.sol"; abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { using SafeERC20 for IERC20; - uint256 public immutable one; // {qShare/share} + uint256 public immutable one; // 1e9 * {qShare/share} IERC20 public immutable rewardToken; - uint256 public rewardsPerShare; // {qRewards/share} - mapping(address => uint256) public lastRewardsPerShare; // {qRewards/share} + uint256 public rewardsPerShare; // 1e9 * {qRewards/share} + mapping(address => uint256) public lastRewardsPerShare; // 1e9 * {qRewards/share} mapping(address => uint256) public accumulatedRewards; // {qRewards} mapping(address => uint256) public claimedRewards; // {qRewards} @@ -35,7 +37,8 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { /// @dev Extending class must ensure ERC20 constructor is called constructor(IERC20 _rewardToken, uint8 _decimals) { rewardToken = _rewardToken; - one = 10**_decimals; // set via pass-in to prevent inheritance issues + // set via pass-in to prevent inheritance issues + one = 10**(_decimals + SHARE_DECIMAL_OFFSET); } function claimRewards() external nonReentrant { @@ -47,7 +50,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { function _syncAccount(address account) internal { if (account == address(0)) return; - // {qRewards/share} + // 1e9 * {qRewards/share} uint256 accountRewardsPerShare = lastRewardsPerShare[account]; // {qShare} @@ -56,13 +59,13 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { // {qRewards} uint256 _accumulatedRewards = accumulatedRewards[account]; - // {qRewards/share} + // 1e9 * {qRewards/share} uint256 _rewardsPerShare = rewardsPerShare; if (accountRewardsPerShare < _rewardsPerShare) { - // {qRewards/share} + // 1e9 * {qRewards/share} uint256 delta = _rewardsPerShare - accountRewardsPerShare; - // {qRewards} = {qRewards/share} * {qShare} + // {qRewards} = (1e9 * {qRewards/share}) * {qShare} / (1e9 * {qShare/share}) _accumulatedRewards += (delta * shares) / one; } lastRewardsPerShare[account] = _rewardsPerShare; @@ -81,12 +84,15 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { uint256 _previousBalance = lastRewardBalance; if (balanceAfterClaimingRewards > _previousBalance) { - uint256 delta = balanceAfterClaimingRewards - _previousBalance; + uint256 delta = balanceAfterClaimingRewards - _previousBalance; // {qRewards} + + // 1e9 * {qRewards/share} = {qRewards} * (1e9 * {qShare/share}) / {qShare} uint256 deltaPerShare = (delta * one) / _totalSupply; + // {qRewards} = {qRewards} + (1e9*(qRewards/share)) * {qShare} / (1e9*{qShare/share}) balanceAfterClaimingRewards = _previousBalance + (deltaPerShare * _totalSupply) / one; - // {qRewards/share} += {qRewards} * {qShare/share} / {qShare} + // 1e9 * {qRewards/share} += {qRewards} * (1e9*{qShare/share}) / {qShare} _rewardsPerShare += deltaPerShare; } diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index 55d71e5698..8fa3b241a7 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -18,6 +18,9 @@ import snapshotGasCost from '../utils/snapshotGasCost' import { formatUnits, parseUnits } from 'ethers/lib/utils' import { MAX_UINT256 } from '#/common/constants' +const SHARE_DECIMAL_OFFSET = 9 // decimals buffer for shares and rewards per share +const BN_SHARE_FACTOR = bn(10).pow(SHARE_DECIMAL_OFFSET) + type Fixture = () => Promise interface RewardableERC20Fixture { @@ -120,7 +123,7 @@ for (const wrapperName of wrapperNames) { describe(wrapperName, () => { // Decimals let shareDecimals: number - + let rewardShareDecimals: number // Assets let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest let rewardableAsset: ERC20MockRewarding @@ -132,7 +135,7 @@ for (const wrapperName of wrapperNames) { let bob: Wallet const initBalance = parseUnits('10000', assetDecimals) - const rewardAmount = parseUnits('200', rewardDecimals) + let rewardAmount = parseUnits('200', rewardDecimals) let oneShare: BigNumber let initShares: BigNumber @@ -152,7 +155,8 @@ for (const wrapperName of wrapperNames) { await rewardableAsset.mint(bob.address, initBalance) await rewardableAsset.connect(bob).approve(rewardableVault.address, initBalance) - shareDecimals = await rewardableVault.decimals() + shareDecimals = (await rewardableVault.decimals()) + SHARE_DECIMAL_OFFSET + rewardShareDecimals = rewardDecimals + SHARE_DECIMAL_OFFSET initShares = toShares(initBalance, assetDecimals, shareDecimals) oneShare = bn('1').mul(bn(10).pow(shareDecimals)) }) @@ -185,7 +189,9 @@ for (const wrapperName of wrapperNames) { expect(await rewardableVault.lastRewardsPerShare(alice.address)).to.equal(bn(0)) await rewardToken.mint(rewardableVault.address, parseUnits('10', rewardDecimals)) await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) + expect(await rewardableVault.rewardsPerShare()).to.equal( + parseUnits('1', rewardShareDecimals) + ) }) it('correctly handles reward tracking if supply is burned', async () => { @@ -196,7 +202,9 @@ for (const wrapperName of wrapperNames) { expect(await rewardableVault.lastRewardsPerShare(alice.address)).to.equal(bn(0)) await rewardToken.mint(rewardableVault.address, parseUnits('10', rewardDecimals)) await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) + expect(await rewardableVault.rewardsPerShare()).to.equal( + parseUnits('1', rewardShareDecimals) + ) // Setting supply to 0 await withdrawAll(rewardableVault.connect(alice)) @@ -215,7 +223,9 @@ for (const wrapperName of wrapperNames) { // Nothing updates.. as totalSupply as totalSupply is 0 await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) + expect(await rewardableVault.rewardsPerShare()).to.equal( + parseUnits('1', rewardShareDecimals) + ) await rewardableVault .connect(alice) .deposit(parseUnits('10', assetDecimals), alice.address) @@ -280,7 +290,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.mul(3).div(8)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.mul(3).div(8).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -288,7 +300,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(8)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(8).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -297,7 +311,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -324,7 +340,9 @@ for (const wrapperName of wrapperNames) { it('alice shows correct lastRewardsPerShare', async () => { // rewards / alice's deposit - expect(initRewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(initRewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) expect(initRewardsPerShare).equal( await rewardableVault.lastRewardsPerShare(alice.address) ) @@ -335,6 +353,7 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) + .mul(BN_SHARE_FACTOR) expect(rewardsPerShare).equal(expectedRewardsPerShare) expect(rewardsPerShare).equal(await rewardableVault.lastRewardsPerShare(bob.address)) }) @@ -358,7 +377,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -399,7 +420,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -425,7 +448,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -434,7 +459,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -454,7 +481,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice has claimed rewards', async () => { @@ -466,7 +495,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(8)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(8).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -475,7 +506,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -501,7 +534,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice has claimed rewards', async () => { @@ -515,7 +550,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -532,6 +569,7 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) + .mul(BN_SHARE_FACTOR) expect(rewardsPerShare).equal(expectedRewardsPerShare) }) }) @@ -561,7 +599,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -573,7 +613,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -586,7 +628,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // (rewards / alice's deposit) + (rewards / bob's deposit) - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4)).mul(2)) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(2).mul(BN_SHARE_FACTOR) + ) }) }) @@ -597,7 +641,9 @@ for (const wrapperName of wrapperNames) { await rewardableVault.connect(alice).deposit(initBalance.div(4), alice.address) await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.connect(bob).deposit(initBalance.div(4), bob.address) - await rewardableVault.connect(alice).transfer(bob.address, initShares.div(4)) + await rewardableVault + .connect(alice) + .transfer(bob.address, initShares.div(4).div(BN_SHARE_FACTOR)) await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.connect(alice).deposit(initBalance.div(4), alice.address) await rewardableVault.connect(bob).claimRewards() @@ -607,7 +653,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -619,7 +667,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(2)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(2).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -637,6 +687,84 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) + .mul(BN_SHARE_FACTOR) + ) + }) + }) + + describe('correctly applies fractional reward tracking', () => { + rewardAmount = parseUnits('1.9', rewardDecimals) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Correctly handles fractional rewards', async () => { + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + + for (let i = 0; i < 10; i++) { + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + await rewardableVault.claimRewards() + expect(await rewardableVault.rewardsPerShare()).to.equal( + rewardAmount + .mul(i + 1) + .mul(oneShare) + .div(initShares) + .mul(BN_SHARE_FACTOR) + ) + } + }) + }) + + describe(`correctly rounds rewards`, () => { + // Assets + rewardAmount = parseUnits('1.7', rewardDecimals) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Avoids wrong distribution of rewards when rounding', async () => { + expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(0)) + expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(0)) + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + // alice deposit and accrue rewards + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + + // bob deposit + await rewardableVault.connect(bob).deposit(initBalance, bob.address) + + // accrue additional rewards (twice the amount) + await rewardableAsset.accrueRewards(rewardAmount.mul(2), rewardableVault.address) + + // claim all rewards + await rewardableVault.connect(bob).claimRewards() + await rewardableVault.connect(alice).claimRewards() + + // Alice got all first rewards plus half of the second + expect(await rewardToken.balanceOf(alice.address)).to.equal(rewardAmount.mul(2)) + + // Bob only got half of the second rewards + expect(await rewardToken.balanceOf(bob.address)).to.equal(rewardAmount) + + expect(await rewardableVault.rewardsPerShare()).equal( + rewardAmount.mul(2).mul(oneShare).div(initShares).mul(BN_SHARE_FACTOR) ) }) }) @@ -688,12 +816,70 @@ for (const wrapperName of wrapperNames) { for (let i = 0; i < 10; i++) { await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.claimRewards() - - expect(await rewardableVault.rewardsPerShare()).to.equal(Math.floor(1.9 * (i + 1))) + expect(await rewardableVault.rewardsPerShare()).to.equal( + bn(`1.9e${SHARE_DECIMAL_OFFSET}`).mul(i + 1) + ) } }) }) + describe(`${wrapperName.replace('Test', '')} Special Case: Rounding - Regression test`, () => { + // Assets + let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest + let rewardableAsset: ERC20MockRewarding + let rewardToken: ERC20MockDecimals + // Main + let alice: Wallet + let bob: Wallet + + const initBalance = parseUnits('1000000', 18) + const rewardAmount = parseUnits('1.7', 6) + + const fixture = getFixture(18, 6) + + before('load wallets', async () => { + ;[alice, bob] = (await ethers.getSigners()) as unknown as Wallet[] + }) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Avoids wrong distribution of rewards when rounding', async () => { + expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(0)) + expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(0)) + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + // alice deposit and accrue rewards + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + + // bob deposit + await rewardableVault.connect(bob).deposit(initBalance, bob.address) + + // accrue additional rewards (twice the amount) + await rewardableAsset.accrueRewards(rewardAmount.mul(2), rewardableVault.address) + + // claim all rewards + await rewardableVault.connect(bob).claimRewards() + await rewardableVault.connect(alice).claimRewards() + + // Alice got all first rewards plus half of the second + expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(3.4e6)) + + // Bob only got half of the second rewards + expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(1.7e6)) + + expect(await rewardableVault.rewardsPerShare()).to.equal(bn(`3.4e${SHARE_DECIMAL_OFFSET}`)) + }) + }) + const IMPLEMENTATION: Implementation = useEnv('PROTO_IMPL') == Implementation.P1.toString() ? Implementation.P1 : Implementation.P0 From 5a9069ec227446815c901a4fe517bfc51d8546c2 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Thu, 2 Nov 2023 11:18:54 -0400 Subject: [PATCH 130/450] deployed STG asset on Base (#996) --- common/configuration.ts | 1 + .../8453-tmp-assets-collateral.json | 12 ++-- scripts/deploy.ts | 4 +- .../phase2-assets/assets/deploy_stg.ts | 66 +++++++++++++++++++ scripts/verification/assets/verify_stg.ts | 45 +++++++++++++ scripts/verify_etherscan.ts | 4 +- 6 files changed, 126 insertions(+), 6 deletions(-) create mode 100644 scripts/deployment/phase2-assets/assets/deploy_stg.ts create mode 100644 scripts/verification/assets/verify_stg.ts diff --git a/common/configuration.ts b/common/configuration.ts index e6e1f846e3..2276396baf 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -543,6 +543,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { RSR: '0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1', // 2%, 24hr wstETHstETHexr: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061', // 0.5%, 24hr cbETHETHexr: '0x868a501e68F3D1E89CfC0D22F6b22E8dabce5F04', // 0.5%, 24hr + STG: '0x63Af8341b62E683B87bB540896bF283D96B4D385' }, GNOSIS_EASY_AUCTION: '0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02', // mock COMET_REWARDS: '0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1', diff --git a/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json index ec42edd113..9373fafb6b 100644 --- a/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json +++ b/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json @@ -1,6 +1,7 @@ { "assets": { - "COMP": "0x277FD5f51fE53a9B3707a0383bF930B149C74ABf" + "COMP": "0x277FD5f51fE53a9B3707a0383bF930B149C74ABf", + "STG": "0xf37adF141BD754e9C9E645de88bB28B5e4a6Db96" }, "collateral": { "DAI": "0x5EBE8927e5495e0A7731888C81AF463cD63602fb", @@ -8,7 +9,8 @@ "USDbC": "0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB", "cbETH": "0x5fE248625aC2AB0e17A115fef288f17AF1952402", "cUSDbCv3": "0xa372EC846131FBf9AE8b589efa3D041D9a94dF41", - "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b" + "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b", + "wsgUSDbC": "0x15395aCCbF8c6b28671fe41624D599624709a2D6" }, "erc20s": { "COMP": "0x9e1028F5F1D5eDE59748FFceE5532509976840E0", @@ -17,6 +19,8 @@ "USDbC": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", "cbETH": "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22", "cUSDbCv3": "0xbC0033679AEf41Fb9FeB553Fdf55a8Bb2fC5B29e", - "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b" + "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b", + "wsgUSDbC": "0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D", + "STG": "0xE3B53AF74a4BF62Ae5511055290838050bf764Df" } -} +} \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index db067c3362..37166ba82a 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -71,7 +71,9 @@ async function main() { 'phase2-assets/2_deploy_collateral.ts', 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts', - 'phase2-assets/collaterals/deploy_aave_v3_usdbc.ts' + 'phase2-assets/collaterals/deploy_aave_v3_usdbc.ts', + 'phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts', + 'phase2-assets/assets/deploy_stg.ts', ) } diff --git a/scripts/deployment/phase2-assets/assets/deploy_stg.ts b/scripts/deployment/phase2-assets/assets/deploy_stg.ts new file mode 100644 index 0000000000..98c81e2be1 --- /dev/null +++ b/scripts/deployment/phase2-assets/assets/deploy_stg.ts @@ -0,0 +1,66 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { + getDeploymentFile, + getDeploymentFilename, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + fileExists, +} from '../../../deployment/common' +import { priceTimeout, oracleTimeout } from '../../../deployment/utils' +import { Asset } from '../../../../typechain' + +async function main() { + // ==== Read Configuration ==== + const [burner] = await hre.ethers.getSigners() + const chainId = await getChainId(hre) + + console.log(`Deploying STG asset to network ${hre.network.name} (${chainId}) + with burner account: ${burner.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedAssets: string[] = [] + + /******** Deploy STG asset **************************/ + const { asset: stgAsset } = await hre.run('deploy-asset', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.STG, + oracleError: fp('0.02').toString(), // 2% + tokenAddress: networkConfig[chainId].tokens.STG, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + }) + await (await ethers.getContractAt('Asset', stgAsset)).refresh() + + assetCollDeployments.assets.STG = stgAsset + assetCollDeployments.erc20s.STG = networkConfig[chainId].tokens.STG + deployedAssets.push(stgAsset.toString()) + + /**************************************************************/ + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed STG asset to ${hre.network.name} (${chainId}): + New deployments: ${deployedAssets} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/assets/verify_stg.ts b/scripts/verification/assets/verify_stg.ts new file mode 100644 index 0000000000..794d417834 --- /dev/null +++ b/scripts/verification/assets/verify_stg.ts @@ -0,0 +1,45 @@ +import hre from 'hardhat' + +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { getAssetCollDeploymentFilename, getDeploymentFile, getDeploymentFilename, IAssetCollDeployments, IDeployments } from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { fp } from '../../../common/numbers' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + deployments = getDeploymentFile(getAssetCollDeploymentFilename(chainId)) + + const asset = await hre.ethers.getContractAt('Asset', deployments.assets.STG!) + + /** ******************** Verify RSR Asset ****************************************/ + await verifyContract( + chainId, + deployments.assets.STG, + [ + (await asset.priceTimeout()).toString(), + await asset.chainlinkFeed(), + fp('0.02').toString(), + await asset.erc20(), + (await asset.maxTradeVolume()).toString(), + (await asset.oracleTimeout()).toString(), + ], + 'contracts/plugins/assets/Asset.sol:Asset' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index b32aac2776..f9b9d28265 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -68,7 +68,9 @@ async function main() { scripts.push( 'collateral-plugins/verify_cbeth.ts', 'collateral-plugins/verify_cusdbcv3.ts', - 'collateral-plugins/verify_aave_v3_usdbc' + 'collateral-plugins/verify_aave_v3_usdbc', + 'collateral-plugins/verify_stargate_usdc', + 'assets/verify_stg.ts' ) } From d9949341184a50e2e6e3a0085d2da18a62ed57b0 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 2 Nov 2023 12:24:13 -0300 Subject: [PATCH 131/450] TRUST L-8: Fix reverts due to rounding in CusdcWrapper (#1005) --- .../assets/compoundv3/CusdcV3Wrapper.sol | 3 ++ .../compoundv3/CusdcV3Wrapper.test.ts | 38 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 3706d9d339..e07b30d5f3 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -203,6 +203,9 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { rewardsClaimed[src] = accrued; rewardsAddr.claimTo(address(underlyingComet), address(this), address(this), true); + + uint256 bal = IERC20(rewardERC20).balanceOf(address(this)); + if (owed > bal) owed = bal; IERC20(rewardERC20).safeTransfer(dst, owed); } emit RewardsClaimed(rewardERC20, owed); diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index 7a1babf104..a7e8ca20d1 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -642,6 +642,44 @@ describeFork('Wrapped CUSDCv3', () => { expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(0) }) + it('caps at balance to avoid reverts when claiming rewards (claimTo)', async () => { + const compToken = await ethers.getContractAt('ERC20Mock', COMP) + expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) + await advanceTime(1000) + await enableRewardsAccrual(cusdcV3) + + // Accrue multiple times + for (let i = 0; i < 10; i++) { + await advanceTime(1000) + await wcusdcV3.accrue() + } + + // Get rewards from Comet + const cometRewards = await ethers.getContractAt('ICometRewards', REWARDS) + await whileImpersonating(wcusdcV3.address, async (signer) => { + await cometRewards + .connect(signer) + .claimTo(cusdcV3.address, wcusdcV3.address, wcusdcV3.address, true) + }) + + // Accrue individual account + await wcusdcV3.accrueAccount(bob.address) + + // Due to rounding, balance is smaller that owed + const owed = await wcusdcV3.getRewardOwed(bob.address) + const bal = await compToken.balanceOf(wcusdcV3.address) + expect(owed).to.be.greaterThan(bal) + + // Should still be able to claimTo (caps at balance) + const balanceBobPrev = await compToken.balanceOf(bob.address) + await expect(wcusdcV3.connect(bob).claimTo(bob.address, bob.address)).to.emit( + wcusdcV3, + 'RewardsClaimed' + ) + + expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(balanceBobPrev) + }) + it('claims rewards and sends to claimer (claimRewards)', async () => { const compToken = await ethers.getContractAt('ERC20Mock', COMP) expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) From 92fbdecf95865051047737f1c9a364f98c20633b Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 2 Nov 2023 14:45:50 -0300 Subject: [PATCH 132/450] TRUST M-9: pegprice in `frxETH` (#1006) --- contracts/plugins/assets/frax-eth/README.md | 2 +- .../plugins/assets/frax-eth/SFraxEthCollateral.sol | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 4e95c0a05a..7d32cc254a 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -34,4 +34,4 @@ This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](h #### tryPrice -This function uses `refPerTok`, the chainlink price of `ETH/frxETH`, and the chainlink price of `USD/ETH` to return the current price range of the collateral. +This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index c318a047e3..c3dbe91379 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -7,6 +7,12 @@ import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; import "./vendor/IsfrxEth.sol"; +/** + * ************************************************************ + * WARNING: this plugin is not ready to be used in Production + * ************************************************************ + */ + /** * @title SFraxEthCollateral * @notice Collateral plugin for Frax-ETH, @@ -32,7 +38,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return pegPrice {target/ref} The actual price observed in the peg + /// @return pegPrice {target/ref} FIX_ONE until an oracle becomes available function tryPrice() external view @@ -51,6 +57,8 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { high = p + err; // assert(low <= high); obviously true just by inspection + // TODO: Currently not checking for depegs between `frxETH` and `ETH` + // Should be modified to use a `frxETH/ETH` oracle when available pegPrice = targetPerRef(); } From bc41785581de71766a10aa9cac8f69ffe7ff90b0 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 2 Nov 2023 15:23:48 -0300 Subject: [PATCH 133/450] TRUST H-4: Single reward token (#1007) --- contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol | 4 ++++ contracts/plugins/assets/erc20/RewardableERC20.sol | 2 ++ 2 files changed, 6 insertions(+) diff --git a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol index 4d712ac720..19da4303f8 100644 --- a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol +++ b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol @@ -16,6 +16,9 @@ interface ILiquidityGauge { function withdraw(uint256 _value) external; } +// Note: Only supports CRV rewards. If a Curve pool with multiple reward tokens is +// used, other reward tokens beyond CRV will never be claimed and distributed to +// depositors. These unclaimed rewards will be lost forever. contract CurveGaugeWrapper is RewardableERC20Wrapper { using SafeERC20 for IERC20; @@ -45,6 +48,7 @@ contract CurveGaugeWrapper is RewardableERC20Wrapper { gauge.withdraw(_amount); } + // claim rewards - only supports CRV rewards function _claimAssetRewards() internal virtual override { MINTER.mint(address(gauge)); } diff --git a/contracts/plugins/assets/erc20/RewardableERC20.sol b/contracts/plugins/assets/erc20/RewardableERC20.sol index ed3d39de15..848ecfdf2d 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20.sol @@ -14,6 +14,7 @@ uint256 constant SHARE_DECIMAL_OFFSET = 9; // to prevent reward rounding issues * @notice An abstract class that can be extended to create rewardable wrapper. * @notice `_claimAssetRewards` keeps tracks of rewards by snapshotting the balance * and calculating the difference between the current balance and the previous balance. + * Limitation: Currently supports only one single reward token. * @dev To inherit: * - override _claimAssetRewards() * - call ERC20 constructor elsewhere during construction @@ -41,6 +42,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { one = 10**(_decimals + SHARE_DECIMAL_OFFSET); } + // claim rewards - Only supports one single reward token function claimRewards() external nonReentrant { _claimAndSyncRewards(); _syncAccount(msg.sender); From 5dadd2c0e86a864933cc86f9c0d79955eecc3735 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 8 Nov 2023 11:32:30 -0500 Subject: [PATCH 134/450] sFrax collateral impl + tests (#1009) --- common/configuration.ts | 15 +- contracts/plugins/assets/frax/README.md | 33 +++ .../plugins/assets/frax/SFraxCollateral.sol | 38 ++++ .../frax/SFraxCollateralTestSuite.test.ts | 206 ++++++++++++++++++ .../individual-collateral/frax/constants.ts | 17 ++ .../individual-collateral/frax/helpers.ts | 13 ++ 6 files changed, 316 insertions(+), 6 deletions(-) create mode 100644 contracts/plugins/assets/frax/README.md create mode 100644 contracts/plugins/assets/frax/SFraxCollateral.sol create mode 100644 test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts create mode 100644 test/plugins/individual-collateral/frax/constants.ts create mode 100644 test/plugins/individual-collateral/frax/helpers.ts diff --git a/common/configuration.ts b/common/configuration.ts index 2276396baf..2cc32f07f0 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -58,6 +58,7 @@ export interface ITokens { cUSDCv3?: string cUSDbCv3?: string ONDO?: string + sFRAX?: string sDAI?: string cbETH?: string STG?: string @@ -177,6 +178,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', + sFRAX: '0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32', sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', cbETH: '0xBe9895146f7AF43049ca1c1AE358B0541Ea49704', STG: '0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6', @@ -228,7 +230,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', - STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' + STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', }, '1': { name: 'mainnet', @@ -279,6 +281,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', + sFRAX: '0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32', sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', cbETH: '0xBe9895146f7AF43049ca1c1AE358B0541Ea49704', STG: '0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6', @@ -327,7 +330,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', - STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' + STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', }, '3': { name: 'tenderly', @@ -426,7 +429,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', - STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' + STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', }, '5': { name: 'goerli', @@ -530,7 +533,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', - STG: '0xE3B53AF74a4BF62Ae5511055290838050bf764Df' + STG: '0xE3B53AF74a4BF62Ae5511055290838050bf764Df', }, chainlinkFeeds: { DAI: '0x591e79239a7d679378ec8c847e5038150364c78f', // 0.3%, 24hr @@ -543,7 +546,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { RSR: '0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1', // 2%, 24hr wstETHstETHexr: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061', // 0.5%, 24hr cbETHETHexr: '0x868a501e68F3D1E89CfC0D22F6b22E8dabce5F04', // 0.5%, 24hr - STG: '0x63Af8341b62E683B87bB540896bF283D96B4D385' + STG: '0x63Af8341b62E683B87bB540896bF283D96B4D385', }, GNOSIS_EASY_AUCTION: '0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02', // mock COMET_REWARDS: '0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1', @@ -552,7 +555,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_EXT: '0x2F9E3953b2Ef89fA265f2a32ed9F80D00229125B', AAVE_V3_POOL: '0xA238Dd80C259a72e81d7e4664a9801593F98d1c5', AAVE_V3_INCENTIVES_CONTROLLER: '0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44', - STARGATE_STAKING_CONTRACT: '0x06Eb48763f117c7Be887296CDcdfad2E4092739C' + STARGATE_STAKING_CONTRACT: '0x06Eb48763f117c7Be887296CDcdfad2E4092739C', }, } diff --git a/contracts/plugins/assets/frax/README.md b/contracts/plugins/assets/frax/README.md new file mode 100644 index 0000000000..12c973fdb2 --- /dev/null +++ b/contracts/plugins/assets/frax/README.md @@ -0,0 +1,33 @@ +# Staked FRAX (sFRAX) Collateral Plugin + +## Summary + +This plugin allows `sFRAX` holders to use their tokens as collateral in the Reserve Protocol. + +sFRAX is a non-upgradeable ERC4626 vault that earns the user the right to an increasing quantity of FRAX over time. The income stream is administered through a timelock + multisig. The only control the timelock has over the vault is the ability to change the rate of interest accrual. At all times `sFRAX` can be redeemed for a prorata portion of the held `FRAX`. + +The timelock + multisig targets a rate of appreciation for `sFRAX` equal to the IORB, or the FED's **interest rate on reserve balances**. In the background, an AMO puts FRAX to work in defi in order to try to cover as much of the interest as possible. Any interest that is not found defi is covered by FXS. If the frax protocol were unable to make good on the targeted IORB rate, they would either have to drop the `sFRAX` yield or risk de-pegging FRAX, which would begin to be become undercollateralized. + +Since it is ERC4626, the redeemable FRAX amount can be gotten by dividing `sFRAX.totalAssets()` by `sFRAX.totalSupply()`. + +No function needs be called in order to update `refPerTok()`. `totalAssets()` is already a function of the block timestamp and increases as time passes. + +We can use 0 revenue hiding since the vault correctly rounds defensively in favor of `sFRAX` holders during deposit/withdrawal (thx t11s). + +No rewards other than the ever-increasing exchange rate. + +`sFRAX` contract: + +## Implementation + +### Units + +| tok | ref | target | UoA | +| ----- | ---- | ------ | --- | +| sFRAX | FRAX | USD | USD | + +### Functions + +#### refPerTok {ref/tok} + +`return divuu(IStakedFrax(address(erc20)).totalAssets(), IStakedFrax(address(erc20)).totalSupply());` diff --git a/contracts/plugins/assets/frax/SFraxCollateral.sol b/contracts/plugins/assets/frax/SFraxCollateral.sol new file mode 100644 index 0000000000..90b7331815 --- /dev/null +++ b/contracts/plugins/assets/frax/SFraxCollateral.sol @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../../libraries/Fixed.sol"; +import "../../../vendor/oz/IERC4626.sol"; +import "../AppreciatingFiatCollateral.sol"; + +interface IStakedFrax is IERC4626 { + function syncRewardsAndDistribution() external; +} + +/** + * @title sFRAX Collateral + * @notice Collateral plugin for staked FRAX (sFRAX) + * tok = sFRAX (ERC4626 vault) + * ref = FRAX + * tar = USD + * UoA = USD + */ +contract SFraxCollateral is AppreciatingFiatCollateral { + // solhint-disable no-empty-blocks + + /// @param config.chainlinkFeed {UoA/ref} price of DAI in USD terms + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + {} + + // solhint-enable no-empty-blocks + + /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens + function _underlyingRefPerTok() internal view override returns (uint192) { + return + divuu( + IStakedFrax(address(erc20)).totalAssets(), + IStakedFrax(address(erc20)).totalSupply() + ); + } +} diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts new file mode 100644 index 0000000000..cf4038f9aa --- /dev/null +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -0,0 +1,206 @@ +import collateralTests from '../collateralTests' +import { setStorageAt, getStorageAt } from '@nomicfoundation/hardhat-network-helpers' +import { CollateralFixtureContext, CollateralOpts, MintCollateralFunc } from '../pluginTestTypes' +import { resetFork, mintSFrax } from './helpers' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { ContractFactory, BigNumberish, BigNumber } from 'ethers' +import { + ERC20Mock, + IERC20Metadata, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../typechain' +import { bn, fp } from '../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../common/constants' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + SFRAX, + ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + FRAX_USD_PRICE_FEED, +} from './constants' + +/* + Define deployment functions +*/ + +export const defaultSFraxCollateralOpts: CollateralOpts = { + erc20: SFRAX, + targetName: ethers.utils.formatBytes32String('USD'), + rewardERC20: ZERO_ADDRESS, + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: FRAX_USD_PRICE_FEED, + oracleTimeout: ORACLE_TIMEOUT, + oracleError: ORACLE_ERROR, + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: fp('0'), +} + +export const deployCollateral = async (opts: CollateralOpts = {}): Promise => { + opts = { ...defaultSFraxCollateralOpts, ...opts } + + const SFraxCollateralFactory: ContractFactory = await ethers.getContractFactory('SFraxCollateral') + const collateral = await SFraxCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { gasLimit: 2000000000 } + ) + await collateral.deployed() + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return collateral +} + +const chainlinkDefaultAnswer = bn('1e8') + +type Fixture = () => Promise + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultSFraxCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, chainlinkDefaultAnswer) + ) + collateralOpts.chainlinkFeed = chainlinkFeed.address + + const sfrax = (await ethers.getContractAt('IERC20Metadata', SFRAX)) as IERC20Metadata + const rewardToken = (await ethers.getContractAt('ERC20Mock', ZERO_ADDRESS)) as ERC20Mock + const collateral = await deployCollateral(collateralOpts) + const tok = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + + return { + alice, + collateral, + chainlinkFeed, + tok, + sfrax, + rewardToken, + } + } + + return makeCollateralFixtureContext +} + +const mintCollateralTo: MintCollateralFunc = async ( + ctx: CollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintSFrax(ctx.tok, amount, recipient) +} + +const reduceTargetPerRef = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +const increaseTargetPerRef = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +// prettier-ignore +const reduceRefPerTok = async ( + ctx: CollateralFixtureContext, + pctDecrease: BigNumberish +) => { + const storedTotalAssets = BigNumber.from(await getStorageAt(ctx.tok.address, 9)) + const newStoredTotalAssets = storedTotalAssets.sub(storedTotalAssets.mul(pctDecrease).div(100)) + await setStorageAt(ctx.tok.address, 9, newStoredTotalAssets) +} + +// prettier-ignore +const increaseRefPerTok = async ( + ctx: CollateralFixtureContext, + pctIncrease: BigNumberish + +) => { + const storedTotalAssets = BigNumber.from(await getStorageAt(ctx.tok.address, 9)) + const newStoredTotalAssets = storedTotalAssets.add(storedTotalAssets.mul(pctIncrease).div(100)) + await setStorageAt(ctx.tok.address, 9, newStoredTotalAssets) +} + +const getExpectedPrice = async (ctx: CollateralFixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() + + const refPerTok = await ctx.collateral.refPerTok() + return clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(refPerTok) + .div(fp('1')) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const beforeEachRewardsTest = async () => {} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itHasRevenueHiding: it.skip, + resetFork, + collateralName: 'SFraxCollateral', + chainlinkDefaultAnswer, + itIsPricedByPeg: true, + toleranceDivisor: bn('1e8'), // 1-part in 100 million +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/frax/constants.ts b/test/plugins/individual-collateral/frax/constants.ts new file mode 100644 index 0000000000..a331f9492b --- /dev/null +++ b/test/plugins/individual-collateral/frax/constants.ts @@ -0,0 +1,17 @@ +import { bn, fp } from '../../../../common/numbers' +import { networkConfig } from '../../../../common/configuration' + +// Mainnet Addresses +export const FRAX_USD_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.FRAX as string +export const FRAX = networkConfig['31337'].tokens.FRAX as string +export const SFRAX = networkConfig['31337'].tokens.sFRAX as string +export const SFRAX_HOLDER = '0xC38744840abCe123608B6f79a8Ac7bAE2153194e' + +export const PRICE_TIMEOUT = bn('604800') // 1 week +export const ORACLE_TIMEOUT = bn(3600) // 1 hour in seconds +export const ORACLE_ERROR = fp('0.01') // 1% +export const DEFAULT_THRESHOLD = fp('0.02') +export const DELAY_UNTIL_DEFAULT = bn(86400) +export const MAX_TRADE_VOL = bn(1000) + +export const FORK_BLOCK = 18522901 diff --git a/test/plugins/individual-collateral/frax/helpers.ts b/test/plugins/individual-collateral/frax/helpers.ts new file mode 100644 index 0000000000..34664e3da9 --- /dev/null +++ b/test/plugins/individual-collateral/frax/helpers.ts @@ -0,0 +1,13 @@ +import { IERC20Metadata } from '../../../../typechain' +import { whileImpersonating } from '../../../utils/impersonation' +import { BigNumberish } from 'ethers' +import { FORK_BLOCK, SFRAX_HOLDER } from './constants' +import { getResetFork } from '../helpers' + +export const mintSFrax = async (sFrax: IERC20Metadata, amount: BigNumberish, recipient: string) => { + await whileImpersonating(SFRAX_HOLDER, async (whale) => { + await sFrax.connect(whale).transfer(recipient, amount) + }) +} + +export const resetFork = getResetFork(FORK_BLOCK) From 714de4d408d6145bf4807e7419a416e7f964ee81 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 8 Nov 2023 13:49:36 -0500 Subject: [PATCH 135/450] deployment + verification scripts for sFRAX (#1010) --- .github/workflows/tests.yml | 1 - scripts/deploy.ts | 7 +- .../phase2-assets/collaterals/deploy_sfrax.ts | 83 +++++++++++++++++++ .../collateral-plugins/verify_sfrax.ts | 53 ++++++++++++ scripts/verify_etherscan.ts | 5 +- test/integration/fork-block-numbers.ts | 2 +- 6 files changed, 144 insertions(+), 7 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts create mode 100644 scripts/verification/collateral-plugins/verify_sfrax.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 62e19d8665..8c1d16e8da 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -22,7 +22,6 @@ jobs: - run: yarn devchain & env: MAINNET_RPC_URL: https://mainnet.infura.io/v3/9aa3d95b3bc440fa88ea12eaa4456161 - FORK_BLOCK: 18329921 FORK_NETWORK: mainnet - run: yarn deploy:run --network localhost env: diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 37166ba82a..eb9d82f713 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -26,7 +26,7 @@ async function main() { // See `confirm.ts` for part 2 // Phase 1- Implementations - let scripts = [ + const scripts = [ 'phase1-common/0_setup_deployments.ts', 'phase1-common/1_deploy_libraries.ts', 'phase1-common/2_deploy_implementations.ts', @@ -61,7 +61,8 @@ async function main() { 'phase2-assets/collaterals/deploy_dsr_sdai.ts', 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts', - 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts' + 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', + 'phase2-assets/collaterals/deploy_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains @@ -73,7 +74,7 @@ async function main() { 'phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdbc.ts', 'phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts', - 'phase2-assets/assets/deploy_stg.ts', + 'phase2-assets/assets/deploy_stg.ts' ) } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts new file mode 100644 index 0000000000..1510377f20 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts @@ -0,0 +1,83 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout, oracleTimeout } from '../../utils' +import { SFraxCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy SFRAX Collateral - sFRAX **************************/ + + const SFraxCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'SFraxCollateral' + ) + + const collateral = await SFraxCollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.FRAX, + oracleError: fp('0.01').toString(), // 1% + erc20: networkConfig[chainId].tokens.sFRAX, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% = 1% oracleError + 1% buffer + delayUntilDefault: bn('86400').toString(), // 24h + }, + '0' // revenueHiding = 0 + ) + await collateral.deployed() + + console.log(`Deployed sFRAX to ${hre.network.name} (${chainId}): ${collateral.address}`) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.sFRAX = collateral.address + assetCollDeployments.erc20s.sFRAX = networkConfig[chainId].tokens.sFRAX + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_sfrax.ts b/scripts/verification/collateral-plugins/verify_sfrax.ts new file mode 100644 index 0000000000..5e4be4fc45 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_sfrax.ts @@ -0,0 +1,53 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify sFRAX **************************/ + await verifyContract( + chainId, + deployments.collateral.sFRAX, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.FRAX, + oracleError: fp('0.01').toString(), // 1% + erc20: networkConfig[chainId].tokens.sFRAX, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% + delayUntilDefault: bn('86400').toString(), // 24h + }, + '0', // revenueHiding = 0 + ], + 'contracts/plugins/assets/frax/SFraxCollateral.sol:SFraxCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index f9b9d28265..a0a69c2281 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -36,7 +36,7 @@ async function main() { // even if some portions have already been verified // Phase 1- Common - let scripts = [ + const scripts = [ '0_verify_libraries.ts', '1_verify_implementations.ts', '2_verify_rsrAsset.ts', @@ -61,7 +61,8 @@ async function main() { 'collateral-plugins/verify_cbeth.ts', 'collateral-plugins/verify_sdai.ts', 'collateral-plugins/verify_morpho.ts', - 'collateral-plugins/verify_aave_v3_usdc.ts' + 'collateral-plugins/verify_aave_v3_usdc.ts', + 'collateral-plugins/verify_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index cf5b9d0336..c575f48e3d 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -5,7 +5,7 @@ const forkBlockNumber = { 'mainnet-deployment': 15690042, // Ethereum 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum - default: 16934828, // Ethereum + default: 18522901, // Ethereum } export default forkBlockNumber From 87fc386a319a039829267168bc739d126d4398e8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 15 Nov 2023 09:17:29 -0500 Subject: [PATCH 136/450] skip 0-valued transfer (#1015) --- contracts/p1/BackingManager.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 5771587195..1065bcc2d6 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -254,6 +254,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // delta: {qTok}, the excess quantity of this asset that we hold uint256 delta = bal.minus(req).shiftl_toUint(int8(asset.erc20Decimals())); uint256 tokensPerShare = delta / (totals.rTokenTotal + totals.rsrTotal); + if (tokensPerShare == 0) continue; // no div-by-0: Distributor guarantees (totals.rTokenTotal + totals.rsrTotal) > 0 // initial division is intentional here! We'd rather save the dust than be unfair From d9aa7585b83620520fa358cfe27602aea5bb28b6 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 15 Nov 2023 10:21:37 -0500 Subject: [PATCH 137/450] Yearn V2 crvUSD pools plugins (#1012) --- common/configuration.ts | 11 + .../assets/curve/CurveStableCollateral.sol | 2 +- contracts/plugins/assets/curve/PoolTokens.sol | 11 +- contracts/plugins/assets/yearnv2/README.md | 34 +++ .../yearnv2/YearnV2CurveFiatCollateral.sol | 98 +++++++ .../curve/collateralTests.ts | 29 +- .../curve/crv/CrvStableMetapoolSuite.test.ts | 1 + .../CrvStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/crv/CrvStableTestSuite.test.ts | 1 + .../curve/cvx/CvxStableMetapoolSuite.test.ts | 1 + .../CvxStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/cvx/CvxStableTestSuite.test.ts | 1 + .../curve/pluginTestTypes.ts | 3 + .../YearnV2CurveFiatCollateral.test.ts | 249 ++++++++++++++++++ .../yearnv2/constants.ts | 23 ++ .../individual-collateral/yearnv2/helpers.ts | 28 ++ 16 files changed, 469 insertions(+), 25 deletions(-) create mode 100644 contracts/plugins/assets/yearnv2/README.md create mode 100644 contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol create mode 100644 test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts create mode 100644 test/plugins/individual-collateral/yearnv2/constants.ts create mode 100644 test/plugins/individual-collateral/yearnv2/helpers.ts diff --git a/common/configuration.ts b/common/configuration.ts index 2cc32f07f0..308bfc671e 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -18,6 +18,7 @@ export interface ITokens { FRAX?: string MIM?: string eUSD?: string + crvUSD?: string aDAI?: string aUSDC?: string aUSDT?: string @@ -70,6 +71,8 @@ export interface ITokens { astETH?: string wsgUSDC?: string wsgUSDbC?: string + yvCurveUSDPcrvUSD?: string + yvCurveUSDCcrvUSD?: string // Morpho Aave maUSDC?: string @@ -141,6 +144,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51', FRAX: '0x853d955aCEf822Db058eb8505911ED77F175b99e', MIM: '0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3', + crvUSD: '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E', eUSD: '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F', aDAI: '0x028171bCA77440897B824Ca71D1c56caC55b68A3', aUSDC: '0xBcca60bB61934080951369a648Fb03DF4F96263C', @@ -187,6 +191,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', + yvCurveUSDPcrvUSD: '0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469', + yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', @@ -201,6 +207,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', FRAX: '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', MIM: '0x7A364e8770418566e3eb2001A96116E6138Eb32F', + crvUSD: '0xEEf0C605546958c1f899b6fB336C20671f9cD49F', ETH: '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', WBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', BTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', @@ -244,6 +251,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51', FRAX: '0x853d955aCEf822Db058eb8505911ED77F175b99e', MIM: '0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3', + crvUSD: '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E', eUSD: '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F', aDAI: '0x028171bCA77440897B824Ca71D1c56caC55b68A3', aUSDC: '0xBcca60bB61934080951369a648Fb03DF4F96263C', @@ -290,6 +298,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', + yvCurveUSDPcrvUSD: '0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469', + yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', @@ -304,6 +314,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', FRAX: '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', MIM: '0x7A364e8770418566e3eb2001A96116E6138Eb32F', + crvUSD: '0xEEf0C605546958c1f899b6fB336C20671f9cD49F', ETH: '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', WBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', BTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index f5706f75e6..5d6f985401 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -132,7 +132,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { /// Claim rewards earned by holding a balance of the ERC20 token /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins - function claimRewards() external override(Asset, IRewardable) { + function claimRewards() external virtual override(Asset, IRewardable) { IRewardable(address(erc20)).claimRewards(); } diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index 1af669572b..3616aca59f 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -12,7 +12,7 @@ interface ICurvePool { // For Curve Plain Pools and V2 Metapools function coins(uint256) external view returns (address); - // Only exists in Curve Lending Pools + // Only exists in Curve Lending Pools; not used currently function underlying_coins(uint256) external view returns (address); // Only exists in V1 Curve Metapools; not used currently @@ -23,13 +23,6 @@ interface ICurvePool { function get_virtual_price() external view returns (uint256); function token() external view returns (address); - - function exchange( - int128, - int128, - uint256, - uint256 - ) external; } /// Supports Curve base pools for up to 4 tokens @@ -135,7 +128,7 @@ contract PoolTokens { token3 = (nTokens > 3) ? tokens[3] : IERC20Metadata(address(0)); // === Feeds + timeouts === - // I know this lots extremely verbose and quite silly, but it actually makes sense: + // I know this section at-first looks verbose and silly, but it's actually well-justified: // - immutable variables cannot be conditionally written to // - a struct or an array would not be able to be immutable // - immutable variables means values get in-lined in the bytecode diff --git a/contracts/plugins/assets/yearnv2/README.md b/contracts/plugins/assets/yearnv2/README.md new file mode 100644 index 0000000000..a2b6f01e52 --- /dev/null +++ b/contracts/plugins/assets/yearnv2/README.md @@ -0,0 +1,34 @@ +# Yearn V2 Collateral Plugin + +## Summary + +This plugin allows Yearn V2 yToken holders to use their tokens as collateral in the Reserve Protocol. (Currently only USD\*-crvUSD yTokens are supported) + +Yearn is is a defi strategy platform that allows users to optimize their defi participation collectively as a group. It handles things like (i) autocompounding, (ii) reward monetization, and (iii) taps into boosted yields. + +Yearn V2 only has 1 function of interest to the Reserve Protocol: `pricePerShare() external view returns (uint256)`. There is no mutator call required in order to update the rate. There is a background `harvest()` step that returns yields from the strategy to the yToken, but this happens continuously over many hours instead of discretely in a single block. Since we can count on Yearn keepers calling `harvest()` for us, we do not need to mutate the yToken ourselves. + +However, we also need to take into account the underlying token's `get_virtual_price()`. The complete `refPerTok()` measure is the product of `pricePerShare()` and `get_virtual_price`. + +There are no rewards to claim as YFI is not emitted that way, and the reward tokens of underlying defi protocols are already converted under the hood for yToken holders. + +## Implementation + +### Units + +For the example of `yvCurveUSDCcrvUSD`: + +| tok | ref | target | UoA | +| ----------------- | ---------------------------- | ------ | --- | +| yvCurveUSDCcrvUSD | crvUSDUSDC-f's virtual token | USD | USD | + +Subtlety: crvUSDUSDC-f has a virtual price, so the ref token is not _quite_ crvUSDUSDC-f but actually its virtual token. That is, when `get_virtual_price()` is 1.1, the ref token is the underlying virtual token that the LP token can be redeemed for at a 1.1:1 ratio. + +### Functions + +#### refPerTok {ref/tok} + +```solidity +// {ref/tok} = {qRef/tok} * {ref/qRef} +return shiftl_toFix(IYearnV2(erc20).pricePerShare(), -int8(erc20.decimals())); +``` diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol new file mode 100644 index 0000000000..89b11d861c --- /dev/null +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -0,0 +1,98 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../curve/CurveStableCollateral.sol"; + +interface IYearnV2 { + /// @return {qLP token/tok} + function pricePerShare() external view returns (uint256); +} + +/** + * @title YearnV2 Curve Fiat Collateral + * @notice Collateral plugin for a Yearn V2 Vault for a fiatcoin curve pool, eg yvCurveUSDCcrvUSD + * tok = yvCurveUSDCcrvUSD + * ref = crvUSDUSDC-f's underlying virtual token + * tar = USD + * UoA = USD + * + * More on the ref token: crvUSDUSDC-f has a virtual price >=1. The ref token to measure is not the + * balance of crvUSDUSDC-f that the LP token is redeemable for, but the balance of the virtual + * token that underlies crvUSDUSDC-f. This virtual token is an evolving mix of USDC and crvUSD. + * + * Revenue hiding should be set to the largest % drawdown in a Yearn vault that should + * not result in default. While it is extremely rare for Yearn to have drawdowns, + * in principle it is possible and should be planned for. + * + * No rewards. + */ +contract YearnV2CurveFiatCollateral is CurveStableCollateral { + using FixLib for uint192; + + // solhint-disable no-empty-blocks + + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveStableCollateral(config, revenueHiding, ptConfig) {} + + // solhint-enable no-empty-blocks + + /// Can revert, used by other contract functions in order to catch errors + /// Should not return FIX_MAX for low + /// Should only return FIX_MAX for high if low is 0 + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return {target/ref} Unused. Always 0 + function tryPrice() + external + view + virtual + override + returns ( + uint192 low, + uint192 high, + uint192 + ) + { + // {UoA} + (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); + + // {LP token} + uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); + // We can always assume that the total supply is non-zero + + // {UoA/LP token} = {UoA} / {LP token} + uint192 lpLow = aumLow.div(supply, FLOOR); + uint192 lpHigh = aumHigh.div(supply, CEIL); + + // {LP token/tok} + uint192 pricePerShare = _pricePerShare(); + + // {UoA/tok} = {UoA/LP token} * {LP token/tok} + low = lpLow.mul(pricePerShare, FLOOR); + high = lpHigh.mul(pricePerShare, CEIL); + + return (low, high, 0); + } + + /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + function claimRewards() external virtual override { + // No rewards to claim, everything is part of the pricePerShare + } + + // === Internal === + + /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens + function _underlyingRefPerTok() internal view virtual override returns (uint192) { + // {ref/tok} = {ref/LP token} * {LP token/tok} + return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare()); + } + + /// @return {LP token/tok} + function _pricePerShare() internal view returns (uint192) { + // {LP token/tok} = {qLP token/tok} * {LP token/qLP token} + return shiftl_toFix(IYearnV2(address(erc20)).pricePerShare(), -int8(erc20Decimals)); + } +} diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index a9a939a029..2cd38cd51e 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -39,6 +39,7 @@ export default function fn( isMetapool, resetFork, collateralName, + itClaimsRewards, } = fixtures describeFork(`Collateral: ${collateralName}`, () => { @@ -46,6 +47,7 @@ export default function fn( let mockERC20: ERC20Mock before(async () => { + await resetFork() ;[, defaultOpts] = await deployCollateral({}) const ERC20Factory = await ethers.getContractFactory('ERC20Mock') mockERC20 = await ERC20Factory.deploy('Mock ERC20', 'ERC20') @@ -293,7 +295,7 @@ export default function fn( await expect(ctx.collateral.claimRewards()).to.not.be.reverted }) - it('claims rewards (plugin)', async () => { + itClaimsRewards('claims rewards (plugin)', async () => { const amount = bn('20000').mul(bn(10).pow(await ctx.wrapper.decimals())) await mintCollateralTo(ctx, amount, ctx.alice, ctx.collateral.address) @@ -314,7 +316,7 @@ export default function fn( } }) - it('claims rewards (wrapper)', async () => { + itClaimsRewards('claims rewards (wrapper)', async () => { const amount = bn('20000').mul(bn(10).pow(await ctx.wrapper.decimals())) await mintCollateralTo(ctx, amount, ctx.alice, ctx.alice.address) @@ -368,17 +370,14 @@ export default function fn( const [initLow, initHigh] = await ctx.collateral.price() const curveVirtualPrice = await ctx.curvePool.get_virtual_price() - await ctx.collateral.refresh() - expect(await ctx.collateral.refPerTok()).to.equal(curveVirtualPrice) - - await ctx.curvePool.setVirtualPrice(curveVirtualPrice.add(1e4)) + await ctx.curvePool.setVirtualPrice(curveVirtualPrice.add(1e7)) const newBalances = [ - await ctx.curvePool.balances(0).then((e) => e.add(1e4)), - await ctx.curvePool.balances(1).then((e) => e.add(2e4)), + await ctx.curvePool.balances(0).then((e) => e.add(1e7)), + await ctx.curvePool.balances(1).then((e) => e.add(2e7)), ] - if (!isMetapool) { - newBalances.push(await ctx.curvePool.balances(2).then((e) => e.add(3e4))) + if (!isMetapool && ctx.poolTokens.length > 2) { + newBalances.push(await ctx.curvePool.balances(2).then((e) => e.add(3e7))) } await ctx.curvePool.setBalances(newBalances) @@ -585,7 +584,7 @@ export default function fn( expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) const currentExchangeRate = await ctx.curvePool.get_virtual_price() - await ctx.curvePool.setVirtualPrice(currentExchangeRate.sub(1e3)).then((e) => e.wait()) + await ctx.curvePool.setVirtualPrice(currentExchangeRate.sub(1e7)).then((e) => e.wait()) // Collateral defaults due to refPerTok() going down await expect(ctx.collateral.refresh()).to.emit(ctx.collateral, 'CollateralStatusChanged') @@ -618,9 +617,9 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // Decrease refPerTok by 1 part in a million + // Decrease refPerTok by nearly 1 part in a million const currentExchangeRate = await ctx.curvePool.get_virtual_price() - const newVirtualPrice = currentExchangeRate.sub(currentExchangeRate.div(bn('1e6'))) + const newVirtualPrice = currentExchangeRate.sub(currentExchangeRate.div(bn('1e6'))).add(2) await ctx.curvePool.setVirtualPrice(newVirtualPrice) // Collateral remains SOUND @@ -631,8 +630,8 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // One quanta more of decrease results in default - await ctx.curvePool.setVirtualPrice(newVirtualPrice.sub(2)) // sub 2 to compenstate for rounding + // Few more quanta of decrease results in default + await ctx.curvePool.setVirtualPrice(newVirtualPrice.sub(4)) // sub 4 to compenstate for rounding await expect(ctx.collateral.refresh()).to.emit(ctx.collateral, 'CollateralStatusChanged') expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts index bef9af157a..12964d9bbc 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts @@ -221,6 +221,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itClaimsRewards: it, isMetapool: true, resetFork, collateralName: 'CurveStableMetapoolCollateral - CurveGaugeWrapper', diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index 091863c246..3ff406f171 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -254,6 +254,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itClaimsRewards: it, isMetapool: true, resetFork, collateralName: 'CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper', diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts index f098b9ef58..21260f9906 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts @@ -230,6 +230,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itClaimsRewards: it, isMetapool: false, resetFork, collateralName: 'CurveStableCollateral - CurveGaugeWrapper', diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts index 9a947dba48..ce3a93e9e0 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts @@ -229,6 +229,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itClaimsRewards: it, isMetapool: true, resetFork, collateralName: 'CurveStableMetapoolCollateral - ConvexStakingWrapper', diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index e1646193a8..5abe5c1ec6 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -256,6 +256,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itClaimsRewards: it, isMetapool: true, resetFork, collateralName: 'CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper', diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 09fde97a48..c86ae829d6 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -475,6 +475,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itClaimsRewards: it, isMetapool: false, resetFork, collateralName: 'CurveStableCollateral - ConvexStakingWrapper', diff --git a/test/plugins/individual-collateral/curve/pluginTestTypes.ts b/test/plugins/individual-collateral/curve/pluginTestTypes.ts index b4502bf73a..d3d3257a68 100644 --- a/test/plugins/individual-collateral/curve/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/curve/pluginTestTypes.ts @@ -72,6 +72,9 @@ export interface CurveCollateralTestSuiteFixtures void + // toggle on or off: tests that claim rewards (off if the plugin does not receive rewards) + itClaimsRewards: Mocha.TestFunction | Mocha.PendingTestFunction + // a function to deploy and return the plugin-specific test suite context makeCollateralFixtureContext: MakeCurveCollateralFixtureFunc diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts new file mode 100644 index 0000000000..9242e0fb03 --- /dev/null +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -0,0 +1,249 @@ +import collateralTests from '../curve/collateralTests' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, +} from '../curve/pluginTestTypes' +import { mintYToken, resetFork } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumber, BigNumberish } from 'ethers' +import { + CurveMetapoolMock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../typechain' +import { bn } from '../../../../common/numbers' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + crvUSD, + CRV_USD_USD_FEED, + CRV_USD_ORACLE_TIMEOUT, + CRV_USD_ORACLE_ERROR, + USDP, + USDP_USD_FEED, + USDP_ORACLE_TIMEOUT, + USDP_ORACLE_ERROR, + yvCurveUSDCcrvUSD, + yvCurveUSDPcrvUSD, + YVUSDC_LP_TOKEN, + YVUSDP_LP_TOKEN, +} from './constants' +import { + PRICE_TIMEOUT, + USDC, + USDC_USD_FEED, + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + CurvePoolType, +} from '../curve/constants' + +// Note: Uses ../curve/collateralTests.ts, not ../collateralTests.ts + +type Fixture = () => Promise + +type CurveFiatTest = { + name: string // name of the test + yToken: string // address of the yToken + lpToken: string // address of the lpToken + pairedToken: string // address of the paired token + pairedOracle: string // address of the oracle for the non-crvUSD token + pairedOracleTimeout: BigNumber // oracleTimeout for the non-crvUSD token's oracle + pairedOracleError: BigNumber // oracleError for the non-crvUSD token's oracle +} + +const tests = [ + { + name: 'yvCurveUSDCcrvUSD', + yToken: yvCurveUSDCcrvUSD, + lpToken: YVUSDC_LP_TOKEN, + pairedToken: USDC, + pairedOracle: USDC_USD_FEED, + pairedOracleTimeout: USDC_ORACLE_TIMEOUT, + pairedOracleError: USDC_ORACLE_ERROR, + }, + { + name: 'yvCurveUSDPcrvUSD', + yToken: yvCurveUSDPcrvUSD, + lpToken: YVUSDP_LP_TOKEN, + pairedToken: USDP, + pairedOracle: USDP_USD_FEED, + pairedOracleTimeout: USDP_ORACLE_TIMEOUT, + pairedOracleError: USDP_ORACLE_ERROR, + }, +] + +tests.forEach((test: CurveFiatTest) => { + const defaultCrvStableCollateralOpts: CurveCollateralOpts = { + erc20: test.yToken, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: test.pairedOracle, // unused but cannot be zero + oracleTimeout: test.pairedOracleTimeout.gt(CRV_USD_ORACLE_TIMEOUT) + ? test.pairedOracleTimeout + : CRV_USD_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + lpToken: test.lpToken, + curvePool: test.lpToken, + poolType: CurvePoolType.Plain, + feeds: [[test.pairedOracle], [CRV_USD_USD_FEED]], + oracleTimeouts: [[test.pairedOracleTimeout], [CRV_USD_ORACLE_TIMEOUT]], + oracleErrors: [[test.pairedOracleError], [CRV_USD_ORACLE_ERROR]], + } + + const deployCollateral = async ( + opts: CurveCollateralOpts = {} + ): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute both feeds: test.pairedToken + crvUSD + const pairedTokenFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUsdFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + opts.feeds = [[pairedTokenFeed.address], [crvUsdFeed.address]] + } + + opts = { ...defaultCrvStableCollateralOpts, ...opts } + + const YearnV2CurveFiatCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'YearnV2CurveFiatCollateral' + ) + + const collateral = await YearnV2CurveFiatCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral, opts] + } + + const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} + ): Fixture => { + const collateralOpts = { ...defaultCrvStableCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute both feeds: test.pairedToken + crvUSD + const pairedTokenFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUsdFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateralOpts.feeds = [[pairedTokenFeed.address], [crvUsdFeed.address]] + + const pairedToken = await ethers.getContractAt('ERC20Mock', test.pairedToken) + const crvUsdToken = await ethers.getContractAt('ERC20Mock', crvUSD) + const wrapper = await ethers.getContractAt('ConvexStakingWrapper', test.yToken) // not really a ConvexStakingWrapper + + // Use mock curvePool seeded with initial balances + const CurvePoolMockFactory = await ethers.getContractFactory('CurveMetapoolMock') // not a metapool, but this works + const realCurvePool = ( + await ethers.getContractAt('CurveMetapoolMock', test.lpToken) + ) + const curvePool = ( + await CurvePoolMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + await curvePool.mint(alice.address, await realCurvePool.totalSupply()) + collateralOpts.lpToken = curvePool.address + collateralOpts.curvePool = curvePool.address + + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + return { + alice, + collateral, + wrapper, + curvePool, + rewardTokens: [], + poolTokens: [pairedToken, crvUsdToken], + feeds: [pairedTokenFeed, crvUsdFeed], + } + } + + return makeCollateralFixtureContext + } + + /* + Define helper functions +*/ + + const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string + ) => { + await mintYToken(ctx.wrapper.address, amount, recipient) + } + + /* + Define collateral-specific tests +*/ + + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificConstructorTests = () => {} + + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificStatusTests = () => {} + + /* + Run the test suite +*/ + + const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itChecksTargetPerRefDefault: it, + itChecksRefPerTokDefault: it, + itHasRevenueHiding: it, + itClaimsRewards: it.skip, + isMetapool: false, + resetFork, + collateralName: 'YearnV2CurveFiatCollateral -- ' + test.name, + } + + collateralTests(opts) +}) diff --git a/test/plugins/individual-collateral/yearnv2/constants.ts b/test/plugins/individual-collateral/yearnv2/constants.ts new file mode 100644 index 0000000000..832ccbb813 --- /dev/null +++ b/test/plugins/individual-collateral/yearnv2/constants.ts @@ -0,0 +1,23 @@ +import { bn, fp } from '../../../../common/numbers' +import { networkConfig } from '../../../../common/configuration' + +// Mainnet Addresses +export const USDP = networkConfig['31337'].tokens.USDP as string +export const crvUSD = networkConfig['31337'].tokens.crvUSD as string +export const yvCurveUSDPcrvUSD = networkConfig['31337'].tokens.yvCurveUSDPcrvUSD as string +export const yvCurveUSDCcrvUSD = networkConfig['31337'].tokens.yvCurveUSDCcrvUSD as string +export const USDP_USD_FEED = networkConfig['31337'].chainlinkFeeds.USDP as string +export const CRV_USD_USD_FEED = networkConfig['31337'].chainlinkFeeds.crvUSD as string + +export const YVUSDC_LP_TOKEN = '0x4DEcE678ceceb27446b35C672dC7d61F30bAD69E' +export const YVUSDP_LP_TOKEN = '0xCa978A0528116DDA3cbA9ACD3e68bc6191CA53D0' + +export const YVUSDC_HOLDER = '0x96E3e323966713a1f56dbb5D5bFabB28B2e4B428' +export const YVUSDP_HOLDER = '0x40A63aDC56B32fdeF389FcB98571EdDC5e53daeD' + +export const USDP_ORACLE_TIMEOUT = bn('3600') +export const USDP_ORACLE_ERROR = fp('0.01') +export const CRV_USD_ORACLE_TIMEOUT = bn('86400') +export const CRV_USD_ORACLE_ERROR = fp('0.005') + +export const FORK_BLOCK = 18537600 diff --git a/test/plugins/individual-collateral/yearnv2/helpers.ts b/test/plugins/individual-collateral/yearnv2/helpers.ts new file mode 100644 index 0000000000..24b24635c6 --- /dev/null +++ b/test/plugins/individual-collateral/yearnv2/helpers.ts @@ -0,0 +1,28 @@ +import { ethers } from 'hardhat' +import { whileImpersonating } from '../../../utils/impersonation' +import { BigNumberish } from 'ethers' +import { + FORK_BLOCK, + yvCurveUSDCcrvUSD, + yvCurveUSDPcrvUSD, + YVUSDC_HOLDER, + YVUSDP_HOLDER, +} from './constants' +import { getResetFork } from '../helpers' + +export const mintYToken = async (yTokenAddr: string, amount: BigNumberish, recipient: string) => { + const yToken = await ethers.getContractAt('ERC20Mock', yTokenAddr) + if (yTokenAddr == yvCurveUSDCcrvUSD) { + await whileImpersonating(YVUSDC_HOLDER, async (whale) => { + await yToken.connect(whale).transfer(recipient, amount) + }) + } else if (yTokenAddr == yvCurveUSDPcrvUSD) { + await whileImpersonating(YVUSDP_HOLDER, async (whale) => { + await yToken.connect(whale).transfer(recipient, amount) + }) + } else { + throw new Error('yToken not supported') + } +} + +export const resetFork = getResetFork(FORK_BLOCK) From 595eabe1ce9fea808173c9b8d21dd534a9992c05 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 17 Nov 2023 14:02:43 -0500 Subject: [PATCH 138/450] add lotPrice() back everywhere (unused) for backwards compatibility (#1004) --- contracts/interfaces/IAsset.sol | 7 ++++++ contracts/interfaces/IBasketHandler.sol | 7 ++++++ contracts/p0/BasketHandler.sol | 22 ++++++++++++++++-- contracts/p1/BasketHandler.sol | 23 +++++++++++++++++-- contracts/plugins/assets/Asset.sol | 9 ++++++++ contracts/plugins/assets/RTokenAsset.sol | 9 ++++++++ docs/collateral.md | 13 +++++++++++ test/Main.test.ts | 9 ++++++++ test/plugins/Asset.test.ts | 11 +++++++++ test/plugins/Collateral.test.ts | 11 +++++++++ .../aave/ATokenFiatCollateral.test.ts | 9 ++++++++ .../individual-collateral/collateralTests.ts | 9 ++++++++ .../compoundv2/CTokenFiatCollateral.test.ts | 9 ++++++++ .../curve/collateralTests.ts | 9 ++++++++ 14 files changed, 153 insertions(+), 4 deletions(-) diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index b5423ab2b5..a1c68a305e 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -32,6 +32,13 @@ interface IAsset is IRewardable { /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); + /// Should not revert + /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); + /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192); diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index e43cf6735f..2ed829d1b9 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -138,6 +138,13 @@ interface IBasketHandler is IComponent { /// @return high {UoA/BU} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); + /// Should not revert + /// lotLow should be nonzero if a BU could be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); + /// @return timestamp The timestamp at which the basket was last set function timestamp() external view returns (uint48); diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 03e99b1401..998c25e65f 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -370,11 +370,27 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } /// Should not revert - /// low should be nonzero when the asset might be worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) function price() external view returns (uint192 low, uint192 high) { + return _price(false); + } + + /// Should not revert + /// lowLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/BU} The lower end of the lot price estimate + /// @return lotHigh {UoA/BU} The upper end of the lot price estimate + // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) + function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { + return _price(true); + } + + /// Returns the price of a BU, using the lot prices if `useLotPrice` is true + /// @return low {UoA/BU} The lower end of the lot price estimate + /// @return high {UoA/BU} The upper end of the lot price estimate + function _price(bool useLotPrice) internal view returns (uint192 low, uint192 high) { IAssetRegistry reg = main.assetRegistry(); uint256 low256; @@ -384,7 +400,9 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint192 qty = quantity(basket.erc20s[i]); if (qty == 0) continue; - (uint192 lowP, uint192 highP) = reg.toAsset(basket.erc20s[i]).price(); + (uint192 lowP, uint192 highP) = useLotPrice + ? reg.toAsset(basket.erc20s[i]).lotPrice() + : reg.toAsset(basket.erc20s[i]).price(); low256 += qty.safeMul(lowP, RoundingMode.FLOOR); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 6a0753c1b6..fa076253bd 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -311,11 +311,28 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } /// Should not revert - /// low should be nonzero when BUs are worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) function price() external view returns (uint192 low, uint192 high) { + return _price(false); + } + + /// Should not revert + /// lowLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/BU} The lower end of the lot price estimate + /// @return lotHigh {UoA/BU} The upper end of the lot price estimate + // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) + function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { + return _price(true); + } + + /// Returns the price of a BU, using the lot prices if `useLotPrice` is true + /// @param useLotPrice Whether to use lotPrice() or price() + /// @return low {UoA/BU} The lower end of the price estimate + /// @return high {UoA/BU} The upper end of the price estimate + function _price(bool useLotPrice) internal view returns (uint192 low, uint192 high) { uint256 low256; uint256 high256; @@ -324,7 +341,9 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 qty = quantity(basket.erc20s[i]); if (qty == 0) continue; - (uint192 lowP, uint192 highP) = assetRegistry.toAsset(basket.erc20s[i]).price(); + (uint192 lowP, uint192 highP) = useLotPrice + ? assetRegistry.toAsset(basket.erc20s[i]).lotPrice() + : assetRegistry.toAsset(basket.erc20s[i]).price(); low256 += qty.safeMul(lowP, RoundingMode.FLOOR); diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 3b858a9eab..302a6a6731 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -168,6 +168,15 @@ contract Asset is IAsset, VersionedAsset { assert(_low <= _high); } + /// Should not revert + /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + return price(); + } + /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view virtual returns (uint192) { return shiftl_toFix(erc20.balanceOf(account), -int8(erc20Decimals)); diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index fdacf7ddb5..e9487fe671 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -105,6 +105,15 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { } } + /// Should not revert + /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + return price(); + } + /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192) { // The RToken has 18 decimals, so there's no reason to waste gas here doing a shiftl_toFix diff --git a/docs/collateral.md b/docs/collateral.md index 9655107da4..e6ae0e039c 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -47,6 +47,13 @@ interface IAsset is IRewardable { /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); + /// Should not revert + /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); + /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192); @@ -367,6 +374,12 @@ Should return `(0, FIX_MAX)` if pricing data is _completely_ unavailable or stal Should be gas-efficient. +### lotPrice() `{UoA/tok}` + +Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility. + +Recommend implement `lotPrice()` by calling `price()`. If you are inheriting from any of our existing collateral plugins, this is already done for you. See [Asset.sol](../contracts/plugins/Asset.sol) for the implementation. + ### refPerTok() `{ref/tok}` Should never revert. diff --git a/test/Main.test.ts b/test/Main.test.ts index de7d519b73..9d00c3b0a6 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -3150,6 +3150,15 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expectPrice(basketHandler.address, fp('0.75'), ORACLE_ERROR, true) }) + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await basketHandler.lotPrice() + const price = await basketHandler.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) + it('Should not put backup tokens with different targetName in the basket', async () => { // Swap out collateral for bad target name const CollFactory = await ethers.getContractFactory('FiatCollateral') diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index ad8c967def..5d801071a7 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -805,6 +805,17 @@ describe('Assets contracts #fast', () => { expect(lowPrice5).to.be.equal(bn(0)) expect(highPrice5).to.be.equal(MAX_UINT192) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + for (const asset of [rsrAsset, compAsset, aaveAsset, rTokenAsset]) { + const lotPrice = await asset.lotPrice() + const price = await asset.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + } + }) }) describe('Constructor validation', () => { diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index e52458f39e..21ca93859c 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -818,6 +818,17 @@ describe('Collateral contracts', () => { expect(await unpricedAppFiatCollateral.savedHighPrice()).to.equal(highPrice) expect(await unpricedAppFiatCollateral.lastSave()).to.equal(currBlockTimestamp) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + for (const coll of [tokenCollateral, usdcCollateral, aTokenCollateral, cTokenCollateral]) { + const lotPrice = await coll.lotPrice() + const price = await coll.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + } + }) }) describe('Status', () => { diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 0ba9baf74e..7a4a52862c 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -747,6 +747,15 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await zeropriceCtokenCollateral.refresh() expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await aDaiCollateral.lotPrice() + const price = await aDaiCollateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) }) // Note: Here the idea is to test all possible statuses and check all possible paths to default diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index da6b098630..dcb238c332 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -441,6 +441,15 @@ export default function fn( await advanceTime(priceTimeout / 2) await expectUnpriced(collateral.address) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await collateral.lotPrice() + const price = await collateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) }) describe('status', () => { diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index aefae34d5a..921b3f1bec 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -760,6 +760,15 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await zeropriceCtokenCollateral.refresh() expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await cDaiCollateral.lotPrice() + const price = await cDaiCollateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) }) // Note: Here the idea is to test all possible statuses and check all possible paths to default diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index cd7d2d4e69..c016642708 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -505,6 +505,15 @@ export default function fn( await advanceTime(priceTimeout / 2) await expectUnpriced(ctx.collateral.address) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await ctx.collateral.lotPrice() + const price = await ctx.collateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) }) describe('status', () => { From f1459e6a9d7015dc90249f50b3b882781b9aab86 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 27 Nov 2023 16:33:34 -0300 Subject: [PATCH 139/450] TRUST M-13: Use latest Convex contract (#1008) Co-authored-by: Akshat Mittal --- .../curve/cvx/vendor/ConvexStakingWrapper.sol | 190 +++++++----------- .../phase1-common/1_deploy_libraries.ts | 14 +- .../deploy_convex_rToken_metapool_plugin.ts | 5 +- .../deploy_convex_stable_metapool_plugin.ts | 5 +- .../deploy_convex_stable_plugin.ts | 5 +- .../verify_convex_stable.ts | 12 +- .../curve/cvx/CvxStableTestSuite.test.ts | 47 ----- .../curve/cvx/helpers.ts | 40 +--- 8 files changed, 86 insertions(+), 232 deletions(-) diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index 4d7b92ebac..93db1ba1c3 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -8,7 +8,6 @@ import "@openzeppelin/contracts-v0.7/token/ERC20/SafeERC20.sol"; import "@openzeppelin/contracts-v0.7/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts-v0.7/utils/ReentrancyGuard.sol"; import "./IRewardStaking.sol"; -import "./CvxMining.sol"; interface IBooster { function poolInfo(uint256 _pid) @@ -22,6 +21,8 @@ interface IBooster { address _stash, bool _shutdown ); + + function earmarkRewards(uint256 _pid) external returns (bool); } interface IConvexDeposits { @@ -38,9 +39,13 @@ interface IConvexDeposits { ) external; } +interface ITokenWrapper { + function token() external view returns (address); +} + // if used as collateral some modifications will be needed to fit the specific platform -// Based on audited contracts: https://github.com/convex-eth/platform/blob/main/contracts/contracts/wrappers/CvxCrvStakingWrapper.sol +// Based on audited contracts: https://github.com/convex-eth/platform/blob/933ace34d896e6684345c6795bf33d4089fbd8f6/contracts/contracts/wrappers/ConvexStakingWrapper.sol contract ConvexStakingWrapper is ERC20, ReentrancyGuard { using SafeERC20 for IERC20; using SafeMath for uint256; @@ -53,8 +58,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { struct RewardType { address reward_token; address reward_pool; - uint128 reward_integral; - uint128 reward_remaining; + uint256 reward_integral; + uint256 reward_remaining; mapping(address => uint256) reward_integral_for; mapping(address => uint256) claimable_reward; } @@ -74,11 +79,10 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //rewards RewardType[] public rewards; mapping(address => uint256) public registeredRewards; + mapping(address => address) public rewardRedirect; //management bool public isInit; - address public owner; - bool internal _isShutdown; string internal _tokenname; string internal _tokensymbol; @@ -90,15 +94,15 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { bool _wrapped ); event Withdrawn(address indexed _user, uint256 _amount, bool _unwrapped); - event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); + event RewardRedirected(address indexed _account, address _forward); + event RewardAdded(address _token); + event UserCheckpoint(address _userA, address _userB); event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); constructor() public ERC20("StakedConvexToken", "stkCvx") {} function initialize(uint256 _poolId) external virtual { require(!isInit, "already init"); - owner = msg.sender; - emit OwnershipTransferred(address(0), owner); (address _lptoken, address _token, , address _rewards, , ) = IBooster(convexBooster) .poolInfo(_poolId); @@ -130,32 +134,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return 18; } - modifier onlyOwner() { - require(owner == msg.sender, "Ownable: caller is not the owner"); - _; - } - - function transferOwnership(address newOwner) public virtual onlyOwner { - require(newOwner != address(0), "Ownable: new owner is the zero address"); - emit OwnershipTransferred(owner, newOwner); - owner = newOwner; - } - - function renounceOwnership() public virtual onlyOwner { - emit OwnershipTransferred(owner, address(0)); - owner = address(0); - } - - function shutdown() external onlyOwner { - _isShutdown = true; - } - - function isShutdown() public view returns (bool) { - if (_isShutdown) return true; - (, , , , , bool isShutdown_) = IBooster(convexBooster).poolInfo(convexPoolId); - return isShutdown_; - } - function setApprovals() public { IERC20(curveToken).safeApprove(convexBooster, 0); IERC20(curveToken).safeApprove(convexBooster, uint256(-1)); @@ -189,12 +167,18 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { IERC20(crv).transfer(address(this), 0); //send to self to warmup state IERC20(cvx).transfer(address(this), 0); + emit RewardAdded(crv); + emit RewardAdded(cvx); } uint256 extraCount = IRewardStaking(mainPool).extraRewardsLength(); for (uint256 i = 0; i < extraCount; i++) { address extraPool = IRewardStaking(mainPool).extraRewards(i); address extraToken = IRewardStaking(extraPool).rewardToken(); + //from pool 151, extra reward tokens are wrapped + if (convexPoolId >= 151) { + extraToken = ITokenWrapper(extraToken).token(); + } if (extraToken == cvx) { //update cvx reward pool address rewards[CVX_INDEX].reward_pool = extraPool; @@ -202,13 +186,14 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //add new token to list rewards.push( RewardType({ - reward_token: IRewardStaking(extraPool).rewardToken(), + reward_token: extraToken, reward_pool: extraPool, reward_integral: 0, reward_remaining: 0 }) ); registeredRewards[extraToken] = rewards.length; //mark registered at index+1 + emit RewardAdded(extraToken); } } } @@ -232,6 +217,15 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return totalSupply(); } + //internal transfer function to transfer rewards out on claim + function _transferReward( + address _token, + address _to, + uint256 _amount + ) internal virtual { + IERC20(_token).safeTransfer(_to, _amount); + } + function _calcRewardIntegral( uint256 _index, address[2] memory _accounts, @@ -240,16 +234,19 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { bool _isClaim ) internal { RewardType storage reward = rewards[_index]; + if (reward.reward_token == address(0)) { + return; + } //get difference in balance and remaining rewards //getReward is unguarded so we use reward_remaining to keep track of how much was actually claimed uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); - // uint256 d_reward = bal.sub(reward.reward_remaining); - if (_supply > 0 && bal.sub(reward.reward_remaining) > 0) { + //check that balance increased and update integral + if (_supply > 0 && bal > reward.reward_remaining) { reward.reward_integral = reward.reward_integral + - uint128(bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); + (bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); } //update user integrals @@ -263,20 +260,20 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { if (_isClaim || userI < reward.reward_integral) { if (_isClaim) { uint256 receiveable = reward.claimable_reward[_accounts[u]].add( - _balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20) + _balances[u].mul(reward.reward_integral.sub(userI)).div(1e20) ); if (receiveable > 0) { reward.claimable_reward[_accounts[u]] = 0; //cheat for gas savings by transfering to the second index in accounts list //if claiming only the 0 index will update so 1 index can hold forwarding info //guaranteed to have an address in u+1 so no need to check - IERC20(reward.reward_token).safeTransfer(_accounts[u + 1], receiveable); + _transferReward(reward.reward_token, _accounts[u + 1], receiveable); bal = bal.sub(receiveable); } } else { reward.claimable_reward[_accounts[u]] = reward .claimable_reward[_accounts[u]] - .add(_balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20)); + .add(_balances[u].mul(reward.reward_integral.sub(userI)).div(1e20)); } reward.reward_integral_for[_accounts[u]] = reward.reward_integral; } @@ -284,7 +281,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //update remaining reward here since balance could have changed if claiming if (bal != reward.reward_remaining) { - reward.reward_remaining = uint128(bal); + reward.reward_remaining = bal; } } @@ -294,16 +291,13 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { depositedBalance[0] = _getDepositedBalance(_accounts[0]); depositedBalance[1] = _getDepositedBalance(_accounts[1]); - if (!isShutdown()) { - IRewardStaking(convexPool).getReward(address(this), true); - } - - _claimExtras(); + IRewardStaking(convexPool).getReward(address(this), true); uint256 rewardCount = rewards.length; for (uint256 i = 0; i < rewardCount; i++) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, false); } + emit UserCheckpoint(_accounts[0], _accounts[1]); } function _checkpointAndClaim(address[2] memory _accounts) internal nonReentrant { @@ -313,17 +307,11 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { IRewardStaking(convexPool).getReward(address(this), true); - _claimExtras(); - uint256 rewardCount = rewards.length; for (uint256 i = 0; i < rewardCount; i++) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, true); } - } - - //claim any rewards not part of the convex pool - function _claimExtras() internal virtual { - //override and add external reward claiming + emit UserCheckpoint(_accounts[0], _accounts[1]); } function user_checkpoint(address _account) external returns (bool) { @@ -337,81 +325,54 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //run earned as a mutable function to claim everything before calculating earned rewards function earned(address _account) external returns (EarnedData[] memory claimable) { - IRewardStaking(convexPool).getReward(address(this), true); - _claimExtras(); - return _earned(_account); - } - - //run earned as a non-mutative function that may not claim everything, but should report standard convex rewards - function earnedView(address _account) external view returns (EarnedData[] memory claimable) { + //checkpoint to pull in and tally new rewards + _checkpoint([_account, address(0)]); return _earned(_account); } function _earned(address _account) internal view returns (EarnedData[] memory claimable) { - uint256 supply = _getTotalSupply(); - // uint256 depositedBalance = _getDepositedBalance(_account); uint256 rewardCount = rewards.length; claimable = new EarnedData[](rewardCount); for (uint256 i = 0; i < rewardCount; i++) { RewardType storage reward = rewards[i]; - - //change in reward is current balance - remaining reward + earned - uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); - uint256 d_reward = bal.sub(reward.reward_remaining); - - //some rewards (like minted cvx) may not have a reward pool directly on the convex pool so check if it exists - if (reward.reward_pool != address(0)) { - //add earned from the convex reward pool for the given token - d_reward = d_reward.add(IRewardStaking(reward.reward_pool).earned(address(this))); - } - - uint256 I = reward.reward_integral; - if (supply > 0) { - I = I + d_reward.mul(1e20).div(supply); + if (reward.reward_token == address(0)) { + continue; } - uint256 newlyClaimable = _getDepositedBalance(_account) - .mul(I.sub(reward.reward_integral_for[_account])) - .div(1e20); - claimable[i].amount = claimable[i].amount.add( - reward.claimable_reward[_account].add(newlyClaimable) - ); + claimable[i].amount = reward.claimable_reward[_account]; claimable[i].token = reward.reward_token; - - //calc cvx minted from crv and add to cvx claimables - //note: crv is always index 0 so will always run before cvx - if (i == CRV_INDEX) { - //because someone can call claim for the pool outside of checkpoints, need to recalculate crv without the local balance - I = reward.reward_integral; - if (supply > 0) { - I = - I + - IRewardStaking(reward.reward_pool).earned(address(this)).mul(1e20).div( - supply - ); - } - newlyClaimable = _getDepositedBalance(_account) - .mul(I.sub(reward.reward_integral_for[_account])) - .div(1e20); - claimable[CVX_INDEX].amount = CvxMining.ConvertCrvToCvx(newlyClaimable); - claimable[CVX_INDEX].token = cvx; - } } return claimable; } function claimRewards() external { - uint256 cvxOldBal = IERC20(cvx).balanceOf(msg.sender); - uint256 crvOldBal = IERC20(crv).balanceOf(msg.sender); - _checkpointAndClaim([address(msg.sender), address(msg.sender)]); - emit RewardsClaimed(IERC20(cvx), IERC20(cvx).balanceOf(msg.sender) - cvxOldBal); - emit RewardsClaimed(IERC20(crv), IERC20(crv).balanceOf(msg.sender) - crvOldBal); + address _account = rewardRedirect[msg.sender] == address(0) + ? msg.sender + : rewardRedirect[msg.sender]; + + uint256 cvxOldBal = IERC20(cvx).balanceOf(_account); + uint256 crvOldBal = IERC20(crv).balanceOf(_account); + _checkpointAndClaim([msg.sender, _account]); + emit RewardsClaimed(IERC20(cvx), IERC20(cvx).balanceOf(_account) - cvxOldBal); + emit RewardsClaimed(IERC20(crv), IERC20(crv).balanceOf(_account) - crvOldBal); + } + + //set any claimed rewards to automatically go to a different address + //set address to zero to disable + function setRewardRedirect(address _to) external nonReentrant { + rewardRedirect[msg.sender] = _to; + emit RewardRedirected(msg.sender, _to); } function getReward(address _account) external { - //claim directly in checkpoint logic to save a bit of gas - _checkpointAndClaim([_account, _account]); + //check if there is a redirect address + if (rewardRedirect[_account] != address(0)) { + _checkpointAndClaim([_account, rewardRedirect[_account]]); + } else { + //claim directly in checkpoint logic to save a bit of gas + _checkpointAndClaim([_account, _account]); + } } function getReward(address _account, address _forwardTo) external { @@ -423,8 +384,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //deposit a curve token function deposit(uint256 _amount, address _to) external { - require(!isShutdown(), "shutdown"); - //dont need to call checkpoint since _mint() will if (_amount > 0) { @@ -438,8 +397,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //stake a convex token function stake(uint256 _amount, address _to) external { - require(!isShutdown(), "shutdown"); - //dont need to call checkpoint since _mint() will if (_amount > 0) { @@ -485,4 +442,9 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { ) internal override { _checkpoint([_from, _to]); } + + //helper function + function earmarkRewards() external returns (bool) { + return IBooster(convexBooster).earmarkRewards(convexPoolId); + } } diff --git a/scripts/deployment/phase1-common/1_deploy_libraries.ts b/scripts/deployment/phase1-common/1_deploy_libraries.ts index 35fc34e373..78a4efa683 100644 --- a/scripts/deployment/phase1-common/1_deploy_libraries.ts +++ b/scripts/deployment/phase1-common/1_deploy_libraries.ts @@ -8,7 +8,6 @@ import { BasketLibP1, CvxMining, RecollateralizationLibP1 } from '../../../typec let tradingLib: RecollateralizationLibP1 let basketLib: BasketLibP1 -let cvxMiningLib: CvxMining async function main() { // ==== Read Configuration ==== @@ -16,7 +15,7 @@ async function main() { const chainId = await getChainId(hre) console.log( - `Deploying TradingLib, BasketLib, and CvxMining to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}` + `Deploying TradingLib, BasketLib to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}` ) if (!networkConfig[chainId]) { @@ -46,20 +45,9 @@ async function main() { fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) - // Deploy CvxMining external library - if (!baseL2Chains.includes(hre.network.name)) { - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - cvxMiningLib = await CvxMiningFactory.connect(burner).deploy() - await cvxMiningLib.deployed() - deployments.cvxMiningLib = cvxMiningLib.address - - fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) - } - console.log(`Deployed to ${hre.network.name} (${chainId}): TradingLib: ${tradingLib.address} BasketLib: ${basketLib.address} - CvxMiningLib: ${cvxMiningLib ? cvxMiningLib.address : 'N/A'} Deployment file: ${deploymentFilename}`) } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts index e7b53d4f51..b382962e58 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts @@ -63,13 +63,10 @@ async function main() { /******** Deploy Convex Stable Metapool for eUSD/fraxBP **************************/ - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory( 'CurveStableRTokenMetapoolCollateral' ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await ConvexStakingWrapperFactory.deploy() await wPool.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts index 4a2c1c6eab..6727ff25d7 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts @@ -69,13 +69,10 @@ async function main() { /******** Deploy Convex Stable Metapool for MIM/3Pool **************************/ - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory( 'CurveStableMetapoolCollateral' ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await ConvexStakingWrapperFactory.deploy() await wPool.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts index bc52c467c9..abd65d88b6 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts @@ -65,11 +65,8 @@ async function main() { /******** Deploy Convex Stable Pool for 3pool **************************/ - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const w3Pool = await ConvexStakingWrapperFactory.deploy() await w3Pool.deployed() diff --git a/scripts/verification/collateral-plugins/verify_convex_stable.ts b/scripts/verification/collateral-plugins/verify_convex_stable.ts index cd7ffc0e86..127ef39143 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable.ts @@ -61,17 +61,7 @@ async function main() { chainId, await w3PoolCollateral.erc20(), [], - 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper', - { CvxMining: coreDeployments.cvxMiningLib } - ) - - /******** Verify CvxMining Lib **************************/ - - await verifyContract( - chainId, - coreDeployments.cvxMiningLib, - [], - 'contracts/plugins/assets/curve/cvx/vendor/CvxMining.sol:CvxMining' + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' ) /******** Verify 3Pool plugin **************************/ diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 09fde97a48..3d95a3b5a5 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -413,53 +413,6 @@ const collateralSpecificStatusTests = () => { const finalRefPerTok = await multiFeedCollateral.refPerTok() expect(finalRefPerTok).to.equal(initialRefPerTok) }) - - it('handles shutdown correctly', async () => { - const fix = await makeW3PoolStable() - const [, alice, bob] = await ethers.getSigners() - const amount = fp('100') - const rewardPerBlock = bn('83197823300') - - const lpToken = ( - await ethers.getContractAt( - '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', - await fix.wrapper.curveToken() - ) - ) - const CRV = ( - await ethers.getContractAt( - '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', - '0xD533a949740bb3306d119CC777fa900bA034cd52' - ) - ) - await whileImpersonating(THREE_POOL_HOLDER, async (signer) => { - await lpToken.connect(signer).transfer(alice.address, amount.mul(2)) - }) - - await lpToken.connect(alice).approve(fix.wrapper.address, ethers.constants.MaxUint256) - await fix.wrapper.connect(alice).deposit(amount, alice.address) - - // let's shutdown! - await fix.wrapper.shutdown() - - const prevBalance = await CRV.balanceOf(alice.address) - await fix.wrapper.connect(alice).claimRewards() - expect(await CRV.balanceOf(alice.address)).to.be.eq(prevBalance.add(rewardPerBlock)) - - const prevBalanceBob = await CRV.balanceOf(bob.address) - - // transfer to bob - await fix.wrapper - .connect(alice) - .transfer(bob.address, await fix.wrapper.balanceOf(alice.address)) - - await fix.wrapper.connect(bob).claimRewards() - expect(await CRV.balanceOf(bob.address)).to.be.eq(prevBalanceBob.add(rewardPerBlock)) - - await expect(fix.wrapper.connect(alice).deposit(amount, alice.address)).to.be.reverted - await expect(fix.wrapper.connect(bob).withdraw(await fix.wrapper.balanceOf(bob.address))).to.not - .be.reverted - }) } /* diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index 77081254f6..a3bfbb93dc 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -71,14 +71,8 @@ export const makeW3PoolStable = async (): Promise => ) await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) - // Deploy external cvxMining lib - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - const cvxMining = await CvxMiningFactory.deploy() - // Deploy Wrapper - const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: cvxMining.address }, - }) + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wrapper = await wrapperFactory.deploy() await wrapper.initialize(THREE_POOL_CVX_POOL_ID) @@ -124,14 +118,8 @@ export const makeWSUSDPoolStable = async (): Promise => { await realMetapool.balanceOf(MIM_THREE_POOL_HOLDER) ) - // Deploy external cvxMining lib - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - const cvxMining = await CvxMiningFactory.deploy() - // Deploy Wrapper - const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: cvxMining.address }, - }) + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await wrapperFactory.deploy() await wPool.initialize(MIM_THREE_POOL_POOL_ID) From 259bdd65f50f0dc1eab26e30595019dbbcae4bb4 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Tue, 28 Nov 2023 16:39:15 -0500 Subject: [PATCH 140/450] fix scripts, add base support, update addys. (#1011) --- .env.example | 1 + docs/deployed-addresses/1-ETH+.md | 32 ++--- docs/deployed-addresses/1-USDC+.md | 24 ++++ docs/deployed-addresses/1-assets-2.0.0.md | 31 +++++ docs/deployed-addresses/1-assets-3.0.0.md | 55 ++++++++ docs/deployed-addresses/1-assets-3.0.1.md | 55 ++++++++ docs/deployed-addresses/1-components-2.0.0.md | 28 ++++ docs/deployed-addresses/1-components-2.1.0.md | 58 ++++---- docs/deployed-addresses/1-components-3.0.0.md | 30 +++++ docs/deployed-addresses/1-components-3.0.1.md | 30 +++++ docs/deployed-addresses/1-eUSD.md | 34 ++--- docs/deployed-addresses/1-hyUSD.md | 34 ++--- docs/deployed-addresses/8453-Vaya.md | 24 ++++ docs/deployed-addresses/8453-assets-3.0.0.md | 17 +++ docs/deployed-addresses/8453-assets-3.0.1.md | 18 +++ .../8453-components-3.0.0.md | 29 ++++ .../8453-components-3.0.1.md | 29 ++++ docs/deployed-addresses/8453-hyUSD.md | 24 ++++ hardhat.config.ts | 5 +- scripts/compile-addresses.sh | 37 +++++ tasks/deployment/get-addresses.ts | 126 +++++++++++------- utils/env.ts | 1 + 22 files changed, 592 insertions(+), 130 deletions(-) create mode 100644 docs/deployed-addresses/1-USDC+.md create mode 100644 docs/deployed-addresses/1-assets-2.0.0.md create mode 100644 docs/deployed-addresses/1-assets-3.0.0.md create mode 100644 docs/deployed-addresses/1-assets-3.0.1.md create mode 100644 docs/deployed-addresses/1-components-2.0.0.md create mode 100644 docs/deployed-addresses/1-components-3.0.0.md create mode 100644 docs/deployed-addresses/1-components-3.0.1.md create mode 100644 docs/deployed-addresses/8453-Vaya.md create mode 100644 docs/deployed-addresses/8453-assets-3.0.0.md create mode 100644 docs/deployed-addresses/8453-assets-3.0.1.md create mode 100644 docs/deployed-addresses/8453-components-3.0.0.md create mode 100644 docs/deployed-addresses/8453-components-3.0.1.md create mode 100644 docs/deployed-addresses/8453-hyUSD.md create mode 100755 scripts/compile-addresses.sh diff --git a/.env.example b/.env.example index 98f4a01a35..a9a6f277c9 100644 --- a/.env.example +++ b/.env.example @@ -15,6 +15,7 @@ MNEMONIC='copy here your mnemonic words' # Etherscan API - for contract verification ETHERSCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1 +BASESCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1 # WARNING: all of the following will make SLOW a truthy value: # SLOW=0 diff --git a/docs/deployed-addresses/1-ETH+.md b/docs/deployed-addresses/1-ETH+.md index cbb06461a1..0445b0a03b 100644 --- a/docs/deployed-addresses/1-ETH+.md +++ b/docs/deployed-addresses/1-ETH+.md @@ -1,24 +1,24 @@ -# [ETH+ (ETHPlus)](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) +# [ETH+ (ETHPlus) - Mainnet](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) | [0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1](https://etherscan.io/address/0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1#code) | 2.1.0 | -| Main | [0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2](https://etherscan.io/address/0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2) | [0x143c35bfe04720394ebd18abeca83ea9d8bede2f](https://etherscan.io/address/0x143c35bfe04720394ebd18abeca83ea9d8bede2f#code) | 2.0.0 | -| AssetRegistry | [0xf526f058858E4cD060cFDD775077999562b31bE0](https://etherscan.io/address/0xf526f058858E4cD060cFDD775077999562b31bE0) | [0x5a004f70b2450e909b4048050c585549ab8afeb8](https://etherscan.io/address/0x5a004f70b2450e909b4048050c585549ab8afeb8#code) | 2.0.0 | -| BackingManager | [0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B](https://etherscan.io/address/0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B) | [0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc](https://etherscan.io/address/0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc#code) | 2.0.0 | -| BasketHandler | [0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194](https://etherscan.io/address/0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194) | [0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030](https://etherscan.io/address/0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030#code) | 2.1.0 | -| Broker | [0x6ca42ce37e5ece334066C504ba37144b4f14D50a](https://etherscan.io/address/0x6ca42ce37e5ece334066C504ba37144b4f14D50a) | [0x89209a52d085d975b14555f3e828f43fb7eaf3b7](https://etherscan.io/address/0x89209a52d085d975b14555f3e828f43fb7eaf3b7#code) | 2.1.0 | -| RSRTrader | [0x6E20823cA50aA026b99789c8D468a01f8aA3581C](https://etherscan.io/address/0x6E20823cA50aA026b99789c8D468a01f8aA3581C) | [](https://etherscan.io/address/#code) | 2.0.0 | -| RTokenTrader | [0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9](https://etherscan.io/address/0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | -| Distributor | [0x954B4770462e8894BcD2451543482F11DC160e1e](https://etherscan.io/address/0x954B4770462e8894BcD2451543482F11DC160e1e) | [](https://etherscan.io/address/#code) | 2.0.0 | -| Furnace | [0x9862efAB36F81524B24F787e07C97e2F5A6c206e](https://etherscan.io/address/0x9862efAB36F81524B24F787e07C97e2F5A6c206e) | [](https://etherscan.io/address/#code) | 2.0.0 | -| StRSR | [0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd](https://etherscan.io/address/0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd) | [0xfda8c62d86e426d5fb653b6c44a455bb657b693f](https://etherscan.io/address/0xfda8c62d86e426d5fb653b6c44a455bb657b693f#code) | 2.1.0 | +| RToken | [0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | +| Main | [0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2](https://etherscan.io/address/0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | +| AssetRegistry | [0xf526f058858E4cD060cFDD775077999562b31bE0](https://etherscan.io/address/0xf526f058858E4cD060cFDD775077999562b31bE0) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | +| BackingManager | [0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B](https://etherscan.io/address/0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B) |[0xbbc532a80dd141449330c1232c953da6801aed01](https://etherscan.io/address/0xbbc532a80dd141449330c1232c953da6801aed01#code) | 3.0.1 | +| BasketHandler | [0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194](https://etherscan.io/address/0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | +| Broker | [0x6ca42ce37e5ece334066C504ba37144b4f14D50a](https://etherscan.io/address/0x6ca42ce37e5ece334066C504ba37144b4f14D50a) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | +| RSRTrader | [0x6E20823cA50aA026b99789c8D468a01f8aA3581C](https://etherscan.io/address/0x6E20823cA50aA026b99789c8D468a01f8aA3581C) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | +| RTokenTrader | [0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9](https://etherscan.io/address/0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | +| Distributor | [0x954B4770462e8894BcD2451543482F11DC160e1e](https://etherscan.io/address/0x954B4770462e8894BcD2451543482F11DC160e1e) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | +| Furnace | [0x9862efAB36F81524B24F787e07C97e2F5A6c206e](https://etherscan.io/address/0x9862efAB36F81524B24F787e07C97e2F5A6c206e) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | +| StRSR | [0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd](https://etherscan.io/address/0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | ## Governance Addresses -| Contract | Address | Implementation | Version | -| --- | --- | --- | --- | -| Governor Alexios | [0x239cDcBE174B4728c870A24F77540dAB3dC5F981](https://etherscan.io/address/0x239cDcBE174B4728c870A24F77540dAB3dC5F981) | [](https://etherscan.io/address/#code) | 1 | -| Timelock | [0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B](https://etherscan.io/address/0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B) | [](https://etherscan.io/address/#code) | N/A | +| Contract | Address | +| --- | --- | +| Governor Alexios | [0x239cDcBE174B4728c870A24F77540dAB3dC5F981](https://etherscan.io/address/0x239cDcBE174B4728c870A24F77540dAB3dC5F981) | +| Timelock | [0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B](https://etherscan.io/address/0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B) | \ No newline at end of file diff --git a/docs/deployed-addresses/1-USDC+.md b/docs/deployed-addresses/1-USDC+.md new file mode 100644 index 0000000000..ace1aba0ab --- /dev/null +++ b/docs/deployed-addresses/1-USDC+.md @@ -0,0 +1,24 @@ +# [USDC+ (USDC Plus) - Mainnet](https://etherscan.io/address/0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b](https://etherscan.io/address/0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | +| Main | [0xeC11Cf537497141aC820615F4f399be4a1638Af6](https://etherscan.io/address/0xeC11Cf537497141aC820615F4f399be4a1638Af6) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | +| AssetRegistry | [0xbCd2719E4862d1Eb32A36e8C956D3118ebB2f511](https://etherscan.io/address/0xbCd2719E4862d1Eb32A36e8C956D3118ebB2f511) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | +| BackingManager | [0x0Ea1f556fe149cBc75C25C12C9A804937144fbf2](https://etherscan.io/address/0x0Ea1f556fe149cBc75C25C12C9A804937144fbf2) |[0x0a388fc05aa017b31fb084e43e7aeafdbc043080](https://etherscan.io/address/0x0a388fc05aa017b31fb084e43e7aeafdbc043080#code) | 3.0.0 | +| BasketHandler | [0x162587b5B4c01d26AfaFD4A1ccA61CdC632c9508](https://etherscan.io/address/0x162587b5B4c01d26AfaFD4A1ccA61CdC632c9508) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | +| Broker | [0x7aFc1d0bDFE2F3887466534516447bA4cE97B305](https://etherscan.io/address/0x7aFc1d0bDFE2F3887466534516447bA4cE97B305) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | +| RSRTrader | [0x892E53828E264c142C929ce8f852352E6b799e19](https://etherscan.io/address/0x892E53828E264c142C929ce8f852352E6b799e19) |[0x1cca3fbb11c4b734183f997679d52defa74b613a](https://etherscan.io/address/0x1cca3fbb11c4b734183f997679d52defa74b613a#code) | 3.0.0 | +| RTokenTrader | [0x0a1c10727F7aE292521078Dfc1280c6C01277EEf](https://etherscan.io/address/0x0a1c10727F7aE292521078Dfc1280c6C01277EEf) |[0x1cca3fbb11c4b734183f997679d52defa74b613a](https://etherscan.io/address/0x1cca3fbb11c4b734183f997679d52defa74b613a#code) | 3.0.0 | +| Distributor | [0x348F00534b0aa8b575D24356E7C3e1a5e6403fA1](https://etherscan.io/address/0x348F00534b0aa8b575D24356E7C3e1a5e6403fA1) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | +| Furnace | [0x106f0A726cBcfAFadB6405860b37F78d287C44e1](https://etherscan.io/address/0x106f0A726cBcfAFadB6405860b37F78d287C44e1) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | +| StRSR | [0x1C77EBBab708153f5f899C29b155a6cc92A2Ac40](https://etherscan.io/address/0x1C77EBBab708153f5f899C29b155a6cc92A2Ac40) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | + + +## Governance Addresses +| Contract | Address | +| --- | --- | +| Governor Alexios | [0xc837C557071D604bCb1058c8c4891ddBe8FDD630](https://etherscan.io/address/0xc837C557071D604bCb1058c8c4891ddBe8FDD630) | +| Timelock | [0x6C957417cB6DF6e821eec8555DEE8b116C291999](https://etherscan.io/address/0x6C957417cB6DF6e821eec8555DEE8b116C291999) | + + \ No newline at end of file diff --git a/docs/deployed-addresses/1-assets-2.0.0.md b/docs/deployed-addresses/1-assets-2.0.0.md new file mode 100644 index 0000000000..a748236e86 --- /dev/null +++ b/docs/deployed-addresses/1-assets-2.0.0.md @@ -0,0 +1,31 @@ +# Assets (Mainnet 2.0.0) +## Assets +| Contract | Address | +| --- | --- | +| stkAAVE | [0xC6e5CF6a9d215D2D3d4D433FABaeA44D5f396c43](https://etherscan.io/address/0xC6e5CF6a9d215D2D3d4D433FABaeA44D5f396c43) | +| COMP | [0xd5cc2875Bbc53AFBcc41Bf04E7bA37F2894CBFa1](https://etherscan.io/address/0xd5cc2875Bbc53AFBcc41Bf04E7bA37F2894CBFa1) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0x77CFE9fe00D45DF94a18aB34Af451199aAab2b5e](https://etherscan.io/address/0x77CFE9fe00D45DF94a18aB34Af451199aAab2b5e) | +| USDC | [0x9837ce9825d52672ca02533b5a160212bf901963](https://etherscan.io/address/0x9837ce9825d52672ca02533b5a160212bf901963) | +| USDT | [0x8960ae89C8fEe76515c1Fa5DAbc100996E143798](https://etherscan.io/address/0x8960ae89C8fEe76515c1Fa5DAbc100996E143798) | +| USDP | [0xFDC36294aF736122456687D14DE7d42598319b7C](https://etherscan.io/address/0xFDC36294aF736122456687D14DE7d42598319b7C) | +| TUSD | [0x95171C5C8602F889fD052e978B4B2a8D56e357a5](https://etherscan.io/address/0x95171C5C8602F889fD052e978B4B2a8D56e357a5) | +| BUSD | [0x9f99F37Fe0b419b3661403DeceA09bC44F615D46](https://etherscan.io/address/0x9f99F37Fe0b419b3661403DeceA09bC44F615D46) | +| aDAI | [0xF934c3dbD394E3D24DB539eF6c044a03090Cd702](https://etherscan.io/address/0xF934c3dbD394E3D24DB539eF6c044a03090Cd702) | +| aUSDC | [0xE5a1da41af2919A43daC3ea22C2Bdd230a3E19f5](https://etherscan.io/address/0xE5a1da41af2919A43daC3ea22C2Bdd230a3E19f5) | +| aUSDT | [0x7FDbE32980861CC63751a0aEa5a5b3Ecb5119ACD](https://etherscan.io/address/0x7FDbE32980861CC63751a0aEa5a5b3Ecb5119ACD) | +| aBUSD | [0xCBD013Dc8387B69620EE3c44c665826852686f24](https://etherscan.io/address/0xCBD013Dc8387B69620EE3c44c665826852686f24) | +| aUSDP | [0x1d51a359e113DBb71F3fE49108FF53990770b61c](https://etherscan.io/address/0x1d51a359e113DBb71F3fE49108FF53990770b61c) | +| cDAI | [0x2b28364A0E9c37BFb0685cB441f11D686F1a9b6c](https://etherscan.io/address/0x2b28364A0E9c37BFb0685cB441f11D686F1a9b6c) | +| cUSDC | [0x8a01936B12bcbEEC394ed497600eDe41D409a83F](https://etherscan.io/address/0x8a01936B12bcbEEC394ed497600eDe41D409a83F) | +| cUSDT | [0x69Bd37B82794d64DC0C8c9652a6151f8954fD378](https://etherscan.io/address/0x69Bd37B82794d64DC0C8c9652a6151f8954fD378) | +| cUSDP | [0xe4c0Ba009782A8908A3821b4950d9d75ECdB2dA6](https://etherscan.io/address/0xe4c0Ba009782A8908A3821b4950d9d75ECdB2dA6) | +| cWBTC | [0x03BCc97B6B0Bb7bc0D5497792F912A20bC64d162](https://etherscan.io/address/0x03BCc97B6B0Bb7bc0D5497792F912A20bC64d162) | +| cETH | [0xdDB74ee1Ce4fa8185217E73fD0666703f58c424C](https://etherscan.io/address/0xdDB74ee1Ce4fa8185217E73fD0666703f58c424C) | +| WBTC | [0xA9C7aE7a71355E5D7A901fB5153D7339f7195A13](https://etherscan.io/address/0xA9C7aE7a71355E5D7A901fB5153D7339f7195A13) | +| WETH | [0xB3522270B6d8a02AA6d789eA887B1D34af35A193](https://etherscan.io/address/0xB3522270B6d8a02AA6d789eA887B1D34af35A193) | +| EURT | [0xb4eB87250Ecd8f32BeA775dA6D164D92A398d05b](https://etherscan.io/address/0xb4eB87250Ecd8f32BeA775dA6D164D92A398d05b) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-assets-3.0.0.md b/docs/deployed-addresses/1-assets-3.0.0.md new file mode 100644 index 0000000000..63a703592a --- /dev/null +++ b/docs/deployed-addresses/1-assets-3.0.0.md @@ -0,0 +1,55 @@ +# Assets (Mainnet 3.0.0) +## Assets +| Contract | Address | +| --- | --- | +| stkAAVE | [0x6647c880Eb8F57948AF50aB45fca8FE86C154D24](https://etherscan.io/address/0x6647c880Eb8F57948AF50aB45fca8FE86C154D24) | +| COMP | [0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1](https://etherscan.io/address/0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1) | +| CRV | [0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA](https://etherscan.io/address/0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA) | +| CVX | [0x4024c00bBD0C420E719527D88781bc1543e63dd5](https://etherscan.io/address/0x4024c00bBD0C420E719527D88781bc1543e63dd5) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833](https://etherscan.io/address/0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833) | +| USDC | [0xBE9D23040fe22E8Bd8A88BF5101061557355cA04](https://etherscan.io/address/0xBE9D23040fe22E8Bd8A88BF5101061557355cA04) | +| USDT | [0x58D7bF13D3572b08dE5d96373b8097d94B1325ad](https://etherscan.io/address/0x58D7bF13D3572b08dE5d96373b8097d94B1325ad) | +| USDP | [0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89](https://etherscan.io/address/0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89) | +| TUSD | [0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2](https://etherscan.io/address/0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2) | +| BUSD | [0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423](https://etherscan.io/address/0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423) | +| aDAI | [0x256b89658bD831CC40283F42e85B1fa8973Db0c9](https://etherscan.io/address/0x256b89658bD831CC40283F42e85B1fa8973Db0c9) | +| aUSDC | [0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51](https://etherscan.io/address/0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51) | +| aUSDT | [0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef](https://etherscan.io/address/0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef) | +| aBUSD | [0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05](https://etherscan.io/address/0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05) | +| aUSDP | [0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd](https://etherscan.io/address/0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd) | +| cDAI | [0x33A8d92B2BE84755441C2b6e39715c4b8938242c](https://etherscan.io/address/0x33A8d92B2BE84755441C2b6e39715c4b8938242c) | +| cUSDC | [0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D](https://etherscan.io/address/0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D) | +| cUSDT | [0x0EEa20c426EcE7D3dA5b73946bb1626697aA7c59](https://etherscan.io/address/0x0EEa20c426EcE7D3dA5b73946bb1626697aA7c59) | +| cUSDP | [0xA7eCF508CdF5a88ae93b899DE4fcACcB43112Ce8](https://etherscan.io/address/0xA7eCF508CdF5a88ae93b899DE4fcACcB43112Ce8) | +| cWBTC | [0xa570BF93FC51406809dBf52aB898913541C91C20](https://etherscan.io/address/0xa570BF93FC51406809dBf52aB898913541C91C20) | +| cETH | [0xeC12e8412a7AE4598d754f4016D487c269719856](https://etherscan.io/address/0xeC12e8412a7AE4598d754f4016D487c269719856) | +| WBTC | [0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4](https://etherscan.io/address/0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4) | +| WETH | [0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3](https://etherscan.io/address/0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3) | +| EURT | [0xEBD07CE38e2f46031c982136012472A4D24AE070](https://etherscan.io/address/0xEBD07CE38e2f46031c982136012472A4D24AE070) | +| wstETH | [0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C](https://etherscan.io/address/0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C) | +| rETH | [0x1103851D1FCDD3f88096fbed812c8FF01949cF9d](https://etherscan.io/address/0x1103851D1FCDD3f88096fbed812c8FF01949cF9d) | +| fUSDC | [0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA](https://etherscan.io/address/0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA) | +| fUSDT | [0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A](https://etherscan.io/address/0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A) | +| fDAI | [0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875](https://etherscan.io/address/0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875) | +| fFRAX | [0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92](https://etherscan.io/address/0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92) | +| cUSDCv3 | [0x85b256e9051B781A0BC0A987857AD6166C94040a](https://etherscan.io/address/0x85b256e9051B781A0BC0A987857AD6166C94040a) | +| cvx3Pool | [0x62C394620f674e85768a7618a6C202baE7fB8Dd1](https://etherscan.io/address/0x62C394620f674e85768a7618a6C202baE7fB8Dd1) | +| cvxeUSDFRAXBP | [0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122](https://etherscan.io/address/0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122) | +| cvxMIM3Pool | [0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7](https://etherscan.io/address/0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7) | +| crv3Pool | [0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D](https://etherscan.io/address/0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D) | +| crveUSDFRAXBP | [0xC87CDFFD680D57BF50De4C364BF4277B8A90098E](https://etherscan.io/address/0xC87CDFFD680D57BF50De4C364BF4277B8A90098E) | +| crvMIM3Pool | [0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa](https://etherscan.io/address/0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa) | +| sDAI | [0xde0e2f0c9792617d3908d92a024caa846354cea2](https://etherscan.io/address/0xde0e2f0c9792617d3908d92a024caa846354cea2) | +| cbETH | [0x3962695aCce0Efce11cFf997890f3D1D7467ec40](https://etherscan.io/address/0x3962695aCce0Efce11cFf997890f3D1D7467ec40) | +| maUSDT | [0xd000a79bd2a07eb6d2e02ecad73437de40e52d69](https://etherscan.io/address/0xd000a79bd2a07eb6d2e02ecad73437de40e52d69) | +| maUSDC | [0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7](https://etherscan.io/address/0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7) | +| maDAI | [0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB](https://etherscan.io/address/0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB) | +| maWBTC | [0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250](https://etherscan.io/address/0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250) | +| maWETH | [0x878b995bDD2D9900BEE896Bd78ADd877672e1637](https://etherscan.io/address/0x878b995bDD2D9900BEE896Bd78ADd877672e1637) | +| maStETH | [0x33E840e5711549358f6d4D11F9Ab2896B36E9822](https://etherscan.io/address/0x33E840e5711549358f6d4D11F9Ab2896B36E9822) | +| aEthUSDC | [0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba](https://etherscan.io/address/0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-assets-3.0.1.md b/docs/deployed-addresses/1-assets-3.0.1.md new file mode 100644 index 0000000000..2b586a2b80 --- /dev/null +++ b/docs/deployed-addresses/1-assets-3.0.1.md @@ -0,0 +1,55 @@ +# Assets (Mainnet 3.0.1) +## Assets +| Contract | Address | +| --- | --- | +| stkAAVE | [0x6647c880Eb8F57948AF50aB45fca8FE86C154D24](https://etherscan.io/address/0x6647c880Eb8F57948AF50aB45fca8FE86C154D24) | +| COMP | [0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1](https://etherscan.io/address/0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1) | +| CRV | [0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA](https://etherscan.io/address/0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA) | +| CVX | [0x4024c00bBD0C420E719527D88781bc1543e63dd5](https://etherscan.io/address/0x4024c00bBD0C420E719527D88781bc1543e63dd5) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833](https://etherscan.io/address/0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833) | +| USDC | [0xBE9D23040fe22E8Bd8A88BF5101061557355cA04](https://etherscan.io/address/0xBE9D23040fe22E8Bd8A88BF5101061557355cA04) | +| USDT | [0x58D7bF13D3572b08dE5d96373b8097d94B1325ad](https://etherscan.io/address/0x58D7bF13D3572b08dE5d96373b8097d94B1325ad) | +| USDP | [0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89](https://etherscan.io/address/0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89) | +| TUSD | [0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2](https://etherscan.io/address/0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2) | +| BUSD | [0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423](https://etherscan.io/address/0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423) | +| aDAI | [0x256b89658bD831CC40283F42e85B1fa8973Db0c9](https://etherscan.io/address/0x256b89658bD831CC40283F42e85B1fa8973Db0c9) | +| aUSDC | [0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51](https://etherscan.io/address/0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51) | +| aUSDT | [0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef](https://etherscan.io/address/0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef) | +| aBUSD | [0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05](https://etherscan.io/address/0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05) | +| aUSDP | [0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd](https://etherscan.io/address/0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd) | +| cDAI | [0x33A8d92B2BE84755441C2b6e39715c4b8938242c](https://etherscan.io/address/0x33A8d92B2BE84755441C2b6e39715c4b8938242c) | +| cUSDC | [0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D](https://etherscan.io/address/0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D) | +| cUSDT | [0x0EEa20c426EcE7D3dA5b73946bb1626697aA7c59](https://etherscan.io/address/0x0EEa20c426EcE7D3dA5b73946bb1626697aA7c59) | +| cUSDP | [0xA7eCF508CdF5a88ae93b899DE4fcACcB43112Ce8](https://etherscan.io/address/0xA7eCF508CdF5a88ae93b899DE4fcACcB43112Ce8) | +| cWBTC | [0xa570BF93FC51406809dBf52aB898913541C91C20](https://etherscan.io/address/0xa570BF93FC51406809dBf52aB898913541C91C20) | +| cETH | [0xeC12e8412a7AE4598d754f4016D487c269719856](https://etherscan.io/address/0xeC12e8412a7AE4598d754f4016D487c269719856) | +| WBTC | [0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4](https://etherscan.io/address/0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4) | +| WETH | [0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3](https://etherscan.io/address/0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3) | +| EURT | [0xEBD07CE38e2f46031c982136012472A4D24AE070](https://etherscan.io/address/0xEBD07CE38e2f46031c982136012472A4D24AE070) | +| wstETH | [0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C](https://etherscan.io/address/0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C) | +| rETH | [0x1103851D1FCDD3f88096fbed812c8FF01949cF9d](https://etherscan.io/address/0x1103851D1FCDD3f88096fbed812c8FF01949cF9d) | +| fUSDC | [0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA](https://etherscan.io/address/0x3C0a9143063Fc306F7D3cBB923ff4879d70Cf1EA) | +| fUSDT | [0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A](https://etherscan.io/address/0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A) | +| fDAI | [0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875](https://etherscan.io/address/0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875) | +| fFRAX | [0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92](https://etherscan.io/address/0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92) | +| cUSDCv3 | [0x85b256e9051B781A0BC0A987857AD6166C94040a](https://etherscan.io/address/0x85b256e9051B781A0BC0A987857AD6166C94040a) | +| cvx3Pool | [0x62C394620f674e85768a7618a6C202baE7fB8Dd1](https://etherscan.io/address/0x62C394620f674e85768a7618a6C202baE7fB8Dd1) | +| cvxeUSDFRAXBP | [0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122](https://etherscan.io/address/0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122) | +| cvxMIM3Pool | [0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7](https://etherscan.io/address/0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7) | +| crv3Pool | [0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D](https://etherscan.io/address/0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D) | +| crveUSDFRAXBP | [0xC87CDFFD680D57BF50De4C364BF4277B8A90098E](https://etherscan.io/address/0xC87CDFFD680D57BF50De4C364BF4277B8A90098E) | +| crvMIM3Pool | [0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa](https://etherscan.io/address/0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa) | +| sDAI | [0xde0e2f0c9792617d3908d92a024caa846354cea2](https://etherscan.io/address/0xde0e2f0c9792617d3908d92a024caa846354cea2) | +| cbETH | [0x3962695aCce0Efce11cFf997890f3D1D7467ec40](https://etherscan.io/address/0x3962695aCce0Efce11cFf997890f3D1D7467ec40) | +| maUSDT | [0xd000a79bd2a07eb6d2e02ecad73437de40e52d69](https://etherscan.io/address/0xd000a79bd2a07eb6d2e02ecad73437de40e52d69) | +| maUSDC | [0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7](https://etherscan.io/address/0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7) | +| maDAI | [0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB](https://etherscan.io/address/0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB) | +| maWBTC | [0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250](https://etherscan.io/address/0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250) | +| maWETH | [0x878b995bDD2D9900BEE896Bd78ADd877672e1637](https://etherscan.io/address/0x878b995bDD2D9900BEE896Bd78ADd877672e1637) | +| maStETH | [0x33E840e5711549358f6d4D11F9Ab2896B36E9822](https://etherscan.io/address/0x33E840e5711549358f6d4D11F9Ab2896B36E9822) | +| aEthUSDC | [0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba](https://etherscan.io/address/0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-2.0.0.md b/docs/deployed-addresses/1-components-2.0.0.md new file mode 100644 index 0000000000..7d1551fe1a --- /dev/null +++ b/docs/deployed-addresses/1-components-2.0.0.md @@ -0,0 +1,28 @@ +# Component Implementations (Mainnet 2.0.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| AssetRegistry | [0x5a004F70b2450E909B4048050c585549Ab8afeB8](https://etherscan.io/address/0x5a004F70b2450E909B4048050c585549Ab8afeB8) | 2.0.0 | +| BackingManager | [0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC](https://etherscan.io/address/0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC) | 2.0.0 | +| BasketHandler | [0x0Ef3c7fE9c1cF7352D52E2867652b7547DeFdbe5](https://etherscan.io/address/0x0Ef3c7fE9c1cF7352D52E2867652b7547DeFdbe5) | 2.0.0 | +| Broker | [0x5a0f5e19E963206ec78FE8BF5fa53108918DD898](https://etherscan.io/address/0x5a0f5e19E963206ec78FE8BF5fa53108918DD898) | 2.0.0 | +| Deployer | [0xFd6CC4F251eaE6d02f9F7B41D1e80464D3d2F377](https://etherscan.io/address/0xFd6CC4F251eaE6d02f9F7B41D1e80464D3d2F377) | 2.0.0 | +| Distributor | [0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569](https://etherscan.io/address/0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569) | 2.0.0 | +| FacadeAct | [0xb80cb6068f743868D38b7abc2c55a720c06c44d0](https://etherscan.io/address/0xb80cb6068f743868D38b7abc2c55a720c06c44d0) | N/A | +| FacadeMonitor | [0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6](https://etherscan.io/address/0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6) | N/A | +| FacadeRead | [0x80b24e984e4fc92a4846b044286DcCcd66564DB9](https://etherscan.io/address/0x80b24e984e4fc92a4846b044286DcCcd66564DB9) | N/A | +| FacadeWrite | [0x24D0AAAC80a457Be7843C59d45a1B90fbb02ED8e](https://etherscan.io/address/0x24D0AAAC80a457Be7843C59d45a1B90fbb02ED8e) | N/A | +| FacadeWriteLib | [0x2117cb9b173077a5efd0e4ce0a21c6b3add65a26](https://etherscan.io/address/0x2117cb9b173077a5efd0e4ce0a21c6b3add65a26) | N/A | +| Furnace | [0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96](https://etherscan.io/address/0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96) | 2.0.0 | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | N/A | +| Main | [0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F](https://etherscan.io/address/0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F) | 2.0.0 | +| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | N/A | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | N/A | +| RsrAsset | [0x2c312da96f98a5b7822270f69afd2d7ae8e748dc](https://etherscan.io/address/0x2c312da96f98a5b7822270f69afd2d7ae8e748dc) | N/A | +| RsrTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | 2.0.0 | +| RToken | [0xEcbBA78d8cD654DFC582cB7FCF31D8a2A0B7A6cC](https://etherscan.io/address/0xEcbBA78d8cD654DFC582cB7FCF31D8a2A0B7A6cC) | 2.0.0 | +| RTokenTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | 2.0.0 | +| StRSR | [0x30B29539b5302Ebce52479275dfC9DFAbb66A047](https://etherscan.io/address/0x30B29539b5302Ebce52479275dfC9DFAbb66A047) | 2.0.0 | +| Trade | [0xAc543Ee89A2238945f7D7Ad4d9Cf958721f9757c](https://etherscan.io/address/0xAc543Ee89A2238945f7D7Ad4d9Cf958721f9757c) | N/A | +| TradingLib | [0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478](https://etherscan.io/address/0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-2.1.0.md b/docs/deployed-addresses/1-components-2.1.0.md index 4ead783227..7fecad6035 100644 --- a/docs/deployed-addresses/1-components-2.1.0.md +++ b/docs/deployed-addresses/1-components-2.1.0.md @@ -1,31 +1,31 @@ # Component Implementations (Mainnet 2.1.0) ## Component Addresses -| Contract | Address | Implementation | Version | -| --- | --- | --- | --- | -| AssetRegistry | [0x5a004F70b2450E909B4048050c585549Ab8afeB8](https://etherscan.io/address/0x5a004F70b2450E909B4048050c585549Ab8afeB8) | -| BackingManager | [0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC](https://etherscan.io/address/0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC) | -| BasketHandler | [0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030](https://etherscan.io/address/0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030) | -| Broker | [0x89209a52d085D975b14555F3e828F43fb7EaF3B7](https://etherscan.io/address/0x89209a52d085D975b14555F3e828F43fb7EaF3B7) | -| CvxMiningLib | [0xA6B8934a82874788043A75d50ca74a18732DC660](https://etherscan.io/address/0xA6B8934a82874788043A75d50ca74a18732DC660) | -| Deployer | [0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB](https://etherscan.io/address/0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB) | -| Distributor | [0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569](https://etherscan.io/address/0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569) | -| DutchTrade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | -| FacadeAct | [0x933c5DBdA80f03C102C560e9ed0c29812998fA78](https://etherscan.io/address/0x933c5DBdA80f03C102C560e9ed0c29812998fA78) | -| FacadeMonitor | [0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6](https://etherscan.io/address/0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6) | -| FacadeRead | [0xf535Cab96457558eE3eeAF1402fCA6441E832f08](https://etherscan.io/address/0xf535Cab96457558eE3eeAF1402fCA6441E832f08) | -| FacadeWrite | [0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629](https://etherscan.io/address/0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629) | -| FacadeWriteLib | [0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8](https://etherscan.io/address/0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8) | -| Furnace | [0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96](https://etherscan.io/address/0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96) | -| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | -| GnosisTrade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | -| Main | [0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F](https://etherscan.io/address/0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F) | -| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | -| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | -| RsrAsset | [0x9cd0F8387672fEaaf7C269b62c34C53590d7e948](https://etherscan.io/address/0x9cd0F8387672fEaaf7C269b62c34C53590d7e948) | -| RsrTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | -| RToken | [0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1](https://etherscan.io/address/0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1) | -| RTokenTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | -| StRSR | [0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f](https://etherscan.io/address/0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f) | -| Trade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | -| TradingLib | [0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478](https://etherscan.io/address/0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478) | - \ No newline at end of file +| Contract | Address | Version | +| --- | --- | --- | +| AssetRegistry | [0x5a004F70b2450E909B4048050c585549Ab8afeB8](https://etherscan.io/address/0x5a004F70b2450E909B4048050c585549Ab8afeB8) | 2.0.0 | +| BackingManager | [0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC](https://etherscan.io/address/0xa0D4b6aD503E776457dBF4695d462DdF8621A1CC) | 2.0.0 | +| BasketHandler | [0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030](https://etherscan.io/address/0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030) | 2.1.0 | +| Broker | [0x89209a52d085D975b14555F3e828F43fb7EaF3B7](https://etherscan.io/address/0x89209a52d085D975b14555F3e828F43fb7EaF3B7) | 2.1.0 | +| CvxMiningLib | [0xA6B8934a82874788043A75d50ca74a18732DC660](https://etherscan.io/address/0xA6B8934a82874788043A75d50ca74a18732DC660) | N/A | +| Deployer | [0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB](https://etherscan.io/address/0x5c46b718Cd79F2BBA6869A3BeC13401b9a4B69bB) | 2.1.0 | +| Distributor | [0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569](https://etherscan.io/address/0xc78c5a84F30317B5F7D87170Ec21DC73Df38d569) | 2.0.0 | +| DutchTrade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | N/A | +| FacadeAct | [0x933c5DBdA80f03C102C560e9ed0c29812998fA78](https://etherscan.io/address/0x933c5DBdA80f03C102C560e9ed0c29812998fA78) | N/A | +| FacadeMonitor | [0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6](https://etherscan.io/address/0xF3458200eDe2C5A592757dc0BA9A915e9CCA77C6) | N/A | +| FacadeRead | [0xf535Cab96457558eE3eeAF1402fCA6441E832f08](https://etherscan.io/address/0xf535Cab96457558eE3eeAF1402fCA6441E832f08) | N/A | +| FacadeWrite | [0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629](https://etherscan.io/address/0x1656D8aAd7Ee892582B9D5c2E9992d9f94ff3629) | N/A | +| FacadeWriteLib | [0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8](https://etherscan.io/address/0xe33cEF9f56F0d8d2b683c6E1F6afcd1e43b77ea8) | N/A | +| Furnace | [0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96](https://etherscan.io/address/0x393002573ea4A3d74A80F3B1Af436a3ee3A30c96) | 2.0.0 | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | N/A | +| GnosisTrade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | N/A | +| Main | [0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F](https://etherscan.io/address/0x143C35bFe04720394eBd18AbECa83eA9D8BEdE2F) | 2.0.0 | +| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | N/A | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | N/A | +| RsrAsset | [0x9cd0F8387672fEaaf7C269b62c34C53590d7e948](https://etherscan.io/address/0x9cd0F8387672fEaaf7C269b62c34C53590d7e948) | N/A | +| RsrTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | 2.0.0 | +| RToken | [0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1](https://etherscan.io/address/0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1) | 2.1.0 | +| RTokenTrader | [0xE5bD2249118b6a4B39Be195951579dC9Af05029a](https://etherscan.io/address/0xE5bD2249118b6a4B39Be195951579dC9Af05029a) | 2.0.0 | +| StRSR | [0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f](https://etherscan.io/address/0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f) | 2.1.0 | +| Trade | [0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439](https://etherscan.io/address/0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439) | N/A | +| TradingLib | [0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478](https://etherscan.io/address/0x81b19Af39ab589D0Ca211DC3Dee4cfF7072eb478) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-3.0.0.md b/docs/deployed-addresses/1-components-3.0.0.md new file mode 100644 index 0000000000..98024b1212 --- /dev/null +++ b/docs/deployed-addresses/1-components-3.0.0.md @@ -0,0 +1,30 @@ +# Component Implementations (Mainnet 3.0.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| AssetRegistry | [0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450](https://etherscan.io/address/0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450) | 3.0.0 | +| BackingManager | [0x0A388FC05AA017b31fb084e43e7aEaFdBc043080](https://etherscan.io/address/0x0A388FC05AA017b31fb084e43e7aEaFdBc043080) | 3.0.0 | +| BasketHandler | [0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc](https://etherscan.io/address/0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc) | 3.0.0 | +| BasketLib | [0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8](https://etherscan.io/address/0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8) | N/A | +| Broker | [0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04](https://etherscan.io/address/0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04) | 3.0.0 | +| CvxMiningLib | [0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472](https://etherscan.io/address/0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472) | N/A | +| Deployer | [0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e](https://etherscan.io/address/0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e) | 3.0.0 | +| Distributor | [0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac](https://etherscan.io/address/0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac) | 3.0.0 | +| DutchTrade | [0x2387C22727ACb91519b80A15AEf393ad40dFdb2F](https://etherscan.io/address/0x2387C22727ACb91519b80A15AEf393ad40dFdb2F) | N/A | +| FacadeAct | [0x801fF27bacc7C00fBef17FC901504c79D59E845C](https://etherscan.io/address/0x801fF27bacc7C00fBef17FC901504c79D59E845C) | N/A | +| FacadeRead | [0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C](https://etherscan.io/address/0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C) | N/A | +| FacadeWrite | [0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c](https://etherscan.io/address/0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c) | N/A | +| FacadeWriteLib | [0x0776Ad71Ae99D759354B3f06fe17454b94837B0D](https://etherscan.io/address/0x0776Ad71Ae99D759354B3f06fe17454b94837B0D) | N/A | +| Furnace | [0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c](https://etherscan.io/address/0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c) | 3.0.0 | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | N/A | +| GnosisTrade | [0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630](https://etherscan.io/address/0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630) | N/A | +| Main | [0xF5366f67FF66A3CefcB18809a762D5b5931FebF8](https://etherscan.io/address/0xF5366f67FF66A3CefcB18809a762D5b5931FebF8) | 3.0.0 | +| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | N/A | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | N/A | +| RsrAsset | [0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6](https://etherscan.io/address/0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6) | 3.0.0 | +| RsrTrader | [0x1cCa3FBB11C4b734183f997679d52DeFA74b613A](https://etherscan.io/address/0x1cCa3FBB11C4b734183f997679d52DeFA74b613A) | 3.0.0 | +| RToken | [0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F](https://etherscan.io/address/0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F) | 3.0.0 | +| RTokenTrader | [0x1cCa3FBB11C4b734183f997679d52DeFA74b613A](https://etherscan.io/address/0x1cCa3FBB11C4b734183f997679d52DeFA74b613A) | 3.0.0 | +| StRSR | [0xC98eaFc9F249D90e3E35E729e3679DD75A899c10](https://etherscan.io/address/0xC98eaFc9F249D90e3E35E729e3679DD75A899c10) | 3.0.0 | +| TradingLib | [0xB81a1fa9A497953CEC7f370CACFA5cc364871A73](https://etherscan.io/address/0xB81a1fa9A497953CEC7f370CACFA5cc364871A73) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-3.0.1.md b/docs/deployed-addresses/1-components-3.0.1.md new file mode 100644 index 0000000000..10ecada01d --- /dev/null +++ b/docs/deployed-addresses/1-components-3.0.1.md @@ -0,0 +1,30 @@ +# Component Implementations (Mainnet 3.0.1) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| AssetRegistry | [0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450](https://etherscan.io/address/0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450) | 3.0.0 | +| BackingManager | [0xBbC532A80DD141449330c1232C953Da6801Aed01](https://etherscan.io/address/0xBbC532A80DD141449330c1232C953Da6801Aed01) | 3.0.1 | +| BasketHandler | [0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc](https://etherscan.io/address/0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc) | 3.0.0 | +| BasketLib | [0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8](https://etherscan.io/address/0xA87e9DAe6E9EA5B2Be858686CC6c21B953BfE0B8) | N/A | +| Broker | [0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04](https://etherscan.io/address/0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04) | 3.0.0 | +| CvxMiningLib | [0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472](https://etherscan.io/address/0xeA4ecB9519Bae14bf343ddde0406C2D6108c1472) | N/A | +| Deployer | [0x43587CAA7dE69C3c2aD0fb73D4C9da67A8E35b0b](https://etherscan.io/address/0x43587CAA7dE69C3c2aD0fb73D4C9da67A8E35b0b) | 3.0.1 | +| Distributor | [0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac](https://etherscan.io/address/0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac) | 3.0.0 | +| DutchTrade | [0x2387C22727ACb91519b80A15AEf393ad40dFdb2F](https://etherscan.io/address/0x2387C22727ACb91519b80A15AEf393ad40dFdb2F) | N/A | +| FacadeAct | [0x801fF27bacc7C00fBef17FC901504c79D59E845C](https://etherscan.io/address/0x801fF27bacc7C00fBef17FC901504c79D59E845C) | N/A | +| FacadeRead | [0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C](https://etherscan.io/address/0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C) | N/A | +| FacadeWrite | [0x3312507BC3F22430B34D5841A472c767DC5C36e4](https://etherscan.io/address/0x3312507BC3F22430B34D5841A472c767DC5C36e4) | N/A | +| FacadeWriteLib | [0x908Cd3B4B4B6c60d5EB7d1Ca7ECda0e7ceCd6dB1](https://etherscan.io/address/0x908Cd3B4B4B6c60d5EB7d1Ca7ECda0e7ceCd6dB1) | N/A | +| Furnace | [0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c](https://etherscan.io/address/0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c) | 3.0.0 | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | N/A | +| GnosisTrade | [0x4e9B97957a0d1F4c25E42Ccc69E4d2665433FEA3](https://etherscan.io/address/0x4e9B97957a0d1F4c25E42Ccc69E4d2665433FEA3) | N/A | +| Main | [0xF5366f67FF66A3CefcB18809a762D5b5931FebF8](https://etherscan.io/address/0xF5366f67FF66A3CefcB18809a762D5b5931FebF8) | 3.0.0 | +| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | N/A | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | N/A | +| RsrAsset | [0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6](https://etherscan.io/address/0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6) | 3.0.0 | +| RsrTrader | [0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF) | 3.0.1 | +| RToken | [0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F](https://etherscan.io/address/0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F) | 3.0.0 | +| RTokenTrader | [0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8EF5E7a2992A88E9e65AF) | 3.0.1 | +| StRSR | [0xC98eaFc9F249D90e3E35E729e3679DD75A899c10](https://etherscan.io/address/0xC98eaFc9F249D90e3E35E729e3679DD75A899c10) | 3.0.0 | +| TradingLib | [0xB81a1fa9A497953CEC7f370CACFA5cc364871A73](https://etherscan.io/address/0xB81a1fa9A497953CEC7f370CACFA5cc364871A73) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-eUSD.md b/docs/deployed-addresses/1-eUSD.md index d07209e433..c55496ec44 100644 --- a/docs/deployed-addresses/1-eUSD.md +++ b/docs/deployed-addresses/1-eUSD.md @@ -1,24 +1,24 @@ -# [eUSD (Electronic Dollar)](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) +# [eUSD (Electronic Dollar) - Mainnet](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) | [0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1](https://etherscan.io/address/0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1#code) | 2.1.0 | -| Main | [0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a](https://etherscan.io/address/0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a) | [0x143c35bfe04720394ebd18abeca83ea9d8bede2f](https://etherscan.io/address/0x143c35bfe04720394ebd18abeca83ea9d8bede2f#code) | 2.0.0 | -| AssetRegistry | [0x9B85aC04A09c8C813c37de9B3d563C2D3F936162](https://etherscan.io/address/0x9B85aC04A09c8C813c37de9B3d563C2D3F936162) | [0x5a004f70b2450e909b4048050c585549ab8afeb8](https://etherscan.io/address/0x5a004f70b2450e909b4048050c585549ab8afeb8#code) | 2.0.0 | -| BackingManager | [0xF014FEF41cCB703975827C8569a3f0940cFD80A4](https://etherscan.io/address/0xF014FEF41cCB703975827C8569a3f0940cFD80A4) | [0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc](https://etherscan.io/address/0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc#code) | 2.0.0 | -| BasketHandler | [0x6d309297ddDFeA104A6E89a132e2f05ce3828e07](https://etherscan.io/address/0x6d309297ddDFeA104A6E89a132e2f05ce3828e07) | [0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030](https://etherscan.io/address/0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030#code) | 2.1.0 | -| Broker | [0x90EB22A31b69C29C34162E0E9278cc0617aA2B50](https://etherscan.io/address/0x90EB22A31b69C29C34162E0E9278cc0617aA2B50) | [0x89209a52d085d975b14555f3e828f43fb7eaf3b7](https://etherscan.io/address/0x89209a52d085d975b14555f3e828f43fb7eaf3b7#code) | 2.1.0 | -| RSRTrader | [0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f](https://etherscan.io/address/0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | -| RTokenTrader | [0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A](https://etherscan.io/address/0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | -| Distributor | [0x8a77980f82A1d537600891D782BCd8bd41B85472](https://etherscan.io/address/0x8a77980f82A1d537600891D782BCd8bd41B85472) | [0xc78c5a84f30317b5f7d87170ec21dc73df38d569](https://etherscan.io/address/0xc78c5a84f30317b5f7d87170ec21dc73df38d569#code) | 2.0.0 | -| Furnace | [0x57084b3a6317bea01bA8f7c582eD033d9345c2B2](https://etherscan.io/address/0x57084b3a6317bea01bA8f7c582eD033d9345c2B2) | [0x393002573ea4a3d74a80f3b1af436a3ee3a30c96](https://etherscan.io/address/0x393002573ea4a3d74a80f3b1af436a3ee3a30c96#code) | 2.0.0 | -| StRSR | [0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8](https://etherscan.io/address/0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8) | [0xfda8c62d86e426d5fb653b6c44a455bb657b693f](https://etherscan.io/address/0xfda8c62d86e426d5fb653b6c44a455bb657b693f#code) | 2.1.0 | +| RToken | [0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | +| Main | [0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a](https://etherscan.io/address/0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | +| AssetRegistry | [0x9B85aC04A09c8C813c37de9B3d563C2D3F936162](https://etherscan.io/address/0x9B85aC04A09c8C813c37de9B3d563C2D3F936162) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | +| BackingManager | [0xF014FEF41cCB703975827C8569a3f0940cFD80A4](https://etherscan.io/address/0xF014FEF41cCB703975827C8569a3f0940cFD80A4) |[0xbbc532a80dd141449330c1232c953da6801aed01](https://etherscan.io/address/0xbbc532a80dd141449330c1232c953da6801aed01#code) | 3.0.1 | +| BasketHandler | [0x6d309297ddDFeA104A6E89a132e2f05ce3828e07](https://etherscan.io/address/0x6d309297ddDFeA104A6E89a132e2f05ce3828e07) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | +| Broker | [0x90EB22A31b69C29C34162E0E9278cc0617aA2B50](https://etherscan.io/address/0x90EB22A31b69C29C34162E0E9278cc0617aA2B50) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | +| RSRTrader | [0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f](https://etherscan.io/address/0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | +| RTokenTrader | [0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A](https://etherscan.io/address/0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | +| Distributor | [0x8a77980f82A1d537600891D782BCd8bd41B85472](https://etherscan.io/address/0x8a77980f82A1d537600891D782BCd8bd41B85472) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | +| Furnace | [0x57084b3a6317bea01bA8f7c582eD033d9345c2B2](https://etherscan.io/address/0x57084b3a6317bea01bA8f7c582eD033d9345c2B2) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | +| StRSR | [0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8](https://etherscan.io/address/0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | ## Governance Addresses -| Contract | Address | Implementation | Version | -| --- | --- | --- | --- | -| Governor Alexios | [0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6](https://etherscan.io/address/0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6) | [](https://etherscan.io/address/#code) | 1 | -| Timelock | [0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c](https://etherscan.io/address/0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c) | [](https://etherscan.io/address/#code) | N/A | +| Contract | Address | +| --- | --- | +| Governor Alexios | [0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6](https://etherscan.io/address/0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6) | +| Timelock | [0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c](https://etherscan.io/address/0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c) | - \ No newline at end of file + \ No newline at end of file diff --git a/docs/deployed-addresses/1-hyUSD.md b/docs/deployed-addresses/1-hyUSD.md index 7d23c9ae09..b3323a833a 100644 --- a/docs/deployed-addresses/1-hyUSD.md +++ b/docs/deployed-addresses/1-hyUSD.md @@ -1,24 +1,24 @@ -# [hyUSD (High Yield USD)](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) +# [hyUSD (High Yield USD) - Mainnet](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xaCdf0DBA4B9839b96221a8487e9ca660a48212be](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) | [0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1](https://etherscan.io/address/0x5643d5ac6b79ae8467cf2f416da6d465d8e7d9c1#code) | 2.1.0 | -| Main | [0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37](https://etherscan.io/address/0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37) | [0x143c35bfe04720394ebd18abeca83ea9d8bede2f](https://etherscan.io/address/0x143c35bfe04720394ebd18abeca83ea9d8bede2f#code) | 2.0.0 | -| AssetRegistry | [0xaCacddeE9b900b7535B13Cd8662df130265b8c78](https://etherscan.io/address/0xaCacddeE9b900b7535B13Cd8662df130265b8c78) | [0x5a004f70b2450e909b4048050c585549ab8afeb8](https://etherscan.io/address/0x5a004f70b2450e909b4048050c585549ab8afeb8#code) | 2.0.0 | -| BackingManager | [0x61691c4181F876Dd7e19D6742B367B48AA280ed3](https://etherscan.io/address/0x61691c4181F876Dd7e19D6742B367B48AA280ed3) | [0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc](https://etherscan.io/address/0xa0d4b6ad503e776457dbf4695d462ddf8621a1cc#code) | 2.0.0 | -| BasketHandler | [0x9119DB28432bd97aBF4c3D81B929849e0490c7A6](https://etherscan.io/address/0x9119DB28432bd97aBF4c3D81B929849e0490c7A6) | [0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030](https://etherscan.io/address/0x5c13b3b6f40ad4bf7aa4793f844ba24e85482030#code) | 2.1.0 | -| Broker | [0x44344ca9014BE4bB622037224d107493586f35ed](https://etherscan.io/address/0x44344ca9014BE4bB622037224d107493586f35ed) | [0x89209a52d085d975b14555f3e828f43fb7eaf3b7](https://etherscan.io/address/0x89209a52d085d975b14555f3e828f43fb7eaf3b7#code) | 2.1.0 | -| RSRTrader | [0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7](https://etherscan.io/address/0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | -| RTokenTrader | [0x4886f5549d3b25adCFaC68E40062c735faf81378](https://etherscan.io/address/0x4886f5549d3b25adCFaC68E40062c735faf81378) | [0xe5bd2249118b6a4b39be195951579dc9af05029a](https://etherscan.io/address/0xe5bd2249118b6a4b39be195951579dc9af05029a#code) | 2.0.0 | -| Distributor | [0x0297941cCB71f5595072C4fA34CE443b6C5b47A0](https://etherscan.io/address/0x0297941cCB71f5595072C4fA34CE443b6C5b47A0) | [0xc78c5a84f30317b5f7d87170ec21dc73df38d569](https://etherscan.io/address/0xc78c5a84f30317b5f7d87170ec21dc73df38d569#code) | 2.0.0 | -| Furnace | [0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8](https://etherscan.io/address/0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8) | [0x393002573ea4a3d74a80f3b1af436a3ee3a30c96](https://etherscan.io/address/0x393002573ea4a3d74a80f3b1af436a3ee3a30c96#code) | 2.0.0 | -| StRSR | [0x7Db3C57001c80644208fb8AA81bA1200C7B0731d](https://etherscan.io/address/0x7Db3C57001c80644208fb8AA81bA1200C7B0731d) | [0xfda8c62d86e426d5fb653b6c44a455bb657b693f](https://etherscan.io/address/0xfda8c62d86e426d5fb653b6c44a455bb657b693f#code) | 2.1.0 | +| RToken | [0xaCdf0DBA4B9839b96221a8487e9ca660a48212be](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | +| Main | [0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37](https://etherscan.io/address/0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | +| AssetRegistry | [0xaCacddeE9b900b7535B13Cd8662df130265b8c78](https://etherscan.io/address/0xaCacddeE9b900b7535B13Cd8662df130265b8c78) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | +| BackingManager | [0x61691c4181F876Dd7e19D6742B367B48AA280ed3](https://etherscan.io/address/0x61691c4181F876Dd7e19D6742B367B48AA280ed3) |[0xbbc532a80dd141449330c1232c953da6801aed01](https://etherscan.io/address/0xbbc532a80dd141449330c1232c953da6801aed01#code) | 3.0.1 | +| BasketHandler | [0x9119DB28432bd97aBF4c3D81B929849e0490c7A6](https://etherscan.io/address/0x9119DB28432bd97aBF4c3D81B929849e0490c7A6) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | +| Broker | [0x44344ca9014BE4bB622037224d107493586f35ed](https://etherscan.io/address/0x44344ca9014BE4bB622037224d107493586f35ed) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | +| RSRTrader | [0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7](https://etherscan.io/address/0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | +| RTokenTrader | [0x4886f5549d3b25adCFaC68E40062c735faf81378](https://etherscan.io/address/0x4886f5549d3b25adCFaC68E40062c735faf81378) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | +| Distributor | [0x0297941cCB71f5595072C4fA34CE443b6C5b47A0](https://etherscan.io/address/0x0297941cCB71f5595072C4fA34CE443b6C5b47A0) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | +| Furnace | [0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8](https://etherscan.io/address/0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | +| StRSR | [0x7Db3C57001c80644208fb8AA81bA1200C7B0731d](https://etherscan.io/address/0x7Db3C57001c80644208fb8AA81bA1200C7B0731d) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | ## Governance Addresses -| Contract | Address | Implementation | Version | -| --- | --- | --- | --- | -| Governor Alexios | [0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1](https://etherscan.io/address/0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1) | [](https://etherscan.io/address/#code) | 1 | -| Timelock | [0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C](https://etherscan.io/address/0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C) | [](https://etherscan.io/address/#code) | N/A | +| Contract | Address | +| --- | --- | +| Governor Alexios | [0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1](https://etherscan.io/address/0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1) | +| Timelock | [0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C](https://etherscan.io/address/0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C) | - \ No newline at end of file + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-Vaya.md b/docs/deployed-addresses/8453-Vaya.md new file mode 100644 index 0000000000..04ae8fc6f6 --- /dev/null +++ b/docs/deployed-addresses/8453-Vaya.md @@ -0,0 +1,24 @@ +# [Vaya (Vaya) - Base](https://basescan.org/address/0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d](https://basescan.org/address/0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d) |[0xa42850a760151bb3acf17e7f8643eb4d864bf7a6](https://basescan.org/address/0xa42850a760151bb3acf17e7f8643eb4d864bf7a6#code) | 3.0.0 | +| Main | [0x6c678DE5334B86EAeEe6d9c8a2d59FfB9E4167F2](https://basescan.org/address/0x6c678DE5334B86EAeEe6d9c8a2d59FfB9E4167F2) |[0x1d6d0b74e7a701ae5c2e11967b242e9861275143](https://basescan.org/address/0x1d6d0b74e7a701ae5c2e11967b242e9861275143#code) | 3.0.0 | +| AssetRegistry | [0xBA8e784AAb8d0c5013DDc8e31F49bAbF53Eccf22](https://basescan.org/address/0xBA8e784AAb8d0c5013DDc8e31F49bAbF53Eccf22) |[0x9c387fc258061bd3e02c851f36ae227db03a396c](https://basescan.org/address/0x9c387fc258061bd3e02c851f36ae227db03a396c#code) | 3.0.0 | +| BackingManager | [0x36893DC33668d499a2f8a929063751817677A3A7](https://basescan.org/address/0x36893DC33668d499a2f8a929063751817677A3A7) |[0x8569d60df34354cdd1115b90de832845b31c28d2](https://basescan.org/address/0x8569d60df34354cdd1115b90de832845b31c28d2#code) | 3.0.1 | +| BasketHandler | [0x499759bAf096856F05BaFA45BB367Fa4fbE4d920](https://basescan.org/address/0x499759bAf096856F05BaFA45BB367Fa4fbE4d920) |[0x25e92785c1ac01b397224e0534f3d626868a1cbf](https://basescan.org/address/0x25e92785c1ac01b397224e0534f3d626868a1cbf#code) | 3.0.0 | +| Broker | [0xe75111b9D5C1344D0edF5355bda384Dc36eB3F7e](https://basescan.org/address/0xe75111b9D5C1344D0edF5355bda384Dc36eB3F7e) |[0x12c3bb1b0da85fdae0137ae8fde901f7d0e106ba](https://basescan.org/address/0x12c3bb1b0da85fdae0137ae8fde901f7d0e106ba#code) | 3.0.0 | +| RSRTrader | [0xD5e348D20bB579c3D2341a461F8B5Bfd4C762090](https://basescan.org/address/0xD5e348D20bB579c3D2341a461F8B5Bfd4C762090) |[0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16](https://basescan.org/address/0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16#code) | 3.0.1 | +| RTokenTrader | [0x961955c02c92E96bd4E9044297E33B06e5652eE9](https://basescan.org/address/0x961955c02c92E96bd4E9044297E33B06e5652eE9) |[0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16](https://basescan.org/address/0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16#code) | 3.0.1 | +| Distributor | [0x93aA969C89a102184938A05A8e16572A4DeB5873](https://basescan.org/address/0x93aA969C89a102184938A05A8e16572A4DeB5873) |[0xd31de64957b79435bfc702044590ac417e02c19b](https://basescan.org/address/0xd31de64957b79435bfc702044590ac417e02c19b#code) | 3.0.0 | +| Furnace | [0xEC5E2FE18FafF28bb85e4B71E106e9Bab7412783](https://basescan.org/address/0xEC5E2FE18FafF28bb85e4B71E106e9Bab7412783) |[0x45d7dfe976cdf80962d863a66918346a457b87bd](https://basescan.org/address/0x45d7dfe976cdf80962d863a66918346a457b87bd#code) | 3.0.0 | +| StRSR | [0x663a141bEA6756A1d3AB1Da068Defa4d6b523FbE](https://basescan.org/address/0x663a141bEA6756A1d3AB1Da068Defa4d6b523FbE) |[0x53321f03a7cce52413515dfd0527e0163ec69a46](https://basescan.org/address/0x53321f03a7cce52413515dfd0527e0163ec69a46#code) | 3.0.0 | + + +## Governance Addresses +| Contract | Address | +| --- | --- | +| Governor Alexios | [0xEb583EA06501f92E994C353aD2741A35582987aA](https://basescan.org/address/0xEb583EA06501f92E994C353aD2741A35582987aA) | +| Timelock | [0xeE3eC997A37e661a42673D7A489Fbf0E5ed0C223](https://basescan.org/address/0xeE3eC997A37e661a42673D7A489Fbf0E5ed0C223) | + + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-assets-3.0.0.md b/docs/deployed-addresses/8453-assets-3.0.0.md new file mode 100644 index 0000000000..7234152856 --- /dev/null +++ b/docs/deployed-addresses/8453-assets-3.0.0.md @@ -0,0 +1,17 @@ +# Assets (Base 3.0.0) +## Assets +| Contract | Address | +| --- | --- | +| COMP | [0x277FD5f51fE53a9B3707a0383bF930B149C74ABf](https://basescan.org/address/0x277FD5f51fE53a9B3707a0383bF930B149C74ABf) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0x5EBE8927e5495e0A7731888C81AF463cD63602fb](https://basescan.org/address/0x5EBE8927e5495e0A7731888C81AF463cD63602fb) | +| WETH | [0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3](https://basescan.org/address/0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3) | +| USDbC | [0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB](https://basescan.org/address/0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB) | +| cbETH | [0x5fE248625aC2AB0e17A115fef288f17AF1952402](https://basescan.org/address/0x5fE248625aC2AB0e17A115fef288f17AF1952402) | +| cUSDbCv3 | [0xa372EC846131FBf9AE8b589efa3D041D9a94dF41](https://basescan.org/address/0xa372EC846131FBf9AE8b589efa3D041D9a94dF41) | +| aBasUSDbC | [0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b](https://basescan.org/address/0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b) | +| wsgUSDbC | [0x15395aCCbF8c6b28671fe41624D599624709a2D6](https://basescan.org/address/0x15395aCCbF8c6b28671fe41624D599624709a2D6) | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-assets-3.0.1.md b/docs/deployed-addresses/8453-assets-3.0.1.md new file mode 100644 index 0000000000..b53352b1a7 --- /dev/null +++ b/docs/deployed-addresses/8453-assets-3.0.1.md @@ -0,0 +1,18 @@ +# Assets (Base 3.0.1) +## Assets +| Contract | Address | +| --- | --- | +| COMP | [0x277FD5f51fE53a9B3707a0383bF930B149C74ABf](https://basescan.org/address/0x277FD5f51fE53a9B3707a0383bF930B149C74ABf) | +| STG | [0xf37adF141BD754e9C9E645de88bB28B5e4a6Db96](https://basescan.org/address/0xf37adF141BD754e9C9E645de88bB28B5e4a6Db96) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0x5EBE8927e5495e0A7731888C81AF463cD63602fb](https://basescan.org/address/0x5EBE8927e5495e0A7731888C81AF463cD63602fb) | +| WETH | [0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3](https://basescan.org/address/0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3) | +| USDbC | [0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB](https://basescan.org/address/0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB) | +| cbETH | [0x5fE248625aC2AB0e17A115fef288f17AF1952402](https://basescan.org/address/0x5fE248625aC2AB0e17A115fef288f17AF1952402) | +| cUSDbCv3 | [0xa372EC846131FBf9AE8b589efa3D041D9a94dF41](https://basescan.org/address/0xa372EC846131FBf9AE8b589efa3D041D9a94dF41) | +| aBasUSDbC | [0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b](https://basescan.org/address/0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b) | +| wsgUSDbC | [0x15395aCCbF8c6b28671fe41624D599624709a2D6](https://basescan.org/address/0x15395aCCbF8c6b28671fe41624D599624709a2D6) | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-components-3.0.0.md b/docs/deployed-addresses/8453-components-3.0.0.md new file mode 100644 index 0000000000..2fc09e7ed0 --- /dev/null +++ b/docs/deployed-addresses/8453-components-3.0.0.md @@ -0,0 +1,29 @@ +# Component Implementations (Base 3.0.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| AssetRegistry | [0x9c387fc258061bd3E02c851F36aE227DB03a396C](https://basescan.org/address/0x9c387fc258061bd3E02c851F36aE227DB03a396C) | 3.0.0 | +| BackingManager | [0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE](https://basescan.org/address/0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE) | 3.0.0 | +| BasketHandler | [0x25E92785C1AC01B397224E0534f3D626868A1Cbf](https://basescan.org/address/0x25E92785C1AC01B397224E0534f3D626868A1Cbf) | 3.0.0 | +| BasketLib | [0x199E12d58B36deE2D2B3dD2b91aD7bb25c787a71](https://basescan.org/address/0x199E12d58B36deE2D2B3dD2b91aD7bb25c787a71) | N/A | +| Broker | [0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba](https://basescan.org/address/0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba) | 3.0.0 | +| Deployer | [0xf1B06c2305445E34CF0147466352249724c2EAC1](https://basescan.org/address/0xf1B06c2305445E34CF0147466352249724c2EAC1) | 3.0.0 | +| Distributor | [0xd31de64957b79435bfc702044590ac417e02c19B](https://basescan.org/address/0xd31de64957b79435bfc702044590ac417e02c19B) | 3.0.0 | +| DutchTrade | [0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7](https://basescan.org/address/0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7) | N/A | +| FacadeAct | [0x3d6D679c863858E89e35c925F937F5814ca687F3](https://basescan.org/address/0x3d6D679c863858E89e35c925F937F5814ca687F3) | N/A | +| FacadeRead | [0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF](https://basescan.org/address/0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF) | N/A | +| FacadeWrite | [0x0903048fD4E948c60451B41A48B35E0bafc0967F](https://basescan.org/address/0x0903048fD4E948c60451B41A48B35E0bafc0967F) | N/A | +| FacadeWriteLib | [0x29e9740275D26fdeDBb0ABA8129C74c15c393027](https://basescan.org/address/0x29e9740275D26fdeDBb0ABA8129C74c15c393027) | N/A | +| Furnace | [0x45D7dFE976cdF80962d863A66918346a457b87Bd](https://basescan.org/address/0x45D7dFE976cdF80962d863A66918346a457b87Bd) | 3.0.0 | +| GNOSIS_EASY_AUCTION | [0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02](https://basescan.org/address/0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02) | N/A | +| GnosisTrade | [0xD4e1D5b1311C992b2735710D46A10284Bcd7D39F](https://basescan.org/address/0xD4e1D5b1311C992b2735710D46A10284Bcd7D39F) | N/A | +| Main | [0x1D6d0B74E7A701aE5C2E11967b242E9861275143](https://basescan.org/address/0x1D6d0B74E7A701aE5C2E11967b242E9861275143) | 3.0.0 | +| RSR | [0xaB36452DbAC151bE02b16Ca17d8919826072f64a](https://basescan.org/address/0xaB36452DbAC151bE02b16Ca17d8919826072f64a) | 1.0.3 | +| RSR_FEED | [0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1](https://basescan.org/address/0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1) | N/A | +| RsrAsset | [0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B](https://basescan.org/address/0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B) | 3.0.0 | +| RsrTrader | [0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09](https://basescan.org/address/0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09) | 3.0.0 | +| RToken | [0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6](https://basescan.org/address/0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6) | 3.0.0 | +| RTokenTrader | [0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09](https://basescan.org/address/0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09) | 3.0.0 | +| StRSR | [0x53321f03A7cce52413515DFD0527e0163ec69A46](https://basescan.org/address/0x53321f03A7cce52413515DFD0527e0163ec69A46) | 3.0.0 | +| TradingLib | [0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B](https://basescan.org/address/0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-components-3.0.1.md b/docs/deployed-addresses/8453-components-3.0.1.md new file mode 100644 index 0000000000..b306cb714f --- /dev/null +++ b/docs/deployed-addresses/8453-components-3.0.1.md @@ -0,0 +1,29 @@ +# Component Implementations (Base 3.0.1) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| AssetRegistry | [0x9c387fc258061bd3E02c851F36aE227DB03a396C](https://basescan.org/address/0x9c387fc258061bd3E02c851F36aE227DB03a396C) | 3.0.0 | +| BackingManager | [0x8569D60Df34354CDd1115b90de832845b31C28d2](https://basescan.org/address/0x8569D60Df34354CDd1115b90de832845b31C28d2) | 3.0.1 | +| BasketHandler | [0x25E92785C1AC01B397224E0534f3D626868A1Cbf](https://basescan.org/address/0x25E92785C1AC01B397224E0534f3D626868A1Cbf) | 3.0.0 | +| BasketLib | [0x199E12d58B36deE2D2B3dD2b91aD7bb25c787a71](https://basescan.org/address/0x199E12d58B36deE2D2B3dD2b91aD7bb25c787a71) | N/A | +| Broker | [0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba](https://basescan.org/address/0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba) | 3.0.0 | +| Deployer | [0x9C75314AFD011F22648ca9C655b61674e27bA4AC](https://basescan.org/address/0x9C75314AFD011F22648ca9C655b61674e27bA4AC) | 3.0.1 | +| Distributor | [0xd31de64957b79435bfc702044590ac417e02c19B](https://basescan.org/address/0xd31de64957b79435bfc702044590ac417e02c19B) | 3.0.0 | +| DutchTrade | [0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7](https://basescan.org/address/0xDfCc89cf76aC93D113A21Da8fbfA63365b1E3DC7) | N/A | +| FacadeAct | [0x3d6D679c863858E89e35c925F937F5814ca687F3](https://basescan.org/address/0x3d6D679c863858E89e35c925F937F5814ca687F3) | N/A | +| FacadeRead | [0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF](https://basescan.org/address/0xe1aa15DA8b993c6312BAeD91E0b470AE405F91BF) | N/A | +| FacadeWrite | [0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb](https://basescan.org/address/0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb) | N/A | +| FacadeWriteLib | [0x13B63e7094B61CCbe79CAe3fb602DFd12D59314a](https://basescan.org/address/0x13B63e7094B61CCbe79CAe3fb602DFd12D59314a) | N/A | +| Furnace | [0x45D7dFE976cdF80962d863A66918346a457b87Bd](https://basescan.org/address/0x45D7dFE976cdF80962d863A66918346a457b87Bd) | 3.0.0 | +| GNOSIS_EASY_AUCTION | [0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02](https://basescan.org/address/0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02) | N/A | +| GnosisTrade | [0xcD033976a011F41D2AB6ef47984041568F818E73](https://basescan.org/address/0xcD033976a011F41D2AB6ef47984041568F818E73) | N/A | +| Main | [0x1D6d0B74E7A701aE5C2E11967b242E9861275143](https://basescan.org/address/0x1D6d0B74E7A701aE5C2E11967b242E9861275143) | 3.0.0 | +| RSR | [0xaB36452DbAC151bE02b16Ca17d8919826072f64a](https://basescan.org/address/0xaB36452DbAC151bE02b16Ca17d8919826072f64a) | 1.0.3 | +| RSR_FEED | [0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1](https://basescan.org/address/0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1) | N/A | +| RsrAsset | [0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B](https://basescan.org/address/0x23b57479327f9BccE6A1F6Be65F3dAa3C9Db797B) | 3.0.0 | +| RsrTrader | [0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16](https://basescan.org/address/0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16) | 3.0.1 | +| RToken | [0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6](https://basescan.org/address/0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6) | 3.0.0 | +| RTokenTrader | [0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16](https://basescan.org/address/0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16) | 3.0.1 | +| StRSR | [0x53321f03A7cce52413515DFD0527e0163ec69A46](https://basescan.org/address/0x53321f03A7cce52413515DFD0527e0163ec69A46) | 3.0.0 | +| TradingLib | [0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B](https://basescan.org/address/0x4E01677488384B851EeAa09C8b8F6Dd0b16d7E9B) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-hyUSD.md b/docs/deployed-addresses/8453-hyUSD.md new file mode 100644 index 0000000000..881629127d --- /dev/null +++ b/docs/deployed-addresses/8453-hyUSD.md @@ -0,0 +1,24 @@ +# [hyUSD (High Yield USD) - Base](https://basescan.org/address/0xCc7FF230365bD730eE4B352cC2492CEdAC49383e) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xCc7FF230365bD730eE4B352cC2492CEdAC49383e](https://basescan.org/address/0xCc7FF230365bD730eE4B352cC2492CEdAC49383e) |[0xa42850a760151bb3acf17e7f8643eb4d864bf7a6](https://basescan.org/address/0xa42850a760151bb3acf17e7f8643eb4d864bf7a6#code) | 3.0.0 | +| Main | [0xA582985c68ED30a052Ff0b07D74931140bd5a00F](https://basescan.org/address/0xA582985c68ED30a052Ff0b07D74931140bd5a00F) |[0x1d6d0b74e7a701ae5c2e11967b242e9861275143](https://basescan.org/address/0x1d6d0b74e7a701ae5c2e11967b242e9861275143#code) | 3.0.0 | +| AssetRegistry | [0xe8209777E3bE69E0f379AE5b2204D301c4FFC9B3](https://basescan.org/address/0xe8209777E3bE69E0f379AE5b2204D301c4FFC9B3) |[0x9c387fc258061bd3e02c851f36ae227db03a396c](https://basescan.org/address/0x9c387fc258061bd3e02c851f36ae227db03a396c#code) | 3.0.0 | +| BackingManager | [0xA1E1A94977ec3159DB546bf01d7a8d17DD3EbBeD](https://basescan.org/address/0xA1E1A94977ec3159DB546bf01d7a8d17DD3EbBeD) |[0x8569d60df34354cdd1115b90de832845b31c28d2](https://basescan.org/address/0x8569d60df34354cdd1115b90de832845b31c28d2#code) | 3.0.1 | +| BasketHandler | [0x9306587db04E35981e57013f6E1D867eCa89e2ec](https://basescan.org/address/0x9306587db04E35981e57013f6E1D867eCa89e2ec) |[0x25e92785c1ac01b397224e0534f3d626868a1cbf](https://basescan.org/address/0x25e92785c1ac01b397224e0534f3d626868a1cbf#code) | 3.0.0 | +| Broker | [0x0E05139662e0C8752a100DB08DA0C7E435B8aC94](https://basescan.org/address/0x0E05139662e0C8752a100DB08DA0C7E435B8aC94) |[0x12c3bb1b0da85fdae0137ae8fde901f7d0e106ba](https://basescan.org/address/0x12c3bb1b0da85fdae0137ae8fde901f7d0e106ba#code) | 3.0.0 | +| RSRTrader | [0xef34C651F1AE9593cfb2CDf02da800A4AAd612bd](https://basescan.org/address/0xef34C651F1AE9593cfb2CDf02da800A4AAd612bd) |[0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16](https://basescan.org/address/0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16#code) | 3.0.1 | +| RTokenTrader | [0xcc03e97F6e2e4eFb50ab95c89BB4b27911105736](https://basescan.org/address/0xcc03e97F6e2e4eFb50ab95c89BB4b27911105736) |[0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16](https://basescan.org/address/0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16#code) | 3.0.1 | +| Distributor | [0xf0a83bC73E9bAeb69b2fBB1e48bCdabf9C1012ca](https://basescan.org/address/0xf0a83bC73E9bAeb69b2fBB1e48bCdabf9C1012ca) |[0xd31de64957b79435bfc702044590ac417e02c19b](https://basescan.org/address/0xd31de64957b79435bfc702044590ac417e02c19b#code) | 3.0.0 | +| Furnace | [0x8532B667150F53f209F71FdF4Ca2173805D16680](https://basescan.org/address/0x8532B667150F53f209F71FdF4Ca2173805D16680) |[0x45d7dfe976cdf80962d863a66918346a457b87bd](https://basescan.org/address/0x45d7dfe976cdf80962d863a66918346a457b87bd#code) | 3.0.0 | +| StRSR | [0x796d2367AF69deB3319B8E10712b8B65957371c3](https://basescan.org/address/0x796d2367AF69deB3319B8E10712b8B65957371c3) |[0x53321f03a7cce52413515dfd0527e0163ec69a46](https://basescan.org/address/0x53321f03a7cce52413515dfd0527e0163ec69a46#code) | 3.0.0 | + + +## Governance Addresses +| Contract | Address | +| --- | --- | +| Governor Alexios | [0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb](https://basescan.org/address/0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb) | +| Timelock | [0xf093d7f00f3dCe6d415Be564f41Cb4bc032fb367](https://basescan.org/address/0xf093d7f00f3dCe6d415Be564f41Cb4bc032fb367) | + + \ No newline at end of file diff --git a/hardhat.config.ts b/hardhat.config.ts index d4c23bc1b9..87a53dbcf0 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -137,7 +137,10 @@ const config: HardhatUserConfig = { enabled: !!useEnv('REPORT_GAS'), }, etherscan: { - apiKey: useEnv('ETHERSCAN_API_KEY'), + apiKey: { + mainnet: useEnv('ETHERSCAN_API_KEY'), + base: useEnv('BASESCAN_API_KEY') + }, customChains: [ { network: 'base', diff --git a/scripts/compile-addresses.sh b/scripts/compile-addresses.sh new file mode 100755 index 0000000000..98e3d69343 --- /dev/null +++ b/scripts/compile-addresses.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +# RTokens +# *** Ethereum Mainnet *** + +# eUSD +npx hardhat get-addys --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --gov 0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6 --network mainnet + +# ETH+ +npx hardhat get-addys --rtoken 0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8 --gov 0x239cDcBE174B4728c870A24F77540dAB3dC5F981 --network mainnet + +# hyUSD +npx hardhat get-addys --rtoken 0xaCdf0DBA4B9839b96221a8487e9ca660a48212be --gov 0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1 --network mainnet + +# USDC+ +npx hardhat get-addys --rtoken 0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b --gov 0xc837C557071D604bCb1058c8c4891ddBe8FDD630 --network mainnet + + +# *** Base L2 *** + +# hyUSD +npx hardhat get-addys --rtoken 0xCc7FF230365bD730eE4B352cC2492CEdAC49383e --gov 0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb --network base + +# VAYA +npx hardhat get-addys --rtoken 0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d --gov 0xEb583EA06501f92E994C353aD2741A35582987aA --network base + + +# Components +# *** Ethereum Mainnet *** +npx hardhat get-addys --ver "2.0.0" --network mainnet +npx hardhat get-addys --ver "2.1.0" --network mainnet +npx hardhat get-addys --ver "3.0.0" --network mainnet +npx hardhat get-addys --ver "3.0.1" --network mainnet + +# *** Base L2 *** +npx hardhat get-addys --ver "3.0.0" --network base +npx hardhat get-addys --ver "3.0.1" --network base \ No newline at end of file diff --git a/tasks/deployment/get-addresses.ts b/tasks/deployment/get-addresses.ts index c7423cb198..3fb2b86a13 100644 --- a/tasks/deployment/get-addresses.ts +++ b/tasks/deployment/get-addresses.ts @@ -19,9 +19,29 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') /* Helper functions */ + + // hacky api throttler, basescan has rate limits 5req/sec + const delay = async (ms: number) => { + return new Promise( resolve => setTimeout(resolve, ms) ); + } + const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1) - const etherscanUrl = 'https://etherscan.io/address/' + const network = hre.network.name + let scannerUrl: string; + let scannerApiUrl: string; + switch(network) { + case 'mainnet': + scannerUrl = 'https://etherscan.io/address/' + scannerApiUrl = `https://api.etherscan.io/api` + break + case 'base': + scannerUrl = 'https://basescan.org/address/' + scannerApiUrl = `https://api.basescan.org/api` + break + default: + throw new Error(`Unsupported network: ${network}`) + } const getVersion = async (c: Contract) => { try { @@ -32,29 +52,46 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') } const createRTokenTableRow = async (name: string, address: string) => { - const url = `https://api.etherscan.io/api?module=contract&action=getsourcecode&address=${address}&apikey=${process.env.ETHERSCAN_API_KEY}` + const url = `${scannerApiUrl}?module=contract&action=getsourcecode&address=${address}&apikey=${process.env.ETHERSCAN_API_KEY}` + await delay(200) const response = await fetch(url) const data = await response.json() const implementation = data.result[0].Implementation const component = await hre.ethers.getContractAt('ComponentP1', address) - return `| ${name} | [${address}](${etherscanUrl}${address}) | [${implementation}](${etherscanUrl}${implementation}#code) | ${await getVersion( - component - )} |` + let row = `| ${name} | [${address}](${scannerUrl}${address}) |` + if (!!implementation) { + row += `[${implementation}](${scannerUrl}${implementation}#code) | ${await getVersion(component)} |` + } + return row + } + + const createComponentTableRow = async (name: string, address: string) => { + const url = `${scannerApiUrl}?module=contract&action=getsourcecode&address=${address}&apikey=${process.env.ETHERSCAN_API_KEY}` + await delay(200) + const response = await fetch(url) + const data = await response.json() + const implementation = data.result[0].Implementation + const component = await hre.ethers.getContractAt('ComponentP1', address) + return `| ${name} | [${address}](${scannerUrl}${address}) | ${await getVersion(component)} |` } const createAssetTableRow = async (name: string, address: string) => { - return `| ${name} | [${address}](${etherscanUrl}${address}) |` + return `| ${name} | [${address}](${scannerUrl}${address}) |` } const createTableRows = async ( components: { name: string; address: string }[], - isRToken: boolean + isRToken: boolean, + isComponent: boolean = false ) => { const rows = [] for (const component of components) { + if (!component.address) continue isRToken ? rows.push(await createRTokenTableRow(component.name, component.address)) - : rows.push(await createAssetTableRow(component.name, component.address)) + : isComponent + ? rows.push(await createComponentTableRow(component.name, component.address)) + : rows.push(await createAssetTableRow(component.name, component.address)) } return rows.join('\n') } @@ -65,7 +102,7 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') rows: string, govRows: string | undefined ) => { - return `# [${name}](${etherscanUrl}${address}) + return `# [${name}](${scannerUrl}${address}) ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | @@ -75,14 +112,26 @@ ${ govRows && ` ## Governance Addresses -| Contract | Address | Implementation | Version | -| --- | --- | --- | --- | +| Contract | Address | +| --- | --- | ${govRows} ` } ` } + const createComponentMarkdown = async ( + name: string, + rows: string + ) => { + return `# ${name} +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +${rows} + ` + } + const createAssetMarkdown = async (name: string, assets: string, collaterals: string) => { return `# ${name} ## Assets @@ -114,36 +163,6 @@ ${collaterals} return `${outputDir}${chainId}-components-${version}.md` } - const getActiveRoleHolders = async (main: MainP1, role: string) => { - // get active owners - // - const grantedFilter = main.filters.RoleGranted(role) - const revokedFilter = main.filters.RoleRevoked(role) - - // get granted owners - const ownersGranted = await main.queryFilter(grantedFilter) - let owners = ownersGranted.map((event) => { - return event.args![1] - }) - interface OwnerCount { - [key: string]: number - } - - // count granted owners - let ownerCount: OwnerCount = {} - owners.forEach((owner: string) => { - ownerCount[owner] = (ownerCount[owner] || 0) + 1 - }) - - // reduce counts by revoked owners - const ownersRevoked = await main.queryFilter(revokedFilter) - ownersRevoked.forEach((event) => { - const owner = event.args![1] - ownerCount[owner] = (ownerCount[owner] || 0) - 1 - }) - return Object.keys(ownerCount).filter((owner) => ownerCount[owner] > 0) - } - /* Compile target addresses and create markdown files */ @@ -152,8 +171,10 @@ ${collaterals} if (params.rtoken && params.gov) { // if rtoken address is provided, print component addresses - + const rToken = await hre.ethers.getContractAt('IRToken', params.rtoken) + const symbol = await rToken.symbol() + console.log(`Collecting addresses for RToken: ${symbol} (${params.rtoken}))`) const mainAddress = await rToken.main() const main = await hre.ethers.getContractAt('MainP1', mainAddress) const backingManagerAddress = await main.backingManager() @@ -200,13 +221,16 @@ ${collaterals} const rows = await createTableRows(components, true) const govRows = await createTableRows(govComponents, true) const markdown = await createRTokenMarkdown( - `${rTokenSymbol} (${rTokenName})`, + `${rTokenSymbol} (${rTokenName}) - ${capitalize(hre.network.name)}`, params.rtoken, rows, govRows ) - fs.writeFileSync(await getRTokenFileName(params.rtoken), markdown) + const rTokenFileName = await getRTokenFileName(params.rtoken) + fs.writeFileSync(rTokenFileName, markdown) + console.log(`Wrote ${rTokenFileName}`) } else if (params.ver) { + console.log(`Collecting addresses for Version: ${params.ver} (${hre.network.name})`) // if version is provided, print implementation addresses const version = `${hre.network.name}-${params.ver}` const collateralDepl = getDeploymentFile( @@ -230,7 +254,9 @@ ${collaterals} assetRows, collateralRows ) - fs.writeFileSync(await getAssetFileName(params.ver), assetMarkdown) + const assetFileName = await getAssetFileName(params.ver) + fs.writeFileSync(assetFileName, assetMarkdown) + console.log(`Wrote ${assetFileName}`) const componentDepl = getDeploymentFile(getDeploymentFilename(await getChainId(hre), version)) const recursiveDestructure = ( @@ -253,13 +279,13 @@ ${collaterals} address: string }> components = components.sort((a, b) => a.name.localeCompare(b.name)) - const componentMarkdown = await createRTokenMarkdown( + const componentMarkdown = await createComponentMarkdown( `Component Implementations (${capitalize(hre.network.name)} ${params.ver})`, - params.version, - await createTableRows(components, false), - undefined + await createTableRows(components, false, true) ) - fs.writeFileSync(await getComponentFileName(params.ver), componentMarkdown) + const componentFileName = await getComponentFileName(params.ver) + fs.writeFileSync(componentFileName, componentMarkdown) + console.log(`Wrote ${componentFileName}`) } else { // if neither rtoken address nor version number is provided, throw error throw new Error( diff --git a/utils/env.ts b/utils/env.ts index 0944189851..919e53a9e8 100644 --- a/utils/env.ts +++ b/utils/env.ts @@ -13,6 +13,7 @@ type IEnvVars = | 'PROTO' | 'PROTO_IMPL' | 'ETHERSCAN_API_KEY' + | 'BASESCAN_API_KEY' | 'NO_OPT' | 'ONLY_FAST' | 'JOBS' From abf9f4679d1f0be1eeb611fb5ae840acbe9bb22a Mon Sep 17 00:00:00 2001 From: brr Date: Thu, 30 Nov 2023 03:09:35 +0100 Subject: [PATCH 141/450] TRUST H2 (#1013) Co-authored-by: Patrick McKelvy --- .../plugins/assets/erc20/RewardableERC20.sol | 16 +- .../morpho-aave/MorphoTokenisedDeposit.sol | 50 +++++- test/plugins/RewardableERC20.test.ts | 17 ++ .../MorphoAAVEFiatCollateral.test.ts | 145 +++++++++++------- .../MorphoAAVEFiatCollateral.test.ts.snap | 12 ++ 5 files changed, 175 insertions(+), 65 deletions(-) diff --git a/contracts/plugins/assets/erc20/RewardableERC20.sol b/contracts/plugins/assets/erc20/RewardableERC20.sol index 848ecfdf2d..ed741e15ec 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20.sol @@ -74,13 +74,21 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { accumulatedRewards[account] = _accumulatedRewards; } + function _rewardTokenBalance() internal view virtual returns (uint256) { + return rewardToken.balanceOf(address(this)); + } + + function _distributeReward(address account, uint256 amt) internal virtual { + rewardToken.safeTransfer(account, amt); + } + function _claimAndSyncRewards() internal virtual { uint256 _totalSupply = totalSupply(); if (_totalSupply == 0) { return; } _claimAssetRewards(); - uint256 balanceAfterClaimingRewards = rewardToken.balanceOf(address(this)); + uint256 balanceAfterClaimingRewards = _rewardTokenBalance(); uint256 _rewardsPerShare = rewardsPerShare; uint256 _previousBalance = lastRewardBalance; @@ -113,7 +121,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { claimedRewards[account] = accumulatedRewards[account]; - uint256 currentRewardTokenBalance = rewardToken.balanceOf(address(this)); + uint256 currentRewardTokenBalance = _rewardTokenBalance(); // This is just to handle the edge case where totalSupply() == 0 and there // are still reward tokens in the contract. @@ -121,9 +129,9 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { ? currentRewardTokenBalance - lastRewardBalance : 0; - rewardToken.safeTransfer(account, claimableRewards); + _distributeReward(account, claimableRewards); - currentRewardTokenBalance = rewardToken.balanceOf(address(this)); + currentRewardTokenBalance = _rewardTokenBalance(); lastRewardBalance = currentRewardTokenBalance > nonDistributed ? currentRewardTokenBalance - nonDistributed : 0; diff --git a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol index d2664e782c..7785a987f8 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol @@ -15,11 +15,23 @@ struct MorphoTokenisedDepositConfig { } abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { + struct MorphoTokenisedDepositRewardsAccountingState { + uint256 totalAccumulatedBalance; + uint256 totalPaidOutBalance; + uint256 pendingBalance; + uint256 availableBalance; + uint256 lastSync; + } + + uint256 private constant PAYOUT_PERIOD = 7 days; + IMorphoRewardsDistributor public immutable rewardsDistributor; IMorpho public immutable morphoController; address public immutable poolToken; address public immutable underlying; + MorphoTokenisedDepositRewardsAccountingState private state; + constructor(MorphoTokenisedDepositConfig memory config) RewardableERC4626Vault( config.underlyingERC20, @@ -32,16 +44,44 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { morphoController = config.morphoController; poolToken = address(config.poolToken); rewardsDistributor = config.rewardsDistributor; + state.lastSync = uint48(block.timestamp); } - function rewardTokenBalance(address account) external returns (uint256 claimableRewards) { + function sync() external { _claimAndSyncRewards(); - _syncAccount(account); - claimableRewards = accumulatedRewards[account] - claimedRewards[account]; } - // solhint-disable-next-line no-empty-blocks - function _claimAssetRewards() internal virtual override {} + function _claimAssetRewards() internal override { + // First pay out any pendingBalances, over a 7200 block period + uint256 timeDelta = block.timestamp - state.lastSync; + if (timeDelta == 0) { + return; + } + if (timeDelta > PAYOUT_PERIOD) { + timeDelta = PAYOUT_PERIOD; + } + uint256 amtToPayOut = (state.pendingBalance * ((timeDelta * 1e18) / PAYOUT_PERIOD)) / 1e18; + state.pendingBalance -= amtToPayOut; + state.availableBalance += amtToPayOut; + + // If we detect any new balances add it to pending and reset payout period + uint256 totalAccumulated = state.totalPaidOutBalance + rewardToken.balanceOf(address(this)); + uint256 newlyAccumulated = totalAccumulated - state.totalAccumulatedBalance; + state.totalAccumulatedBalance = totalAccumulated; + state.pendingBalance += newlyAccumulated; + + state.lastSync = block.timestamp; + } + + function _rewardTokenBalance() internal view override returns (uint256) { + return state.availableBalance; + } + + function _distributeReward(address account, uint256 amt) internal override { + state.totalPaidOutBalance += uint256(amt); + state.availableBalance -= uint256(amt); + SafeERC20.safeTransfer(rewardToken, account, amt); + } function getMorphoPoolBalance(address poolToken) internal view virtual returns (uint256); diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index 8fa3b241a7..2b10d1847b 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -512,6 +512,23 @@ for (const wrapperName of wrapperNames) { }) }) + it('Cannot frontrun claimRewards by inflating your shares', async () => { + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance.mul(100)) + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + + // Bob 'flashloans' 100x the current balance of the vault and claims rewards + await rewardableVault.connect(bob).deposit(initBalance.mul(100), bob.address) + await rewardableVault.connect(bob).claimRewards() + + // Alice claimsRewards a bit later + await rewardableVault.connect(alice).claimRewards() + expect(await rewardToken.balanceOf(alice.address)).to.be.gt( + await rewardToken.balanceOf(bob.address) + ) + }) + describe('alice deposit, accrue, bob deposit, accrue, bob claim, alice claim', () => { let rewardsPerShare: BigNumber diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index a1c99cfffa..a573f48887 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -24,7 +24,7 @@ import { MorphoAaveCollateralFixtureContext, mintCollateralTo } from './mintColl import { setCode } from '@nomicfoundation/hardhat-network-helpers' import { whileImpersonating } from '#/utils/impersonation' import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' -import { formatEther } from 'ethers/lib/utils' +import { advanceBlocks, advanceTime } from '#/utils/time' interface MAFiatCollateralOpts extends CollateralOpts { underlyingToken?: string @@ -35,7 +35,8 @@ interface MAFiatCollateralOpts extends CollateralOpts { const makeAaveFiatCollateralTestSuite = ( collateralName: string, - defaultCollateralOpts: MAFiatCollateralOpts + defaultCollateralOpts: MAFiatCollateralOpts, + specificTests = false ) => { const networkConfigToUse = networkConfig[31337] const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { @@ -197,7 +198,9 @@ const makeAaveFiatCollateralTestSuite = ( */ const collateralSpecificConstructorTests = () => { it('tokenised deposits can correctly claim rewards', async () => { - const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' + const alice = hre.ethers.provider.getSigner(1) + const aliceAddress = await alice.getAddress() + const forkBlock = 17574117 const claimer = '0x05e818959c2Aa4CD05EDAe9A099c38e7Bdc377C6' const reset = getResetFork(forkBlock) @@ -213,39 +216,39 @@ const makeAaveFiatCollateralTestSuite = ( rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) + + const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' const vaultCode = await ethers.provider.getCode(usdtVault.address) await setCode(claimer, vaultCode) const vaultWithClaimableRewards = usdtVault.attach(claimer) + await whileImpersonating(hre, morphoTokenOwner, async (signer) => { + const morphoTokenInst = await ethers.getContractAt( + 'IMorphoToken', + networkConfigToUse.tokens.MORPHO!, + signer + ) + + await morphoTokenInst + .connect(signer) + .setUserRole(vaultWithClaimableRewards.address, 0, true) + }) const erc20Factory = await ethers.getContractFactory('ERC20Mock') const underlyingERC20 = erc20Factory.attach(defaultCollateralOpts.underlyingToken!) const depositAmount = utils.parseUnits('1000', 6) - const user = hre.ethers.provider.getSigner(0) - const userAddress = await user.getAddress() - - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('0.0') - await whileImpersonating( hre, whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], async (whaleSigner) => { - await underlyingERC20.connect(whaleSigner).approve(vaultWithClaimableRewards.address, 0) - await underlyingERC20 - .connect(whaleSigner) - .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) - await vaultWithClaimableRewards.connect(whaleSigner).mint(depositAmount, userAddress) + await underlyingERC20.connect(whaleSigner).transfer(aliceAddress, depositAmount) } ) - - expect( - formatEther( - await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) - ).slice(0, '8.60295466891613'.length) - ).to.be.equal('8.60295466891613') - + await underlyingERC20.connect(alice).approve(vaultWithClaimableRewards.address, 0) + await underlyingERC20 + .connect(alice) + .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) + await vaultWithClaimableRewards.connect(alice).mint(depositAmount, aliceAddress) const morphoRewards = await ethers.getContractAt( 'IMorphoRewardsDistributor', networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR! @@ -265,47 +268,74 @@ const makeAaveFiatCollateralTestSuite = ( '0xea8c2ee8d43e37ceb7b0c04d59106eff88afbe3e911b656dec7caebd415ea696', ]) - expect( - formatEther( - await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) - ).slice(0, '14.162082619942089'.length) - ).to.be.equal('14.162082619942089') + // sync needs to be called after a claim to start a new payout period + // new tokens will only be moved into pending after a _claimAssetRewards call + // which sync allows you to do without the other stuff that happens in claimRewards + await vaultWithClaimableRewards.sync() - // MORPHO is not a transferable token. - // POST Launch we could ask the Morpho team if our TokenVaults could get permission to transfer the MORPHO tokens. - // Otherwise owners of the TokenVault shares need to wait until the protocol enables the transfer function on the MORPHO token. + await advanceTime(hre, 86400 * 7) + await advanceBlocks(hre, 7200 * 7) + expect(await vaultWithClaimableRewards.connect(alice).claimRewards()) + expect( + await erc20Factory.attach(networkConfigToUse.tokens.MORPHO!).balanceOf(aliceAddress) + ).to.be.eq(bn('14162082619942089266')) + }) + it('Frontrunning claiming rewards is not economical', async () => { + const alice = hre.ethers.provider.getSigner(1) + const aliceAddress = await alice.getAddress() + const bob = hre.ethers.provider.getSigner(2) + const bobAddress = await bob.getAddress() - await whileImpersonating(hre, morphoTokenOwner, async (signer) => { - const morphoTokenInst = await ethers.getContractAt( - 'IMorphoToken', - networkConfigToUse.tokens.MORPHO!, - signer - ) + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDeposit' + ) + const ERC20Factory = await ethers.getContractFactory('ERC20Mock') + const mockRewardsToken = await ERC20Factory.deploy('MockMorphoReward', 'MMrp') + const underlyingERC20 = ERC20Factory.attach(defaultCollateralOpts.underlyingToken!) - await morphoTokenInst - .connect(signer) - .setUserRole(vaultWithClaimableRewards.address, 0, true) + const vault = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, + underlyingERC20: defaultCollateralOpts.underlyingToken!, + poolToken: defaultCollateralOpts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, + rewardToken: mockRewardsToken.address, }) - const morphoTokenInst = await ethers.getContractAt( - 'IMorphoToken', - networkConfigToUse.tokens.MORPHO!, - user + const depositAmount = utils.parseUnits('1000', 6) + + await whileImpersonating( + hre, + whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], + async (whaleSigner) => { + await underlyingERC20.connect(whaleSigner).transfer(aliceAddress, depositAmount) + await underlyingERC20.connect(whaleSigner).transfer(bobAddress, depositAmount.mul(10)) + } ) - expect(formatEther(await morphoTokenInst.balanceOf(userAddress))).to.be.equal('0.0') - await vaultWithClaimableRewards.claimRewards() + await underlyingERC20.connect(alice).approve(vault.address, ethers.constants.MaxUint256) + await vault.connect(alice).mint(depositAmount, aliceAddress) - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('0.0') + // Simulate inflation attack + await underlyingERC20.connect(bob).approve(vault.address, ethers.constants.MaxUint256) + await vault.connect(bob).mint(depositAmount.mul(10), bobAddress) - expect( - formatEther(await morphoTokenInst.balanceOf(userAddress)).slice( - 0, - '14.162082619942089'.length - ) - ).to.be.equal('14.162082619942089') + await mockRewardsToken.mint(vault.address, bn('1000000000000000000000')) + await vault.sync() + + await vault.connect(bob).claimRewards() + await vault.connect(bob).redeem(depositAmount.mul(10), bobAddress, bobAddress) + + // After the inflation attack + await advanceTime(hre, 86400 * 7) + await advanceBlocks(hre, 7200 * 7) + await vault.connect(alice).claimRewards() + + // Shown below is that it is no longer economical to inflate own shares + // bob only managed to steal approx 1/7200 * 90% of the reward because hardhat increments block by 1 + // in practise it would be 0 as inflation attacks typically flashloan assets. + expect(await mockRewardsToken.balanceOf(aliceAddress)).to.be.eq(bn('999996993749479075487')) + expect(await mockRewardsToken.balanceOf(bobAddress)).to.be.eq(bn('1503126503126363')) }) } @@ -316,7 +346,9 @@ const makeAaveFiatCollateralTestSuite = ( const opts = { deployCollateral, - collateralSpecificConstructorTests: collateralSpecificConstructorTests, + collateralSpecificConstructorTests: specificTests + ? collateralSpecificConstructorTests + : () => void 0, collateralSpecificStatusTests, beforeEachRewardsTest, makeCollateralFixtureContext, @@ -369,7 +401,8 @@ const makeOpts = ( const { tokens, chainlinkFeeds } = networkConfig[31337] makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDT', - makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!) + makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!), + true // Only run specific tests once, since they are slow ) makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDC', diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 049d644503..99f876bb27 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -4,6 +4,10 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality G exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; + exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134211`; exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129742`; @@ -32,6 +36,10 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; + exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134414`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129945`; @@ -60,6 +68,10 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; + exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133567`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129098`; From 3a4ac7c5f1f8cb269b2dfe941700fd5f41dc90ed Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 29 Nov 2023 22:05:54 -0500 Subject: [PATCH 142/450] Wcusdcv3 rewards fix (#1016) --- .../plugins/assets/compoundv3/CusdcV3Wrapper.sol | 13 ++++++------- .../plugins/assets/compoundv3/ICusdcV3Wrapper.sol | 2 +- .../assets/yearnv2/YearnV2CurveFiatCollateral.sol | 4 ++++ .../compoundv3/CusdcV3Wrapper.test.ts | 12 ++++++++++++ 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 9234322186..5b7b176061 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -20,14 +20,14 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { /// From cUSDCv3, used in principal <> present calculations uint256 public constant TRACKING_INDEX_SCALE = 1e15; /// From cUSDCv3, scaling factor for USDC rewards - uint64 public constant RESCALE_FACTOR = 1e12; + uint256 public constant RESCALE_FACTOR = 1e12; CometInterface public immutable underlyingComet; ICometRewards public immutable rewardsAddr; IERC20 public immutable rewardERC20; - mapping(address => uint64) public baseTrackingIndex; - mapping(address => uint64) public baseTrackingAccrued; + mapping(address => uint64) public baseTrackingIndex; // uint64 for consistency with CometHelpers + mapping(address => uint256) public baseTrackingAccrued; // uint256 to avoid overflow in L:199 mapping(address => uint256) public rewardsClaimed; constructor( @@ -257,7 +257,8 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { uint256 indexDelta = uint256(trackingSupplyIndex - baseTrackingIndex[account]); uint256 newBaseTrackingAccrued = baseTrackingAccrued[account] + - safe64((safe104(balanceOf(account)) * indexDelta) / TRACKING_INDEX_SCALE); + (safe104(balanceOf(account)) * indexDelta) / + TRACKING_INDEX_SCALE; uint256 claimed = rewardsClaimed[account]; uint256 accrued = newBaseTrackingAccrued * RESCALE_FACTOR; @@ -286,9 +287,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { (, uint64 trackingSupplyIndex) = getSupplyIndices(); uint256 indexDelta = uint256(trackingSupplyIndex - baseTrackingIndex[account]); - baseTrackingAccrued[account] += safe64( - (safe104(accountBal) * indexDelta) / TRACKING_INDEX_SCALE - ); + baseTrackingAccrued[account] += (safe104(accountBal) * indexDelta) / TRACKING_INDEX_SCALE; baseTrackingIndex[account] = trackingSupplyIndex; } diff --git a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol index f1514ec8e8..89a9dcfb35 100644 --- a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol @@ -51,7 +51,7 @@ interface ICusdcV3Wrapper is IWrappedERC20, IRewardable { function convertDynamicToStatic(uint256 amount) external view returns (uint104); - function baseTrackingAccrued(address account) external view returns (uint64); + function baseTrackingAccrued(address account) external view returns (uint256); function baseTrackingIndex(address account) external view returns (uint64); diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 89b11d861c..9121982562 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -77,11 +77,15 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { return (low, high, 0); } + // solhint-disable no-empty-blocks + /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins function claimRewards() external virtual override { // No rewards to claim, everything is part of the pricePerShare } + // solhint-enable no-empty-blocks + // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index b47b71bff9..cbbd48ed43 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -598,6 +598,18 @@ describeFork('Wrapped CUSDCv3', () => { ) }) + it('regression test: able to claim rewards even when they are big without overflow', async () => { + // Nov 28 2023: uint64 math in CusdcV3Wrapper contract results in overflow when COMP rewards are even moderately large + + const compToken = await ethers.getContractAt('ERC20Mock', COMP) + expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) + await advanceTime(1000) + await enableRewardsAccrual(cusdcV3, bn('2e18')) // enough to revert on uint64 implementation + + await expect(wcusdcV3.connect(bob).claimRewards()).to.emit(wcusdcV3, 'RewardsClaimed') + expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(0) + }) + it('claims rewards and sends to claimer (claimTo)', async () => { const compToken = await ethers.getContractAt('ERC20Mock', COMP) expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) From 7ee70864e21bf2b598fbbc654421c0a50dc934b1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 4 Dec 2023 12:02:02 -0500 Subject: [PATCH 143/450] wcUSDCv3 addresses (#1019) --- .../base-3.0.1/8453-tmp-assets-collateral.json | 4 ++-- .../mainnet-3.0.1/1-tmp-assets-collateral.json | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json index 9373fafb6b..d4cab5f1df 100644 --- a/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json +++ b/scripts/addresses/base-3.0.1/8453-tmp-assets-collateral.json @@ -8,7 +8,7 @@ "WETH": "0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3", "USDbC": "0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB", "cbETH": "0x5fE248625aC2AB0e17A115fef288f17AF1952402", - "cUSDbCv3": "0xa372EC846131FBf9AE8b589efa3D041D9a94dF41", + "cUSDbCv3": "0xd3025304C6487FC5c39010bEA0B46cc0690ab229", "aBasUSDbC": "0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b", "wsgUSDbC": "0x15395aCCbF8c6b28671fe41624D599624709a2D6" }, @@ -18,7 +18,7 @@ "WETH": "0x4200000000000000000000000000000000000006", "USDbC": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", "cbETH": "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22", - "cUSDbCv3": "0xbC0033679AEf41Fb9FeB553Fdf55a8Bb2fC5B29e", + "cUSDbCv3": "0xa8d818C719c1034E731Feba2088F4F011D44ACB3", "aBasUSDbC": "0x308447562442Cc43978f8274fA722C9C14BafF8b", "wsgUSDbC": "0x073F98792ef4c00bB5f11B1F64f13cB25Cde0d8D", "STG": "0xE3B53AF74a4BF62Ae5511055290838050bf764Df" diff --git a/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json index d03e354462..bb2d77e4f5 100644 --- a/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.0.1/1-tmp-assets-collateral.json @@ -32,7 +32,7 @@ "fUSDT": "0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A", "fDAI": "0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875", "fFRAX": "0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92", - "cUSDCv3": "0x85b256e9051B781A0BC0A987857AD6166C94040a", + "cUSDCv3": "0x7Dee4DbeF75f93cCA06823Ac915Df990be3F1538", "cvx3Pool": "0x62C394620f674e85768a7618a6C202baE7fB8Dd1", "cvxeUSDFRAXBP": "0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122", "cvxMIM3Pool": "0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7", @@ -47,7 +47,8 @@ "maWBTC": "0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250", "maWETH": "0x878b995bDD2D9900BEE896Bd78ADd877672e1637", "maStETH": "0x33E840e5711549358f6d4D11F9Ab2896B36E9822", - "aEthUSDC": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba" + "aEthUSDC": "0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba", + "sFRAX": "0x7E4650af145f6a9146b91E8b363DF49ee32b0A58" }, "erc20s": { "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", @@ -80,7 +81,7 @@ "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7", "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b", "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B", - "cUSDCv3": "0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab", + "cUSDCv3": "0x093c07787920eB34A0A0c7a09823510725Aee4Af", "cvx3Pool": "0xaBd7E7a5C846eD497681a590feBED99e7157B6a3", "cvxeUSDFRAXBP": "0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5", "cvxMIM3Pool": "0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F", @@ -95,6 +96,7 @@ "maWBTC": "0xe0E1d3c6f09DA01399e84699722B11308607BBfC", "maWETH": "0x291ed25eB61fcc074156eE79c5Da87e5DA94198F", "maStETH": "0x97F9d5ed17A0C99B279887caD5254d15fb1B619B", - "aEthUSDC": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE" + "aEthUSDC": "0x63e12c3b2DBCaeF1835Bb99Ac1Fdb0Ebe1bE69bE", + "sFRAX": "0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32" } } \ No newline at end of file From 01c77fd002fa73014736c56e77e2af9de7e8f591 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 4 Dec 2023 20:18:16 -0500 Subject: [PATCH 144/450] init 3.2.0 --- contracts/mixins/Versioned.sol | 2 +- test/fixtures.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index c70c7a8857..afc4915e0c 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.1.0"; +string constant VERSION = "3.2.0"; /** * @title Versioned diff --git a/test/fixtures.ts b/test/fixtures.ts index 6244d68ff3..4b0a8e30fa 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -80,7 +80,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.1.0' +export const VERSION = '3.2.0' export type Collateral = | FiatCollateral From 05c1d665ccb897b6189fd0de261146ea3f431ce4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 4 Dec 2023 20:28:00 -0500 Subject: [PATCH 145/450] fix deployment --- scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts index 1510377f20..600505d84e 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { SFraxCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -53,7 +53,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% erc20: networkConfig[chainId].tokens.sFRAX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% = 1% oracleError + 1% buffer delayUntilDefault: bn('86400').toString(), // 24h From 2770b2a22fd7abea0b7e8c7b0c02913bb3b8cf41 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 4 Dec 2023 20:29:56 -0500 Subject: [PATCH 146/450] fix mainnet integration tests --- .../individual-collateral/frax/SFraxCollateralTestSuite.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index cf4038f9aa..43d09c95be 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,6 +193,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it.skip, From 2a9e8f59b349138531639e4b9361cffc2502c0c7 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Tue, 5 Dec 2023 15:07:56 -0500 Subject: [PATCH 147/450] add toc for docs website. (#1021) --- docs/deployed-addresses/1-assets-3.0.1.md | 3 +- docs/deployed-addresses/8453-assets-3.0.1.md | 2 +- docs/deployed-addresses/index.json | 36 ++++++++++++ tasks/deployment/get-addresses.ts | 58 ++++++++++++++------ 4 files changed, 80 insertions(+), 19 deletions(-) create mode 100644 docs/deployed-addresses/index.json diff --git a/docs/deployed-addresses/1-assets-3.0.1.md b/docs/deployed-addresses/1-assets-3.0.1.md index 2b586a2b80..9205b1b537 100644 --- a/docs/deployed-addresses/1-assets-3.0.1.md +++ b/docs/deployed-addresses/1-assets-3.0.1.md @@ -36,7 +36,7 @@ | fUSDT | [0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A](https://etherscan.io/address/0xbe6Fb2b2908D85179e34ee0D996e32fa2BF4410A) | | fDAI | [0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875](https://etherscan.io/address/0x33C1665Eb1b3673213Daa5f068ae1026fC8D5875) | | fFRAX | [0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92](https://etherscan.io/address/0xaAeF84f6FfDE4D0390E14DA9c527d1a1ABf28B92) | -| cUSDCv3 | [0x85b256e9051B781A0BC0A987857AD6166C94040a](https://etherscan.io/address/0x85b256e9051B781A0BC0A987857AD6166C94040a) | +| cUSDCv3 | [0x7Dee4DbeF75f93cCA06823Ac915Df990be3F1538](https://etherscan.io/address/0x7Dee4DbeF75f93cCA06823Ac915Df990be3F1538) | | cvx3Pool | [0x62C394620f674e85768a7618a6C202baE7fB8Dd1](https://etherscan.io/address/0x62C394620f674e85768a7618a6C202baE7fB8Dd1) | | cvxeUSDFRAXBP | [0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122](https://etherscan.io/address/0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122) | | cvxMIM3Pool | [0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7](https://etherscan.io/address/0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7) | @@ -52,4 +52,5 @@ | maWETH | [0x878b995bDD2D9900BEE896Bd78ADd877672e1637](https://etherscan.io/address/0x878b995bDD2D9900BEE896Bd78ADd877672e1637) | | maStETH | [0x33E840e5711549358f6d4D11F9Ab2896B36E9822](https://etherscan.io/address/0x33E840e5711549358f6d4D11F9Ab2896B36E9822) | | aEthUSDC | [0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba](https://etherscan.io/address/0x12c3BB1B0da85fDaE0137aE8fDe901F7D0e106ba) | +| sFRAX | [0x7E4650af145f6a9146b91E8b363DF49ee32b0A58](https://etherscan.io/address/0x7E4650af145f6a9146b91E8b363DF49ee32b0A58) | \ No newline at end of file diff --git a/docs/deployed-addresses/8453-assets-3.0.1.md b/docs/deployed-addresses/8453-assets-3.0.1.md index b53352b1a7..0c26f6845b 100644 --- a/docs/deployed-addresses/8453-assets-3.0.1.md +++ b/docs/deployed-addresses/8453-assets-3.0.1.md @@ -12,7 +12,7 @@ | WETH | [0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3](https://basescan.org/address/0x42D0fA25d6d5bff01aC050c0F5aB0B2C9D01b4a3) | | USDbC | [0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB](https://basescan.org/address/0x6490D66B17A1E9a460Ab54131165C8F921aCcDeB) | | cbETH | [0x5fE248625aC2AB0e17A115fef288f17AF1952402](https://basescan.org/address/0x5fE248625aC2AB0e17A115fef288f17AF1952402) | -| cUSDbCv3 | [0xa372EC846131FBf9AE8b589efa3D041D9a94dF41](https://basescan.org/address/0xa372EC846131FBf9AE8b589efa3D041D9a94dF41) | +| cUSDbCv3 | [0xd3025304C6487FC5c39010bEA0B46cc0690ab229](https://basescan.org/address/0xd3025304C6487FC5c39010bEA0B46cc0690ab229) | | aBasUSDbC | [0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b](https://basescan.org/address/0x1DdB7dfdC5D26FE1f2aD02d9972f12481346Ae9b) | | wsgUSDbC | [0x15395aCCbF8c6b28671fe41624D599624709a2D6](https://basescan.org/address/0x15395aCCbF8c6b28671fe41624D599624709a2D6) | \ No newline at end of file diff --git a/docs/deployed-addresses/index.json b/docs/deployed-addresses/index.json new file mode 100644 index 0000000000..41ee236cd2 --- /dev/null +++ b/docs/deployed-addresses/index.json @@ -0,0 +1,36 @@ +{ + "mainnet": { + "components": [ + "components-2.0.0", + "components-2.1.0", + "components-3.0.0", + "components-3.0.1" + ], + "assets": [ + "assets-2.0.0", + "assets-2.1.0", + "assets-3.0.0", + "assets-3.0.1" + ], + "rtokens": [ + "eUSD", + "ETH+", + "hyUSD", + "USDC+" + ] + }, + "base": { + "components": [ + "components-3.0.0", + "components-3.0.1" + ], + "assets": [ + "assets-3.0.0", + "assets-3.0.1" + ], + "rtokens": [ + "hyUSD", + "Vaya" + ] + } +} \ No newline at end of file diff --git a/tasks/deployment/get-addresses.ts b/tasks/deployment/get-addresses.ts index 3fb2b86a13..f8433460d4 100644 --- a/tasks/deployment/get-addresses.ts +++ b/tasks/deployment/get-addresses.ts @@ -10,6 +10,10 @@ import { import { ITokens } from '#/common/configuration' import { MainP1 } from '@typechain/MainP1' import { Contract } from 'ethers' +const tocFilename = 'docs/deployed-addresses/index.json' +import toc from '#/docs/deployed-addresses/index.json' + +type Network = 'mainnet' | 'base' task('get-addys', 'Compile the deployed addresses of an RToken deployment') .addOptionalParam('rtoken', 'The address of the RToken', undefined, types.string) @@ -17,17 +21,18 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') .addOptionalParam('ver', 'The target version', undefined, types.string) .setAction(async (params, hre) => { /* - Helper functions + Helper functions */ - - // hacky api throttler, basescan has rate limits 5req/sec - const delay = async (ms: number) => { - return new Promise( resolve => setTimeout(resolve, ms) ); + + // hacky api throttler, basescan has rate limits 5req/sec + const delay = async (ms: number) => { + return new Promise( resolve => setTimeout(resolve, ms) ); } - + const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1) - - const network = hre.network.name + + const chainId = await getChainId(hre) + const network: Network = hre.network.name as Network let scannerUrl: string; let scannerApiUrl: string; switch(network) { @@ -147,20 +152,25 @@ ${collaterals} } const getRTokenFileName = async (rtoken: string) => { - const chainId = await getChainId(hre) const rToken = await hre.ethers.getContractAt('IRToken', rtoken) const rTokenSymbol = await rToken.symbol() return `${outputDir}${chainId}-${rTokenSymbol}.md` } - const getAssetFileName = async (version: string) => { - const chainId = await getChainId(hre) - return `${outputDir}${chainId}-assets-${version}.md` + const getAssetFileId = (version: string) => { + return `assets-${version}` } - const getComponentFileName = async (version: string) => { - const chainId = await getChainId(hre) - return `${outputDir}${chainId}-components-${version}.md` + const getComponentFileId = (version: string) => { + return `components-${version}` + } + + const getAssetFileName = (assetFileId: string) => { + return `${outputDir}${chainId}-${assetFileId}.md` + } + + const getComponentFileName = (componentFileId: string) => { + return `${outputDir}${chainId}-${componentFileId}.md` } /* @@ -229,6 +239,11 @@ ${collaterals} const rTokenFileName = await getRTokenFileName(params.rtoken) fs.writeFileSync(rTokenFileName, markdown) console.log(`Wrote ${rTokenFileName}`) + + toc[network]['rtokens'].indexOf(rTokenSymbol) === -1 && toc[network]['rtokens'].push(rTokenSymbol) + fs.writeFileSync(tocFilename, JSON.stringify(toc, null, 2)) + console.log(`Updated table of contents`) + } else if (params.ver) { console.log(`Collecting addresses for Version: ${params.ver} (${hre.network.name})`) // if version is provided, print implementation addresses @@ -254,7 +269,9 @@ ${collaterals} assetRows, collateralRows ) - const assetFileName = await getAssetFileName(params.ver) + const assetFileId = getAssetFileId(params.ver) + const assetFileName = getAssetFileName(assetFileId) + fs.writeFileSync(assetFileName, assetMarkdown) console.log(`Wrote ${assetFileName}`) @@ -283,9 +300,16 @@ ${collaterals} `Component Implementations (${capitalize(hre.network.name)} ${params.ver})`, await createTableRows(components, false, true) ) - const componentFileName = await getComponentFileName(params.ver) + + const componentFileId = getComponentFileId(params.ver) + const componentFileName = getComponentFileName(componentFileId) fs.writeFileSync(componentFileName, componentMarkdown) console.log(`Wrote ${componentFileName}`) + + toc[network]['components'].indexOf(componentFileId) === -1 && toc[network]['components'].push(componentFileId) + toc[network]['assets'].indexOf(assetFileId) === -1 && toc[network]['assets'].push(assetFileId) + fs.writeFileSync(tocFilename, JSON.stringify(toc, null, 2)) + console.log(`Updated table of contents`) } else { // if neither rtoken address nor version number is provided, throw error throw new Error( From e58de1cbaeae9de4b90c9adcdba2c989e48c6bc1 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Tue, 5 Dec 2023 18:00:09 -0500 Subject: [PATCH 148/450] add new c4 reports. (#1023) --- ...it Report - Release 3.0.0 (collaterals).md | 2877 +++++++++++++++++ ...ve Audit Report - Release 3.0.0 (core).md} | 30 +- ...a Reserve Audit Report - Release 2.1.0.md} | 0 3 files changed, 2896 insertions(+), 11 deletions(-) create mode 100644 audits/Code4rena - Reserve Audit Report - Release 3.0.0 (collaterals).md rename audits/{Code4rena - Reserve Audit Report - 3.0.0 Release.md => Code4rena - Reserve Audit Report - Release 3.0.0 (core).md} (97%) rename audits/{Code4rena Reserve Audit Report.md => Code4rena Reserve Audit Report - Release 2.1.0.md} (100%) diff --git a/audits/Code4rena - Reserve Audit Report - Release 3.0.0 (collaterals).md b/audits/Code4rena - Reserve Audit Report - Release 3.0.0 (collaterals).md new file mode 100644 index 0000000000..125d19a823 --- /dev/null +++ b/audits/Code4rena - Reserve Audit Report - Release 3.0.0 (collaterals).md @@ -0,0 +1,2877 @@ +--- +sponsor: "Reserve" +slug: "2023-07-reserve" +date: "2023-11-13" +title: "Reserve Protocol - Invitational" +findings: "https://github.com/code-423n4/2023-07-reserve-findings/issues" +contest: 268 +--- + +# Overview + +## About C4 + +Code4rena (C4) is an open organization consisting of security researchers, auditors, developers, and individuals with domain expertise in smart contracts. + +A C4 audit is an event in which community participants, referred to as Wardens, review, audit, or analyze smart contract logic in exchange for a bounty provided by sponsoring projects. + +During the audit outlined in this document, C4 conducted an analysis of the Reserve Protocol smart contract system written in Solidity. The audit took place between July 25 — August 4 2023. + +Following the C4 audit, 3 wardens ([ronnyx2017](https://code4rena.com/@ronnyx2017), [bin2chen](https://code4rena.com/@bin2chen) and [RaymondFam](https://code4rena.com/@RaymondFam)) reviewed the mitigations for all identified issues; the mitigation review report is appended below the audit report. + +## Wardens + +In Code4rena's Invitational audits, the competition is limited to a small group of wardens; for this audit, 7 wardens contributed reports:: + + 1. [ronnyx2017](https://code4rena.com/@ronnyx2017) + 2. [bin2chen](https://code4rena.com/@bin2chen) + 3. [RaymondFam](https://code4rena.com/@RaymondFam) + 4. [0xA5DF](https://code4rena.com/@0xA5DF) + 5. [auditor0517](https://code4rena.com/@auditor0517) + 6. [sces60107](https://code4rena.com/@sces60107) + 7. [carlitox477](https://code4rena.com/@carlitox477) + +This audit was judged by [cccz](https://code4rena.com/@cccz). + +Final report assembled by [liveactionllama](https://twitter.com/liveactionllama) and thebrittfactor. + +# Summary + +The C4 analysis yielded an aggregated total of 18 unique vulnerabilities. Of these vulnerabilities, 3 received a risk rating in the category of HIGH severity and 15 received a risk rating in the category of MEDIUM severity. + +Additionally, C4 analysis included 6 reports detailing issues with a risk rating of LOW severity or non-critical. There were also 2 reports recommending gas optimizations. + +All of the issues presented here are linked back to their original finding. + +# Scope + +The code under review can be found within the [C4 Reserve Protocol Audit repository](https://github.com/code-423n4/2023-07-reserve), and is composed of 51 smart contracts written in the Solidity programming language and includes approximately 3000 lines of Solidity code. + +# Severity Criteria + +C4 assesses the severity of disclosed vulnerabilities based on three primary risk categories: high, medium, and low/non-critical. + +High-level considerations for vulnerabilities span the following key areas when conducting assessments: + +- Malicious Input Handling +- Escalation of privileges +- Arithmetic +- Gas use + +For more information regarding the severity criteria referenced throughout the submission review process, please refer to the documentation provided on [the C4 website](https://code4rena.com), specifically our section on [Severity Categorization](https://docs.code4rena.com/awarding/judging-criteria/severity-categorization). + +# High Risk Findings (3) +## [[H-01] CBEthCollateral and AnkrStakedEthCollateral \_underlyingRefPerTok is incorrect](https://github.com/code-423n4/2023-07-reserve-findings/issues/23) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/23), also found by [0xA5DF](https://github.com/code-423n4/2023-07-reserve-findings/issues/32)* + +### Lines of Code + +
+ + +The `CBEthCollateral._underlyingRefPerTok()` function just uses `CBEth.exchangeRate()` to get the ref/tok rate. The `CBEth.exchangeRate()` can only get the conversion rate from cbETH to staked ETH2 on the coinbase. However as the docs `https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/2023-07-reserve/protocol/contracts/plugins/assets/cbeth/README.md` the ref unit should be ETH. The staked ETH2 must take a few days to unstake, which leads to a premium between ETH and cbETH. + +And the `AnkrStakedEthCollateral` and `RethCollateral` has the same problem. According to the ankr docs, unstake eth by Flash unstake have to pay a fee, 0.5% of the unstaked amount. + +### Impact + +The `_underlyingRefPerTok` will return a higher ref/tok rate than the truth. And the premium is positively correlated with the unstake delay of eth2. When the unstake queue suddenly increases, the attacker can uses cbeth to issue more rtokens. Even if the cbETH has defaulted, the CBEthCollateral will never mark the state as DISABLED because the `CBEth.exchangeRate()` is updated by coinbase manager and it only represents the cbETH / staked eth2 rate instead of the cbETH/ETH rate. + +### Proof of Concept + +For example, Now it's about 17819370 block high on the mainnet, and the `CBEth.exchangeRate()`() is 1.045264058480813188, but the chainlink price feed for cbETH/ETH() is 1.0438. + +### Recommended Mitigation Steps + +Use the `cbETH/ETH` oracle to get the `cbETH/ETH` rate. + +Or, the ref unit for the collateral should be the staked eth2. + +### Assessed type + +Context + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/23#issuecomment-1670254005):** + > This feels like a duplicate of [#32](https://github.com/code-423n4/2023-07-reserve-findings/issues/32). The root cause is an incorrect reference unit. The reference unit should be staked eth2, as indicated here. + +**[pmckelvy1 (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/23#issuecomment-1687102372)** + +**[ronnyx2017 (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/23#issuecomment-1706448165):** + > This issue and [32](https://github.com/code-423n4/2023-07-reserve-findings/issues/32) explain the misuse of tar unit and ref unit in staked eth related assets from different perspectives. The root cause is same, that 1 staked eth2 != 1 eth. This issue assumes that the ref token and target is all eth, which is referred to in [the docs](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/2023-07-reserve/protocol/contracts/plugins/assets/cbeth/README.md). So the error should be in the function `_underlyingRefPerTok`. But issue 32 assumes that the ref unit should be staked eth2 and the target unit is eth. So it needs to modify function `targetPerRef`. I also have mentioned this mitigation in the `Recommended Mitigation Steps` section of the current issue: +> ``` +> Or, the ref unit for the collateral should be the staked eth2. +> ``` + +**[cccz (judge) increased severity to High](https://github.com/code-423n4/2023-07-reserve-findings/issues/23#issuecomment-1706659317)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Fixes units and price calculations in cbETH, rETH, ankrETH collateral plugins.
+> PR: https://github.com/reserve-protocol/protocol/pull/899 + +**Status**: Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/20), [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/3) and [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/2). + +*** + +## [[H-02] CurveVolatileCollateral Collateral status can be manipulated by flashloan attack](https://github.com/code-423n4/2023-07-reserve-findings/issues/22) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/22)* + +Attacker can make the CurveVolatileCollateral enter the status of IFFY/DISABLED. It will cause the basket to rebalance and sell off all the CurveVolatileCollateral. + +### Proof of Concept + +The `CurveVolatileCollateral` overrides the `_anyDepeggedInPool` function to check if the distribution of capital is balanced. If the any part of underlying token exceeds the expected more than `_defaultThreshold`, return true, which means the volatile pool has been depeg: + +```solidity +uint192 expected = FIX_ONE.divu(nTokens); // {1} +for (uint8 i = 0; i < nTokens; i++) { + uint192 observed = divuu(vals[i], valSum); // {1} + if (observed > expected) { + if (observed - expected > _defaultThreshold) return true; + } +} +``` + +And the coll status will be updated in the super class `CurveStableCollateral.refresh()`: + + if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + markStatus(CollateralStatus.IFFY); + } + +The attack process is as follows: + +1. Assumption: There is a CurveVolatileCollateral bases on a TriCrypto ETH/WBTC/USDT, and the value of them should be 1:1:1, and the `_defaultThreshold` of the CurveVolatileCollateral is 5%. And at first, there are 1000 USDT in the pool and the pool is balanced. + +2. The attacker uses flash loan to deposit 500 USDT to the pool. Now, the USDT distribution is `1500/(1500+1000+1000) = 42.86%`. + +3. Attacker refresh the CurveVolatileCollateral. Because the USDT distribution \- expected = 42.86% \- 33.33% = 9.53% > 5% \_defaultThreshold. So CurveVolatileCollateral will be marked as IFFY. + +4. The attacker withdraw from the pool and repay the USDT. + +5. Just wait `delayUntilDefault`, the collateral will be marked as defaulted by the `alreadyDefaulted` function. + + function alreadyDefaulted() internal view returns (bool) { + return _whenDefault <= block.timestamp; + } + +### Recommended Mitigation Steps + +I think the de-pegged status in the volatile pool may be unimportant. It will be temporary and have little impact on the price of outside lp tokens. After all, override the `_anyDepeggedOutsidePool` to check the lp price might be a good idea. + +### Assessed type + +Context + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/22#issuecomment-1670210544)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Removes `CurveVolatileCollateral`.
+> PR: https://github.com/reserve-protocol/protocol/pull/896 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/21), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/27) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/4). + +*** + +## [[H-03] ConvexStakingWrapper.sol after shutdown，rewards can be stolen](https://github.com/code-423n4/2023-07-reserve-findings/issues/11) +*Submitted by [bin2chen](https://github.com/code-423n4/2023-07-reserve-findings/issues/11)* + +After shutdown, checkpoints are stopped, leading to possible theft of rewards. + +### Proof of Concept + +`ConvexStakingWrapper` No more `checkpoints` after `shutdown`, i.e. no updates `reward.reward_integral_for[user]` + +```solidity + function _beforeTokenTransfer( + address _from, + address _to, + uint256 + ) internal override { +@> _checkpoint([_from, _to]); + } + + function _checkpoint(address[2] memory _accounts) internal nonReentrant { + //if shutdown, no longer checkpoint in case there are problems +@> if (isShutdown()) return; + + uint256 supply = _getTotalSupply(); + uint256[2] memory depositedBalance; + depositedBalance[0] = _getDepositedBalance(_accounts[0]); + depositedBalance[1] = _getDepositedBalance(_accounts[1]); + + IRewardStaking(convexPool).getReward(address(this), true); + + _claimExtras(); + + uint256 rewardCount = rewards.length; + for (uint256 i = 0; i < rewardCount; i++) { + _calcRewardIntegral(i, _accounts, depositedBalance, supply, false); + } + } +``` + +This would result in, after `shutdown`, being able to steal `rewards` by transferring `tokens` to new users. + +Example:
+Suppose the current
+`reward.reward_integral = 1000` + +When a `shutdown` occurs: + +1. Alice transfers 100 to the new user, Bob. + +Since Bob is the new user and `_beforeTokenTransfer()->_checkpoint()` is not actually executed.
+Result:
+balanceOf\[bob] = 100
+reward.reward\_integral\_for\[bob] = 0 + +2. Bob executes `claimRewards()` to steal the reward. + +reward amount = balanceOf\[bob] * (reward.reward\_integral \- reward.reward\_integral\_for\[bob])
+\= 100 * (1000-0) + +3. Bob transfers the balance to other new users, looping steps 1-2 and stealing all rewards. + +### Recommended Mitigation Steps + +Still execute `\_checkpoint` + +```solidity + + function _checkpoint(address[2] memory _accounts) internal nonReentrant { + //if shutdown, no longer checkpoint in case there are problems + - if (isShutdown()) return; + + uint256 supply = _getTotalSupply(); + uint256[2] memory depositedBalance; + depositedBalance[0] = _getDepositedBalance(_accounts[0]); + depositedBalance[1] = _getDepositedBalance(_accounts[1]); + + IRewardStaking(convexPool).getReward(address(this), true); + + _claimExtras(); + + uint256 rewardCount = rewards.length; + for (uint256 i = 0; i < rewardCount; i++) { + _calcRewardIntegral(i, _accounts, depositedBalance, supply, false); + } + } +``` + +### Assessed type + +Context + +**[pmckelvy1 (Reserve) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/11#issuecomment-1699523437)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Skip reward claim in `_checkpoint` if shutdown.
+> PR: https://github.com/reserve-protocol/protocol/pull/930 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/22), [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/5) and [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/29). + + +*** + + +# Medium Risk Findings (15) +## [[M-01] Curve Read-only Reentrancy can increase the price of some CurveStableCollateral](https://github.com/code-423n4/2023-07-reserve-findings/issues/45) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/45), also found by [bin2chen](https://github.com/code-423n4/2023-07-reserve-findings/issues/14)* + +If the curve pool of a CurveStableCollateral is a Plain Pool with a native gas token, just like eth/stETH pool: https://etherscan.io/address/0xdc24316b9ae028f1497c275eb9192a3ea0f67022#code
+The price can be manipulated by Curve Read-only Reentrancy. + +A example is eth/stETH pool, in its `remove_liquidity` function: +```solidity +# snippet from remove_liquidity +CurveToken(lp_token).burnFrom(msg.sender, _amount) +for i in range(N_COINS): + value: uint256 = amounts[i] * _amount / total_supply + if i == 0: + raw_call(msg.sender, b"", value=value) + else: + assert ERC20(self.coins[1]).transfer(msg.sender, value) +``` + +First, LP tokens are burned. Next, each token is transferred out to the msg.sender. Given that ETH will be the first coin transferred out, token balances and total LP token supply will be inconsistent during the execution of the fallback function. + +The `CurveStableCollateral` uses `total underlying token balance value / lp supply` to calculate the lp token price: +``` + (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); + + // {tok} + uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); + // We can always assume that the total supply is non-zero + + // {UoA/tok} = {UoA} / {tok} + low = aumLow.div(supply, FLOOR); + high = aumHigh.div(supply, CEIL); +``` + +So the price will be higher than the actual value because the other assets(except eth) are still in the pool but the lp supply has been cut down during the `remove_liquidity` fallback. + +**[tbrent (Reserve) commented via duplicate issue `#14`](https://github.com/code-423n4/2023-07-reserve-findings/issues/14#issuecomment-1670265655):** +> We have considered this very issue before and have decided as a solution to avoid raw ETH and ERC777's entirely, and _not_ try to detect reentrancy in the way described in the article. This is for a few reasons: +> 1. It cannot be implemented uniformly. `withdraw_admin_fees` is not on all Curve pools, and in particular not on Tricrypto. https://etherscan.io/address/0xd51a44d3fae010294c616388b506acda1bfaae46 +> 2. Raw ETH presents other challenges. Even if we detect reentrancy in the way suggested, the assetRegistry making multiple asset `refresh()` calls means an attacker could gain execution under a _different_ asset's refresh() and use that to manipulate refPerTok(). +> +> Also related: Our target unit system does not work well with volatile pools. Each pool would need its own target unit and therefore could not be backed up with any other collateral except identically/distributed pools. We plan to remove `CurveVolatileCollateral` entirely. + +**[tbrent (Reserve) commented via duplicate issue `#14`](https://github.com/code-423n4/2023-07-reserve-findings/issues/14#issuecomment-1670297671):** +> There is documentation on the website indicating to avoid ERC777 tokens, but this should probably be updated to include forbidding LP tokens that contain raw ETH. Though, it is a bit more complicated than that since some LP tokens offer withdrawal functions that automate the unwrapping of WETH into ETH. +> +> https://reserve.org/protocol/rtokens/#non-compatible-erc20-assets + +**[pmckelvy1 (Reserve) confirmed via duplicate issue `#14`](https://github.com/code-423n4/2023-07-reserve-findings/issues/14#issuecomment-1699524901)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Removes `CurveVolatileCollateral`.
+> PR: https://github.com/reserve-protocol/protocol/pull/896 + +**Status:** Mitigation confirmed. Full details in reports from [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/28), [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/23) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/6). + + +*** + +## [[M-02] `CTokenV3Collateral._underlyingRefPerTok` should use the decimals from underlying Comet](https://github.com/code-423n4/2023-07-reserve-findings/issues/39) +*Submitted by [sces60107](https://github.com/code-423n4/2023-07-reserve-findings/issues/39)* + +
+
+ + +`CTokenV3Collateral._underlyingRefPerTok` uses `erc20Decimals` which is the decimals of `CusdcV3Wrapper`. But it should use the decimals of the underlying Comet. + +### Proof of Concept + +`CTokenV3Collateral.\_underlyingRefPerTok`computes the actual quantity of whole reference units per whole collateral tokens. And it passes`erc20Decimals`to`shiftl_toFix`.
+ + +```solidity + function _underlyingRefPerTok() internal view virtual override returns (uint192) { + return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(erc20Decimals)); + } +``` + +However, the correct decimals should be the decimals of underlying Comet since it is used in `CusdcV3Wrapper.exchangeRate`. + + + +```solidity + function exchangeRate() public view returns (uint256) { + (uint64 baseSupplyIndex, ) = getUpdatedSupplyIndicies(); + return presentValueSupply(baseSupplyIndex, safe104(10**underlyingComet.decimals())); + } +``` + +### Recommended Mitigation Steps + +```diff + function _underlyingRefPerTok() internal view virtual override returns (uint192) { +- return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(erc20Decimals)); ++ return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(comet.decimals())); + } +``` + +### Assessed type + +Decimal + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/39#issuecomment-1670212066)** + +**[pmckelvy1 (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/39#issuecomment-1673628054):** + > https://github.com/reserve-protocol/protocol/pull/889 + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Use decimals from underlying Comet.
+> PR: https://github.com/reserve-protocol/protocol/pull/889 + +**Status:** Mitigation confirmed. Full details in reports from [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/30), [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/24) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/7). + + +*** + +## [[M-03] `RTokenAsset` price estimation accounts for margin of error twice](https://github.com/code-423n4/2023-07-reserve-findings/issues/31) +*Submitted by [0xA5DF](https://github.com/code-423n4/2023-07-reserve-findings/issues/31)* + +
+ + +`RTokenAsset` estimates the price by multiplying the BU (basket unit) price estimation by the estimation of baskets held (then dividing by total supply). +The issue is that both BU and baskets held account for price margin of error, widening the range of the price more than necessary. + +### Impact + +This would increase the high estimation of the price and decrease the lower estimation. This would impact: + +* Setting a lower min price for trading (possibly selling the asset for less than its value) +* Preventing the sale of the asset (`lotLow` falling below the min trade volume) +* Misestimation of the basket range on the 'parent' RToken + +### Proof of Concept + +* Both `tryPrice()` and `lotPrice()` use this method of multiplying basket unit price by basket range then dividing by total supply +* BU price accounts for oracle error +* As for the basket range - whenever one of the collaterals is missing (i.e. less than baskets needed) it estimates the value of anything above the min baskets held, and when doing that it estimates for oracle error as well. + +Consider the following scenario: + +* We have a basket composed of 1 ETH token and 1 USD token (cUSDCv2) +* cUSDCv2 defaults and the backup token AAVE-USDC kicks in +* Before trading rebalances things we have 0 AAVE-USDC +* This means that we'd be estimating the low price of the ETH we're accounting for margin of error at least twice: + * Within the `basketRange()` we're dividing the ETH's `low` price by `buPriceHigh` + * Then we multiply again by `buPriceLow` + +(There's also some duplication within the `basketRange()` but that function isn't in scope, what is is scope is the additional margin of error when multiplying by `buPriceLow`). + +### Recommended Mitigation Steps + +I think the best way to mitigate this would be to use a dedicated function to estimate the price, I don't see an easy way to fix this while using the existing functions. + +### Assessed type + +Other + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1671657043):** + > Currently contemplating switching `BasketHandler.price()/lotPrice()` to return a point estimate, since it is only ever used by `RTokenAsset` and `RecollateralizationLib` to back out a `UoA` value to a `BU` value. +> +> (or equivalently, using the `basketHandler.price()` midpoint) + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1672310129):** + > @0xA5DF - On further thought I'm not so sure this is a bug, or at least, I don't think one could do better. Consider the following: +> - When an RToken is 100% collateralized (or expects to regain it), `basketRange().top == basketRange().bottom`. But there still needs to be uncertainty associated with the RToken price. It doesn't make sense for the RToken price estimate to be a single point estimate given there are price uncertainties associated with the backing tokens. +> - The behavior you're describing only occurs when `basketRange()` has a non-zero delta between `top` and `bottom`. The delta exists due to potential clearing prices during the trading that will occur on the way to recollateralization. After all that occurs, there is then an _additional_ uncertainty that comes from pricing the tokens that will eventually back the RToken. So it seems right to me to take the oracleError into account twice, for balances that are expected to be traded. +> +> As for the impact statements, there are a few things I'd point out: +> ``` +> - Setting a lower min price for trading (possibly selling the asset for less than its value) +> - Preventing the sale of the asset (lotLow falling below the min trade volume) +> - Misestimation of the basket range on the 'parent' RToken +> ``` +> 1. Any RToken sitting in the BackingManager [is dissolved](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/p1/BackingManager.sol#L133) as a first step before `rebalance()` trading. RToken will therefore never be bought or sold by the BackingManager, only ever by the RevenueTraders, and [**RevenueTraders do not pay attention to minTradeVolume**](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/p1/RevenueTrader.sol#L142). +> 2. The trading mechanisms are intentionally resilient to under/over-pricing. Batch auctions have good price discovery as long as there is competition, and the dutch auctions will cover the entire distance between the "best price" and "worst price" for the pair, and then some. The impact for dutch auctions would be less precision in the overall clearing price due to larger drops in price per-block. The degree to which it can be said that the asset was sold for less than its true value is thus extremely small, and as implied by point 1 this can only happen for revenue auctions. + +**[0xA5DF (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1673783637):** + > > So it seems right to me to take the oracleError into account twice, for balances that are expected to be traded. +> +> I agree there's some sense to it, but: +> * The required trading can be a very small percentage of the total basket value, e.g. we have 99 cUSDC and 1 aUSDC and the aUSDC is the one failing. In this case only 1% will be traded while we account for an oracle error for the whole basket. +> * Notice that the same thing happens upwards, i.e. we account for the oracle error twice when calculating the `high` price. Do we expect to get more value by trading? we might argue that yes, but I think most cases we lose some value by trading (though I'm not sure what's the impact of the high price being to high) +> +> > Any RToken sitting in the BackingManager [is dissolved](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/p1/BackingManager.sol#L133) as a first step before rebalance() +> +> My understanding was that `RTokenAsset` is for cases when you have one RToken that holds another RToken as an asset, if this isn't the case then I agree this isn't relevant for rebalancing. +> +> > The trading mechanisms are intentionally resilient to under/over-pricing. +> +> I agree the mechanism will work well for most of the time, but during busy and high gas price periods this might fail and this is when you need the minimum price to kick in.
+> Also notice that Dutch trades might have less participants when selling a high volume since it requires to buy the whole batch at once (if I'm not mistaken, I read somewhere in the docs that this is the reason we need `EasyAuction` as well), this is also a case where you need the min price protection mechanism. + +**[tbrent (Reserve) acknowledged and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1673929459):** + > Good points. I was ignoring the fact that RTokens may hold other RTokens as assets. In the case of `CurveStableRTokenMetapoolCollateral`, it's also possible for an RToken to hold an LP token for a pool that contains a different RToken as one of its tokens. Currently for example [this pool](https://curve.fi/#/ethereum/pools/factory-v2-277) is a collateral token in the RToken hyUSD. +> +> The point about the uncertainty being applied to the entire basket because of the use of `basketsHeld.bottom` is good as well. If the basket is DISABLED or directly after it is changed, for example, this value would be 0, so the uncertainty would be applied to _all_ token balances. This is something we were aware of in the context of a single RToken iteratively recollateralizing (because each step raises `basketsHeld.bottom`, decreasing uncertainty) but it's true that when it comes to one RToken pricing another RToken it seems like it could lead to poor behavior. +> +> For upwards pricing it feels like less of a concern to me, because `range.top` is bounded at `rToken.basketsNeeded()`. +> +> It's worth noting though that all this discussion has been in the absence of any RSR stake. In practice all RTokens are overcollateralized by RSR. If the overcollateralization is at least 2%, and the avg oracleError for the collateral tokens is 1%, then ~no double counting occurs because `range.top ~= range.bottom`. Only ETH+ today has such a low overcollateralization; the other 4 RTokens listed on register.app are overcollateralized 7-24%. Still, the protocol should function well when the Distributor is set up with 0% of revenue going to stakers. +> +> Thoughts on ways this issue could be mitigated? I thought I had an idea but after I looked into it more I don't think it would work. + +**[0xA5DF commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1674983772):** + > > Thoughts on ways this issue could be mitigated? +> +> Maybe the most simple solution would be to calculate the total value of the assets that the protocol holds (capped to BU price), and then multiply by baskets needed and divide by `totalSupply`. +> +> I was thinking of modifying `RecollateralizationLibP1.basketRange()` to calculate the price rather than baskets the protocol holds, but I think it'd just be a more complicated way to calculate the above. + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1675110830):** + > > Maybe the most simple solution would be to calculate the total value of the assets that the protocol holds (capped to BU price), and then multiply by baskets needed and divide by totalSupply. +> +> The issue with an approach like this is that it's agnostic of where we are in the collateralization process. Balances that are disjoint with the current basket are treated the same as balances that are overlapping. This really comes down to the question of when and where to apply `maxTradeSlippage` and subtract out `minTradeVolume`, which is what the current `basketRange()` implementation aims to do. + +**[tbrent (Reserve) disagreed with severity and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1675117094):** + > We've discussed internally and where we're coming down is that we think this issue should be acknowledged but that it is a Medium and not a High. We want to acknowledge the issue because while we were aware of the double-counting of oracleError in the context of a single RToken pricing itself, we hadn't considered it in the context of a parent-child relationship, and in that case it is importantly different. However, it seems more like a Medium because the trading mechanisms are resilient to mild mispricing. The expected downside outcome would be a trade occuring via `DutchTrade` and the block-by-block price dropping faster than necessary, possibly resulting in more slippage, but this would likely be very small and on the order of ~0.1%, and only for the impacted balance held in the child RToken. + +**[cccz (judge) decreased severity to Medium](https://github.com/code-423n4/2023-07-reserve-findings/issues/31#issuecomment-1676659739)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Acknowledged and documented.
+> PR: https://github.com/reserve-protocol/protocol/pull/916 + +**Status:** Mitigation confirmed. Full details in reports from [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/8), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/31) and [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/25). + +*** + +## [[M-04] Possible rounding during the reward calculation](https://github.com/code-423n4/2023-07-reserve-findings/issues/30) +*Submitted by [auditor0517](https://github.com/code-423n4/2023-07-reserve-findings/issues/30)* + +Some rewards might be locked inside the contract due to the rounding loss. + +### Proof of Concept + +`_claimAndSyncRewards()` claimed the rewards from the staking contract and tracks `rewardsPerShare` with the current supply. + +```solidity + function _claimAndSyncRewards() internal virtual { + uint256 _totalSupply = totalSupply(); + if (_totalSupply == 0) { + return; + } + _claimAssetRewards(); + uint256 balanceAfterClaimingRewards = rewardToken.balanceOf(address(this)); + + uint256 _rewardsPerShare = rewardsPerShare; + uint256 _previousBalance = lastRewardBalance; + + if (balanceAfterClaimingRewards > _previousBalance) { + uint256 delta = balanceAfterClaimingRewards - _previousBalance; + // {qRewards/share} += {qRewards} * {qShare/share} / {qShare} + _rewardsPerShare += (delta * one) / _totalSupply; //@audit possible rounding loss + } + lastRewardBalance = balanceAfterClaimingRewards; + rewardsPerShare = _rewardsPerShare; + } +``` + +It uses [one](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L38) as a multiplier and from [this setting](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol#L32-L39) we know it has the same decimals as `underlying`(thus `totalSupply`). + +My concern is `_claimAndSyncRewards()` is called for each deposit/transfer/withdraw in [\_beforeTokenTransfer()](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L124) and it will make the rounding problem more serious. + +1. Let's consider [underlyingDecimals = 18](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol#L34). `totalSupply = 10**6 with 18 decimals`, `rewardToken` has 6 decimals. And total rewards for 1 year are `1M rewardToken` for `1M totalSupply`. +2. With the above settings, `_claimAndSyncRewards()` might be called every 1 min due to the frequent user actions. +3. Then expected rewards for 1 min are `1000000 / 365 / 24 / 60 = 1.9 rewardToken = 1900000 wei`. +4. During the [division](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L86), it will be `1900000 * 10**18 / (1000000 * 10**18) = 1`. + +So users would lose almost 50% of rewards due to the rounding loss and these rewards will be locked inside the contract. + +### Recommended Mitigation Steps + +I think there would be 2 mitigations. + +1. Use a bigger multiplier. +2. Keep the remainders and use them next time in `_claimAndSyncRewards()` like this. + +```solidity + if (balanceAfterClaimingRewards > _previousBalance) { + uint256 delta = balanceAfterClaimingRewards - _previousBalance; //new rewards + uint256 deltaPerShare = (delta * one) / _totalSupply; //new delta per share + + // decrease balanceAfterClaimingRewards so remainders can be used next time + balanceAfterClaimingRewards = _previousBalance + deltaPerShare * _totalSupply / one; + + _rewardsPerShare += deltaPerShare; + } + lastRewardBalance = balanceAfterClaimingRewards; +``` + +### Assessed type + +Math + +**[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/30#issuecomment-1670219312):** + > Mitigation option `#2` seems quite good. + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Roll over remainder to next call.
+> PR: https://github.com/reserve-protocol/protocol/pull/896 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/36), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/9). + +*** + +## [[M-05] Permanent funds lock in `StargateRewardableWrapper`](https://github.com/code-423n4/2023-07-reserve-findings/issues/27) +*Submitted by [auditor0517](https://github.com/code-423n4/2023-07-reserve-findings/issues/27)* + +The staked funds might be locked because the deposit/withdraw/transfer logic reverts. + +### Proof of Concept + +In `StargateRewardableWrapper`, `_claimAssetRewards()` claims the accumulated rewards from the staking contract and it's called during every deposit/withdraw/transfer in [\_beforeTokenTransfer()](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L124) and [\_claimAndSyncRewards()](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L77). + +```solidity + function _claimAssetRewards() internal override { + stakingContract.deposit(poolId, 0); + } +``` + +And in the stargate staking contract, [deposit()](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L153) calls [updatePool()](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L136) inside the function. + +```solidity + function updatePool(uint256 _pid) public { + PoolInfo storage pool = poolInfo[_pid]; + if (block.number <= pool.lastRewardBlock) { + return; + } + uint256 lpSupply = pool.lpToken.balanceOf(address(this)); + if (lpSupply == 0) { + pool.lastRewardBlock = block.number; + return; + } + uint256 multiplier = getMultiplier(pool.lastRewardBlock, block.number); + uint256 stargateReward = multiplier.mul(stargatePerBlock).mul(pool.allocPoint).div(totalAllocPoint); //@audit revert when totalAllocPoint = 0 + + pool.accStargatePerShare = pool.accStargatePerShare.add(stargateReward.mul(1e12).div(lpSupply)); + pool.lastRewardBlock = block.number; + } + + function deposit(uint256 _pid, uint256 _amount) public { + PoolInfo storage pool = poolInfo[_pid]; + UserInfo storage user = userInfo[_pid][msg.sender]; + updatePool(_pid); + ... + } +``` + +The problem is `updatePool()` reverts when `totalAllocPoint == 0` and this value can be changed by stargate admin using [set()](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L100). + +So user funds might be locked like the below. + +1. The stargate staking contract had one pool and `totalAllocPoint = 10`. +2. In `StargateRewardableWrapper`, some users staked their funds using [deposit()](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol#L42). +3. After that, that pool was removed by the stargate admin due to an unexpected reason. So the admin called [set(0, 0)](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L100) to reset the pool. Then `totalAllocPoint = 0` now. In the stargate contract, it's not so critical because this contract has [emergencyWithdraw()](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L184) to rescue funds without caring about rewards. Normal users can withdraw their funds using this function. +4. But in `StargateRewardableWrapper`, there is no logic to be used under the emergency and deposit/withdraw won't work because `_claimAssetRewards()` reverts in [updatePool()](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L147) due to 0 division. + +### Recommended Mitigation Steps + +We should implement a logic for an emergency in `StargateRewardableWrapper`. + +During the emergency, `_claimAssetRewards()` should return 0 without interacting with the staking contract and we should use `stakingContract.emergencyWithdraw()` to rescue the funds. + +### Assessed type + +Error + +**[cccz (judge) decreased severity to Medium and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/27#issuecomment-1667163427):** + > External requirement with specific owner behavior. + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/27#issuecomment-1670222139)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Add call to `emergencyWithdraw`.
+> PR: https://github.com/reserve-protocol/protocol/pull/896 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/40), [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/13) and [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/32). + +*** + +## [[M-06] CurveStableMetapoolCollateral.tryPrice returns a huge but valid high price when the price oracle of pairedToken is timeout](https://github.com/code-423n4/2023-07-reserve-findings/issues/25) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/25)* + +
+ + +The CurveStableMetapoolCollateral is intended for 2-fiattoken stable metapools. The metapoolToken coin0 is pairedToken and the coin1 is lpToken, e.g. 3CRV. And the `config.chainlinkFeed` should be set for paired token. + +### Impact + +The CurveStableMetapoolCollateral.price() high price will be about `FIX_MAX / metapoolToken.totalSupply()` when the price oracle of pairedToken is timeout. It is significantly more than the actual price. It will lead to unexpected pricing in the rewards trade and rebalance auctions. Furthermore, I think an attacker can trigger this bug proactively by out of gas, which can bypass the empty error message check because of the different call stack depth. But I have not verified the idea due to lack of time. So the issue here only details the high price caused by external factor, for example oracle timeout. Hope to add it under this issue if I have any other progress. Thanks. + +### Proof of Concept + +In the `CurveStableMetapoolCollateral.tryPrice` function, the pairedToken price is from `tryPairedPrice` function by the following codes: + +```solidity +uint192 lowPaired; +uint192 highPaired = FIX_MAX; +try this.tryPairedPrice() returns (uint192 lowPaired_, uint192 highPaired_) { + lowPaired = lowPaired_; + highPaired = highPaired_; +} catch {} + +function tryPairedPrice() public view virtual returns (uint192 lowPaired, uint192 highPaired) { + uint192 p = chainlinkFeed.price(oracleTimeout); // {UoA/pairedTok} + uint192 delta = p.mul(oracleError, CEIL); + return (p - delta, p + delta); +} +``` + +So if the chainlinkFeed is offline(oracle timeout), the tryPairedPrice will throw an error which is caught by the empty catch block, and the price of pairedToken will be (0, FIX\_MAX). + +And then the function `_metapoolBalancesValue` will use these prices to get the total UoA of the metapool. The following codes are how it uses the price of pairedToken: + +```solidity +aumLow += lowPaired.mul(pairedBal, FLOOR); + +// Add-in high part carefully +uint192 toAdd = highPaired.safeMul(pairedBal, CEIL); +if (aumHigh + uint256(toAdd) >= FIX_MAX) { + aumHigh = FIX_MAX; +} else { + aumHigh += toAdd; +} +``` + +The `aumLow` has already included the UoA of LpToken, so it is non-zero. And the highPaired price now is FIX\_MAX, which will mul the paired token balance by `Fixed.safeMul`. We can find the Fixed lib has handled overflow safely: + +```solidity +function safeMul( + uint192 a, + uint192 b, + RoundingMode rounding +) internal pure returns (uint192) { + ... + if (a == FIX_MAX || b == FIX_MAX) return FIX_MAX; +``` + +So the `aumHigh` from the `_metapoolBalancesValue` function will be FIX\_MAX. The final prices are calculated by: + + low = aumLow.div(supply, FLOOR); + high = aumHigh.div(supply, CEIL); + +`supply` is the `metapoolToken.totalSupply()`. So if the supply is > 1 token, the `Fixed.div` won't revert. And the high price will be a huge but valid value < FIX\_MAX. + +### Recommended Mitigation Steps + +Don't try catch the `this.tryPairedPrice()` in the `CurveStableMetapoolCollateral.tryPrice`, if it failed, just let the whole tryPrice function revert, the caller, for example refresh(), can catch the error. + +### Assessed type + +Context + +**[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/25#issuecomment-1670234545)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Enforce (`0, FIX_MAX`) as "unpriced" during oracle timeout.
+> PR: https://github.com/reserve-protocol/protocol/pull/917 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/37), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/33) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/10). + +*** + +## [[M-07] The Asset.lotPrice doubles the oracle timeout in the worst case](https://github.com/code-423n4/2023-07-reserve-findings/issues/24) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/24)* + +When the `tryPrice()` function revert, for example oracle timeout, the `Asset.lotPrice` will use a decayed historical value: + +```solidity +uint48 delta = uint48(block.timestamp) - lastSave; // {s} +if (delta <= oracleTimeout) { + lotLow = savedLowPrice; + lotHigh = savedHighPrice; +} else if (delta >= oracleTimeout + priceTimeout) { + return (0, 0); // no price after full timeout +} else { +``` + +And the delta time is from the last price saved time. If the delta time is greater than oracle timeout, historical price starts decaying. + +But the last price might be saved at the last second of the last oracle timeout period. So the `Asset.lotPrice` will double the oracle timeout in the worst case. + +### Impact + +The `Asset.lotPrice` will double the oracle timeout in the worst case. When the rewards need to be sold or basket is rebalancing, if the price oracle is offline temporarily, the `Asset.lotPrice` will use the last saved price in max two oracle timeout before the historical value starts to decay. It increases the sale/buy price of the asset. + +### Proof of Concept + +The `lastSave` is updated in the `refresh()` function, and it's set to the current `block.timestamp` instead of the `updateTime` from the chainlink feed: + +```solidity +function refresh() public virtual override { + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); +``` + +But in the `OracleLib`, the oracle time is checked for the delta time of `block.timestamp - updateTime`: + + uint48 secondsSince = uint48(block.timestamp - updateTime); + if (secondsSince > timeout) revert StalePrice(); + +So if the last oracle feed updateTime is `block.timestamp - priceTimeout`, the timeout check will be passed and lastSave will be updated to block.timestamp. And the lotPrice will start to decay from `lastSave + priceTimeout`. However when it starts, it's been 2 * priceTimeout since the last oracle price update. + +### Recommended Mitigation Steps + +Starts lotPrice decay immediately or updated the `lastSave` to `updateTime` instead of `block.timestamp`. + +### Assessed type + +Context + +**[tbrent (Reserve) disputed and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/24#issuecomment-1670250237):** + > This issue was known and was discussed internally. Unfortunately this occurred in the private copy of the repo that the devs use to coordinate while C4 audits are ongoing. I've attached a screenshot of the discussion, though it is up to C4 how to treat this ultimately. We could probably provide repo access to a member of the C4 team if asked. +> +> ![Screenshot 2023-08-08 at 4 11 33 PM](https://github.com/code-423n4/2023-07-reserve-findings/assets/13439795/bab2c98b-1144-4463-87ea-a6453a4924e0) +> +> We decided not to pursue this direction as it introduced a large number of changes, and it seems acceptable to have the worst-case behavior of using 100% of the last saved price for up to one oracleTimeout too long. + +**[cccz (judge) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/24#issuecomment-1680742090):** + > Agree that sponsors not address it.
+> And this issue will be considered as medium risk under the C4 criteria.
+> `> 2 — Med: Assets not at direct risk, but the function of the protocol or its availability could be impacted, or leak value with a hypothetical attack path with stated assumptions, but external requirements.` + + + +*** + +## [[M-08] User can't redeem from RToken based on CurveStableRTokenMetapoolCollateral when any underlying collateral of paired RToken's price oracle is offline(timeout)](https://github.com/code-423n4/2023-07-reserve-findings/issues/21) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/21)* + +
+
+ + +The CurveStableMetapoolCollateral is intended for 2-fiattoken stable metapools that involve RTokens, such as eUSD-fraxBP. The metapoolToken coin0 is pairedToken, which is also a RToken, and the coin1 is lpToken, e.g. 3CRV. And the `CurveStableRTokenMetapoolCollateral.tryPairedPrice` uses `RTokenAsset.price()` as the oracle to get the pairedToken price: + + function tryPairedPrice() + ... + returns (uint192 lowPaired, uint192 highPaired) + { + return pairedAssetRegistry.toAsset(pairedToken).price(); + } + +### Impact + +Users can't redeem from RToken when any underlying collateral of paired RToken's price oracle is offline(timeout). It can lead to a serious run/depeg on the RToken. + +### Proof of Concept + +First I submitted another issue named "RTokenAsset price oracle can return a huge but valid high price when any underlying collateral's price oracle timeout". It's the premise for this issue. Because this issue is located in different collateral codes, I split them into two issues. + +The conclusion from the pre issue: + +> *If there is any underlying collateral's price oracle reverts, for example oracle timeout, the `RTokenAsset.price` will return a valid but untrue (low, high) price range, which can be described as `low = true_price * A1` and `high = FIX_MAX * A2`, A1 is `bh.quantity(oracle_revert_coll) / all quantity for a BU` and A2 is the `BasketRange.top / RToken totalSupply`.* + +Back to the `CurveStableRTokenMetapoolCollateral`. There are two cases that will revert in the super class `CurveStableCollateral.refresh()`. + +The `CurveStableRTokenMetapoolCollateral.tryPairedPrice` function gets low/high price from `paired RTokenAsset.price()`. So when any underlying collateral's price oracle of paired RTokenAsset reverts, the max high price will be FIX\_MAX and the low price is non-zero. + +1. If the high price is FIX\_MAX, the assert for low price will revert: + +``` + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } +``` + +2. And if high price is There is a little smaller than FIX\_MAX, the `_anyDepeggedOutsidePool` check in the refresh function will revert. + +``` + if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + markStatus(CollateralStatus.IFFY); + } +``` + +And the `CurveStableMetapoolCollateral` overrides it: + +``` + function _anyDepeggedOutsidePool() internal view virtual override returns (bool) { + try this.tryPairedPrice() returns (uint192 low, uint192 high) { + // {UoA/tok} = {UoA/tok} + {UoA/tok} + uint192 mid = (low + high) / 2; + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (mid < pairedTokenPegBottom || mid > pairedTokenPegTop) return true; + } +``` + +So the `uint192 mid = (low + high) / 2;` will revert because of uint192 overflow. The `CurveStableRTokenMetapoolCollateral.refresh()` will revert without any catch. + +Because RToken.redeemTo and redeemCustom need to call `assetRegistry.refresh();` at the beginning, it will revert directly. + +### Recommended Mitigation Steps + +The Fix.plus can't handle the uint192 overflow error. Try to override `_anyDepeggedOutsidePool` for `CurveStableRTokenMetapoolCollateral` as: + +``` + unchecked { + uint192 mid = (high - low) / 2 + low; + } +``` + +The assert `assert(low <= high)` in the RTokenAsset.tryPrice has already protected everything. + +### Assessed type + +DoS + +**[cccz (judge) decreased severity to Medium and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/21#issuecomment-1667169269):** + > External requirement with oracle errors. + +**[pmckelvy1 (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/21#issuecomment-1687104593)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Unpriced on oracle timeout.
+> PR: https://github.com/reserve-protocol/protocol/pull/917 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/38), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/34) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/11) . + +*** + +## [[M-09] RTokenAsset price oracle can return a huge but valid high price when any underlying collateral's price oracle timeout](https://github.com/code-423n4/2023-07-reserve-findings/issues/20) +*Submitted by [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/20)* + +
+
+ + +The RTokenAsset is an implementation of interface `IRTokenOracle` to work as a oracle price feed for the little RToken. RTokenAsset implements the `latestPrice` function to get the oracle price and saved time from the `cachedOracleData`, which is updated by `_updateCachedPrice` function: + +```solidity +function _updateCachedPrice() internal { + (uint192 low, uint192 high) = price(); + + require(low != 0 && high != FIX_MAX, "invalid price"); + + cachedOracleData = CachedOracleData( + (low + high) / 2, + block.timestamp, + basketHandler.nonce(), + backingManager.tradesOpen(), + backingManager.tradesNonce() + ); +} +``` + +The `_updateCachedPrice` gets the low and high prices from `price()`, and updates the oracle price to `(low + high) / 2`. And it checks `low != 0 && high != FIX_MAX`. + +The `RTokenAsset.price` just uses the return of `tryPrice` as the low price and high price, if `tryPrice` reverts, it will return `(0, FIX_MAX)`, which is an invalid price range for the oracle price check above. But if there is any underlying collateral's price oracle reverts, for example oracle timeout, the `RTokenAsset.price` will return a valid but untrue (low, high) price range, which can be described as `low = true_price * A1` and `high = FIX_MAX * A2`, A1 is `bh.quantity(oracle_revert_coll) / all quantity for a BU` and A2 is the `BasketRange.top / RToken totalSupply`. + +### Impact + +The RToken oracle price will be about `FIX_MAX / 2` when any underlying collateral's price oracle is timeout. It is significantly more than the actual price. It will lead to a distortion in the price of collateral associated with the RToken, for example `CurveStableRTokenMetapoolCollateral`: + +```solidity + pairedAssetRegistry = IRToken(address(pairedToken)).main().assetRegistry(); + + function tryPairedPrice() + ... + { + return pairedAssetRegistry.toAsset(pairedToken).price(); + } +``` + +### Proof of Concept + +`RToken.tryPrice` gets the BU (low, high) price from `basketHandler.price()` first. `BasketHandler._price(false)` core logic: + +```solidity +for (uint256 i = 0; i < len; ++i) { + uint192 qty = quantity(basket.erc20s[i]); + + (uint192 lowP, uint192 highP) = assetRegistry.toAsset(basket.erc20s[i]).price(); + + low256 += qty.safeMul(lowP, RoundingMode.FLOOR); + + if (high256 < FIX_MAX) { + if (highP == FIX_MAX) { + high256 = FIX_MAX; + } else { + high256 += qty.safeMul(highP, RoundingMode.CEIL); + } + } +} +``` + +And the `IAsset.price()` should not revert. If the price oracle of the asset reverts, it just returns `(0,FIX_MAX)`. In this case, the branch will enter `high256 += qty.safeMul(highP, RoundingMode.CEIL);` first. And it won't revert for overflow because the Fixed.safeMul will return FIX\_MAX directly if any param is FIX\_MAX: + +```solidity +function safeMul( + ... +) internal pure returns (uint192) { + if (a == FIX_MAX || b == FIX_MAX) return FIX_MAX; +``` + +So the high price is `FIX_MAX`, and the low price is reduced according to the share of qty. + +Return to the `RToken.tryPrice`, the following codes uses `basketRange()` to calculate the low and high price for BU: + +```solidity +BasketRange memory range = basketRange(); // {BU} + +// {UoA/tok} = {BU} * {UoA/BU} / {tok} +low = range.bottom.mulDiv(lowBUPrice, supply, FLOOR); +high = range.top.mulDiv(highBUPrice, supply, CEIL); +``` + +And the only thing has to be proofed is `range.top.mulDiv(highBUPrice, supply, CEIL)` should not revert for overflow in unit192. Now `highBUPrice = FIX_MAX`, according to the `Fixed.mulDiv`, if `range.top <= supply` it won't overflow. And for passing the check in the `RToken._updateCachedPrice()`, the high price should be lower than `FIX_MAX`. So it needs to ensure `range.top < supply`. + +The max value of range.top is basketsNeeded which is defined in `RecollateralizationLibP1.basketRange(ctx, reg)`: + +```solidity +if (range.top > basketsNeeded) range.top = basketsNeeded; +``` + +And the basketsNeeded:RToken supply is 1:1 at the beginning. If the RToken has experienced a haircut or the RToken is undercollateralized at present, the basketsNeeded can be lower than RToken supply. + +### Recommended Mitigation Steps + +Add a BU price valid check in the `RToken.tryPrice`: + +```solidity +function tryPrice() external view virtual returns (uint192 low, uint192 high) { + (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(); // {UoA/BU} + require(lowBUPrice != 0 && highBUPrice != FIX_MAX, "invalid price"); +``` + +### Assessed type + +Context + +**[cccz (judge) decreased severity to Medium and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/20#issuecomment-1667168907):** + > External requirement with oracle errors. + +**[pmckelvy1 (Reserve) confirmed](https://github.com/code-423n4/2023-07-reserve-findings/issues/20#issuecomment-1699524306)** + +**[Reserve Mitigated](https://github.com/code-423n4/2023-09-reserve-mitigation#individual-prs):** +> Enforce (`0, FIX_MAX`) as "unpriced" during oracle timeout.
+> PR: https://github.com/reserve-protocol/protocol/pull/917 + +**Status:** Mitigation confirmed. Full details in reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/39), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/35) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/12). + +*** + +## [[M-10] `Asset.lotPrice` only uses `oracleTimeout` to determine if the price is stale.](https://github.com/code-423n4/2023-07-reserve-findings/issues/17) +*Submitted by [sces60107](https://github.com/code-423n4/2023-07-reserve-findings/issues/17)* + +`OracleTimeout` is the number of seconds until an oracle value becomes invalid. It is set in the constructor of `Asset`. And `Asset.lotPrice` uses `OracleTimeout` to determine if the saved price is stale. However, `OracleTimeout` may not be the correct source to determine if the price is stale. `Asset.lotPrice` may return the incorrect price. + +### Proof of Concept + +`OracleTimeout` is set in the constructor of `Asset`.
+ + +```solidity + constructor( + uint48 priceTimeout_, + AggregatorV3Interface chainlinkFeed_, + uint192 oracleError_, + IERC20Metadata erc20_, + uint192 maxTradeVolume_, + uint48 oracleTimeout_ + ) { + … + oracleTimeout = oracleTimeout_; + } +``` + +`Asset.lotPrice` use `oracleTimeout` to determine if the saved price is in good standing.
+ + +```solidity + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // if the price feed is still functioning, use that + lotLow = low; + lotHigh = high; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + + // if the price feed is broken, use a decayed historical value + + uint48 delta = uint48(block.timestamp) - lastSave; // {s} + if (delta <= oracleTimeout) { + lotLow = savedLowPrice; + lotHigh = savedHighPrice; + } else if (delta >= oracleTimeout + priceTimeout) { + return (0, 0); // no price after full timeout + } else { + // oracleTimeout <= delta <= oracleTimeout + priceTimeout + + // {1} = {s} / {s} + uint192 lotMultiplier = divuu(oracleTimeout + priceTimeout - delta, priceTimeout); + + // {UoA/tok} = {UoA/tok} * {1} + lotLow = savedLowPrice.mul(lotMultiplier); + lotHigh = savedHighPrice.mul(lotMultiplier); + } + } + assert(lotLow <= lotHigh); + } +``` + +However, `oracleTimeout` may not be the accurate source to determine if the saved price is stale. The following examples shows that using only `oracleTimeout` is vulnerable. + +1. `NonFiatCollateral.tryPrice` leverages two price feeds to calculate the price. These two feeds have different timeouts. + + + + function tryPrice() + external + view + override + returns ( + uint192 low, + uint192 high, + uint192 pegPrice + ) + { + pegPrice = chainlinkFeed.price(oracleTimeout); // {target/ref} + + // Assumption: {ref/tok} = 1; inherit from `AppreciatingFiatCollateral` if need appreciation + // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} (1) + uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice); + + // this oracleError is already the combined total oracle error + uint192 err = p.mul(oracleError, CEIL); + + low = p - err; + high = p + err; + // assert(low <= high); obviously true just by inspection + } + +If `targetUnitChainlinkFeed` is malfunctioning and `targetUnitOracleTimeout` is smaller than `oracleTimeout`, `lotPrice()` should not return saved price when `delta > targetUnitOracleTimeout`. However, `lotPrice()` only considers `oracleTimeout`. It could return the incorrect price when `targetUnitChainlinkFeed` is malfunctioning. + +2. To calculate the price, `CurveStableCollateral.tryPrice` calls `PoolToken.totalBalancesValue`. And `PoolToken.totalBalancesValue` calls `PoolToken.tokenPrice`. `PoolToken.tokenPrice` uses multiple feeds to calculate the price. And they could have different timeouts. None of them are used in `lotPrice()`. + +
+
+ + +```solidity + function tryPrice() + external + view + virtual + override + returns ( + uint192 low, + uint192 high, + uint192 + ) + { + // {UoA} + (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); + + // {tok} + uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); + // We can always assume that the total supply is non-zero + + // {UoA/tok} = {UoA} / {tok} + low = aumLow.div(supply, FLOOR); + high = aumHigh.div(supply, CEIL); + assert(low <= high); // not obviously true just by inspection + + return (low, high, 0); + } + + + function totalBalancesValue() internal view returns (uint192 low, uint192 high) { + for (uint8 i = 0; i < nTokens; ++i) { + IERC20Metadata token = getToken(i); + uint192 balance = shiftl_toFix(curvePool.balances(i), -int8(token.decimals())); + (uint192 lowP, uint192 highP) = tokenPrice(i); + + low += balance.mul(lowP, FLOOR); + high += balance.mul(highP, CEIL); + } + } + + function tokenPrice(uint8 index) public view returns (uint192 low, uint192 high) { + ... + + if (index == 0) { + x = _t0feed0.price(_t0timeout0); + xErr = _t0error0; + if (address(_t0feed1) != address(0)) { + y = _t0feed1.price(_t0timeout1); + yErr = _t0error1; + } + ... + + return toRange(x, y, xErr, yErr); + } +``` + +We can also find out that `oracleTimeout` is unused. But `lotPrice()` still uses it to determine if the saved price is valid. This case is worse than the first case.
+ + +```solidity + /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout + /// @dev config.erc20 should be a RewardableERC20 + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) AppreciatingFiatCollateral(config, revenueHiding) PoolTokens(ptConfig) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } +``` + +### Recommended Mitigation Steps + +Since collaterals have various implementations of price feed. `Asset.lotPrice` could be modified like: + +```diff + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + … +- if (delta <= oracleTimeout) { ++ if (delta <= actualOracleTimeout()) { + lotLow = savedLowPrice; + lotHigh = savedHighPrice; + … + } + ++ function actualOracleTimeout() public view virtual returns (uint192) { ++ return oracleTimeout; ++ } +``` + +Then, collaterals can override `actualOracleTimeout` to reflect the correct oracle timeout. + +### Assessed type + +Error + +**[cccz (judge) decreased severity to Medium and commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/17#issuecomment-1667169837):** + > External requirement with oracle errors. + +**[tbrent (Reserve) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/17#issuecomment-1670255601)** + +**[pmckelvy1 (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/17#issuecomment-1799793083):** +> As documented in `Asset.sol` [here](https://github.com/reserve-protocol/protocol/blob/master/contracts/plugins/assets/Asset.sol#L41):
+`oracleTimeout_` is also used as the timeout value in `lotPrice()`; should be highest of all assets 'oracleTimeout` in a collateral if there are multiple oracles. + +*** + +## [[M-11] StaticATokenLM transfer missing \_updateRewards](https://github.com/code-423n4/2023-07-reserve-findings/issues/12) +*Submitted by [bin2chen](https://github.com/code-423n4/2023-07-reserve-findings/issues/12)* + +Transfer missing `_updateRewards()`, resulting in the loss of `from`'s reward. + +### Proof of Concept + +`StaticATokenLM` contains the rewards mechanism, when the balance changes, the global `_accRewardsPerToken` needs to be updated first to calculate the user's `rewardsAccrued` more accurately. + +Example: `mint()/burn()` both call `_updateRewards()` to update `_accRewardsPerToken`. + +```solidity + function _deposit( + address depositor, + address recipient, + uint256 amount, + uint16 referralCode, + bool fromUnderlying + ) internal returns (uint256) { + require(recipient != address(0), StaticATokenErrors.INVALID_RECIPIENT); +@> _updateRewards(); + +... + + _mint(recipient, amountToMint); + + return amountToMint; + } + + + function _withdraw( + address owner, + address recipient, + uint256 staticAmount, + uint256 dynamicAmount, + bool toUnderlying + ) internal returns (uint256, uint256) { +... +@> _updateRewards(); + +... +@> _burn(owner, amountToBurn); + +... + } +``` + +When `transfer()/transerFrom()`, the balance is also modified, but without calling `_updateRewards()` first. The result is that if the user transfers the balance, the difference in rewards accrued by `from` is transferred to `to` along with it. This doesn't make sense for `from`. + +```solidity + function _beforeTokenTransfer( + address from, + address to, + uint256 + ) internal override { + if (address(INCENTIVES_CONTROLLER) == address(0)) { + return; + } + if (from != address(0)) { + _updateUser(from); + } + if (to != address(0)) { + _updateUser(to); + } + } +``` + +### Recommended Mitigation Steps + +`_beforeTokenTransfer` first trigger `_updateRewards()`. + +```solidity + function _beforeTokenTransfer( + address from, + address to, + uint256 + ) internal override { + if (address(INCENTIVES_CONTROLLER) == address(0)) { + return; + } ++ _updateRewards(); + if (from != address(0)) { + _updateUser(from); + } + if (to != address(0)) { + _updateUser(to); + } + } +``` + +### Assessed type + +Context + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/12#issuecomment-1670267488):** + > We will be reaching out to the Aave team to understand more about this. It seems there are multiple places in StaticATokenLM where reward steps are missing, and there may be reasons why. + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/12#issuecomment-1695841823):** + > We will mark this issue as Sponsor Acknowledged. It is true the situation described by the warden and that's the behavior we observe. However we will not be implementing any change in the code (besides adding some comments) for the following reasons: +> * We do not expect rewards in Aave V2 to come back. +> * We checked with Aave and we believe the original reason for building it this way still holds, and that is for gas purposes. Even if for some reason rewards on AAve V2 come back the cost of updating the user rewards on every transfer outweighs the rewards that may be left "uncollected" after a `transfer` operation. It is important to remark that any `deposit` or `withdraw` done to the contract plus any call to `collectRewards..`, and any claim of rewards from the Reserve protocol, would setup the correct balances. So while it is true that transfers may in some cases not transfer rewards we expect this to only be slightly off. +> +> To clarify this issue for users we will add a comment to the wrapper contract `StaticATokenLM` to clarify the situation with how rewards are handled on transfer. + +**[tbrent (Reserve) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/12#issuecomment-1695970537)** + + + +*** + +## [[M-12] `_claimRewardsOnBehalf()` User's rewards may be lost](https://github.com/code-423n4/2023-07-reserve-findings/issues/10) +*Submitted by [bin2chen](https://github.com/code-423n4/2023-07-reserve-findings/issues/10), also found by [carlitox477](https://github.com/code-423n4/2023-07-reserve-findings/issues/36)* + +Incorrect determination of maximum rewards, which may lead to loss of user rewards. + +### Proof of Concept + +`_claimRewardsOnBehalf()` for users to retrieve rewards: + +```solidity + function _claimRewardsOnBehalf( + address onBehalfOf, + address receiver, + bool forceUpdate + ) internal { + if (forceUpdate) { + _collectAndUpdateRewards(); + } + + uint256 balance = balanceOf(onBehalfOf); + uint256 reward = _getClaimableRewards(onBehalfOf, balance, false); + uint256 totBal = REWARD_TOKEN.balanceOf(address(this)); + +@> if (reward > totBal) { +@> reward = totBal; +@> } + if (reward > 0) { +@> _unclaimedRewards[onBehalfOf] = 0; + _updateUserSnapshotRewardsPerToken(onBehalfOf); + REWARD_TOKEN.safeTransfer(receiver, reward); + } + } +``` + +From the code above, we can see that if the contract balance is not enough, it will only use the contract balance and set the unclaimed rewards to 0: `_unclaimedRewards[user]=0`. + +But using the current contract's balance is inaccurate, `REWARD_TOKEN` may still be stored in `INCENTIVES_CONTROLLER`. + +`_updateRewards()` and `_updateUser()`, are just calculations, they don't transfer `REWARD_TOKEN` to the current contract, but `_unclaimedRewards[user]` is always accumulating. + +1. `_updateRewards()` not transferable `REWARD_TOKEN`. + +``` + + function _updateRewards() internal { + ... + if (block.number > _lastRewardBlock) { + ... + + address[] memory assets = new address[](1); + assets[0] = address(ATOKEN); + + @> uint256 freshRewards = INCENTIVES_CONTROLLER.getRewardsBalance(assets, address(this)); + uint256 lifetimeRewards = _lifetimeRewardsClaimed.add(freshRewards); + uint256 rewardsAccrued = lifetimeRewards.sub(_lifetimeRewards).wadToRay(); + + @> _accRewardsPerToken = _accRewardsPerToken.add( + (rewardsAccrued).rayDivNoRounding(supply.wadToRay()) + ); + _lifetimeRewards = lifetimeRewards; + } + } +``` + +2. But `_unclaimedRewards[user]` always accumulating. + +```solidity + function _updateUser(address user) internal { + uint256 balance = balanceOf(user); + if (balance > 0) { + uint256 pending = _getPendingRewards(user, balance, false); +@> _unclaimedRewards[user] = _unclaimedRewards[user].add(pending); + } + _updateUserSnapshotRewardsPerToken(user); + } +``` + +This way if `_unclaimedRewards(forceUpdate=false)` is executed, it does not trigger the transfer of `REWARD_TOKEN` to the current contract. This makes it possible that `_unclaimedRewards[user] > REWARD_TOKEN.balanceOf(address(this))`. According to the `_claimedRewardsOnBehalf()` current code, the extra value is lost. + +It is recommended that `if (reward > totBal)` be executed only if `forceUpdate=true`, to avoid losing user rewards. + +### Recommended Mitigation Steps + +```solidity + function _claimRewardsOnBehalf( + address onBehalfOf, + address receiver, + bool forceUpdate + ) internal { + if (forceUpdate) { + _collectAndUpdateRewards(); + } + + uint256 balance = balanceOf(onBehalfOf); + uint256 reward = _getClaimableRewards(onBehalfOf, balance, false); + uint256 totBal = REWARD_TOKEN.balanceOf(address(this)); + +- if (reward > totBal) { ++ if (forceUpdate && reward > totBal) { + reward = totBal; + } + if (reward > 0) { + _unclaimedRewards[onBehalfOf] = 0; + _updateUserSnapshotRewardsPerToken(onBehalfOf); + REWARD_TOKEN.safeTransfer(receiver, reward); + } + } +``` + +### Assessed type + +Context + +**[cccz (judge) decreased severity to Medium](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1666915113)** + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1670279119):** + > See comment on [issue 12](https://github.com/code-423n4/2023-07-reserve-findings/issues/12#issuecomment-1670267488). + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1695750350):** + > After a thorough review we can confirm this is not an issue. This is the way it should work and that's the reason why there is a forceUpdate param. When forceUpdate == true, then you will always have the latest rewards to claim and the updated balance. +> +> When is set to false, it will only distribute the rewards that were previously collected (the ones available in the contract). It is correct there might be additional rewards to be collected, but that can easily be done with another call to the same function using the forceUpdate == true. +> +> There are no rewards "lost" in the process, no fix needs to be implemented. Even though `unclaimedRewards` is set to zero, then it will be populated with all the `pending` rewards again so the amount will be ok. +> +> Moreover, the suggested fix would brick the function most of the time (as usually rewards are bigger than balance because it includes uncollected but pending rewards), and in that case it would attempt to transfer rewards not available in the contract. The check of just sending the balance in those cases is required. + +**[tbrent (Reserve) disputed](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1695967757)** + +**[cccz (judge) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700374987):** + > @bin2chen - please take a look.
+> It seems that since `_getPendingRewards` has a false parameter, `_unclaimedRewards` does not accumulate unclaimed rewards in the controller, so the rewards are not lost. +> ```solidity +> function _updateUser(address user) internal { +> uint256 balance = balanceOf(user); +> if (balance > 0) { +> uint256 pending = _getPendingRewards(user, balance, false); +> _unclaimedRewards[user] = _unclaimedRewards[user].add(pending); +> } +> _updateUserSnapshotRewardsPerToken(user); +> } +> ``` + +**[bin2chen (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700422759):** + > @cccz - `getPendingRewards(fresh = true)`. +> It doesn't matter if `fresh` is`true` or `false`, because this can only be used to calculate the latest global `accRewardsPerToken`. +> +> Since `_updateRewards()` must be executed before `_updateUser (user)` is executed to ensure that `accRewardsPerToken` is up-to-date, it does not matter whether `fresh` is true. +> +> But the message above
+> `Even though unclaimedRewards is set to zero, then it will be populated with all the pending rewards again so the amount will be ok.` +> +> It confuses me a bit, I might need to take another look. I need to familiarize myself with this project again to see if I missed something. + +**[cccz (judge) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700432976):** + > `_getClaimableRewards` returns `_unclaimedRewards + pendingRewards`, that is, `reward = _unclaimedRewards + pendingRewards`, so just setting `_unclaimedRewards` to 0 will not decrease pendingRewards, which may be somewhat helpful. +> ```solidity +> uint256 reward = _getClaimableRewards(onBehalfOf, balance, false); +> uint256 totBal = REWARD_TOKEN.balanceOf(address(this)); +> +> if (reward > totBal) { +> reward = totBal; +> } +> if (reward > 0) { +> _unclaimedRewards[onBehalfOf] = 0; +> _updateUserSnapshotRewardsPerToken(onBehalfOf); +> REWARD_TOKEN.safeTransfer(receiver, reward); +> } +> ... +> function _getClaimableRewards( +> address user, +> uint256 balance, +> bool fresh +> ) internal view returns (uint256) { +> uint256 reward = _unclaimedRewards[user].add(_getPendingRewards(user, balance, fresh)); +> return reward.rayToWadNoRounding(); +> } +> ``` + +**[bin2chen (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700449715):** + > @cccz - `pendingRewards` is assumed to be 0.
+> But `_unclaimedRewards[user]` has a value, the point is that the value in there is not in the current contract, it's in `INCENTIVES_CONTROLLER`. +> If it's cleared, it's gone. +> I think I need to take another look. + +**[bin2chen (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700588497):** + > @cccz - I'll keep my original point. Please help me see if I'm missing something. Thanks. +> +> The current implementation only moves rewards to the current contract if `_collectAndUpdateRewards()` is executed. +> +> `_updateRewards()` and `_updateUser()` are not triggered. +> +> But `_unclaimedRewards[user]` is accumulated.
+> `_accRewardsPerToken` and `_userSnapshotRewardsPerToken[user]` keeps getting bigger. +> +> So that if no one has called `_collectAndUpdateRewards()` (i.e. forceUpdate=false is not called). +> +> This way the rewards balance in the contract will always be zero. +> +> After `_claimRewardsOnBehalf(forceUpdate=false)`.
+> The user doesn't get any rewards, but `_unclaimedRewards[user]` is cleared to 0 and can't be refilled (note that it's not pendingRewards, assuming that pendingRewards is 0). +> +> This way the rewards are lost. + +**[cccz (judge) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700781759):** + > Need review from sponsors. @julianmrodri + +**[bin2chen (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700850145):** + > Here's a test case to look at.
+> Note: The balance of the current contract described above cannot be 0, it needs to be a little bit. +> +> Add to StaticATokenLM.test.ts +> +> ```js +> it('test_lost', async () => { +> const amountToDeposit = utils.parseEther('5') +> +> // Just preparation +> await waitForTx(await weth.deposit({ value: amountToDeposit.mul(2) })) +> await waitForTx( +> await weth.approve(staticAToken.address, amountToDeposit.mul(2), defaultTxParams) +> ) +> +> // Depositing +> await waitForTx( +> await staticAToken.deposit(userSigner._address, amountToDeposit, 0, true, defaultTxParams) +> ) +> await advanceTime(1); +> //***** need small reward balace +> await staticAToken.collectAndUpdateRewards() +> const staticATokenBalanceFirst = await stkAave.balanceOf(staticAToken.address); +> await advanceTime(60 * 60 * 24) +> +> // Depositing +> await waitForTx( +> await staticAToken.deposit(userSigner._address, amountToDeposit, 0, true, defaultTxParams) +> ) +> +> const beforeRewardBalance = await stkAave.balanceOf(userSigner._address); +> const pendingRewardsBefore = await staticAToken.getClaimableRewards(userSigner._address) +> console.log("user Reward Balance(Before):",beforeRewardBalance); +> +> // user claim forceUpdate = false +> await waitForTx(await staticAToken.connect(userSigner).claimRewardsToSelf(false)) +> +> const afterRewardBalance = await stkAave.balanceOf(userSigner._address); +> const pendingRewardsAfter = await staticAToken.getClaimableRewards(userSigner._address) +> console.log("user Reward Balance(After):",afterRewardBalance); +> +> +> const pendingRewardsDecline = pendingRewardsBefore.toNumber() - pendingRewardsAfter.toNumber() ; +> const getRewards= afterRewardBalance.toNumber() - beforeRewardBalance.toNumber() ; +> console.log("user pendingRewardsBefore:",pendingRewardsBefore); +> console.log("user pendingRewardsAfter:",pendingRewardsAfter); +> const staticATokenBalanceAfter = await stkAave.balanceOf(staticAToken.address); +> console.log("staticAToken Balance (before):",staticATokenBalanceFirst); +> console.log("staticAToken Balance (After):",staticATokenBalanceAfter); +> console.log("user lost:",pendingRewardsDecline - getRewards); +> +> +> +> }) +> ``` +> ```console +> `$` yarn test:plugins:integration --grep "test_lost" +> +> +> StaticATokenLM: aToken wrapper with static balances and liquidity mining +> Duplicate definition of RewardsClaimed (RewardsClaimed(address,address,uint256), RewardsClaimed(address,address,address,uint256)) +> Rewards - Small checks +> user Reward Balance(Before): BigNumber { value: "0" } +> user Reward Balance(After): BigNumber { value: "34497547939" } +> user pendingRewardsBefore: BigNumber { value: "1490345817336159" } +> user pendingRewardsAfter: BigNumber { value: "34497293495" } +> staticAToken Balance (before): BigNumber { value: "34497547939" } +> staticAToken Balance (After): BigNumber { value: "0" } +> user lost: 1490276822494725 +> ✔ test_lost (947ms) +> +> +> 1 passing (24s) +> ``` + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1700897236):** + > Thanks for the example. I'll review and let you know. + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1701011453):** + > @cccz & @bin2chen - Ok, the issue exists I can confirm now. This is a tricky one, nice catch. Found out that this was built this way on purpose. The idea is to allow the user to "sacrifice" some rewards for gas savings. You can see it in some of the tests, with comments like this one: +> +> ``` +> expect(pendingRewards5).to.be.eq(0) // User "sacrifice" excess rewards to save on gas-costs +> ``` +> +> We will discuss today what action we are taking with this issue. +> +> In any case, the suggested mitigation does not address fully the issue, and causes the contract to fail under normal operations (simply try to run our test suite with that change). I believe we should probably address the main issue that the `_unclaimed` variable is set to 0, instead of to the rewards still pending to be collected. +> +> What do you think about the function working this way? I ran a simple check and seems to address it at least for the example you provided. This mitigation was suggested on the other ticket linked here, it had some rounding issues but overall is the same. +> +> ``` +> function _claimRewardsOnBehalf( +> address onBehalfOf, +> address receiver, +> bool forceUpdate +> ) internal { +> if (forceUpdate) { +> _collectAndUpdateRewards(); +> } +> +> uint256 balance = balanceOf(onBehalfOf); +> uint256 reward = _getClaimableRewards(onBehalfOf, balance, false); +> uint256 totBal = REWARD_TOKEN.balanceOf(address(this)); +> +> if (reward == 0) { +> return; +> } +> +> if (reward > totBal) { +> reward = totBal; +> _unclaimedRewards[onBehalfOf] -= reward.wadToRay(); +> } else { +> _unclaimedRewards[onBehalfOf] = 0; +> } +> +> _updateUserSnapshotRewardsPerToken(onBehalfOf); +> REWARD_TOKEN.safeTransfer(receiver, reward); +> } +> ``` +> +> Thanks for taking a look! + +**[bin2chen (warden) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1701163446):** + > @julianmrodri - This one still has problems. +> 1. If there is a `pendingReward` may `underflow`
+> For example:
+> balance = 10
+> \_unclaimedRewards[user]=9
+> pendingRewards = 2 +> +> `_unclaimedRewards[onBehalfOf] -= reward.wadToRay();` will underflow +> +> 2. Finally executed `_updateUserSnapshotRewardsPerToken(onBehalfOf);`
+> Then we need to accumulate `pendingRewards` to `_unclaimedRewards[user]`. +> +> Personally, I feel that if we don't want to revert, try this: +> ```diff +> function _claimRewardsOnBehalf( +> address onBehalfOf, +> address receiver, +> bool forceUpdate +> ) internal { +> if (forceUpdate) { +> _collectAndUpdateRewards(); +> } +> +> uint256 balance = balanceOf(onBehalfOf); +> uint256 reward = _getClaimableRewards(onBehalfOf, balance, false); +> uint256 totBal = REWARD_TOKEN.balanceOf(address(this)); +> +> if (reward == 0) { +> return; +> } +> +> if (reward > totBal) { +> + // Insufficient balance resulting in no transfers out put into _unclaimedRewards[] +> + _unclaimedRewards[onBehalfOf] = (reward -totBal).wadToRay(); +> reward = totBal; +> - _unclaimedRewards[onBehalfOf] -= reward.wadToRay(); +> } else { +> _unclaimedRewards[onBehalfOf] = 0; +> } +> +> _updateUserSnapshotRewardsPerToken(onBehalfOf); +> REWARD_TOKEN.safeTransfer(receiver, reward); +> } +> ``` +> +> This may still have this prompt.
+> `expect(pendingRewards5).to.be.eq(0) // User "sacrifice" excess rewards to save on gas-costs` +> +> But I feel that this use case should be changed. It is okay to sacrifice a little. If it is a lot, it is still necessary to prevent the user from executing it. + +**[pmckelvy1 (sponsor) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1701385272)** + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1701397555):** + > @cccz @bin2chen - We had a group call and we decided to ACKNOWLEDGE the issue but we will not make code changes, just add a comment in the contract explaining this risk of losing rewards if you call it with the `false` parameter. +> +> The reasons are: +> * We do not expect Aave V2 Rewards to come back in practice. +> * Our protocol is not exposed to this issue. Because in our code we always claim with the parameter set to `true`, and nobody can claim on behalf of the protocol with the `false` parameter, the Protocol will always get the latest rewards when claiming. +> * It is up to the user to call this with true or false. They might see value in calling it with false and sacrificing some rewards, which was the original reason it was built this way. But they always have the option to call it with the true parameter which will behave normally. So we consider it more like an option they have and not that much of a bug. We also do not expect people holding this wrapper token besides using it in our protocol. +> +> However, we acknowledge and value the finding which was spot on and allowed us to understand the wrapper in more detail. Thanks for that! + + + +*** + +## [[M-13] Lack of protection when caling `CusdcV3Wrapper._withdraw`](https://github.com/code-423n4/2023-07-reserve-findings/issues/8) +*Submitted by [RaymondFam](https://github.com/code-423n4/2023-07-reserve-findings/issues/8)* + +When unwrapping the `wComet` to its rebasing `comet`, users with an equivalent amount of `wComet` invoking `CusdcV3Wrapper._withdraw` at around the same time could end up having different percentage gains because `comet` is not linearly rebasing. + +Moreover, the rate-determining `getUpdatedSupplyIndicies()` is an internal view function inaccessible to the users unless they take the trouble creating a contract to inherit CusdcV3Wrapper.sol. So most users making partial withdrawals will have no clue whether or not this is the best time to unwrap. This is because the public view function [underlyingBalanceOf](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L225-L231) is only directly informational when `amount` has been entered as `type(uint256).max`. + +### Proof of Concept + + + +```solidity + function _withdraw( + address operator, + address src, + address dst, + uint256 amount + ) internal { + if (!hasPermission(src, operator)) revert Unauthorized(); + // {Comet} + uint256 srcBalUnderlying = underlyingBalanceOf(src); + if (srcBalUnderlying < amount) amount = srcBalUnderlying; + if (amount == 0) revert BadAmount(); + + underlyingComet.accrueAccount(address(this)); + underlyingComet.accrueAccount(src); + + uint256 srcBalPre = balanceOf(src); + CometInterface.UserBasic memory wrappedBasic = underlyingComet.userBasic(address(this)); + int104 wrapperPrePrinc = wrappedBasic.principal; + + // conservative rounding in favor of the wrapper + IERC20(address(underlyingComet)).safeTransfer(dst, (amount / 10) * 10); + + wrappedBasic = underlyingComet.userBasic(address(this)); + int104 wrapperPostPrinc = wrappedBasic.principal; + + // safe to cast because principal can't go negative, wrapper is not borrowing + uint256 burnAmt = uint256(uint104(wrapperPrePrinc - wrapperPostPrinc)); + // occasionally comet will withdraw 1-10 wei more than we asked for. + // this is ok because 9 times out of 10 we are rounding in favor of the wrapper. + // safe because we have already capped the comet withdraw amount to src underlying bal. + // untested: + // difficult to trigger, depends on comet rules regarding rounding + if (srcBalPre <= burnAmt) burnAmt = srcBalPre; + + accrueAccountRewards(src); + _burn(src, safe104(burnAmt)); + } +``` + +As can be seen in the code block of function `_withdraw` above, `underlyingBalanceOf(src)` is first invoked. + + + +```solidity + function underlyingBalanceOf(address account) public view returns (uint256) { + uint256 balance = balanceOf(account); + if (balance == 0) { + return 0; + } + return convertStaticToDynamic(safe104(balance)); + } +``` + +Next, function `convertStaticToDynamic` is invoked. + + + +```solidity + function convertStaticToDynamic(uint104 amount) public view returns (uint256) { + (uint64 baseSupplyIndex, ) = getUpdatedSupplyIndicies(); + return presentValueSupply(baseSupplyIndex, amount); + } +``` + +And next, function `getUpdatedSupplyIndicies` is invoked. As can be seen in its code logic, the returned value of `baseSupplyIndex_` is determined by the changing `supplyRate`. + + + +```solidity + function getUpdatedSupplyIndicies() internal view returns (uint64, uint64) { + TotalsBasic memory totals = underlyingComet.totalsBasic(); + uint40 timeDelta = uint40(block.timestamp) - totals.lastAccrualTime; + uint64 baseSupplyIndex_ = totals.baseSupplyIndex; + uint64 trackingSupplyIndex_ = totals.trackingSupplyIndex; + if (timeDelta > 0) { + uint256 baseTrackingSupplySpeed = underlyingComet.baseTrackingSupplySpeed(); + uint256 utilization = underlyingComet.getUtilization(); + uint256 supplyRate = underlyingComet.getSupplyRate(utilization); + baseSupplyIndex_ += safe64(mulFactor(baseSupplyIndex_, supplyRate * timeDelta)); + trackingSupplyIndex_ += safe64( + divBaseWei(baseTrackingSupplySpeed * timeDelta, totals.totalSupplyBase) + ); + } + return (baseSupplyIndex_, trackingSupplyIndex_); + } +``` + +The returned value of `baseSupplyIndex` is then inputted into function `principalValueSupply` where the lower the value of `baseSupplyIndex`, the higher the `principalValueSupply` or simply put, the lesser the `burn` amount. + + + +```solidity + function principalValueSupply(uint64 baseSupplyIndex_, uint256 presentValue_) + internal + pure + returns (uint104) + { + return safe104((presentValue_ * BASE_INDEX_SCALE) / baseSupplyIndex_); + } +``` + +### Recommended Mitigation Steps + +Consider implementing slippage protection on `CusdcV3Wrapper._withdraw` so that users could opt for the minimum amount of `comet` to receive or the maximum amount of `wComet` to burn. + +### Assessed type + +Timing + +**[tbrent (Reserve) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/8#issuecomment-1670267745)** + +**[pmckelvy1 (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/8#issuecomment-1688439465):** + > Users can always use `convertStaticToDynamic` and `convertDynamicToStatic` to get the exchange rates as they both use `getUpdatedSupplyIndicies()`. The issue being flagged here (rebase rate is dynamic) is inherent to the comet itself (and pretty much any rebasing token for that matter), and not something the wrapper needs to be concerned about. + + + +*** + +## [[M-14] Lack of protection when withdrawing Static Atoken ](https://github.com/code-423n4/2023-07-reserve-findings/issues/7) +*Submitted by [RaymondFam](https://github.com/code-423n4/2023-07-reserve-findings/issues/7)* + +The Aave plugin is associated with [an ever-increasing exchange rate](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L26). The earlier a user wraps the AToken, the more Static Atoken will be minted and understandably no slippage protection is needed. + +However, since the rate is not linearly increasing, withdrawing the Static Atoken (following RToken redemption) at the wrong time could mean a difference in terms of the amount of AToken redeemed. The rate could be in a transient mode of non-increasing or barely increasing and then a significant surge. Users with an equivalent amount of Static AToken making such calls at around the same time could end up having different percentage gains. + +Although the user could always deposit and wrap the AToken again, it's not going to help if the wrapping were to encounter a sudden surge (bad timing again) thereby thwarting the intended purpose. + +### Proof of Concept + + + +```solidity + uint256 userBalance = balanceOf(owner); + + uint256 amountToWithdraw; + uint256 amountToBurn; + + uint256 currentRate = rate(); + if (staticAmount > 0) { + amountToBurn = (staticAmount > userBalance) ? userBalance : staticAmount; + amountToWithdraw = _staticToDynamicAmount(amountToBurn, currentRate); + } else { + uint256 dynamicUserBalance = _staticToDynamicAmount(userBalance, currentRate); + amountToWithdraw = (dynamicAmount > dynamicUserBalance) + ? dynamicUserBalance + : dynamicAmount; + amountToBurn = _dynamicToStaticAmount(amountToWithdraw, currentRate); + } + + _burn(owner, amountToBurn); +``` + +As can be seen in the code block of function `_withdraw` above, choosing `staticAmount > 0` will have a lesser amount of AToken to withdraw when the `currentRate` is stagnant. + + + +```solidity + function _staticToDynamicAmount(uint256 amount, uint256 rate_) internal pure returns (uint256) { + return amount.rayMul(rate_); + } +``` + +Similarly, choosing `dynamicAmount > 0` will have a higher than expected amount of Static Atoken to burn. + + + +```solidity + function _dynamicToStaticAmount(uint256 amount, uint256 rate_) internal pure returns (uint256) { + return amount.rayDiv(rate_); + } +``` + +### Recommended Mitigation Steps + +Consider implementing slippage protection on `StaticATokenLM._withdraw` so that users could opt for the minimum amount of AToken to receive or the maximum amount of Static Atoken to burn. + +### Assessed type + +Timing + +**[tbrent (Reserve) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/7#issuecomment-1670268069)** + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/7#issuecomment-1695796001):** + > Hi, as mentioned before we acknowledge the existence of this issue. +> +> But on the other hand we will not implement fixes or changes. We believe it is the responsibility of the user to decide when to wrap/unwrap these tokens and these interactions are in general outside of the protocol behavior. +> +> In addition to this the rate is accesible for the user to make that decision, and we don't expect these rates to increase abruptly for this wrapper, so in reality we might be adding a feature that will probably not be used in practice. +> +> It is important to remark this is something that exists in any wrapper for rebasing tokens we use, whether it is our own, or developed by other protocol teams. And generally we don't see implemented in those wrappers slippage protection or a feature like the one suggested here. + + + +*** + +## [[M-15] Potential Loss of Rewards During Token Transfers in StaticATokenLM.sol](https://github.com/code-423n4/2023-07-reserve-findings/issues/4) +*Submitted by [RaymondFam](https://github.com/code-423n4/2023-07-reserve-findings/issues/4)* + +This issue could lead to a permanent loss of rewards for the transferer of the token. During the token transfer process, the `_beforeTokenTransfer` function updates rewards for both the sender and the receiver. However, due to the specific call order and the behavior of the `_updateUser` function and the `_getPendingRewards` function, some rewards may not be accurately accounted for. + +The crux of the problem lies in the fact that the `_getPendingRewards` function, when called with the `fresh` parameter set to `false`, may not account for all the latest rewards from the `INCENTIVES_CONTROLLER`. As a result, the `_updateUserSnapshotRewardsPerToken` function, which relies on the output of the `_getPendingRewards` function, could end up missing out on some rewards. This could be detrimental to the token sender, especially the `Backing Manager` whenever `RToken` is redeemed. Apparently, most users having wrapped their `AToken`, would automatically use it to issue `RToken` as part of the basket range of backing collaterals and be minimally impacted. But it would have the Reserve Protocol collectively affected depending on the frequency and volume of RToken redemption and the time elapsed since `_updateRewards()` or `_collectAndUpdateRewards()` was last called. The same impact shall also apply when making token transfers to successful auction bidders. + +### Proof of Concept + +As denoted in the function NatSpec below, function `_beforeTokenTransfer` updates rewards for senders and receivers in a [`transfer`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/vendor/ERC20.sol#L223-L250). + + + +```solidity + /** + * @notice Updates rewards for senders and receiver in a transfer (not updating rewards for address(0)) + * @param from The address of the sender of tokens + * @param to The address of the receiver of tokens + */ + function _beforeTokenTransfer( + address from, + address to, + uint256 + ) internal override { + if (address(INCENTIVES_CONTROLLER) == address(0)) { + return; + } + if (from != address(0)) { + _updateUser(from); + } + if (to != address(0)) { + _updateUser(to); + } + } +``` + +When function `_updateUser` is respectively invoked, `_getPendingRewards(user, balance, false)` is called. + + + +```solidity + /** + * @notice Adding the pending rewards to the unclaimed for specific user and updating user index + * @param user The address of the user to update + */ + function _updateUser(address user) internal { + uint256 balance = balanceOf(user); + if (balance > 0) { + uint256 pending = _getPendingRewards(user, balance, false); + _unclaimedRewards[user] = _unclaimedRewards[user].add(pending); + } + _updateUserSnapshotRewardsPerToken(user); + } +``` + +However, because the third parameter has been entered `false`, the third if block of function `_getPendingRewards` is skipped. + + + +```solidity + /** + * @notice Compute the pending in RAY (rounded down). Pending is the amount to add (not yet unclaimed) rewards in RAY (rounded down). + * @param user The user to compute for + * @param balance The balance of the user + * @param fresh Flag to account for rewards not claimed by contract yet + * @return The amount of pending rewards in RAY + */ + function _getPendingRewards( + address user, + uint256 balance, + bool fresh + ) internal view returns (uint256) { + if (address(INCENTIVES_CONTROLLER) == address(0)) { + return 0; + } + + if (balance == 0) { + return 0; + } + + uint256 rayBalance = balance.wadToRay(); + + uint256 supply = totalSupply(); + uint256 accRewardsPerToken = _accRewardsPerToken; + + if (supply != 0 && fresh) { + address[] memory assets = new address[](1); + assets[0] = address(ATOKEN); + + uint256 freshReward = INCENTIVES_CONTROLLER.getRewardsBalance(assets, address(this)); + uint256 lifetimeRewards = _lifetimeRewardsClaimed.add(freshReward); + uint256 rewardsAccrued = lifetimeRewards.sub(_lifetimeRewards).wadToRay(); + accRewardsPerToken = accRewardsPerToken.add( + (rewardsAccrued).rayDivNoRounding(supply.wadToRay()) + ); + } + + return + rayBalance.rayMulNoRounding(accRewardsPerToken.sub(_userSnapshotRewardsPerToken[user])); + } +``` + +Hence, `accRewardsPerToken` may not be updated with the latest rewards from `INCENTIVES_CONTROLLER`. Consequently, `_updateUserSnapshotRewardsPerToken(user)` will miss out on claiming some rewards and is a loss to the StaticAtoken transferrer. + + + +```solidity + /** + * @notice Update the rewardDebt for a user with balance as his balance + * @param user The user to update + */ + function _updateUserSnapshotRewardsPerToken(address user) internal { + _userSnapshotRewardsPerToken[user] = _accRewardsPerToken; + } +``` + +Ironically, this works out as a zero-sum game where the loss of the transferrer is a gain to the transferee. But most assuredly, the Backing Manager is going to end up incurring more losses than gains in this regard. + +### Recommended Mitigation Steps + +Consider introducing an additional call to update the state of rewards before any token transfer occurs. Specifically, within the `_beforeTokenTransfer` function, invoking [`_updateRewards`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L388-L415) like it has been implemented in [`StaticATokenLM._deposit`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L309) and [`StaticATokenLM._withdraw`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L336) before updating the user balances would have the issues resolved. + +This method would not force an immediate claim of rewards, but rather ensure the internal accounting of rewards is up-to-date before the transfer. By doing so, the state of rewards for each user would be accurate and ensure no loss or premature gain of rewards during token transfers. + +### Assessed type + +Token-Transfer + +**[cccz (judge) decreased severity to Medium](https://github.com/code-423n4/2023-07-reserve-findings/issues/4#issuecomment-1666907721)** + +**[tbrent (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/4#issuecomment-1670279270):** + > See comment on [issue 12](https://github.com/code-423n4/2023-07-reserve-findings/issues/12#issuecomment-1670267488). + +**[julianmrodri (Reserve) commented](https://github.com/code-423n4/2023-07-reserve-findings/issues/4#issuecomment-1695841054):** + > We will mark this issue as Sponsor Acknowledged. It is true the situation described by the warden and that's the behavior we observe. However we will not be implementing any change in the code (besides adding some comments) for the following reasons: +> * We do not expect rewards in Aave V2 to come back. +> * We checked with Aave and we believe the original reason for building it this way still holds, and that is for gas purposes. Even if for some reason rewards on AAve V2 come back the cost of updating the user rewards on every transfer outweighs the rewards that may be left "uncollected" after a `transfer` operation. It is important to remark that any `deposit` or `withdraw` done to the contract plus any call to `collectRewards..`, and any claim of rewards from the Reserve protocol, would setup the correct balances. So while it is true that transfers may in some cases not transfer rewards we expect this to only be slightly off. +> +> To clarify this issue for users we will add a comment to the wrapper contract `StaticATokenLM` to clarify the situation with how rewards are handled on transfer. + +**[tbrent (Reserve) acknowledged](https://github.com/code-423n4/2023-07-reserve-findings/issues/4#issuecomment-1695970933)** + + + +*** + +# Low Risk and Non-Critical Issues + +For this audit, 6 reports were submitted by wardens detailing low risk and non-critical issues. The [report highlighted below](https://github.com/code-423n4/2023-07-reserve-findings/issues/38) by **auditor0517** received the top score from the judge. + +*The following wardens also submitted reports: [ronnyx2017](https://github.com/code-423n4/2023-07-reserve-findings/issues/26), [bin2chen](https://github.com/code-423n4/2023-07-reserve-findings/issues/16), [RaymondFam](https://github.com/code-423n4/2023-07-reserve-findings/issues/9), [carlitox477](https://github.com/code-423n4/2023-07-reserve-findings/issues/41), and [0xA5DF](https://github.com/code-423n4/2023-07-reserve-findings/issues/34).* + +## [L-01] Unsafe max approve +It's not recommended to approve `type(uint256).max` for safety. We should approve a relevant amount every time. + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L105 + +```solidity +ASSET.safeApprove(address(pool), type(uint256).max); +``` + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol#L39 + +```solidity +pool_.approve(address(stakingContract_), type(uint256).max); +``` + +## [L-02] Possible reentrancy +Users might manipulate `wrapperPostPrinc` inside the transfer hook. With the current `underlyingComet` token, there is no impact as it doesn't have any hook but it's recommended to add a `nonReentrant` modifier to `_deposit()/_withdraw()`. + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L96 + +```solidity +IERC20(address(underlyingComet)).safeTransferFrom(src, address(this), amount); +``` + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L154 + +```solidity +IERC20(address(underlyingComet)).safeTransfer(dst, (amount / 10) * 10); +``` + +## [L-03] Unsafe downcasting +`feeds[i].length` might be downcasted wrongly when it's greater than `type(uint8).max`. `maxFeedsLength()` might pass the [requirement](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L105) when `config.feeds` has many elements(like 256). + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L330 + +```solidity +maxLength = uint8(Math.max(maxLength, feeds[i].length)); +``` + +## [L-04] Reverts on 0 transfer +It deposits 0 amount to the staking contract to claim rewards but it might revert [during the 0 transfer](https://github.com/stargate-protocol/stargate/blob/main/contracts/LPStaking.sol#L161). There is no problem with the current `lpToken` but good to keep in mind. + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol#L48 + +```solidity +stakingContract.deposit(poolId, 0); +``` + +## [L-05] Wrong comment +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/Asset.sol#L146 + +```solidity +// oracleTimeout <= delta <= oracleTimeout + priceTimeout ==========> oracleTimeout < delta < oracleTimeout + priceTimeout +``` + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/WrappedERC20.sol#L298 + +```solidity + * - when `from` is zero, `amount` tokens will be minted for `to`. //@audit should remove, no hook if `from` or `to` is zero + * - when `to` is zero, `amount` of ``from``'s tokens will be burned. +``` + +## [L-06] Unsafe permission +`WrappedERC20` uses a permission mechanism and operators can have an infinite allowance once approved. It might be inconvenient/dangerous for some users. + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L84 + +```solidity + function _deposit( + address operator, + address src, + address dst, + uint256 amount + ) internal { + if (!hasPermission(src, operator)) revert Unauthorized(); //@audit infinite allowance + ... + } +``` + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L140 + +```solidity + function _withdraw( + address operator, + address src, + address dst, + uint256 amount + ) internal { + if (!hasPermission(src, operator)) revert Unauthorized(); //@audit infinite allowance + ... + } +``` + +## [L-07] Typical first depositor issue in `RewardableERC4626Vault` +It's recommended to follow the [instructions](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/vendor/oz/ERC4626.sol#L39-L43). + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol#L20 + +```solidity +abstract contract RewardableERC4626Vault is ERC4626, RewardableERC20 {} +``` + +## [N-01] Typo +`_accumuatedRewards` => `_accumulatedRewards` + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L57 + +```solidity +uint256 _accumuatedRewards = accumulatedRewards[account]; +``` + +## [N-02] Needless accrue for src +We don't need to accrue for `src` because we don't use any information of `src` and that info will be accrued during the [underlyingComet transfer](https://github.com/compound-finance/comet/blob/main/contracts/Comet.sol#L942). + +- https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L91 + +```solidity + underlyingComet.accrueAccount(address(this)); + underlyingComet.accrueAccount(src); //@audit needless accrue + + CometInterface.UserBasic memory wrappedBasic = underlyingComet.userBasic(address(this)); + int104 wrapperPrePrinc = wrappedBasic.principal; + + IERC20(address(underlyingComet)).safeTransferFrom(src, address(this), amount); +``` + + + +*** + +# Gas Optimizations + +For this audit, 2 reports were submitted by wardens detailing gas optimizations. The [report highlighted below](https://github.com/code-423n4/2023-07-reserve-findings/issues/18) by **RaymondFam** received the top score from the judge. + +*The following wardens also submitted reports: [carlitox477](https://github.com/code-423n4/2023-07-reserve-findings/issues/40).* + +## [G-01] Immutable over constant +The use of constant `keccak` variables results in extra hashing whenever the variable is used, increasing gas costs relative to just storing the output hash. Changing to immutable will only perform hashing on contract deployment which will save gas. + +Here are some of the instances entailed. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L44-L60 + +```solidity + bytes public constant EIP712_REVISION = bytes("1"); + bytes32 internal constant EIP712_DOMAIN = + keccak256( + "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)" + ); + bytes32 public constant PERMIT_TYPEHASH = + keccak256( + "Permit(address owner,address spender,uint256 value,uint256 nonce,uint256 deadline)" + ); + bytes32 public constant METADEPOSIT_TYPEHASH = + keccak256( + "Deposit(address depositor,address recipient,uint256 value,uint16 referralCode,bool fromUnderlying,uint256 nonce,uint256 deadline)" + ); + bytes32 public constant METAWITHDRAWAL_TYPEHASH = + keccak256( + "Withdraw(address owner,address recipient,uint256 staticAmount,uint256 dynamicAmount,bool toUnderlying,uint256 nonce,uint256 deadline)" + ); +``` + +## [G-02] Unreachable code lines +The following else block in the function logic of `refresh()` is never reachable considering [`tryPrice()`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/Asset.sol#L64-L84) does not have (0, FIX\_MAX) catered for. Any upriced data would have been sent to the catch block. Other than Asset.sol, similarly wasted logic is also exhibited in [`AppreciatingFiatCollateral.refresh`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/AppreciatingFiatCollateral.sol#L113-L116), [`FiatCollateral.refresh`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/FiatCollateral.sol#L136-L139), [`CTokenV3Collateral.refresh`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol#L105-L110), [`CurveStableCollateral.refresh`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/CurveStableCollateral.sol#L110-L115), [`StargatePoolFiatCollateral.refresh`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol#L87-L90). + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/Asset.sol#L86-L106 + +```solidity + /// Should not revert + /// Refresh saved prices + function refresh() public virtual override { + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + assert(low == 0); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + } + } +``` + +## [G-03] Redundant `return` in the `try` clause +This `try` clause has already returned `low` and `high` and is returning the same things again in its nested logic, which is inexpedient and unnecessary. Similar behavior is also found in [`Asset.price`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/Asset.sol#L112-L121). + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/RTokenAsset.sol#L86-L94 + +```diff + function price() public view virtual returns (uint192, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high) { +- return (low, high); + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return (0, FIX_MAX); + } + } +``` + +## [G-04] Unneeded import in `RTokenAsset.sol` +`IRToken.sol` has already been imported by `IMain.sol`, making the former an unneeded import. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/RTokenAsset.sol#L5-L6 + +```diff + import "../../interfaces/IMain.sol"; +- import "../../interfaces/IRToken.sol"; +``` + +## [G-05] Cached variables not efficiently used +In `StaticATokenLM._updateRewards`, the state variable `_lifetimeRewardsClaimed` is doubly used in the following code logic when `rewardsAccrued` could simply/equally be assigned `freshRewards.wadToRay()`. This extra gas incurring behaviour is also exhibited in [`StaticATokenLM._collectAndUpdateRewards`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L428-L434), and [`StaticATokenLM._getPendingRewards`](https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L581-L583). + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L406-L408 + +```diff + uint256 freshRewards = INCENTIVES_CONTROLLER.getRewardsBalance(assets, address(this)); + uint256 lifetimeRewards = _lifetimeRewardsClaimed.add(freshRewards); +- uint256 rewardsAccrued = lifetimeRewards.sub(_lifetimeRewards).wadToRay(); ++ uint256 rewardsAccrued = freshRewards.wadToRay(); +``` + +## [G-06] Identical for loop check +The if block in the constructor of PoolTokens.sol entails identical if block checks that may be moved outside the loop to save gas. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L123-L130 + +```diff + IERC20Metadata[] memory tokens = new IERC20Metadata[](nTokens); + ++ if (config.poolType == CurvePoolType.Plain) revert("invalid poolType"); + + for (uint8 i = 0; i < nTokens; ++i) { +- if (config.poolType == CurvePoolType.Plain) { + tokens[i] = IERC20Metadata(curvePool.coins(i)); +- } else { +- revert("invalid poolType"); +- } + } +``` + +## [G-07] Unneeded ternary logic, booleans, and second condition checks +In the constructor of PoolTokens.sol, the second condition of the following require statement mandates that at least one feed is associated with each token. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L106-L109 + +```solidity + require( + config.feeds.length == config.nTokens && minFeedsLength(config.feeds) > 0, + "each token needs at least 1 price feed" + ); +``` +Additionally, the following code lines signify that a minimum of 2 tokens will be associated with the Curve base pool. Otherwise, if `nTokens` is less than 2 or 1, assigning `token0` and/or `token1` will revert due to accessing out-of-bound array elements. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L132-L135 + +```solidity + token0 = tokens[0]; + token1 = tokens[1]; + token2 = (nTokens > 2) ? tokens[2] : IERC20Metadata(address(0)); + token3 = (nTokens > 3) ? tokens[3] : IERC20Metadata(address(0)); +``` +Under this context, the following ternary logic along with the use of boolean `more` is therefore deemed unnecessary. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L143-L154 + +```diff + // token0 +- bool more = config.feeds[0].length > 0; + // untestable: + // more will always be true based on previous feeds validations +- _t0feed0 = more ? config.feeds[0][0] : AggregatorV3Interface(address(0)); ++ _t0feed0 = config.feeds[0][0]; + _t0timeout0 = more && config.oracleTimeouts[0].length > 0 ? config.oracleTimeouts[0][0] : 0; + _t0error0 = more && config.oracleErrors[0].length > 0 ? config.oracleErrors[0][0] : 0; +- if (more) { + require(address(_t0feed0) != address(0), "t0feed0 empty"); + require(_t0timeout0 > 0, "t0timeout0 zero"); + require(_t0error0 < FIX_ONE, "t0error0 too large"); +- } +``` +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L166-L177 + +```diff + // token1 + // untestable: + // more will always be true based on previous feeds validations +- more = config.feeds[1].length > 0; +- _t1feed0 = more ? config.feeds[1][0] : AggregatorV3Interface(address(0)); ++ _t1feed0 = config.feeds[1][0]; + _t1timeout0 = more && config.oracleTimeouts[1].length > 0 ? config.oracleTimeouts[1][0] : 0; + _t1error0 = more && config.oracleErrors[1].length > 0 ? config.oracleErrors[1][0] : 0; +- if (more) { + require(address(_t1feed0) != address(0), "t1feed0 empty"); + require(_t1timeout0 > 0, "t1timeout0 zero"); + require(_t1error0 < FIX_ONE, "t1error0 too large"); +- } +``` +Similarly, the following second conditional checks are also not needed. + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L189-L190 + +```diff + // token2 +- more = config.feeds.length > 2 && config.feeds[2].length > 0; ++ more = config.feeds.length > 2; +``` +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/curve/PoolTokens.sol#L210-L211 + +```diff + // token3 +- more = config.feeds.length > 3 && config.feeds[3].length > 0; ++ more = config.feeds.length > 3; +``` + +## [G-08] Use of named returns for local variables saves gas +You can have further advantages in terms of gas cost by simply using named return values as temporary local variables. + +For instance, the code block below may be refactored as follows: + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L225 + +```diff +- function underlyingBalanceOf(address account) public view returns (uint256) { ++ function underlyingBalanceOf(address account) public view returns (uint256 _balance) { + uint256 balance = balanceOf(account); + if (balance == 0) { + return 0; + } +- return convertStaticToDynamic(safe104(balance)); ++ _balance = convertStaticToDynamic(safe104(balance)); + } +``` + +## [G-09] `+=` and `-=` cost more gas +`+=` and `-=` generally cost 22 more gas than writing out the assigned equation explicitly. The amount of gas wasted can be quite sizable when repeatedly operated in a loop. + +For instance, the `+=` instance below may be refactored as follows: + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol#L307 + +```diff +- baseSupplyIndex_ += safe64(mulFactor(baseSupplyIndex_, supplyRate * timeDelta)); ++ baseSupplyIndex_ = baseSupplyIndex_ + safe64(mulFactor(baseSupplyIndex_, supplyRate * timeDelta)); +``` + +## [G-10] Function order affects gas consumption +The order of function will also have an impact on gas consumption. Because in smart contracts, there is a difference in the order of the functions. Each position will have an extra 22 gas. The order is dependent on method ID. So, if you rename the frequently accessed function to more early method ID, you can save gas cost. Please visit the following site for further information: + +https://medium.com/joyso/solidity-how-does-function-name-affect-gas-consumption-in-smart-contract-47d270d8ac92 + +## [G-11] Activate the optimizer +Before deploying your contract, activate the optimizer when compiling using `solc --optimize --bin sourceFile.sol`. By default, the optimizer will optimize the contract assuming it is called 200 times across its lifetime. If you want the initial contract deployment to be cheaper and the later function executions to be more expensive, set it to `--optimize-runs=1`. Conversely, if you expect many transactions and do not care for higher deployment cost and output size, set `--optimize-runs` to a high number. + +``` +module.exports = { +solidity: { +version: "0.8.19", +settings: { + optimizer: { + enabled: true, + runs: 1000, + }, +}, +}, +}; +``` +Please visit the following site for further information: + +https://docs.soliditylang.org/en/v0.5.4/using-the-compiler.html#using-the-commandline-compiler + +Here's one example of instance on opcode comparison that delineates the gas saving mechanism: + +``` +for !=0 before optimization +PUSH1 0x00 +DUP2 +EQ +ISZERO +PUSH1 [cont offset] +JUMPI + +after optimization +DUP1 +PUSH1 [revert offset] +JUMPI +``` +Disclaimer: There have been several bugs with security implications related to optimizations. For this reason, Solidity compiler optimizations are disabled by default, and it is unclear how many contracts in the wild actually use them. Therefore, it is unclear how well they are being tested and exercised. High-severity security issues due to optimization bugs have occurred in the past. A high-severity bug in the emscripten -generated solc-js compiler used by Truffle and Remix persisted until late 2018. The fix for this bug was not reported in the Solidity CHANGELOG. Another high-severity optimization bug resulting in incorrect bit shift results was patched in Solidity 0.5.6. Please measure the gas savings from optimizations, and carefully weigh them against the possibility of an optimization-related bug. Also, monitor the development and adoption of Solidity compiler optimizations to assess their maturity. + +## [G-12] Constructors can be marked payable +Payable functions cost less gas to execute, since the compiler does not have to add extra checks to ensure that a payment wasn't provided. A constructor can safely be marked as payable, since only the deployer would be able to pass funds, and the project itself would not pass any funds. + +Here are some of the instances entailed: + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/ATokenFiatCollateral.sol#L42 + +```solidity + constructor(CollateralConfig memory config, uint192 revenueHiding) +``` +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/EURFiatCollateral.sol#L23-L27 + +```solidity + constructor( + CollateralConfig memory config, + AggregatorV3Interface targetUnitChainlinkFeed_, + uint48 targetUnitOracleTimeout_ + ) FiatCollateral(config) { +``` +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/FiatCollateral.sol#L62-L70 + +```solidity + constructor(CollateralConfig memory config) + Asset( + config.priceTimeout, + config.chainlinkFeed, + config.oracleError, + config.erc20, + config.maxTradeVolume, + config.oracleTimeout + ) +``` + +## [G-13] Use assembly for small keccak256 hashes, in order to save gas +If the arguments to the encode call can fit into the scratch space (two words or fewer), then it's more efficient to use assembly to generate the hash (80 gas): keccak256(abi.encodePacked(x, y)) -> assembly {mstore(0x00, a); mstore(0x20, b); let hash := keccak256(0x00, 0x40); } + +Here are some of the instances entailed: + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L285-L286 + +```solidity + keccak256(bytes(name())), + keccak256(EIP712_REVISION), +``` + +## [G-14] Reduce gas usage by moving to Solidity 0.8.19 or later +Please visit the following link for substantiated details: + +https://soliditylang.org/blog/2023/02/22/solidity-0.8.19-release-announcement/#preventing-dead-code-in-runtime-bytecode + +And, here are some of the instances entailed: + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenLM.sol#L2 + +```solidity +pragma solidity 0.6.12; +``` +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/aave/StaticATokenErrors.sol + +```solidity +pragma solidity 0.6.12; +``` +## [G-15] Using this to access functions results in an external call, wasting gas +External calls have an overhead of 100 gas, which can be avoided by not referencing the function using this. Contracts are [allowed](https://docs.soliditylang.org/en/latest/contracts.html#function-overriding) to override their parents' functions and change the visibility from external to public, so make this change if it's required in order to call the function internally. + +Here are some of the instances entailed: + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/AppreciatingFiatCollateral.sol#L104 + +```solidity + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { +``` +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/Asset.sol + +```solidity +89: try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + +113: try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + +129: try this.tryPrice() returns (uint192 low, uint192 high, uint192) { +``` + + + +*** + +# Audit Analysis + +For this audit, 2 analysis reports were submitted by wardens. An analysis report examines the codebase as a whole, providing observations and advice on such topics as architecture, mechanism, or approach. The [report highlighted below](https://github.com/code-423n4/2023-07-reserve-findings/issues/42) by **RaymondFam** received the top score from the judge. + +*The following warden also submitted a report: [0xA5DF](https://github.com/code-423n4/2023-07-reserve-findings/issues/37).* + +### Introduction + +The following is a detailed analysis of the Reserve Protocol, with a comprehensive exploration of the codebase, architecture, quality, centralization risks, mechanisms, and potential systemic risks. In this report, six key vulnerabilities have been identified and ranked by severity, with three identified as high, and the remaining three as medium. The potential issues range from token loss during transfers to early exploits, reentrancy vulnerabilities, incorrect collateral pricing, and lack of protection during withdrawals. Each vulnerability is thoroughly explained with corresponding recommendations to mitigate the associated risks. The report further covers the evaluation approach, providing insightful suggestions for improving the codebase and minimizing centralization risks. The mechanism review and an assessment of systemic risks offer an understanding of the potential threats that need to be managed for long-term system stability. + +### Comments for the judge to contextualize my findings +A total of 3 highs, 3 mediums along with additional inputs in the Gas and QA reports have been submitted. It's worth noting that loopholes still abound depending on how you would visualize the codebase both short and long terms. Here is the breakdown of the HM findings in their condensed forms: + +1. Potential Loss of Rewards During Token Transfers in StaticATokenLM.sol (High) +The report identifies a potential issue in the Reserve Protocol, where the process of transferring tokens could lead to permanent loss of rewards for the sender due to the order of function calls and behavior of certain functions. The issue arises primarily from the `_getPendingRewards` function not accounting for all recent rewards from the `INCENTIVES_CONTROLLER` when the `fresh` parameter is set to `false`. This miscalculation could then negatively affect the output of the `_updateUserSnapshotRewardsPerToken` function, resulting in some rewards being missed, particularly affecting the `Backing Manager` during `RToken` redemptions. The issue could also affect token transfers to successful auction bidders. The report recommends mitigating this by introducing an additional call to update the state of rewards before any token transfer occurs, specifically within the `_beforeTokenTransfer` function, to ensure accurate internal accounting of rewards and prevent loss or premature gain during transfers. +2. Potential Early Exploit in Morho-Aave ERC4626 Implementation (High) +The report describes an exploit in a blockchain smart contract where an attacker could potentially gain unauthorized control over a significant portion of the assets stored within the contract's "vault". This is possible when the vault is initially empty, and an attacker deposits a negligible amount before a legitimate user's deposit, thereby owning shares while the total vault asset is still low. The attacker then donates a large amount to the vault, causing a precision error which leads to other users receiving no shares despite depositing assets. The attacker redeems their shares, possibly gaining a significant portion of the vault's assets. This vulnerability arises from the flawed inheritance structure of the underlying smart contract and its functions, particularly the `MorphoTokenisedDeposit. _decimalsOffset()` function. A proof-of-concept is given which shows how an attacker can implement this exploit in five steps. The report recommends mitigating this risk by hardcoding `MorphoTokenisedDeposit. _decimalsOffset()` to return `9` instead of `0`. +3. Cross-Function Reentrancy Vulnerability Leading to Unintended Token Minting in `RewardableERC20Wrapper.deposit` (High) +The report outlines a substantial reentrancy vulnerability within the `RewardableERC20Wrapper` contract, particularly the `deposit()` function. This vulnerability, which can be exploited through direct and cross-function reentrancy attacks, becomes evident when ERC777 tokens or other token types with "hook" features serve as the underlying token. Successful exploitation could trigger unwarranted token minting, leading to a skewed token supply, thereby compromising the contract's integrity and impacting individual token value. This susceptibility is due to the `_mint(_to, _amount)` operation execution prior to the `underlying.safeTransferFrom(msg.sender, address(this), _amount)` call within the `deposit()` function. Such a sequence allows an ERC777 token to initiate a reentrant call back to `deposit()`, thereby allowing token minting before the contract's state is adequately updated. To mitigate this, the report suggests implementing a reentrancy guard for all public and external functions that modify the contract's state and call external contracts. It also recommends refactoring the `deposit()` function to adhere to the check-effects-interactions pattern, conducting state changes post external calls. +4. Risk of Incorrect Collateral Pricing in Case of Aggregator Reaching minAnswer (Medium) +The report highlights a significant issue within Chainlink aggregators related to the built-in circuit breaker, which can cause the oracle to continuously return the `minPrice` rather than the actual asset price during substantial price drops. The problem occurs when an asset's price goes below its `minPrice`; the protocol then overvalues the token at the `minPrice`, leading to overvalued function calls. The issue becomes prominent when the `defaultThreshold` is set in a way that keeps the `pegPrice` between `pegBottom` and `pegTop`, which can potentially lead to an excessively large issuance of `RTokens`, creating an unnoticed unhealthy collateral basket. Although a combination of oracles, such as Chainlink and Band, could potentially prevent this situation, a malicious user could still exploit Band by DDOSing relayers to block price updates. To address this issue, the report suggests cross-checking the returned price in the `OracleLib.price` against `minPrice/maxPrice`, and triggering a revert if the price falls outside these boundaries, thus ensuring an accurate price representation. +5. Lack of protection when withdrawing Static Atoken (Medium) +The report reveals a significant issue with the Aave plugin regarding its ever-increasing exchange rate. It shows that while an early wrap of AToken results in more Static Atoken minting, withdrawal timing can greatly impact the amount of AToken redeemed due to the nonlinear growth of the exchange rate. This could lead to unequal percentage gains for users who perform similar calls around the same time. Furthermore, rewrapping the AToken may not be beneficial if it encounters a sudden surge, consequently thwarting the initial objective. The highlighted code snippets show that choosing `staticAmount > 0` could result in a lesser amount of AToken being withdrawn when the `currentRate` is stagnant. In contrast, choosing `dynamicAmount > 0` could lead to burning a higher than expected amount of Static Atoken. To mitigate this, the report suggests implementing slippage protection on `StaticATokenLM._withdraw` so that users could set the minimum AToken amount to receive or the maximum Static Atoken amount to burn. +6. Lack of protection when caling `CusdcV3Wrapper._withdraw` (Medium) +The report discusses potential risks associated with the `wComet` unwrapping process in the `CusdcV3Wrapper` contract. It notes that users who invoke `CusdcV3Wrapper._withdraw` simultaneously could experience different percentage gains due to the non-linear rebasing of `comet`. Moreover, the report suggests that the rate-determining `getUpdatedSupplyIndicies()` function is inaccessible to most users who make partial withdrawals, obscuring the ideal unwrapping moment. The document provides a detailed code walkthrough, demonstrating how the value of `baseSupplyIndex` influences the burn amount, with lower values resulting in higher `principalValueSupply` and therefore a smaller `burn` quantity. To remedy these issues, the report proposes implementing slippage protection on `CusdcV3Wrapper._withdraw`, allowing users to set the minimum `comet` to receive or the maximum `wComet` to burn. + +### Approach taken in evaluating the codebase +Going through the recommended specs and links is of paramount importance prior to going over the codebases line upon line. I started with the generic contracts and then moved on to tackling the specific plugins one after another. It has also helped me smell out some bugs by reading past related audit reports as I pieced together the puzzles. Deep diving into the code logic was fun and satisfying when noticing how the flaws could be so exploited. + +### Architecture recommendations +The codebase could do better with adequate and complete NatSpec along with some thorough flow charts to help link up essential flows/calls. There have been some redundant and unneeded codes presented in the Gas report. Touching up the codebase with the low and non-critical feedback from the QA report would also help amplify code robustness. + +### Codebase quality analysis +The Reserve Protocol features one of the most sophisticated and well-structured codebases in the industry. Having prior knowledge of the previous audits will not make it enough to revisit the documentation and specifications. You would assuredly gain a better and often another facet of understanding of the business logic particularly when it relates to Dimensional Analysis. + +### Centralization risks +There are some centralized risks associated with the vendors but they are deemed out of scope here. Nonetheless, these vendors are mostly reputable third-party contracts that have relatively been battled tested and should not pose much of a concern at this juncture. Perhaps, the protocol should look into implementing some form of emergency contract and/or key function pausing/freezing and be prepared for the worst. + +### Mechanism review +The Reserve Protocol, with its intricate design and interlocking mechanisms, presents unique challenges for ensuring the stability and security of its network. The protocol has addressed several key concerns raised in previous reports, showcasing its commitment to maintaining a safe and reliable platform for its users. + +However, the protocol's complexity necessitates ongoing vigilance. The Token Transfer Mechanism, Vault Control Mechanism, and Withdrawal Mechanisms, while remedied, need constant monitoring to prevent the re-emergence of issues such as inaccurate accounting of rewards or unauthorized asset control. + +Moreover, the Token Minting and Price Retrieval Mechanisms require careful handling to avoid potential reentrancy attacks and misvaluation of function calls. Any discrepancies in these systems could lead to an unpredictable token supply and excessive issuance of RTokens, thus destabilizing the entire ecosystem. + +### Systemic risks +Limited risks will always prevail considering the majority of current designs have not gone live yet. The previous audit on governance currently falling also under the plugins/*, when more elaborately worked upon and implemented, should help defray all anticipated threats. I think the adoption of Revenue Hiding via AppreciatingFiatCollateral.sol is a smart approach overall to minimize the likelihood of having collaterals defaulted to DISABLED. Coupled with good collateral rewards revenue incentives, the high participation of RSR stakers that enhances over-collateralization would assuredly make the system fully established and intact from getting anywhere near to an undesirable haircut. + +### Time spent +72 hours + +*** + +# [Mitigation Review](#mitigation-review) + +## Introduction + +Following the C4 audit, 3 wardens ([ronnyx2017](https://code4rena.com/@ronnyx2017), [bin2chen](https://code4rena.com/@bin2chen) and [RaymondFam](https://code4rena.com/@RaymondFam)) reviewed the mitigations for all identified issues. Additional details can be found within the [Reserve Mitigation Review repository](https://github.com/code-423n4/2023-09-reserve-mitigation). + +## Overview of Changes + +**[Summary from the Sponsor](https://github.com/code-423n4/2023-09-reserve-mitigation#overview-of-changes):** + +Units and price calculations in LSD collateral types were fixed. `CurveVolatileCollateral` was removed entirely. Decimals fixed in wrapped `cUSDCv3`. RToken Asset pricing issues fixed, (`0, FIX_MAX`) enforced as "unpriced". Reward remainder held until next claim instead of lost. + +## Mitigation Review Scope + +### Branch + https://github.com/reserve-protocol/protocol/tree/master + + +### Individual PRs +| URL | Mitigation of | Purpose | +| ----------- | ------------- | ----------- | +| https://github.com/reserve-protocol/protocol/pull/899 | H-01 | Fixes units and price calculations in cbETH, rETH, ankrETH collateral plugins. | +| https://github.com/reserve-protocol/protocol/pull/896 | H-02 | Removes `CurveVolatileCollateral`. | +| https://github.com/reserve-protocol/protocol/pull/930 | H-03 | Skip reward claim in `_checkpoint` if shutdown. | +| https://github.com/reserve-protocol/protocol/pull/896 | M-01 | Removes `CurveVolatileCollateral`. | +| https://github.com/reserve-protocol/protocol/pull/889 | M-02 | Use decimals from underlying Comet. | +| https://github.com/reserve-protocol/protocol/pull/916 | M-03 | Acknowledged and documented. | +| https://github.com/reserve-protocol/protocol/pull/896 | M-04 | Roll over remainder to next call. | +| https://github.com/reserve-protocol/protocol/pull/896 | M-05 | Add call to `emergencyWithdraw`. | +| https://github.com/reserve-protocol/protocol/pull/917 | M-06 | Enforce (`0, FIX_MAX`) as "unpriced" during oracle timeout. | +| https://github.com/reserve-protocol/protocol/pull/917 | M-08 | Unpriced on oracle timeout. | +| https://github.com/reserve-protocol/protocol/pull/917 | M-09 | Enforce (`0, FIX_MAX`) as "unpriced" during oracle timeout. | + +### Out of Scope + +| URL | Mitigation of | Purpose | +| ----------- | ------------- | ----------- | +| | M-07 | Acknowledged. See details in [comment](https://github.com/code-423n4/2023-07-reserve-findings/issues/24#issuecomment-1670250237). | +| https://github.com/reserve-protocol/protocol/pull/896 | M-10 | Acknowledged, documented. | +| https://github.com/reserve-protocol/protocol/pull/920 | M-11 | Acknowledged. Details in [comment](https://github.com/code-423n4/2023-07-reserve-findings/issues/12#issuecomment-1695841823). | +| https://github.com/reserve-protocol/protocol/pull/920 | M-12 | Acknowledged. Details in [comment](https://github.com/code-423n4/2023-07-reserve-findings/issues/10#issuecomment-1701397555). | +| | M-13 | Acknowledged. Details in [comment](https://github.com/code-423n4/2023-07-reserve-findings/issues/8#issuecomment-1688439465). | +| | M-14 | Acknowledged. Details in [comment](https://github.com/code-423n4/2023-07-reserve-findings/issues/7#issuecomment-1695796001). | +| | M-15 | Acknowledged. Details in [comment](https://github.com/code-423n4/2023-07-reserve-findings/issues/4#issuecomment-1695841054). | + +## Mitigation Review Summary + +| Original Issue | Status | Full Details | + | --- | --- | --- | + | [H-01](https://github.com/code-423n4/2023-07-reserve-findings/issues/23) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/20), [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/3) and [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/2) | +| [H-02](https://github.com/code-423n4/2023-07-reserve-findings/issues/22) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/21), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/27) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/4) | +| [H-03](https://github.com/code-423n4/2023-07-reserve-findings/issues/11) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/22), [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/5) and [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/29) | +| [M-01](https://github.com/code-423n4/2023-07-reserve-findings/issues/45) | 🟢 Mitigation Confirmed | Reports from [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/28), [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/23) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/6) | +| [M-02](https://github.com/code-423n4/2023-07-reserve-findings/issues/39) | 🟢 Mitigation Confirmed | Reports from [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/30), [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/24) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/7) | +| [M-03](https://github.com/code-423n4/2023-07-reserve-findings/issues/31) | 🟢 Mitigation Confirmed | Reports from [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/8), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/31) and [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/25) | +| [M-04](https://github.com/code-423n4/2023-07-reserve-findings/issues/30) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/36), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/9) | +| [M-05](https://github.com/code-423n4/2023-07-reserve-findings/issues/27) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/40), [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/13) and [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/32) | +| [M-06](https://github.com/code-423n4/2023-07-reserve-findings/issues/25) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/37), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/33) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/10) | +| [M-08](https://github.com/code-423n4/2023-07-reserve-findings/issues/21) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/38), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/34) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/11) | +| [M-09](https://github.com/code-423n4/2023-07-reserve-findings/issues/20) | 🟢 Mitigation Confirmed | Reports from [ronnyx2017](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/39), [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/35) and [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/12) | + +**There were also 3 new Medium severity issues surfaced by the wardens. See below for details regarding the new issues.** + +## [`getReward()` is not called after shutdown, which could lead to incorrect reward accumulation](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/5) +*Submitted by [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/5)* + +**Severity: Medium** + +In the previous implementation, after shutdown, checkpoints are stopped +`reward.reward_integral_for[user]`. No updates resulted in new users getting more rewards and possible theft of rewards. + +### Mitigation + +PR 930 + +Modify that `checkpoints` are already executed, not just calling `IRewardStaking(convexPool).getReward(address(this), true);` the mitigation resolved the original issue. + +### Suggestion + +By not calling `convexPool.getReward()`, there is a slight loss of rewards for transferred users. The feeling is that there is no need to ignore this call, `convexPool.getReward()`, just don't revert if shutdown. + +**[cccz (judge) commented](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/5#issuecomment-1757630366):** +> `getReward()` is not called after shutdown, which could lead to incorrect reward accumulation. +> Consider the simple scenario where Alice is the only depositor. +> 1. Alice deposits 1000 tokens. +> 2. 100 reward tokens are generated, Alice claims the reward, `convexPool.getReward()` is called, and Alice receives 100 reward tokens. +> 3. Another 100 reward tokens are generated, and the owner shuts down the Wrapper. +> 4. Alice executes `withdraw(1000)`. Since `convexPool.getReward()` is not triggered, their accumulated rewards will not be increased, but the balance will be changed to 0. So `another 100 reward tokens are generated` will be lost. + +*** + +## [Rewards can be incorrectly distributed due to rounding rollover](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19) +*Submitted by [RaymondFam](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19), also found by [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/9)* + +**Severity: Medium** + +### Lines of code + +https://github.com/reserve-protocol/protocol/blob/9ee60f142f9f5c1fe8bc50eef915cf33124a534f/contracts/plugins/assets/erc20/RewardableERC20.sol#L86 + + +### Impact + +The previously identified vulnerability of potential rounding issues during reward calculations has not been fully mitigated. The current strategy to keep remainders and use them in subsequent `_claimAndSyncRewards()` calls does not adequately address the issue when the `rewardToken` has a decimal smaller than 6 and/or the total reward tokens entailed is much smaller. This could lead to significant truncation losses as the remainder rolls over until it's large enough to overcome truncation and unfairly disadvantaging users; particularly those exiting the investment earlier, as they would miss out on a sizable amount of reward. This rounding issue, if left unresolved, can erode trust and potentially open up the system to arbitrage opportunities, further exacerbating the loss of rewards for regular users. + +### Proof of Concept + +**Scenario:** + +Let's assume `rewardToken` still has 6 decimals but there are only 0.5 million `rewardToken` to be distributed for the year and `_claimAndSyncRewards()` is called every minute. And, `totalSupply = 10^6` with 18 decimals. + +The expected rewards for 1 min are `500000 / 365 / 24 / 60 = 0.95 rewardToken = 950000 wei`. + +Initially, assume `balanceAfterClaimingRewards = 1950000` (wei), and `_previousBalance = 1000000` (wei), making `delta = 950000` (wei). + +`deltaPerShare` will be calculated as: `(950000 * 10^18) / (10^6 * 10^18) = 0` + +Now, `balanceAfterClaimingRewards` is updated to: `previous balance + (deltaPerShare * totalSupply / one) += 1000000 + (0 * (10^6 * 10^18) / 10^18) += 1000000 + 0 = 1000000 (wei) ` + +As illustrated, the truncation issue causes `deltaPerShare` to equal `0`. This will lead to a scenario where the rewards aren't distributed accurately among users; particularly affecting those who exit earlier before the remainder becomes large enough to surpass truncation. + +In a high-frequency scenario where `_claimAndSyncRewards` is invoked often, users could miss out on a significant portion of rewards, showcasing the inadequacy of the proposed mitigation in handling the rounding loss effectively. + +### Mitigation + +Using a bigger multiplier as the original report suggested seems viable, but finding a suitably discrete factor could be tricky. + +While keeping the current change per [PR #896](https://github.com/reserve-protocol/protocol/pull/896), I suggest adding another step by normalizing both `delta` and `_totalSupply` to `PRICE_DECIMALS`, i.e. 18, which will greatly minimize the prolonged remainder rollover. The intended decimals may be obtained by undoing the normalization when needed. Here are the two useful functions (assuming `decimals` is between 1 to 18) that could help handle the issue, but it will require further code refactoring on `_claimAndSyncRewards()` and `_syncAccount()`. + +```solidity + /// @dev Convert decimals of the value to price decimals + function _toPriceDecimals(uint128 _value, uint8 decimals, address liquidityPool) + internal + view + returns (uint256 value) + { + if (PRICE_DECIMALS == decimals) return uint256(_value); + value = uint256(_value) * 10 ** (PRICE_DECIMALS - decimals); + } + + /// @dev Convert decimals of the value from the price decimals back to the intended decimals + function _fromPriceDecimals(uint256 _value, uint8 decimals, address liquidityPool) + internal + view + returns (uint128 value) + { + if (PRICE_DECIMALS == decimals) return _toUint128(_value); + value = _toUint128(_value / 10 ** (PRICE_DECIMALS - decimals)); + } +``` + +### Assessed type + +Decimal + +**[ronnyx2017 (warden) commented](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19#issuecomment-1751948354):** +>``` +> deltaPerShare will be calculated as: (950000 * 10^18) / (10^6 * 10^18) = 0 +> ``` +> It's based on `uint256 deltaPerShare = (delta * one) / _totalSupply;` and `uint256 delta = balanceAfterClaimingRewards - _previousBalance;`. +> +> But the `delta` is not always `950000`. It will accumulate over time because the `lastRewardBalance = balanceAfterClaimingRewards = _previousBalance + (deltaPerShare * _totalSupply) / one `. +> +> So the max loss will be less than `10^6` wei - is my understanding, correct? Have I missed anything? + +**[bin3chen (warden) commented](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19#issuecomment-1751982030):** +> My personal understanding is that this is an acceptable simple solution. +> +> See mitigation description for details in [Issue `#9`](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/9): +> +> ``` +> This is a simple way to fix. Some rewards might be locked inside the contract. But it's not fair to the user that the rewards should be allocated to the next time. The next totalSupply would be different. +> A more reasonable approach would be to increase the precision, e.g. by using decimals = 27. But the implementation requires more modifications +> ``` + +**[RaymondFam (warden) commented](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19#issuecomment-1752018998):** +> The rollover issue could be quite pronounced/prolonged if all of the factors below were to kick in together: +> +> A much smaller numerator than anticipated due to: +> 1. e.g. 10k `rewardToken` to be distributed for the year +> 2. A much smaller decimal (1 - 5) associated with `rewardToken` +> +> A much bigger denominator than anticipated due to a bigger `totalSupply` entailed say in tens of millions or even larger. + +**[cccz (judge) commented](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/19#issuecomment-1752358388):** +> According to the Mitigation Review Guidelines, I'm inclined to consider this a new issue. +> +> [The original issue](https://github.com/code-423n4/2023-07-reserve-findings/issues/30) causes rewards to be locked in contract, and the mitigation solves it, but introduces the new issue of rewards being incorrectly distributed. +> +> The potential loss caused by this issue is related to the supply and price of deposit token and the decimals and price of the reward token. +> +> In the extreme case where the deposit token is SHIB and the reward token is WBTC (8 decimals), the loss may be unacceptable (1 WBTC reward for per 700 USD SHIB loss). + +*** + +## [User token locked due to `StargateRewardableWrapper` no longer being able to execute `StargateRewardableWrapper.withdraw()`](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/13) +*Submitted by [bin2chen](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/13)* + +In the previous implementation, when `stakingContract.totalAllocPoint = 0` `stakingContract.withdraw()` and `stakingContract.deposit()` will div 0 , `revert`. This results in `StargateRewardableWrapper` no longer being able to execute `StargateRewardableWrapper.withdraw()`, as the user's token is locked. + +### Mitigation + +[PR 896](https://github.com/reserve-protocol/protocol/pull/896) + +Determine if `poolInfo.allocPoint` is equal to `0`. If equal to `0`, use `stakingContract.emergencyWithdraw()` instead of `stakingContract.deposit()` to avoid reverting. The mitigation resolved the original issue. + + +### Suggestion + +Since `allocPoint==0` is used instead of `totalAllocPoint==0`, there may be a case where `allocPoint == 0` but `totalAllocPoint> 0`. However, the modified version still uses `stakingContract.emergencyWithdraw()`, which discards all rewards. It is recommended that if `totalAllocPoint> 0`, we can execute the +`stakingContract.deposit(0)` to retrieve the reward first, then execute `stakingContract.emergencyWithdraw()`. + +**[bin2chen (warden) commented](https://github.com/code-423n4/2023-09-reserve-mitigation-findings/issues/13#issuecomment-1754154795):** +> This problem is due to use `allocPoint==0` is used instead of `totalAllocPoint==0`. Some of the rewards are lost in this scenario. +> +> Assumption: +> +> The current: `poolInfo.allocPoint = 50`, `totalAllocPoint = 100` (have another pool). +> 1. After a certain period of time, `poolInfo.pendingRewards = 100`. +> 2. `stakingContract.set()` changes `poolInfo.allocPoint = 0`, but `totalAllocPoint` is still `50`. (`set()` will trigger accumulation pending rewards first). +> 3. `StargateRewardableWrapper.claim()` -> `stakingContract.emergencyWithdraw()` will discard any pending rewards. +> +> In step 3, if `totalAllocPoint > 0`, we can use `stakingContract.deposit(0)` to retrieve the pending rewards first, then +call `stakingContract.emergencyWithdraw()` to avoid discarding the `pendingRewards`. + +*** + +# Disclosures + +C4 is an open organization governed by participants in the community. + +C4 Audits incentivize the discovery of exploits, vulnerabilities, and bugs in smart contracts. Security researchers are rewarded at an increasing rate for finding higher-risk issues. Audit submissions are judged by a knowledgeable security researcher and solidity developer and disclosed to sponsoring developers. C4 does not conduct formal verification regarding the provided code but instead provides final verification. + +C4 does not provide any guarantee or warranty regarding the security of this project. All smart contract software should be used at the sole risk and responsibility of users. diff --git a/audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md b/audits/Code4rena - Reserve Audit Report - Release 3.0.0 (core).md similarity index 97% rename from audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md rename to audits/Code4rena - Reserve Audit Report - Release 3.0.0 (core).md index 396da93633..5247746a86 100644 --- a/audits/Code4rena - Reserve Audit Report - 3.0.0 Release.md +++ b/audits/Code4rena - Reserve Audit Report - Release 3.0.0 (core).md @@ -1,7 +1,7 @@ --- sponsor: "Reserve" slug: "2023-06-reserve" -date: "2023-09-⭕" # the date this report is published to the C4 website +date: "2023-11-13" title: "Reserve Protocol - Invitational" findings: "https://github.com/code-423n4/2023-06-reserve-findings/issues" contest: 248 @@ -46,6 +46,10 @@ All of the issues presented here are linked back to their original finding. The code under review can be found within the [C4 Reserve Protocol repository](https://github.com/code-423n4/2023-06-reserve), and is composed of 12 smart contracts written in the Solidity programming language and includes 2126 lines of Solidity code. +In addition to the known issues identified by the project team, the C4udit tool was ran prior to the audit launch. This generated the [Automated Findings report](https://gist.github.com/carlitox477/35963b3c46ebd25927c41ce368b8e10c) and all findings therein were classified as out of scope. + +*Note: the automated findings report also included [one medium-severity finding](https://gist.github.com/carlitox477/35963b3c46ebd25927c41ce368b8e10c#M-1) that has been acknowledged by the sponsor and confirmed by the judge.* + # Severity Criteria C4 assesses the severity of disclosed vulnerabilities based on three primary risk categories: high, medium, and low/non-critical. @@ -477,7 +481,7 @@ Add claimRewardsSingle when refresh assert in the `manageToken`. **[tbrent (Reserve) disputed and commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/16#issuecomment-1588019948):** - > This is similar to an (unmitigated) issue from an earlier contest: https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/22 + > This is similar to an (unmitigated) issue from an earlier audit: https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/22 > > However in this case it has to do with `RevenueTraderP1.manageToken()`, as opposed to `BackingManagerP1.manageTokens()`. > @@ -933,9 +937,9 @@ On top of checking that the error data is empty, compare the gas before and afte **[0xA5DF (warden) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1662876091):** > Hey - It's a bit difficult to track deprecated Chainlink oracles since Chainlink removes the announcement once they're deprecated.
-> I was able to track one Oracle that was deprecated during the first contest, from the original issue this seems to be [this one](https://polygonscan.com/address/0x2E5B04aDC0A3b7dB5Fd34AE817c7D0993315A8a6#readContract#F10).
+> I was able to track one Oracle that was deprecated during the first audit, from the original issue this seems to be [this one](https://polygonscan.com/address/0x2E5B04aDC0A3b7dB5Fd34AE817c7D0993315A8a6#readContract#F10).
> It seems that what happens is that Chainlink sets the aggregator address to the zero address, which makes the call to `latestRoundData()` to revert without any data (I guess this is due to the way Solidity handles calls to a non-contract address).
-> See also the PoC in the [original issue](https://github.com/code-423n4/2023-01-reserve-findings/issues/234) in the January contest. +> See also the PoC in the [original issue](https://github.com/code-423n4/2023-01-reserve-findings/issues/234) in the January audit. **[tbrent (Reserve) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/8#issuecomment-1662939816):** > Got it, checks out. Thanks! @@ -955,7 +959,7 @@ On top of checking that the error data is empty, compare the gas before and afte
-At the mitigation contest there was an issue regarding the `basketHandler.quantity()` call at the unregistration process taking up all gas. +At the mitigation audit there was an issue regarding the `basketHandler.quantity()` call at the unregistration process taking up all gas. As a mitigation to that issue the devs set aside some gas and use the remaining to do that call. This opens up to a new kind of attack, where a attacker can cause the call to revert by not supplying enough gas to it. @@ -1005,12 +1009,12 @@ Reserve gas for the call as well: } ``` -Disclosure: this issue was [mentioned in the comments](https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/73#issuecomment-1435483929) to the issue in the mitigation contest; however, since this wasn't noticed by the devs and isn't part of the submission, I don't think this should be considered a known issue. +Disclosure: this issue was [mentioned in the comments](https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/73#issuecomment-1435483929) to the issue in the mitigation audit; however, since this wasn't noticed by the devs and isn't part of the submission, I don't think this should be considered a known issue. **[0xean (judge) commented](https://github.com/code-423n4/2023-06-reserve-findings/issues/7#issuecomment-1586332703):** > Applaud @0xA5DF for highlighting this on their own issue. > -> > *Disclosure: this issue was [mentioned in the comments](https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/73#issuecomment-1435483929) to the issue in the mitigation contest, however since this wasn't noticed by the devs and isn't part of the submission I don't think this should be considered a known issue* +> > *Disclosure: this issue was [mentioned in the comments](https://github.com/code-423n4/2023-02-reserve-mitigation-contest-findings/issues/73#issuecomment-1435483929) to the issue in the mitigation audit, however since this wasn't noticed by the devs and isn't part of the submission I don't think this should be considered a known issue* > > Look forward to discussion with sponsor. @@ -1481,7 +1485,8 @@ Context **[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20#issuecomment-1692159329):** > Anticipating restricting governance to only be able to _enable_ batch trade, or dutch trade. - +**[pmckelvy1 (Reserve) commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/20#issuecomment-1803002105):** +> Implemented [here](https://github.com/reserve-protocol/protocol/blob/master/contracts/p1/Broker.sol#L211) and [here](https://github.com/reserve-protocol/protocol/blob/master/contracts/p1/Broker.sol#L217). *** @@ -1500,7 +1505,8 @@ Mitigation might be to create violation report only if the price is high and the **[tbrent (Reserve) confirmed](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40#issuecomment-1692064874)** - +**[pmckelvy1 (Reserve) commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/40#issuecomment-1803002833):** +> Fixed [here](https://github.com/reserve-protocol/protocol/blob/master/contracts/p1/Broker.sol#L142) - only rebalancing trades can disable dutch trades in this manner. *** @@ -1518,8 +1524,10 @@ Fully mitigating the issue might not be possible, as it’d require to send from **[tbrent (Reserve) confirmed and commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36#issuecomment-1692078866):** > Anticipating adding a try-catch at the start of `setDistribution()` targeting `RevenueTrader.distributeTokenToBuy()` - - +**[pmckelvy1 (Reserve) commented](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/36#issuecomment-1803003171):** +> > Anticipating adding a try-catch at the start of `setDistribution()` targeting `RevenueTrader.distributeTokenToBuy()` +> +> Added [here](https://github.com/reserve-protocol/protocol/blob/3.1.0/contracts/p1/Distributor.sol#L59). *** ## [M-04 Mitigation Error: Furnace would melt less than intended](https://github.com/code-423n4/2023-08-reserve-mitigation-findings/issues/37) diff --git a/audits/Code4rena Reserve Audit Report.md b/audits/Code4rena Reserve Audit Report - Release 2.1.0.md similarity index 100% rename from audits/Code4rena Reserve Audit Report.md rename to audits/Code4rena Reserve Audit Report - Release 2.1.0.md From 3ae2f07ad064f33bab63af72667db56a0d2c82b4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 5 Dec 2023 19:00:58 -0500 Subject: [PATCH 149/450] floor yearn V2 refPerTok() to be consistent with rest of plugins --- contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 9121982562..8e967f865d 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -91,7 +91,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view virtual override returns (uint192) { // {ref/tok} = {ref/LP token} * {LP token/tok} - return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare()); + return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare(), FLOOR); } /// @return {LP token/tok} From 2d3dc5b8f646d8835bfafa3f950919c5fbfc8bb6 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 4 Dec 2023 20:28:00 -0500 Subject: [PATCH 150/450] fix deployment --- scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts index 1510377f20..600505d84e 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { SFraxCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -53,7 +53,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% erc20: networkConfig[chainId].tokens.sFRAX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% = 1% oracleError + 1% buffer delayUntilDefault: bn('86400').toString(), // 24h From ee0a81f755625536b0bf7e79afefa8dc657e60e8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 4 Dec 2023 20:29:56 -0500 Subject: [PATCH 151/450] fix mainnet integration tests --- .../individual-collateral/frax/SFraxCollateralTestSuite.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index cf4038f9aa..43d09c95be 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,6 +193,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it.skip, From 5770411aba3d5c304ae24c918cbc99780eb6c9a2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 5 Dec 2023 19:00:58 -0500 Subject: [PATCH 152/450] floor yearn V2 refPerTok() to be consistent with rest of plugins --- contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 9121982562..8e967f865d 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -91,7 +91,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view virtual override returns (uint192) { // {ref/tok} = {ref/LP token} * {LP token/tok} - return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare()); + return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare(), FLOOR); } /// @return {LP token/tok} From 93699a49c816f3e3acb80cb82f3d4984d376695a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 15 Dec 2023 11:09:04 -0500 Subject: [PATCH 153/450] Add ability to reweight target basket (#1022) --- CHANGELOG.md | 18 ++++++ common/configuration.ts | 1 + contracts/interfaces/IBasketHandler.sol | 6 +- contracts/interfaces/IDeployer.sol | 1 + contracts/p0/BasketHandler.sol | 16 +++++- contracts/p0/Deployer.sol | 2 +- contracts/p1/BasketHandler.sol | 35 +++++++++--- contracts/p1/Deployer.sol | 2 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- test/Main.test.ts | 62 ++++++++++----------- test/Upgradeability.test.ts | 2 +- test/fixtures.ts | 1 + test/integration/fixtures.ts | 1 + 13 files changed, 99 insertions(+), 50 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fa4815b9e..85e47bec94 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,23 @@ # Changelog +# 3.2.0 + +This release gives new RTokens being deployed the option to enable a variable target basket, or to be "reweightable". An RToken that is not reweightable cannot have its target basket changed in terms of quantities of target units. + +### Upgrade Steps + +Upgrade BasketHandler + +### Core Protocol Contracts + +New governance param added to `DeploymentParams`: `reweightable` + +- `BasketHandler` [+1 slot] + - Add concept of a reweightable basket: a basket that can have its target amounts (once grouped by target unit) changed + - Add immutable-after-init `reweightable` bool +- `Deployer` + - New boolean field `reweightable` added to `IDeployer.DeploymentParams` + # 3.1.0 - Unreleased ### Upgrade Steps -- Required diff --git a/common/configuration.ts b/common/configuration.ts index 0bd5d8ff2e..8aec5837da 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -592,6 +592,7 @@ export interface IConfig { unstakingDelay: BigNumber withdrawalLeak: BigNumber warmupPeriod: BigNumber + reweightable: boolean tradingDelay: BigNumber batchAuctionLength: BigNumber dutchAuctionLength: BigNumber diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index 2ed829d1b9..b835ddc683 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -49,7 +49,11 @@ interface IBasketHandler is IComponent { event BasketStatusChanged(CollateralStatus oldStatus, CollateralStatus newStatus); // Initialization - function init(IMain main_, uint48 warmupPeriod_) external; + function init( + IMain main_, + uint48 warmupPeriod_, + bool reweightable_ + ) external; /// Set the prime basket /// @param erc20s The collateral tokens for the new prime basket diff --git a/contracts/interfaces/IDeployer.sol b/contracts/interfaces/IDeployer.sol index 18c1cc4ddc..d811aef2ec 100644 --- a/contracts/interfaces/IDeployer.sol +++ b/contracts/interfaces/IDeployer.sol @@ -38,6 +38,7 @@ struct DeploymentParams { // // === BasketHandler === uint48 warmupPeriod; // {s} how long to wait until issuance/trading after regaining SOUND + bool reweightable; // whether the basket can change in value // // === BackingManager === uint48 tradingDelay; // {s} how long to wait until starting auctions after switching basket diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 998c25e65f..bb32ffad23 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -116,7 +116,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight // config is the basket configuration, from which basket will be computed in a basket-switch - // event. config is only modified by governance through setPrimeBakset and setBackupConfig + // event. config is only modified by governance through setPrimeBasket and setBackupConfig BasketConfig private config; // basket, disabled, nonce, and timestamp are only ever set by `_switchBasket()` @@ -148,6 +148,9 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // A history of baskets by basket nonce; includes current basket mapping(uint48 => Basket) private basketHistory; + // Whether the total weights of the target basket can be changed + bool public reweightable; // immutable after init + // ==== Invariants ==== // basket is a valid Basket: // basket.erc20s is a valid collateral array and basket.erc20s == keys(basket.refAmts) @@ -158,10 +161,15 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // if basket.erc20s is empty then disabled == true // BasketHandler.init() just leaves the BasketHandler state zeroed - function init(IMain main_, uint48 warmupPeriod_) external initializer { + function init( + IMain main_, + uint48 warmupPeriod_, + bool reweightable_ + ) external initializer { __Component_init(main_); setWarmupPeriod(warmupPeriod_); + reweightable = reweightable_; // immutable thereafter // Set last status to DISABLED (default) lastStatus = CollateralStatus.DISABLED; @@ -245,7 +253,9 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { requireValidCollArray(erc20s); // If this isn't initial setup, require targets remain constant - if (config.erc20s.length > 0) requireConstantConfigTargets(erc20s, targetAmts); + if (!reweightable && config.erc20s.length > 0) { + requireConstantConfigTargets(erc20s, targetAmts); + } // Clean up previous basket config for (uint256 i = 0; i < config.erc20s.length; ++i) { diff --git a/contracts/p0/Deployer.sol b/contracts/p0/Deployer.sol index c143ec9d62..b44e11a94d 100644 --- a/contracts/p0/Deployer.sol +++ b/contracts/p0/Deployer.sol @@ -95,7 +95,7 @@ contract DeployerP0 is IDeployer, Versioned { ); // Init Basket Handler - main.basketHandler().init(main, params.warmupPeriod); + main.basketHandler().init(main, params.warmupPeriod, params.reweightable); // Init Revenue Traders main.rsrTrader().init(main, rsr, params.maxTradeSlippage, params.minTradeVolume); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index fa076253bd..db22162a74 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -79,6 +79,12 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Effectively local variable of `requireConstantConfigTargets()` EnumerableMap.Bytes32ToUintMap private _targetAmts; // targetName -> {target/BU} + // === + // Added in 3.2.0 + + // Whether the total weights of the target basket can be changed + bool public reweightable; // immutable after init + // === // ==== Invariants ==== @@ -91,7 +97,11 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // if basket.erc20s is empty then disabled == true // BasketHandler.init() just leaves the BasketHandler state zeroed - function init(IMain main_, uint48 warmupPeriod_) external initializer { + function init( + IMain main_, + uint48 warmupPeriod_, + bool reweightable_ + ) external initializer { __Component_init(main_); assetRegistry = main_.assetRegistry(); @@ -101,6 +111,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { stRSR = main_.stRSR(); setWarmupPeriod(warmupPeriod_); + reweightable = reweightable_; // immutable thereafter // Set last status to DISABLED (default) lastStatus = CollateralStatus.DISABLED; @@ -174,16 +185,16 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // config'.erc20s = erc20s // config'.targetAmts[erc20s[i]] = targetAmts[i], for i from 0 to erc20s.length-1 // config'.targetNames[e] = assetRegistry.toColl(e).targetName, for e in erc20s - function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) - external - governance - { + function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external { + requireGovernanceOnly(); require(erc20s.length > 0, "empty basket"); require(erc20s.length == targetAmts.length, "len mismatch"); requireValidCollArray(erc20s); // If this isn't initial setup, require targets remain constant - if (config.erc20s.length > 0) requireConstantConfigTargets(erc20s, targetAmts); + if (!reweightable && config.erc20s.length > 0) { + requireConstantConfigTargets(erc20s, targetAmts); + } // Clean up previous basket config for (uint256 i = 0; i < config.erc20s.length; ++i) { @@ -224,7 +235,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { bytes32 targetName, uint256 max, IERC20[] calldata erc20s - ) external governance { + ) external { + requireGovernanceOnly(); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; @@ -507,7 +519,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // === Governance Setters === /// @custom:governance - function setWarmupPeriod(uint48 val) public governance { + function setWarmupPeriod(uint48 val) public { + requireGovernanceOnly(); require(val >= MIN_WARMUP_PERIOD && val <= MAX_WARMUP_PERIOD, "invalid warmupPeriod"); emit WarmupPeriodSet(warmupPeriod, val); warmupPeriod = val; @@ -515,6 +528,10 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // === Private === + // contract-size-saver + // solhint-disable-next-line no-empty-blocks + function requireGovernanceOnly() private governance {} + /// Select and save the next basket, based on the BasketConfig and Collateral statuses function _switchBasket() private { // Mark basket disabled. Pause most protocol functions unless there is a next basket @@ -673,5 +690,5 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[37] private __gap; + uint256[36] private __gap; } diff --git a/contracts/p1/Deployer.sol b/contracts/p1/Deployer.sol index 2119420e43..a962b2efe8 100644 --- a/contracts/p1/Deployer.sol +++ b/contracts/p1/Deployer.sol @@ -183,7 +183,7 @@ contract DeployerP1 is IDeployer, Versioned { ); // Init Basket Handler - components.basketHandler.init(main, params.warmupPeriod); + components.basketHandler.init(main, params.warmupPeriod, params.reweightable); // Init Revenue Traders components.rsrTrader.init(main, rsr, params.maxTradeSlippage, params.minTradeVolume); diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index b36945769d..4b241f6ef3 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.1.0"; +string constant ASSET_VERSION = "3.2.0"; /** * @title VersionedAsset diff --git a/test/Main.test.ts b/test/Main.test.ts index 9d00c3b0a6..452f7bc1be 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -370,9 +370,9 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('Initializable: contract is already initialized') // Attempt to reinitialize - Basket Handler - await expect(basketHandler.init(main.address, config.warmupPeriod)).to.be.revertedWith( - 'Initializable: contract is already initialized' - ) + await expect( + basketHandler.init(main.address, config.warmupPeriod, config.reweightable) + ).to.be.revertedWith('Initializable: contract is already initialized') // Attempt to reinitialize - Distributor await expect(distributor.init(main.address, config.dist)).to.be.revertedWith( @@ -1689,31 +1689,27 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { }) describe('Basket Handling', () => { - let freshBasketHandler: TestIBasketHandler // need to have both this and regular basketHandler around + let reweightableBH: TestIBasketHandler // need to have both this and regular basketHandler around let eurToken: ERC20Mock beforeEach(async () => { if (IMPLEMENTATION == Implementation.P0) { const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP0') - freshBasketHandler = ((await BasketHandlerFactory.deploy()) as unknown) + reweightableBH = ((await BasketHandlerFactory.deploy()) as unknown) } else if (IMPLEMENTATION == Implementation.P1) { const basketLib = await (await ethers.getContractFactory('BasketLibP1')).deploy() const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1', { libraries: { BasketLibP1: basketLib.address }, }) - freshBasketHandler = await upgrades.deployProxy( - BasketHandlerFactory, - [], - { - kind: 'uups', - unsafeAllow: ['external-library-linking'], // BasketLibP1 - } - ) + reweightableBH = await upgrades.deployProxy(BasketHandlerFactory, [], { + kind: 'uups', + unsafeAllow: ['external-library-linking'], // BasketLibP1 + }) } else { throw new Error('PROTO_IMPL must be set to either `0` or `1`') } - await freshBasketHandler.init(main.address, config.warmupPeriod) + await reweightableBH.init(main.address, config.warmupPeriod, config.reweightable) eurToken = await (await ethers.getContractFactory('ERC20Mock')).deploy('EURO Token', 'EUR') const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( @@ -1735,7 +1731,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket if not OWNER', async () => { await expect( - freshBasketHandler.connect(other).setPrimeBasket([token0.address], [fp('1')]) + reweightableBH.connect(other).setPrimeBasket([token0.address], [fp('1')]) ).to.be.revertedWith('governance only') await expect( basketHandler.connect(other).setPrimeBasket([token0.address], [fp('1')]) @@ -1744,7 +1740,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with invalid length', async () => { await expect( - freshBasketHandler.connect(owner).setPrimeBasket([token0.address], []) + reweightableBH.connect(owner).setPrimeBasket([token0.address], []) ).to.be.revertedWith('len mismatch') await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], []) @@ -1756,13 +1752,13 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { basketHandler.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) ).to.be.revertedWith('erc20 is not collateral') await expect( - freshBasketHandler.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) + reweightableBH.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) ).to.be.revertedWith('erc20 is not collateral') }) it('Should not allow to set prime Basket with duplicate ERC20s', async () => { await expect( - freshBasketHandler + reweightableBH .connect(owner) .setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) ).to.be.revertedWith('contains duplicates') @@ -1775,7 +1771,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with 0 address tokens', async () => { await expect( - freshBasketHandler.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) + reweightableBH.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( basketHandler.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) @@ -1784,7 +1780,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with stRSR', async () => { await expect( - freshBasketHandler.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) + reweightableBH.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( basketHandler.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) @@ -1794,26 +1790,26 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to bypass MAX_TARGET_AMT', async () => { // not possible on non-fresh basketHandler await expect( - freshBasketHandler.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) + reweightableBH.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) ).to.be.revertedWith('invalid target amount; too large') }) it('Should not allow to increase prime Basket weights', async () => { - // not possible on freshBasketHandler + // not possible on reweightableBH await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').add(1)]) ).to.be.revertedWith('new target weights') }) it('Should not allow to decrease prime Basket weights', async () => { - // not possible on freshBasketHandler + // not possible on reweightableBH await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').sub(1)]) ).to.be.revertedWith('missing target weights') }) it('Should not allow to set prime Basket with an empty basket', async () => { - await expect(freshBasketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( + await expect(reweightableBH.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( 'empty basket' ) await expect(basketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( @@ -1823,7 +1819,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with a zero amount', async () => { await expect( - freshBasketHandler.connect(owner).setPrimeBasket([token0.address], [0]) + reweightableBH.connect(owner).setPrimeBasket([token0.address], [0]) ).to.be.revertedWith('invalid target amount; must be nonzero') await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], [0]) @@ -1914,14 +1910,14 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with RSR/RToken', async () => { await expect( - freshBasketHandler.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) + reweightableBH.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( basketHandler.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( - freshBasketHandler + reweightableBH .connect(owner) .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) ).to.be.revertedWith('invalid collateral') @@ -2876,10 +2872,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await newColl.refresh() // Set basket with single collateral - await freshBasketHandler.connect(owner).setPrimeBasket([token2.address], [fp('1000')]) + await reweightableBH.connect(owner).setPrimeBasket([token2.address], [fp('1000')]) // Change basket - valid at this point - await freshBasketHandler.connect(owner).refreshBasket() + await reweightableBH.connect(owner).refreshBasket() // Set refPerTok = 1 await newColl.setRate(bn(1)) @@ -2887,20 +2883,20 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const newPrice: BigNumber = MAX_UINT192.div(bn('1e10')) await setOraclePrice(collateral2.address, newPrice.sub(newPrice.div(100))) // oracle error - const [lowPrice, highPrice] = await freshBasketHandler.price() + const [lowPrice, highPrice] = await reweightableBH.price() expect(lowPrice).to.equal(MAX_UINT192) expect(highPrice).to.equal(MAX_UINT192) }) it('Should handle overflow in price calculation and return [FIX_MAX, FIX_MAX] - case 2', async () => { // Set basket with single collateral - await freshBasketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1.1')]) - await freshBasketHandler.refreshBasket() + await reweightableBH.connect(owner).setPrimeBasket([token0.address], [fp('1.1')]) + await reweightableBH.refreshBasket() const newPrice: BigNumber = MAX_UINT192.div(bn('1e10')) await setOraclePrice(collateral0.address, newPrice.sub(newPrice.div(100))) // oracle error - const [lowPrice, highPrice] = await freshBasketHandler.price() + const [lowPrice, highPrice] = await reweightableBH.price() expect(lowPrice).to.equal(MAX_UINT192) expect(highPrice).to.equal(MAX_UINT192) }) diff --git a/test/Upgradeability.test.ts b/test/Upgradeability.test.ts index 0c94eec20c..bacd80f602 100644 --- a/test/Upgradeability.test.ts +++ b/test/Upgradeability.test.ts @@ -248,7 +248,7 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { it('Should deploy valid implementation - BasketHandler', async () => { const newBasketHandler: BasketHandlerP1 = await upgrades.deployProxy( BasketHandlerFactory, - [main.address, config.warmupPeriod], + [main.address, config.warmupPeriod, config.reweightable], { initializer: 'init', kind: 'uups', diff --git a/test/fixtures.ts b/test/fixtures.ts index 4b0a8e30fa..72d6eb4339 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -453,6 +453,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) + reweightable: false, tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) batchAuctionLength: bn('900'), // 15 minutes dutchAuctionLength: bn('1800'), // 30 minutes diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 206cfb2afe..ae65eaa450 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -648,6 +648,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) + reweightable: false, tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) batchAuctionLength: bn('900'), // 15 minutes dutchAuctionLength: bn('1800'), // 30 minutes From b467ce2b042650e762636f60daf4c8fcf0ac3b1b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 15 Dec 2023 16:04:23 -0500 Subject: [PATCH 154/450] Gas-optimization: remove unnecessary main.* calls (#1025) --- CHANGELOG.md | 6 +++++- contracts/p1/Distributor.sol | 18 +++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85e47bec94..3f2edd990b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ This release gives new RTokens being deployed the option to enable a variable ta ### Upgrade Steps -Upgrade BasketHandler +Upgrade BasketHandler and Distributor + +Call `Distributor.cacheComponents()` if this is the first upgrade to a >=3.0.0 token. ### Core Protocol Contracts @@ -17,6 +19,8 @@ New governance param added to `DeploymentParams`: `reweightable` - Add immutable-after-init `reweightable` bool - `Deployer` - New boolean field `reweightable` added to `IDeployer.DeploymentParams` +- `Distributor` + - Minor gas-optimization # 3.1.0 - Unreleased diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 776e19fe5a..6b1835bc9f 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -35,8 +35,8 @@ contract DistributorP1 is ComponentP1, IDistributor { IERC20 private rsr; IERC20 private rToken; - address private furnace; - address private stRSR; + IFurnace private furnace; + IStRSR private stRSR; address private rTokenTrader; address private rsrTrader; @@ -108,8 +108,8 @@ contract DistributorP1 is ComponentP1, IDistributor { Transfer[] memory transfers = new Transfer[](destinations.length()); uint256 numTransfers; - address furnaceAddr = furnace; // gas-saver - address stRSRAddr = stRSR; // gas-saver + address furnaceAddr = address(furnace); // gas-saver + address stRSRAddr = address(stRSR); // gas-saver bool accountRewards = false; @@ -144,9 +144,9 @@ contract DistributorP1 is ComponentP1, IDistributor { // Perform reward accounting if (accountRewards) { if (isRSR) { - main.stRSR().payoutRewards(); + stRSR.payoutRewards(); } else { - main.furnace().melt(); + furnace.melt(); } } } @@ -176,7 +176,7 @@ contract DistributorP1 is ComponentP1, IDistributor { function _setDistribution(address dest, RevenueShare memory share) internal { require(dest != address(0), "dest cannot be zero"); require( - dest != furnace && dest != stRSR, + dest != address(furnace) && dest != address(stRSR), "destination can not be furnace or strsr directly" ); if (dest == FURNACE) require(share.rsrDist == 0, "Furnace must get 0% of RSR"); @@ -205,8 +205,8 @@ contract DistributorP1 is ComponentP1, IDistributor { function cacheComponents() public { rsr = main.rsr(); rToken = IERC20(address(main.rToken())); - furnace = address(main.furnace()); - stRSR = address(main.stRSR()); + furnace = main.furnace(); + stRSR = main.stRSR(); rTokenTrader = address(main.rTokenTrader()); rsrTrader = address(main.rsrTrader()); } From 25e3598c35ff634244eb5421650646826288af27 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Mon, 8 Jan 2024 17:45:59 -0500 Subject: [PATCH 155/450] cleanup slithering, add pipeline job. (#1024) --- .github/workflows/tests.yml | 14 ++++++++++++++ contracts/facade/FacadeAct.sol | 2 ++ contracts/facade/FacadeRead.sol | 2 ++ contracts/facade/FacadeTest.sol | 2 ++ contracts/facade/FacadeWrite.sol | 2 ++ contracts/libraries/Fixed.sol | 2 ++ contracts/p1/RToken.sol | 2 ++ .../assets/aave-v3/vendor/interfaces/IERC4626.sol | 1 + .../plugins/assets/curve/crv/CurveGaugeWrapper.sol | 1 + .../assets/curve/cvx/vendor/ConvexInterfaces.sol | 1 + .../curve/cvx/vendor/ConvexStakingWrapper.sol | 4 ++++ contracts/vendor/oz/ERC4626.sol | 1 + contracts/vendor/oz/IERC4626.sol | 1 + docs/dev-env.md | 5 +++++ package.json | 2 +- 15 files changed, 41 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8c1d16e8da..7b553d57d7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -187,3 +187,17 @@ jobs: TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet + slither: + name: 'Slither' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - run: pip3 install solc-select slither-analyzer + - run: solc-select install 0.8.19 + - run: solc-select use 0.8.19 + - run: yarn slither diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 5622742421..3534a1fa62 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -15,6 +15,7 @@ import "../interfaces/IFacadeRead.sol"; * @notice A Facade to help batch compound actions that cannot be done from an EOA, solely. * Compatible with both 2.1.0 and ^3.0.0 RTokens. */ +// slither-disable-start contract FacadeAct is IFacadeAct, Multicall { using Address for address; using SafeERC20 for IERC20; @@ -286,3 +287,4 @@ contract FacadeAct is IFacadeAct, Multicall { revert("unrecognized version"); } } +// slither-disable-end diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 10f60d9182..eed25706aa 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -19,6 +19,7 @@ import "../p1/StRSRVotes.sol"; * Backwards-compatible with 2.1.0 RTokens with the exception of `redeemCustom()`. * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ +// slither-disable-start contract FacadeRead is IFacadeRead { using FixLib for uint192; @@ -421,3 +422,4 @@ contract FacadeRead is IFacadeRead { } } } +// slither-disable-end diff --git a/contracts/facade/FacadeTest.sol b/contracts/facade/FacadeTest.sol index d16c6ab6d3..512457c1b2 100644 --- a/contracts/facade/FacadeTest.sol +++ b/contracts/facade/FacadeTest.sol @@ -18,6 +18,7 @@ uint192 constant FIX_TWO = FIX_ONE * 2; * * @custom:static-call - Use ethers callStatic() in order to get result after update */ +// slither-disable-start contract FacadeTest is IFacadeTest { using FixLib for uint192; @@ -150,3 +151,4 @@ contract FacadeTest is IFacadeTest { } } } +// slither-disable-end diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index ed791cb244..27ea7fb321 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -9,6 +9,7 @@ import "./lib/FacadeWriteLib.sol"; * @notice A UX-friendly layer to interact with the protocol * @dev Under the hood, uses two external libs to deal with blocksize limits. */ +// slither-disable-start contract FacadeWrite is IFacadeWrite { using FacadeWriteLib for address; @@ -209,3 +210,4 @@ contract FacadeWrite is IFacadeWrite { main.renounceRole(OWNER, address(this)); } } +// slither-disable-end diff --git a/contracts/libraries/Fixed.sol b/contracts/libraries/Fixed.sol index de4e6c37b6..4daa221c5e 100644 --- a/contracts/libraries/Fixed.sol +++ b/contracts/libraries/Fixed.sol @@ -1,5 +1,6 @@ // SPDX-License-Identifier: BlueOak-1.0.0 // solhint-disable func-name-mixedcase func-visibility +// slither-disable-start divide-before-multiply pragma solidity ^0.8.19; /// @title FixedPoint, a fixed-point arithmetic library defining the custom type uint192 @@ -674,3 +675,4 @@ function fullMul(uint256 x, uint256 y) pure returns (uint256 hi, uint256 lo) { if (mm < lo) hi -= 1; } } +// slither-disable-end divide-before-multiply diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 77f15bef54..8b447d4273 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -210,6 +210,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { if (amounts[i] == 0) continue; // Send withdrawal + // slither-disable-next-line arbitrary-send-erc20 IERC20Upgradeable(erc20s[i]).safeTransferFrom( address(backingManager), recipient, @@ -319,6 +320,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { if (allZero) allZero = false; // Send withdrawal + // slither-disable-next-line arbitrary-send-erc20 IERC20Upgradeable(erc20s[i]).safeTransferFrom( address(backingManager), recipient, diff --git a/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol b/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol index 0444cac97b..4bca4cf28c 100644 --- a/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol +++ b/contracts/plugins/assets/aave-v3/vendor/interfaces/IERC4626.sol @@ -11,6 +11,7 @@ pragma solidity ^0.8.10; * * _Available since v4.7._ */ +//slither-disable-next-line name-reused interface IERC4626 { event Deposit(address indexed sender, address indexed owner, uint256 assets, uint256 shares); diff --git a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol index 4d712ac720..e4c893f024 100644 --- a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol +++ b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol @@ -4,6 +4,7 @@ pragma solidity ^0.8.19; import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "../../erc20/RewardableERC20Wrapper.sol"; +//slither-disable-next-line name-reused interface IMinter { /// Mint CRV to msg.sender based on their prorata share of the provided gauge function mint(address gaugeAddr) external; diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexInterfaces.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexInterfaces.sol index 0a8c00e155..5335f9a4e1 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexInterfaces.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexInterfaces.sol @@ -59,6 +59,7 @@ interface IVoting { function vote_for_gauge_weights(address, uint256) external; } +//slither-disable-next-line name-reused interface IMinter { function mint(address) external; } diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index 4d7b92ebac..250d5b63ae 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: MIT pragma solidity 0.6.12; pragma experimental ABIEncoderV2; +// slither-disable-start reentrancy-no-eth import "@openzeppelin/contracts-v0.7/math/SafeMath.sol"; import "@openzeppelin/contracts-v0.7/token/ERC20/IERC20.sol"; @@ -186,8 +187,10 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { registeredRewards[crv] = CRV_INDEX + 1; //mark registered at index+1 registeredRewards[cvx] = CVX_INDEX + 1; //mark registered at index+1 //send to self to warmup state + //slither-disable-next-line unchecked-transfer IERC20(crv).transfer(address(this), 0); //send to self to warmup state + //slither-disable-next-line unchecked-transfer IERC20(cvx).transfer(address(this), 0); } @@ -486,3 +489,4 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { _checkpoint([_from, _to]); } } +// slither-disable-end reentrancy-no-eth \ No newline at end of file diff --git a/contracts/vendor/oz/ERC4626.sol b/contracts/vendor/oz/ERC4626.sol index 958d06dee4..b4645d613d 100644 --- a/contracts/vendor/oz/ERC4626.sol +++ b/contracts/vendor/oz/ERC4626.sol @@ -247,6 +247,7 @@ abstract contract ERC4626 is ERC20, IERC4626 { // Conclusion: we need to do the transfer before we mint so that any reentrancy would happen before the // assets are transferred and before the shares are minted, which is a valid state. // slither-disable-next-line reentrancy-no-eth + // slither-disable-next-line arbitrary-send-erc20 SafeERC20.safeTransferFrom(_asset, caller, address(this), assets); _mint(receiver, shares); diff --git a/contracts/vendor/oz/IERC4626.sol b/contracts/vendor/oz/IERC4626.sol index e11727a727..0c2adaeb35 100644 --- a/contracts/vendor/oz/IERC4626.sol +++ b/contracts/vendor/oz/IERC4626.sol @@ -12,6 +12,7 @@ import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; * * _Available since v4.7._ */ +//slither-disable-next-line name-reused interface IERC4626 is IERC20, IERC20Metadata { event Deposit(address indexed sender, address indexed owner, uint256 assets, uint256 shares); diff --git a/docs/dev-env.md b/docs/dev-env.md index 3934dba202..02aec1e64b 100644 --- a/docs/dev-env.md +++ b/docs/dev-env.md @@ -106,3 +106,8 @@ We _have_ some tooling for testing with Echidna, but it is specically in `fuzz` ## Test Deployment See our [deployment documentation](deployment.md). + +## Slither Analysis + +The ToB Sliter tool is run on any pull request, and is expected to be checked by devs for any unexpected high or medium issues raised. + diff --git a/package.json b/package.json index c4c37617a1..ba1f2ec495 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "lint": "bash tools/lint && eslint test/", "prettier": "prettier --ignore-path .gitignore --loglevel warn --write \"./**/*.{js,ts,sol,json,md}\"", "size": "hardhat size-contracts", - "slither": "python3 tools/slither.py", + "slither": "python3 tools/slither.py --exclude-informational --exclude-low --exclude-optimization --exclude uninitialized-state-variables --fail-high", "prepare": "husky install", "run:backtests": "hardhat run scripts/ci_backtest_plugin.ts", "run:4byte": "hardhat run scripts/4byte.ts" From 71f60917f92cb6cd950079dc22220401a417a4fe Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 12 Jan 2024 17:11:01 -0300 Subject: [PATCH 156/450] TRUST-H4: Add additional comments (#1034) --- contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol | 9 ++++++++- .../curve/cvx/CvxStableTestSuite.test.ts | 2 -- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol index 19da4303f8..f69e5fdaf3 100644 --- a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol +++ b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol @@ -19,6 +19,13 @@ interface ILiquidityGauge { // Note: Only supports CRV rewards. If a Curve pool with multiple reward tokens is // used, other reward tokens beyond CRV will never be claimed and distributed to // depositors. These unclaimed rewards will be lost forever. + +// In addition to this, each wrapper deployment must be tested individually, regardless +// of the number of reward tokens it has. This contract is not compatible with all gauges +// and may revert depending on the Curve Gauge being used. For example, the +// `RewardsOnlyGauge` does not have a user_checkpoint() function, which means the +// MINTER.mint() call in this contract would revert in that case. + contract CurveGaugeWrapper is RewardableERC20Wrapper { using SafeERC20 for IERC20; @@ -48,7 +55,7 @@ contract CurveGaugeWrapper is RewardableERC20Wrapper { gauge.withdraw(_amount); } - // claim rewards - only supports CRV rewards + // claim rewards - only supports CRV rewards, may not work for all gauges function _claimAssetRewards() internal virtual override { MINTER.mint(address(gauge)); } diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 6ff50ba47f..8cbdd58345 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -9,7 +9,6 @@ import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { ERC20Mock, - IERC20, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -43,7 +42,6 @@ import { CRV, THREE_POOL_HOLDER, } from '../constants' -import { whileImpersonating } from '#/test/utils/impersonation' type Fixture = () => Promise From b2596de87f8f29246dbed52be477efe06be6e5e2 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 12 Jan 2024 17:11:40 -0300 Subject: [PATCH 157/450] TRUST-M3: Fix Storage Gap (#1032) --- contracts/p1/BackingManager.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 1065bcc2d6..4fa94fe78e 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -351,5 +351,5 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[37] private __gap; + uint256[38] private __gap; } From c2aaa30131308cbac0748e3fd957293223709143 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 12 Jan 2024 17:12:24 -0300 Subject: [PATCH 158/450] TRUST-L8: Remove unnecessary cast (#1033) --- contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 1336d24cde..afbab80784 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -204,9 +204,9 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { rewardsAddr.claimTo(address(underlyingComet), address(this), address(this), true); - uint256 bal = IERC20(rewardERC20).balanceOf(address(this)); + uint256 bal = rewardERC20.balanceOf(address(this)); if (owed > bal) owed = bal; - IERC20(rewardERC20).safeTransfer(dst, owed); + rewardERC20.safeTransfer(dst, owed); } emit RewardsClaimed(rewardERC20, owed); } From 5ade2e1cfdb1313e7198e0a0448534adc2456c10 Mon Sep 17 00:00:00 2001 From: brr Date: Mon, 15 Jan 2024 21:02:19 +0100 Subject: [PATCH 159/450] Feature/dutch auction cb bid (#1027) Co-authored-by: Taylor Brent --- .../mocks/CallbackDutchTradeBidder.sol | 45 ++++ contracts/plugins/trading/DutchTrade.sol | 81 ++++++- .../plugins/trading/DutchTradeRouter.sol | 113 ++++++++++ docs/mev.md | 6 +- tasks/testing/upgrade-checker-utils/trades.ts | 20 +- test/Broker.test.ts | 7 +- test/Recollateralization.test.ts | 41 +++- test/Revenues.test.ts | 206 ++++++++++++++---- test/plugins/Asset.test.ts | 10 +- .../individual-collateral/collateralTests.ts | 16 +- .../curve/collateralTests.ts | 17 +- 11 files changed, 478 insertions(+), 84 deletions(-) create mode 100644 contracts/plugins/mocks/CallbackDutchTradeBidder.sol create mode 100644 contracts/plugins/trading/DutchTradeRouter.sol diff --git a/contracts/plugins/mocks/CallbackDutchTradeBidder.sol b/contracts/plugins/mocks/CallbackDutchTradeBidder.sol new file mode 100644 index 0000000000..5ba6b26fbf --- /dev/null +++ b/contracts/plugins/mocks/CallbackDutchTradeBidder.sol @@ -0,0 +1,45 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { IDutchTradeCallee, DutchTrade } from "../trading/DutchTrade.sol"; + +contract CallbackDutchTraderBidder is IDutchTradeCallee { + function bid(DutchTrade trade) external { + trade.bidWithCallback(new bytes(0)); + } + + function dutchTradeCallback( + address buyToken, + uint256 buyAmount, + bytes calldata + ) external { + IERC20(buyToken).transfer(msg.sender, buyAmount); + } +} + +contract CallbackDutchTraderBidderLowBaller is IDutchTradeCallee { + function bid(DutchTrade trade) external { + trade.bidWithCallback(new bytes(0)); + } + + function dutchTradeCallback( + address buyToken, + uint256 buyAmount, + bytes calldata + ) external { + IERC20(buyToken).transfer(msg.sender, buyAmount - 1); + } +} + +contract CallbackDutchTraderBidderNoPayer is IDutchTradeCallee { + function bid(DutchTrade trade) external { + trade.bidWithCallback(new bytes(0)); + } + + function dutchTradeCallback( + address buyToken, + uint256 buyAmount, + bytes calldata + ) external {} +} diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index dc4a563dc6..972aeecfd7 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -9,6 +9,21 @@ import "../../interfaces/IAsset.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/ITrade.sol"; +interface IDutchTradeCallee { + function dutchTradeCallback( + address buyToken, + // {qBuyTok} + uint256 buyAmount, + bytes calldata data + ) external; +} + +enum BidType { + NONE, + CALLBACK, + TRANSFER +} + // A dutch auction in 4 parts: // 1. 0% - 20%: Geometric decay from 1000x the bestPrice to ~1.5x the bestPrice // 2. 20% - 45%: Linear decay from ~1.5x the bestPrice to the bestPrice @@ -77,6 +92,8 @@ contract DutchTrade is ITrade { // solhint-disable-next-line var-name-mixedcase uint48 public immutable ONE_BLOCK; // {s} 1 block based on network + BidType public bidType; // = BidType.NONE + TradeStatus public status; // reentrancy protection IBroker public broker; // The Broker that cloned this contract into existence @@ -183,7 +200,7 @@ contract DutchTrade is ITrade { bestPrice = _bestPrice; // gas-saver } - /// Bid for the auction lot at the current price; settling atomically via a callback + /// Bid for the auction lot at the current price; settle trade in protocol /// @dev Caller must have provided approval /// @return amountIn {qBuyTok} The quantity of tokens the bidder paid function bid() external returns (uint256 amountIn) { @@ -195,10 +212,48 @@ contract DutchTrade is ITrade { // {qBuyTok} amountIn = _bidAmount(price); - // Transfer in buy tokens + // Mark bidder bidder = msg.sender; + bidType = BidType.TRANSFER; + + // status must begin OPEN + assert(status == TradeStatus.OPEN); + + // reportViolation if auction cleared in geometric phase + if (price > bestPrice.mul(ONE_POINT_FIVE, CEIL)) { + broker.reportViolation(); + } + + // Transfer in buy tokens from bidder buy.safeTransferFrom(msg.sender, address(this), amountIn); + // settle() in core protocol + origin.settleTrade(sell); + + // confirm .settleTrade() succeeded and .settle() has been called + assert(status == TradeStatus.CLOSED); + } + + /// Bid with callback for the auction lot at the current price; settle trade in protocol + /// Sold funds are sent back to the callee first via callee.dutchTradeCallback(...) + /// Balance of buy token must increase by bidAmount(current block) after callback + /// + /// @dev Caller must implement IDutchTradeCallee + /// @param data {bytes} The data to pass to the callback + /// @return amountIn {qBuyTok} The quantity of tokens the bidder paid + function bidWithCallback(bytes calldata data) external returns (uint256 amountIn) { + require(bidder == address(0), "bid already received"); + + // {buyTok/sellTok} + uint192 price = _price(block.number); // enforces auction ongoing + + // {qBuyTok} + amountIn = _bidAmount(price); + + // Mark bidder + bidder = msg.sender; + bidType = BidType.CALLBACK; + // status must begin OPEN assert(status == TradeStatus.OPEN); @@ -207,10 +262,20 @@ contract DutchTrade is ITrade { broker.reportViolation(); } - // settle() via callback + // Transfer sell tokens to bidder + sell.safeTransfer(bidder, lot()); // {qSellTok} + + uint256 balanceBefore = buy.balanceOf(address(this)); // {qBuyTok} + IDutchTradeCallee(bidder).dutchTradeCallback(address(buy), amountIn, data); + require( + amountIn <= buy.balanceOf(address(this)) - balanceBefore, + "insufficient buy tokens" + ); + + // settle() in core protocol origin.settleTrade(sell); - // confirm callback succeeded + // confirm .settleTrade() succeeded and .settle() has been called assert(status == TradeStatus.CLOSED); } @@ -223,13 +288,13 @@ contract DutchTrade is ITrade { returns (uint256 soldAmt, uint256 boughtAmt) { require(msg.sender == address(origin), "only origin can settle"); + require(bidder != address(0) || block.number > endBlock, "auction not over"); - // Received bid - if (bidder != address(0)) { + if (bidType == BidType.CALLBACK) { + soldAmt = lot(); // {qSellTok} + } else if (bidType == BidType.TRANSFER) { soldAmt = lot(); // {qSellTok} sell.safeTransfer(bidder, soldAmt); // {qSellTok} - } else { - require(block.number > endBlock, "auction not over"); } // Transfer remaining balances back to origin diff --git a/contracts/plugins/trading/DutchTradeRouter.sol b/contracts/plugins/trading/DutchTradeRouter.sol new file mode 100644 index 0000000000..acc1b09186 --- /dev/null +++ b/contracts/plugins/trading/DutchTradeRouter.sol @@ -0,0 +1,113 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { IDutchTradeCallee, TradeStatus, DutchTrade } from "../trading/DutchTrade.sol"; +import { IMain } from "../../interfaces/IMain.sol"; + +/** @title DutchTradeRouter + * @notice Utility contract for placing bids on DutchTrade auctions + * @dev This contract is needed as end user wallets cannot call DutchTrade.bid directly anymore, + tests and UI need to be updated to use this contract + */ +contract DutchTradeRouter is IDutchTradeCallee { + using SafeERC20 for IERC20; + struct Bid { + /// @notice The DutchTrade that was bid on + DutchTrade trade; + /// @notice The token sold to the protocol + IERC20 sellToken; + /// @notice The amount of tokenIn the protocol got {qSellAmt} + uint256 sellAmt; + /// @notice The token bought from the trade + IERC20 buyToken; + /// @notice The amount of tokenOut the we got {qBuyAmt} + uint256 buyAmt; + } + + /// @notice Emitted when a bid is placed + /// @param main The main contract of the rToken + /// @param trade The DutchTrade that was bid on + /// @param bidder The address of the bidder + /// @param sellToken The token being sold by the protocol + /// @param soldAmt The amount of sellToken sold {qSellToken} + /// @param buyToken The token being bought by the protocol + /// @param boughtAmt The amount of buyToken bought {qBuyToken} + event BidPlaced( + IMain main, + DutchTrade trade, + address bidder, + IERC20 sellToken, + uint256 soldAmt, + IERC20 buyToken, + uint256 boughtAmt + ); + DutchTrade private _currentTrade; + + /// Place a bid on an OPEN dutch auction + /// @param trade The DutchTrade to bid on + /// @param recipient The recipient of the tokens out + /// @dev Requires msg.sender has sufficient approval on the tokenIn with router + /// @dev Requires msg.sender has sufficient balance on the tokenIn + function bid(DutchTrade trade, address recipient) external returns (Bid memory) { + Bid memory out = _placeBid(trade, msg.sender); + _sendBalanceTo(out.sellToken, recipient); + _sendBalanceTo(out.buyToken, recipient); + return out; + } + + /// @notice Callback for DutchTrade + /// @param buyToken The token DutchTrade is expecting to receive + /// @param buyAmount The amt the DutchTrade is expecting to receive {qBuyToken} + /// @notice Data is not used here + function dutchTradeCallback( + address buyToken, + uint256 buyAmount, + bytes calldata + ) external { + require(msg.sender == address(_currentTrade), "Incorrect callee"); + IERC20(buyToken).safeTransfer(msg.sender, buyAmount); // {qBuyToken} + } + + function _sendBalanceTo(IERC20 token, address to) internal { + uint256 bal = token.balanceOf(address(this)); + token.safeTransfer(to, bal); + } + + /// Helper for placing bid on DutchTrade + /// @notice pulls funds from 'bidder' + /// @notice Does not send proceeds anywhere, funds have to be transfered out after this call + /// @notice non-reentrant, uses _currentTrade to prevent reentrancy + function _placeBid(DutchTrade trade, address bidder) internal returns (Bid memory out) { + // Prevent reentrancy + require(_currentTrade == DutchTrade(address(0)), "already bidding"); + require(trade.status() == TradeStatus.OPEN, "trade not open"); + _currentTrade = trade; + out.trade = trade; + out.buyToken = IERC20(trade.buy()); + out.sellToken = IERC20(trade.sell()); + out.buyAmt = trade.bidAmount(block.number); // {qBuyToken} + out.buyToken.safeTransferFrom(bidder, address(this), out.buyAmt); + + uint256 sellAmt = out.sellToken.balanceOf(address(this)); // {qSellToken} + + uint256 expectedSellAmt = trade.lot(); // {qSellToken} + trade.bidWithCallback(new bytes(0)); + + sellAmt = out.sellToken.balanceOf(address(this)) - sellAmt; // {qSellToken} + require(sellAmt >= expectedSellAmt, "insufficient amount out"); + out.sellAmt = sellAmt; // {qSellToken} + + _currentTrade = DutchTrade(address(0)); + emit BidPlaced( + IMain(address(out.trade.broker().main())), + out.trade, + bidder, + out.sellToken, + out.sellAmt, + out.buyToken, + out.buyAmt + ); + } +} diff --git a/docs/mev.md b/docs/mev.md index f0579c8c3b..55a0a4a5fc 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -27,7 +27,7 @@ Bidding instructions from the `DutchTrade` contract: `DutchTrade` (relevant) interface: ```solidity -function bid() external; // execute a bid at the current block number +function bid(bytes memory data) external; // execute a bid at the current block number function sell() external view returns (IERC20); @@ -43,13 +43,15 @@ function bidAmount(uint256 blockNumber) external view returns (uint256); // {qBu To participate: +Make sure calling contract implements the `IDutchTradeCallee` interface. It contains a single method function `dutchTradeCallbac(address buyToken,uint256 buyAmount,bytes calldata data) external;`. This method will be called by the `DutchTrade` as a callback after calling `bidWithCallback` and before the trade has been resolved. The trader is expected to pay for the trade during the callback. See `DutchTradeRouter.sol` for an example. + 1. Call `status()` view; the auction is ongoing if return value is 1 2. Call `lot()` to see the number of tokens being sold 3. Call `bidAmount()` to see the number of tokens required to buy the lot, at various block numbers 4. After finding an attractive bidAmount, provide an approval for the `buy()` token. The spender should be the `DutchTrade` contract. **Note**: it is very important to set tight approvals! Do not set more than the `bidAmount()` for the desired bidding block else reorgs present risk. 5. Wait until the desired block is reached (hopefully not in the first 40% of the auction) -6. Call `bid()`. If someone else completes the auction first, this will revert with the error message "bid already received". Approvals do not have to be revoked in the event that another MEV searcher wins the auction. (Though ideally the searcher includes the approval in the same tx they `bid()`) +6. Call `bidWithCallback()`. If someone else completes the auction first, this will revert with the error message "bid already received". Approvals do not have to be revoked in the event that another MEV searcher wins the auction. (Though ideally the searcher includes the approval in the same tx they `bid()`) For a sample price curve, see [docs/system-design.md](./system-design.md#sample-price-curve) diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index 564e91b037..6069ca478e 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -1,20 +1,20 @@ +import { QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' +import { bn, fp } from '#/common/numbers' import { whileImpersonating } from '#/utils/impersonation' import { advanceBlocks, advanceTime, - getLatestBlockTimestamp, getLatestBlockNumber, + getLatestBlockTimestamp, } from '#/utils/time' +import { DutchTrade } from '@typechain/DutchTrade' +import { GnosisTrade } from '@typechain/GnosisTrade' import { TestITrading } from '@typechain/TestITrading' import { BigNumber, ContractTransaction } from 'ethers' -import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' import { Interface, LogDescription } from 'ethers/lib/utils' +import { HardhatRuntimeEnvironment } from 'hardhat/types' import { collateralToUnderlying, whales } from './constants' -import { bn, fp } from '#/common/numbers' import { logToken } from './logs' -import { GnosisTrade } from '@typechain/GnosisTrade' -import { DutchTrade } from '@typechain/DutchTrade' export const runBatchTrade = async ( hre: HardhatRuntimeEnvironment, @@ -86,6 +86,7 @@ export const runDutchTrade = async ( trader: TestITrading, tradeToken: string ): Promise<[boolean, string]> => { + const router = await (await hre.ethers.getContractFactory('DutchTradeRouter')).deploy() // NOTE: // buy & sell are from the perspective of the auction-starter // bid() flips it to be from the perspective of the trader @@ -116,9 +117,12 @@ export const runDutchTrade = async ( await whileImpersonating(hre, whaleAddr, async (whale) => { const sellToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) - await sellToken.connect(whale).approve(trade.address, buyAmount) // Bid - ;[tradesRemain, newSellToken] = await callAndGetNextTrade(trade.connect(whale).bid(), trader) + + ;[tradesRemain, newSellToken] = await callAndGetNextTrade( + router.bid(trade.address, await router.signer.getAddress()), + trader + ) }) if ( diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 633d1fed48..d63bb2d129 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -2,7 +2,7 @@ import { loadFixture, getStorageAt, setStorageAt } from '@nomicfoundation/hardha import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' -import { BigNumber, ContractFactory } from 'ethers' +import { BigNumber, ContractFactory, constants } from 'ethers' import { ethers, upgrades } from 'hardhat' import { IConfig, MAX_AUCTION_LENGTH } from '../common/configuration' import { @@ -1405,6 +1405,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { auctionSellAmt, progression, ]: BigNumber[]) { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() // Factories const ERC20Factory = await ethers.getContractFactory('ERC20MockDecimals') const CollFactory = await ethers.getContractFactory('FiatCollateral') @@ -1478,6 +1479,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const tradeAddr = await backingManager.trades(sellTok.address) await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) const currentBlock = bn(await getLatestBlockNumber()) const toAdvance = progression .mul((await trade.endBlock()).sub(currentBlock)) @@ -1492,7 +1494,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(bidAmt).to.be.gt(0) const buyBalBefore = await buyTok.balanceOf(backingManager.address) const sellBalBefore = await sellTok.balanceOf(addr1.address) - await expect(trade.connect(addr1).bid()) + + await expect(router.connect(addr1).bid(trade.address, addr1.address)) .to.emit(backingManager, 'TradeSettled') .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 83d0b04af6..d995dc3dbb 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -2,7 +2,7 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' -import { BigNumber, ContractFactory } from 'ethers' +import { BigNumber, ContractFactory, constants } from 'ethers' import { ethers } from 'hardhat' import { IConfig } from '../common/configuration' import { @@ -36,6 +36,7 @@ import { TestIRToken, TestIStRSR, USDCMock, + DutchTradeRouter, } from '../typechain' import { advanceTime, @@ -3237,6 +3238,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { const end = await trade.endBlock() // Simulate 30 minutes of blocks, should swap at right price each time + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token1.connect(addr1).approve(router.address, constants.MaxUint256) let now = bn(await getLatestBlockNumber()) while (now.lt(end)) { const actual = await trade.connect(addr1).bidAmount(now) @@ -3252,27 +3255,31 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) - const staticResult = await trade.connect(addr1).callStatic.bid() - expect(staticResult).to.equal(actual) + const staticResult = await router + .connect(addr1) + .callStatic.bid(trade.address, addr1.address) + expect(staticResult.buyAmt).to.equal(actual) await advanceBlocks(1) now = bn(await getLatestBlockNumber()) } }) it('Should handle no bid case correctly', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token1.connect(addr1).approve(router.address, constants.MaxUint256) await backingManager.rebalance(TradeKind.DUTCH_AUCTION) const trade = await ethers.getContractAt( 'DutchTrade', await backingManager.trades(token0.address) ) await token1.connect(addr1).approve(trade.address, initialBal) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) await expect( trade.connect(addr1).bidAmount(await getLatestBlockNumber()) ).to.be.revertedWith('auction over') - await expect(trade.connect(addr1).bid()).be.revertedWith('auction over') - + await expect(router.connect(addr1).bid(trade.address, addr1.address)).be.revertedWith( + 'auction over' + ) // Should be able to settle await expect(trade.settle()).to.be.revertedWith('only origin can settle') await expect(backingManager.settleTrade(token0.address)) @@ -3286,8 +3293,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { context('Should successfully recollateralize after default', () => { let trade1: DutchTrade // token0 -> token1 let trade2: DutchTrade // RSR -> token1 - + let router: DutchTradeRouter beforeEach(async () => { + router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token0.connect(addr1).approve(router.address, constants.MaxUint256) + await token1.connect(addr1).approve(router.address, constants.MaxUint256) await backingManager.rebalance(TradeKind.DUTCH_AUCTION) trade1 = await ethers.getContractAt( 'DutchTrade', @@ -3297,10 +3307,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Snipe auction at 0s left await advanceBlocks((await trade1.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await trade1.connect(addr1).bid() + + await router.connect(addr1).bid(trade1.address, addr1.address) expect(await trade1.canSettle()).to.equal(false) expect(await trade1.status()).to.equal(2) // Status.CLOSED - expect(await trade1.bidder()).to.equal(addr1.address) + expect(await trade1.bidder()).to.equal(router.address) expect(await token0.balanceOf(addr1.address)).to.equal(initialBal) const expected = divCeil( @@ -3340,7 +3351,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await trade2.canSettle()).to.equal(false) // Bid + settle RSR auction - await expect(trade2.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + + await expect(await router.connect(addr1).bid(trade2.address, addr1.address)).to.emit( + backingManager, + 'TradeSettled' + ) }) it('via fallback to Batch Auction', async () => { @@ -5082,6 +5097,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('rebalance() - DutchTrade ', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() // Register Collateral await assetRegistry.connect(owner).register(backupCollateral1.address) @@ -5121,7 +5137,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { let trade = await ethers.getContractAt('DutchTrade', tradeAddr) await backupToken1.connect(addr1).approve(trade.address, initialBal) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await snapshotGasCost(trade.connect(addr1).bid()) + + await snapshotGasCost(await router.connect(addr1).bid(trade.address, addr1.address)) // Expect new trade started -- bid in last block expect(await backingManager.tradesOpen()).to.equal(1) @@ -5130,7 +5147,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { tradeAddr = await backingManager.trades(rsr.address) trade = await ethers.getContractAt('DutchTrade', tradeAddr) await backupToken1.connect(addr1).approve(trade.address, initialBal) - await snapshotGasCost(trade.connect(addr1).bid()) + await snapshotGasCost(await router.connect(addr1).bid(trade.address, addr1.address)) // No new trade expect(await backingManager.tradesOpen()).to.equal(0) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 3858ba4290..c6fe25cd22 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1,30 +1,32 @@ -import { loadFixture, getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' +import { useEnv } from '#/utils/env' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { getStorageAt, loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' -import { BigNumber, ContractFactory, Wallet } from 'ethers' +import { BigNumber, ContractFactory, Wallet, constants } from 'ethers' import { ethers, upgrades } from 'hardhat' -import { IConfig, GNOSIS_MAX_TOKENS } from '../common/configuration' +import { GNOSIS_MAX_TOKENS, IConfig } from '../common/configuration' import { BN_SCALE_FACTOR, - FURNACE_DEST, - STRSR_DEST, - ZERO_ADDRESS, CollateralStatus, - TradeKind, + FURNACE_DEST, MAX_UINT192, ONE_PERIOD, + STRSR_DEST, + TradeKind, + ZERO_ADDRESS, } from '../common/constants' import { expectEvents } from '../common/events' import { bn, divCeil, fp, near } from '../common/numbers' import { - Asset, ATokenFiatCollateral, - ComptrollerMock, + Asset, CTokenFiatCollateral, CTokenWrapperMock, + ComptrollerMock, ERC20Mock, FacadeTest, + FiatCollateral, GnosisMock, IAssetRegistry, InvalidATokenFiatCollateralMock, @@ -36,37 +38,35 @@ import { TestIBroker, TestIDistributor, TestIFurnace, - TestIRevenueTrader, TestIMain, TestIRToken, + TestIRevenueTrader, TestIStRSR, USDCMock, - FiatCollateral, } from '../typechain' -import { whileImpersonating } from './utils/impersonation' -import snapshotGasCost from './utils/snapshotGasCost' -import { - advanceTime, - advanceBlocks, - getLatestBlockNumber, - getLatestBlockTimestamp, -} from './utils/time' -import { withinQuad } from './utils/matchers' import { Collateral, - defaultFixture, - Implementation, IMPLEMENTATION, - REVENUE_HIDING, + Implementation, ORACLE_ERROR, ORACLE_TIMEOUT, ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, + REVENUE_HIDING, + defaultFixture, } from './fixtures' +import { whileImpersonating } from './utils/impersonation' +import { withinQuad } from './utils/matchers' import { expectRTokenPrice, setOraclePrice } from './utils/oracles' -import { dutchBuyAmount, expectTrade, getTrade } from './utils/trades' -import { useEnv } from '#/utils/env' +import snapshotGasCost from './utils/snapshotGasCost' +import { + advanceBlocks, + advanceTime, + getLatestBlockNumber, + getLatestBlockTimestamp, +} from './utils/time' import { mintCollaterals } from './utils/tokens' +import { dutchBuyAmount, expectTrade, getTrade } from './utils/trades' const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip @@ -2813,7 +2813,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should not report violation when Dutch Auction clears in geometric phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade - + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await rsr.connect(addr1).approve(router.address, constants.MaxUint256) + await rToken.connect(addr1).approve(router.address, constants.MaxUint256) rewardAmountAAVE = bn('0.5e18') // AAVE Rewards @@ -2905,16 +2907,15 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await advanceBlocks(config.dutchAuctionLength.div(12).div(5).sub(5)) // Should settle RSR auction without disabling dutch auctions - await rsr.connect(addr1).approve(rsrTrade.address, sellAmt.mul(10)) - await expect(rsrTrade.connect(addr1).bid()) + await expect(router.connect(addr1).bid(rsrTrade.address, addr1.address)) .to.emit(rsrTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rsr.address, sellAmt, anyValue) + expect(await broker.dutchTradeDisabled(aaveToken.address)).to.equal(false) expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) // Should still be able to settle RToken auction - await rToken.connect(addr1).approve(rTokenTrade.address, sellAmtRToken.mul(10)) - await expect(rTokenTrade.connect(addr1).bid()) + await expect(router.connect(addr1).bid(rTokenTrade.address, addr1.address)) .to.emit(rTokenTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rToken.address, sellAmtRToken, anyValue) @@ -2927,7 +2928,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should not report violation when Dutch Auction clears in first linear phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade - + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await rsr.connect(addr1).approve(router.address, constants.MaxUint256) + await rToken.connect(addr1).approve(router.address, constants.MaxUint256) rewardAmountAAVE = bn('0.5e18') // AAVE Rewards @@ -3019,14 +3022,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await advanceBlocks(config.dutchAuctionLength.div(12).div(3)) // Should settle RSR auction - await rsr.connect(addr1).approve(rsrTrade.address, sellAmt.mul(10)) - await expect(rsrTrade.connect(addr1).bid()) + await expect(router.connect(addr1).bid(rsrTrade.address, addr1.address)) .to.emit(rsrTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rsr.address, sellAmt, anyValue) // Should settle RToken auction - await rToken.connect(addr1).approve(rTokenTrade.address, sellAmtRToken.mul(10)) - await expect(rTokenTrade.connect(addr1).bid()) + await expect(router.connect(addr1).bid(rTokenTrade.address, addr1.address)) .to.emit(rTokenTrader, 'TradeSettled') .withArgs(anyValue, aaveToken.address, rToken.address, sellAmtRToken, anyValue) @@ -3476,6 +3477,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { }) it('Should allow one bidder', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) @@ -3484,30 +3486,135 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rTokenTrader.trades(token0.address) ) + await (await ethers.getContractAt('ERC20Mock', await trade.buy())) + .connect(addr1) + .approve(router.address, constants.MaxUint256) + + // Bid + await router.connect(addr1).bid(trade.address, addr1.address) + expect(await trade.bidder()).to.equal(router.address) + // Cannot bid once is settled + await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.be.revertedWith( + 'trade not open' + ) + }) + it('Trade should initially have bidType 0', async () => { + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + expect(await trade.bidType()).to.be.eq(0) + }) + it('It should support non callback bid', async () => { + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + + await (await ethers.getContractAt('ERC20Mock', await trade.buy())) + .connect(addr1) + .approve(trade.address, constants.MaxUint256) + // Bid - await rToken.connect(addr1).approve(trade.address, issueAmount) await trade.connect(addr1).bid() + expect(await trade.bidType()).to.be.eq(2) expect(await trade.bidder()).to.equal(addr1.address) - - // Cannot bid once is settled await expect(trade.connect(addr1).bid()).to.be.revertedWith('bid already received') }) + /// Tests callback based bidding + describe('Callback based bidding', () => { + it('Supports bidCb', async () => { + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + + // Bid + const bidder = await ( + await ethers.getContractFactory('CallbackDutchTraderBidder') + ).deploy() + await rToken.connect(addr1).transfer(bidder.address, issueAmount) + await bidder.connect(addr1).bid(trade.address) + expect(await trade.bidType()).to.be.eq(1) + expect(await trade.bidder()).to.equal(bidder.address) + expect(await trade.status()).to.be.eq(2) // Status.CLOSED + }) + + it('Will revert if bidder submits the wrong bid', async () => { + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + + // Bid + const bidder = await ( + await ethers.getContractFactory('CallbackDutchTraderBidderLowBaller') + ).deploy() + await rToken.connect(addr1).transfer(bidder.address, issueAmount) + await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( + 'insufficient buy tokens' + ) + + expect(await trade.bidder()).to.equal(constants.AddressZero) + expect(await trade.status()).to.be.eq(1) // Status.OPEN + }) + + it('Will revert if bidder submits the no bid', async () => { + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + + // Bid + const bidder = await ( + await ethers.getContractFactory('CallbackDutchTraderBidderNoPayer') + ).deploy() + await rToken.connect(addr1).transfer(bidder.address, issueAmount) + await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( + 'insufficient buy tokens' + ) + + expect(await trade.bidder()).to.equal(constants.AddressZero) + expect(await trade.status()).to.be.eq(1) // Status.OPEN + }) + }) + it('Should quote piecewise-falling price correctly throughout entirety of auction', async () => { issueAmount = issueAmount.div(10000) + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) const trade = await ethers.getContractAt( 'DutchTrade', await rTokenTrader.trades(token0.address) ) - await rToken.connect(addr1).approve(trade.address, initialBal) + await rToken.connect(addr1).approve(router.address, constants.MaxUint256) + await token0.connect(addr1).approve(router.address, constants.MaxUint256) + await token1.connect(addr1).approve(router.address, constants.MaxUint256) const start = await trade.startBlock() const end = await trade.endBlock() // Simulate 30 minutes of blocks, should swap at right price each time let now = bn(await getLatestBlockNumber()) + while (now.lt(end)) { const actual = await trade.connect(addr1).bidAmount(now) const expected = await dutchBuyAmount( @@ -3519,27 +3626,33 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) - const staticResult = await trade.connect(addr1).callStatic.bid() - expect(staticResult).to.equal(actual) + const staticResult = await router + .connect(addr1) + .callStatic.bid(trade.address, addr1.address) + + expect(staticResult.buyAmt).to.equal(actual) await advanceBlocks(1) now = bn(await getLatestBlockNumber()) } }) it('Should handle no bid case correctly', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) const trade = await ethers.getContractAt( 'DutchTrade', await rTokenTrader.trades(token0.address) ) - await rToken.connect(addr1).approve(trade.address, initialBal) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) await expect( trade.connect(addr1).bidAmount(await getLatestBlockNumber()) ).to.be.revertedWith('auction over') - await expect(trade.connect(addr1).bid()).be.revertedWith('auction over') + + await expect(router.connect(addr1).bid(trade.address, addr1.address)).be.revertedWith( + 'auction over' + ) // Should be able to settle await expect(trade.settle()).to.be.revertedWith('only origin can settle') @@ -3552,21 +3665,22 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { }) it('Should bid at exactly endBlock() and not launch another auction', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await rToken.connect(addr1).approve(router.address, constants.MaxUint256) await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) const trade = await ethers.getContractAt( 'DutchTrade', await rTokenTrader.trades(token0.address) ) - await rToken.connect(addr1).approve(trade.address, initialBal) await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted // Snipe auction at 0s left await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await trade.connect(addr1).bid() + await router.connect(addr1).bid(trade.address, addr1.address) expect(await trade.canSettle()).to.equal(false) expect(await trade.status()).to.equal(2) // Status.CLOSED - expect(await trade.bidder()).to.equal(addr1.address) + expect(await trade.bidder()).to.equal(router.address) expect(await token0.balanceOf(addr1.address)).to.equal(initialBal.sub(issueAmount.div(4))) const expected = await dutchBuyAmount( diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 5d801071a7..1d671deeb9 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -1,6 +1,6 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { expect } from 'chai' -import { Wallet, ContractFactory } from 'ethers' +import { Wallet, ContractFactory, constants } from 'ethers' import { ethers } from 'hardhat' import { IConfig } from '../../common/configuration' import { @@ -517,6 +517,8 @@ describe('Assets contracts #fast', () => { }) it('Should handle tokens being out on trade for RTokenAsset', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await usdc.connect(wallet).approve(router.address, constants.MaxUint256) // Summary: // - Run a dutch auction that does not fill // - Run a batch auction that fills for partial volume @@ -599,7 +601,11 @@ describe('Assets contracts #fast', () => { const buyAmt = await trade.bidAmount(await trade.endBlock()) await usdc.approve(trade.address, buyAmt) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await expect(trade.bid()).to.emit(backingManager, 'TradeSettled') + + await expect(router.bid(trade.address, await router.signer.getAddress())).to.emit( + backingManager, + 'TradeSettled' + ) expect(await backingManager.tradesOpen()).to.equal(1) // launches another trade! await expectExactPrice(rTokenAsset.address, [low3, bn('1007427552565834095')]) // high end starts to fall }) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index dcb238c332..576a60a2f2 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -833,6 +833,8 @@ export default function fn( }) it('rebalances out of the collateral', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await pairedERC20.connect(addr1).approve(router.address, MAX_UINT256) // Remove collateral from basket await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) await expect(basketHandler.connect(owner).refreshBasket()) @@ -855,12 +857,18 @@ export default function fn( await pairedERC20.connect(addr1).approve(trade.address, buyAmt) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) const pairedBal = await pairedERC20.balanceOf(backingManager.address) - await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + + await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( + backingManager, + 'TradeSettled' + ) expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) expect(await backingManager.tradesOpen()).to.equal(0) }) it('forwards revenue and sells in a revenue auction', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await rToken.connect(addr1).approve(router.address, MAX_UINT256) // Send excess collateral to the RToken trader via forwardRevenue() const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) await mintCollateralTo( @@ -886,7 +894,11 @@ export default function fn( const buyAmt = await trade.bidAmount(await trade.endBlock()) await rToken.connect(addr1).approve(trade.address, buyAmt) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') + + await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( + rTokenTrader, + 'TradeSettled' + ) expect(await rTokenTrader.tradesOpen()).to.equal(0) }) diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 1e4fe95ab9..cfb97d23e0 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -979,6 +979,8 @@ export default function fn( }) it('rebalances out of the collateral', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await pairedERC20.connect(addr1).approve(router.address, MAX_UINT256) // Remove collateral from basket await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) await expect(basketHandler.connect(owner).refreshBasket()) @@ -995,18 +997,24 @@ export default function fn( const tradeAddr = await backingManager.trades(collateralERC20.address) expect(tradeAddr).to.not.equal(ZERO_ADDRESS) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) expect(await trade.buy()).to.equal(pairedERC20.address) const buyAmt = await trade.bidAmount(await trade.endBlock()) await pairedERC20.connect(addr1).approve(trade.address, buyAmt) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) const pairedBal = await pairedERC20.balanceOf(backingManager.address) - await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( + backingManager, + 'TradeSettled' + ) expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) expect(await backingManager.tradesOpen()).to.equal(0) }) it('forwards revenue and sells in a revenue auction', async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await rToken.connect(addr1).approve(router.address, MAX_UINT256) // Send excess collateral to the RToken trader via forwardRevenue() const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) await mintCollateralTo( @@ -1027,12 +1035,17 @@ export default function fn( const tradeAddr = await rTokenTrader.trades(collateralERC20.address) expect(tradeAddr).to.not.equal(ZERO_ADDRESS) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) expect(await trade.buy()).to.equal(rToken.address) const buyAmt = await trade.bidAmount(await trade.endBlock()) await rToken.connect(addr1).approve(trade.address, buyAmt) await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') + + await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( + rTokenTrader, + 'TradeSettled' + ) expect(await rTokenTrader.tradesOpen()).to.equal(0) }) From d7315fb42c45f42dbb7f059c07d682b03947949c Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Mon, 15 Jan 2024 20:30:44 -0300 Subject: [PATCH 160/450] Invariant Monitor contract (#1017) --- .github/workflows/tests.yml | 27 + .openzeppelin/base_8453.json | 184 +++ .openzeppelin/mainnet.json | 200 ++- common/configuration.ts | 8 + contracts/facade/FacadeMonitor.sol | 211 +++ contracts/interfaces/IFacadeMonitor.sol | 49 + .../plugins/assets/compoundv2/ICToken.sol | 11 + contracts/plugins/mocks/ComptrollerMock.sol | 5 + .../mocks/upgrades/FacadeMonitorV2.sol | 23 + docs/deployed-addresses/1-FacadeMonitor.md | 7 + docs/deployed-addresses/8453-FacadeMonitor.md | 8 + docs/monitoring.md | 35 + tasks/deployment/deploy-facade-monitor.ts | 107 ++ tasks/index.ts | 1 + test/Broker.test.ts | 36 +- test/Facade.test.ts | 353 +++- test/fixtures.ts | 39 +- test/integration/fixtures.ts | 25 +- test/integration/fork-block-numbers.ts | 1 + test/monitor/FacadeMonitor.test.ts | 1417 +++++++++++++++++ test/utils/trades.ts | 24 +- 21 files changed, 2717 insertions(+), 54 deletions(-) create mode 100644 contracts/facade/FacadeMonitor.sol create mode 100644 contracts/interfaces/IFacadeMonitor.sol create mode 100644 contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol create mode 100644 docs/deployed-addresses/1-FacadeMonitor.md create mode 100644 docs/deployed-addresses/8453-FacadeMonitor.md create mode 100644 docs/monitoring.md create mode 100644 tasks/deployment/deploy-facade-monitor.ts create mode 100644 test/monitor/FacadeMonitor.test.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 8c1d16e8da..227b0b97fd 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -187,3 +187,30 @@ jobs: TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet + + monitor-tests: + name: 'Monitor Tests (Mainnet)' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - name: 'Cache hardhat network fork' + uses: actions/cache@v3 + with: + path: cache/hardhat-network-fork + key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} + restore-keys: | + hardhat-network-fork-${{ runner.os }}- + hardhat-network-fork- + - run: npx hardhat test ./test/monitor/*.test.ts + env: + NODE_OPTIONS: '--max-old-space-size=8192' + TS_NODE_SKIP_IGNORE: true + MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet + FORK: 1 + PROTO_IMPL: 1 diff --git a/.openzeppelin/base_8453.json b/.openzeppelin/base_8453.json index 6c4c4a3671..0d90ea97cb 100644 --- a/.openzeppelin/base_8453.json +++ b/.openzeppelin/base_8453.json @@ -3144,6 +3144,190 @@ } } } + }, + "83264eb95f2f9ab0055f3cdf3d195b52003b35099a624ee29920f6a83be6b884": { + "address": "0xD45a441F334f6f27CDDA3728414FD26Cc5798E66", + "txHash": "0xcce3cfb75dad5e947efeab8a30cd981ca578d96f7a8bee1512a86b2849a0fa24", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "07b40b651527d3b3c3f0d1fb77a991853411f5b7fd564a45478bb03e177adcae": { + "address": "0x69c20aD99eb1054cd7Da2809572205186975dA17", + "txHash": "0x05c19fbc6774d5e85aadba888cc56e0764a104c1da7e3fa9f0774dfba8a46215", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index 8ae5721830..d0dae943ca 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -3747,10 +3747,7 @@ }, "t_enum(TradeKind)25002": { "label": "enum TradeKind", - "members": [ - "DUTCH_AUCTION", - "BATCH_AUCTION" - ], + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { @@ -4043,11 +4040,7 @@ }, "t_enum(CollateralStatus)24460": { "label": "enum CollateralStatus", - "members": [ - "SOUND", - "IFFY", - "DISABLED" - ], + "members": ["SOUND", "IFFY", "DISABLED"], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -6340,10 +6333,7 @@ }, "t_enum(TradeKind)17751": { "label": "enum TradeKind", - "members": [ - "DUTCH_AUCTION", - "BATCH_AUCTION" - ], + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { @@ -6652,6 +6642,190 @@ } } } + }, + "f0632c54f5763a16d6d87d14d0e7a80a079e8b998507fa1d081ee3b631c3961c": { + "address": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", + "txHash": "0xfa37e2544175813e2b4308c62f14f05f336a62ea25c94dd9346f710449498d0c", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "ebc9c3f1c253e562c3d21649a4c7d904b40ed64689bc3d3bc57bbe09fcd1d120": { + "address": "0x35fDc5537c32588bfc97b393A8ed522Df737af5A", + "txHash": "0xc1d9400b9492c969e5a156fa8e419ccd8a1138160f6eb4079192455e3af357e6", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/common/configuration.ts b/common/configuration.ts index 0bd5d8ff2e..3692d8068f 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -109,6 +109,7 @@ interface INetworkConfig { AAVE_INCENTIVES?: string AAVE_EMISSIONS_MGR?: string AAVE_RESERVE_TREASURY?: string + AAVE_DATA_PROVIDER?: string COMPTROLLER?: string FLUX_FINANCE_COMPTROLLER?: string GNOSIS_EASY_AUCTION?: string @@ -224,6 +225,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', AAVE_EMISSIONS_MGR: '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -329,6 +331,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -428,6 +431,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -642,6 +646,10 @@ export interface IRTokenConfig { params: IConfig } +export interface IMonitorParams { + AAVE_V2_DATA_PROVIDER_ADDR: string +} + export interface IBackupInfo { backupUnit: string diversityFactor: BigNumber diff --git a/contracts/facade/FacadeMonitor.sol b/contracts/facade/FacadeMonitor.sol new file mode 100644 index 0000000000..e8221a1195 --- /dev/null +++ b/contracts/facade/FacadeMonitor.sol @@ -0,0 +1,211 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; +import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; +import "../interfaces/IFacadeMonitor.sol"; +import "../interfaces/IRToken.sol"; +import "../libraries/Fixed.sol"; +import "../p1/RToken.sol"; +import "../plugins/assets/compoundv2/CTokenWrapper.sol"; +import "../plugins/assets/compoundv3/ICusdcV3Wrapper.sol"; +import "../plugins/assets/stargate/StargateRewardableWrapper.sol"; +import { StaticATokenV3LM } from "../plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol"; +import "../plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol"; + +interface IAaveProtocolDataProvider { + function getReserveData(address asset) + external + view + returns ( + uint256 availableLiquidity, + uint256 totalStableDebt, + uint256 totalVariableDebt, + uint256 liquidityRate, + uint256 variableBorrowRate, + uint256 stableBorrowRate, + uint256 averageStableBorrowRate, + uint256 liquidityIndex, + uint256 variableBorrowIndex, + uint40 lastUpdateTimestamp + ); +} + +interface IStaticATokenLM is IERC20 { + // solhint-disable-next-line func-name-mixedcase + function UNDERLYING_ASSET_ADDRESS() external view returns (address); + + function dynamicBalanceOf(address account) external view returns (uint256); +} + +/** + * @title FacadeMonitor + * @notice A UX-friendly layer for monitoring RTokens + */ +contract FacadeMonitor is Initializable, OwnableUpgradeable, UUPSUpgradeable, IFacadeMonitor { + using FixLib for uint192; + + /// @custom:oz-upgrades-unsafe-allow state-variable-immutable + // solhint-disable-next-line var-name-mixedcase + address public immutable AAVE_V2_DATA_PROVIDER; + + /// @custom:oz-upgrades-unsafe-allow constructor + constructor(MonitorParams memory params) { + AAVE_V2_DATA_PROVIDER = params.AAVE_V2_DATA_PROVIDER_ADDR; + _disableInitializers(); + } + + function init(address initialOwner) public initializer { + require(initialOwner != address(0), "invalid owner address"); + + __Ownable_init(); + __UUPSUpgradeable_init(); + _transferOwnership(initialOwner); + } + + // === Views === + + /// @return Whether batch auctions are disabled for a specific rToken + function batchAuctionsDisabled(IRToken rToken) external view returns (bool) { + return rToken.main().broker().batchTradeDisabled(); + } + + /// @return Whether any dutch auction is disabled for a specific rToken + function dutchAuctionsDisabled(IRToken rToken) external view returns (bool) { + bool disabled = false; + + IERC20[] memory erc20s = rToken.main().assetRegistry().erc20s(); + for (uint256 i = 0; i < erc20s.length; ++i) { + if (rToken.main().broker().dutchTradeDisabled(IERC20Metadata(address(erc20s[i])))) + disabled = true; + } + + return disabled; + } + + /// @return Which percentage of issuance throttle is still available for a specific rToken + function issuanceAvailable(IRToken rToken) external view returns (uint256) { + ThrottleLib.Params memory params = RTokenP1(address(rToken)).issuanceThrottleParams(); + + // Calculate hourly limit as: max(params.amtRate, supply.mul(params.pctRate)) + uint256 limit = (rToken.totalSupply() * params.pctRate) / FIX_ONE_256; // {qRTok} + if (params.amtRate > limit) limit = params.amtRate; + + uint256 issueAvailable = rToken.issuanceAvailable(); + if (issueAvailable >= limit) return FIX_ONE_256; + + return (issueAvailable * FIX_ONE_256) / limit; + } + + function redemptionAvailable(IRToken rToken) external view returns (uint256) { + ThrottleLib.Params memory params = RTokenP1(address(rToken)).redemptionThrottleParams(); + + uint256 supply = rToken.totalSupply(); + + if (supply == 0) return FIX_ONE_256; + + // Calculate hourly limit as: max(params.amtRate, supply.mul(params.pctRate)) + uint256 limit = (supply * params.pctRate) / FIX_ONE_256; // {qRTok} + if (params.amtRate > limit) limit = supply < params.amtRate ? supply : params.amtRate; + + uint256 redeemAvailable = rToken.redemptionAvailable(); + if (redeemAvailable >= limit) return FIX_ONE_256; + + return (redeemAvailable * FIX_ONE_256) / limit; + } + + function backingReedemable( + IRToken rToken, + CollPluginType collType, + IERC20 erc20 + ) external view returns (uint256) { + uint256 backingBalance; + uint256 availableLiquidity; + + if (collType == CollPluginType.AAVE_V2 || collType == CollPluginType.MORPHO_AAVE_V2) { + address underlying; + if (collType == CollPluginType.AAVE_V2) { + // AAVE V2 - Uses Static wrapper + IStaticATokenLM staticAToken = IStaticATokenLM(address(erc20)); + backingBalance = staticAToken.dynamicBalanceOf( + address(rToken.main().backingManager()) + ); + underlying = staticAToken.UNDERLYING_ASSET_ADDRESS(); + } else { + // MORPHO AAVE V2 + MorphoAaveV2TokenisedDeposit mrpTknDeposit = MorphoAaveV2TokenisedDeposit( + address(erc20) + ); + backingBalance = mrpTknDeposit.convertToAssets( + mrpTknDeposit.balanceOf(address(rToken.main().backingManager())) + ); + underlying = mrpTknDeposit.underlying(); + } + + (availableLiquidity, , , , , , , , , ) = IAaveProtocolDataProvider( + AAVE_V2_DATA_PROVIDER + ).getReserveData(underlying); + } else if (collType == CollPluginType.AAVE_V3) { + StaticATokenV3LM staticAToken = StaticATokenV3LM(address(erc20)); + IERC20 aToken = staticAToken.aToken(); + IERC20 underlying = IERC20(staticAToken.asset()); + + backingBalance = staticAToken.convertToAssets( + staticAToken.balanceOf(address(rToken.main().backingManager())) + ); + availableLiquidity = underlying.balanceOf(address(aToken)); + } else if (collType == CollPluginType.COMPOUND_V2 || collType == CollPluginType.FLUX) { + ICToken cToken; + uint256 cTokenBal; + if (collType == CollPluginType.COMPOUND_V2) { + // CompoundV2 uses a vault to wrap the CToken + CTokenWrapper cTokenVault = CTokenWrapper(address(erc20)); + cToken = ICToken(address(cTokenVault.underlying())); + cTokenBal = cTokenVault.balanceOf(address(rToken.main().backingManager())); + } else { + // FLUX - Uses FToken directly (fork of CToken) + cToken = ICToken(address(erc20)); + cTokenBal = cToken.balanceOf(address(rToken.main().backingManager())); + } + IERC20 underlying = IERC20(cToken.underlying()); + + uint256 exchangeRate = cToken.exchangeRateStored(); + + backingBalance = (cTokenBal * exchangeRate) / 1e18; + availableLiquidity = underlying.balanceOf(address(cToken)); + } else if (collType == CollPluginType.COMPOUND_V3) { + ICusdcV3Wrapper cTokenV3Wrapper = ICusdcV3Wrapper(address(erc20)); + CometInterface cTokenV3 = CometInterface(address(cTokenV3Wrapper.underlyingComet())); + IERC20 underlying = IERC20(cTokenV3.baseToken()); + + backingBalance = cTokenV3Wrapper.underlyingBalanceOf( + address(rToken.main().backingManager()) + ); + availableLiquidity = underlying.balanceOf(address(cTokenV3)); + } else if (collType == CollPluginType.STARGATE) { + StargateRewardableWrapper stgWrapper = StargateRewardableWrapper(address(erc20)); + IStargatePool stgPool = stgWrapper.pool(); + + uint256 wstgBal = stgWrapper.balanceOf(address(rToken.main().backingManager())); + + backingBalance = stgPool.amountLPtoLD(wstgBal); + availableLiquidity = stgPool.totalLiquidity(); + } + + if (availableLiquidity == 0) { + return 0; // Avoid division by zero + } + + if (availableLiquidity >= backingBalance) { + return FIX_ONE_256; + } + + // Calculate the percentage + return (availableLiquidity * FIX_ONE_256) / backingBalance; + } + + // solhint-disable-next-line no-empty-blocks + function _authorizeUpgrade(address newImplementation) internal override onlyOwner {} +} diff --git a/contracts/interfaces/IFacadeMonitor.sol b/contracts/interfaces/IFacadeMonitor.sol new file mode 100644 index 0000000000..6c4f6f8d2d --- /dev/null +++ b/contracts/interfaces/IFacadeMonitor.sol @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "./IRToken.sol"; + +/** + * @title IFacadeMonitor + * @notice A monitoring layer for RTokens + */ + +/// PluginType +enum CollPluginType { + AAVE_V2, + AAVE_V3, + COMPOUND_V2, + COMPOUND_V3, + STARGATE, + FLUX, + MORPHO_AAVE_V2 +} + +/** + * @title MonitorParams + * @notice The set of protocol params needed for the required calculations + * Should be defined at deployment based on network + */ + +// solhint-disable var-name-mixedcase +struct MonitorParams { + // === AAVE_V2=== + address AAVE_V2_DATA_PROVIDER_ADDR; +} + +interface IFacadeMonitor { + // === Views === + function batchAuctionsDisabled(IRToken rToken) external view returns (bool); + + function dutchAuctionsDisabled(IRToken rToken) external view returns (bool); + + function issuanceAvailable(IRToken rToken) external view returns (uint256); + + function redemptionAvailable(IRToken rToken) external view returns (uint256); + + function backingReedemable( + IRToken rToken, + CollPluginType collType, + IERC20 erc20 + ) external view returns (uint256); +} diff --git a/contracts/plugins/assets/compoundv2/ICToken.sol b/contracts/plugins/assets/compoundv2/ICToken.sol index 609ea37112..c83f9a3552 100644 --- a/contracts/plugins/assets/compoundv2/ICToken.sol +++ b/contracts/plugins/assets/compoundv2/ICToken.sol @@ -33,6 +33,15 @@ interface ICToken is IERC20Metadata { function redeem(uint256 redeemTokens) external returns (uint256); } +interface TestICToken is ICToken { + /** + * @notice Sender borrows assets from the protocol to their own address + * @param borrowAmount The amount of the underlying asset to borrow + * @return uint 0=success, otherwise a failure + */ + function borrow(uint256 borrowAmount) external returns (uint256); +} + interface IComptroller { /// Claim comp for an account, to an account function claimComp( @@ -44,4 +53,6 @@ interface IComptroller { /// @return The address for COMP token function getCompAddress() external view returns (address); + + function enterMarkets(address[] calldata) external returns (uint256[] memory); } diff --git a/contracts/plugins/mocks/ComptrollerMock.sol b/contracts/plugins/mocks/ComptrollerMock.sol index 49c46df9c9..249bcdb088 100644 --- a/contracts/plugins/mocks/ComptrollerMock.sol +++ b/contracts/plugins/mocks/ComptrollerMock.sol @@ -37,4 +37,9 @@ contract ComptrollerMock is IComptroller { function getCompAddress() external view returns (address) { return address(compToken); } + + // mock + function enterMarkets(address[] calldata) external returns (uint256[] memory) { + return new uint256[](1); + } } diff --git a/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol b/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol new file mode 100644 index 0000000000..ebbfc6b1c2 --- /dev/null +++ b/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../../facade/FacadeMonitor.sol"; + +/** + * @title FacadeMonitorV2 + * @notice Mock to test upgradeability for the FacadeMonitor contract + */ +contract FacadeMonitorV2 is FacadeMonitor { + /// @custom:oz-upgrades-unsafe-allow constructor + constructor(MonitorParams memory params) FacadeMonitor(params) {} + + uint256 public newValue; + + function setNewValue(uint256 newValue_) external onlyOwner { + newValue = newValue_; + } + + function version() public pure returns (string memory) { + return "2.0.0"; + } +} diff --git a/docs/deployed-addresses/1-FacadeMonitor.md b/docs/deployed-addresses/1-FacadeMonitor.md new file mode 100644 index 0000000000..e8cf1a8c05 --- /dev/null +++ b/docs/deployed-addresses/1-FacadeMonitor.md @@ -0,0 +1,7 @@ +# FacadeMonitor (Mainnet) + +## Facade Monitor Proxy + +| Contract | Address | +| -------- | --------------------------------------------------------------------------------------------------------------------- | +| FacadeMonitor (Proxy) | [0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09](https://etherscan.io/address/0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09) | diff --git a/docs/deployed-addresses/8453-FacadeMonitor.md b/docs/deployed-addresses/8453-FacadeMonitor.md new file mode 100644 index 0000000000..4cba0e181a --- /dev/null +++ b/docs/deployed-addresses/8453-FacadeMonitor.md @@ -0,0 +1,8 @@ +8453-FacadeMonitor.md +# FacadeMonitor (Base) + +## Facade Monitor Proxy + +| Contract | Address | +| --------------------- | --------------------------------------------------------------------------------------------------------------------- | +| FacadeMonitor (Proxy) | [0x5bfc6df700ef23741B2e01Bd45826E4c9735ae60](https://basescan.org/address/0x5bfc6df700ef23741B2e01Bd45826E4c9735ae60) | diff --git a/docs/monitoring.md b/docs/monitoring.md new file mode 100644 index 0000000000..df1c5f8baf --- /dev/null +++ b/docs/monitoring.md @@ -0,0 +1,35 @@ +# Monitoring the Reserve Protocol and Rtokens + +This document provides an overview of the monitoring setup for the Reserve Protocol and RTokens on both the Ethereum and Base networks. The monitoring is conducted through the [Hypernative](https://app.hypernative.xyz/) platform, utilizing the `FacadeMonitor` contract to retrieve the status for specific RTokens. This monitoring setup ensures continuous vigilance over the Reserve Protocol and RTokens, with alerts promptly notifying relevant channels in case of any issues. + +## Checks/Alerts + +The following alerts are currently setup for RTokens deployed in Mainnet and Base: + +### Status (Basket Handler) - HIGH + +Checks if the status of the Basket Handler for a specific RToken is SOUND. If not, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Fully collateralized (Basket Handler) - HIGH + +Checks if the Basket Handler for a specific RToken is FULLY COLLATERALIZED. If not, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Batch Auctions Disabled - HIGH + +Checks if the batch auctions for a specific RToken are DISABLED. If true, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Dutch Auctions Disabled - HIGH + +Checks if the any of the dutch auctions for a specific RToken is DISABLED. If true, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Issuance Depleted - MEDIUM + +Triggers and alert via Slack if the Issuance Throttle for a specific RToken is consumed > 99% + +### Redemption Depleted - MEDIUM + +Triggers and alert via Slack if the Redemption Throttle for a specific RToken is consumed > 99% + +### Backing Fully Redeemable- MEDIUM + +Triggers and alert via Slack if the backing of a specific RToken is not redeemable 100% on the underlying Defi Protocol. Provides checks for AAVE V2, AAVE V3, Compound V2, Compound V3, Stargate, Flux, and Morpho AAVE V2. diff --git a/tasks/deployment/deploy-facade-monitor.ts b/tasks/deployment/deploy-facade-monitor.ts new file mode 100644 index 0000000000..290a77f647 --- /dev/null +++ b/tasks/deployment/deploy-facade-monitor.ts @@ -0,0 +1,107 @@ +import { getChainId } from '../../common/blockchain-utils' +import { task, types } from 'hardhat/config' +import { FacadeMonitor } from '../../typechain' +import { developmentChains, networkConfig, IMonitorParams } from '../../common/configuration' +import { ZERO_ADDRESS } from '../../common/constants' +import { ContractFactory } from 'ethers' + +let facadeMonitor: FacadeMonitor + +task( + 'deploy-facade-monitor', + 'Deploys the FacadeMonitor implementation and proxy (if its not an upgrade)' +) + .addParam('upgrade', 'Set to true if this is for a later upgrade', false, types.boolean) + .addOptionalParam('owner', 'The address that will own the FacadeMonitor', '', types.string) + .addOptionalParam('noOutput', 'Suppress output', false, types.boolean) + .setAction(async (params, hre) => { + const [wallet] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + // ********** Read config ********** + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (!params.upgrade) { + if (!params.owner) { + throw new Error( + `An --owner must be specified for the initial deployment to ${hre.network.name}` + ) + } + } + + if (!params.noOutput) { + console.log( + `Deploying FacadeMonitor to ${hre.network.name} (${chainId}) with burner account ${wallet.address}` + ) + } + + // Setup Monitor Params + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, + } + + // Deploy FacadeMonitor + const FacadeMonitorFactory: ContractFactory = await hre.ethers.getContractFactory( + 'FacadeMonitor' + ) + const facadeMonitorImplAddr = (await hre.upgrades.deployImplementation(FacadeMonitorFactory, { + kind: 'uups', + constructorArgs: [monitorParams], + })) as string + + if (!params.noOutput) { + console.log( + `Deployed FacadeMonitor (Implementation) to ${hre.network.name} (${chainId}): ${facadeMonitorImplAddr}` + ) + } + + if (!params.upgrade) { + facadeMonitor = await hre.upgrades.deployProxy( + FacadeMonitorFactory, + [params.owner], + { + kind: 'uups', + initializer: 'init', + constructorArgs: [monitorParams], + } + ) + + if (!params.noOutput) { + console.log( + `Deployed FacadeMonitor (Proxy) to ${hre.network.name} (${chainId}): ${facadeMonitor.address}` + ) + } + } + // Verify if its not a development chain + if (!developmentChains.includes(hre.network.name)) { + // Uncomment to verify + if (!params.noOutput) { + console.log('sleeping 30s') + } + + // Sleep to ensure API is in sync with chain + await new Promise((r) => setTimeout(r, 30000)) // 30s + + if (!params.noOutput) { + console.log('verifying') + } + + /** ******************** Verify FacadeMonitor ****************************************/ + console.time('Verifying FacadeMonitor Implementation') + await hre.run('verify:verify', { + address: facadeMonitorImplAddr, + constructorArguments: [monitorParams], + contract: 'contracts/facade/FacadeMonitor.sol:FacadeMonitor', + }) + console.timeEnd('Verifying FacadeMonitor Implementation') + + if (!params.noOutput) { + console.log('verified') + } + } + + return { facadeMonitor: facadeMonitor ? facadeMonitor.address : 'N/A', facadeMonitorImplAddr } + }) diff --git a/tasks/index.ts b/tasks/index.ts index 4f167da7a5..b1a9df3b56 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -16,6 +16,7 @@ import './deployment/mock/deploy-mock-aave' import './deployment/mock/deploy-mock-wbtc' import './deployment/mock/deploy-mock-easyauction' import './deployment/create-deployer-registry' +import './deployment/deploy-facade-monitor' import './deployment/empty-wallet' import './deployment/cancel-tx' import './deployment/sign-msg' diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 633d1fed48..8ef43c0721 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -54,7 +54,7 @@ import { getLatestBlockTimestamp, getLatestBlockNumber, } from './utils/time' -import { ITradeRequest } from './utils/trades' +import { ITradeRequest, disableBatchTrade, disableDutchTrade } from './utils/trades' import { useEnv } from '#/utils/env' import { parseUnits } from 'ethers/lib/utils' @@ -132,30 +132,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { prices = { sellLow: fp('1'), sellHigh: fp('1'), buyLow: fp('1'), buyHigh: fp('1') } }) - const disableBatchTrade = async () => { - if (IMPLEMENTATION == Implementation.P1) { - const slot = await getStorageAt(broker.address, 205) - await setStorageAt( - broker.address, - 205, - slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) - ) - } else { - const slot = await getStorageAt(broker.address, 56) - await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) - } - expect(await broker.batchTradeDisabled()).to.equal(true) - } - - const disableDutchTrade = async (erc20: string) => { - const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') - const p = mappingSlot.toHexString().slice(2).padStart(64, '0') - const key = erc20.slice(2).padStart(64, '0') - const slot = ethers.utils.keccak256('0x' + key + p) - await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) - expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) - } - describe('Deployment', () => { it('Should setup Broker correctly', async () => { expect(await broker.gnosis()).to.equal(gnosis.address) @@ -412,7 +388,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Disable batch trade manually - await disableBatchTrade() + await disableBatchTrade(broker) expect(await broker.batchTradeDisabled()).to.equal(true) // Enable batch trade with owner @@ -425,7 +401,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Disable dutch trade manually - await disableDutchTrade(token0.address) + await disableDutchTrade(broker, token0.address) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(true) // Enable dutch trade with owner @@ -444,7 +420,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { describe('Trade Management', () => { it('Should not allow to open Batch trade if Disabled', async () => { // Disable Broker Batch Auctions - await disableBatchTrade() + await disableBatchTrade(broker) const tradeRequest: ITradeRequest = { sell: collateral0.address, @@ -479,7 +455,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token0 - await disableDutchTrade(token0.address) + await disableDutchTrade(broker, token0.address) // Dutch Auction openTrade should fail now await expect( @@ -498,7 +474,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token1 - await disableDutchTrade(token1.address) + await disableDutchTrade(broker, token1.address) // Dutch Auction openTrade should fail now await expect( diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 9da2b8398a..df8269dc8a 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -3,11 +3,13 @@ import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' -import { ethers } from 'hardhat' +import { ethers, upgrades } from 'hardhat' import { expectEvents } from '../common/events' -import { IConfig } from '#/common/configuration' +import { IConfig, IMonitorParams } from '#/common/configuration' import { bn, fp } from '../common/numbers' import { setOraclePrice } from './utils/oracles' +import { disableBatchTrade, disableDutchTrade } from './utils/trades' + import { Asset, BackingManagerP1, @@ -18,6 +20,8 @@ import { CTokenWrapperMock, ERC20Mock, FacadeAct, + FacadeMonitor, + FacadeMonitorV2, FacadeRead, FacadeTest, MockV3Aggregator, @@ -49,7 +53,13 @@ import { PRICE_TIMEOUT, } from './fixtures' import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' -import { CollateralStatus, TradeKind, MAX_UINT256, ZERO_ADDRESS } from '#/common/constants' +import { + CollateralStatus, + TradeKind, + MAX_UINT256, + ONE_PERIOD, + ZERO_ADDRESS, +} from '#/common/constants' import { expectTrade } from './utils/trades' import { mintCollaterals } from './utils/tokens' @@ -57,7 +67,7 @@ const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.ski const itP1 = IMPLEMENTATION == Implementation.P1 ? it : it.skip -describe('FacadeRead + FacadeAct contracts', () => { +describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { let owner: SignerWithAddress let addr1: SignerWithAddress let addr2: SignerWithAddress @@ -85,6 +95,7 @@ describe('FacadeRead + FacadeAct contracts', () => { let facade: FacadeRead let facadeTest: FacadeTest let facadeAct: FacadeAct + let facadeMonitor: FacadeMonitor // Main let rToken: TestIRToken @@ -127,6 +138,7 @@ describe('FacadeRead + FacadeAct contracts', () => { facade, facadeAct, facadeTest, + facadeMonitor, rToken, main, basketHandler, @@ -1047,6 +1059,339 @@ describe('FacadeRead + FacadeAct contracts', () => { } }) + describe('FacadeMonitor', () => { + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: ZERO_ADDRESS, + } + + beforeEach(async () => { + // Mint Tokens + initialBal = bn('10000000000e18') + await token.connect(owner).mint(addr1.address, initialBal) + await usdc.connect(owner).mint(addr1.address, initialBal) + await aToken.connect(owner).mint(addr1.address, initialBal) + await cTokenVault.connect(owner).mint(addr1.address, initialBal) + + // Provide approvals + await token.connect(addr1).approve(rToken.address, initialBal) + await usdc.connect(addr1).approve(rToken.address, initialBal) + await aToken.connect(addr1).approve(rToken.address, initialBal) + await cTokenVault.connect(addr1).approve(rToken.address, initialBal) + }) + + it('should return batch auctions disabled correctly', async () => { + expect(await facadeMonitor.batchAuctionsDisabled(rToken.address)).to.equal(false) + + // Disable Broker Batch Auctions + await disableBatchTrade(broker) + + expect(await facadeMonitor.batchAuctionsDisabled(rToken.address)).to.equal(true) + }) + + it('should return dutch auctions disabled correctly', async () => { + expect(await facadeMonitor.dutchAuctionsDisabled(rToken.address)).to.equal(false) + + // Disable Broker Dutch Auctions for token0 + await disableDutchTrade(broker, token.address) + + expect(await facadeMonitor.dutchAuctionsDisabled(rToken.address)).to.equal(true) + }) + + it('should return issuance available', async () => { + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) // no supply + + // Issue some RTokens (1%) + const issueAmount = bn('10000e18') + + // Issue rTokens (1%) + await rToken.connect(addr1).issue(issueAmount) + + // check throttles updated + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('0.99')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issue additional rTokens (another 1%) + await rToken.connect(addr1).issue(issueAmount) + + // Should be 2% down minus some recharging + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.98'), + fp('0.001') + ) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Advance time significantly + await advanceTime(10000000) + + // Check new issuance available - fully recharged + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issuance #2 - Consume all throttle + const issueAmount2: BigNumber = config.issuanceThrottle.amtRate + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount2) + + // Check new issuance available - all consumed + expect(await rToken.issuanceAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + }) + + it('should return redemption available', async () => { + const issueAmount = bn('100000e18') + + // Decrease redemption allowed amount + const redeemThrottleParams = { amtRate: issueAmount.div(2), pctRate: fp('0.1') } // 50K + await rToken.connect(owner).setRedemptionThrottleParams(redeemThrottleParams) + + // Check with no supply + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issue some RTokens + await rToken.connect(addr1).issue(issueAmount) + + // check throttles - redemption still fully available + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('0.9')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redeem RTokens (50% of throttle) + await rToken.connect(addr1).redeem(issueAmount.div(4)) + + // check throttle - redemption allowed decreased to 50% + expect(await rToken.redemptionAvailable()).to.equal(issueAmount.div(4)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('0.5')) + + // Advance time significantly + await advanceTime(10000000) + + // Check redemption available - fully recharged + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redemption #2 - Consume all throttle + await rToken.connect(addr1).redeem(issueAmount.div(2)) + + // Check new redemption available - all consumed + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(bn(0)) + }) + + it('Should handle issuance/redemption throttles correctly, using percent', async function () { + // Full issuance available. Nothing to redeem + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issue full throttle + const issueAmount1: BigNumber = config.issuanceThrottle.amtRate + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount1) + + // Check redemption throttles updated + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Advance time significantly + await advanceTime(1000000000) + + // Check new issuance available - fully recharged + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await rToken.redemptionAvailable()).to.equal(issueAmount1) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issuance #2 - Full throttle again - will be processed + const issueAmount2: BigNumber = config.issuanceThrottle.amtRate + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount2) + + // Check new issuance available - all consumed + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) + + // Check redemption throttle updated - fixed in max (does not exceed) + expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Set issuance throttle to percent only + const issuanceThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } // 10% + await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) + + // Advance time significantly + await advanceTime(1000000000) + + // Check new issuance available - 10% of supply (2 M) = 200K + const supplyThrottle = bn('200000e18') + expect(await rToken.issuanceAvailable()).to.equal(supplyThrottle) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + + // Check redemption throttle unchanged + expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issuance #3 - Should be allowed, does not exceed supply restriction + const issueAmount3: BigNumber = bn('100000e18') + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount3) + + // Check issuance throttle updated - Previous issuances recharged + expect(await rToken.issuanceAvailable()).to.equal(supplyThrottle.sub(issueAmount3)) + + // Hourly Limit: 210K (10% of total supply of 2.1 M) + // Available: 100 K / 201K (~ 0.47619) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.476'), + fp('0.001') + ) + + // Check redemption throttle unchanged + expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Check all issuances are confirmed + expect(await rToken.balanceOf(addr1.address)).to.equal( + issueAmount1.add(issueAmount2).add(issueAmount3) + ) + + // Advance time, issuance will recharge a bit + await advanceTime(100) + + // Now 50% of hourly limit available (~105.8K / 210 K) + expect(await rToken.issuanceAvailable()).to.be.closeTo(fp('105800'), fp('100')) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.5'), + fp('0.01') + ) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + const issueAmount4: BigNumber = fp('105800') + // Issuance #4 - almost all available + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount4) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.003'), + fp('0.001') + ) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Advance time significantly to fully recharge + await advanceTime(1000000000) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Check redemptions + // Set redemption throttle to percent only + const redemptionThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } // 10% + await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + + const totalSupply = await rToken.totalSupply() + expect(await rToken.redemptionAvailable()).to.equal(totalSupply.div(10)) // 10% + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redeem half of the available throttle + await rToken.connect(addr1).redeem(totalSupply.div(10).div(2)) + + // About 52% now used of redemption throttle + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.be.closeTo( + fp('0.52'), + fp('0.01') + ) + + // Advance time significantly to fully recharge + await advanceTime(1000000000) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redeem all remaining + await rToken.connect(addr1).redeem(await rToken.redemptionAvailable()) + + // Check all consumed + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(bn(0)) + }) + + it('Should not allow empty owner on initialization', async () => { + const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') + + const newFacadeMonitor = await upgrades.deployProxy(FacadeMonitorFactory, [], { + constructorArgs: [monitorParams], + kind: 'uups', + }) + + await expect(newFacadeMonitor.init(ZERO_ADDRESS)).to.be.revertedWith('invalid owner address') + }) + + it('Should allow owner to transfer ownership', async () => { + expect(await facadeMonitor.owner()).to.equal(owner.address) + + // Attempt to transfer ownership with another account + await expect( + facadeMonitor.connect(addr1).transferOwnership(addr1.address) + ).to.be.revertedWith('Ownable: caller is not the owner') + + // Owner remains the same + expect(await facadeMonitor.owner()).to.equal(owner.address) + + // Transfer ownership with owner + await expect(facadeMonitor.connect(owner).transferOwnership(addr1.address)) + .to.emit(facadeMonitor, 'OwnershipTransferred') + .withArgs(owner.address, addr1.address) + + // Owner changed + expect(await facadeMonitor.owner()).to.equal(addr1.address) + }) + + it('Should only allow owner to upgrade', async () => { + const FacadeMonitorV2Factory: ContractFactory = await ethers.getContractFactory( + 'FacadeMonitorV2' + ) + const facadeMonitorV2 = await FacadeMonitorV2Factory.deploy(monitorParams) + + await expect( + facadeMonitor.connect(addr1).upgradeTo(facadeMonitorV2.address) + ).to.be.revertedWith('Ownable: caller is not the owner') + await expect(facadeMonitor.connect(owner).upgradeTo(facadeMonitorV2.address)).to.not.be + .reverted + }) + + it('Should upgrade correctly', async () => { + // Upgrading + const FacadeMonitorV2Factory: ContractFactory = await ethers.getContractFactory( + 'FacadeMonitorV2' + ) + const facadeMonitorV2: FacadeMonitorV2 = await upgrades.upgradeProxy( + facadeMonitor.address, + FacadeMonitorV2Factory, + { + constructorArgs: [monitorParams], + } + ) + + // Check address is maintained + expect(facadeMonitorV2.address).to.equal(facadeMonitor.address) + + // Check state is preserved + expect(await facadeMonitorV2.owner()).to.equal(owner.address) + + // Check new version is implemented + expect(await facadeMonitorV2.version()).to.equal('2.0.0') + + expect(await facadeMonitorV2.newValue()).to.equal(0) + await facadeMonitorV2.connect(owner).setNewValue(bn(1000)) + expect(await facadeMonitorV2.newValue()).to.equal(bn(1000)) + }) + }) + // P1 only describeP1('FacadeAct', () => { let issueAmount: BigNumber diff --git a/test/fixtures.ts b/test/fixtures.ts index 6244d68ff3..a787359e1b 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -1,11 +1,23 @@ import { ContractFactory } from 'ethers' import { expect } from 'chai' -import hre, { ethers } from 'hardhat' +import hre, { ethers, upgrades } from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { IConfig, IImplementations, IRevenueShare, networkConfig } from '../common/configuration' +import { + IConfig, + IImplementations, + IMonitorParams, + IRevenueShare, + networkConfig, +} from '../common/configuration' import { expectInReceipt } from '../common/events' import { bn, fp } from '../common/numbers' -import { CollateralStatus, PAUSER, LONG_FREEZER, SHORT_FREEZER } from '../common/constants' +import { + CollateralStatus, + PAUSER, + LONG_FREEZER, + SHORT_FREEZER, + ZERO_ADDRESS, +} from '../common/constants' import { Asset, AssetRegistryP1, @@ -24,6 +36,7 @@ import { DutchTrade, FacadeRead, FacadeAct, + FacadeMonitor, FacadeTest, DistributorP1, FiatCollateral, @@ -412,6 +425,7 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt facade: FacadeRead facadeAct: FacadeAct facadeTest: FacadeTest + facadeMonitor: FacadeMonitor broker: TestIBroker rsrTrader: TestIRevenueTrader rTokenTrader: TestIRevenueTrader @@ -468,6 +482,11 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = }, } + // Setup Monitor Params (mock addrs for local deployment) + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: ZERO_ADDRESS, + } + // Deploy TradingLib external library const TradingLibFactory: ContractFactory = await ethers.getContractFactory('TradingLibP0') const tradingLib: TradingLibP0 = await TradingLibFactory.deploy() @@ -484,6 +503,19 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() + // Deploy FacadeMonitor + const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') + + const facadeMonitor = await upgrades.deployProxy( + FacadeMonitorFactory, + [owner.address], + { + kind: 'uups', + initializer: 'init', + constructorArgs: [monitorParams], + } + ) + // Deploy RSR chainlink feed const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( 'MockV3Aggregator' @@ -751,6 +783,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, facadeAct, facadeTest, + facadeMonitor, rsrTrader, rTokenTrader, bySymbol, diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 206cfb2afe..c9778bb7df 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -1,8 +1,14 @@ import { BigNumber, ContractFactory } from 'ethers' import hre, { ethers } from 'hardhat' import { getChainId } from '../../common/blockchain-utils' -import { IConfig, IImplementations, IRevenueShare, networkConfig } from '../../common/configuration' -import { PAUSER, SHORT_FREEZER, LONG_FREEZER } from '../../common/constants' +import { + IConfig, + IImplementations, + IMonitorParams, + IRevenueShare, + networkConfig, +} from '../../common/configuration' +import { PAUSER, SHORT_FREEZER, LONG_FREEZER, ZERO_ADDRESS } from '../../common/constants' import { expectInReceipt } from '../../common/events' import { advanceTime } from '../utils/time' import { bn, fp } from '../../common/numbers' @@ -54,6 +60,7 @@ import { TestIRToken, TestIStRSR, RecollateralizationLibP1, + FacadeMonitor, } from '../../typechain' import { Collateral, @@ -247,6 +254,7 @@ export async function collateralFixture( 'stat' + symbol ) ) + const coll = await ATokenCollateralFactory.deploy( { priceTimeout: PRICE_TIMEOUT, @@ -584,7 +592,7 @@ type RSRAndCompAaveAndCollateralAndModuleFixture = RSRFixture & CollateralFixture & ModuleFixture -interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { +export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { config: IConfig dist: IRevenueShare deployer: TestIDeployer @@ -603,6 +611,7 @@ interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { facade: FacadeRead facadeAct: FacadeAct facadeTest: FacadeTest + facadeMonitor: FacadeMonitor broker: TestIBroker rsrTrader: TestIRevenueTrader rTokenTrader: TestIRevenueTrader @@ -663,6 +672,11 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = }, } + // Setup Monitor Params based on network + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, + } + // Deploy FacadeRead const FacadeReadFactory: ContractFactory = await ethers.getContractFactory('FacadeRead') const facade = await FacadeReadFactory.deploy() @@ -675,6 +689,10 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() + // Deploy FacadeMonitor - Use implementation to simplify deployments + const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') + const facadeMonitor = await FacadeMonitorFactory.deploy(monitorParams) + // Deploy TradingLib external library const TradingLibFactory: ContractFactory = await ethers.getContractFactory( 'RecollateralizationLibP1' @@ -930,6 +948,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, facadeAct, facadeTest, + facadeMonitor, rsrTrader, rTokenTrader, } diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index c575f48e3d..f5b5dff068 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -5,6 +5,7 @@ const forkBlockNumber = { 'mainnet-deployment': 15690042, // Ethereum 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum + 'facade-monitor': 18742016, // Ethereum default: 18522901, // Ethereum } diff --git a/test/monitor/FacadeMonitor.test.ts b/test/monitor/FacadeMonitor.test.ts new file mode 100644 index 0000000000..45b7bf1d22 --- /dev/null +++ b/test/monitor/FacadeMonitor.test.ts @@ -0,0 +1,1417 @@ +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { expect } from 'chai' +import { BigNumber, Contract } from 'ethers' +import hre, { ethers } from 'hardhat' +import { Collateral, IMPLEMENTATION } from '../fixtures' +import { defaultFixtureNoBasket, DefaultFixture } from '../integration/fixtures' +import { getChainId } from '../../common/blockchain-utils' +import { IConfig, baseL2Chains, networkConfig } from '../../common/configuration' +import { bn, fp, toBNDecimals } from '../../common/numbers' +import { advanceTime } from '../utils/time' +import { whileImpersonating } from '../utils/impersonation' +import { pushOracleForward } from '../utils/oracles' + +import forkBlockNumber from '../integration/fork-block-numbers' +import { + ATokenFiatCollateral, + AaveV3FiatCollateral, + CTokenV3Collateral, + CTokenFiatCollateral, + ERC20Mock, + FacadeTest, + FacadeMonitor, + FiatCollateral, + IAToken, + IComptroller, + IERC20, + ILendingPool, + IPool, + IWETH, + StaticATokenLM, + IAssetRegistry, + TestIBackingManager, + TestIBasketHandler, + TestICToken, + TestIRToken, + USDCMock, + CTokenWrapper, + StaticATokenV3LM, + CusdcV3Wrapper, + CometInterface, + StargateRewardableWrapper, + StargatePoolFiatCollateral, + IStargatePool, + MorphoAaveV2TokenisedDeposit, +} from '../../typechain' +import { useEnv } from '#/utils/env' +import { MAX_UINT256 } from '#/common/constants' + +enum CollPluginType { + AAVE_V2, + AAVE_V3, + COMPOUND_V2, + COMPOUND_V3, + STARGATE, + FLUX, + MORPHO_AAVE_V2, +} + +// Relevant addresses (Mainnet) +const holderDAI = '0x075e72a5eDf65F0A5f44699c7654C1a76941Ddc8' +const holderCDAI = '0x01d127D90513CCB6071F83eFE15611C4d9890668' +const holderADAI = '0x07edE94cF6316F4809f2B725f5d79AD303fB4Dc8' +const holderaUSDCV3 = '0x1eAb3B222A5B57474E0c237E7E1C4312C1066855' +const holderWETH = '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' +const holdercUSDCV3 = '0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03' +const holdersUSDC = '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' +const holderfUSDC = '0x86A07dDED024121b282362f4e7A249b00F5dAB37' +const holderUSDC = '0x28C6c06298d514Db089934071355E5743bf21d60' + +let owner: SignerWithAddress + +const describeFork = useEnv('FORK') ? describe : describe.skip + +describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, function () { + let addr1: SignerWithAddress + let addr2: SignerWithAddress + + // Assets + let collateral: Collateral[] + + // Tokens and Assets + let dai: ERC20Mock + let aDai: IAToken + let stataDai: StaticATokenLM + let usdc: USDCMock + let aUsdcV3: IAToken + let sUsdc: IStargatePool + let fUsdc: TestICToken + let weth: IWETH + let cDai: TestICToken + let cDaiVault: CTokenWrapper + let cusdcV3: CometInterface + let daiCollateral: FiatCollateral + let aDaiCollateral: ATokenFiatCollateral + + // Contracts to retrieve after deploy + let rToken: TestIRToken + let facadeTest: FacadeTest + let facadeMonitor: FacadeMonitor + let assetRegistry: IAssetRegistry + let basketHandler: TestIBasketHandler + let backingManager: TestIBackingManager + let config: IConfig + + let initialBal: BigNumber + let basket: Collateral[] + let erc20s: IERC20[] + + let fullLiquidityAmt: BigNumber + let chainId: number + + // Setup test environment + const setup = async (blockNumber: number) => { + // Use Mainnet fork + await hre.network.provider.request({ + method: 'hardhat_reset', + params: [ + { + forking: { + jsonRpcUrl: useEnv('MAINNET_RPC_URL'), + blockNumber: blockNumber, + }, + }, + ], + }) + } + + describe('FacadeMonitor', () => { + before(async () => { + await setup(forkBlockNumber['facade-monitor']) + + chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + }) + + beforeEach(async () => { + ;[owner, addr1, addr2] = await ethers.getSigners() + ;({ + erc20s, + collateral, + basket, + assetRegistry, + basketHandler, + backingManager, + rToken, + facadeTest, + facadeMonitor, + config, + } = await loadFixture(defaultFixtureNoBasket)) + + // Get tokens + dai = erc20s[0] // DAI + cDaiVault = erc20s[6] // cDAI + cDai = await ethers.getContractAt('TestICToken', await cDaiVault.underlying()) // cDAI + stataDai = erc20s[10] // static aDAI + + // Get plain aTokens + aDai = ( + await ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', + networkConfig[chainId].tokens.aDAI || '' + ) + ) + + // Get collaterals + daiCollateral = collateral[0] // DAI + aDaiCollateral = collateral[10] // aDAI + + // Get assets and tokens for default basket + daiCollateral = basket[0] + aDaiCollateral = basket[1] + + dai = await ethers.getContractAt('ERC20Mock', await daiCollateral.erc20()) + stataDai = ( + await ethers.getContractAt('StaticATokenLM', await aDaiCollateral.erc20()) + ) + + // Get plain aToken + aDai = ( + await ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', + networkConfig[chainId].tokens.aDAI || '' + ) + ) + + usdc = ( + await ethers.getContractAt('USDCMock', networkConfig[chainId].tokens.USDC || '') + ) + aUsdcV3 = await ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', // use V2 interface, it includes ERC20 + networkConfig[chainId].tokens.aEthUSDC || '' + ) + + cusdcV3 = ( + await ethers.getContractAt('CometInterface', networkConfig[chainId].tokens.cUSDCv3 || '') + ) + + sUsdc = ( + await ethers.getContractAt('IStargatePool', networkConfig[chainId].tokens.sUSDC || '') + ) + + fUsdc = ( + await ethers.getContractAt('TestICToken', networkConfig[chainId].tokens.fUSDC || '') + ) + + initialBal = bn('2500000e18') + + // Fund user with static aDAI + await whileImpersonating(holderADAI, async (adaiSigner) => { + // Wrap ADAI into static ADAI + await aDai.connect(adaiSigner).transfer(addr1.address, initialBal) + await aDai.connect(addr1).approve(stataDai.address, initialBal) + await stataDai.connect(addr1).deposit(addr1.address, initialBal, 0, false) + }) + + // Fund user with aUSDCV3 + await whileImpersonating(holderaUSDCV3, async (ausdcV3Signer) => { + await aUsdcV3.connect(ausdcV3Signer).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with DAI + await whileImpersonating(holderDAI, async (daiSigner) => { + await dai.connect(daiSigner).transfer(addr1.address, initialBal.mul(8)) + }) + + // Fund user with cDAI + await whileImpersonating(holderCDAI, async (cdaiSigner) => { + await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) + await cDai.connect(addr1).approve(cDaiVault.address, toBNDecimals(initialBal, 8).mul(100)) + await cDaiVault.connect(addr1).deposit(toBNDecimals(initialBal, 8).mul(100), addr1.address) + }) + + // Fund user with cUSDCV3 + await whileImpersonating(holdercUSDCV3, async (cusdcV3Signer) => { + await cusdcV3.connect(cusdcV3Signer).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with sUSDC + await whileImpersonating(holdersUSDC, async (susdcSigner) => { + await sUsdc.connect(susdcSigner).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with fUSDC + await whileImpersonating(holderfUSDC, async (fusdcSigner) => { + await fUsdc + .connect(fusdcSigner) + .transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) + }) + + // Fund user with USDC + await whileImpersonating(holderUSDC, async (usdcSigner) => { + await usdc.connect(usdcSigner).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with WETH + weth = await ethers.getContractAt('IWETH', networkConfig[chainId].tokens.WETH || '') + await whileImpersonating(holderWETH, async (signer) => { + await weth.connect(signer).transfer(addr1.address, fp('500000')) + }) + }) + + describe('AAVE V2', () => { + const issueAmount: BigNumber = bn('1000000e18') + let lendingPool: ILendingPool + let aaveV2DataProvider: Contract + + beforeEach(async () => { + // Setup basket + await basketHandler.connect(owner).setPrimeBasket([stataDai.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await stataDai.connect(addr1).approve(rToken.address, issueAmount) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + lendingPool = ( + await ethers.getContractAt('ILendingPool', networkConfig[chainId].AAVE_LENDING_POOL || '') + ) + + const aaveV2DataProviderAbi = [ + 'function getReserveData(address asset) external view returns (uint256 availableLiquidity,uint256 totalStableDebt,uint256 totalVariableDebt,uint256 liquidityRate,uint256 variableBorrowRate,uint256 stableBorrowRate,uint256 averageStableBorrowRate,uint256 liquidityIndex,uint256 variableBorrowIndex,uint40 lastUpdateTimestamp)', + ] + aaveV2DataProvider = await ethers.getContractAt( + aaveV2DataProviderAbi, + networkConfig[chainId].AAVE_DATA_PROVIDER || '' + ) + + // Get current liquidity + ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider + .connect(addr1) + .getReserveData(dai.address) + + // Provide liquidity in AAVE V2 to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(lendingPool.address, amountToDeposit) + await lendingPool.connect(addr1).deposit(weth.address, amountToDeposit, addr1.address, 0) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) + await expect(lendingPool.connect(addr2).withdraw(dai.address, MAX_UINT256, addr2.address)) + .to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await aDai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing available to be redeemed + const borrowAmount = fullLiquidityAmt.sub(issueAmount.mul(80).div(100)) + await lendingPool.connect(addr1).borrow(dai.address, borrowAmount, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await lendingPool + .connect(addr1) + .borrow(dai.address, remainingLiquidity.div(2), 2, 0, addr1.address) + + // Now only 40% is available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) + await expect(lendingPool.connect(addr2).withdraw(dai.address, MAX_UINT256, addr2.address)) + .to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // But we can redeem if we reduce the amount to 30% + await expect( + lendingPool + .connect(addr2) + .withdraw( + dai.address, + (await aDai.balanceOf(addr2.address)).mul(30).div(100), + addr2.address + ) + ).to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await lendingPool.connect(addr1).borrow(dai.address, fullLiquidityAmt, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) + await expect( + lendingPool + .connect(addr2) + .withdraw(dai.address, (await aDai.balanceOf(addr2.address)).div(100), addr2.address) + ).to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('AAVE V3', () => { + const issueAmount: BigNumber = bn('1000000e18') + let stataUsdcV3: StaticATokenV3LM + let pool: IPool + + beforeEach(async () => { + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + stataUsdcV3 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + + await stataUsdcV3.deployed() + await ( + await stataUsdcV3.initialize( + networkConfig[chainId].tokens.aEthUSDC!, + 'Static Aave Ethereum USDC', + 'saEthUSDC' + ) + ).wait() + + /******** Deploy Aave V3 USDC collateral plugin **************************/ + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const collateral = await CollateralFactory.connect(owner).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError, + erc20: stataUsdcV3.address, + maxTradeVolume: fp('1e6'), + oracleTimeout: usdcOracleTimeout, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError), + delayUntilDefault: bn('86400'), + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Wrap aUsdcV3 + await aUsdcV3.connect(addr1).approve(stataUsdcV3.address, toBNDecimals(initialBal, 6)) + await stataUsdcV3 + .connect(addr1) + ['deposit(uint256,address,uint16,bool)']( + toBNDecimals(initialBal, 6), + addr1.address, + 0, + false + ) + + // Get current liquidity + fullLiquidityAmt = await usdc.balanceOf(aUsdcV3.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([stataUsdcV3.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await stataUsdcV3.connect(addr1).approve(rToken.address, issueAmount) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + pool = await ethers.getContractAt('IPool', networkConfig[chainId].AAVE_V3_POOL || '') + + // Provide liquidity to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(pool.address, amountToDeposit) + await pool.connect(addr1).supply(weth.address, amountToDeposit, addr1.address, 0) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataUsdcV3 + .connect(addr2) + ['redeem(uint256,address,address,bool)']( + bmBalanceAmt, + addr2.address, + addr2.address, + false + ) + await expect(pool.connect(addr2).withdraw(usdc.address, MAX_UINT256, addr2.address)).to.not + .be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await aUsdcV3.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing to be able to be redeemed + const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) + await pool.connect(addr1).borrow(usdc.address, borrowAmount, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await pool + .connect(addr1) + .borrow(usdc.address, remainingLiquidity.div(2), 2, 0, addr1.address) + + // Only 40% available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataUsdcV3 + .connect(addr2) + ['redeem(uint256,address,address,bool)']( + bmBalanceAmt, + addr2.address, + addr2.address, + false + ) + await expect(pool.connect(addr2).withdraw(usdc.address, MAX_UINT256, addr2.address)).to.be + .reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // We can redeem if we reduce to 30% + await expect( + pool + .connect(addr2) + .withdraw( + usdc.address, + (await aUsdcV3.balanceOf(addr2.address)).mul(30).div(100), + addr2.address + ) + ).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await pool.connect(addr1).borrow(usdc.address, fullLiquidityAmt, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataUsdcV3 + .connect(addr2) + ['redeem(uint256,address,address,bool)']( + bmBalanceAmt, + addr2.address, + addr2.address, + false + ) + await expect( + pool + .connect(addr2) + .withdraw( + usdc.address, + (await aUsdcV3.balanceOf(addr2.address)).div(100), + addr2.address + ) + ).to.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('Compound V2', () => { + const issueAmount: BigNumber = bn('1000000e18') + let comptroller: IComptroller + + beforeEach(async () => { + // Setup basket + await basketHandler.connect(owner).setPrimeBasket([cDaiVault.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await cDaiVault + .connect(addr1) + .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + // Get current liquidity + fullLiquidityAmt = await dai.balanceOf(cDai.address) + + // Compound Comptroller + comptroller = await ethers.getContractAt( + 'ComptrollerMock', + networkConfig[chainId].COMPTROLLER || '' + ) + + // Deposit ETH to be able to borrow + const cEtherAbi = [ + 'function mint(uint256 mintAmount) external payable returns (uint256)', + 'function balanceOf(address owner) external view returns (uint256 balance)', + ] + const cEth = await ethers.getContractAt(cEtherAbi, networkConfig[chainId].tokens.cETH || '') + await comptroller.connect(addr1).enterMarkets([cEth.address]) + const amountToDeposit = fp('500000') + await weth.connect(addr1).withdraw(amountToDeposit) + await cEth.connect(addr1).mint(amountToDeposit, { value: amountToDeposit }) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // COMPOUND V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) + expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) + + await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await cDai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // COMPOUND V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing to be able to be redeemed + const borrowAmount = fullLiquidityAmt.sub(issueAmount.mul(80).div(100)) + await cDai.connect(addr1).borrow(borrowAmount) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await cDai.connect(addr1).borrow(bn(remainingLiquidity.div(2))) + + // Now only 40% of backing can be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) + await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // We can redeem iff we reduce to 30% + await expect(cDai.connect(addr2).redeem(bmBalanceAmt.mul(30).div(100))).to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await cDai.connect(addr1).borrow(fullLiquidityAmt) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) + expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) + + await expect(cDai.connect(addr2).redeem((await cDai.balanceOf(addr2.address)).div(100))).to + .be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('Compound V3', () => { + const issueAmount: BigNumber = bn('1000000e18') + let wcusdcV3: CusdcV3Wrapper + + beforeEach(async () => { + const CUsdcV3WrapperFactory = await hre.ethers.getContractFactory('CusdcV3Wrapper') + + wcusdcV3 = ( + await CUsdcV3WrapperFactory.deploy( + cusdcV3.address, + networkConfig[chainId].COMET_REWARDS || '', + networkConfig[chainId].tokens.COMP || '' + ) + ) + await wcusdcV3.deployed() + + /******** Deploy Compound V3 USDC collateral plugin **************************/ + const CollateralFactory = await ethers.getContractFactory('CTokenV3Collateral') + + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await CollateralFactory.connect(owner).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError.toString(), + erc20: wcusdcV3.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: usdcOracleTimeout, // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6'), + bn('10000e6').toString() // $10k + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Wrap cUSDCV3 + await cusdcV3.connect(addr1).allow(wcusdcV3.address, true) + await wcusdcV3.connect(addr1).deposit(toBNDecimals(initialBal, 6)) + + // Get current liquidity + fullLiquidityAmt = await usdc.balanceOf(cusdcV3.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([wcusdcV3.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await wcusdcV3.connect(addr1).approve(rToken.address, MAX_UINT256) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + // Provide liquidity to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(cusdcV3.address, amountToDeposit) + await cusdcV3.connect(addr1).supply(weth.address, amountToDeposit.div(2)) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // Compound V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) + + await expect(cusdcV3.connect(addr2).withdraw(usdc.address, MAX_UINT256)).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await cusdcV3.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing to be able to be redeemed + const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) + await cusdcV3.connect(addr1).withdraw(usdc.address, borrowAmount) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await cusdcV3.connect(addr1).withdraw(usdc.address, remainingLiquidity.div(2)) + + // Only 40% available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) + + await expect(cusdcV3.connect(addr2).withdraw(usdc.address, MAX_UINT256)).to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // We can redeem if we reduce to 30% + await expect( + cusdcV3 + .connect(addr2) + .withdraw(usdc.address, (await cusdcV3.balanceOf(addr2.address)).mul(30).div(100)) + ).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await cusdcV3.connect(addr1).withdraw(usdc.address, fullLiquidityAmt) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) + + await expect( + cusdcV3 + .connect(addr2) + .withdraw(usdc.address, (await cusdcV3.balanceOf(addr2.address)).div(100)) + ).to.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('Stargate', () => { + const issueAmount: BigNumber = bn('1000000e18') + let wstgUsdc: StargateRewardableWrapper + + beforeEach(async () => { + const SthWrapperFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') + + wstgUsdc = await SthWrapperFactory.deploy( + 'Wrapped Stargate USDC', + 'wsgUSDC', + networkConfig[chainId].tokens.STG!, + networkConfig[chainId].STARGATE_STAKING_CONTRACT!, + networkConfig[chainId].tokens.sUSDC! + ) + await wstgUsdc.deployed() + + /******** Deploy Stargate USDC collateral plugin **************************/ + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const CollateralFactory = await hre.ethers.getContractFactory('StargatePoolFiatCollateral') + const collateral = await CollateralFactory.connect( + owner + ).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError, + erc20: wstgUsdc.address, + maxTradeVolume: fp('1e6'), + oracleTimeout: usdcOracleTimeout, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError), + delayUntilDefault: bn('86400'), + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Wrap sUsdc + await sUsdc.connect(addr1).approve(wstgUsdc.address, toBNDecimals(initialBal, 6)) + await wstgUsdc.connect(addr1).deposit(toBNDecimals(initialBal, 6), addr1.address) + + // Get current liquidity + fullLiquidityAmt = await sUsdc.totalLiquidity() + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([wstgUsdc.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await wstgUsdc.connect(addr1).approve(rToken.address, issueAmount) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + }) + + it('Should return 100%, full liquidity available at all times', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.STARGATE, + wstgUsdc.address + ) + ).to.equal(fp('1')) + }) + }) + + describe('Flux', () => { + const issueAmount: BigNumber = bn('1000000e18') + + beforeEach(async () => { + /******** Deploy Flux USDC collateral plugin **************************/ + const CollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') + + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await CollateralFactory.connect(owner).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError.toString(), + erc20: fUsdc.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: usdcOracleTimeout, // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Get current liquidity + fullLiquidityAmt = await usdc.balanceOf(fUsdc.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([fUsdc.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await fUsdc.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // FLUX - All redeemable + expect( + await facadeMonitor.backingReedemable(rToken.address, CollPluginType.FLUX, fUsdc.address) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await fUsdc.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await fUsdc.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await expect(fUsdc.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await fUsdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('MORPHO - AAVE V2', () => { + const issueAmount: BigNumber = bn('1000000e18') + let lendingPool: ILendingPool + let maUSDC: MorphoAaveV2TokenisedDeposit + let aaveV2DataProvider: Contract + + beforeEach(async () => { + /******** Deploy Morpho AAVE V2 USDC collateral plugin **************************/ + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDeposit' + ) + maUSDC = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, + underlyingERC20: networkConfig[chainId].tokens.USDC!, + poolToken: networkConfig[chainId].tokens.aUSDC!, + rewardToken: networkConfig[chainId].tokens.MORPHO!, + }) + + const CollateralFactory = await hre.ethers.getContractFactory('MorphoFiatCollateral') + + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const baseStableConfig = { + priceTimeout: bn('604800').toString(), + oracleError: usdcOracleError.toString(), + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: usdcOracleTimeout, // 24h + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: usdcOracleError.add(fp('0.01')), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + } + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await CollateralFactory.connect(owner).deploy( + { + ...baseStableConfig, + chainlinkFeed: chainlinkFeed.address, + erc20: maUSDC.address, + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + const aaveV2DataProviderAbi = [ + 'function getReserveData(address asset) external view returns (uint256 availableLiquidity,uint256 totalStableDebt,uint256 totalVariableDebt,uint256 liquidityRate,uint256 variableBorrowRate,uint256 stableBorrowRate,uint256 averageStableBorrowRate,uint256 liquidityIndex,uint256 variableBorrowIndex,uint40 lastUpdateTimestamp)', + ] + aaveV2DataProvider = await ethers.getContractAt( + aaveV2DataProviderAbi, + networkConfig[chainId].AAVE_DATA_PROVIDER || '' + ) + + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + + // Wrap maUSDC + await usdc.connect(addr1).approve(maUSDC.address, 0) + await usdc.connect(addr1).approve(maUSDC.address, MAX_UINT256) + await maUSDC.connect(addr1).mint(toBNDecimals(initialBal, 15), addr1.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([maUSDC.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await maUSDC.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 15)) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + lendingPool = ( + await ethers.getContractAt('ILendingPool', networkConfig[chainId].AAVE_LENDING_POOL || '') + ) + + // Provide liquidity in AAVE V2 to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(lendingPool.address, amountToDeposit) + await lendingPool.connect(addr1).deposit(weth.address, amountToDeposit, addr1.address, 0) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // MORPHO AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) + await expect(maUSDC.connect(addr2).withdraw(maxWithdraw, addr2.address, addr2.address)).to + .not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // MORPHO AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.equal(fp('1')) + + // Get current liquidity from Aave V2 (Morpho relies on this) + ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider + .connect(addr1) + .getReserveData(usdc.address) + + // Leave only 80% of backing available to be redeemed + const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) + await lendingPool.connect(addr1).borrow(usdc.address, borrowAmount, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await lendingPool + .connect(addr1) + .borrow(usdc.address, remainingLiquidity.div(2), 2, 0, addr1.address) + + // Now only 40% is available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) + await expect(maUSDC.connect(addr2).withdraw(maxWithdraw, addr2.address, addr2.address)).to + .be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + + // But we can redeem if we reduce the amount to 30% + await expect( + maUSDC.connect(addr2).withdraw(maxWithdraw.mul(30).div(100), addr2.address, addr2.address) + ).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.equal(fp('1')) + + // Get current liquidity from Aave V2 (Morpho relies on this) + ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider + .connect(addr1) + .getReserveData(usdc.address) + + // Borrow full liquidity + await lendingPool.connect(addr1).borrow(usdc.address, fullLiquidityAmt, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) + await expect( + maUSDC.connect(addr2).withdraw(maxWithdraw.div(100), addr2.address, addr2.address) + ).to.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + }) +}) diff --git a/test/utils/trades.ts b/test/utils/trades.ts index b952deabfe..99e0f4c22f 100644 --- a/test/utils/trades.ts +++ b/test/utils/trades.ts @@ -1,9 +1,11 @@ +import { getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { Decimal } from 'decimal.js' import { BigNumber } from 'ethers' import { ethers } from 'hardhat' import { expect } from 'chai' -import { TestITrading, GnosisTrade } from '../../typechain' +import { TestITrading, GnosisTrade, TestIBroker } from '../../typechain' import { bn, fp, divCeil, divRound } from '../../common/numbers' +import { IMPLEMENTATION, Implementation } from '../fixtures' export const expectTrade = async (trader: TestITrading, auctionInfo: Partial) => { if (!auctionInfo.sell) throw new Error('Must provide sell token to find trade') @@ -118,3 +120,23 @@ export const dutchBuyAmount = async ( } else price = worstPrice return divCeil(outAmount.mul(price), fp('1')) } + +export const disableBatchTrade = async (broker: TestIBroker) => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt(broker.address, 205, slot.replace(slot.slice(2, 14), '1'.padStart(12, '0'))) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) +} + +export const disableDutchTrade = async (broker: TestIBroker, erc20: string) => { + const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') + const p = mappingSlot.toHexString().slice(2).padStart(64, '0') + const key = erc20.slice(2).padStart(64, '0') + const slot = ethers.utils.keccak256('0x' + key + p) + await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) + expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) +} From 8d6933d02fec9ddbb93e0f3e689566213fbe6b1c Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:04:20 -0300 Subject: [PATCH 161/450] fixes to exhaustive tests (#1037) --- docs/exhaustive-tests.md | 8 ++++---- scripts/exhaustive-tests/run-1.sh | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docs/exhaustive-tests.md b/docs/exhaustive-tests.md index fef7f481e0..2eb334f917 100644 --- a/docs/exhaustive-tests.md +++ b/docs/exhaustive-tests.md @@ -1,6 +1,6 @@ # Exhaustive Testing -The exhaustive tests include `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExteremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. +The exhaustive tests include `Broker.test.ts`, `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExtremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. The env vars related to exhaustive testing are `EXTREME` and `SLOW`. @@ -12,7 +12,7 @@ I'm assuming you've already got `gcloud` installed on your dev machine. If not, ```bash gcloud auth login -gcloud config set project rtoken-fuzz +gcloud config set project rtoken-testing gcloud config list project # assumed defaults @@ -39,7 +39,7 @@ gcloud compute config-ssh Jump onto the instance: ``` -ssh exhaustive.us-central1-a.rtoken-fuzz +ssh exhaustive.us-central1-a.rtoken-testing ``` Add Matt's special seasoning, for tmux and emacs QoL improvements (NOTE: This sets the tmux `ctrl-b` to `ctrl-z`): @@ -93,7 +93,7 @@ gcloud compute config-ssh Jump onto the instance: ``` -ssh exhaustive.us-central1-a.rtoken-fuzz +ssh exhaustive.us-central1-a.rtoken-testing ``` ## 3) Run the tests diff --git a/scripts/exhaustive-tests/run-1.sh b/scripts/exhaustive-tests/run-1.sh index fbad597e14..bf214a6ba0 100644 --- a/scripts/exhaustive-tests/run-1.sh +++ b/scripts/exhaustive-tests/run-1.sh @@ -1,3 +1,3 @@ -echo "Running RToken & Furnace exhaustive tests for commit hash: " +echo "Running Broker, RToken, & Furnace exhaustive tests for commit hash: " git rev-parse HEAD; -NODE_OPTIONS=--max-old-space-size=30000 EXTREME=1 SLOW=1 PROTO_IMPL=1 npx hardhat test test/RTokenExtremes.test.ts test/Furnace.test.ts; +NODE_OPTIONS=--max-old-space-size=30000 EXTREME=1 SLOW=1 PROTO_IMPL=1 npx hardhat test test/RTokenExtremes.test.ts test/Broker.test.ts test/Furnace.test.ts; From ed9daa07aba4db6176f6d5200e19047eebbffd1a Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 16 Jan 2024 10:10:42 -0300 Subject: [PATCH 162/450] Fix command in extreme test docs (#1038) --- docs/exhaustive-tests.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/exhaustive-tests.md b/docs/exhaustive-tests.md index 2eb334f917..5fafdb48f3 100644 --- a/docs/exhaustive-tests.md +++ b/docs/exhaustive-tests.md @@ -113,7 +113,7 @@ Tmux and run the tests: ``` tmux -bash ./scripts/run-exhaustive-tests.sh +bash ./scripts/exhaustive-tests/run-exhaustive-tests.sh ``` When the test are complete, you'll find the console output in `tmux-1.log` and `tmux-2.log`. From 20af633d34ab077486b42cca6e346695fcf9b744 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Jan 2024 19:39:30 -0500 Subject: [PATCH 163/450] document new bidWithCallback() --- CHANGELOG.md | 8 +++++--- docs/mev.md | 14 ++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f2edd990b..7f74b4b658 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,13 +2,15 @@ # 3.2.0 -This release gives new RTokens being deployed the option to enable a variable target basket, or to be "reweightable". An RToken that is not reweightable cannot have its target basket changed in terms of quantities of target units. +This release makes bidding in dutch auctions easier for MEV searchers and gives new RTokens being deployed the option to enable a variable target basket, or to be "reweightable". An RToken that is not reweightable cannot have its target basket changed in terms of quantities of target units. ### Upgrade Steps -Upgrade BasketHandler and Distributor +Upgrade BasketHandler and Distributor. -Call `Distributor.cacheComponents()` if this is the first upgrade to a >=3.0.0 token. +Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTrade` contract address. + +If this is the first upgrade to a >= 3.0.0 token, call `*.cacheComponents()` on all components. ### Core Protocol Contracts diff --git a/docs/mev.md b/docs/mev.md index 55a0a4a5fc..4ee944472f 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -27,7 +27,9 @@ Bidding instructions from the `DutchTrade` contract: `DutchTrade` (relevant) interface: ```solidity -function bid(bytes memory data) external; // execute a bid at the current block number +function bid() external; // execute a bid at the current block number via transferFrom + +function bidWithCallback(bytes memory data) external; // execute a bid at the current block number with post-hook callback for transfer of tokens function sell() external view returns (IERC20); @@ -41,9 +43,13 @@ function bidAmount(uint256 blockNumber) external view returns (uint256); // {qBu ``` -To participate: +To participate, either: + +(1) Call `bid()` with a prior approval for the `bidAmount` + +OR -Make sure calling contract implements the `IDutchTradeCallee` interface. It contains a single method function `dutchTradeCallbac(address buyToken,uint256 buyAmount,bytes calldata data) external;`. This method will be called by the `DutchTrade` as a callback after calling `bidWithCallback` and before the trade has been resolved. The trader is expected to pay for the trade during the callback. See `DutchTradeRouter.sol` for an example. +(2) Call `bidWithCallback(bytes memory)` from a calling contract that adheres to the `IDutchTradeCallee` interface. It should contain a function `dutchTradeCallback(address buyToken,uint256 buyAmount,bytes calldata data) external;` that transfers `bidAmount` buy tokens. This method will be called by the `DutchTrade` as a callback after the trade has been resolved. See `DutchTradeRouter.sol` for an example. 1. Call `status()` view; the auction is ongoing if return value is 1 2. Call `lot()` to see the number of tokens being sold @@ -51,7 +57,7 @@ Make sure calling contract implements the `IDutchTradeCallee` interface. It cont 4. After finding an attractive bidAmount, provide an approval for the `buy()` token. The spender should be the `DutchTrade` contract. **Note**: it is very important to set tight approvals! Do not set more than the `bidAmount()` for the desired bidding block else reorgs present risk. 5. Wait until the desired block is reached (hopefully not in the first 40% of the auction) -6. Call `bidWithCallback()`. If someone else completes the auction first, this will revert with the error message "bid already received". Approvals do not have to be revoked in the event that another MEV searcher wins the auction. (Though ideally the searcher includes the approval in the same tx they `bid()`) +6. Call `bid()`. If someone else completes the auction first, this will revert with the error message "bid already received". Approvals do not have to be revoked in the event that another MEV searcher wins the auction. (Though ideally the searcher includes the approval in the same tx they `bid()`) For a sample price curve, see [docs/system-design.md](./system-design.md#sample-price-curve) From a2750ee3fcee7960f8c2271953f36f46d6b128be Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Jan 2024 19:48:34 -0500 Subject: [PATCH 164/450] Yearn plugin scripts (#1014) --- .../assets/curve/CurveStableCollateral.sol | 1 - .../curve/CurveStableMetapoolCollateral.sol | 1 - .../yearnv2/YearnV2CurveFiatCollateral.sol | 39 ++++--- scripts/deploy.ts | 2 + .../collaterals/deploy_yearn_v2_curve_usdc.ts | 107 ++++++++++++++++++ .../collaterals/deploy_yearn_v2_curve_usdp.ts | 107 ++++++++++++++++++ .../verify_yearn_v2_curve_usdc.ts | 73 ++++++++++++ scripts/verify_etherscan.ts | 2 + .../YearnV2CurveFiatCollateral.test.ts | 4 +- .../yearnv2/constants.ts | 2 + 10 files changed, 319 insertions(+), 19 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts create mode 100644 scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index c59994fd56..a9d9a6b9b3 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -66,7 +66,6 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // {UoA/tok} = {UoA} / {tok} low = aumLow.div(supply, FLOOR); high = aumHigh.div(supply, CEIL); - assert(low <= high); // not obviously true just by inspection return (low, high, 0); } diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index ad3cd6ac8e..3e4c0009a0 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -97,7 +97,6 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // {UoA/tok} = {UoA} / {tok} low = aumLow.div(supply, FLOOR); high = aumHigh.div(supply, CEIL); - assert(low <= high); // not obviously true just by inspection return (low, high, 0); } diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 8e967f865d..322eca9a75 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -3,9 +3,11 @@ pragma solidity 0.8.19; import "../curve/CurveStableCollateral.sol"; -interface IYearnV2 { - /// @return {qLP token/tok} - function pricePerShare() external view returns (uint256); +interface IPricePerShareHelper { + /// @param vault The yToken address + /// @param amount {qTok} + /// @return {qLP Token} + function amountToShares(address vault, uint256 amount) external view returns (uint256); } /** @@ -16,28 +18,27 @@ interface IYearnV2 { * tar = USD * UoA = USD * - * More on the ref token: crvUSDUSDC-f has a virtual price >=1. The ref token to measure is not the + * More on the ref token: crvUSDUSDC-f has a virtual price. The ref token to measure is not the * balance of crvUSDUSDC-f that the LP token is redeemable for, but the balance of the virtual * token that underlies crvUSDUSDC-f. This virtual token is an evolving mix of USDC and crvUSD. * - * Revenue hiding should be set to the largest % drawdown in a Yearn vault that should - * not result in default. While it is extremely rare for Yearn to have drawdowns, - * in principle it is possible and should be planned for. - * - * No rewards. + * Should only be used for Stable pools. + * No rewards (handled internally by the Yearn vault). + * Revenue hiding can be kept very small since stable curve pools should be up-only. */ contract YearnV2CurveFiatCollateral is CurveStableCollateral { using FixLib for uint192; - // solhint-disable no-empty-blocks + IPricePerShareHelper public immutable pricePerShareHelper; constructor( CollateralConfig memory config, uint192 revenueHiding, - PTConfiguration memory ptConfig - ) CurveStableCollateral(config, revenueHiding, ptConfig) {} - - // solhint-enable no-empty-blocks + PTConfiguration memory ptConfig, + IPricePerShareHelper pricePerShareHelper_ + ) CurveStableCollateral(config, revenueHiding, ptConfig) { + pricePerShareHelper = pricePerShareHelper_; + } /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low @@ -96,7 +97,13 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// @return {LP token/tok} function _pricePerShare() internal view returns (uint192) { - // {LP token/tok} = {qLP token/tok} * {LP token/qLP token} - return shiftl_toFix(IYearnV2(address(erc20)).pricePerShare(), -int8(erc20Decimals)); + uint256 supply = erc20.totalSupply(); // {qTok} + uint256 shares = pricePerShareHelper.amountToShares(address(erc20), supply); // {qLP Token} + + // yvCurve tokens always have the same number of decimals as the underlying curve LP token, + // so we can divide the quanta units without converting to whole units + + // {LP token/tok} = {LP token} / {tok} + return divuu(shares, supply); } } diff --git a/scripts/deploy.ts b/scripts/deploy.ts index eb9d82f713..e2916e7d00 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -62,6 +62,8 @@ async function main() { 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', + 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts', + 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts', 'phase2-assets/collaterals/deploy_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts new file mode 100644 index 0000000000..b3e1facdc8 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts @@ -0,0 +1,107 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout, oracleTimeout } from '../../utils' +import { YearnV2CurveFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' +import { + PRICE_PER_SHARE_HELPER, + YVUSDC_LP_TOKEN, +} from '../../../../test/plugins/individual-collateral/yearnv2/constants' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Yearn V2 Curve Fiat Collateral - yvCurveUSDCcrvUSD **************************/ + + const YearnV2CurveCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'YearnV2CurveFiatCollateral' + ) + + const collateral = await YearnV2CurveCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, // not used but can't be empty + oracleError: fp('0.0025').toString(), // not used but can't be empty + erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24hr -- max of all oracleTimeouts + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only + { + nTokens: '2', + curvePool: YVUSDC_LP_TOKEN, + poolType: '0', + feeds: [ + [networkConfig[chainId].chainlinkFeeds.USDC], + [networkConfig[chainId].chainlinkFeeds.crvUSD], + ], + oracleTimeouts: [ + [oracleTimeout(chainId, '86400').toString()], + [oracleTimeout(chainId, '86400').toString()], + ], + oracleErrors: [[fp('0.0025').toString()], [fp('0.005').toString()]], + lpToken: YVUSDC_LP_TOKEN, + }, + PRICE_PER_SHARE_HELPER + ) + await collateral.deployed() + + console.log( + `Deployed Yearn Curve yvUSDCcrvUSD to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.yvCurveUSDCcrvUSD = collateral.address + assetCollDeployments.erc20s.yvCurveUSDCcrvUSD = networkConfig[chainId].tokens.yvCurveUSDCcrvUSD + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts new file mode 100644 index 0000000000..8f16464f6b --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts @@ -0,0 +1,107 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout, oracleTimeout } from '../../utils' +import { YearnV2CurveFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' +import { + PRICE_PER_SHARE_HELPER, + YVUSDP_LP_TOKEN, +} from '../../../../test/plugins/individual-collateral/yearnv2/constants' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Yearn V2 Curve Fiat Collateral - yvCurveUSDPcrvUSD **************************/ + + const YearnV2CurveCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'YearnV2CurveFiatCollateral' + ) + + const collateral = await YearnV2CurveCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDP, // not used but can't be empty + oracleError: fp('0.0025').toString(), // not used but can't be empty + erc20: networkConfig[chainId].tokens.yvCurveUSDPcrvUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, bn('86400')).toString(), // 24hr -- max of all oracleTimeouts + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% = max oracleError + 1% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only + { + nTokens: '2', + curvePool: YVUSDP_LP_TOKEN, + poolType: '0', + feeds: [ + [networkConfig[chainId].chainlinkFeeds.USDP], + [networkConfig[chainId].chainlinkFeeds.crvUSD], + ], + oracleTimeouts: [ + [oracleTimeout(chainId, '3600').toString()], + [oracleTimeout(chainId, '86400').toString()], + ], + oracleErrors: [[fp('0.01').toString()], [fp('0.005').toString()]], + lpToken: YVUSDP_LP_TOKEN, + }, + PRICE_PER_SHARE_HELPER + ) + await collateral.deployed() + + console.log( + `Deployed Yearn Curve yvUSDPcrvUSD to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.yvCurveUSDPcrvUSD = collateral.address + assetCollDeployments.erc20s.yvCurveUSDPcrvUSD = networkConfig[chainId].tokens.yvCurveUSDPcrvUSD + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts new file mode 100644 index 0000000000..7505cfdb85 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts @@ -0,0 +1,73 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { + PRICE_PER_SHARE_HELPER, + YVUSDC_LP_TOKEN, +} from '../../../test/plugins/individual-collateral/yearnv2/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify yvCurveUSDCcrvUSD **************************/ + await verifyContract( + chainId, + deployments.collateral.yvCurveUSDCcrvUSD, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, // not used but can't be empty + oracleError: fp('0.0025').toString(), // not used but can't be empty + erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24hr -- max of all oracleTimeouts + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only + { + nTokens: '2', + curvePool: YVUSDC_LP_TOKEN, + poolType: '0', + feeds: [ + networkConfig[chainId].chainlinkFeeds.USDC, + networkConfig[chainId].chainlinkFeeds.crvUSD, + ], + oracleTimeouts: [ + oracleTimeout(chainId, '86400').toString(), + oracleTimeout(chainId, '86400').toString(), + ], + oracleErrors: [fp('0.0025').toString(), fp('0.005').toString()], + lpToken: YVUSDC_LP_TOKEN, + }, + PRICE_PER_SHARE_HELPER, + ], + 'contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol:YearnV2CurveFiatCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index a0a69c2281..dd200b6248 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -62,6 +62,8 @@ async function main() { 'collateral-plugins/verify_sdai.ts', 'collateral-plugins/verify_morpho.ts', 'collateral-plugins/verify_aave_v3_usdc.ts', + 'collateral-plugins/verify_yearn_v2_curve_usdc.ts', + 'collateral-plugins/verify_yearn_v2_curve_usdp.ts', 'collateral-plugins/verify_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index 9242e0fb03..126280f15b 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -21,6 +21,7 @@ import { CRV_USD_USD_FEED, CRV_USD_ORACLE_TIMEOUT, CRV_USD_ORACLE_ERROR, + PRICE_PER_SHARE_HELPER, USDP, USDP_USD_FEED, USDP_ORACLE_TIMEOUT, @@ -141,7 +142,8 @@ tests.forEach((test: CurveFiatTest) => { oracleTimeouts: opts.oracleTimeouts, oracleErrors: opts.oracleErrors, lpToken: opts.lpToken, - } + }, + PRICE_PER_SHARE_HELPER ) await collateral.deployed() diff --git a/test/plugins/individual-collateral/yearnv2/constants.ts b/test/plugins/individual-collateral/yearnv2/constants.ts index 832ccbb813..2d480c5cb4 100644 --- a/test/plugins/individual-collateral/yearnv2/constants.ts +++ b/test/plugins/individual-collateral/yearnv2/constants.ts @@ -9,6 +9,8 @@ export const yvCurveUSDCcrvUSD = networkConfig['31337'].tokens.yvCurveUSDCcrvUSD export const USDP_USD_FEED = networkConfig['31337'].chainlinkFeeds.USDP as string export const CRV_USD_USD_FEED = networkConfig['31337'].chainlinkFeeds.crvUSD as string +export const PRICE_PER_SHARE_HELPER = '0x444443bae5bB8640677A8cdF94CB8879Fec948Ec' + export const YVUSDC_LP_TOKEN = '0x4DEcE678ceceb27446b35C672dC7d61F30bAD69E' export const YVUSDP_LP_TOKEN = '0xCa978A0528116DDA3cbA9ACD3e68bc6191CA53D0' From 86fd0ec6a05511eeac3d7a20941c8444acb6365a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Jan 2024 19:52:40 -0500 Subject: [PATCH 165/450] fix slither in CI --- .github/workflows/tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d45c2ec65c..3bd5b1a460 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -219,6 +219,12 @@ jobs: name: 'Slither' runs-on: ubuntu-latest steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable - run: pip3 install solc-select slither-analyzer - run: solc-select install 0.8.19 - run: solc-select use 0.8.19 From 54bf1b5499b8b0be320c70d8baf0e8705f4ec5cc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Jan 2024 10:23:03 -0500 Subject: [PATCH 166/450] fix deployment scripts in CI --- .../collaterals/deploy_yearn_v2_curve_usdc.ts | 9 +++------ .../collaterals/deploy_yearn_v2_curve_usdp.ts | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts index b3e1facdc8..e8f9f1f154 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { YearnV2CurveFiatCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' import { @@ -59,7 +59,7 @@ async function main() { oracleError: fp('0.0025').toString(), // not used but can't be empty erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24hr -- max of all oracleTimeouts + oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% delayUntilDefault: bn('86400').toString(), // 24h @@ -73,10 +73,7 @@ async function main() { [networkConfig[chainId].chainlinkFeeds.USDC], [networkConfig[chainId].chainlinkFeeds.crvUSD], ], - oracleTimeouts: [ - [oracleTimeout(chainId, '86400').toString()], - [oracleTimeout(chainId, '86400').toString()], - ], + oracleTimeouts: [['86400'], ['86400']], oracleErrors: [[fp('0.0025').toString()], [fp('0.005').toString()]], lpToken: YVUSDC_LP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts index 8f16464f6b..cbb2c89cc0 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { YearnV2CurveFiatCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' import { @@ -59,7 +59,7 @@ async function main() { oracleError: fp('0.0025').toString(), // not used but can't be empty erc20: networkConfig[chainId].tokens.yvCurveUSDPcrvUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, bn('86400')).toString(), // 24hr -- max of all oracleTimeouts + oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% = max oracleError + 1% delayUntilDefault: bn('86400').toString(), // 24h @@ -73,10 +73,7 @@ async function main() { [networkConfig[chainId].chainlinkFeeds.USDP], [networkConfig[chainId].chainlinkFeeds.crvUSD], ], - oracleTimeouts: [ - [oracleTimeout(chainId, '3600').toString()], - [oracleTimeout(chainId, '86400').toString()], - ], + oracleTimeouts: [['3600'], ['86400']], oracleErrors: [[fp('0.01').toString()], [fp('0.005').toString()]], lpToken: YVUSDP_LP_TOKEN, }, From 82bca4bf2f0671fedb3dc8e9da2de7831b53425b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Jan 2024 11:08:10 -0500 Subject: [PATCH 167/450] remove unused function on IMorpho interface (#1030) --- .../assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol | 4 +--- .../plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol | 5 +---- .../collaterals/deploy_morpho_aavev2_plugin.ts | 6 ------ .../morpho-aave/MorphoAAVEFiatCollateral.test.ts | 3 --- .../morpho-aave/MorphoAAVENonFiatCollateral.test.ts | 2 -- .../morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts | 2 -- .../morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts | 1 - 7 files changed, 2 insertions(+), 21 deletions(-) diff --git a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol index eff7ccd9b5..bc5f32abd8 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol @@ -3,13 +3,12 @@ pragma solidity 0.8.19; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol"; -import { IMorpho, IMorphoRewardsDistributor, IMorphoUsersLens } from "./IMorpho.sol"; +import { IMorpho, IMorphoUsersLens } from "./IMorpho.sol"; import { MorphoTokenisedDeposit, MorphoTokenisedDepositConfig } from "./MorphoTokenisedDeposit.sol"; struct MorphoAaveV2TokenisedDepositConfig { IMorpho morphoController; IMorphoUsersLens morphoLens; - IMorphoRewardsDistributor rewardsDistributor; IERC20Metadata underlyingERC20; IERC20Metadata poolToken; ERC20 rewardToken; @@ -22,7 +21,6 @@ contract MorphoAaveV2TokenisedDeposit is MorphoTokenisedDeposit { MorphoTokenisedDeposit( MorphoTokenisedDepositConfig({ morphoController: config.morphoController, - rewardsDistributor: config.rewardsDistributor, underlyingERC20: config.underlyingERC20, poolToken: config.poolToken, rewardToken: config.rewardToken diff --git a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol index 7785a987f8..23469bce8f 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol @@ -3,12 +3,11 @@ pragma solidity 0.8.19; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol"; -import { IMorpho, IMorphoRewardsDistributor, IMorphoUsersLens } from "./IMorpho.sol"; +import { IMorpho, IMorphoUsersLens } from "./IMorpho.sol"; import { RewardableERC4626Vault } from "../erc20/RewardableERC4626Vault.sol"; struct MorphoTokenisedDepositConfig { IMorpho morphoController; - IMorphoRewardsDistributor rewardsDistributor; IERC20Metadata underlyingERC20; IERC20Metadata poolToken; ERC20 rewardToken; @@ -25,7 +24,6 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { uint256 private constant PAYOUT_PERIOD = 7 days; - IMorphoRewardsDistributor public immutable rewardsDistributor; IMorpho public immutable morphoController; address public immutable poolToken; address public immutable underlying; @@ -43,7 +41,6 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { underlying = address(config.underlyingERC20); morphoController = config.morphoController; poolToken = address(config.poolToken); - rewardsDistributor = config.rewardsDistributor; state.lastSync = uint48(block.timestamp); } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index fd7a1e96b9..c2831b6fd0 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -49,7 +49,6 @@ async function main() { const maUSDT = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDT!, poolToken: networkConfig[chainId].tokens.aUSDT!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -58,7 +57,6 @@ async function main() { const maUSDC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDC!, poolToken: networkConfig[chainId].tokens.aUSDC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -67,7 +65,6 @@ async function main() { const maDAI = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.DAI!, poolToken: networkConfig[chainId].tokens.aDAI!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -76,7 +73,6 @@ async function main() { const maWBTC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.WBTC!, poolToken: networkConfig[chainId].tokens.aWBTC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -85,7 +81,6 @@ async function main() { const maWETH = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.WETH!, poolToken: networkConfig[chainId].tokens.aWETH!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -94,7 +89,6 @@ async function main() { const maStETH = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.stETH!, poolToken: networkConfig[chainId].tokens.astETH!, rewardToken: networkConfig[chainId].tokens.MORPHO!, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index a573f48887..ac75bd4216 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -54,7 +54,6 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) opts.erc20 = wrapperMock.address @@ -104,7 +103,6 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) @@ -213,7 +211,6 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: defaultCollateralOpts.underlyingToken!, poolToken: defaultCollateralOpts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index f9a0339f9a..faefce8157 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -54,7 +54,6 @@ const makeAaveNonFiatCollateralTestSuite = ( morphoLens: configToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: configToUse.tokens.MORPHO!, }) opts.erc20 = wrapperMock.address @@ -105,7 +104,6 @@ const makeAaveNonFiatCollateralTestSuite = ( morphoLens: configToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: configToUse.tokens.MORPHO!, }) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 8e934cedca..4bf7730685 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -49,7 +49,6 @@ const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise Date: Thu, 18 Jan 2024 09:16:30 -0300 Subject: [PATCH 168/450] Bid tests - complete tests for both bidding types (#1040) --- common/constants.ts | 6 ++ test/Broker.test.ts | 18 +++- test/Revenues.test.ts | 192 ++++++++++++++++++++++++++---------------- 3 files changed, 140 insertions(+), 76 deletions(-) diff --git a/common/constants.ts b/common/constants.ts index a11a2b4b80..06e166ba1b 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -56,6 +56,12 @@ export enum TradeKind { BATCH_AUCTION, } +export enum BidType { + NONE, + CALLBACK, + TRANSFER, +} + export const FURNACE_DEST = '0x0000000000000000000000000000000000000001' export const STRSR_DEST = '0x0000000000000000000000000000000000000002' diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 2c27c6c3ba..c41846c170 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -13,6 +13,7 @@ import { TradeStatus, ZERO_ADDRESS, ONE_ADDRESS, + BidType, } from '../common/constants' import { bn, fp, divCeil, shortString, toBNDecimals } from '../common/numbers' import { @@ -1376,6 +1377,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { if (!(Implementation.P1 && useEnv('EXTREME'))) return // prevents bunch of skipped tests async function runScenario([ + bidType, sellTokDecimals, buyTokDecimals, auctionSellAmt, @@ -1471,9 +1473,15 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const buyBalBefore = await buyTok.balanceOf(backingManager.address) const sellBalBefore = await sellTok.balanceOf(addr1.address) - await expect(router.connect(addr1).bid(trade.address, addr1.address)) - .to.emit(backingManager, 'TradeSettled') - .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + if (bidType.eq(bn(BidType.CALLBACK))) { + await expect(router.connect(addr1).bid(trade.address, addr1.address)) + .to.emit(backingManager, 'TradeSettled') + .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + } else if (bidType.eq(bn(BidType.TRANSFER))) { + await expect(trade.connect(addr1).bid()) + .to.emit(backingManager, 'TradeSettled') + .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + } // Check balances expect(await sellTok.balanceOf(addr1.address)).to.equal(sellBalBefore.add(sellAmt)) @@ -1489,6 +1497,8 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // ==== Generate the tests ==== + const bidTypes = [bn(BidType.CALLBACK), bn(BidType.TRANSFER)] + // applied to both buy and sell tokens const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18')] @@ -1506,7 +1516,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // total cases is 5 * 5 * 3 * 6 = 450 } - const paramList = cartesianProduct(decimals, decimals, auctionSellAmts, progression) + const paramList = cartesianProduct(bidTypes, decimals, decimals, auctionSellAmts, progression) const numCases = paramList.length.toString() paramList.forEach((params, index) => { diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index c6fe25cd22..04dea5e3b9 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -15,6 +15,7 @@ import { STRSR_DEST, TradeKind, ZERO_ADDRESS, + BidType, } from '../common/constants' import { expectEvents } from '../common/events' import { bn, divCeil, fp, near } from '../common/numbers' @@ -3476,28 +3477,46 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(actual).to.be.gt(bn(0)) }) - it('Should allow one bidder', async () => { - const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) - await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - - const trade = await ethers.getContractAt( - 'DutchTrade', - await rTokenTrader.trades(token0.address) - ) + // Run test for both bid types + const bidTypes = [BidType.CALLBACK, BidType.TRANSFER] + bidTypes.forEach((bidType) => { + it(`Should allow one bidder - Bid Type: ${Object.values(BidType)[bidType]}`, async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - await (await ethers.getContractAt('ERC20Mock', await trade.buy())) - .connect(addr1) - .approve(router.address, constants.MaxUint256) + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) - // Bid - await router.connect(addr1).bid(trade.address, addr1.address) - expect(await trade.bidder()).to.equal(router.address) - // Cannot bid once is settled - await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.be.revertedWith( - 'trade not open' - ) + // Bid + if (bidType == BidType.CALLBACK) { + await (await ethers.getContractAt('ERC20Mock', await trade.buy())) + .connect(addr1) + .approve(router.address, constants.MaxUint256) + + await router.connect(addr1).bid(trade.address, addr1.address) + expect(await trade.bidder()).to.equal(router.address) + // Cannot bid once is settled + await expect( + router.connect(addr1).bid(trade.address, addr1.address) + ).to.be.revertedWith('trade not open') + } + + if (bidType == BidType.TRANSFER) { + await (await ethers.getContractAt('ERC20Mock', await trade.buy())) + .connect(addr1) + .approve(trade.address, constants.MaxUint256) + + await trade.connect(addr1).bid() + expect(await trade.bidder()).to.equal(addr1.address) + // Cannot bid once is settled + await expect(trade.connect(addr1).bid()).to.be.revertedWith('bid already received') + } + }) }) + it('Trade should initially have bidType 0', async () => { await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) @@ -3508,7 +3527,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) expect(await trade.bidType()).to.be.eq(0) }) - it('It should support non callback bid', async () => { + + it('It should support non callback bid and perform validations', async () => { await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) @@ -3525,6 +3545,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await trade.connect(addr1).bid() expect(await trade.bidType()).to.be.eq(2) expect(await trade.bidder()).to.equal(addr1.address) + + // Should allow one bidder await expect(trade.connect(addr1).bid()).to.be.revertedWith('bid already received') }) @@ -3636,63 +3658,89 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { } }) - it('Should handle no bid case correctly', async () => { - const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) - await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - const trade = await ethers.getContractAt( - 'DutchTrade', - await rTokenTrader.trades(token0.address) - ) + // Perform test for both Bid Types + bidTypes.forEach((bidType) => { + it(`Should handle no bid case correctly - Bid Type: ${ + Object.values(BidType)[bidType] + }`, async () => { + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) - await expect( - trade.connect(addr1).bidAmount(await getLatestBlockNumber()) - ).to.be.revertedWith('auction over') + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) + await expect( + trade.connect(addr1).bidAmount(await getLatestBlockNumber()) + ).to.be.revertedWith('auction over') - await expect(router.connect(addr1).bid(trade.address, addr1.address)).be.revertedWith( - 'auction over' - ) + // Bid + if (bidType == BidType.CALLBACK) { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await expect(router.connect(addr1).bid(trade.address, addr1.address)).be.revertedWith( + 'auction over' + ) + } else if (bidType == BidType.TRANSFER) { + await expect(trade.connect(addr1).bid()).be.revertedWith('auction over') + } + + // Should be able to settle + await expect(trade.settle()).to.be.revertedWith('only origin can settle') + await expect(rTokenTrader.settleTrade(token0.address)) + .to.emit(rTokenTrader, 'TradeSettled') + .withArgs(trade.address, token0.address, rToken.address, 0, 0) + + // Should NOT start another auction, since caller was not DutchTrade + expect(await backingManager.tradesOpen()).to.equal(0) + }) + }) - // Should be able to settle - await expect(trade.settle()).to.be.revertedWith('only origin can settle') - await expect(rTokenTrader.settleTrade(token0.address)) - .to.emit(rTokenTrader, 'TradeSettled') - .withArgs(trade.address, token0.address, rToken.address, 0, 0) + // Perform test for both bid types + bidTypes.forEach((bidType) => { + it(`Should bid at exactly endBlock() and not launch another auction - Bid Type: ${ + Object.values(BidType)[bidType] + }`, async () => { + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await rToken.connect(addr1).approve(router.address, constants.MaxUint256) + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + await rToken.connect(addr1).approve(trade.address, constants.MaxUint256) + await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted - // Should NOT start another auction, since caller was not DutchTrade - expect(await backingManager.tradesOpen()).to.equal(0) - }) + // Snipe auction at 0s left + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - it('Should bid at exactly endBlock() and not launch another auction', async () => { - const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await rToken.connect(addr1).approve(router.address, constants.MaxUint256) - await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) - await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - const trade = await ethers.getContractAt( - 'DutchTrade', - await rTokenTrader.trades(token0.address) - ) - await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted - - // Snipe auction at 0s left - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await router.connect(addr1).bid(trade.address, addr1.address) - expect(await trade.canSettle()).to.equal(false) - expect(await trade.status()).to.equal(2) // Status.CLOSED - expect(await trade.bidder()).to.equal(router.address) - expect(await token0.balanceOf(addr1.address)).to.equal(initialBal.sub(issueAmount.div(4))) - - const expected = await dutchBuyAmount( - fp(auctionLength).div(auctionLength), // last possible second - rTokenAsset.address, - collateral0.address, - issueAmount, - config.maxTradeSlippage - ) - expect(await rTokenTrader.tradesOpen()).to.equal(0) - expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo(0, 100) - expect(await rToken.balanceOf(furnace.address)).to.equal(expected) + // Bid + if (bidType == BidType.CALLBACK) { + await router.connect(addr1).bid(trade.address, addr1.address) + expect(await trade.bidder()).to.equal(router.address) + } else if (bidType == BidType.TRANSFER) { + await trade.connect(addr1).bid() + expect(await trade.bidder()).to.equal(addr1.address) + } + + expect(await trade.canSettle()).to.equal(false) + expect(await trade.status()).to.equal(2) // Status.CLOSED + expect(await token0.balanceOf(addr1.address)).to.equal( + initialBal.sub(issueAmount.div(4)) + ) + + const expected = await dutchBuyAmount( + fp(auctionLength).div(auctionLength), // last possible second + rTokenAsset.address, + collateral0.address, + issueAmount, + config.maxTradeSlippage + ) + expect(await rTokenTrader.tradesOpen()).to.equal(0) + expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo(0, 100) + expect(await rToken.balanceOf(furnace.address)).to.equal(expected) + }) }) it('Should return lot() in {qSellTok} and sellAmount() in {sellTok}', async () => { From 2e3f52fbd8cafc571c3100093532549c56d47eaf Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 20 Jan 2024 00:58:30 +0530 Subject: [PATCH 169/450] Trust Mitigation Review: Morpho (#1036) Co-authored-by: Taylor Brent --- .../morpho-aave/MorphoNonFiatCollateral.sol | 13 +- .../morpho-aave/MorphoTokenisedDeposit.sol | 42 +++-- .../deploy_morpho_aavev2_plugin.ts | 16 +- .../MorphoAAVEFiatCollateral.test.ts | 11 +- .../MorphoAAVENonFiatCollateral.test.ts | 50 +++--- .../MorphoAaveV2TokenisedDeposit.test.ts | 170 ++++++++++++++++-- 6 files changed, 230 insertions(+), 72 deletions(-) diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 27449c2883..3f1fe73110 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -16,13 +16,13 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {target/ref} + AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {UoA/target} uint48 public immutable targetUnitOracleTimeout; // {s} /// @dev config.erc20 must be a MorphoTokenisedDeposit - /// @param config.chainlinkFeed Feed units: {UoA/target} + /// @param config.chainlinkFeed Feed units: {target/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide - /// @param targetUnitChainlinkFeed_ Feed units: {target/ref} + /// @param targetUnitChainlinkFeed_ Feed units: {UoA/target} /// @param targetUnitOracleTimeout_ {s} oracle timeout to use for targetUnitChainlinkFeed constructor( CollateralConfig memory config, @@ -48,11 +48,12 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { uint192 pegPrice ) { - // {tar/ref} Get current market peg - pegPrice = targetUnitChainlinkFeed.price(targetUnitOracleTimeout); + pegPrice = chainlinkFeed.price(oracleTimeout); // {target/ref} // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); + uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( + _underlyingRefPerTok() + ); uint192 err = p.mul(oracleError, CEIL); high = p + err; diff --git a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol index 23469bce8f..e2bf558fe5 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol @@ -19,6 +19,7 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { uint256 totalPaidOutBalance; uint256 pendingBalance; uint256 availableBalance; + uint256 remainingPeriod; uint256 lastSync; } @@ -49,23 +50,31 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { } function _claimAssetRewards() internal override { - // First pay out any pendingBalances, over a 7200 block period - uint256 timeDelta = block.timestamp - state.lastSync; - if (timeDelta == 0) { - return; - } - if (timeDelta > PAYOUT_PERIOD) { - timeDelta = PAYOUT_PERIOD; - } - uint256 amtToPayOut = (state.pendingBalance * ((timeDelta * 1e18) / PAYOUT_PERIOD)) / 1e18; - state.pendingBalance -= amtToPayOut; - state.availableBalance += amtToPayOut; - // If we detect any new balances add it to pending and reset payout period uint256 totalAccumulated = state.totalPaidOutBalance + rewardToken.balanceOf(address(this)); uint256 newlyAccumulated = totalAccumulated - state.totalAccumulatedBalance; - state.totalAccumulatedBalance = totalAccumulated; - state.pendingBalance += newlyAccumulated; + + uint256 timeDelta = block.timestamp - state.lastSync; + if (timeDelta != 0 && state.remainingPeriod != 0) { + if (timeDelta > state.remainingPeriod) { + timeDelta = state.remainingPeriod; + } + + uint256 amtToPayOut = (state.pendingBalance * timeDelta) / state.remainingPeriod; + state.pendingBalance -= amtToPayOut; + state.availableBalance += amtToPayOut; + } + + if (newlyAccumulated != 0) { + state.totalAccumulatedBalance = totalAccumulated; + state.pendingBalance += newlyAccumulated; + + state.remainingPeriod = PAYOUT_PERIOD; + } else { + state.remainingPeriod = state.remainingPeriod < timeDelta + ? 0 + : state.remainingPeriod - timeDelta; + } state.lastSync = block.timestamp; } @@ -75,8 +84,9 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { } function _distributeReward(address account, uint256 amt) internal override { - state.totalPaidOutBalance += uint256(amt); - state.availableBalance -= uint256(amt); + state.totalPaidOutBalance += amt; + state.availableBalance -= amt; + SafeERC20.safeTransfer(rewardToken, account, amt); } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index c2831b6fd0..cb659b1889 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -179,16 +179,16 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedBTCWBTCError, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} erc20: maWBTC.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} - '86400' // 1 hr + networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} + '3600' // 1 hr ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) @@ -231,16 +231,16 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedOracleErrors, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} erc20: maStETH.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} - '86400' // 1 hr + networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} + '3600' // 1 hr ) assetCollDeployments.collateral.maStETH = collateral.address deployedCollateral.push(collateral.address.toString()) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index ac75bd4216..5ffecb6582 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -295,7 +295,6 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: defaultCollateralOpts.underlyingToken!, poolToken: defaultCollateralOpts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: mockRewardsToken.address, }) @@ -331,8 +330,14 @@ const makeAaveFiatCollateralTestSuite = ( // Shown below is that it is no longer economical to inflate own shares // bob only managed to steal approx 1/7200 * 90% of the reward because hardhat increments block by 1 // in practise it would be 0 as inflation attacks typically flashloan assets. - expect(await mockRewardsToken.balanceOf(aliceAddress)).to.be.eq(bn('999996993749479075487')) - expect(await mockRewardsToken.balanceOf(bobAddress)).to.be.eq(bn('1503126503126363')) + expect(await mockRewardsToken.balanceOf(aliceAddress)).to.be.closeTo( + bn('999996993746993746995'), + bn('1e15') + ) + expect(await mockRewardsToken.balanceOf(bobAddress)).to.be.closeTo( + bn('1503126503126502'), + bn('1e12') + ) }) } diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index faefce8157..28614aff7d 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -149,18 +149,18 @@ const makeAaveNonFiatCollateralTestSuite = ( ctx: MorphoAaveCollateralFixtureContext, pctDecrease: BigNumberish ) => { - const lastRound = await ctx.targetPrRefFeed!.latestRoundData() + const lastRound = await ctx.chainlinkFeed!.latestRoundData() const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) - await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) + await ctx.chainlinkFeed!.updateAnswer(nextAnswer) } const increaseTargetPerRef = async ( ctx: MorphoAaveCollateralFixtureContext, pctIncrease: BigNumberish ) => { - const lastRound = await ctx.targetPrRefFeed!.latestRoundData() + const lastRound = await ctx.chainlinkFeed!.latestRoundData() const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) - await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) + await ctx.chainlinkFeed!.updateAnswer(nextAnswer) } const changeRefPerTok = async ( @@ -171,25 +171,17 @@ const makeAaveNonFiatCollateralTestSuite = ( await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) } - // prettier-ignore const reduceRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, pctDecrease: BigNumberish ) => { - await changeRefPerTok( - ctx, - bn(pctDecrease).mul(-1) - ) + await changeRefPerTok(ctx, bn(pctDecrease).mul(-1)) } - // prettier-ignore const increaseRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, pctIncrease: BigNumberish ) => { - await changeRefPerTok( - ctx, - bn(pctIncrease) - ) + await changeRefPerTok(ctx, bn(pctIncrease)) } const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { @@ -199,11 +191,12 @@ const makeAaveNonFiatCollateralTestSuite = ( const clRptData = await ctx.targetPrRefFeed!.latestRoundData() const clRptDecimals = await ctx.targetPrRefFeed!.decimals() - const expctPrice = clData.answer - .mul(bn(10).pow(18 - clDecimals)) - .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) + const expectedPrice = clRptData.answer + .mul(bn(10).pow(18 - clRptDecimals)) + .mul(clData.answer.mul(bn(10).pow(18 - clDecimals))) .div(fp('1')) - return expctPrice + + return expectedPrice } /* @@ -215,6 +208,7 @@ const makeAaveNonFiatCollateralTestSuite = ( // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function const beforeEachRewardsTest = async () => {} const opts = { @@ -252,17 +246,17 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - WBTC', { underlyingToken: configToUse.tokens.WBTC!, poolToken: configToUse.tokens.aWBTC!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.BTC!, - targetPrRefFeed: configToUse.chainlinkFeeds.WBTC!, + chainlinkFeed: configToUse.chainlinkFeeds.WBTC!, + targetPrRefFeed: configToUse.chainlinkFeeds.BTC!, oracleTimeout: ORACLE_TIMEOUT, + refPerTokChainlinkTimeout: ORACLE_TIMEOUT.div(24), oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - defaultPrice: parseUnits('30000', 8), - defaultRefPerTok: parseUnits('1', 8), - refPerTokChainlinkTimeout: PRICE_TIMEOUT, + defaultPrice: parseUnits('1', 8), + defaultRefPerTok: parseUnits('30000', 8), }) makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { @@ -270,15 +264,15 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { underlyingToken: configToUse.tokens.stETH!, poolToken: configToUse.tokens.astETH!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.ETH!, - targetPrRefFeed: configToUse.chainlinkFeeds.stETHETH!, + chainlinkFeed: configToUse.chainlinkFeeds.stETHETH!, + targetPrRefFeed: configToUse.chainlinkFeeds.ETH!, oracleTimeout: ORACLE_TIMEOUT, + refPerTokChainlinkTimeout: ORACLE_TIMEOUT.div(24), oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - defaultPrice: parseUnits('1800', 8), - defaultRefPerTok: parseUnits('1', 8), - refPerTokChainlinkTimeout: PRICE_TIMEOUT, + defaultPrice: parseUnits('1', 8), + defaultRefPerTok: parseUnits('1800', 8), }) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index 79ac2b06ac..b05bcf82d8 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -1,3 +1,4 @@ +import hre from 'hardhat' import { ITokens, networkConfig } from '#/common/configuration' import { ethers } from 'hardhat' import { whileImpersonating } from '../../../utils/impersonation' @@ -9,6 +10,7 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { bn } from '#/common/numbers' import { getResetFork } from '../helpers' import { FORK_BLOCK } from './constants' +import { advanceTime } from '#/utils/time' type ITokenSymbol = keyof ITokens const networkConfigToUse = networkConfig[31337] @@ -82,6 +84,7 @@ const execTestForToken = ({ await instances.underlying.connect(whaleSigner).transfer(users.bob.address, amountBN) await instances.underlying.connect(whaleSigner).transfer(users.charlie.address, amountBN) }) + return { factories, instances, @@ -162,14 +165,6 @@ const execTestForToken = ({ .connect(from) .transfer(await to.getAddress(), parseUnits(amount, shareDecimals)) }, - unclaimedRewards: async (owner: Signer) => { - return formatUnits( - await instances.tokenVault - .connect(owner) - .callStatic.rewardTokenBalance(await owner.getAddress()), - 18 - ) - }, claimRewards: async (owner: Signer) => { await instances.tokenVault.connect(owner).claimRewards() }, @@ -299,9 +294,162 @@ const execTestForToken = ({ expect(postWithdrawalBalance).lt(parseFloat(orignalBalance)) }) - /** - * There is a test for claiming rewards in the MorphoAAVEFiatCollateral.test.ts - */ + it('linearly distributes rewards', async () => { + const { + users: { alice, bob, charlie }, + methods, + instances, + amountBN, + } = context + + await methods.deposit(bob, '1') + + // Enable transfers on Morpho + // ugh + await whileImpersonating( + '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa', + async (whaleSigner) => { + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159daa9059cbb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159da23b872dd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + } + ) + + // Let's drop 700 MORPHO to the tokenVault + await whileImpersonating( + '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', + async (whaleSigner) => { + await instances.morpho + .connect(whaleSigner) + .transfer( + instances.tokenVault.address, + parseUnits('700', await instances.morpho.decimals()) + ) + } + ) + + // Account for rewards + await instances.tokenVault.sync() + + // Simulate 8 days.. + for (let i = 0; i < 8; i++) { + await advanceTime(hre, 24 * 60 * 60 - 1) + await methods.claimRewards(bob) + + if (i < 7) { + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(i + 1) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } else { + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(7) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } + } + }) + + it('linearly distributes rewards, even with multiple claims', async () => { + const { + users: { alice, bob, charlie }, + methods, + instances, + amountBN, + } = context + + await methods.deposit(bob, '1') + + // Enable transfers on Morpho + // ugh + await whileImpersonating( + '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa', + async (whaleSigner) => { + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159daa9059cbb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159da23b872dd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + } + ) + + // Let's drop 700 MORPHO to the tokenVault + await whileImpersonating( + '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', + async (whaleSigner) => { + await instances.morpho + .connect(whaleSigner) + .transfer( + instances.tokenVault.address, + parseUnits('700', await instances.morpho.decimals()) + ) + } + ) + + // Account for rewards + await instances.tokenVault.sync() + + // Simulate 3 days.. + for (let i = 0; i < 3; i++) { + await advanceTime(hre, 24 * 60 * 60 - 1) + await methods.claimRewards(bob) + + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(i + 1) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } + + // Let's drop another 300 MORPHO to the tokenVault + await whileImpersonating( + '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', + async (whaleSigner) => { + await instances.morpho + .connect(whaleSigner) + .transfer( + instances.tokenVault.address, + parseUnits('300', await instances.morpho.decimals()) + ) + } + ) + + // Account for rewards + await instances.tokenVault.sync() + + for (let i = 3; i < 10; i++) { + await advanceTime(hre, 24 * 60 * 60 - 1) + await methods.claimRewards(bob) + + // console.log( + // 'MORPHO:', + // formatUnits( + // await instances.morpho.balanceOf(await bob.getAddress()), + // await instances.morpho.decimals() + // ) + // ) + + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(i + 1) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } + }) }) } From 20c8f608e95111975690566a63a7023781420554 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 18:15:17 -0500 Subject: [PATCH 170/450] UnstakingStarted event fix (#1042) --- CHANGELOG.md | 8 ++++++++ contracts/facade/FacadeRead.sol | 25 +++++++++++++------------ contracts/interfaces/IFacadeRead.sol | 13 ++++++++----- contracts/p0/StRSR.sol | 17 +++++++++++------ contracts/p1/StRSR.sol | 13 +++++++++---- test/Facade.test.ts | 16 ++++++++++++---- test/ZZStRSR.test.ts | 21 ++++++++++++++++++++- 7 files changed, 81 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4fa4815b9e..b965577156 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,14 @@ Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` - `Furnace` - Allow melting while frozen +- `StRSR` + - Use correct era in `UnstakingStarted` event + - Expose `draftEra` via `getDraftEra()` view + +### Facades + +- `FacadeRead` + - Add `draftEra` argument to `pendingUnstakings(..)` ## Plugins diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 9b88e8a91c..2e2ce936e0 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -266,25 +266,26 @@ contract FacadeRead is IFacadeRead { // === Views === + /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @return unstakings All the pending StRSR unstakings for an account - function pendingUnstakings(RTokenP1 rToken, address account) - external - view - returns (Pending[] memory unstakings) - { - StRSRP1Votes stRSR = StRSRP1Votes(address(rToken.main().stRSR())); - uint256 era = stRSR.currentEra(); - uint256 left = stRSR.firstRemainingDraft(era, account); - uint256 right = stRSR.draftQueueLen(era, account); + /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} + /// @return unstakings {qDrafts} All the pending StRSR unstakings for an account, in drafts + function pendingUnstakings( + RTokenP1 rToken, + uint256 draftEra, + address account + ) external view returns (Pending[] memory unstakings) { + StRSRP1 stRSR = StRSRP1(address(rToken.main().stRSR())); + uint256 left = stRSR.firstRemainingDraft(draftEra, account); + uint256 right = stRSR.draftQueueLen(draftEra, account); unstakings = new Pending[](right - left); for (uint256 i = 0; i < right - left; i++) { - (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(era, account, i + left); + (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); uint192 diff = drafts; if (i + left > 0) { - (uint192 prevDrafts, ) = stRSR.draftQueues(era, account, i + left - 1); + (uint192 prevDrafts, ) = stRSR.draftQueues(draftEra, account, i + left - 1); diff = drafts - prevDrafts; } diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IFacadeRead.sol index 44af758dec..df5f039d64 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IFacadeRead.sol @@ -85,12 +85,15 @@ interface IFacadeRead { uint256 amount; } + /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @return All the pending StRSR unstakings for an account - function pendingUnstakings(RTokenP1 rToken, address account) - external - view - returns (Pending[] memory); + /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} + /// @return {qDrafts} All the pending unstakings for an account, in drafts + function pendingUnstakings( + RTokenP1 rToken, + uint256 draftEra, + address account + ) external view returns (Pending[] memory); /// Returns the prime basket /// @dev Indices are shared across return values diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index fe3676dcef..a9a3e597ec 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -77,9 +77,11 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // {qRSR} How much reward RSR was held the last time rewards were paid out uint256 internal rsrRewardsAtLastPayout; - // Era. If ever there's a total RSR wipeout, this is incremented - // This is only really here for equivalence with P1, which requires it + // Eras. These are only really here for equivalence with P1, which requires it + // If there's ever a total RSR wipeout to balances, this is incremented uint256 internal era; + // If there's ever a total RSR wipeout to pending withdrawals, this is incremented + uint256 internal draftEra; // The momentary stake/unstake rate is rsrBacking/totalStaked {RSR/stRSR} // That rate is locked in when slow unstaking *begins* @@ -136,6 +138,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { setRewardRatio(rewardRatio_); setWithdrawalLeak(withdrawalLeak_); era = 1; + draftEra = 1; } /// Assign reward payouts to the staker pool @@ -201,7 +204,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint256 lastAvailableAt = index > 0 ? withdrawals[account][index - 1].availableAt : 0; uint256 availableAt = Math.max(block.timestamp + unstakingDelay, lastAvailableAt); withdrawals[account].push(Withdrawal(account, rsrAmount, stakeAmount, availableAt)); - emit UnstakingStarted(index, era, account, rsrAmount, stakeAmount, availableAt); + emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); } /// Complete delayed staking for an account, up to but not including draft ID `endId` @@ -239,7 +242,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { require(bh.isReady(), "basket not ready"); // Execute accumulated withdrawals - emit UnstakingCompleted(start, i, era, account, total); + emit UnstakingCompleted(start, i, draftEra, account, total); main.rsr().safeTransfer(account, total); } @@ -280,7 +283,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } // Execute accumulated withdrawals - emit UnstakingCancelled(start, i, era, account, total); + emit UnstakingCancelled(start, i, draftEra, account, total); uint256 stakeAmount = total; if (totalStaked > 0) stakeAmount = (total * totalStaked) / rsrBacking; @@ -335,6 +338,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint256 withdrawalRSRtoTake = (rsrBeingWithdrawn() * rsrAmount + (rsrBalance - 1)) / rsrBalance; if ( + withdrawalRSRtoTake == 0 || rsrBeingWithdrawn() - withdrawalRSRtoTake < MIN_EXCHANGE_RATE.mulu_toUint(stakeBeingWithdrawn()) ) { @@ -382,7 +386,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address account = accounts.at(i); delete withdrawals[account]; } - emit AllUnstakingReset(era); + draftEra++; + emit AllUnstakingReset(draftEra); } /// @custom:governance diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 527d63f50c..faff182759 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -76,15 +76,15 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // === Financial State: Drafts === // Era. If drafts get wiped out due to RSR seizure, increment the era to zero draft values. // Only ever directly written by beginDraftEra() - uint256 internal draftEra; + uint256 internal draftEra; // {draftEra} // Drafts: share of the withdrawing tokens. Not transferrable and not revenue-earning. struct CumulativeDraft { // Avoid re-using uint192 in order to avoid confusion with our type system; 176 is enough uint176 drafts; // Total amount of drafts that will become available // {qDrafts} uint64 availableAt; // When the last of the drafts will become available } - // draftEra => ({account} => {drafts}) - mapping(uint256 => mapping(address => CumulativeDraft[])) public draftQueues; // {drafts} + // {draftEra} => ({account} => {qDrafts}) + mapping(uint256 => mapping(address => CumulativeDraft[])) public draftQueues; // {qDrafts} mapping(uint256 => mapping(address => uint256)) public firstRemainingDraft; // draft index uint256 private totalDrafts; // Total of all drafts {qDrafts} uint256 private draftRSR; // Amount of RSR backing all drafts {qRSR} @@ -285,7 +285,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // Create draft (uint256 index, uint64 availableAt) = pushDraft(account, rsrAmount); - emit UnstakingStarted(index, era, account, rsrAmount, stakeAmount, availableAt); + emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); } /// Complete an account's unstaking; callable by anyone @@ -564,6 +564,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab return totalDrafts; } + /// @return {draftEra} The current era for drafts (withdrawals) + function getDraftEra() external view returns (uint256) { + return draftEra; + } + // ==== Internal Functions ==== /// Assign reward payouts to the staker pool diff --git a/test/Facade.test.ts b/test/Facade.test.ts index df8269dc8a..f20428e2a4 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -9,7 +9,7 @@ import { IConfig, IMonitorParams } from '#/common/configuration' import { bn, fp } from '../common/numbers' import { setOraclePrice } from './utils/oracles' import { disableBatchTrade, disableDutchTrade } from './utils/trades' - +import { whileImpersonating } from './utils/impersonation' import { Asset, BackingManagerP1, @@ -966,16 +966,24 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) it('Should return pending unstakings', async () => { - const unstakeAmount = bn('10000e18') - await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(10)) + // Bump draftEra by seizing RSR when the withdrawal queue is empty + await rsr.connect(owner).mint(stRSRP1.address, 1) + await whileImpersonating(backingManager.address, async (signer) => { + await stRSRP1.connect(signer).seizeRSR(1) + }) + const draftEra = await stRSRP1.getDraftEra() + expect(draftEra).to.equal(2) // Stake + const unstakeAmount = bn('10000e18') + await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(10)) await rsr.connect(addr1).approve(stRSR.address, unstakeAmount.mul(10)) await stRSRP1.connect(addr1).stake(unstakeAmount.mul(10)) + await stRSRP1.connect(addr1).unstake(unstakeAmount) await stRSRP1.connect(addr1).unstake(unstakeAmount.add(1)) - const pendings = await facade.pendingUnstakings(rToken.address, addr1.address) + const pendings = await facade.pendingUnstakings(rToken.address, draftEra, addr1.address) expect(pendings.length).to.eql(2) expect(pendings[0][0]).to.eql(bn(0)) // index expect(pendings[0][2]).to.eql(unstakeAmount) // amount diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 927858718f..81629b3426 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -1,5 +1,6 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' import { signERC2612Permit } from 'eth-permit' import { BigNumber, ContractFactory } from 'ethers' @@ -536,6 +537,24 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await expect(stRSR.connect(addr1).unstake(0)).to.be.revertedWith('frozen or trading paused') }) + it('Should emit UnstakingStarted event with draftEra -- regression test 01/18/2024', async () => { + const amount: BigNumber = bn('1000e18') + + // Stake + await rsr.connect(addr1).approve(stRSR.address, amount) + await stRSR.connect(addr1).stake(amount) + + // Seize half the RSR, bumping the draftEra because the withdrawal queue is empty + await whileImpersonating(backingManager.address, async (signer) => { + await stRSR.connect(signer).seizeRSR(amount.div(2)) + }) + + // Unstake + await expect(stRSR.connect(addr1).unstake(amount)) + .emit(stRSR, 'UnstakingStarted') + .withArgs(0, 2, addr1.address, amount.div(2), amount, anyValue) + }) + it('Should create Pending withdrawal when unstaking', async () => { const amount: BigNumber = bn('1000e18') @@ -2009,7 +2028,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await expect(stRSR.connect(addr1).unstake(one)) .emit(stRSR, 'UnstakingStarted') - .withArgs(0, 1, addr1.address, bn(0), one, availableAt) + .withArgs(0, 2, addr1.address, bn(0), one, availableAt) // Check withdrawal properly registered - Check draft era //await expectWithdrawal(addr1.address, 0, { rsrAmount: bn(1) }) From 77e8981404fa9ae3d2aba427cbe554574b8d2160 Mon Sep 17 00:00:00 2001 From: brr Date: Sat, 20 Jan 2024 03:29:03 +0100 Subject: [PATCH 171/450] Prevent Stargate wrapper from reverting on failed claimRewards (#1029) --- .../stargate/StargateRewardableWrapper.sol | 43 ++++++++++++------- .../interfaces/IStargateLPStaking.sol | 2 +- .../stargate/mocks/StargateLPStakingMock.sol | 15 ++++++- .../StargateRewardableWrapper.test.ts | 26 +++++++---- 4 files changed, 59 insertions(+), 27 deletions(-) diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 838695d183..4ed4db54fb 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -46,31 +46,42 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { } function _claimAssetRewards() internal override { - if (stakingContract.totalAllocPoint() != 0) { - stakingContract.deposit(poolId, 0); + try stakingContract.totalAllocPoint() returns (uint256 totalAllocPoint) { + if (totalAllocPoint == 0) { + return; + } + } catch { + return; } + + // `.deposit` call in a try/catch to prevent staking contract + // this is because `_claimAssetRewards` is called on all movements + // and we want to prevent external calls from bricking the contract + // solhint-disable-next-line no-empty-blocks + try stakingContract.deposit(poolId, 0) {} catch {} } function _afterDeposit(uint256, address) internal override { uint256 underlyingBalance = underlying.balanceOf(address(this)); - IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); - - if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { - pool.approve(address(stakingContract), underlyingBalance); - stakingContract.deposit(poolId, underlyingBalance); - } + try stakingContract.poolInfo(poolId) returns (IStargateLPStaking.PoolInfo memory poolInfo) { + if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { + pool.approve(address(stakingContract), underlyingBalance); + try stakingContract.deposit(poolId, underlyingBalance) {} catch {} + } + } catch {} } function _beforeWithdraw(uint256 _amount, address) internal override { - IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); + try stakingContract.poolInfo(poolId) returns (IStargateLPStaking.PoolInfo memory poolInfo) { + uint256 underlyingBalance = underlying.balanceOf(address(this)); - uint256 underlyingBalance = underlying.balanceOf(address(this)); - if (underlyingBalance < _amount) { - if (poolInfo.allocPoint != 0) { - stakingContract.withdraw(poolId, _amount - underlyingBalance); - } else { - stakingContract.emergencyWithdraw(poolId); + if (underlyingBalance < _amount) { + if (poolInfo.allocPoint != 0) { + try stakingContract.withdraw(poolId, _amount - underlyingBalance) {} catch {} + } else { + try stakingContract.emergencyWithdraw(poolId) {} catch {} + } } - } + } catch {} } } diff --git a/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol b/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol index dc9e62ff5e..c6caae692c 100644 --- a/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol +++ b/contracts/plugins/assets/stargate/interfaces/IStargateLPStaking.sol @@ -24,7 +24,7 @@ interface IStargateLPStaking { function poolInfo(uint256) external view returns (PoolInfo memory); - function pendingStargate(uint256 _pid, address _user) external view returns (uint256); + function pendingEmissionToken(uint256 _pid, address _user) external view returns (uint256); /// @param _pid The pid specifies the pool function updatePool(uint256 _pid) external; diff --git a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol index 2123564b67..1fcc2c22f2 100644 --- a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol +++ b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol @@ -15,6 +15,8 @@ contract StargateLPStakingMock is IStargateLPStaking { uint256 public totalAllocPoint = 0; + uint256 public availableRewards = type(uint256).max; + constructor(ERC20Mock stargateMock_) { stargateMock = stargateMock_; stargate = address(stargateMock_); @@ -25,7 +27,16 @@ contract StargateLPStakingMock is IStargateLPStaking { return _poolInfo.length; } - function pendingStargate(uint256 pid, address user) external view override returns (uint256) { + function setAvailableRewards(uint256 amount) external { + availableRewards = amount; + } + + function pendingEmissionToken(uint256 pid, address user) + external + view + override + returns (uint256) + { return poolToUserRewardsPending[pid][user]; } @@ -84,6 +95,8 @@ contract StargateLPStakingMock is IStargateLPStaking { function _emitUserRewards(uint256 pid, address user) private { uint256 amount = poolToUserRewardsPending[pid][user]; + require(availableRewards >= amount, "LPStakingTime: eTokenBal must be >= _amount"); + availableRewards -= amount; stargateMock.mint(user, amount); poolToUserRewardsPending[pid][user] = 0; } diff --git a/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts b/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts index 76bf95cb27..b645235075 100644 --- a/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateRewardableWrapper.test.ts @@ -257,18 +257,26 @@ describeFork('Wrapped S*USDC', () => { it('claims previous rewards', async () => { await wrapper.connect(bob).deposit(await mockPool.balanceOf(bob.address), bob.address) await stakingContract.addRewardsToUser(bn('0'), wrapper.address, bn('20000e18')) - const availableReward = await stakingContract.pendingStargate('0', wrapper.address) + const availableReward = await stakingContract.pendingEmissionToken('0', wrapper.address) await mockPool.mint(bob.address, initialAmount) await wrapper.connect(bob).claimRewards() expect(availableReward).to.be.eq(await stargate.balanceOf(bob.address)) }) + it('regression: wrapper works even if staking contract is out of funds', async () => { + await wrapper.connect(bob).deposit(await mockPool.balanceOf(bob.address), bob.address) + await stakingContract.addRewardsToUser(bn('0'), wrapper.address, bn('20000e18')) + await stakingContract.setAvailableRewards(0) + + await wrapper.connect(bob).transfer(charles.address, await wrapper.balanceOf(bob.address)) + }) + describe('Tracking', () => { it('tracks slightly complex', async () => { const rewardIncrement = bn('20000e18') await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement ) await mockPool.mint(charles.address, initialAmount) @@ -279,7 +287,7 @@ describeFork('Wrapped S*USDC', () => { await wrapper.connect(charles).claimRewards() expect(await stargate.balanceOf(wrapper.address)).to.be.eq(rewardIncrement) await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement.mul(2)) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement.mul(2) ) await wrapper.connect(bob).withdraw(await wrapper.balanceOf(bob.address), bob.address) @@ -295,7 +303,7 @@ describeFork('Wrapped S*USDC', () => { it('tracks moderately complex sequence', async () => { const rewardIncrement = bn('20000e18') await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement ) @@ -309,7 +317,7 @@ describeFork('Wrapped S*USDC', () => { await wrapper.connect(charles).claimRewards() expect(await stargate.balanceOf(wrapper.address)).to.be.eq(rewardIncrement) await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement.mul(2)) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement.mul(2) ) @@ -323,7 +331,7 @@ describeFork('Wrapped S*USDC', () => { // bob rewards - 0 // charles rewards - 20k await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement.mul(3)) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement.mul(3) ) @@ -347,7 +355,7 @@ describeFork('Wrapped S*USDC', () => { it('maintains user rewards when transferring tokens', async () => { const rewardIncrement = bn('20000e18') await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement ) // bob rewards - 20k @@ -355,14 +363,14 @@ describeFork('Wrapped S*USDC', () => { // claims pending rewards to wrapper await wrapper.connect(bob).transfer(charles.address, initialAmount.div(2)) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq(0) + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq(0) expect(await wrapper.balanceOf(bob.address)).to.be.eq(initialAmount.div(2)) expect(await wrapper.balanceOf(charles.address)).to.be.eq(initialAmount.div(2)) // bob rewards - 20k // charles rewards - 0 await stakingContract.addRewardsToUser(bn('0'), wrapper.address, rewardIncrement) - expect(await stakingContract.pendingStargate(bn('0'), wrapper.address)).to.be.eq( + expect(await stakingContract.pendingEmissionToken(bn('0'), wrapper.address)).to.be.eq( rewardIncrement ) // bob rewards - 30k From cf3091139e59bc5efb6bfd6f7d6d920bfbbbed4b Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Fri, 19 Jan 2024 21:40:00 -0500 Subject: [PATCH 172/450] fix sfrxETH Collateral, add new oracle (#1026) --- common/configuration.ts | 7 ++ contracts/plugins/assets/FraxOracleLib.sol | 66 ++++++++++++++ contracts/plugins/assets/OracleErrors.sol | 7 ++ contracts/plugins/assets/OracleLib.sol | 4 +- contracts/plugins/assets/frax-eth/README.md | 7 +- .../assets/frax-eth/SFraxEthCollateral.sol | 46 +++++----- .../CurvePoolEmaPriceOracleWithMinMax.sol | 70 +++++++++++++++ .../ICurvePoolEmaPriceOracleWithMinMax.sol | 16 ++++ contracts/plugins/mocks/ChainlinkMock.sol | 13 +++ .../mocks/EmaPriceOracleStableSwapMock.sol | 33 +++++++ hardhat.config.ts | 2 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 1 + .../ankr/AnkrEthCollateralTestSuite.test.ts | 1 + .../cbeth/CBETHCollateral.test.ts | 1 + .../cbeth/CBETHCollateralL2.test.ts | 1 + .../individual-collateral/collateralTests.ts | 21 +++-- .../compoundv3/CometTestSuite.test.ts | 1 + .../curve/crv/CrvStableMetapoolSuite.test.ts | 1 + .../CrvStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/crv/CrvStableTestSuite.test.ts | 1 + .../curve/cvx/CvxStableMetapoolSuite.test.ts | 1 + .../CvxStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/cvx/CvxStableTestSuite.test.ts | 1 + .../dsr/SDaiCollateralTestSuite.test.ts | 1 + .../flux-finance/FTokenFiatCollateral.test.ts | 1 + .../frax-eth/SFrxEthTestSuite.test.ts | 88 +++++++++++++++---- .../frax-eth/constants.ts | 5 +- .../individual-collateral/frax-eth/helpers.ts | 7 +- .../frax/SFraxCollateralTestSuite.test.ts | 1 + .../lido/LidoStakedEthTestSuite.test.ts | 1 + .../MorphoAAVEFiatCollateral.test.ts | 1 + .../MorphoAAVENonFiatCollateral.test.ts | 1 + ...orphoAAVESelfReferentialCollateral.test.ts | 1 + .../individual-collateral/pluginTestTypes.ts | 3 + .../RethCollateralTestSuite.test.ts | 1 + .../stargate/StargateUSDCTestSuite.test.ts | 1 + .../YearnV2CurveFiatCollateral.test.ts | 1 + test/utils/oracles.ts | 27 +++++- 38 files changed, 384 insertions(+), 59 deletions(-) create mode 100644 contracts/plugins/assets/FraxOracleLib.sol create mode 100644 contracts/plugins/assets/OracleErrors.sol create mode 100644 contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol create mode 100644 contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol create mode 100644 contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol diff --git a/common/configuration.ts b/common/configuration.ts index 3692d8068f..f7caf36273 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -124,6 +124,7 @@ interface INetworkConfig { AAVE_V3_INCENTIVES_CONTROLLER?: string AAVE_V3_POOL?: string STARGATE_STAKING_CONTRACT?: string + CURVE_POOL_ETH_FRXETH?: string } export const networkConfig: { [key: string]: INetworkConfig } = { @@ -220,6 +221,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', @@ -240,6 +242,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '1': { name: 'mainnet', @@ -328,6 +331,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -345,6 +349,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '3': { name: 'tenderly', @@ -428,6 +433,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -445,6 +451,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '5': { name: 'goerli', diff --git a/contracts/plugins/assets/FraxOracleLib.sol b/contracts/plugins/assets/FraxOracleLib.sol new file mode 100644 index 0000000000..67374c8de1 --- /dev/null +++ b/contracts/plugins/assets/FraxOracleLib.sol @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import "../../libraries/Fixed.sol"; +import "./OracleErrors.sol"; + +interface FraxAggregatorV3Interface is AggregatorV3Interface { + function priceSource() external view returns (address); + + function addRoundData( + bool _isBadData, + uint104 _priceLow, + uint104 _priceHigh, + uint40 _timestamp + ) external; +} + +/// Used by asset plugins to price their collateral +library FraxOracleLib { + /// @dev Use for nested calls that should revert when there is a problem + /// @param timeout The number of seconds after which oracle values should be considered stale + /// @return {UoA/tok} + function price(FraxAggregatorV3Interface chainlinkFeed, uint48 timeout) + internal + view + returns (uint192) + { + try chainlinkFeed.latestRoundData() returns ( + uint80 roundId, + int256 p, + uint256, + uint256 updateTime, + uint80 answeredInRound + ) { + if (updateTime == 0 || answeredInRound < roundId) { + revert StalePrice(); + } + + // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 + uint48 secondsSince = uint48(block.timestamp - updateTime); + if (secondsSince > timeout) revert StalePrice(); + + if (p == 0) revert ZeroPrice(); + + // {UoA/tok} + return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); + } catch (bytes memory errData) { + // Check if the priceSource was not set: if so, the chainlink feed has been deprecated + // and a _specific_ error needs to be raised in order to avoid looking like OOG + if (errData.length == 0) { + if (chainlinkFeed.priceSource() == address(0)) { + revert StalePrice(); + } + // solhint-disable-next-line reason-string + revert(); + } + + // Otherwise, preserve the error bytes + // solhint-disable-next-line no-inline-assembly + assembly { + revert(add(32, errData), mload(errData)) + } + } + } +} diff --git a/contracts/plugins/assets/OracleErrors.sol b/contracts/plugins/assets/OracleErrors.sol new file mode 100644 index 0000000000..ddb96dd9ce --- /dev/null +++ b/contracts/plugins/assets/OracleErrors.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +// 0x19abf40e +error StalePrice(); +// 0x4dfba023 +error ZeroPrice(); diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index ff9bd0ef59..87db68e2b3 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -3,9 +3,7 @@ pragma solidity 0.8.19; import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import "../../libraries/Fixed.sol"; - -error StalePrice(); -error ZeroPrice(); +import "./OracleErrors.sol"; interface EACAggregatorProxy { function aggregator() external view returns (address); diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 7d32cc254a..81ed35cd9b 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -1,7 +1,5 @@ # Staked-Frax-ETH Collateral Plugin -**NOTE: The SFraxEthCollateral plugin SHOULD NOT be deployed and used until a `frxETH/ETH` chainlink oracle can be integrated with the plugin. As of 3/14/23, there is no chainlink oracle, but the FRAX team is working on getting one.** - ## Summary This plugin allows `sfrxETH` ((Staked-Frax-ETH)[https://docs.frax.finance/frax-ether/overview]) holders use their tokens as collateral in the Reserve Protocol. @@ -16,8 +14,6 @@ You can get the `frxETH/sfrxETH` exchange rate from [`sfrxETH.pricePerShare()`]( `frxETH` contract: -`wstETH` and `stETH` can be always swapped at any time to each other without any risk and limitation (Except smart contract risk), like `wETH` and `ETH`. Wrap & Unwrap app can be found here: - ## Implementation ### Units @@ -32,6 +28,9 @@ You can get the `frxETH/sfrxETH` exchange rate from [`sfrxETH.pricePerShare()`]( This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](https://github.com/FraxFinance/frxETH-public/blob/master/src/sfrxETH.sol#L82) function in sfrxETH contract. +#### target-per-ref price {tar/ref} + +The targetPerRef price of `ETH/frxETH` is received from the frxETH/ETH FRAX-managed oracle ([details here](https://docs.frax.finance/frax-oracle/frax-oracle-overview)). #### tryPrice This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index c3dbe91379..ccafd1163d 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -5,13 +5,9 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../../libraries/Fixed.sol"; import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; +import "../FraxOracleLib.sol"; import "./vendor/IsfrxEth.sol"; - -/** - * ************************************************************ - * WARNING: this plugin is not ready to be used in Production - * ************************************************************ - */ +import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; /** * @title SFraxEthCollateral @@ -21,20 +17,30 @@ import "./vendor/IsfrxEth.sol"; * tar = ETH * UoA = USD */ -contract SFraxEthCollateral is AppreciatingFiatCollateral { +contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOracleWithMinMax { using OracleLib for AggregatorV3Interface; + using FraxOracleLib for FraxAggregatorV3Interface; using FixLib for uint192; - // solhint-disable no-empty-blocks - /// @param config.chainlinkFeed Feed units: {UoA/target} - constructor(CollateralConfig memory config, uint192 revenueHiding) + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param revenueHiding {1e18} percent amount of revenue to hide + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + address curvePoolEmaPriceOracleAddress, + uint256 _minimumCurvePoolEma, + uint256 _maximumCurvePoolEma + ) AppreciatingFiatCollateral(config, revenueHiding) + CurvePoolEmaPriceOracleWithMinMax( + curvePoolEmaPriceOracleAddress, + _minimumCurvePoolEma, + _maximumCurvePoolEma + ) { require(config.defaultThreshold > 0, "defaultThreshold zero"); } - // solhint-enable no-empty-blocks - /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate @@ -49,22 +55,20 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { uint192 pegPrice ) { - // {UoA/tok} = {UoA/target} * {ref/tok} * {target/ref} (1) - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + // {target/ref} Get current market peg ({eth/frxeth}) + pegPrice = _safeWrap(_getCurvePoolToken1EmaPrice()); + + // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); - low = p - err; high = p + err; + low = p - err; // assert(low <= high); obviously true just by inspection - - // TODO: Currently not checking for depegs between `frxETH` and `ETH` - // Should be modified to use a `frxETH/ETH` oracle when available - pegPrice = targetPerRef(); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - uint256 rate = IsfrxEth(address(erc20)).pricePerShare(); - return _safeWrap(rate); + return _safeWrap(IsfrxEth(address(erc20)).pricePerShare()); } } diff --git a/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol new file mode 100644 index 0000000000..75f829a0dc --- /dev/null +++ b/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: ISC +pragma solidity ^0.8.19; + +// Inspired by Frax Finance: https://github.com/FraxFinance + +// Original Author +// Drake Evans: https://github.com/DrakeEvans + +// Original Reviewers +// Dennis: https://github.com/denett + +// ==================================================================== + +import { ICurvePoolEmaPriceOracleWithMinMax } from "./ICurvePoolEmaPriceOracleWithMinMax.sol"; + +interface IEmaPriceOracleStableSwap { + // solhint-disable-next-line func-name-mixedcase + function price_oracle() external view returns (uint256); +} + +struct ConstructorParams { + address curvePoolEmaPriceOracleAddress; + uint256 minimumCurvePoolEma; + uint256 maximumCurvePoolEma; +} + +/// @title CurvePoolEmaPriceOracleWithMinMax +/// @author Drake Evans (Frax Finance) https://github.com/drakeevans +/// @notice An oracle for getting EMA prices from Curve +contract CurvePoolEmaPriceOracleWithMinMax is ICurvePoolEmaPriceOracleWithMinMax { + /// @notice Curve pool, source of EMA + // solhint-disable-next-line var-name-mixedcase + address public immutable CURVE_POOL_EMA_PRICE_ORACLE; + + /// @notice Precision of Curve pool price_oracle() + uint256 public constant CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS = 18; + + /// @notice Maximum price of token1 in token0 units of the EMA + /// @dev Must match precision of EMA + uint256 public minimumCurvePoolEma; + + /// @notice Maximum price of token1 in token0 units of the EMA + /// @dev Must match precision of EMA + uint256 public maximumCurvePoolEma; + + constructor( + address curvePoolEmaPriceOracleAddress, + uint256 _minimumCurvePoolEma, + uint256 _maximumCurvePoolEma + ) { + CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; + minimumCurvePoolEma = _minimumCurvePoolEma; + maximumCurvePoolEma = _maximumCurvePoolEma; + } + + function _getCurvePoolToken1EmaPrice() internal view returns (uint256 _token1Price) { + uint256 _priceRaw = IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle(); + uint256 _price = _priceRaw > maximumCurvePoolEma ? maximumCurvePoolEma : _priceRaw; + + _token1Price = _price < minimumCurvePoolEma ? minimumCurvePoolEma : _price; + } + + /// @notice The ```getCurvePoolToken1EmaPrice``` function gets the price of the second token + /// in the Curve pool (token1) + /// @dev Returned in units of the first token (token0) + /// @return _emaPrice The price of the second token in the Curve pool + function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice) { + return _getCurvePoolToken1EmaPrice(); + } +} diff --git a/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol new file mode 100644 index 0000000000..94a8b2dbde --- /dev/null +++ b/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity 0.8.19; + +interface ICurvePoolEmaPriceOracleWithMinMax { + // solhint-disable-next-line func-name-mixedcase + function CURVE_POOL_EMA_PRICE_ORACLE() external view returns (address); + + // solhint-disable-next-line func-name-mixedcase + function CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS() external view returns (uint256); + + function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice); + + function maximumCurvePoolEma() external view returns (uint256); + + function minimumCurvePoolEma() external view returns (uint256); +} diff --git a/contracts/plugins/mocks/ChainlinkMock.sol b/contracts/plugins/mocks/ChainlinkMock.sol index 6e0fee6785..17cd3b6edd 100644 --- a/contracts/plugins/mocks/ChainlinkMock.sol +++ b/contracts/plugins/mocks/ChainlinkMock.sol @@ -24,6 +24,7 @@ contract MockV3Aggregator is AggregatorV3Interface { // Additional variable to be able to test invalid behavior uint256 public latestAnsweredRound; address public aggregator; + address public priceSource; mapping(uint256 => int256) public getAnswer; mapping(uint256 => uint256) public getTimestamp; @@ -32,6 +33,7 @@ contract MockV3Aggregator is AggregatorV3Interface { constructor(uint8 _decimals, int256 _initialAnswer) { decimals = _decimals; aggregator = address(this); + priceSource = address(this); updateAnswer(_initialAnswer); } @@ -49,6 +51,17 @@ contract MockV3Aggregator is AggregatorV3Interface { latestAnsweredRound = latestRound; } + // used by Frax oracle + function addRoundData(bool isBadData, uint104 low, uint104 high, uint40 timestamp) public { + latestAnswer = int104(low + high) / 2; + latestTimestamp = block.timestamp; + latestRound++; + getAnswer[latestRound] = latestAnswer; + getTimestamp[latestRound] = block.timestamp; + getStartedAt[latestRound] = block.timestamp; + latestAnsweredRound = latestRound; + } + // Additional function to be able to test invalid Chainlink behavior function setInvalidTimestamp() public { getTimestamp[latestRound] = 0; diff --git a/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol new file mode 100644 index 0000000000..6d94dc396f --- /dev/null +++ b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: ISC +pragma solidity ^0.8.19; + +interface IEmaPriceOracleStableSwap { + function price_oracle() external view returns (uint256); +} + +/// @title CurvePoolEmaPriceOracleWithMinMax +/// @author Drake Evans (Frax Finance) https://github.com/drakeevans +/// @notice An oracle for getting EMA prices from Curve +contract EmaPriceOracleStableSwapMock is IEmaPriceOracleStableSwap { + uint256 public initPrice; + uint256 internal _price; + + constructor( + uint256 _initPrice + ) { + initPrice = _initPrice; + _price = _initPrice; + } + + function resetPrice() external { + _price = initPrice; + } + + function setPrice(uint256 newPrice) external { + _price = newPrice; + } + + function price_oracle() external view returns (uint256) { + return _price; + } +} \ No newline at end of file diff --git a/hardhat.config.ts b/hardhat.config.ts index 87a53dbcf0..61bac4e916 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -44,7 +44,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true, + allowUnlimitedContractSize: true }, localhost: { // network for long-lived mainnet forks diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index a15ac37a23..b2628df278 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -213,6 +213,7 @@ export const stableOpts = { itClaimsRewards: it.skip, // untested: very complicated to get Aave to handout rewards, and none are live currently. // The StaticATokenV3LM contract is formally verified and the function we added for claimRewards() is pretty obviously correct. itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index e21a0f66a0..8a3a07a83f 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -286,6 +286,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 8f5bb5efe1..cd35ee5c0c 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -243,6 +243,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts index fbc3f6874b..a4a9c32425 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -274,6 +274,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index dcb238c332..f2eec97cb5 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -78,6 +78,7 @@ export default function fn( getExpectedPrice, itClaimsRewards, itChecksTargetPerRefDefault, + itChecksTargetPerRefDefaultUp, itChecksRefPerTokDefault, itChecksPriceChanges, itChecksNonZeroDefaultThreshold, @@ -223,6 +224,14 @@ export default function fn( describe('prices', () => { before(resetFork) // important for getting prices/refPerToks to behave predictably + it('enters IFFY state when price becomes stale', async () => { + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(oracleTimeout / 12) + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + }) + itChecksPriceChanges('prices change as USD feed price changes', async () => { const oracleError = await collateral.oracleError() const expectedPrice = await getExpectedPrice(ctx) @@ -411,14 +420,6 @@ export default function fn( expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) }) - it('enters IFFY state when price becomes stale', async () => { - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(oracleTimeout / 12) - await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - }) - it('decays price over priceTimeout period', async () => { await collateral.refresh() const savedLow = await collateral.savedLowPrice() @@ -453,6 +454,8 @@ export default function fn( }) describe('status', () => { + before(resetFork) + it('maintains status in normal situations', async () => { // Check initial state expect(await collateral.status()).to.equal(CollateralStatus.SOUND) @@ -489,7 +492,7 @@ export default function fn( } ) - itChecksTargetPerRefDefault( + itChecksTargetPerRefDefaultUp( 'enters IFFY state when target-per-ref depegs above high threshold', async () => { const delayUntilDefault = await collateral.delayUntilDefault() diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 7c91bd2064..0aa72a386e 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -407,6 +407,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts index 12964d9bbc..2bf70ca7cd 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts @@ -219,6 +219,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index bbabc4c8aa..0ab94cd268 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -289,6 +289,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts index 21260f9906..27a7a5c213 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts @@ -228,6 +228,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts index ce3a93e9e0..e259ef05be 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts @@ -227,6 +227,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 9000295bb8..11d8fcb5a9 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -291,6 +291,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 8cbdd58345..859b762b3f 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -424,6 +424,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 4d539a4a25..2919f0ebc4 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -211,6 +211,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index ea7c5554f2..180a889352 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -254,6 +254,7 @@ all.forEach((curr: FTokenEnumeration) => { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index 7ac77c01d1..fb9f69b97d 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -11,6 +11,9 @@ import { SfraxEthMock, TestICollateral, IsfrxEth, + SFraxEthCollateral, + EmaPriceOracleStableSwapMock__factory, + EmaPriceOracleStableSwapMock, } from '../../../../typechain' import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' @@ -27,6 +30,7 @@ import { FRX_ETH, SFRX_ETH, ETH_USD_PRICE_FEED, + CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, } from './constants' import { advanceTime, @@ -42,13 +46,20 @@ import { interface SFrxEthCollateralFixtureContext extends CollateralFixtureContext { frxEth: ERC20Mock sfrxEth: IsfrxEth + curveEmaOracle: EmaPriceOracleStableSwapMock } /* Define deployment functions */ -export const defaultRethCollateralOpts: CollateralOpts = { +interface SfrxEthCollateralOpts extends CollateralOpts { + curvePoolEmaPriceOracleAddress?: string + _minimumCurvePoolEma?: BigNumberish + _maximumCurvePoolEma?: BigNumberish +} + +export const defaultRethCollateralOpts: SfrxEthCollateralOpts = { erc20: SFRX_ETH, targetName: ethers.utils.formatBytes32String('ETH'), rewardERC20: WETH, @@ -60,9 +71,14 @@ export const defaultRethCollateralOpts: CollateralOpts = { defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), + curvePoolEmaPriceOracleAddress: CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, + _minimumCurvePoolEma: 0, + _maximumCurvePoolEma: fp(1), } -export const deployCollateral = async (opts: CollateralOpts = {}): Promise => { +export const deployCollateral = async ( + opts: SfrxEthCollateralOpts = {} +): Promise => { opts = { ...defaultRethCollateralOpts, ...opts } const SFraxEthCollateralFactory: ContractFactory = await ethers.getContractFactory( @@ -82,13 +98,15 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise( + await ethers.getContractFactory('EmaPriceOracleStableSwapMock') + ) + + const curveEmaOracle = ( + await EmaPriceOracleStableSwapMockFactory.deploy(fp('0.997646')) + ) + collateralOpts.curvePoolEmaPriceOracleAddress = curveEmaOracle.address + const frxEth = (await ethers.getContractAt('ERC20Mock', FRX_ETH)) as ERC20Mock const sfrxEth = (await ethers.getContractAt('IsfrxEth', SFRX_ETH)) as IsfrxEth const collateral = await deployCollateral(collateralOpts) @@ -126,6 +153,7 @@ const makeCollateralFixtureContext = ( chainlinkFeed, frxEth, sfrxEth, + curveEmaOracle, tok: sfrxEth, } } @@ -146,11 +174,27 @@ const mintCollateralTo: MintCollateralFunc = as await mintSfrxETH(ctx.sfrxEth, user, amount, recipient, ctx.chainlinkFeed) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} +const changeTargetPerRef = async ( + ctx: SFrxEthCollateralFixtureContext, + percentChange: BigNumber +) => { + const initPrice = await ctx.curveEmaOracle.price_oracle() + await ctx.curveEmaOracle.setPrice(initPrice.add(initPrice.mul(percentChange).div(100))) +} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} +const reduceTargetPerRef = async ( + ctx: SFrxEthCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) +} + +const increaseTargetPerRef = async ( + ctx: SFrxEthCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctIncrease)) +} // prettier-ignore const reduceRefPerTok = async () => { @@ -172,11 +216,11 @@ const increaseRefPerTok = async ( await hre.network.provider.send('evm_mine', []) } await ctx.sfrxEth.syncRewards() - await advanceBlocks(1200 / 12) - await advanceTime(1200) + await advanceBlocks(86400 / 12) + await advanceTime(86400) // push chainlink oracle forward so that tryPrice() still works - const lastAnswer = await ctx.chainlinkFeed.latestAnswer() - await ctx.chainlinkFeed.updateAnswer(lastAnswer) + const latestRoundData = await ctx.chainlinkFeed.latestRoundData() + await ctx.chainlinkFeed.updateAnswer(latestRoundData.answer) } const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise => { @@ -184,9 +228,18 @@ const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise { const chainlinkFeed = ( await (await ethers.getContractFactory('MockV3Aggregator')).deploy(8, chainlinkDefaultAnswer) ) + const collateral = await deployCollateral({ erc20: erc20.address, revenueHiding: fp('0.01'), @@ -256,14 +310,16 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it.skip, itChecksRefPerTokDefault: it.skip, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemnted in this file + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'SFraxEthCollateral', chainlinkDefaultAnswer, + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/frax-eth/constants.ts b/test/plugins/individual-collateral/frax-eth/constants.ts index 8ae4cfc38a..aa6cda39c6 100644 --- a/test/plugins/individual-collateral/frax-eth/constants.ts +++ b/test/plugins/individual-collateral/frax-eth/constants.ts @@ -7,6 +7,9 @@ export const FRX_ETH = networkConfig['31337'].tokens.frxETH as string export const SFRX_ETH = networkConfig['31337'].tokens.sfrxETH as string export const WETH = networkConfig['31337'].tokens.WETH as string export const FRX_ETH_MINTER = '0xbAFA44EFE7901E04E39Dad13167D089C559c1138' +export const FRXETH_ETH_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.frxETH as string +export const CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS = networkConfig['31337'] + .CURVE_POOL_ETH_FRXETH as string export const PRICE_TIMEOUT = bn('604800') // 1 week export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds @@ -15,4 +18,4 @@ export const DEFAULT_THRESHOLD = bn(5).mul(bn(10).pow(16)) // 0.05 export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000) -export const FORK_BLOCK = 16773193 +export const FORK_BLOCK = 18705637 diff --git a/test/plugins/individual-collateral/frax-eth/helpers.ts b/test/plugins/individual-collateral/frax-eth/helpers.ts index 50a24bb9bc..99ce493da5 100644 --- a/test/plugins/individual-collateral/frax-eth/helpers.ts +++ b/test/plugins/individual-collateral/frax-eth/helpers.ts @@ -5,6 +5,8 @@ import { BigNumberish } from 'ethers' import { FORK_BLOCK, FRX_ETH_MINTER } from './constants' import { getResetFork } from '../helpers' import { setNextBlockTimestamp, getLatestBlockTimestamp } from '../../../utils/time' +import { fp } from '#/common/numbers' +import { setBalance } from '@nomicfoundation/hardhat-network-helpers' export const mintSfrxETH = async ( sfrxEth: IsfrxEth, @@ -13,6 +15,7 @@ export const mintSfrxETH = async ( recipient: string, chainlinkFeed: MockV3Aggregator ) => { + await setBalance(account.address, fp(100000)) const frxEthMinter: IfrxEthMinter = ( await ethers.getContractAt('IfrxEthMinter', FRX_ETH_MINTER) ) @@ -28,8 +31,8 @@ export const mintSfrxETH = async ( await frxEthMinter.connect(account).submitAndDeposit(recipient, { value: depositAmount }) // push chainlink oracle forward so that tryPrice() still works - const lastAnswer = await chainlinkFeed.latestAnswer() - await chainlinkFeed.updateAnswer(lastAnswer) + const lastAnswer = await chainlinkFeed.latestRoundData() + await chainlinkFeed.updateAnswer(lastAnswer.answer) } export const mintFrxETH = async ( diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index 43d09c95be..28d0f1bcd9 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,6 +193,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, diff --git a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts index 1f4213ac61..366c8c81c2 100644 --- a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts @@ -265,6 +265,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index 5ffecb6582..7f1a19c867 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -362,6 +362,7 @@ const makeAaveFiatCollateralTestSuite = ( getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 28614aff7d..937ec99e70 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -225,6 +225,7 @@ const makeAaveNonFiatCollateralTestSuite = ( getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 4bf7730685..81404fe208 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -225,6 +225,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefaultUp: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it.skip, diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 34bfefbb20..2dca2653da 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -91,6 +91,9 @@ export interface CollateralTestSuiteFixtures // toggle on or off: tests that focus on a targetPerRef default itChecksTargetPerRefDefault: Mocha.TestFunction | Mocha.PendingTestFunction + // toggle on or off: tests that focus on a targetPerRef defaulting upwards + itChecksTargetPerRefDefaultUp: Mocha.TestFunction | Mocha.PendingTestFunction + // toggle on or off: tests that focus on a refPerTok default itChecksRefPerTokDefault: Mocha.TestFunction | Mocha.PendingTestFunction diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index d10488770e..f766a3bc08 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -272,6 +272,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts index f3f81e978d..1968edfe85 100644 --- a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts @@ -312,6 +312,7 @@ export const stableOpts = { increaseTargetPerRef, itClaimsRewards: it, // reward growth not supported in mock itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index 126280f15b..ed208fbf48 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -239,6 +239,7 @@ tests.forEach((test: CurveFiatTest) => { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it.skip, diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 2444878fe4..6dde6dec02 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -5,6 +5,8 @@ import { ethers, network } from 'hardhat' import { expect } from 'chai' import { fp, bn, divCeil } from '../../common/numbers' import { MAX_UINT192 } from '../../common/constants' +import { getLatestBlockTimestamp } from './time' +import { whileImpersonating } from './impersonation' const toleranceDivisor = bn('1e15') // 1 part in 1000 trillions @@ -143,7 +145,12 @@ export const overrideOracle = async (oracleAddress: string): Promise { const chainlinkFeed = await ethers.getContractAt('MockV3Aggregator', await chainlinkAddr) - const initPrice = await chainlinkFeed.latestAnswer() + let initPrice + // awkward workaround for sfrxETH oracle + try { + initPrice = await chainlinkFeed.latestAnswer() + } catch { + initPrice = (await chainlinkFeed.latestRoundData()).answer + } try { // Try to update as if it's a mock already await chainlinkFeed.updateAnswer(initPrice) @@ -163,3 +176,13 @@ export const pushOracleForward = async (chainlinkAddr: string) => { await oracle.updateAnswer(initPrice) } } + +export const pushFraxOracleForward = async (chainlinkAddr: string) => { + const chainlinkFeed = await ethers.getContractAt('FraxAggregatorV3Interface', chainlinkAddr) + const initPrice = (await chainlinkFeed.latestRoundData()).answer + await whileImpersonating(await chainlinkFeed.priceSource(), async (owner) => { + await chainlinkFeed + .connect(owner) + .addRoundData(false, initPrice, initPrice, (await getLatestBlockTimestamp()) + 1) + }) +} From e26ba6e34fbb1d7193394656e77c37102a605dfb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 21:45:23 -0500 Subject: [PATCH 173/450] Revert "fix sfrxETH Collateral, add new oracle" (#1043) --- common/configuration.ts | 7 -- contracts/plugins/assets/FraxOracleLib.sol | 66 -------------- contracts/plugins/assets/OracleErrors.sol | 7 -- contracts/plugins/assets/OracleLib.sol | 4 +- contracts/plugins/assets/frax-eth/README.md | 7 +- .../assets/frax-eth/SFraxEthCollateral.sol | 46 +++++----- .../CurvePoolEmaPriceOracleWithMinMax.sol | 70 --------------- .../ICurvePoolEmaPriceOracleWithMinMax.sol | 16 ---- contracts/plugins/mocks/ChainlinkMock.sol | 13 --- .../mocks/EmaPriceOracleStableSwapMock.sol | 33 ------- hardhat.config.ts | 2 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 1 - .../ankr/AnkrEthCollateralTestSuite.test.ts | 1 - .../cbeth/CBETHCollateral.test.ts | 1 - .../cbeth/CBETHCollateralL2.test.ts | 1 - .../individual-collateral/collateralTests.ts | 21 ++--- .../compoundv3/CometTestSuite.test.ts | 1 - .../curve/crv/CrvStableMetapoolSuite.test.ts | 1 - .../CrvStableRTokenMetapoolTestSuite.test.ts | 1 - .../curve/crv/CrvStableTestSuite.test.ts | 1 - .../curve/cvx/CvxStableMetapoolSuite.test.ts | 1 - .../CvxStableRTokenMetapoolTestSuite.test.ts | 1 - .../curve/cvx/CvxStableTestSuite.test.ts | 1 - .../dsr/SDaiCollateralTestSuite.test.ts | 1 - .../flux-finance/FTokenFiatCollateral.test.ts | 1 - .../frax-eth/SFrxEthTestSuite.test.ts | 88 ++++--------------- .../frax-eth/constants.ts | 5 +- .../individual-collateral/frax-eth/helpers.ts | 7 +- .../frax/SFraxCollateralTestSuite.test.ts | 1 - .../lido/LidoStakedEthTestSuite.test.ts | 1 - .../MorphoAAVEFiatCollateral.test.ts | 1 - .../MorphoAAVENonFiatCollateral.test.ts | 1 - ...orphoAAVESelfReferentialCollateral.test.ts | 1 - .../individual-collateral/pluginTestTypes.ts | 3 - .../RethCollateralTestSuite.test.ts | 1 - .../stargate/StargateUSDCTestSuite.test.ts | 1 - .../YearnV2CurveFiatCollateral.test.ts | 1 - test/utils/oracles.ts | 27 +----- 38 files changed, 59 insertions(+), 384 deletions(-) delete mode 100644 contracts/plugins/assets/FraxOracleLib.sol delete mode 100644 contracts/plugins/assets/OracleErrors.sol delete mode 100644 contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol delete mode 100644 contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol delete mode 100644 contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol diff --git a/common/configuration.ts b/common/configuration.ts index f7caf36273..3692d8068f 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -124,7 +124,6 @@ interface INetworkConfig { AAVE_V3_INCENTIVES_CONTROLLER?: string AAVE_V3_POOL?: string STARGATE_STAKING_CONTRACT?: string - CURVE_POOL_ETH_FRXETH?: string } export const networkConfig: { [key: string]: INetworkConfig } = { @@ -221,7 +220,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', @@ -242,7 +240,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '1': { name: 'mainnet', @@ -331,7 +328,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -349,7 +345,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '3': { name: 'tenderly', @@ -433,7 +428,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -451,7 +445,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '5': { name: 'goerli', diff --git a/contracts/plugins/assets/FraxOracleLib.sol b/contracts/plugins/assets/FraxOracleLib.sol deleted file mode 100644 index 67374c8de1..0000000000 --- a/contracts/plugins/assets/FraxOracleLib.sol +++ /dev/null @@ -1,66 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; -import "../../libraries/Fixed.sol"; -import "./OracleErrors.sol"; - -interface FraxAggregatorV3Interface is AggregatorV3Interface { - function priceSource() external view returns (address); - - function addRoundData( - bool _isBadData, - uint104 _priceLow, - uint104 _priceHigh, - uint40 _timestamp - ) external; -} - -/// Used by asset plugins to price their collateral -library FraxOracleLib { - /// @dev Use for nested calls that should revert when there is a problem - /// @param timeout The number of seconds after which oracle values should be considered stale - /// @return {UoA/tok} - function price(FraxAggregatorV3Interface chainlinkFeed, uint48 timeout) - internal - view - returns (uint192) - { - try chainlinkFeed.latestRoundData() returns ( - uint80 roundId, - int256 p, - uint256, - uint256 updateTime, - uint80 answeredInRound - ) { - if (updateTime == 0 || answeredInRound < roundId) { - revert StalePrice(); - } - - // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 - uint48 secondsSince = uint48(block.timestamp - updateTime); - if (secondsSince > timeout) revert StalePrice(); - - if (p == 0) revert ZeroPrice(); - - // {UoA/tok} - return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); - } catch (bytes memory errData) { - // Check if the priceSource was not set: if so, the chainlink feed has been deprecated - // and a _specific_ error needs to be raised in order to avoid looking like OOG - if (errData.length == 0) { - if (chainlinkFeed.priceSource() == address(0)) { - revert StalePrice(); - } - // solhint-disable-next-line reason-string - revert(); - } - - // Otherwise, preserve the error bytes - // solhint-disable-next-line no-inline-assembly - assembly { - revert(add(32, errData), mload(errData)) - } - } - } -} diff --git a/contracts/plugins/assets/OracleErrors.sol b/contracts/plugins/assets/OracleErrors.sol deleted file mode 100644 index ddb96dd9ce..0000000000 --- a/contracts/plugins/assets/OracleErrors.sol +++ /dev/null @@ -1,7 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -// 0x19abf40e -error StalePrice(); -// 0x4dfba023 -error ZeroPrice(); diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index 87db68e2b3..ff9bd0ef59 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -3,7 +3,9 @@ pragma solidity 0.8.19; import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import "../../libraries/Fixed.sol"; -import "./OracleErrors.sol"; + +error StalePrice(); +error ZeroPrice(); interface EACAggregatorProxy { function aggregator() external view returns (address); diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 81ed35cd9b..7d32cc254a 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -1,5 +1,7 @@ # Staked-Frax-ETH Collateral Plugin +**NOTE: The SFraxEthCollateral plugin SHOULD NOT be deployed and used until a `frxETH/ETH` chainlink oracle can be integrated with the plugin. As of 3/14/23, there is no chainlink oracle, but the FRAX team is working on getting one.** + ## Summary This plugin allows `sfrxETH` ((Staked-Frax-ETH)[https://docs.frax.finance/frax-ether/overview]) holders use their tokens as collateral in the Reserve Protocol. @@ -14,6 +16,8 @@ You can get the `frxETH/sfrxETH` exchange rate from [`sfrxETH.pricePerShare()`]( `frxETH` contract: +`wstETH` and `stETH` can be always swapped at any time to each other without any risk and limitation (Except smart contract risk), like `wETH` and `ETH`. Wrap & Unwrap app can be found here: + ## Implementation ### Units @@ -28,9 +32,6 @@ You can get the `frxETH/sfrxETH` exchange rate from [`sfrxETH.pricePerShare()`]( This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](https://github.com/FraxFinance/frxETH-public/blob/master/src/sfrxETH.sol#L82) function in sfrxETH contract. -#### target-per-ref price {tar/ref} - -The targetPerRef price of `ETH/frxETH` is received from the frxETH/ETH FRAX-managed oracle ([details here](https://docs.frax.finance/frax-oracle/frax-oracle-overview)). #### tryPrice This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index ccafd1163d..c3dbe91379 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -5,9 +5,13 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../../libraries/Fixed.sol"; import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; -import "../FraxOracleLib.sol"; import "./vendor/IsfrxEth.sol"; -import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; + +/** + * ************************************************************ + * WARNING: this plugin is not ready to be used in Production + * ************************************************************ + */ /** * @title SFraxEthCollateral @@ -17,30 +21,20 @@ import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; * tar = ETH * UoA = USD */ -contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOracleWithMinMax { +contract SFraxEthCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; - using FraxOracleLib for FraxAggregatorV3Interface; using FixLib for uint192; - /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms - /// @param revenueHiding {1e18} percent amount of revenue to hide - constructor( - CollateralConfig memory config, - uint192 revenueHiding, - address curvePoolEmaPriceOracleAddress, - uint256 _minimumCurvePoolEma, - uint256 _maximumCurvePoolEma - ) + // solhint-disable no-empty-blocks + /// @param config.chainlinkFeed Feed units: {UoA/target} + constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - CurvePoolEmaPriceOracleWithMinMax( - curvePoolEmaPriceOracleAddress, - _minimumCurvePoolEma, - _maximumCurvePoolEma - ) { require(config.defaultThreshold > 0, "defaultThreshold zero"); } + // solhint-enable no-empty-blocks + /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate @@ -55,20 +49,22 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOrac uint192 pegPrice ) { - // {target/ref} Get current market peg ({eth/frxeth}) - pegPrice = _safeWrap(_getCurvePoolToken1EmaPrice()); - - // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); + // {UoA/tok} = {UoA/target} * {ref/tok} * {target/ref} (1) + uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); - high = p + err; low = p - err; + high = p + err; // assert(low <= high); obviously true just by inspection + + // TODO: Currently not checking for depegs between `frxETH` and `ETH` + // Should be modified to use a `frxETH/ETH` oracle when available + pegPrice = targetPerRef(); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - return _safeWrap(IsfrxEth(address(erc20)).pricePerShare()); + uint256 rate = IsfrxEth(address(erc20)).pricePerShare(); + return _safeWrap(rate); } } diff --git a/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol deleted file mode 100644 index 75f829a0dc..0000000000 --- a/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol +++ /dev/null @@ -1,70 +0,0 @@ -// SPDX-License-Identifier: ISC -pragma solidity ^0.8.19; - -// Inspired by Frax Finance: https://github.com/FraxFinance - -// Original Author -// Drake Evans: https://github.com/DrakeEvans - -// Original Reviewers -// Dennis: https://github.com/denett - -// ==================================================================== - -import { ICurvePoolEmaPriceOracleWithMinMax } from "./ICurvePoolEmaPriceOracleWithMinMax.sol"; - -interface IEmaPriceOracleStableSwap { - // solhint-disable-next-line func-name-mixedcase - function price_oracle() external view returns (uint256); -} - -struct ConstructorParams { - address curvePoolEmaPriceOracleAddress; - uint256 minimumCurvePoolEma; - uint256 maximumCurvePoolEma; -} - -/// @title CurvePoolEmaPriceOracleWithMinMax -/// @author Drake Evans (Frax Finance) https://github.com/drakeevans -/// @notice An oracle for getting EMA prices from Curve -contract CurvePoolEmaPriceOracleWithMinMax is ICurvePoolEmaPriceOracleWithMinMax { - /// @notice Curve pool, source of EMA - // solhint-disable-next-line var-name-mixedcase - address public immutable CURVE_POOL_EMA_PRICE_ORACLE; - - /// @notice Precision of Curve pool price_oracle() - uint256 public constant CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS = 18; - - /// @notice Maximum price of token1 in token0 units of the EMA - /// @dev Must match precision of EMA - uint256 public minimumCurvePoolEma; - - /// @notice Maximum price of token1 in token0 units of the EMA - /// @dev Must match precision of EMA - uint256 public maximumCurvePoolEma; - - constructor( - address curvePoolEmaPriceOracleAddress, - uint256 _minimumCurvePoolEma, - uint256 _maximumCurvePoolEma - ) { - CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; - minimumCurvePoolEma = _minimumCurvePoolEma; - maximumCurvePoolEma = _maximumCurvePoolEma; - } - - function _getCurvePoolToken1EmaPrice() internal view returns (uint256 _token1Price) { - uint256 _priceRaw = IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle(); - uint256 _price = _priceRaw > maximumCurvePoolEma ? maximumCurvePoolEma : _priceRaw; - - _token1Price = _price < minimumCurvePoolEma ? minimumCurvePoolEma : _price; - } - - /// @notice The ```getCurvePoolToken1EmaPrice``` function gets the price of the second token - /// in the Curve pool (token1) - /// @dev Returned in units of the first token (token0) - /// @return _emaPrice The price of the second token in the Curve pool - function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice) { - return _getCurvePoolToken1EmaPrice(); - } -} diff --git a/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol deleted file mode 100644 index 94a8b2dbde..0000000000 --- a/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity 0.8.19; - -interface ICurvePoolEmaPriceOracleWithMinMax { - // solhint-disable-next-line func-name-mixedcase - function CURVE_POOL_EMA_PRICE_ORACLE() external view returns (address); - - // solhint-disable-next-line func-name-mixedcase - function CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS() external view returns (uint256); - - function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice); - - function maximumCurvePoolEma() external view returns (uint256); - - function minimumCurvePoolEma() external view returns (uint256); -} diff --git a/contracts/plugins/mocks/ChainlinkMock.sol b/contracts/plugins/mocks/ChainlinkMock.sol index 17cd3b6edd..6e0fee6785 100644 --- a/contracts/plugins/mocks/ChainlinkMock.sol +++ b/contracts/plugins/mocks/ChainlinkMock.sol @@ -24,7 +24,6 @@ contract MockV3Aggregator is AggregatorV3Interface { // Additional variable to be able to test invalid behavior uint256 public latestAnsweredRound; address public aggregator; - address public priceSource; mapping(uint256 => int256) public getAnswer; mapping(uint256 => uint256) public getTimestamp; @@ -33,7 +32,6 @@ contract MockV3Aggregator is AggregatorV3Interface { constructor(uint8 _decimals, int256 _initialAnswer) { decimals = _decimals; aggregator = address(this); - priceSource = address(this); updateAnswer(_initialAnswer); } @@ -51,17 +49,6 @@ contract MockV3Aggregator is AggregatorV3Interface { latestAnsweredRound = latestRound; } - // used by Frax oracle - function addRoundData(bool isBadData, uint104 low, uint104 high, uint40 timestamp) public { - latestAnswer = int104(low + high) / 2; - latestTimestamp = block.timestamp; - latestRound++; - getAnswer[latestRound] = latestAnswer; - getTimestamp[latestRound] = block.timestamp; - getStartedAt[latestRound] = block.timestamp; - latestAnsweredRound = latestRound; - } - // Additional function to be able to test invalid Chainlink behavior function setInvalidTimestamp() public { getTimestamp[latestRound] = 0; diff --git a/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol deleted file mode 100644 index 6d94dc396f..0000000000 --- a/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol +++ /dev/null @@ -1,33 +0,0 @@ -// SPDX-License-Identifier: ISC -pragma solidity ^0.8.19; - -interface IEmaPriceOracleStableSwap { - function price_oracle() external view returns (uint256); -} - -/// @title CurvePoolEmaPriceOracleWithMinMax -/// @author Drake Evans (Frax Finance) https://github.com/drakeevans -/// @notice An oracle for getting EMA prices from Curve -contract EmaPriceOracleStableSwapMock is IEmaPriceOracleStableSwap { - uint256 public initPrice; - uint256 internal _price; - - constructor( - uint256 _initPrice - ) { - initPrice = _initPrice; - _price = _initPrice; - } - - function resetPrice() external { - _price = initPrice; - } - - function setPrice(uint256 newPrice) external { - _price = newPrice; - } - - function price_oracle() external view returns (uint256) { - return _price; - } -} \ No newline at end of file diff --git a/hardhat.config.ts b/hardhat.config.ts index 61bac4e916..87a53dbcf0 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -44,7 +44,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true + allowUnlimitedContractSize: true, }, localhost: { // network for long-lived mainnet forks diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index b2628df278..a15ac37a23 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -213,7 +213,6 @@ export const stableOpts = { itClaimsRewards: it.skip, // untested: very complicated to get Aave to handout rewards, and none are live currently. // The StaticATokenV3LM contract is formally verified and the function we added for claimRewards() is pretty obviously correct. itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index 8a3a07a83f..e21a0f66a0 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -286,7 +286,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index cd35ee5c0c..8f5bb5efe1 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -243,7 +243,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts index a4a9c32425..fbc3f6874b 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -274,7 +274,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index f2eec97cb5..dcb238c332 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -78,7 +78,6 @@ export default function fn( getExpectedPrice, itClaimsRewards, itChecksTargetPerRefDefault, - itChecksTargetPerRefDefaultUp, itChecksRefPerTokDefault, itChecksPriceChanges, itChecksNonZeroDefaultThreshold, @@ -224,14 +223,6 @@ export default function fn( describe('prices', () => { before(resetFork) // important for getting prices/refPerToks to behave predictably - it('enters IFFY state when price becomes stale', async () => { - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(oracleTimeout / 12) - await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - }) - itChecksPriceChanges('prices change as USD feed price changes', async () => { const oracleError = await collateral.oracleError() const expectedPrice = await getExpectedPrice(ctx) @@ -420,6 +411,14 @@ export default function fn( expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) }) + it('enters IFFY state when price becomes stale', async () => { + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(oracleTimeout / 12) + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + }) + it('decays price over priceTimeout period', async () => { await collateral.refresh() const savedLow = await collateral.savedLowPrice() @@ -454,8 +453,6 @@ export default function fn( }) describe('status', () => { - before(resetFork) - it('maintains status in normal situations', async () => { // Check initial state expect(await collateral.status()).to.equal(CollateralStatus.SOUND) @@ -492,7 +489,7 @@ export default function fn( } ) - itChecksTargetPerRefDefaultUp( + itChecksTargetPerRefDefault( 'enters IFFY state when target-per-ref depegs above high threshold', async () => { const delayUntilDefault = await collateral.delayUntilDefault() diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 0aa72a386e..7c91bd2064 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -407,7 +407,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts index 2bf70ca7cd..12964d9bbc 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts @@ -219,7 +219,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index 0ab94cd268..bbabc4c8aa 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -289,7 +289,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts index 27a7a5c213..21260f9906 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts @@ -228,7 +228,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts index e259ef05be..ce3a93e9e0 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts @@ -227,7 +227,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 11d8fcb5a9..9000295bb8 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -291,7 +291,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 859b762b3f..8cbdd58345 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -424,7 +424,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 2919f0ebc4..4d539a4a25 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -211,7 +211,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index 180a889352..ea7c5554f2 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -254,7 +254,6 @@ all.forEach((curr: FTokenEnumeration) => { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index fb9f69b97d..7ac77c01d1 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -11,9 +11,6 @@ import { SfraxEthMock, TestICollateral, IsfrxEth, - SFraxEthCollateral, - EmaPriceOracleStableSwapMock__factory, - EmaPriceOracleStableSwapMock, } from '../../../../typechain' import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' @@ -30,7 +27,6 @@ import { FRX_ETH, SFRX_ETH, ETH_USD_PRICE_FEED, - CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, } from './constants' import { advanceTime, @@ -46,20 +42,13 @@ import { interface SFrxEthCollateralFixtureContext extends CollateralFixtureContext { frxEth: ERC20Mock sfrxEth: IsfrxEth - curveEmaOracle: EmaPriceOracleStableSwapMock } /* Define deployment functions */ -interface SfrxEthCollateralOpts extends CollateralOpts { - curvePoolEmaPriceOracleAddress?: string - _minimumCurvePoolEma?: BigNumberish - _maximumCurvePoolEma?: BigNumberish -} - -export const defaultRethCollateralOpts: SfrxEthCollateralOpts = { +export const defaultRethCollateralOpts: CollateralOpts = { erc20: SFRX_ETH, targetName: ethers.utils.formatBytes32String('ETH'), rewardERC20: WETH, @@ -71,14 +60,9 @@ export const defaultRethCollateralOpts: SfrxEthCollateralOpts = { defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - curvePoolEmaPriceOracleAddress: CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, - _minimumCurvePoolEma: 0, - _maximumCurvePoolEma: fp(1), } -export const deployCollateral = async ( - opts: SfrxEthCollateralOpts = {} -): Promise => { +export const deployCollateral = async (opts: CollateralOpts = {}): Promise => { opts = { ...defaultRethCollateralOpts, ...opts } const SFraxEthCollateralFactory: ContractFactory = await ethers.getContractFactory( @@ -98,15 +82,13 @@ export const deployCollateral = async ( delayUntilDefault: opts.delayUntilDefault, }, opts.revenueHiding, - opts.curvePoolEmaPriceOracleAddress ?? CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, - opts._minimumCurvePoolEma ?? 0, - opts._maximumCurvePoolEma ?? fp(1), { gasLimit: 2000000000 } ) await collateral.deployed() // Push forward chainlink feed await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -134,15 +116,6 @@ const makeCollateralFixtureContext = ( ) collateralOpts.chainlinkFeed = chainlinkFeed.address - const EmaPriceOracleStableSwapMockFactory = ( - await ethers.getContractFactory('EmaPriceOracleStableSwapMock') - ) - - const curveEmaOracle = ( - await EmaPriceOracleStableSwapMockFactory.deploy(fp('0.997646')) - ) - collateralOpts.curvePoolEmaPriceOracleAddress = curveEmaOracle.address - const frxEth = (await ethers.getContractAt('ERC20Mock', FRX_ETH)) as ERC20Mock const sfrxEth = (await ethers.getContractAt('IsfrxEth', SFRX_ETH)) as IsfrxEth const collateral = await deployCollateral(collateralOpts) @@ -153,7 +126,6 @@ const makeCollateralFixtureContext = ( chainlinkFeed, frxEth, sfrxEth, - curveEmaOracle, tok: sfrxEth, } } @@ -174,27 +146,11 @@ const mintCollateralTo: MintCollateralFunc = as await mintSfrxETH(ctx.sfrxEth, user, amount, recipient, ctx.chainlinkFeed) } -const changeTargetPerRef = async ( - ctx: SFrxEthCollateralFixtureContext, - percentChange: BigNumber -) => { - const initPrice = await ctx.curveEmaOracle.price_oracle() - await ctx.curveEmaOracle.setPrice(initPrice.add(initPrice.mul(percentChange).div(100))) -} - -const reduceTargetPerRef = async ( - ctx: SFrxEthCollateralFixtureContext, - pctDecrease: BigNumberish -) => { - await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) -} +// eslint-disable-next-line @typescript-eslint/no-empty-function +const reduceTargetPerRef = async () => {} -const increaseTargetPerRef = async ( - ctx: SFrxEthCollateralFixtureContext, - pctIncrease: BigNumberish -) => { - await changeTargetPerRef(ctx, bn(pctIncrease)) -} +// eslint-disable-next-line @typescript-eslint/no-empty-function +const increaseTargetPerRef = async () => {} // prettier-ignore const reduceRefPerTok = async () => { @@ -216,11 +172,11 @@ const increaseRefPerTok = async ( await hre.network.provider.send('evm_mine', []) } await ctx.sfrxEth.syncRewards() - await advanceBlocks(86400 / 12) - await advanceTime(86400) + await advanceBlocks(1200 / 12) + await advanceTime(1200) // push chainlink oracle forward so that tryPrice() still works - const latestRoundData = await ctx.chainlinkFeed.latestRoundData() - await ctx.chainlinkFeed.updateAnswer(latestRoundData.answer) + const lastAnswer = await ctx.chainlinkFeed.latestAnswer() + await ctx.chainlinkFeed.updateAnswer(lastAnswer) } const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise => { @@ -228,18 +184,9 @@ const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise { const chainlinkFeed = ( await (await ethers.getContractFactory('MockV3Aggregator')).deploy(8, chainlinkDefaultAnswer) ) - const collateral = await deployCollateral({ erc20: erc20.address, revenueHiding: fp('0.01'), @@ -310,16 +256,14 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it.skip, + itChecksTargetPerRefDefault: it.skip, itChecksRefPerTokDefault: it.skip, itChecksPriceChanges: it, - itHasRevenueHiding: it.skip, // implemnted in this file itChecksNonZeroDefaultThreshold: it, + itHasRevenueHiding: it.skip, // implemnted in this file resetFork, collateralName: 'SFraxEthCollateral', chainlinkDefaultAnswer, - itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/frax-eth/constants.ts b/test/plugins/individual-collateral/frax-eth/constants.ts index aa6cda39c6..8ae4cfc38a 100644 --- a/test/plugins/individual-collateral/frax-eth/constants.ts +++ b/test/plugins/individual-collateral/frax-eth/constants.ts @@ -7,9 +7,6 @@ export const FRX_ETH = networkConfig['31337'].tokens.frxETH as string export const SFRX_ETH = networkConfig['31337'].tokens.sfrxETH as string export const WETH = networkConfig['31337'].tokens.WETH as string export const FRX_ETH_MINTER = '0xbAFA44EFE7901E04E39Dad13167D089C559c1138' -export const FRXETH_ETH_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.frxETH as string -export const CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS = networkConfig['31337'] - .CURVE_POOL_ETH_FRXETH as string export const PRICE_TIMEOUT = bn('604800') // 1 week export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds @@ -18,4 +15,4 @@ export const DEFAULT_THRESHOLD = bn(5).mul(bn(10).pow(16)) // 0.05 export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000) -export const FORK_BLOCK = 18705637 +export const FORK_BLOCK = 16773193 diff --git a/test/plugins/individual-collateral/frax-eth/helpers.ts b/test/plugins/individual-collateral/frax-eth/helpers.ts index 99ce493da5..50a24bb9bc 100644 --- a/test/plugins/individual-collateral/frax-eth/helpers.ts +++ b/test/plugins/individual-collateral/frax-eth/helpers.ts @@ -5,8 +5,6 @@ import { BigNumberish } from 'ethers' import { FORK_BLOCK, FRX_ETH_MINTER } from './constants' import { getResetFork } from '../helpers' import { setNextBlockTimestamp, getLatestBlockTimestamp } from '../../../utils/time' -import { fp } from '#/common/numbers' -import { setBalance } from '@nomicfoundation/hardhat-network-helpers' export const mintSfrxETH = async ( sfrxEth: IsfrxEth, @@ -15,7 +13,6 @@ export const mintSfrxETH = async ( recipient: string, chainlinkFeed: MockV3Aggregator ) => { - await setBalance(account.address, fp(100000)) const frxEthMinter: IfrxEthMinter = ( await ethers.getContractAt('IfrxEthMinter', FRX_ETH_MINTER) ) @@ -31,8 +28,8 @@ export const mintSfrxETH = async ( await frxEthMinter.connect(account).submitAndDeposit(recipient, { value: depositAmount }) // push chainlink oracle forward so that tryPrice() still works - const lastAnswer = await chainlinkFeed.latestRoundData() - await chainlinkFeed.updateAnswer(lastAnswer.answer) + const lastAnswer = await chainlinkFeed.latestAnswer() + await chainlinkFeed.updateAnswer(lastAnswer) } export const mintFrxETH = async ( diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index 28d0f1bcd9..43d09c95be 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,7 +193,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, diff --git a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts index 366c8c81c2..1f4213ac61 100644 --- a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts @@ -265,7 +265,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index 7f1a19c867..5ffecb6582 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -362,7 +362,6 @@ const makeAaveFiatCollateralTestSuite = ( getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 937ec99e70..28614aff7d 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -225,7 +225,6 @@ const makeAaveNonFiatCollateralTestSuite = ( getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 81404fe208..4bf7730685 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -225,7 +225,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it.skip, - itChecksTargetPerRefDefaultUp: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it.skip, diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 2dca2653da..34bfefbb20 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -91,9 +91,6 @@ export interface CollateralTestSuiteFixtures // toggle on or off: tests that focus on a targetPerRef default itChecksTargetPerRefDefault: Mocha.TestFunction | Mocha.PendingTestFunction - // toggle on or off: tests that focus on a targetPerRef defaulting upwards - itChecksTargetPerRefDefaultUp: Mocha.TestFunction | Mocha.PendingTestFunction - // toggle on or off: tests that focus on a refPerTok default itChecksRefPerTokDefault: Mocha.TestFunction | Mocha.PendingTestFunction diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index f766a3bc08..d10488770e 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -272,7 +272,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts index 1968edfe85..f3f81e978d 100644 --- a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts @@ -312,7 +312,6 @@ export const stableOpts = { increaseTargetPerRef, itClaimsRewards: it, // reward growth not supported in mock itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index ed208fbf48..126280f15b 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -239,7 +239,6 @@ tests.forEach((test: CurveFiatTest) => { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it.skip, diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 6dde6dec02..2444878fe4 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -5,8 +5,6 @@ import { ethers, network } from 'hardhat' import { expect } from 'chai' import { fp, bn, divCeil } from '../../common/numbers' import { MAX_UINT192 } from '../../common/constants' -import { getLatestBlockTimestamp } from './time' -import { whileImpersonating } from './impersonation' const toleranceDivisor = bn('1e15') // 1 part in 1000 trillions @@ -145,12 +143,7 @@ export const overrideOracle = async (oracleAddress: string): Promise { const chainlinkFeed = await ethers.getContractAt('MockV3Aggregator', await chainlinkAddr) - let initPrice - // awkward workaround for sfrxETH oracle - try { - initPrice = await chainlinkFeed.latestAnswer() - } catch { - initPrice = (await chainlinkFeed.latestRoundData()).answer - } + const initPrice = await chainlinkFeed.latestAnswer() try { // Try to update as if it's a mock already await chainlinkFeed.updateAnswer(initPrice) @@ -176,13 +163,3 @@ export const pushOracleForward = async (chainlinkAddr: string) => { await oracle.updateAnswer(initPrice) } } - -export const pushFraxOracleForward = async (chainlinkAddr: string) => { - const chainlinkFeed = await ethers.getContractAt('FraxAggregatorV3Interface', chainlinkAddr) - const initPrice = (await chainlinkFeed.latestRoundData()).answer - await whileImpersonating(await chainlinkFeed.priceSource(), async (owner) => { - await chainlinkFeed - .connect(owner) - .addRoundData(false, initPrice, initPrice, (await getLatestBlockTimestamp()) + 1) - }) -} From 92f1c012a24ea25193a0a8b7e0407bc14c5bbc4c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 21:47:56 -0500 Subject: [PATCH 174/450] Sfraxeth plugin Curve EMA (#1044) Co-authored-by: Patrick McKelvy --- common/configuration.ts | 7 ++ contracts/plugins/assets/FraxOracleLib.sol | 66 ++++++++++++++ contracts/plugins/assets/OracleErrors.sol | 7 ++ contracts/plugins/assets/OracleLib.sol | 4 +- contracts/plugins/assets/frax-eth/README.md | 7 +- .../assets/frax-eth/SFraxEthCollateral.sol | 46 +++++----- .../CurvePoolEmaPriceOracleWithMinMax.sol | 70 +++++++++++++++ .../ICurvePoolEmaPriceOracleWithMinMax.sol | 16 ++++ contracts/plugins/mocks/ChainlinkMock.sol | 13 +++ .../mocks/EmaPriceOracleStableSwapMock.sol | 33 +++++++ hardhat.config.ts | 2 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 1 + .../ankr/AnkrEthCollateralTestSuite.test.ts | 1 + .../cbeth/CBETHCollateral.test.ts | 1 + .../cbeth/CBETHCollateralL2.test.ts | 1 + .../individual-collateral/collateralTests.ts | 21 +++-- .../compoundv3/CometTestSuite.test.ts | 1 + .../curve/crv/CrvStableMetapoolSuite.test.ts | 1 + .../CrvStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/crv/CrvStableTestSuite.test.ts | 1 + .../curve/cvx/CvxStableMetapoolSuite.test.ts | 1 + .../CvxStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/cvx/CvxStableTestSuite.test.ts | 1 + .../dsr/SDaiCollateralTestSuite.test.ts | 1 + .../flux-finance/FTokenFiatCollateral.test.ts | 1 + .../frax-eth/SFrxEthTestSuite.test.ts | 88 +++++++++++++++---- .../frax-eth/constants.ts | 5 +- .../individual-collateral/frax-eth/helpers.ts | 7 +- .../frax/SFraxCollateralTestSuite.test.ts | 1 + .../lido/LidoStakedEthTestSuite.test.ts | 1 + .../MorphoAAVEFiatCollateral.test.ts | 1 + .../MorphoAAVENonFiatCollateral.test.ts | 1 + ...orphoAAVESelfReferentialCollateral.test.ts | 1 + .../individual-collateral/pluginTestTypes.ts | 3 + .../RethCollateralTestSuite.test.ts | 1 + .../stargate/StargateUSDCTestSuite.test.ts | 1 + .../YearnV2CurveFiatCollateral.test.ts | 1 + test/utils/oracles.ts | 27 +++++- 38 files changed, 384 insertions(+), 59 deletions(-) create mode 100644 contracts/plugins/assets/FraxOracleLib.sol create mode 100644 contracts/plugins/assets/OracleErrors.sol create mode 100644 contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol create mode 100644 contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol create mode 100644 contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol diff --git a/common/configuration.ts b/common/configuration.ts index 62d2e8609a..edfeadbc91 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -124,6 +124,7 @@ interface INetworkConfig { AAVE_V3_INCENTIVES_CONTROLLER?: string AAVE_V3_POOL?: string STARGATE_STAKING_CONTRACT?: string + CURVE_POOL_ETH_FRXETH?: string } export const networkConfig: { [key: string]: INetworkConfig } = { @@ -220,6 +221,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', @@ -240,6 +242,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '1': { name: 'mainnet', @@ -328,6 +331,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -345,6 +349,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '3': { name: 'tenderly', @@ -428,6 +433,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -445,6 +451,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' }, '5': { name: 'goerli', diff --git a/contracts/plugins/assets/FraxOracleLib.sol b/contracts/plugins/assets/FraxOracleLib.sol new file mode 100644 index 0000000000..67374c8de1 --- /dev/null +++ b/contracts/plugins/assets/FraxOracleLib.sol @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import "../../libraries/Fixed.sol"; +import "./OracleErrors.sol"; + +interface FraxAggregatorV3Interface is AggregatorV3Interface { + function priceSource() external view returns (address); + + function addRoundData( + bool _isBadData, + uint104 _priceLow, + uint104 _priceHigh, + uint40 _timestamp + ) external; +} + +/// Used by asset plugins to price their collateral +library FraxOracleLib { + /// @dev Use for nested calls that should revert when there is a problem + /// @param timeout The number of seconds after which oracle values should be considered stale + /// @return {UoA/tok} + function price(FraxAggregatorV3Interface chainlinkFeed, uint48 timeout) + internal + view + returns (uint192) + { + try chainlinkFeed.latestRoundData() returns ( + uint80 roundId, + int256 p, + uint256, + uint256 updateTime, + uint80 answeredInRound + ) { + if (updateTime == 0 || answeredInRound < roundId) { + revert StalePrice(); + } + + // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 + uint48 secondsSince = uint48(block.timestamp - updateTime); + if (secondsSince > timeout) revert StalePrice(); + + if (p == 0) revert ZeroPrice(); + + // {UoA/tok} + return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); + } catch (bytes memory errData) { + // Check if the priceSource was not set: if so, the chainlink feed has been deprecated + // and a _specific_ error needs to be raised in order to avoid looking like OOG + if (errData.length == 0) { + if (chainlinkFeed.priceSource() == address(0)) { + revert StalePrice(); + } + // solhint-disable-next-line reason-string + revert(); + } + + // Otherwise, preserve the error bytes + // solhint-disable-next-line no-inline-assembly + assembly { + revert(add(32, errData), mload(errData)) + } + } + } +} diff --git a/contracts/plugins/assets/OracleErrors.sol b/contracts/plugins/assets/OracleErrors.sol new file mode 100644 index 0000000000..ddb96dd9ce --- /dev/null +++ b/contracts/plugins/assets/OracleErrors.sol @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +// 0x19abf40e +error StalePrice(); +// 0x4dfba023 +error ZeroPrice(); diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index ff9bd0ef59..87db68e2b3 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -3,9 +3,7 @@ pragma solidity 0.8.19; import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import "../../libraries/Fixed.sol"; - -error StalePrice(); -error ZeroPrice(); +import "./OracleErrors.sol"; interface EACAggregatorProxy { function aggregator() external view returns (address); diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 7d32cc254a..81ed35cd9b 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -1,7 +1,5 @@ # Staked-Frax-ETH Collateral Plugin -**NOTE: The SFraxEthCollateral plugin SHOULD NOT be deployed and used until a `frxETH/ETH` chainlink oracle can be integrated with the plugin. As of 3/14/23, there is no chainlink oracle, but the FRAX team is working on getting one.** - ## Summary This plugin allows `sfrxETH` ((Staked-Frax-ETH)[https://docs.frax.finance/frax-ether/overview]) holders use their tokens as collateral in the Reserve Protocol. @@ -16,8 +14,6 @@ You can get the `frxETH/sfrxETH` exchange rate from [`sfrxETH.pricePerShare()`]( `frxETH` contract: -`wstETH` and `stETH` can be always swapped at any time to each other without any risk and limitation (Except smart contract risk), like `wETH` and `ETH`. Wrap & Unwrap app can be found here: - ## Implementation ### Units @@ -32,6 +28,9 @@ You can get the `frxETH/sfrxETH` exchange rate from [`sfrxETH.pricePerShare()`]( This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](https://github.com/FraxFinance/frxETH-public/blob/master/src/sfrxETH.sol#L82) function in sfrxETH contract. +#### target-per-ref price {tar/ref} + +The targetPerRef price of `ETH/frxETH` is received from the frxETH/ETH FRAX-managed oracle ([details here](https://docs.frax.finance/frax-oracle/frax-oracle-overview)). #### tryPrice This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index c3dbe91379..ccafd1163d 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -5,13 +5,9 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../../libraries/Fixed.sol"; import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; +import "../FraxOracleLib.sol"; import "./vendor/IsfrxEth.sol"; - -/** - * ************************************************************ - * WARNING: this plugin is not ready to be used in Production - * ************************************************************ - */ +import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; /** * @title SFraxEthCollateral @@ -21,20 +17,30 @@ import "./vendor/IsfrxEth.sol"; * tar = ETH * UoA = USD */ -contract SFraxEthCollateral is AppreciatingFiatCollateral { +contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOracleWithMinMax { using OracleLib for AggregatorV3Interface; + using FraxOracleLib for FraxAggregatorV3Interface; using FixLib for uint192; - // solhint-disable no-empty-blocks - /// @param config.chainlinkFeed Feed units: {UoA/target} - constructor(CollateralConfig memory config, uint192 revenueHiding) + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms + /// @param revenueHiding {1e18} percent amount of revenue to hide + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + address curvePoolEmaPriceOracleAddress, + uint256 _minimumCurvePoolEma, + uint256 _maximumCurvePoolEma + ) AppreciatingFiatCollateral(config, revenueHiding) + CurvePoolEmaPriceOracleWithMinMax( + curvePoolEmaPriceOracleAddress, + _minimumCurvePoolEma, + _maximumCurvePoolEma + ) { require(config.defaultThreshold > 0, "defaultThreshold zero"); } - // solhint-enable no-empty-blocks - /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate @@ -49,22 +55,20 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { uint192 pegPrice ) { - // {UoA/tok} = {UoA/target} * {ref/tok} * {target/ref} (1) - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + // {target/ref} Get current market peg ({eth/frxeth}) + pegPrice = _safeWrap(_getCurvePoolToken1EmaPrice()); + + // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); - low = p - err; high = p + err; + low = p - err; // assert(low <= high); obviously true just by inspection - - // TODO: Currently not checking for depegs between `frxETH` and `ETH` - // Should be modified to use a `frxETH/ETH` oracle when available - pegPrice = targetPerRef(); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view override returns (uint192) { - uint256 rate = IsfrxEth(address(erc20)).pricePerShare(); - return _safeWrap(rate); + return _safeWrap(IsfrxEth(address(erc20)).pricePerShare()); } } diff --git a/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol new file mode 100644 index 0000000000..75f829a0dc --- /dev/null +++ b/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: ISC +pragma solidity ^0.8.19; + +// Inspired by Frax Finance: https://github.com/FraxFinance + +// Original Author +// Drake Evans: https://github.com/DrakeEvans + +// Original Reviewers +// Dennis: https://github.com/denett + +// ==================================================================== + +import { ICurvePoolEmaPriceOracleWithMinMax } from "./ICurvePoolEmaPriceOracleWithMinMax.sol"; + +interface IEmaPriceOracleStableSwap { + // solhint-disable-next-line func-name-mixedcase + function price_oracle() external view returns (uint256); +} + +struct ConstructorParams { + address curvePoolEmaPriceOracleAddress; + uint256 minimumCurvePoolEma; + uint256 maximumCurvePoolEma; +} + +/// @title CurvePoolEmaPriceOracleWithMinMax +/// @author Drake Evans (Frax Finance) https://github.com/drakeevans +/// @notice An oracle for getting EMA prices from Curve +contract CurvePoolEmaPriceOracleWithMinMax is ICurvePoolEmaPriceOracleWithMinMax { + /// @notice Curve pool, source of EMA + // solhint-disable-next-line var-name-mixedcase + address public immutable CURVE_POOL_EMA_PRICE_ORACLE; + + /// @notice Precision of Curve pool price_oracle() + uint256 public constant CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS = 18; + + /// @notice Maximum price of token1 in token0 units of the EMA + /// @dev Must match precision of EMA + uint256 public minimumCurvePoolEma; + + /// @notice Maximum price of token1 in token0 units of the EMA + /// @dev Must match precision of EMA + uint256 public maximumCurvePoolEma; + + constructor( + address curvePoolEmaPriceOracleAddress, + uint256 _minimumCurvePoolEma, + uint256 _maximumCurvePoolEma + ) { + CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; + minimumCurvePoolEma = _minimumCurvePoolEma; + maximumCurvePoolEma = _maximumCurvePoolEma; + } + + function _getCurvePoolToken1EmaPrice() internal view returns (uint256 _token1Price) { + uint256 _priceRaw = IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle(); + uint256 _price = _priceRaw > maximumCurvePoolEma ? maximumCurvePoolEma : _priceRaw; + + _token1Price = _price < minimumCurvePoolEma ? minimumCurvePoolEma : _price; + } + + /// @notice The ```getCurvePoolToken1EmaPrice``` function gets the price of the second token + /// in the Curve pool (token1) + /// @dev Returned in units of the first token (token0) + /// @return _emaPrice The price of the second token in the Curve pool + function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice) { + return _getCurvePoolToken1EmaPrice(); + } +} diff --git a/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol new file mode 100644 index 0000000000..94a8b2dbde --- /dev/null +++ b/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: UNLICENSED +pragma solidity 0.8.19; + +interface ICurvePoolEmaPriceOracleWithMinMax { + // solhint-disable-next-line func-name-mixedcase + function CURVE_POOL_EMA_PRICE_ORACLE() external view returns (address); + + // solhint-disable-next-line func-name-mixedcase + function CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS() external view returns (uint256); + + function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice); + + function maximumCurvePoolEma() external view returns (uint256); + + function minimumCurvePoolEma() external view returns (uint256); +} diff --git a/contracts/plugins/mocks/ChainlinkMock.sol b/contracts/plugins/mocks/ChainlinkMock.sol index 6e0fee6785..17cd3b6edd 100644 --- a/contracts/plugins/mocks/ChainlinkMock.sol +++ b/contracts/plugins/mocks/ChainlinkMock.sol @@ -24,6 +24,7 @@ contract MockV3Aggregator is AggregatorV3Interface { // Additional variable to be able to test invalid behavior uint256 public latestAnsweredRound; address public aggregator; + address public priceSource; mapping(uint256 => int256) public getAnswer; mapping(uint256 => uint256) public getTimestamp; @@ -32,6 +33,7 @@ contract MockV3Aggregator is AggregatorV3Interface { constructor(uint8 _decimals, int256 _initialAnswer) { decimals = _decimals; aggregator = address(this); + priceSource = address(this); updateAnswer(_initialAnswer); } @@ -49,6 +51,17 @@ contract MockV3Aggregator is AggregatorV3Interface { latestAnsweredRound = latestRound; } + // used by Frax oracle + function addRoundData(bool isBadData, uint104 low, uint104 high, uint40 timestamp) public { + latestAnswer = int104(low + high) / 2; + latestTimestamp = block.timestamp; + latestRound++; + getAnswer[latestRound] = latestAnswer; + getTimestamp[latestRound] = block.timestamp; + getStartedAt[latestRound] = block.timestamp; + latestAnsweredRound = latestRound; + } + // Additional function to be able to test invalid Chainlink behavior function setInvalidTimestamp() public { getTimestamp[latestRound] = 0; diff --git a/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol new file mode 100644 index 0000000000..6d94dc396f --- /dev/null +++ b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: ISC +pragma solidity ^0.8.19; + +interface IEmaPriceOracleStableSwap { + function price_oracle() external view returns (uint256); +} + +/// @title CurvePoolEmaPriceOracleWithMinMax +/// @author Drake Evans (Frax Finance) https://github.com/drakeevans +/// @notice An oracle for getting EMA prices from Curve +contract EmaPriceOracleStableSwapMock is IEmaPriceOracleStableSwap { + uint256 public initPrice; + uint256 internal _price; + + constructor( + uint256 _initPrice + ) { + initPrice = _initPrice; + _price = _initPrice; + } + + function resetPrice() external { + _price = initPrice; + } + + function setPrice(uint256 newPrice) external { + _price = newPrice; + } + + function price_oracle() external view returns (uint256) { + return _price; + } +} \ No newline at end of file diff --git a/hardhat.config.ts b/hardhat.config.ts index 87a53dbcf0..61bac4e916 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -44,7 +44,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true, + allowUnlimitedContractSize: true }, localhost: { // network for long-lived mainnet forks diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index a15ac37a23..b2628df278 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -213,6 +213,7 @@ export const stableOpts = { itClaimsRewards: it.skip, // untested: very complicated to get Aave to handout rewards, and none are live currently. // The StaticATokenV3LM contract is formally verified and the function we added for claimRewards() is pretty obviously correct. itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index e21a0f66a0..8a3a07a83f 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -286,6 +286,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 8f5bb5efe1..cd35ee5c0c 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -243,6 +243,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts index fbc3f6874b..a4a9c32425 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -274,6 +274,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 576a60a2f2..f63c80268a 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -78,6 +78,7 @@ export default function fn( getExpectedPrice, itClaimsRewards, itChecksTargetPerRefDefault, + itChecksTargetPerRefDefaultUp, itChecksRefPerTokDefault, itChecksPriceChanges, itChecksNonZeroDefaultThreshold, @@ -223,6 +224,14 @@ export default function fn( describe('prices', () => { before(resetFork) // important for getting prices/refPerToks to behave predictably + it('enters IFFY state when price becomes stale', async () => { + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(oracleTimeout / 12) + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + }) + itChecksPriceChanges('prices change as USD feed price changes', async () => { const oracleError = await collateral.oracleError() const expectedPrice = await getExpectedPrice(ctx) @@ -411,14 +420,6 @@ export default function fn( expect(await invalidCollateral.status()).to.equal(CollateralStatus.SOUND) }) - it('enters IFFY state when price becomes stale', async () => { - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(oracleTimeout / 12) - await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - }) - it('decays price over priceTimeout period', async () => { await collateral.refresh() const savedLow = await collateral.savedLowPrice() @@ -453,6 +454,8 @@ export default function fn( }) describe('status', () => { + before(resetFork) + it('maintains status in normal situations', async () => { // Check initial state expect(await collateral.status()).to.equal(CollateralStatus.SOUND) @@ -489,7 +492,7 @@ export default function fn( } ) - itChecksTargetPerRefDefault( + itChecksTargetPerRefDefaultUp( 'enters IFFY state when target-per-ref depegs above high threshold', async () => { const delayUntilDefault = await collateral.delayUntilDefault() diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 7c91bd2064..0aa72a386e 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -407,6 +407,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts index 12964d9bbc..2bf70ca7cd 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts @@ -219,6 +219,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index bbabc4c8aa..0ab94cd268 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -289,6 +289,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts index 21260f9906..27a7a5c213 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts @@ -228,6 +228,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts index ce3a93e9e0..e259ef05be 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts @@ -227,6 +227,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 9000295bb8..11d8fcb5a9 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -291,6 +291,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 8cbdd58345..859b762b3f 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -424,6 +424,7 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it, diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 4d539a4a25..2919f0ebc4 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -211,6 +211,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index ea7c5554f2..180a889352 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -254,6 +254,7 @@ all.forEach((curr: FTokenEnumeration) => { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index 7ac77c01d1..fb9f69b97d 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -11,6 +11,9 @@ import { SfraxEthMock, TestICollateral, IsfrxEth, + SFraxEthCollateral, + EmaPriceOracleStableSwapMock__factory, + EmaPriceOracleStableSwapMock, } from '../../../../typechain' import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' @@ -27,6 +30,7 @@ import { FRX_ETH, SFRX_ETH, ETH_USD_PRICE_FEED, + CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, } from './constants' import { advanceTime, @@ -42,13 +46,20 @@ import { interface SFrxEthCollateralFixtureContext extends CollateralFixtureContext { frxEth: ERC20Mock sfrxEth: IsfrxEth + curveEmaOracle: EmaPriceOracleStableSwapMock } /* Define deployment functions */ -export const defaultRethCollateralOpts: CollateralOpts = { +interface SfrxEthCollateralOpts extends CollateralOpts { + curvePoolEmaPriceOracleAddress?: string + _minimumCurvePoolEma?: BigNumberish + _maximumCurvePoolEma?: BigNumberish +} + +export const defaultRethCollateralOpts: SfrxEthCollateralOpts = { erc20: SFRX_ETH, targetName: ethers.utils.formatBytes32String('ETH'), rewardERC20: WETH, @@ -60,9 +71,14 @@ export const defaultRethCollateralOpts: CollateralOpts = { defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), + curvePoolEmaPriceOracleAddress: CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, + _minimumCurvePoolEma: 0, + _maximumCurvePoolEma: fp(1), } -export const deployCollateral = async (opts: CollateralOpts = {}): Promise => { +export const deployCollateral = async ( + opts: SfrxEthCollateralOpts = {} +): Promise => { opts = { ...defaultRethCollateralOpts, ...opts } const SFraxEthCollateralFactory: ContractFactory = await ethers.getContractFactory( @@ -82,13 +98,15 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise( + await ethers.getContractFactory('EmaPriceOracleStableSwapMock') + ) + + const curveEmaOracle = ( + await EmaPriceOracleStableSwapMockFactory.deploy(fp('0.997646')) + ) + collateralOpts.curvePoolEmaPriceOracleAddress = curveEmaOracle.address + const frxEth = (await ethers.getContractAt('ERC20Mock', FRX_ETH)) as ERC20Mock const sfrxEth = (await ethers.getContractAt('IsfrxEth', SFRX_ETH)) as IsfrxEth const collateral = await deployCollateral(collateralOpts) @@ -126,6 +153,7 @@ const makeCollateralFixtureContext = ( chainlinkFeed, frxEth, sfrxEth, + curveEmaOracle, tok: sfrxEth, } } @@ -146,11 +174,27 @@ const mintCollateralTo: MintCollateralFunc = as await mintSfrxETH(ctx.sfrxEth, user, amount, recipient, ctx.chainlinkFeed) } -// eslint-disable-next-line @typescript-eslint/no-empty-function -const reduceTargetPerRef = async () => {} +const changeTargetPerRef = async ( + ctx: SFrxEthCollateralFixtureContext, + percentChange: BigNumber +) => { + const initPrice = await ctx.curveEmaOracle.price_oracle() + await ctx.curveEmaOracle.setPrice(initPrice.add(initPrice.mul(percentChange).div(100))) +} -// eslint-disable-next-line @typescript-eslint/no-empty-function -const increaseTargetPerRef = async () => {} +const reduceTargetPerRef = async ( + ctx: SFrxEthCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctDecrease).mul(-1)) +} + +const increaseTargetPerRef = async ( + ctx: SFrxEthCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + await changeTargetPerRef(ctx, bn(pctIncrease)) +} // prettier-ignore const reduceRefPerTok = async () => { @@ -172,11 +216,11 @@ const increaseRefPerTok = async ( await hre.network.provider.send('evm_mine', []) } await ctx.sfrxEth.syncRewards() - await advanceBlocks(1200 / 12) - await advanceTime(1200) + await advanceBlocks(86400 / 12) + await advanceTime(86400) // push chainlink oracle forward so that tryPrice() still works - const lastAnswer = await ctx.chainlinkFeed.latestAnswer() - await ctx.chainlinkFeed.updateAnswer(lastAnswer) + const latestRoundData = await ctx.chainlinkFeed.latestRoundData() + await ctx.chainlinkFeed.updateAnswer(latestRoundData.answer) } const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise => { @@ -184,9 +228,18 @@ const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise { const chainlinkFeed = ( await (await ethers.getContractFactory('MockV3Aggregator')).deploy(8, chainlinkDefaultAnswer) ) + const collateral = await deployCollateral({ erc20: erc20.address, revenueHiding: fp('0.01'), @@ -256,14 +310,16 @@ const opts = { increaseRefPerTok, getExpectedPrice, itClaimsRewards: it.skip, - itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it.skip, itChecksRefPerTokDefault: it.skip, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemnted in this file + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'SFraxEthCollateral', chainlinkDefaultAnswer, + itIsPricedByPeg: true, } collateralTests(opts) diff --git a/test/plugins/individual-collateral/frax-eth/constants.ts b/test/plugins/individual-collateral/frax-eth/constants.ts index 8ae4cfc38a..aa6cda39c6 100644 --- a/test/plugins/individual-collateral/frax-eth/constants.ts +++ b/test/plugins/individual-collateral/frax-eth/constants.ts @@ -7,6 +7,9 @@ export const FRX_ETH = networkConfig['31337'].tokens.frxETH as string export const SFRX_ETH = networkConfig['31337'].tokens.sfrxETH as string export const WETH = networkConfig['31337'].tokens.WETH as string export const FRX_ETH_MINTER = '0xbAFA44EFE7901E04E39Dad13167D089C559c1138' +export const FRXETH_ETH_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.frxETH as string +export const CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS = networkConfig['31337'] + .CURVE_POOL_ETH_FRXETH as string export const PRICE_TIMEOUT = bn('604800') // 1 week export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds @@ -15,4 +18,4 @@ export const DEFAULT_THRESHOLD = bn(5).mul(bn(10).pow(16)) // 0.05 export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000) -export const FORK_BLOCK = 16773193 +export const FORK_BLOCK = 18705637 diff --git a/test/plugins/individual-collateral/frax-eth/helpers.ts b/test/plugins/individual-collateral/frax-eth/helpers.ts index 50a24bb9bc..99ce493da5 100644 --- a/test/plugins/individual-collateral/frax-eth/helpers.ts +++ b/test/plugins/individual-collateral/frax-eth/helpers.ts @@ -5,6 +5,8 @@ import { BigNumberish } from 'ethers' import { FORK_BLOCK, FRX_ETH_MINTER } from './constants' import { getResetFork } from '../helpers' import { setNextBlockTimestamp, getLatestBlockTimestamp } from '../../../utils/time' +import { fp } from '#/common/numbers' +import { setBalance } from '@nomicfoundation/hardhat-network-helpers' export const mintSfrxETH = async ( sfrxEth: IsfrxEth, @@ -13,6 +15,7 @@ export const mintSfrxETH = async ( recipient: string, chainlinkFeed: MockV3Aggregator ) => { + await setBalance(account.address, fp(100000)) const frxEthMinter: IfrxEthMinter = ( await ethers.getContractAt('IfrxEthMinter', FRX_ETH_MINTER) ) @@ -28,8 +31,8 @@ export const mintSfrxETH = async ( await frxEthMinter.connect(account).submitAndDeposit(recipient, { value: depositAmount }) // push chainlink oracle forward so that tryPrice() still works - const lastAnswer = await chainlinkFeed.latestAnswer() - await chainlinkFeed.updateAnswer(lastAnswer) + const lastAnswer = await chainlinkFeed.latestRoundData() + await chainlinkFeed.updateAnswer(lastAnswer.answer) } export const mintFrxETH = async ( diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index 43d09c95be..28d0f1bcd9 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,6 +193,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, diff --git a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts index 1f4213ac61..366c8c81c2 100644 --- a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts @@ -265,6 +265,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index a573f48887..afb9e7da0d 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -360,6 +360,7 @@ const makeAaveFiatCollateralTestSuite = ( getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index f9a0339f9a..5428212d2c 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -233,6 +233,7 @@ const makeAaveNonFiatCollateralTestSuite = ( getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 8e934cedca..6c1b80f2c6 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -227,6 +227,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefaultUp: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it.skip, diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 34bfefbb20..2dca2653da 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -91,6 +91,9 @@ export interface CollateralTestSuiteFixtures // toggle on or off: tests that focus on a targetPerRef default itChecksTargetPerRefDefault: Mocha.TestFunction | Mocha.PendingTestFunction + // toggle on or off: tests that focus on a targetPerRef defaulting upwards + itChecksTargetPerRefDefaultUp: Mocha.TestFunction | Mocha.PendingTestFunction + // toggle on or off: tests that focus on a refPerTok default itChecksRefPerTokDefault: Mocha.TestFunction | Mocha.PendingTestFunction diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index d10488770e..f766a3bc08 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -272,6 +272,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, diff --git a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts index f3f81e978d..1968edfe85 100644 --- a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts @@ -312,6 +312,7 @@ export const stableOpts = { increaseTargetPerRef, itClaimsRewards: it, // reward growth not supported in mock itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index 126280f15b..ed208fbf48 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -239,6 +239,7 @@ tests.forEach((test: CurveFiatTest) => { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, itClaimsRewards: it.skip, diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 2444878fe4..6dde6dec02 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -5,6 +5,8 @@ import { ethers, network } from 'hardhat' import { expect } from 'chai' import { fp, bn, divCeil } from '../../common/numbers' import { MAX_UINT192 } from '../../common/constants' +import { getLatestBlockTimestamp } from './time' +import { whileImpersonating } from './impersonation' const toleranceDivisor = bn('1e15') // 1 part in 1000 trillions @@ -143,7 +145,12 @@ export const overrideOracle = async (oracleAddress: string): Promise { const chainlinkFeed = await ethers.getContractAt('MockV3Aggregator', await chainlinkAddr) - const initPrice = await chainlinkFeed.latestAnswer() + let initPrice + // awkward workaround for sfrxETH oracle + try { + initPrice = await chainlinkFeed.latestAnswer() + } catch { + initPrice = (await chainlinkFeed.latestRoundData()).answer + } try { // Try to update as if it's a mock already await chainlinkFeed.updateAnswer(initPrice) @@ -163,3 +176,13 @@ export const pushOracleForward = async (chainlinkAddr: string) => { await oracle.updateAnswer(initPrice) } } + +export const pushFraxOracleForward = async (chainlinkAddr: string) => { + const chainlinkFeed = await ethers.getContractAt('FraxAggregatorV3Interface', chainlinkAddr) + const initPrice = (await chainlinkFeed.latestRoundData()).answer + await whileImpersonating(await chainlinkFeed.priceSource(), async (owner) => { + await chainlinkFeed + .connect(owner) + .addRoundData(false, initPrice, initPrice, (await getLatestBlockTimestamp()) + 1) + }) +} From 2fb9a018b49ba72f2dade73437851716e86a2187 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 22:47:55 -0500 Subject: [PATCH 175/450] comment nit --- contracts/interfaces/IAsset.sol | 2 +- contracts/p1/BackingManager.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index a1c68a305e..8126aa12ce 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -69,7 +69,7 @@ interface TestIAsset is IAsset { /// @return {s} Seconds that an oracle value is considered valid function oracleTimeout() external view returns (uint48); - /// @return {s} Seconds that the price().low should decay over, after stale price + /// @return {s} Seconds that the price() should decay over, after stale price function priceTimeout() external view returns (uint48); /// @return {UoA/tok} The last saved low price diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 4fa94fe78e..b7191aa097 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -45,7 +45,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { IFurnace private furnace; mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind - // === 3.0.1 === + // === 3.1.0 === mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades // ==== Invariants ==== From 4beaab9d290d141887cf86d1299b3187a17ee37a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 22:48:02 -0500 Subject: [PATCH 176/450] changelog --- CHANGELOG.md | 58 ++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b965577156..a5330e5235 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -# 3.1.0 - Unreleased +# 3.1.0 ### Upgrade Steps -- Required @@ -19,28 +19,74 @@ Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. ### Core Protocol Contracts - `BackingManager` [+2 slots] - - Replace use of `lotPrice()` with `price()` + - Replace use of `lotPrice()` with `price()` everywhere + - Track `tokensOut` on trades and account for during collateralization math + - Call `StRSR.payoutRewards()` after forwarding RSR + - Make `backingBuffer` math precise + - Add caching in `RecollateralizationLibP1` + - Use `price().low` instead of `price().high` to compute maximum sell amounts - `BasketHandler` - - Remove `lotPrice()` + - Replace use of `lotPrice()` with `price()` everywhere + - Minor gas optimizations to status tracking and custom redemption math - `Broker` [+1 slot] + - Cache `rToken` address and add `cacheComponents()` helper + - Allow `reportViolation()` to be called when paused or frozen - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` +- `Distributor` + - Call `RevenueTrader.distributeTokenToBuy()` before distribution table changes + - Call `StRSR.payoutRewards()` or `Furnace.melt()` after distributions + - Minor gas optimizations - `Furnace` - Allow melting while frozen +- `Main` + - Remove `furnace.melt()` from `poke()` +- `RevenueTrader` + - Replace use of `lotPrice()` with `price()` everywhere + - Ensure `settleTrade` cannot be reverted due to `tokenToBuy` distribution + - Ensure during `manageTokens()` that the Distributor is configured for the `tokenToBuy` - `StRSR` - Use correct era in `UnstakingStarted` event - Expose `draftEra` via `getDraftEra()` view ### Facades +- `FacadeMonitor` + - Add `batchAuctionsDisabled()` view + - Add `dutchAuctionsDisabled()` view + - Add `issuanceAvailable()` view + - Add `redemptionAvailable()` view + - Add `backingRedeemable()` view - `FacadeRead` - - Add `draftEra` argument to `pendingUnstakings(..)` + - Add `draftEra` argument to `pendingUnstakings()` + - Remove `.melt()` calls during pokes ## Plugins ### Assets -- Remove `lotPrice()` -- Alter `price().high` to decay upwards to 3x over the price timeout +- ALL + - Deprecate `lotPrice()` + - Alter `price().low` to decay downwards to 0 over the price timeout + - Alter `price().high` to decay upwards to 3x over the price timeout + - Move `ORACLE_TIMEOUT_BUFFER` into code, as opposed to incorporating at the deployment script level + - Make`refPerTok()` smoother during event of hard default + - Check for `defaultThreshold > 0` in constructors + - Add 9 more decimals of precision to reward accounting (some wrappers excluded) +- compoundv2: make wrapper much more gas efficient during COMP claim +- compoundv3 bugfix: check permission correctly on underlying comet +- curve: Also `refresh()` the RToken's AssetRegistry during `refresh()` +- convex: Update to latest approved wrapper from Convex team +- morpho-aave: Add ability to track and handout MORPHO rewards +- yearnv2: Use pricePerShare helper for more precision + +### Governance + +- Add a minimum voting delay of 1 day + +### Trading + +- `GnosisTrade` + - Add `sellAmount() returns (uint192)` view # 3.0.1 From 7299085be492b324d0f9a14017778a2b7a1703f5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 22:56:58 -0500 Subject: [PATCH 177/450] lint nit --- contracts/plugins/assets/stargate/StargateRewardableWrapper.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 4ed4db54fb..16136eff83 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -5,6 +5,8 @@ import "./interfaces/IStargateLPStaking.sol"; import "./interfaces/IStargatePool.sol"; import "../erc20/RewardableERC20Wrapper.sol"; +// solhint-disable no-empty-blocks + contract StargateRewardableWrapper is RewardableERC20Wrapper { IStargateLPStaking public immutable stakingContract; IStargatePool public immutable pool; From c7bbdb1d529c0dcbee6b707e0a3e8b82003ecd95 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Jan 2024 23:04:15 -0500 Subject: [PATCH 178/450] changelog --- CHANGELOG.md | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fb63a6eaf..0e86976551 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This release makes bidding in dutch auctions easier for MEV searchers and gives new RTokens being deployed the option to enable a variable target basket, or to be "reweightable". An RToken that is not reweightable cannot have its target basket changed in terms of quantities of target units. -### Upgrade Steps +## Upgrade Steps Upgrade BasketHandler and Distributor. @@ -12,21 +12,39 @@ Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTra If this is the first upgrade to a >= 3.0.0 token, call `*.cacheComponents()` on all components. -### Core Protocol Contracts +## Core Protocol Contracts -New governance param added to `DeploymentParams`: `reweightable` +New governance param added: `reweightable` - `BasketHandler` [+1 slot] - Add concept of a reweightable basket: a basket that can have its target amounts (once grouped by target unit) changed - - Add immutable-after-init `reweightable` bool + - Add `reweightable()` view - `Deployer` - New boolean field `reweightable` added to `IDeployer.DeploymentParams` - `Distributor` - Minor gas-optimization +## Plugins + +### Assets + +- frax-eth: Add new `sFrxETH` plugin that leverages a curve EMA +- stargate: Continue transfers of wrapper tokens if stargate rewards break + +### Trading + +- `DutchTrade` + + - Add new `bidTradeCallback()` function to allow payment of tokens at the _end_ of the tx, removing need for flash loans + +- `DutchTradeRouter` +- New contract to avoid needing to approve each new `DutchTrade` contract +- `bid(DutchTrade trade, address recipient) retruns (Bid memory)` +- `dutchTradeCallback(address buyToken, uint256 buyAmount, bytes calldata) external` + # 3.1.0 -### Upgrade Steps +## Upgrade Steps Upgrade all core contracts and _all_ assets. Most ERC20s do not need to be upgraded. Use `Deployer.deployRTokenAsset()` to create a new `RTokenAsset` instance. This asset should be swapped too. @@ -40,7 +58,7 @@ Then, call `Broker.cacheComponents()`. Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. -### Core Protocol Contracts +## Core Protocol Contracts - `BackingManager` [+2 slots] - Replace use of `lotPrice()` with `price()` everywhere @@ -72,7 +90,7 @@ Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. - Use correct era in `UnstakingStarted` event - Expose `draftEra` via `getDraftEra()` view -### Facades +## Facades - `FacadeMonitor` - Add `batchAuctionsDisabled()` view From dd28e025c5df2ea40c6f13aad93a843d71be6ced Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 22 Jan 2024 12:08:40 -0500 Subject: [PATCH 179/450] add back low <= high asserts --- contracts/plugins/assets/curve/CurveStableCollateral.sol | 1 + contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol | 1 + 2 files changed, 2 insertions(+) diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index a9d9a6b9b3..c59994fd56 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -66,6 +66,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // {UoA/tok} = {UoA} / {tok} low = aumLow.div(supply, FLOOR); high = aumHigh.div(supply, CEIL); + assert(low <= high); // not obviously true just by inspection return (low, high, 0); } diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 3e4c0009a0..ad3cd6ac8e 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -97,6 +97,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // {UoA/tok} = {UoA} / {tok} low = aumLow.div(supply, FLOOR); high = aumHigh.div(supply, CEIL); + assert(low <= high); // not obviously true just by inspection return (low, high, 0); } From 53c2e5ae4ebc7f0a94f7907e4ba66d28ad1605dc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 30 Jan 2024 11:28:13 -0500 Subject: [PATCH 180/450] TRST-QA-2: Small comment nits (#1048) --- contracts/interfaces/IDeployer.sol | 2 +- contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contracts/interfaces/IDeployer.sol b/contracts/interfaces/IDeployer.sol index d811aef2ec..535a5d4f93 100644 --- a/contracts/interfaces/IDeployer.sol +++ b/contracts/interfaces/IDeployer.sol @@ -38,7 +38,7 @@ struct DeploymentParams { // // === BasketHandler === uint48 warmupPeriod; // {s} how long to wait until issuance/trading after regaining SOUND - bool reweightable; // whether the basket can change in value + bool reweightable; // whether the target amounts in the prime basket can change // // === BackingManager === uint48 tradingDelay; // {s} how long to wait until starting auctions after switching basket diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 322eca9a75..f5c1d2b6ff 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -31,6 +31,8 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { IPricePerShareHelper public immutable pricePerShareHelper; + /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout + /// @dev config.erc20 should be a RewardableERC20 constructor( CollateralConfig memory config, uint192 revenueHiding, From c48c342c218bc8619e7e1ff204996b027ec417b0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 30 Jan 2024 11:28:32 -0500 Subject: [PATCH 181/450] Gas nit: Use `rToken` variable over `main.rToken()` in BackingManager (#1046) --- CHANGELOG.md | 6 ++++-- contracts/p1/BackingManager.sol | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0e86976551..18d504f4cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ This release makes bidding in dutch auctions easier for MEV searchers and gives ## Upgrade Steps -Upgrade BasketHandler and Distributor. +Upgrade BasketHandler, BackingManager, and Distributor. Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTrade` contract address. @@ -19,10 +19,12 @@ New governance param added: `reweightable` - `BasketHandler` [+1 slot] - Add concept of a reweightable basket: a basket that can have its target amounts (once grouped by target unit) changed - Add `reweightable()` view +- `BackingManager` + - Minor gas optimization - `Deployer` - New boolean field `reweightable` added to `IDeployer.DeploymentParams` - `Distributor` - - Minor gas-optimization + - Minor gas optimization ## Plugins diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index b7191aa097..401ed7eea0 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -79,8 +79,8 @@ contract BackingManagerP1 is TradingP1, IBackingManager { function grantRTokenAllowance(IERC20 erc20) external notFrozen { require(assetRegistry.isRegistered(erc20), "erc20 unregistered"); // == Interaction == - IERC20(address(erc20)).safeApprove(address(main.rToken()), 0); - IERC20(address(erc20)).safeApprove(address(main.rToken()), type(uint256).max); + IERC20(address(erc20)).safeApprove(address(rToken), 0); + IERC20(address(erc20)).safeApprove(address(rToken), type(uint256).max); } /// Settle a single trade. If the caller is the trade, try chaining into rebalance() @@ -134,8 +134,8 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // First dissolve any held RToken balance (above Distributor-dust) // gas-optimization: 1 whole RToken must be worth 100 trillion dollars for this to skip $1 - uint256 balance = main.rToken().balanceOf(address(this)); - if (balance >= MAX_DISTRIBUTION * MAX_DESTINATIONS) main.rToken().dissolve(balance); + uint256 balance = rToken.balanceOf(address(this)); + if (balance >= MAX_DISTRIBUTION * MAX_DESTINATIONS) rToken.dissolve(balance); if (basketsHeld.bottom >= rToken.basketsNeeded()) return; // return if now capitalized /* From 02c9bd7b7c3b3bbf39ab6eed7e416dc16171f6f9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 30 Jan 2024 19:49:22 -0500 Subject: [PATCH 182/450] remove FraxOracleLib --- contracts/plugins/assets/FraxOracleLib.sol | 66 ------------------- .../assets/frax-eth/SFraxEthCollateral.sol | 2 - contracts/plugins/mocks/FraxAggregator.sol | 15 +++++ 3 files changed, 15 insertions(+), 68 deletions(-) delete mode 100644 contracts/plugins/assets/FraxOracleLib.sol create mode 100644 contracts/plugins/mocks/FraxAggregator.sol diff --git a/contracts/plugins/assets/FraxOracleLib.sol b/contracts/plugins/assets/FraxOracleLib.sol deleted file mode 100644 index 67374c8de1..0000000000 --- a/contracts/plugins/assets/FraxOracleLib.sol +++ /dev/null @@ -1,66 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; -import "../../libraries/Fixed.sol"; -import "./OracleErrors.sol"; - -interface FraxAggregatorV3Interface is AggregatorV3Interface { - function priceSource() external view returns (address); - - function addRoundData( - bool _isBadData, - uint104 _priceLow, - uint104 _priceHigh, - uint40 _timestamp - ) external; -} - -/// Used by asset plugins to price their collateral -library FraxOracleLib { - /// @dev Use for nested calls that should revert when there is a problem - /// @param timeout The number of seconds after which oracle values should be considered stale - /// @return {UoA/tok} - function price(FraxAggregatorV3Interface chainlinkFeed, uint48 timeout) - internal - view - returns (uint192) - { - try chainlinkFeed.latestRoundData() returns ( - uint80 roundId, - int256 p, - uint256, - uint256 updateTime, - uint80 answeredInRound - ) { - if (updateTime == 0 || answeredInRound < roundId) { - revert StalePrice(); - } - - // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 - uint48 secondsSince = uint48(block.timestamp - updateTime); - if (secondsSince > timeout) revert StalePrice(); - - if (p == 0) revert ZeroPrice(); - - // {UoA/tok} - return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); - } catch (bytes memory errData) { - // Check if the priceSource was not set: if so, the chainlink feed has been deprecated - // and a _specific_ error needs to be raised in order to avoid looking like OOG - if (errData.length == 0) { - if (chainlinkFeed.priceSource() == address(0)) { - revert StalePrice(); - } - // solhint-disable-next-line reason-string - revert(); - } - - // Otherwise, preserve the error bytes - // solhint-disable-next-line no-inline-assembly - assembly { - revert(add(32, errData), mload(errData)) - } - } - } -} diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index ccafd1163d..98e1b1ecc0 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -5,7 +5,6 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../../libraries/Fixed.sol"; import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; -import "../FraxOracleLib.sol"; import "./vendor/IsfrxEth.sol"; import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; @@ -19,7 +18,6 @@ import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; */ contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOracleWithMinMax { using OracleLib for AggregatorV3Interface; - using FraxOracleLib for FraxAggregatorV3Interface; using FixLib for uint192; /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms diff --git a/contracts/plugins/mocks/FraxAggregator.sol b/contracts/plugins/mocks/FraxAggregator.sol new file mode 100644 index 0000000000..e3b867dd49 --- /dev/null +++ b/contracts/plugins/mocks/FraxAggregator.sol @@ -0,0 +1,15 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; + +interface FraxAggregatorV3Interface is AggregatorV3Interface { + function priceSource() external view returns (address); + + function addRoundData( + bool _isBadData, + uint104 _priceLow, + uint104 _priceHigh, + uint40 _timestamp + ) external; +} From 7dd4f0e09f6fb920275ff3294f7e955f5a2b4778 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 31 Jan 2024 22:12:25 +0530 Subject: [PATCH 183/450] TRST-H-1: YearnV2CurveFiatCollateral (#1050) --- .../yearnv2/YearnV2CurveFiatCollateral.sol | 9 +++--- .../YearnV2CurveFiatCollateral.test.ts | 31 ++++++++++++++++--- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index f5c1d2b6ff..b9e73cf258 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -4,10 +4,11 @@ pragma solidity 0.8.19; import "../curve/CurveStableCollateral.sol"; interface IPricePerShareHelper { + /// @notice Helper function to convert shares to underlying amount with exact precision /// @param vault The yToken address - /// @param amount {qTok} + /// @param shares {qTok} /// @return {qLP Token} - function amountToShares(address vault, uint256 amount) external view returns (uint256); + function sharesToAmount(address vault, uint256 shares) external view returns (uint256); } /** @@ -100,12 +101,12 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// @return {LP token/tok} function _pricePerShare() internal view returns (uint192) { uint256 supply = erc20.totalSupply(); // {qTok} - uint256 shares = pricePerShareHelper.amountToShares(address(erc20), supply); // {qLP Token} + uint256 amount = pricePerShareHelper.sharesToAmount(address(erc20), supply); // {qLP Token} // yvCurve tokens always have the same number of decimals as the underlying curve LP token, // so we can divide the quanta units without converting to whole units // {LP token/tok} = {LP token} / {tok} - return divuu(shares, supply); + return divuu(amount, supply); } } diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index ed208fbf48..6a9d31ded9 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -42,6 +42,7 @@ import { DELAY_UNTIL_DEFAULT, CurvePoolType, } from '../curve/constants' +import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' // Note: Uses ../curve/collateralTests.ts, not ../collateralTests.ts @@ -207,7 +208,7 @@ tests.forEach((test: CurveFiatTest) => { /* Define helper functions -*/ + */ const mintCollateralTo: MintCurveCollateralFunc = async ( ctx: CurveCollateralFixtureContext, @@ -220,17 +221,37 @@ tests.forEach((test: CurveFiatTest) => { /* Define collateral-specific tests -*/ + */ // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificConstructorTests = () => {} - // eslint-disable-next-line @typescript-eslint/no-empty-function - const collateralSpecificStatusTests = () => {} + const collateralSpecificStatusTests = () => { + it('correctly values tokens', async () => { + const [collateral] = await deployCollateral() + + await collateral.refresh() + const refPerTokBefore = await collateral.refPerTok() + + const slotValue = await ethers.provider.getStorageAt(await collateral.erc20(), 0x28) + await setStorageAt( + await collateral.erc20(), + 0x28, + BigNumber.from(slotValue).mul(101).div(100).toHexString() // increase debt by 1% + ) + + await ethers.provider.getStorageAt(await collateral.erc20(), 0x28).then(console.log) + + await collateral.refresh() + const refPerTokAfter = await collateral.refPerTok() + + expect(refPerTokAfter).to.be.gt(refPerTokBefore) + }) + } /* Run the test suite -*/ + */ const opts = { deployCollateral, From be3c8d823327d3544d38f295010f160ae2b919ea Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 31 Jan 2024 15:36:15 -0500 Subject: [PATCH 184/450] TRST-M-1A: Restrict `redeemCustom()` to recent nonces (#1047) --- CHANGELOG.md | 6 +++ contracts/interfaces/IBasketHandler.sol | 9 ++++ contracts/p0/BackingManager.sol | 2 + contracts/p0/BasketHandler.sol | 18 +++++++- contracts/p1/BackingManager.sol | 13 +++--- contracts/p1/BasketHandler.sol | 58 +++++++++++-------------- contracts/p1/mixins/BasketLib.sol | 36 +++++++++++++++ contracts/p1/mixins/Trading.sol | 10 ++++- test/RToken.test.ts | 10 ++--- test/Recollateralization.test.ts | 42 +++++++++++++----- 10 files changed, 146 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18d504f4cd..79a29115b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,11 +12,17 @@ Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTra If this is the first upgrade to a >= 3.0.0 token, call `*.cacheComponents()` on all components. +For plugins, upgrade Stargate. + ## Core Protocol Contracts New governance param added: `reweightable` +- `BackingManager` + - Track basket nonce last collateralized at end of `settleTrade()` - `BasketHandler` [+1 slot] + - Restrict `redeemCustom()` to nonces after `lastCollateralized` + - New `LastCollateralizedChanged()` event -- track to determine earliest basket nonce to use for `redeemCustom()` - Add concept of a reweightable basket: a basket that can have its target amounts (once grouped by target unit) changed - Add `reweightable()` view - `BackingManager` diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index b835ddc683..a98621dd4f 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -48,6 +48,11 @@ interface IBasketHandler is IComponent { /// @param newStatus The new basket status event BasketStatusChanged(CollateralStatus oldStatus, CollateralStatus newStatus); + /// Emitted when the last basket nonce available for redemption is changed + /// @param oldVal The old value of lastCollateralized + /// @param newVal The new value of lastCollateralized + event LastCollateralizedChanged(uint48 oldVal, uint48 newVal); + // Initialization function init( IMain main_, @@ -87,6 +92,10 @@ interface IBasketHandler is IComponent { /// @custom:refresher function trackStatus() external; + /// Track when last collateralized + /// @custom:refresher + function trackCollateralization() external; + /// @return If the BackingManager has sufficient collateral to redeem the entire RToken supply function fullyCollateralized() external view returns (bool); diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 34a28ce66a..2a3d25b9d4 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -82,6 +82,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager { if (errData.length == 0) revert(); // solhint-disable-line reason-string } } + + main.basketHandler().trackCollateralization(); } /// Apply the overall backing policy using the specified TradeKind, taking a haircut if unable diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index bb32ffad23..b8e76cfacb 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -124,6 +124,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { Basket private basket; uint48 public nonce; // {basketNonce} A unique identifier for this basket instance + uint48 public lastCollateralized; // {basketNonce} Nonce of most recent full collateralization uint48 public timestamp; // The timestamp when this basket was last set // If disabled is true, status() is DISABLED, the basket is invalid, and the whole system should @@ -229,6 +230,16 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } } + /// Track when last collateralized + // effects: lastCollateralized' = nonce if nonce > lastCollateralized && fullyCapitalized + /// @custom:refresher + function trackCollateralization() external { + if (nonce > lastCollateralized && fullyCollateralized()) { + emit LastCollateralizedChanged(lastCollateralized, nonce); + lastCollateralized = nonce; + } + } + /// Set the prime basket in the basket configuration, in terms of erc20s and target amounts /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket @@ -315,7 +326,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { /// @return Whether this contract owns enough collateral to cover rToken.basketsNeeded() BUs /// ie, whether the protocol is currently fully collateralized - function fullyCollateralized() external view returns (bool) { + function fullyCollateralized() public view returns (bool) { BasketRange memory held = basketsHeldBy(address(main.backingManager())); return held.bottom >= main.rToken().basketsNeeded(); } @@ -476,7 +487,10 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // Calculate the linear combination basket for (uint48 i = 0; i < basketNonces.length; ++i) { - require(basketNonces[i] <= nonce, "invalid basketNonce"); + require( + basketNonces[i] >= lastCollateralized && basketNonces[i] <= nonce, + "invalid basketNonce" + ); Basket storage b = basketHistory[basketNonces[i]]; // Add-in refAmts contribution from historical basket diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 401ed7eea0..66f69edaee 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -107,6 +107,8 @@ contract BackingManagerP1 is TradingP1, IBackingManager { if (errData.length == 0) revert(); // solhint-disable-line reason-string } } + + basketHandler.trackCollateralization(); } /// Apply the overall backing policy using the specified TradeKind, taking a haircut if unable @@ -114,7 +116,9 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// @custom:interaction not RCEI; nonReentrant // untested: // OZ nonReentrant line is assumed to be working. cost/benefit of direct testing is high - function rebalance(TradeKind kind) external nonReentrant notTradingPausedOrFrozen { + function rebalance(TradeKind kind) external nonReentrant { + requireNotTradingPausedOrFrozen(); + // == Refresh == assetRegistry.refresh(); @@ -183,11 +187,8 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// @custom:interaction not RCEI; nonReentrant // untested: // OZ nonReentrant line is assumed to be working. cost/benefit of direct testing is high - function forwardRevenue(IERC20[] calldata erc20s) - external - nonReentrant - notTradingPausedOrFrozen - { + function forwardRevenue(IERC20[] calldata erc20s) external nonReentrant { + requireNotTradingPausedOrFrozen(); require(ArrayLib.allUnique(erc20s), "duplicate tokens"); assetRegistry.refresh(); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index db22162a74..5899a744b1 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -76,7 +76,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // A history of baskets by basket nonce; includes current basket mapping(uint48 => Basket) private basketHistory; - // Effectively local variable of `requireConstantConfigTargets()` + // Effectively local variable of `BasketLibP1.requireConstantConfigTargets()` EnumerableMap.Bytes32ToUintMap private _targetAmts; // targetName -> {target/BU} // === @@ -85,6 +85,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Whether the total weights of the target basket can be changed bool public reweightable; // immutable after init + uint48 public lastCollateralized; // {basketNonce} most recent full collateralization + // === // ==== Invariants ==== @@ -170,6 +172,16 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } } + /// Track when last collateralized + // effects: lastCollateralized' = nonce if nonce > lastCollateralized && fullyCapitalized + /// @custom:refresher + function trackCollateralization() external { + if (nonce > lastCollateralized && fullyCollateralized()) { + emit LastCollateralizedChanged(lastCollateralized, nonce); + lastCollateralized = nonce; + } + } + /// Set the prime basket in the basket configuration, in terms of erc20s and target amounts /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket @@ -193,7 +205,13 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // If this isn't initial setup, require targets remain constant if (!reweightable && config.erc20s.length > 0) { - requireConstantConfigTargets(erc20s, targetAmts); + BasketLibP1.requireConstantConfigTargets( + assetRegistry, + config, + _targetAmts, + erc20s, + targetAmts + ); } // Clean up previous basket config @@ -253,7 +271,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { /// @return Whether this contract owns enough collateral to cover rToken.basketsNeeded() BUs /// ie, whether the protocol is currently fully collateralized - function fullyCollateralized() external view returns (bool) { + function fullyCollateralized() public view returns (bool) { BasketRange memory held = basketsHeldBy(address(backingManager)); return held.bottom >= rToken.basketsNeeded(); } @@ -422,7 +440,10 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Calculate the linear combination basket for (uint48 i = 0; i < basketNonces.length; ++i) { - require(basketNonces[i] <= nonce, "invalid basketNonce"); + require( + basketNonces[i] >= lastCollateralized && basketNonces[i] <= nonce, + "invalid basketNonce" + ); Basket storage b = basketHistory[basketNonces[i]]; // Add-in refAmts contribution from historical basket @@ -561,35 +582,6 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { emit BasketSet(nonce, basket.erc20s, refAmts, disabled); } - /// Require that newERC20s and newTargetAmts preserve the current config targets - function requireConstantConfigTargets( - IERC20[] calldata newERC20s, - uint192[] calldata newTargetAmts - ) private { - // Populate _targetAmts mapping with old basket config - uint256 len = config.erc20s.length; - for (uint256 i = 0; i < len; ++i) { - IERC20 erc20 = config.erc20s[i]; - bytes32 targetName = config.targetNames[erc20]; - (bool contains, uint256 amt) = _targetAmts.tryGet(targetName); - _targetAmts.set( - targetName, - contains ? amt + config.targetAmts[erc20] : config.targetAmts[erc20] - ); - } - - // Require new basket is exactly equal to old basket, in terms of targetAmts by targetName - len = newERC20s.length; - for (uint256 i = 0; i < len; ++i) { - bytes32 targetName = assetRegistry.toColl(newERC20s[i]).targetName(); - (bool contains, uint256 amt) = _targetAmts.tryGet(targetName); - require(contains && amt >= newTargetAmts[i], "new target weights"); - if (amt > newTargetAmts[i]) _targetAmts.set(targetName, amt - newTargetAmts[i]); - else _targetAmts.remove(targetName); - } - require(_targetAmts.length() == 0, "missing target weights"); - } - /// Require that erc20s is a valid collateral array function requireValidCollArray(IERC20[] calldata erc20s) private view { for (uint256 i = 0; i < erc20s.length; i++) { diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index 6480d77055..37645b4337 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -3,6 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; +import "@openzeppelin/contracts/utils/structs/EnumerableMap.sol"; import "../../interfaces/IAssetRegistry.sol"; import "../../libraries/Fixed.sol"; @@ -56,6 +57,7 @@ struct Basket { */ library BasketLibP1 { using BasketLibP1 for Basket; + using EnumerableMap for EnumerableMap.Bytes32ToUintMap; using EnumerableSet for EnumerableSet.AddressSet; using EnumerableSet for EnumerableSet.Bytes32Set; using FixLib for uint192; @@ -306,4 +308,38 @@ library BasketLibP1 { return false; } } + + // === Contract-size saver === + + /// Require that newERC20s and newTargetAmts preserve the current config targets + function requireConstantConfigTargets( + IAssetRegistry assetRegistry, + BasketConfig storage config, + EnumerableMap.Bytes32ToUintMap storage targetAmts, + IERC20[] calldata newERC20s, + uint192[] calldata newTargetAmts + ) external { + // Populate targetAmts mapping with old basket config + uint256 len = config.erc20s.length; + for (uint256 i = 0; i < len; ++i) { + IERC20 erc20 = config.erc20s[i]; + bytes32 targetName = config.targetNames[erc20]; + (bool contains, uint256 amt) = targetAmts.tryGet(targetName); + targetAmts.set( + targetName, + contains ? amt + config.targetAmts[erc20] : config.targetAmts[erc20] + ); + } + + // Require new basket is exactly equal to old basket, in terms of targetAmts by targetName + len = newERC20s.length; + for (uint256 i = 0; i < len; ++i) { + bytes32 targetName = assetRegistry.toColl(newERC20s[i]).targetName(); + (bool contains, uint256 amt) = targetAmts.tryGet(targetName); + require(contains && amt >= newTargetAmts[i], "new target weights"); + if (amt > newTargetAmts[i]) targetAmts.set(targetName, amt - newTargetAmts[i]); + else targetAmts.remove(targetName); + } + require(targetAmts.length() == 0, "missing target weights"); + } } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 1c6217e8ec..393cc2435a 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -57,10 +57,15 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl setMinTradeVolume(minTradeVolume_); } + /// Contract-size helper + // solhint-disable-next-line no-empty-blocks + function requireNotTradingPausedOrFrozen() internal view notTradingPausedOrFrozen {} + /// Claim all rewards /// Collective Action /// @custom:interaction CEI - function claimRewards() external notTradingPausedOrFrozen { + function claimRewards() external { + requireNotTradingPausedOrFrozen(); RewardableLibP1.claimRewards(main.assetRegistry()); } @@ -68,7 +73,8 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl /// Collective Action /// @param erc20 The ERC20 to claimRewards on /// @custom:interaction CEI - function claimRewardsSingle(IERC20 erc20) external notTradingPausedOrFrozen { + function claimRewardsSingle(IERC20 erc20) external { + requireNotTradingPausedOrFrozen(); RewardableLibP1.claimRewardsSingle(main.assetRegistry().toAsset(erc20)); } diff --git a/test/RToken.test.ts b/test/RToken.test.ts index 4652dec1c9..b225dd3bfd 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -1227,23 +1227,23 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { .connect(addr1) .redeemCustom(addr1.address, fp('1'), [await basketHandler.nonce()], [fp('1')], [], []) - // New reference basket + // Cannot redeem after new reference basket await basketHandler.refreshBasket() expect(await basketHandler.fullyCollateralized()).to.equal(false) - - // Custom redemption should not revert since there is collateral overlap await expect(rToken.connect(addr1).redeem(1)).to.be.revertedWith( 'partial redemption; use redeemCustom' ) + + // Can redeemCustom at latest basket nonce const nonce = await basketHandler.nonce() await rToken.connect(addr1).redeemCustom(addr1.address, fp('1'), [nonce], [fp('1')], [], []) - // Previous basket nonce should be redeemable + // Can redeemCustom at previous basket nonce await rToken .connect(addr1) .redeemCustom(addr1.address, fp('1'), [nonce - 1], [fp('1')], [], []) - // Future basket nonce should not be redeemable + // Cannot redeemCustom at future basket nonce await expect( rToken.connect(addr1).redeemCustom(addr1.address, fp('1'), [nonce + 1], [fp('1')], [], []) ).to.be.revertedWith('invalid basketNonce') diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index d995dc3dbb..6bc20a55bb 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -1093,15 +1093,25 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { const sellAmt: BigNumber = await token0.balanceOf(backingManager.address) const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) - await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) - .to.emit(backingManager, 'TradeStarted') - .withArgs( - anyValue, - token0.address, - token1.address, - sellAmt, - toBNDecimals(minBuyAmt, 6).add(1) - ) + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: backingManager, + name: 'TradeStarted', + args: [ + anyValue, + token0.address, + token1.address, + sellAmt, + toBNDecimals(minBuyAmt, 6).add(1), + ], + emitted: true, + }, + { + contract: basketHandler, + name: 'LastCollateralizedChanged', + emitted: false, + }, + ]) const auctionTimestamp: number = await getLatestBlockTimestamp() @@ -1155,7 +1165,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Advance time till auction ended await advanceTime(config.batchAuctionLength.add(100).toString()) - // End current auction, should not start any new auctions + // End current auction, should not start any new auctions await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: backingManager, @@ -1170,6 +1180,12 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { emitted: true, }, { contract: backingManager, name: 'TradeStarted', emitted: false }, + { + contract: basketHandler, + name: 'LastCollateralizedChanged', + args: [anyValue, 3], + emitted: true, + }, ]) // Check state - Order restablished @@ -1183,6 +1199,12 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) expect(await rToken.totalSupply()).to.equal(issueAmount) // assets kept in backing buffer + // Regression test -- Jan 29 2024 + // After recollateralization: should NOT allow redeemCustom at previous basket + await expect( + rToken.connect(addr1).redeemCustom(addr1.address, bn('1'), [2], [fp('1')], [], []) + ).to.be.revertedWith('invalid basketNonce') + // Check price in USD of the current RToken await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) }) From c7972aad28ab96a497086a6e0580c65428bfb5cb Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Thu, 1 Feb 2024 04:05:01 +0530 Subject: [PATCH 185/450] TRST-QA-4: No more mix max (#1052) --- .../assets/frax-eth/SFraxEthCollateral.sol | 27 ++++--- .../CurvePoolEmaPriceOracleWithMinMax.sol | 70 ------------------- .../ICurvePoolEmaPriceOracleWithMinMax.sol | 16 ----- .../mocks/EmaPriceOracleStableSwapMock.sol | 10 +-- .../frax-eth/SFrxEthTestSuite.test.ts | 8 +-- 5 files changed, 21 insertions(+), 110 deletions(-) delete mode 100644 contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol delete mode 100644 contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 98e1b1ecc0..38ee4918e1 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -6,7 +6,11 @@ import "../../../libraries/Fixed.sol"; import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; import "./vendor/IsfrxEth.sol"; -import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; + +interface IEmaPriceOracleStableSwap { + // solhint-disable-next-line func-name-mixedcase + function price_oracle() external view returns (uint256); +} /** * @title SFraxEthCollateral @@ -16,27 +20,22 @@ import "./vendor/CurvePoolEmaPriceOracleWithMinMax.sol"; * tar = ETH * UoA = USD */ -contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOracleWithMinMax { +contract SFraxEthCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; + address public immutable CURVE_POOL_EMA_PRICE_ORACLE; + /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms /// @param revenueHiding {1e18} percent amount of revenue to hide constructor( CollateralConfig memory config, uint192 revenueHiding, - address curvePoolEmaPriceOracleAddress, - uint256 _minimumCurvePoolEma, - uint256 _maximumCurvePoolEma - ) - AppreciatingFiatCollateral(config, revenueHiding) - CurvePoolEmaPriceOracleWithMinMax( - curvePoolEmaPriceOracleAddress, - _minimumCurvePoolEma, - _maximumCurvePoolEma - ) - { + address curvePoolEmaPriceOracleAddress + ) AppreciatingFiatCollateral(config, revenueHiding) { require(config.defaultThreshold > 0, "defaultThreshold zero"); + + CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; } /// Can revert, used by other contract functions in order to catch errors @@ -54,7 +53,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral, CurvePoolEmaPriceOrac ) { // {target/ref} Get current market peg ({eth/frxeth}) - pegPrice = _safeWrap(_getCurvePoolToken1EmaPrice()); + pegPrice = _safeWrap(IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle()); // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); diff --git a/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol deleted file mode 100644 index 75f829a0dc..0000000000 --- a/contracts/plugins/assets/frax-eth/vendor/CurvePoolEmaPriceOracleWithMinMax.sol +++ /dev/null @@ -1,70 +0,0 @@ -// SPDX-License-Identifier: ISC -pragma solidity ^0.8.19; - -// Inspired by Frax Finance: https://github.com/FraxFinance - -// Original Author -// Drake Evans: https://github.com/DrakeEvans - -// Original Reviewers -// Dennis: https://github.com/denett - -// ==================================================================== - -import { ICurvePoolEmaPriceOracleWithMinMax } from "./ICurvePoolEmaPriceOracleWithMinMax.sol"; - -interface IEmaPriceOracleStableSwap { - // solhint-disable-next-line func-name-mixedcase - function price_oracle() external view returns (uint256); -} - -struct ConstructorParams { - address curvePoolEmaPriceOracleAddress; - uint256 minimumCurvePoolEma; - uint256 maximumCurvePoolEma; -} - -/// @title CurvePoolEmaPriceOracleWithMinMax -/// @author Drake Evans (Frax Finance) https://github.com/drakeevans -/// @notice An oracle for getting EMA prices from Curve -contract CurvePoolEmaPriceOracleWithMinMax is ICurvePoolEmaPriceOracleWithMinMax { - /// @notice Curve pool, source of EMA - // solhint-disable-next-line var-name-mixedcase - address public immutable CURVE_POOL_EMA_PRICE_ORACLE; - - /// @notice Precision of Curve pool price_oracle() - uint256 public constant CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS = 18; - - /// @notice Maximum price of token1 in token0 units of the EMA - /// @dev Must match precision of EMA - uint256 public minimumCurvePoolEma; - - /// @notice Maximum price of token1 in token0 units of the EMA - /// @dev Must match precision of EMA - uint256 public maximumCurvePoolEma; - - constructor( - address curvePoolEmaPriceOracleAddress, - uint256 _minimumCurvePoolEma, - uint256 _maximumCurvePoolEma - ) { - CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; - minimumCurvePoolEma = _minimumCurvePoolEma; - maximumCurvePoolEma = _maximumCurvePoolEma; - } - - function _getCurvePoolToken1EmaPrice() internal view returns (uint256 _token1Price) { - uint256 _priceRaw = IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle(); - uint256 _price = _priceRaw > maximumCurvePoolEma ? maximumCurvePoolEma : _priceRaw; - - _token1Price = _price < minimumCurvePoolEma ? minimumCurvePoolEma : _price; - } - - /// @notice The ```getCurvePoolToken1EmaPrice``` function gets the price of the second token - /// in the Curve pool (token1) - /// @dev Returned in units of the first token (token0) - /// @return _emaPrice The price of the second token in the Curve pool - function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice) { - return _getCurvePoolToken1EmaPrice(); - } -} diff --git a/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol b/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol deleted file mode 100644 index 94a8b2dbde..0000000000 --- a/contracts/plugins/assets/frax-eth/vendor/ICurvePoolEmaPriceOracleWithMinMax.sol +++ /dev/null @@ -1,16 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity 0.8.19; - -interface ICurvePoolEmaPriceOracleWithMinMax { - // solhint-disable-next-line func-name-mixedcase - function CURVE_POOL_EMA_PRICE_ORACLE() external view returns (address); - - // solhint-disable-next-line func-name-mixedcase - function CURVE_POOL_EMA_PRICE_ORACLE_DECIMALS() external view returns (uint256); - - function getCurvePoolToken1EmaPrice() external view returns (uint256 _emaPrice); - - function maximumCurvePoolEma() external view returns (uint256); - - function minimumCurvePoolEma() external view returns (uint256); -} diff --git a/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol index 6d94dc396f..ab7b0fa4f3 100644 --- a/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol +++ b/contracts/plugins/mocks/EmaPriceOracleStableSwapMock.sol @@ -12,9 +12,7 @@ contract EmaPriceOracleStableSwapMock is IEmaPriceOracleStableSwap { uint256 public initPrice; uint256 internal _price; - constructor( - uint256 _initPrice - ) { + constructor(uint256 _initPrice) { initPrice = _initPrice; _price = _initPrice; } @@ -30,4 +28,8 @@ contract EmaPriceOracleStableSwapMock is IEmaPriceOracleStableSwap { function price_oracle() external view returns (uint256) { return _price; } -} \ No newline at end of file + + function decimals() external pure returns (uint8) { + return 18; + } +} diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index fb9f69b97d..47a242ffb0 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -11,7 +11,6 @@ import { SfraxEthMock, TestICollateral, IsfrxEth, - SFraxEthCollateral, EmaPriceOracleStableSwapMock__factory, EmaPriceOracleStableSwapMock, } from '../../../../typechain' @@ -99,8 +98,6 @@ export const deployCollateral = async ( }, opts.revenueHiding, opts.curvePoolEmaPriceOracleAddress ?? CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS, - opts._minimumCurvePoolEma ?? 0, - opts._maximumCurvePoolEma ?? fp(1), { gasLimit: 2000000000 } ) await collateral.deployed() @@ -228,9 +225,8 @@ const getExpectedPrice = async (ctx: SFrxEthCollateralFixtureContext): Promise Date: Fri, 2 Feb 2024 03:27:11 +0530 Subject: [PATCH 186/450] TRST-L-2: sFRAX and sfrxETH sync rewards. (#1053) --- contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol | 6 ++++++ contracts/plugins/assets/frax/SFraxCollateral.sol | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 38ee4918e1..3d973def9f 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -38,6 +38,12 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; } + function refresh() public virtual override { + try IsfrxEth(address(erc20)).syncRewards() {} catch {} + + super.refresh(); + } + /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate diff --git a/contracts/plugins/assets/frax/SFraxCollateral.sol b/contracts/plugins/assets/frax/SFraxCollateral.sol index 90b7331815..863cd098fc 100644 --- a/contracts/plugins/assets/frax/SFraxCollateral.sol +++ b/contracts/plugins/assets/frax/SFraxCollateral.sol @@ -25,6 +25,12 @@ contract SFraxCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) {} + function refresh() public virtual override { + try IStakedFrax(address(erc20)).syncRewardsAndDistribution() {} catch {} + + super.refresh(); + } + // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens From fd1e09a24dd184d5ce4cd935e6d086a3fd776b84 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 2 Feb 2024 03:27:35 +0530 Subject: [PATCH 187/450] TRST-QA-3: Gap Sizes (#1051) --- .gitignore | 1 + contracts/p1/AssetRegistry.sol | 2 +- contracts/p1/BasketHandler.sol | 2 +- contracts/p1/Distributor.sol | 2 +- contracts/p1/RToken.sol | 2 +- contracts/p1/StRSR.sol | 2 ++ hardhat.config.ts | 5 +++-- package.json | 1 + yarn.lock | 28 ++++++++++++++++++++++++++++ 9 files changed, 39 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 13c0e37712..69f2a05a17 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ scripts/addresses/31337* *.orig .idea +output.txt # Scripts for local/test interactions scripts/test.ts diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index c556a96120..2d606999f4 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -232,5 +232,5 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[46] private __gap; + uint256[44] private __gap; } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 5899a744b1..280dc2adb5 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -682,5 +682,5 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[36] private __gap; + uint256[28] private __gap; } diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 6b1835bc9f..ff81d32773 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -216,5 +216,5 @@ contract DistributorP1 is ComponentP1, IDistributor { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[44] private __gap; + uint256[41] private __gap; } diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 1c07b650ef..2d27b3c7d3 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -530,5 +530,5 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[42] private __gap; + uint256[36] private __gap; } diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index faff182759..791cedf8a6 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -1002,6 +1002,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + * + * StRSRP1 uses 53 total slots, not 50. */ uint256[28] private __gap; } diff --git a/hardhat.config.ts b/hardhat.config.ts index 61bac4e916..7e6ea11aa2 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -8,6 +8,7 @@ import '@typechain/hardhat' import 'hardhat-contract-sizer' import 'hardhat-gas-reporter' import 'solidity-coverage' +import 'hardhat-storage-layout' import * as tenderly from '@tenderly/hardhat-tenderly' import { useEnv } from '#/utils/env' @@ -44,7 +45,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true + allowUnlimitedContractSize: true, }, localhost: { // network for long-lived mainnet forks @@ -139,7 +140,7 @@ const config: HardhatUserConfig = { etherscan: { apiKey: { mainnet: useEnv('ETHERSCAN_API_KEY'), - base: useEnv('BASESCAN_API_KEY') + base: useEnv('BASESCAN_API_KEY'), }, customChains: [ { diff --git a/package.json b/package.json index ba1f2ec495..d04258b90b 100644 --- a/package.json +++ b/package.json @@ -91,6 +91,7 @@ "hardhat": "^2.12.3", "hardhat-contract-sizer": "^2.4.0", "hardhat-gas-reporter": "^1.0.8", + "hardhat-storage-layout": "^0.1.7", "husky": "^7.0.0", "lodash": "^4.17.21", "lodash.get": "^4.4.2", diff --git a/yarn.lock b/yarn.lock index 7b7e7a4873..57bfb84089 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3689,6 +3689,15 @@ __metadata: languageName: node linkType: hard +"console-table-printer@npm:^2.9.0": + version: 2.12.0 + resolution: "console-table-printer@npm:2.12.0" + dependencies: + simple-wcswidth: ^1.0.1 + checksum: 2cd826da503186e939f760d4f821a967944c2d111d73aec36d252e99af0f0b17c1e2722782278508deff83b77207ab872b9400fa5c524ed273586ac32762b318 + languageName: node + linkType: hard + "content-disposition@npm:0.5.4": version: 0.5.4 resolution: "content-disposition@npm:0.5.4" @@ -5930,6 +5939,17 @@ __metadata: languageName: node linkType: hard +"hardhat-storage-layout@npm:^0.1.7": + version: 0.1.7 + resolution: "hardhat-storage-layout@npm:0.1.7" + dependencies: + console-table-printer: ^2.9.0 + peerDependencies: + hardhat: ^2.0.3 + checksum: 8d27d6b16c1ebdffa032ba6b99c61996df4601dcbaf7d770c474806b492a56de9d21b4190086ab40f50a3a1f2e9851cc81034a9cfd2e21368941977324f96fd4 + languageName: node + linkType: hard + "hardhat@npm:^2.12.3": version: 2.17.0 resolution: "hardhat@npm:2.17.0" @@ -8879,6 +8899,7 @@ __metadata: hardhat: ^2.12.3 hardhat-contract-sizer: ^2.4.0 hardhat-gas-reporter: ^1.0.8 + hardhat-storage-layout: ^0.1.7 husky: ^7.0.0 isomorphic-fetch: ^3.0.0 lodash: ^4.17.21 @@ -9387,6 +9408,13 @@ __metadata: languageName: node linkType: hard +"simple-wcswidth@npm:^1.0.1": + version: 1.0.1 + resolution: "simple-wcswidth@npm:1.0.1" + checksum: dc5bf4cb131d9c386825d1355add2b1ecc408b37dc2c2334edd7a1a4c9f527e6b594dedcdbf6d949bce2740c3a332e39af1183072a2d068e40d9e9146067a37f + languageName: node + linkType: hard + "sisteransi@npm:^1.0.5": version: 1.0.5 resolution: "sisteransi@npm:1.0.5" From d8902d4591a4ea9c454ee47e364d4e00a2696aae Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 1 Feb 2024 18:00:35 -0500 Subject: [PATCH 188/450] Make `pendingUnstakings` return RSR amount (#1054) --- contracts/facade/FacadeRead.sol | 6 +++-- contracts/interfaces/IFacadeRead.sol | 2 +- test/Facade.test.ts | 37 +++++++++++++++++----------- 3 files changed, 28 insertions(+), 17 deletions(-) diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 2e2ce936e0..b392eb554d 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -269,7 +269,7 @@ contract FacadeRead is IFacadeRead { /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} - /// @return unstakings {qDrafts} All the pending StRSR unstakings for an account, in drafts + /// @return unstakings {qRSR} All the pending StRSR unstakings for an account, in RSR function pendingUnstakings( RTokenP1 rToken, uint256 draftEra, @@ -278,6 +278,7 @@ contract FacadeRead is IFacadeRead { StRSRP1 stRSR = StRSRP1(address(rToken.main().stRSR())); uint256 left = stRSR.firstRemainingDraft(draftEra, account); uint256 right = stRSR.draftQueueLen(draftEra, account); + uint192 draftRate = stRSR.draftRate(); unstakings = new Pending[](right - left); for (uint256 i = 0; i < right - left; i++) { @@ -289,7 +290,8 @@ contract FacadeRead is IFacadeRead { diff = drafts - prevDrafts; } - unstakings[i] = Pending(i + left, availableAt, diff); + // {qRSR} = {qDrafts} / {qDrafts/qRSR} + unstakings[i] = Pending(i + left, availableAt, diff.div(draftRate)); } } diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IFacadeRead.sol index df5f039d64..4060a390f6 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IFacadeRead.sol @@ -88,7 +88,7 @@ interface IFacadeRead { /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} - /// @return {qDrafts} All the pending unstakings for an account, in drafts + /// @return {qRSR} All the pending StRSR unstakings for an account, in RSR function pendingUnstakings( RTokenP1 rToken, uint256 draftEra, diff --git a/test/Facade.test.ts b/test/Facade.test.ts index f20428e2a4..4e1d3e9877 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -966,30 +966,39 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) it('Should return pending unstakings', async () => { - // Bump draftEra by seizing RSR when the withdrawal queue is empty - await rsr.connect(owner).mint(stRSRP1.address, 1) + // Stake + const unstakeAmount = bn('10000e18') + await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(20)) + await rsr.connect(addr1).approve(stRSR.address, unstakeAmount.mul(20)) + await stRSRP1.connect(addr1).stake(unstakeAmount.mul(20)) + + // Bump draftEra by seizing half the RSR when the withdrawal queue is empty + let draftEra = await stRSRP1.getDraftEra() + expect(draftEra).to.equal(1) await whileImpersonating(backingManager.address, async (signer) => { - await stRSRP1.connect(signer).seizeRSR(1) + await stRSRP1.connect(signer).seizeRSR(unstakeAmount.mul(10)) // seize half }) - const draftEra = await stRSRP1.getDraftEra() - expect(draftEra).to.equal(2) + draftEra = await stRSRP1.getDraftEra() + expect(draftEra).to.equal(2) // era bumps because queue is empty - // Stake - const unstakeAmount = bn('10000e18') - await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(10)) - await rsr.connect(addr1).approve(stRSR.address, unstakeAmount.mul(10)) - await stRSRP1.connect(addr1).stake(unstakeAmount.mul(10)) + await stRSRP1.connect(addr1).unstake(unstakeAmount.mul(4)) // eventually 75% StRSR/RSR depreciation + + // Bump draftEra by seizing half the RSR when the queue is empty + await whileImpersonating(backingManager.address, async (signer) => { + await stRSRP1.connect(signer).seizeRSR(unstakeAmount.mul(5)) // seize half, again + }) + draftEra = await stRSRP1.getDraftEra() + expect(draftEra).to.equal(2) // no era bump - await stRSRP1.connect(addr1).unstake(unstakeAmount) - await stRSRP1.connect(addr1).unstake(unstakeAmount.add(1)) + await stRSRP1.connect(addr1).unstake(unstakeAmount.mul(4).add(1)) // test rounding const pendings = await facade.pendingUnstakings(rToken.address, draftEra, addr1.address) expect(pendings.length).to.eql(2) expect(pendings[0][0]).to.eql(bn(0)) // index - expect(pendings[0][2]).to.eql(unstakeAmount) // amount + expect(pendings[0][2]).to.eql(unstakeAmount) // RSR amount, not draft amount expect(pendings[1][0]).to.eql(bn(1)) // index - expect(pendings[1][2]).to.eql(unstakeAmount.add(1)) // amount + expect(pendings[1][2]).to.eql(unstakeAmount) // RSR amount, not draft amount }) it('Should return prime basket', async () => { From 23ffdab82d79e08ad31cf47ee1a6aa047d1ad500 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 2 Feb 2024 11:50:26 -0500 Subject: [PATCH 189/450] nit: remove outdated comment --- contracts/facade/FacadeRead.sol | 1 - contracts/interfaces/IFacadeRead.sol | 1 - 2 files changed, 2 deletions(-) diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index b392eb554d..62f2cfc2f8 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -268,7 +268,6 @@ contract FacadeRead is IFacadeRead { /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} /// @return unstakings {qRSR} All the pending StRSR unstakings for an account, in RSR function pendingUnstakings( RTokenP1 rToken, diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IFacadeRead.sol index 4060a390f6..5471a1ebb3 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IFacadeRead.sol @@ -87,7 +87,6 @@ interface IFacadeRead { /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} /// @return {qRSR} All the pending StRSR unstakings for an account, in RSR function pendingUnstakings( RTokenP1 rToken, From 77fad4d5fd4bd8b6ee83fe4370688acccf446ba8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 2 Feb 2024 19:16:55 -0500 Subject: [PATCH 190/450] expose underlyingRefPerTok() --- .../assets/AppreciatingFiatCollateral.sol | 74 ++++++++------- contracts/plugins/assets/L2LSDCollateral.sol | 16 ++-- .../assets/aave-v3/AaveV3FiatCollateral.sol | 2 +- .../assets/aave/ATokenFiatCollateral.sol | 2 +- .../assets/ankr/AnkrStakedEthCollateral.sol | 4 +- .../plugins/assets/cbeth/CBETHCollateral.sol | 4 +- .../assets/cbeth/CBETHCollateralL2.sol | 2 +- .../compoundv2/CTokenFiatCollateral.sol | 2 +- .../compoundv2/CTokenNonFiatCollateral.sol | 2 +- .../CTokenSelfReferentialCollateral.sol | 4 +- .../assets/compoundv3/CTokenV3Collateral.sol | 94 ++++++++++--------- .../assets/curve/CurveStableCollateral.sol | 74 ++++++++------- .../curve/CurveStableMetapoolCollateral.sol | 2 +- .../plugins/assets/dsr/SDaiCollateral.sol | 2 +- .../assets/frax-eth/SFraxEthCollateral.sol | 4 +- .../plugins/assets/frax/SFraxCollateral.sol | 2 +- .../assets/lido/LidoStakedEthCollateral.sol | 4 +- .../morpho-aave/MorphoFiatCollateral.sol | 2 +- .../morpho-aave/MorphoNonFiatCollateral.sol | 2 +- .../MorphoSelfReferentialCollateral.sol | 4 +- .../assets/rocket-eth/RethCollateral.sol | 4 +- .../stargate/StargatePoolFiatCollateral.sol | 2 +- .../yearnv2/YearnV2CurveFiatCollateral.sol | 2 +- .../plugins/mocks/BadCollateralPlugin.sol | 6 +- .../mocks/InvalidRefPerTokCollateral.sol | 41 ++++---- contracts/plugins/mocks/UnpricedPlugins.sol | 4 +- 26 files changed, 187 insertions(+), 174 deletions(-) diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 60e575cf71..012b7097f1 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -13,7 +13,7 @@ import "./OracleLib.sol"; * Collateral that may need revenue hiding to become truly "up only" * * For: {tok} != {ref}, {ref} != {target}, {target} == {UoA} - * Inheritors _must_ implement _underlyingRefPerTok() + * Inheritors _must_ implement underlyingRefPerTok() * Can be easily extended by (optionally) re-implementing: * - tryPrice() * - refPerTok() @@ -63,7 +63,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { pegPrice = chainlinkFeed.price(oracleTimeout); // {UoA/tok} = {target/ref} * {ref/tok} * {UoA/target} (1) - uint192 p = pegPrice.mul(_underlyingRefPerTok()); + uint192 p = pegPrice.mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -81,45 +81,49 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - assert(low == 0); + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); @@ -135,5 +139,5 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { /// Should update in inheritors /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual returns (uint192); + function underlyingRefPerTok() public view virtual returns (uint192); } diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index 60b0bd8329..de926c0a53 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -9,7 +9,7 @@ import { CollateralStatus } from "../../interfaces/IAsset.sol"; /** * @title L2LSDCollateral * @notice Base collateral plugin for LSDs on L2s. Inherited per collateral. - * @notice _underlyingRefPerTok uses a chainlink feed rather than direct contract calls. + * @notice underlyingRefPerTok uses a chainlink feed rather than direct contract calls. */ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; @@ -47,13 +47,13 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { // revenue hiding: do not DISABLE if drawdown is small // underlyingRefPerTok may fail call to chainlink oracle, need to catch - try this.getUnderlyingRefPerTok() returns (uint192 underlyingRefPerTok) { + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; @@ -98,12 +98,8 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { } } - function getUnderlyingRefPerTok() public view returns (uint192) { - return _underlyingRefPerTok(); - } - /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return exchangeRateChainlinkFeed.price(exchangeRateChainlinkTimeout); } } diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index ba1843351c..8aa9d87eb1 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -27,7 +27,7 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = StaticATokenV3LM(address(erc20)).rate(); // {ray ref/tok} return shiftl_toFix(rate, -27); // {ray -> wad} diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index 14e72a72ca..439a711831 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -48,7 +48,7 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rateInRAYs = IStaticAToken(address(erc20)).rate(); // {ray ref/tok} return shiftl_toFix(rateInRAYs, -27); } diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 59e921e774..a71da001da 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -64,11 +64,11 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return FIX_ONE.div(_safeWrap(IAnkrETH(address(erc20)).ratio()), FLOOR); } } diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 40eb3a9d6e..dc9ba50a55 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -63,11 +63,11 @@ contract CBEthCollateral is AppreciatingFiatCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(ICBEth(address(erc20)).exchangeRate()); } } diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index 4e98b7c3f2..a67366e06c 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -72,6 +72,6 @@ contract CBEthCollateralL2 is L2LSDCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index ce76a72635..9434ddada5 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -72,7 +72,7 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = cToken.exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; return shiftl_toFix(rate, shiftLeft); diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 3d7dcae18f..161fb0ccb6 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -53,7 +53,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( - _underlyingRefPerTok() + underlyingRefPerTok() ); uint192 err = p.mul(oracleError, CEIL); diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index 00218ec37e..34fdd32856 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -49,7 +49,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { ) { // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -83,7 +83,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = cToken.exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; return shiftl_toFix(rate, shiftLeft); diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 17d46dc908..7ea45ec6be 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -45,7 +45,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { IRewardable(address(erc20)).claimRewards(); } - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(cometDecimals)); } @@ -60,54 +60,58 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - int256 cometReserves = comet.getReserves(); - if (cometReserves < 0) { - markStatus(CollateralStatus.DISABLED); - } else if (uint256(cometReserves) < reservesThresholdIffy) { - markStatus(CollateralStatus.IFFY); - } else { - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - // untested: - // validated in other plugins, cost to test here is high - assert(low == 0); - } + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + int256 cometReserves = comet.getReserves(); + if (cometReserves < 0) { + markStatus(CollateralStatus.DISABLED); + } else if (uint256(cometReserves) < reservesThresholdIffy) { + markStatus(CollateralStatus.IFFY); + } else { + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); } - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index c59994fd56..d94c59a7a3 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -81,47 +81,51 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - // {UoA/tok}, {UoA/tok}, {UoA/tok} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - // untested: - // validated in other plugins, cost to test here is high - assert(low == 0); + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); @@ -139,7 +143,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { return _safeWrap(curvePool.get_virtual_price()); } diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index ad3cd6ac8e..b743021b65 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -116,7 +116,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(metapoolToken.get_virtual_price()); } diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 5401b2ad5f..5b06c26716 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -52,7 +52,7 @@ contract SDaiCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix(pot.chi(), -27); } } diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 3d973def9f..151aa9490f 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -62,7 +62,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { pegPrice = _safeWrap(IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle()); // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); high = p + err; @@ -71,7 +71,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(IsfrxEth(address(erc20)).pricePerShare()); } } diff --git a/contracts/plugins/assets/frax/SFraxCollateral.sol b/contracts/plugins/assets/frax/SFraxCollateral.sol index 863cd098fc..64e9a13297 100644 --- a/contracts/plugins/assets/frax/SFraxCollateral.sol +++ b/contracts/plugins/assets/frax/SFraxCollateral.sol @@ -34,7 +34,7 @@ contract SFraxCollateral is AppreciatingFiatCollateral { // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return divuu( IStakedFrax(address(erc20)).totalAssets(), diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 9267f40e76..32341ee1a8 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -59,7 +59,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { pegPrice = targetPerRefChainlinkFeed.price(targetPerRefChainlinkTimeout); // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); high = p + err; @@ -68,7 +68,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = IWSTETH(address(erc20)).stEthPerToken(); return _safeWrap(rate); } diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 248c24084c..96cb195a62 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -35,7 +35,7 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix( MorphoTokenisedDeposit(address(erc20)).convertToAssets(oneShare), diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 3f1fe73110..145711c890 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -52,7 +52,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( - _underlyingRefPerTok() + underlyingRefPerTok() ); uint192 err = p.mul(oracleError, CEIL); diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index e1f1ec17b3..d839931ee2 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -50,7 +50,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { ) { // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -61,7 +61,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals); } } diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index 97c58aaef4..a116c02842 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -62,11 +62,11 @@ contract RethCollateral is AppreciatingFiatCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(IReth(address(erc20)).getExchangeRate()); } } diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index d31d7b04df..b9b815ed48 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -27,7 +27,7 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { } /// @return _rate {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { uint256 _totalSupply = pool.totalSupply(); uint192 _rate = FIX_ONE; // 1:1 if pool has no tokens at all if (_totalSupply != 0) { diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index b9e73cf258..d3b0d1b836 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -93,7 +93,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { // {ref/tok} = {ref/LP token} * {LP token/tok} return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare(), FLOOR); } diff --git a/contracts/plugins/mocks/BadCollateralPlugin.sol b/contracts/plugins/mocks/BadCollateralPlugin.sol index 765d95892a..f68bb95ccf 100644 --- a/contracts/plugins/mocks/BadCollateralPlugin.sol +++ b/contracts/plugins/mocks/BadCollateralPlugin.sol @@ -32,13 +32,13 @@ contract BadCollateralPlugin is ATokenFiatCollateral { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); + uint192 underlyingRefPerTok_ = underlyingRefPerTok(); // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); // uint192(<) is equivalent to Fix.lt - if (checkHardDefault && underlyingRefPerTok < exposedReferencePrice) { + if (checkHardDefault && underlyingRefPerTok_ < exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; markStatus(CollateralStatus.DISABLED); } else if (!checkHardDefault || hiddenReferencePrice > exposedReferencePrice) { diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index a8a644df53..736f9f3ae8 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -26,27 +26,32 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { function refresh() public virtual override { CollateralStatus oldStatus = status(); - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - exposedReferencePrice = hiddenReferencePrice; - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if high price is finite - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + exposedReferencePrice = hiddenReferencePrice; + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if high price is finite + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); @@ -76,7 +81,7 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return rateMock; } } diff --git a/contracts/plugins/mocks/UnpricedPlugins.sol b/contracts/plugins/mocks/UnpricedPlugins.sol index f3d5808761..cc2841f2e6 100644 --- a/contracts/plugins/mocks/UnpricedPlugins.sol +++ b/contracts/plugins/mocks/UnpricedPlugins.sol @@ -85,7 +85,7 @@ contract UnpricedAppreciatingFiatCollateralMock is AppreciatingFiatCollateral { pegPrice = chainlinkFeed.price(oracleTimeout); // {UoA/tok} = {target/ref} * {ref/tok} * {UoA/target} (1) - uint192 p = pegPrice.mul(_underlyingRefPerTok()); + uint192 p = pegPrice.mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -94,7 +94,7 @@ contract UnpricedAppreciatingFiatCollateralMock is AppreciatingFiatCollateral { } /// Mock function, required but not used in tests - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return mockRefPerTok; } From 0cee805edbd16a4212a2dd1dc1297dd853def391 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Sun, 4 Feb 2024 18:56:18 -0500 Subject: [PATCH 191/450] test for CompoundV3 case --- contracts/plugins/mocks/CusdcV3WrapperMock.sol | 6 ++++++ .../compoundv3/CometTestSuite.test.ts | 13 ++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/contracts/plugins/mocks/CusdcV3WrapperMock.sol b/contracts/plugins/mocks/CusdcV3WrapperMock.sol index 844c9ef785..3e26d77725 100644 --- a/contracts/plugins/mocks/CusdcV3WrapperMock.sol +++ b/contracts/plugins/mocks/CusdcV3WrapperMock.sol @@ -13,6 +13,7 @@ contract CusdcV3WrapperMock { address internal mockTarget; mapping(bytes4 => bool) internal isMocking; uint256 internal mockExchangeRate_; + bool internal revertExchangeRate; constructor(address mockTarget_) { mockTarget = mockTarget_; @@ -23,7 +24,12 @@ contract CusdcV3WrapperMock { mockExchangeRate_ = mockValue; } + function setRevertExchangeRate(bool shouldRevert) external { + revertExchangeRate = shouldRevert; + } + function exchangeRate() public view returns (uint256) { + if (revertExchangeRate) revert("exchangeRate revert"); if (isMocking[this.exchangeRate.selector]) { return mockExchangeRate_; } else { diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 0aa72a386e..2da2bc8b2a 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -269,11 +269,6 @@ const reduceRefPerTok = async (ctx: CometCollateralFixtureContext, pctDecrease: await cometAsMock.setBaseSupplyIndex(bsi.sub(bsi.mul(pctDecrease).div(100))) await setCode(COMET_EXT, oldBytecode) - // const currentExchangeRate = await ctx.wcusdcV3.exchangeRate() - // await ctx.wcusdcV3Mock.setMockExchangeRate( - // true, - // currentExchangeRate.sub(currentExchangeRate.mul(pctDecrease).div(100)) - // ) } const increaseRefPerTok = async () => { @@ -383,6 +378,14 @@ const collateralSpecificStatusTests = () => { refPerTok = refPerTok.sub(refPerTok.div(100)) expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) + + it('should not brick refPerTok() even if _underlyingRefPerTok() reverts', async () => { + const { collateral, wcusdcV3Mock } = await deployCollateralCometMockContext({}) + await wcusdcV3Mock.setRevertExchangeRate(true) + await expect(collateral.refresh()).not.to.be.reverted + await expect(collateral.refPerTok()).not.to.be.reverted + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + }) } const beforeEachRewardsTest = async (ctx: CometCollateralFixtureContext) => { From b5cccdaaf39ff8219fbe3d73ab018017e7ab50b3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Sun, 4 Feb 2024 18:59:46 -0500 Subject: [PATCH 192/450] CHANGELOG --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79a29115b2..b6e0e23570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTra If this is the first upgrade to a >= 3.0.0 token, call `*.cacheComponents()` on all components. -For plugins, upgrade Stargate. +For plugins, upgrade all plugins that contain an appreciating asset (not FiatCollateral. AppreciatingFiatCollateral etc). ## Core Protocol Contracts @@ -38,6 +38,7 @@ New governance param added: `reweightable` - frax-eth: Add new `sFrxETH` plugin that leverages a curve EMA - stargate: Continue transfers of wrapper tokens if stargate rewards break +- All plugins with variable refPerTok(): do no revert refresh() when underlying protocol reverts ### Trading From 79c71b8369c4f46715f8461f4442d6b5e73634ec Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 5 Feb 2024 16:16:57 -0500 Subject: [PATCH 193/450] move DutchTradeRouter to mocks --- contracts/plugins/{trading => mocks}/DutchTradeRouter.sol | 2 -- docs/mev.md | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename contracts/plugins/{trading => mocks}/DutchTradeRouter.sol (96%) diff --git a/contracts/plugins/trading/DutchTradeRouter.sol b/contracts/plugins/mocks/DutchTradeRouter.sol similarity index 96% rename from contracts/plugins/trading/DutchTradeRouter.sol rename to contracts/plugins/mocks/DutchTradeRouter.sol index acc1b09186..287b2986d1 100644 --- a/contracts/plugins/trading/DutchTradeRouter.sol +++ b/contracts/plugins/mocks/DutchTradeRouter.sol @@ -8,8 +8,6 @@ import { IMain } from "../../interfaces/IMain.sol"; /** @title DutchTradeRouter * @notice Utility contract for placing bids on DutchTrade auctions - * @dev This contract is needed as end user wallets cannot call DutchTrade.bid directly anymore, - tests and UI need to be updated to use this contract */ contract DutchTradeRouter is IDutchTradeCallee { using SafeERC20 for IERC20; diff --git a/docs/mev.md b/docs/mev.md index 4ee944472f..399f4763d1 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -49,7 +49,7 @@ To participate, either: OR -(2) Call `bidWithCallback(bytes memory)` from a calling contract that adheres to the `IDutchTradeCallee` interface. It should contain a function `dutchTradeCallback(address buyToken,uint256 buyAmount,bytes calldata data) external;` that transfers `bidAmount` buy tokens. This method will be called by the `DutchTrade` as a callback after the trade has been resolved. See `DutchTradeRouter.sol` for an example. +(2) Call `bidWithCallback(bytes memory)` from a calling contract that adheres to the `IDutchTradeCallee` interface. It should contain a function `dutchTradeCallback(address buyToken,uint256 buyAmount,bytes calldata data) external;` that transfers `bidAmount` buy tokens. This method will be called by the `DutchTrade` as a callback after the trade has been resolved. See `plugins/mocks/DutchTradeRouter.sol` for an example. 1. Call `status()` view; the auction is ongoing if return value is 1 2. Call `lot()` to see the number of tokens being sold From 154021a70c49cecab520618d67ccf02a241dd011 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 6 Feb 2024 02:48:08 +0530 Subject: [PATCH 194/450] TRST-L-1: Stargate wrapper changes (#1055) --- .../stargate/StargateRewardableWrapper.sol | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 16136eff83..50b58dce39 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -48,14 +48,6 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { } function _claimAssetRewards() internal override { - try stakingContract.totalAllocPoint() returns (uint256 totalAllocPoint) { - if (totalAllocPoint == 0) { - return; - } - } catch { - return; - } - // `.deposit` call in a try/catch to prevent staking contract // this is because `_claimAssetRewards` is called on all movements // and we want to prevent external calls from bricking the contract @@ -65,25 +57,21 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { function _afterDeposit(uint256, address) internal override { uint256 underlyingBalance = underlying.balanceOf(address(this)); - try stakingContract.poolInfo(poolId) returns (IStargateLPStaking.PoolInfo memory poolInfo) { - if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { - pool.approve(address(stakingContract), underlyingBalance); - try stakingContract.deposit(poolId, underlyingBalance) {} catch {} - } - } catch {} + IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); + + if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { + pool.approve(address(stakingContract), underlyingBalance); + try stakingContract.deposit(poolId, underlyingBalance) {} catch {} + } } function _beforeWithdraw(uint256 _amount, address) internal override { - try stakingContract.poolInfo(poolId) returns (IStargateLPStaking.PoolInfo memory poolInfo) { - uint256 underlyingBalance = underlying.balanceOf(address(this)); + uint256 underlyingBalance = underlying.balanceOf(address(this)); - if (underlyingBalance < _amount) { - if (poolInfo.allocPoint != 0) { - try stakingContract.withdraw(poolId, _amount - underlyingBalance) {} catch {} - } else { - try stakingContract.emergencyWithdraw(poolId) {} catch {} - } + if (underlyingBalance < _amount) { + try stakingContract.withdraw(poolId, _amount - underlyingBalance) {} catch { + try stakingContract.emergencyWithdraw(poolId) {} catch {} } - } catch {} + } } } From 709769377b507b48c7378610f5074698489a3961 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 5 Feb 2024 16:16:57 -0500 Subject: [PATCH 195/450] move DutchTradeRouter to mocks --- contracts/plugins/{trading => mocks}/DutchTradeRouter.sol | 2 -- docs/mev.md | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) rename contracts/plugins/{trading => mocks}/DutchTradeRouter.sol (96%) diff --git a/contracts/plugins/trading/DutchTradeRouter.sol b/contracts/plugins/mocks/DutchTradeRouter.sol similarity index 96% rename from contracts/plugins/trading/DutchTradeRouter.sol rename to contracts/plugins/mocks/DutchTradeRouter.sol index acc1b09186..287b2986d1 100644 --- a/contracts/plugins/trading/DutchTradeRouter.sol +++ b/contracts/plugins/mocks/DutchTradeRouter.sol @@ -8,8 +8,6 @@ import { IMain } from "../../interfaces/IMain.sol"; /** @title DutchTradeRouter * @notice Utility contract for placing bids on DutchTrade auctions - * @dev This contract is needed as end user wallets cannot call DutchTrade.bid directly anymore, - tests and UI need to be updated to use this contract */ contract DutchTradeRouter is IDutchTradeCallee { using SafeERC20 for IERC20; diff --git a/docs/mev.md b/docs/mev.md index 4ee944472f..399f4763d1 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -49,7 +49,7 @@ To participate, either: OR -(2) Call `bidWithCallback(bytes memory)` from a calling contract that adheres to the `IDutchTradeCallee` interface. It should contain a function `dutchTradeCallback(address buyToken,uint256 buyAmount,bytes calldata data) external;` that transfers `bidAmount` buy tokens. This method will be called by the `DutchTrade` as a callback after the trade has been resolved. See `DutchTradeRouter.sol` for an example. +(2) Call `bidWithCallback(bytes memory)` from a calling contract that adheres to the `IDutchTradeCallee` interface. It should contain a function `dutchTradeCallback(address buyToken,uint256 buyAmount,bytes calldata data) external;` that transfers `bidAmount` buy tokens. This method will be called by the `DutchTrade` as a callback after the trade has been resolved. See `plugins/mocks/DutchTradeRouter.sol` for an example. 1. Call `status()` view; the auction is ongoing if return value is 1 2. Call `lot()` to see the number of tokens being sold From 7c4376d5c51a53dfa4e099351f0817a08acb30d3 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 6 Feb 2024 02:48:08 +0530 Subject: [PATCH 196/450] TRST-L-1: Stargate wrapper changes (#1055) --- .../stargate/StargateRewardableWrapper.sol | 34 ++++++------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 16136eff83..50b58dce39 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -48,14 +48,6 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { } function _claimAssetRewards() internal override { - try stakingContract.totalAllocPoint() returns (uint256 totalAllocPoint) { - if (totalAllocPoint == 0) { - return; - } - } catch { - return; - } - // `.deposit` call in a try/catch to prevent staking contract // this is because `_claimAssetRewards` is called on all movements // and we want to prevent external calls from bricking the contract @@ -65,25 +57,21 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { function _afterDeposit(uint256, address) internal override { uint256 underlyingBalance = underlying.balanceOf(address(this)); - try stakingContract.poolInfo(poolId) returns (IStargateLPStaking.PoolInfo memory poolInfo) { - if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { - pool.approve(address(stakingContract), underlyingBalance); - try stakingContract.deposit(poolId, underlyingBalance) {} catch {} - } - } catch {} + IStargateLPStaking.PoolInfo memory poolInfo = stakingContract.poolInfo(poolId); + + if (poolInfo.allocPoint != 0 && underlyingBalance != 0) { + pool.approve(address(stakingContract), underlyingBalance); + try stakingContract.deposit(poolId, underlyingBalance) {} catch {} + } } function _beforeWithdraw(uint256 _amount, address) internal override { - try stakingContract.poolInfo(poolId) returns (IStargateLPStaking.PoolInfo memory poolInfo) { - uint256 underlyingBalance = underlying.balanceOf(address(this)); + uint256 underlyingBalance = underlying.balanceOf(address(this)); - if (underlyingBalance < _amount) { - if (poolInfo.allocPoint != 0) { - try stakingContract.withdraw(poolId, _amount - underlyingBalance) {} catch {} - } else { - try stakingContract.emergencyWithdraw(poolId) {} catch {} - } + if (underlyingBalance < _amount) { + try stakingContract.withdraw(poolId, _amount - underlyingBalance) {} catch { + try stakingContract.emergencyWithdraw(poolId) {} catch {} } - } catch {} + } } } From cb20ac14e0baaa34f235421edca535d151ba411d Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 6 Feb 2024 22:46:12 +0530 Subject: [PATCH 197/450] TRST-QA-1: Quick Reentrance Check (#1058) --- .../mocks/DutchTradeCallbackReentrantTest.sol | 37 +++++++++++++++++++ test/Revenues.test.ts | 23 ++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol diff --git a/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol b/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol new file mode 100644 index 0000000000..ebf3707347 --- /dev/null +++ b/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol @@ -0,0 +1,37 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import { IDutchTradeCallee, TradeStatus, DutchTrade, ITrading } from "../trading/DutchTrade.sol"; + +import "hardhat/console.sol"; + +contract DutchTradeCallbackReentrantTest is IDutchTradeCallee { + using SafeERC20 for IERC20; + + DutchTrade private _currentTrade; + ITrading private _trader; + + function start(DutchTrade trade, ITrading trader) external { + _currentTrade = trade; + _trader = trader; + + trade.buy().transferFrom(msg.sender, address(this), trade.bidAmount(block.number)); + + trade.bidWithCallback(new bytes(0)); + } + + function dutchTradeCallback(address buyToken, uint256 buyAmount, bytes calldata) external { + require(msg.sender == address(_currentTrade), "Nope"); + + IERC20(buyToken).safeTransfer(msg.sender, buyAmount); + + console.log("canSettle", _currentTrade.canSettle()); + + _trader.settleTrade(_currentTrade.sell()); + + // _currentTrade.canSettle(); + // _currentTrade.settle(); + } +} diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 04dea5e3b9..43028e57f2 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -3754,6 +3754,29 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await trade.lot()).to.equal(amt) expect(await trade.sellAmount()).to.equal(amt.mul(bn('1e12'))) }) + + it('DutchTrade Reentrance Check', async () => { + const exploiter = await ( + await ethers.getContractFactory('DutchTradeCallbackReentrantTest') + ).deploy() + + await rToken.connect(addr1).approve(exploiter.address, constants.MaxUint256) + await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) + await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + const trade = await ethers.getContractAt( + 'DutchTrade', + await rTokenTrader.trades(token0.address) + ) + await rToken.connect(addr1).approve(trade.address, constants.MaxUint256) + await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted + + // Snipe auction at 0s left + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + + // Run it down + await expect(exploiter.connect(addr1).start(trade.address, rTokenTrader.address)).to.be + .reverted + }) }) }) From ffb8489a3dd69340dfea30d487c737dc94cc42ea Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 6 Feb 2024 13:49:11 -0500 Subject: [PATCH 198/450] TRST-L-3: try-catch underlyingRefPerTok (#1056) --- CHANGELOG.md | 3 +- .../assets/AppreciatingFiatCollateral.sol | 74 ++++++++------- contracts/plugins/assets/L2LSDCollateral.sol | 16 ++-- .../assets/aave-v3/AaveV3FiatCollateral.sol | 2 +- .../assets/aave/ATokenFiatCollateral.sol | 2 +- .../assets/ankr/AnkrStakedEthCollateral.sol | 4 +- .../plugins/assets/cbeth/CBETHCollateral.sol | 4 +- .../assets/cbeth/CBETHCollateralL2.sol | 2 +- .../compoundv2/CTokenFiatCollateral.sol | 2 +- .../compoundv2/CTokenNonFiatCollateral.sol | 2 +- .../CTokenSelfReferentialCollateral.sol | 4 +- .../assets/compoundv3/CTokenV3Collateral.sol | 94 ++++++++++--------- .../assets/curve/CurveStableCollateral.sol | 74 ++++++++------- .../curve/CurveStableMetapoolCollateral.sol | 2 +- .../plugins/assets/dsr/SDaiCollateral.sol | 2 +- .../assets/frax-eth/SFraxEthCollateral.sol | 4 +- .../plugins/assets/frax/SFraxCollateral.sol | 2 +- .../assets/lido/LidoStakedEthCollateral.sol | 4 +- .../morpho-aave/MorphoFiatCollateral.sol | 2 +- .../morpho-aave/MorphoNonFiatCollateral.sol | 2 +- .../MorphoSelfReferentialCollateral.sol | 4 +- .../assets/rocket-eth/RethCollateral.sol | 4 +- .../stargate/StargatePoolFiatCollateral.sol | 2 +- .../yearnv2/YearnV2CurveFiatCollateral.sol | 2 +- .../plugins/mocks/BadCollateralPlugin.sol | 6 +- .../plugins/mocks/CusdcV3WrapperMock.sol | 6 ++ .../mocks/InvalidRefPerTokCollateral.sol | 41 ++++---- contracts/plugins/mocks/UnpricedPlugins.sol | 4 +- .../compoundv3/CometTestSuite.test.ts | 13 ++- 29 files changed, 203 insertions(+), 180 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 79a29115b2..b6e0e23570 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTra If this is the first upgrade to a >= 3.0.0 token, call `*.cacheComponents()` on all components. -For plugins, upgrade Stargate. +For plugins, upgrade all plugins that contain an appreciating asset (not FiatCollateral. AppreciatingFiatCollateral etc). ## Core Protocol Contracts @@ -38,6 +38,7 @@ New governance param added: `reweightable` - frax-eth: Add new `sFrxETH` plugin that leverages a curve EMA - stargate: Continue transfers of wrapper tokens if stargate rewards break +- All plugins with variable refPerTok(): do no revert refresh() when underlying protocol reverts ### Trading diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 60e575cf71..012b7097f1 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -13,7 +13,7 @@ import "./OracleLib.sol"; * Collateral that may need revenue hiding to become truly "up only" * * For: {tok} != {ref}, {ref} != {target}, {target} == {UoA} - * Inheritors _must_ implement _underlyingRefPerTok() + * Inheritors _must_ implement underlyingRefPerTok() * Can be easily extended by (optionally) re-implementing: * - tryPrice() * - refPerTok() @@ -63,7 +63,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { pegPrice = chainlinkFeed.price(oracleTimeout); // {UoA/tok} = {target/ref} * {ref/tok} * {UoA/target} (1) - uint192 p = pegPrice.mul(_underlyingRefPerTok()); + uint192 p = pegPrice.mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -81,45 +81,49 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - assert(low == 0); + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); @@ -135,5 +139,5 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { /// Should update in inheritors /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual returns (uint192); + function underlyingRefPerTok() public view virtual returns (uint192); } diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index 60b0bd8329..de926c0a53 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -9,7 +9,7 @@ import { CollateralStatus } from "../../interfaces/IAsset.sol"; /** * @title L2LSDCollateral * @notice Base collateral plugin for LSDs on L2s. Inherited per collateral. - * @notice _underlyingRefPerTok uses a chainlink feed rather than direct contract calls. + * @notice underlyingRefPerTok uses a chainlink feed rather than direct contract calls. */ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; @@ -47,13 +47,13 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { // revenue hiding: do not DISABLE if drawdown is small // underlyingRefPerTok may fail call to chainlink oracle, need to catch - try this.getUnderlyingRefPerTok() returns (uint192 underlyingRefPerTok) { + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; @@ -98,12 +98,8 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { } } - function getUnderlyingRefPerTok() public view returns (uint192) { - return _underlyingRefPerTok(); - } - /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return exchangeRateChainlinkFeed.price(exchangeRateChainlinkTimeout); } } diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index ba1843351c..8aa9d87eb1 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -27,7 +27,7 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = StaticATokenV3LM(address(erc20)).rate(); // {ray ref/tok} return shiftl_toFix(rate, -27); // {ray -> wad} diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index 14e72a72ca..439a711831 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -48,7 +48,7 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rateInRAYs = IStaticAToken(address(erc20)).rate(); // {ray ref/tok} return shiftl_toFix(rateInRAYs, -27); } diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 59e921e774..a71da001da 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -64,11 +64,11 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return FIX_ONE.div(_safeWrap(IAnkrETH(address(erc20)).ratio()), FLOOR); } } diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 40eb3a9d6e..dc9ba50a55 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -63,11 +63,11 @@ contract CBEthCollateral is AppreciatingFiatCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(ICBEth(address(erc20)).exchangeRate()); } } diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index 4e98b7c3f2..a67366e06c 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -72,6 +72,6 @@ contract CBEthCollateralL2 is L2LSDCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index ce76a72635..9434ddada5 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -72,7 +72,7 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = cToken.exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; return shiftl_toFix(rate, shiftLeft); diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 3d7dcae18f..161fb0ccb6 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -53,7 +53,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( - _underlyingRefPerTok() + underlyingRefPerTok() ); uint192 err = p.mul(oracleError, CEIL); diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index 00218ec37e..34fdd32856 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -49,7 +49,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { ) { // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -83,7 +83,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = cToken.exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; return shiftl_toFix(rate, shiftLeft); diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 17d46dc908..7ea45ec6be 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -45,7 +45,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { IRewardable(address(erc20)).claimRewards(); } - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(cometDecimals)); } @@ -60,54 +60,58 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - int256 cometReserves = comet.getReserves(); - if (cometReserves < 0) { - markStatus(CollateralStatus.DISABLED); - } else if (uint256(cometReserves) < reservesThresholdIffy) { - markStatus(CollateralStatus.IFFY); - } else { - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - // untested: - // validated in other plugins, cost to test here is high - assert(low == 0); - } + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + int256 cometReserves = comet.getReserves(); + if (cometReserves < 0) { + markStatus(CollateralStatus.DISABLED); + } else if (uint256(cometReserves) < reservesThresholdIffy) { + markStatus(CollateralStatus.IFFY); + } else { + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); } - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index c59994fd56..d94c59a7a3 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -81,47 +81,51 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - // {UoA/tok}, {UoA/tok}, {UoA/tok} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - // untested: - // validated in other plugins, cost to test here is high - assert(low == 0); + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); @@ -139,7 +143,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { return _safeWrap(curvePool.get_virtual_price()); } diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index ad3cd6ac8e..b743021b65 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -116,7 +116,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(metapoolToken.get_virtual_price()); } diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 5401b2ad5f..5b06c26716 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -52,7 +52,7 @@ contract SDaiCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix(pot.chi(), -27); } } diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 3d973def9f..151aa9490f 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -62,7 +62,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { pegPrice = _safeWrap(IEmaPriceOracleStableSwap(CURVE_POOL_EMA_PRICE_ORACLE).price_oracle()); // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); high = p + err; @@ -71,7 +71,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(IsfrxEth(address(erc20)).pricePerShare()); } } diff --git a/contracts/plugins/assets/frax/SFraxCollateral.sol b/contracts/plugins/assets/frax/SFraxCollateral.sol index 863cd098fc..64e9a13297 100644 --- a/contracts/plugins/assets/frax/SFraxCollateral.sol +++ b/contracts/plugins/assets/frax/SFraxCollateral.sol @@ -34,7 +34,7 @@ contract SFraxCollateral is AppreciatingFiatCollateral { // solhint-enable no-empty-blocks /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return divuu( IStakedFrax(address(erc20)).totalAssets(), diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 9267f40e76..32341ee1a8 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -59,7 +59,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { pegPrice = targetPerRefChainlinkFeed.price(targetPerRefChainlinkTimeout); // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); high = p + err; @@ -68,7 +68,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = IWSTETH(address(erc20)).stEthPerToken(); return _safeWrap(rate); } diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 248c24084c..96cb195a62 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -35,7 +35,7 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix( MorphoTokenisedDeposit(address(erc20)).convertToAssets(oneShare), diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 3f1fe73110..145711c890 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -52,7 +52,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( - _underlyingRefPerTok() + underlyingRefPerTok() ); uint192 err = p.mul(oracleError, CEIL); diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index e1f1ec17b3..d839931ee2 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -50,7 +50,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { ) { // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(_underlyingRefPerTok()); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -61,7 +61,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals); } } diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index 97c58aaef4..a116c02842 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -62,11 +62,11 @@ contract RethCollateral is AppreciatingFiatCollateral { // assert(low <= high); obviously true just by inspection // {target/ref} = {target/tok} / {ref/tok} - pegPrice = targetPerTok.div(_underlyingRefPerTok()); + pegPrice = targetPerTok.div(underlyingRefPerTok()); } /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return _safeWrap(IReth(address(erc20)).getExchangeRate()); } } diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index d31d7b04df..b9b815ed48 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -27,7 +27,7 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { } /// @return _rate {ref/tok} Quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { uint256 _totalSupply = pool.totalSupply(); uint192 _rate = FIX_ONE; // 1:1 if pool has no tokens at all if (_totalSupply != 0) { diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index b9e73cf258..d3b0d1b836 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -93,7 +93,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { // === Internal === /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view virtual override returns (uint192) { + function underlyingRefPerTok() public view virtual override returns (uint192) { // {ref/tok} = {ref/LP token} * {LP token/tok} return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare(), FLOOR); } diff --git a/contracts/plugins/mocks/BadCollateralPlugin.sol b/contracts/plugins/mocks/BadCollateralPlugin.sol index 765d95892a..f68bb95ccf 100644 --- a/contracts/plugins/mocks/BadCollateralPlugin.sol +++ b/contracts/plugins/mocks/BadCollateralPlugin.sol @@ -32,13 +32,13 @@ contract BadCollateralPlugin is ATokenFiatCollateral { // must happen before tryPrice() call since `refPerTok()` returns a stored value // revenue hiding: do not DISABLE if drawdown is small - uint192 underlyingRefPerTok = _underlyingRefPerTok(); + uint192 underlyingRefPerTok_ = underlyingRefPerTok(); // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); // uint192(<) is equivalent to Fix.lt - if (checkHardDefault && underlyingRefPerTok < exposedReferencePrice) { + if (checkHardDefault && underlyingRefPerTok_ < exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; markStatus(CollateralStatus.DISABLED); } else if (!checkHardDefault || hiddenReferencePrice > exposedReferencePrice) { diff --git a/contracts/plugins/mocks/CusdcV3WrapperMock.sol b/contracts/plugins/mocks/CusdcV3WrapperMock.sol index 844c9ef785..3e26d77725 100644 --- a/contracts/plugins/mocks/CusdcV3WrapperMock.sol +++ b/contracts/plugins/mocks/CusdcV3WrapperMock.sol @@ -13,6 +13,7 @@ contract CusdcV3WrapperMock { address internal mockTarget; mapping(bytes4 => bool) internal isMocking; uint256 internal mockExchangeRate_; + bool internal revertExchangeRate; constructor(address mockTarget_) { mockTarget = mockTarget_; @@ -23,7 +24,12 @@ contract CusdcV3WrapperMock { mockExchangeRate_ = mockValue; } + function setRevertExchangeRate(bool shouldRevert) external { + revertExchangeRate = shouldRevert; + } + function exchangeRate() public view returns (uint256) { + if (revertExchangeRate) revert("exchangeRate revert"); if (isMocking[this.exchangeRate.selector]) { return mockExchangeRate_; } else { diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index a8a644df53..736f9f3ae8 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -26,27 +26,32 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { function refresh() public virtual override { CollateralStatus oldStatus = status(); - uint192 underlyingRefPerTok = _underlyingRefPerTok(); - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = underlyingRefPerTok.mul(revenueShowing); - - exposedReferencePrice = hiddenReferencePrice; - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if high price is finite - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + exposedReferencePrice = hiddenReferencePrice; + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if high price is finite + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); + markStatus(CollateralStatus.DISABLED); } CollateralStatus newStatus = status(); @@ -76,7 +81,7 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return rateMock; } } diff --git a/contracts/plugins/mocks/UnpricedPlugins.sol b/contracts/plugins/mocks/UnpricedPlugins.sol index f3d5808761..cc2841f2e6 100644 --- a/contracts/plugins/mocks/UnpricedPlugins.sol +++ b/contracts/plugins/mocks/UnpricedPlugins.sol @@ -85,7 +85,7 @@ contract UnpricedAppreciatingFiatCollateralMock is AppreciatingFiatCollateral { pegPrice = chainlinkFeed.price(oracleTimeout); // {UoA/tok} = {target/ref} * {ref/tok} * {UoA/target} (1) - uint192 p = pegPrice.mul(_underlyingRefPerTok()); + uint192 p = pegPrice.mul(underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); low = p - err; @@ -94,7 +94,7 @@ contract UnpricedAppreciatingFiatCollateralMock is AppreciatingFiatCollateral { } /// Mock function, required but not used in tests - function _underlyingRefPerTok() internal view override returns (uint192) { + function underlyingRefPerTok() public view override returns (uint192) { return mockRefPerTok; } diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 0aa72a386e..2da2bc8b2a 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -269,11 +269,6 @@ const reduceRefPerTok = async (ctx: CometCollateralFixtureContext, pctDecrease: await cometAsMock.setBaseSupplyIndex(bsi.sub(bsi.mul(pctDecrease).div(100))) await setCode(COMET_EXT, oldBytecode) - // const currentExchangeRate = await ctx.wcusdcV3.exchangeRate() - // await ctx.wcusdcV3Mock.setMockExchangeRate( - // true, - // currentExchangeRate.sub(currentExchangeRate.mul(pctDecrease).div(100)) - // ) } const increaseRefPerTok = async () => { @@ -383,6 +378,14 @@ const collateralSpecificStatusTests = () => { refPerTok = refPerTok.sub(refPerTok.div(100)) expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) + + it('should not brick refPerTok() even if _underlyingRefPerTok() reverts', async () => { + const { collateral, wcusdcV3Mock } = await deployCollateralCometMockContext({}) + await wcusdcV3Mock.setRevertExchangeRate(true) + await expect(collateral.refresh()).not.to.be.reverted + await expect(collateral.refPerTok()).not.to.be.reverted + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + }) } const beforeEachRewardsTest = async (ctx: CometCollateralFixtureContext) => { From af68499e3e06fc96e7cedf2ca10f644a7f74e672 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 6 Feb 2024 14:01:29 -0500 Subject: [PATCH 199/450] 3.1.0 (#950) Co-authored-by: pmckelvy1 Co-authored-by: Julian R <56316686+julianmrodri@users.noreply.github.com> Co-authored-by: Akshat Mittal Co-authored-by: Jan --- .github/workflows/tests.yml | 28 + .openzeppelin/base_8453.json | 184 +++ .openzeppelin/mainnet.json | 200 ++- CHANGELOG.md | 102 +- README.md | 1 + common/configuration.ts | 10 +- common/numbers.ts | 4 +- contracts/facade/FacadeAct.sol | 6 +- contracts/facade/FacadeMonitor.sol | 211 +++ contracts/facade/FacadeRead.sol | 31 +- contracts/facade/FacadeTest.sol | 4 +- contracts/interfaces/IAsset.sol | 10 +- contracts/interfaces/IAssetRegistry.sol | 2 +- contracts/interfaces/IBackingManager.sol | 37 + contracts/interfaces/IBasketHandler.sol | 2 + contracts/interfaces/IBroker.sol | 2 +- contracts/interfaces/IFacadeMonitor.sol | 49 + contracts/interfaces/IFacadeRead.sol | 13 +- contracts/interfaces/ITrade.sol | 3 + contracts/mixins/Versioned.sol | 2 +- contracts/p0/BackingManager.sol | 54 +- contracts/p0/BasketHandler.sol | 5 +- contracts/p0/Broker.sol | 13 +- contracts/p0/Distributor.sol | 22 +- contracts/p0/Furnace.sol | 12 +- contracts/p0/Main.sol | 3 +- contracts/p0/RevenueTrader.sol | 26 +- contracts/p0/StRSR.sol | 17 +- contracts/p0/mixins/TradingLib.sol | 77 +- contracts/p1/AssetRegistry.sol | 2 + contracts/p1/BackingManager.sol | 68 +- contracts/p1/BasketHandler.sol | 7 +- contracts/p1/Broker.sol | 33 +- contracts/p1/Distributor.sol | 31 +- contracts/p1/Furnace.sol | 12 +- contracts/p1/Main.sol | 3 +- contracts/p1/RToken.sol | 5 - contracts/p1/RevenueTrader.sol | 23 +- contracts/p1/StRSR.sol | 13 +- .../p1/mixins/RecollateralizationLib.sol | 189 +-- contracts/p1/mixins/TradeLib.sol | 2 +- contracts/p1/mixins/Trading.sol | 4 +- .../assets/AppreciatingFiatCollateral.sol | 2 +- contracts/plugins/assets/Asset.sol | 85 +- .../plugins/assets/EURFiatCollateral.sol | 2 + contracts/plugins/assets/FiatCollateral.sol | 6 +- contracts/plugins/assets/L2LSDCollateral.sol | 3 +- .../plugins/assets/NonFiatCollateral.sol | 2 + contracts/plugins/assets/RTokenAsset.sol | 78 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- .../assets/aave-v3/AaveV3FiatCollateral.sol | 4 +- .../assets/aave/ATokenFiatCollateral.sol | 4 +- .../assets/ankr/AnkrStakedEthCollateral.sol | 1 + .../plugins/assets/cbeth/CBETHCollateral.sol | 1 + .../assets/cbeth/CBETHCollateralL2.sol | 1 + contracts/plugins/assets/cbeth/README.md | 1 + .../compoundv2/CTokenFiatCollateral.sol | 2 + .../compoundv2/CTokenNonFiatCollateral.sol | 1 + .../assets/compoundv2/CTokenWrapper.sol | 4 +- .../plugins/assets/compoundv2/ICToken.sol | 18 +- .../assets/compoundv3/CTokenV3Collateral.sol | 13 +- .../assets/compoundv3/CusdcV3Wrapper.sol | 9 +- .../assets/compoundv3/ICusdcV3Wrapper.sol | 2 +- .../assets/compoundv3/WrappedERC20.sol | 7 + .../compoundv3/vendor/CometExtInterface.sol | 8 + .../assets/curve/CurveStableCollateral.sol | 2 +- .../curve/CurveStableMetapoolCollateral.sol | 3 + .../CurveStableRTokenMetapoolCollateral.sol | 5 + .../assets/curve/crv/CurveGaugeWrapper.sol | 11 + .../curve/cvx/vendor/ConvexStakingWrapper.sol | 190 +-- .../plugins/assets/dsr/SDaiCollateral.sol | 1 + .../plugins/assets/erc20/RewardableERC20.sol | 44 +- .../assets/erc20/RewardableERC20Wrapper.sol | 4 + .../assets/erc20/RewardableERC4626Vault.sol | 4 +- contracts/plugins/assets/frax-eth/README.md | 2 +- .../assets/frax-eth/SFraxEthCollateral.sol | 14 +- .../assets/lido/LidoStakedEthCollateral.sol | 2 + .../MorphoAaveV2TokenisedDeposit.sol | 4 +- .../morpho-aave/MorphoFiatCollateral.sol | 1 + .../morpho-aave/MorphoNonFiatCollateral.sol | 13 +- .../morpho-aave/MorphoTokenisedDeposit.sol | 65 +- .../assets/rocket-eth/RethCollateral.sol | 1 + .../stargate/StargatePoolFiatCollateral.sol | 1 + .../yearnv2/YearnV2CurveFiatCollateral.sol | 41 +- contracts/plugins/governance/Governance.sol | 23 +- contracts/plugins/mocks/AssetMock.sol | 11 +- contracts/plugins/mocks/CTokenWrapperMock.sol | 4 +- contracts/plugins/mocks/ComptrollerMock.sol | 13 +- .../plugins/mocks/RevenueTraderBackComp.sol | 4 +- .../mocks/upgrades/FacadeMonitorV2.sol | 23 + contracts/plugins/trading/GnosisTrade.sol | 12 +- docs/collateral.md | 24 +- docs/deployed-addresses/1-FacadeMonitor.md | 7 + docs/deployed-addresses/8453-FacadeMonitor.md | 8 + docs/deployment.md | 2 +- docs/exhaustive-tests.md | 10 +- docs/monitoring.md | 35 + docs/pause-freeze-states.md | 73 + docs/recollateralization.md | 16 +- .../addresses/84531-RTKN-tmp-deployments.json | 19 + scripts/confirmation/1_confirm_assets.ts | 39 +- scripts/deploy.ts | 2 + .../phase1-common/1_deploy_libraries.ts | 14 +- .../phase1-common/3_deploy_rsrAsset.ts | 4 +- .../phase2-assets/1_deploy_assets.ts | 6 +- .../phase2-assets/2_deploy_collateral.ts | 280 +++- .../phase2-assets/assets/deploy_crv.ts | 4 +- .../phase2-assets/assets/deploy_cvx.ts | 4 +- .../collaterals/deploy_aave_v3_usdbc.ts | 4 +- .../collaterals/deploy_aave_v3_usdc.ts | 6 +- .../collaterals/deploy_cbeth_collateral.ts | 12 +- .../deploy_compound_v2_collateral.ts | 18 +- .../deploy_convex_rToken_metapool_plugin.ts | 14 +- .../deploy_convex_stable_metapool_plugin.ts | 13 +- .../deploy_convex_stable_plugin.ts | 15 +- .../deploy_convex_volatile_plugin.ts | 142 -- .../deploy_ctokenv3_usdbc_collateral.ts | 6 +- .../deploy_ctokenv3_usdc_collateral.ts | 6 +- .../deploy_curve_rToken_metapool_plugin.ts | 9 +- .../deploy_curve_stable_metapool_plugin.ts | 8 +- .../collaterals/deploy_curve_stable_plugin.ts | 10 +- .../deploy_curve_volatile_plugin.ts | 142 -- .../collaterals/deploy_dsr_sdai.ts | 6 +- .../deploy_flux_finance_collateral.ts | 10 +- .../deploy_lido_wsteth_collateral.ts | 6 +- .../deploy_morpho_aavev2_plugin.ts | 30 +- .../deploy_rocket_pool_reth_collateral.ts | 6 +- .../phase2-assets/collaterals/deploy_sfrax.ts | 4 +- .../deploy_stargate_usdc_collateral.ts | 19 +- .../deploy_stargate_usdt_collateral.ts | 4 +- .../collaterals/deploy_yearn_v2_curve_usdc.ts | 104 ++ .../collaterals/deploy_yearn_v2_curve_usdp.ts | 104 ++ scripts/deployment/utils.ts | 9 +- scripts/exhaustive-tests/run-1.sh | 4 +- scripts/verification/6_verify_collateral.ts | 34 +- .../verify_aave_v3_usdbc.ts | 4 +- .../collateral-plugins/verify_aave_v3_usdc.ts | 6 +- .../collateral-plugins/verify_cbeth.ts | 12 +- .../verify_convex_stable.ts | 22 +- .../verify_convex_stable_metapool.ts | 8 +- .../verify_convex_stable_rtoken_metapool.ts | 9 +- .../verify_convex_volatile.ts | 98 -- .../collateral-plugins/verify_curve_stable.ts | 10 +- .../verify_curve_stable_metapool.ts | 8 +- .../verify_curve_stable_rtoken_metapool.ts | 9 +- .../verify_curve_volatile.ts | 98 -- .../collateral-plugins/verify_cusdbcv3.ts | 6 +- .../collateral-plugins/verify_cusdcv3.ts | 6 +- .../collateral-plugins/verify_morpho.ts | 16 +- .../collateral-plugins/verify_reth.ts | 6 +- .../collateral-plugins/verify_sdai.ts | 2 +- .../collateral-plugins/verify_wsteth.ts | 6 +- .../verify_yearn_v2_curve_usdc.ts | 73 + scripts/verify_etherscan.ts | 2 + tasks/deployment/deploy-facade-monitor.ts | 107 ++ tasks/index.ts | 1 + test/Broker.test.ts | 85 +- test/Facade.test.ts | 573 +++++-- test/FacadeWrite.test.ts | 4 +- test/Furnace.test.ts | 49 +- test/Governance.test.ts | 172 +- test/Main.test.ts | 84 +- test/RTokenExtremes.test.ts | 5 +- test/Recollateralization.test.ts | 127 +- test/Revenues.test.ts | 807 +++++++++- test/ZZStRSR.test.ts | 21 +- test/__snapshots__/Broker.test.ts.snap | 16 +- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Furnace.test.ts.snap | 34 +- test/__snapshots__/Main.test.ts.snap | 12 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 18 +- test/__snapshots__/Revenues.test.ts.snap | 26 +- test/__snapshots__/ZZStRSR.test.ts.snap | 6 +- test/fixtures.ts | 61 +- test/integration/AssetPlugins.test.ts | 211 ++- test/integration/EasyAuction.test.ts | 7 +- .../__snapshots__/CTokenVaultGas.test.ts.snap | 25 - test/integration/fixtures.ts | 55 +- test/integration/fork-block-numbers.ts | 1 + test/monitor/FacadeMonitor.test.ts | 1417 +++++++++++++++++ test/plugins/Asset.test.ts | 369 +++-- test/plugins/Collateral.test.ts | 591 +++++-- test/plugins/RewardableERC20.test.ts | 280 +++- .../__snapshots__/Collateral.test.ts.snap | 8 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 5 + .../AaveV3FiatCollateral.test.ts.snap | 24 +- .../aave/ATokenFiatCollateral.test.ts | 72 +- .../ATokenFiatCollateral.test.ts.snap | 24 +- .../ankr/AnkrEthCollateralTestSuite.test.ts | 5 + .../AnkrEthCollateralTestSuite.test.ts.snap | 24 +- .../cbeth/CBETHCollateral.test.ts | 6 + .../cbeth/CBETHCollateralL2.test.ts | 1 + .../CBETHCollateral.test.ts.snap | 24 +- .../individual-collateral/collateralTests.ts | 510 +++++- .../compoundv2/CTokenFiatCollateral.test.ts | 70 +- .../CTokenFiatCollateral.test.ts.snap | 24 +- .../compoundv3/CometTestSuite.test.ts | 14 + .../compoundv3/CusdcV3Wrapper.test.ts | 71 +- .../__snapshots__/CometTestSuite.test.ts.snap | 24 +- .../curve/collateralTests.ts | 487 +++++- .../CrvStableRTokenMetapoolTestSuite.test.ts | 51 +- .../CrvStableMetapoolSuite.test.ts.snap | 24 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +- .../CrvStableTestSuite.test.ts.snap | 24 +- .../CvxStableRTokenMetapoolTestSuite.test.ts | 51 +- .../curve/cvx/CvxStableTestSuite.test.ts | 49 - .../CvxStableMetapoolSuite.test.ts.snap | 24 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +- .../CvxStableTestSuite.test.ts.snap | 24 +- .../curve/cvx/helpers.ts | 40 +- .../dsr/SDaiCollateralTestSuite.test.ts | 8 +- .../SDaiCollateralTestSuite.test.ts.snap | 24 +- .../plugins/individual-collateral/fixtures.ts | 13 +- .../flux-finance/FTokenFiatCollateral.test.ts | 5 + .../FTokenFiatCollateral.test.ts.snap | 96 +- .../frax-eth/SFrxEthTestSuite.test.ts | 24 +- .../SFrxEthTestSuite.test.ts.snap | 12 +- .../frax/SFraxCollateralTestSuite.test.ts | 1 + .../lido/LidoStakedEthTestSuite.test.ts | 7 + .../LidoStakedEthTestSuite.test.ts.snap | 24 +- .../MorphoAAVEFiatCollateral.test.ts | 158 +- .../MorphoAAVENonFiatCollateral.test.ts | 58 +- ...orphoAAVESelfReferentialCollateral.test.ts | 7 +- .../MorphoAaveV2TokenisedDeposit.test.ts | 176 +- .../MorphoAAVEFiatCollateral.test.ts.snap | 84 +- .../MorphoAAVENonFiatCollateral.test.ts.snap | 48 +- ...AAVESelfReferentialCollateral.test.ts.snap | 16 +- .../individual-collateral/pluginTestTypes.ts | 3 + .../RethCollateralTestSuite.test.ts | 7 + .../RethCollateralTestSuite.test.ts.snap | 24 +- .../stargate/StargateUSDCTestSuite.test.ts | 1 + .../StargateETHTestSuite.test.ts.snap | 57 - .../StargateUSDCTestSuite.test.ts.snap | 29 + .../YearnV2CurveFiatCollateral.test.ts | 4 +- .../yearnv2/constants.ts | 2 + test/scenario/BadCollateralPlugin.test.ts | 4 +- test/scenario/ComplexBasket.test.ts | 34 +- test/scenario/MaxBasketSize.test.ts | 8 +- test/scenario/NestedRTokens.test.ts | 4 +- test/scenario/NontrivialPeg.test.ts | 6 +- test/scenario/RevenueHiding.test.ts | 4 +- test/scenario/SetProtocol.test.ts | 8 +- .../__snapshots__/MaxBasketSize.test.ts.snap | 18 +- test/utils/oracles.ts | 16 + test/utils/trades.ts | 25 +- 246 files changed, 8913 insertions(+), 2971 deletions(-) create mode 100644 contracts/facade/FacadeMonitor.sol create mode 100644 contracts/interfaces/IFacadeMonitor.sol create mode 100644 contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol create mode 100644 docs/deployed-addresses/1-FacadeMonitor.md create mode 100644 docs/deployed-addresses/8453-FacadeMonitor.md create mode 100644 docs/monitoring.md create mode 100644 docs/pause-freeze-states.md create mode 100644 scripts/addresses/84531-RTKN-tmp-deployments.json delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts delete mode 100644 scripts/verification/collateral-plugins/verify_convex_volatile.ts delete mode 100644 scripts/verification/collateral-plugins/verify_curve_volatile.ts create mode 100644 scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts create mode 100644 tasks/deployment/deploy-facade-monitor.ts delete mode 100644 test/integration/__snapshots__/CTokenVaultGas.test.ts.snap create mode 100644 test/monitor/FacadeMonitor.test.ts delete mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap create mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b553d57d7..3bd5b1a460 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -187,6 +187,34 @@ jobs: TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet + + monitor-tests: + name: 'Monitor Tests (Mainnet)' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - name: 'Cache hardhat network fork' + uses: actions/cache@v3 + with: + path: cache/hardhat-network-fork + key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} + restore-keys: | + hardhat-network-fork-${{ runner.os }}- + hardhat-network-fork- + - run: npx hardhat test ./test/monitor/*.test.ts + env: + NODE_OPTIONS: '--max-old-space-size=8192' + TS_NODE_SKIP_IGNORE: true + MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet + FORK: 1 + PROTO_IMPL: 1 + slither: name: 'Slither' runs-on: ubuntu-latest diff --git a/.openzeppelin/base_8453.json b/.openzeppelin/base_8453.json index 6c4c4a3671..0d90ea97cb 100644 --- a/.openzeppelin/base_8453.json +++ b/.openzeppelin/base_8453.json @@ -3144,6 +3144,190 @@ } } } + }, + "83264eb95f2f9ab0055f3cdf3d195b52003b35099a624ee29920f6a83be6b884": { + "address": "0xD45a441F334f6f27CDDA3728414FD26Cc5798E66", + "txHash": "0xcce3cfb75dad5e947efeab8a30cd981ca578d96f7a8bee1512a86b2849a0fa24", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "07b40b651527d3b3c3f0d1fb77a991853411f5b7fd564a45478bb03e177adcae": { + "address": "0x69c20aD99eb1054cd7Da2809572205186975dA17", + "txHash": "0x05c19fbc6774d5e85aadba888cc56e0764a104c1da7e3fa9f0774dfba8a46215", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index 8ae5721830..d0dae943ca 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -3747,10 +3747,7 @@ }, "t_enum(TradeKind)25002": { "label": "enum TradeKind", - "members": [ - "DUTCH_AUCTION", - "BATCH_AUCTION" - ], + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { @@ -4043,11 +4040,7 @@ }, "t_enum(CollateralStatus)24460": { "label": "enum CollateralStatus", - "members": [ - "SOUND", - "IFFY", - "DISABLED" - ], + "members": ["SOUND", "IFFY", "DISABLED"], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -6340,10 +6333,7 @@ }, "t_enum(TradeKind)17751": { "label": "enum TradeKind", - "members": [ - "DUTCH_AUCTION", - "BATCH_AUCTION" - ], + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { @@ -6652,6 +6642,190 @@ } } } + }, + "f0632c54f5763a16d6d87d14d0e7a80a079e8b998507fa1d081ee3b631c3961c": { + "address": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", + "txHash": "0xfa37e2544175813e2b4308c62f14f05f336a62ea25c94dd9346f710449498d0c", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "ebc9c3f1c253e562c3d21649a4c7d904b40ed64689bc3d3bc57bbe09fcd1d120": { + "address": "0x35fDc5537c32588bfc97b393A8ed522Df737af5A", + "txHash": "0xc1d9400b9492c969e5a156fa8e419ccd8a1138160f6eb4079192455e3af357e6", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/CHANGELOG.md b/CHANGELOG.md index 693d32bd91..a5330e5235 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,93 @@ # Changelog +# 3.1.0 + +### Upgrade Steps -- Required + +Upgrade all core contracts and _all_ assets. Most ERC20s do not need to be upgraded. Use `Deployer.deployRTokenAsset()` to create a new `RTokenAsset` instance. This asset should be swapped too. + +ERC20s that _do_ need to be upgraded: + +- Morpho +- Convex +- CompoundV3 + +Then, call `Broker.cacheComponents()`. + +Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. + +### Core Protocol Contracts + +- `BackingManager` [+2 slots] + - Replace use of `lotPrice()` with `price()` everywhere + - Track `tokensOut` on trades and account for during collateralization math + - Call `StRSR.payoutRewards()` after forwarding RSR + - Make `backingBuffer` math precise + - Add caching in `RecollateralizationLibP1` + - Use `price().low` instead of `price().high` to compute maximum sell amounts +- `BasketHandler` + - Replace use of `lotPrice()` with `price()` everywhere + - Minor gas optimizations to status tracking and custom redemption math +- `Broker` [+1 slot] + - Cache `rToken` address and add `cacheComponents()` helper + - Allow `reportViolation()` to be called when paused or frozen + - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` +- `Distributor` + - Call `RevenueTrader.distributeTokenToBuy()` before distribution table changes + - Call `StRSR.payoutRewards()` or `Furnace.melt()` after distributions + - Minor gas optimizations +- `Furnace` + - Allow melting while frozen +- `Main` + - Remove `furnace.melt()` from `poke()` +- `RevenueTrader` + - Replace use of `lotPrice()` with `price()` everywhere + - Ensure `settleTrade` cannot be reverted due to `tokenToBuy` distribution + - Ensure during `manageTokens()` that the Distributor is configured for the `tokenToBuy` +- `StRSR` + - Use correct era in `UnstakingStarted` event + - Expose `draftEra` via `getDraftEra()` view + +### Facades + +- `FacadeMonitor` + - Add `batchAuctionsDisabled()` view + - Add `dutchAuctionsDisabled()` view + - Add `issuanceAvailable()` view + - Add `redemptionAvailable()` view + - Add `backingRedeemable()` view +- `FacadeRead` + - Add `draftEra` argument to `pendingUnstakings()` + - Remove `.melt()` calls during pokes + +## Plugins + +### Assets + +- ALL + - Deprecate `lotPrice()` + - Alter `price().low` to decay downwards to 0 over the price timeout + - Alter `price().high` to decay upwards to 3x over the price timeout + - Move `ORACLE_TIMEOUT_BUFFER` into code, as opposed to incorporating at the deployment script level + - Make`refPerTok()` smoother during event of hard default + - Check for `defaultThreshold > 0` in constructors + - Add 9 more decimals of precision to reward accounting (some wrappers excluded) +- compoundv2: make wrapper much more gas efficient during COMP claim +- compoundv3 bugfix: check permission correctly on underlying comet +- curve: Also `refresh()` the RToken's AssetRegistry during `refresh()` +- convex: Update to latest approved wrapper from Convex team +- morpho-aave: Add ability to track and handout MORPHO rewards +- yearnv2: Use pricePerShare helper for more precision + +### Governance + +- Add a minimum voting delay of 1 day + +### Trading + +- `GnosisTrade` + - Add `sellAmount() returns (uint192)` view + # 3.0.1 ### Upgrade steps @@ -8,6 +96,8 @@ Update `BackingManager`, both `RevenueTraders` (rTokenTrader/rsrTrader), and cal # 3.0.0 +Bump solidity version to 0.8.19 + ### Upgrade Steps #### Required Steps @@ -38,9 +128,7 @@ It is acceptable to leave these function calls out of the initial upgrade tx and ### Core Protocol Contracts - `AssetRegistry` [+1 slot] - Summary: StRSR contract need to know when refresh() was last called - - # Add last refresh timestamp tracking and expose via `lastRefresh()` getter - Summary: Other component contracts need to know when refresh() was last called + Summary: Other component contracts need to know when refresh() was last called - Add `lastRefresh()` timestamp getter - Add `size()` getter for number of registered assets - Require asset is SOUND on registration @@ -180,10 +268,10 @@ Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` a - `FacadeRead` Summary: Add new data summary views frontends may be interested in - - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` - - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions - - Remove `traderBalances(..)` - - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` +- Remove `basketNonce` from `redeem(.., uint48 basketNonce)` +- Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions +- Remove `traderBalances(..)` +- Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - `FacadeWrite` Summary: More expressive and fine-grained control over the set of pausers and freezers diff --git a/README.md b/README.md index 1c569eb492..e8ab78faec 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ For a much more detailed explanation of the economic design, including an hour-l - [Testing with Echidna](https://github.com/reserve-protocol/protocol/blob/master/docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) - [Deployment](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment.md): How to do test deployments in our environment. - [System Design](https://github.com/reserve-protocol/protocol/blob/master/docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. +- [Pause and Freeze States](https://github.com/reserve-protocol/protocol/blob/master/docs/pause-freeze-states.md): An overview of which protocol functions are halted in the paused and frozen states. - [Deployment Variables](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment-variables.md) A detailed description of the governance variables of the protocol. - [Our Solidity Style](https://github.com/reserve-protocol/protocol/blob/master/docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. - [Writing Collateral Plugins](https://github.com/reserve-protocol/protocol/blob/master/docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. diff --git a/common/configuration.ts b/common/configuration.ts index 308bfc671e..3692d8068f 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -109,6 +109,7 @@ interface INetworkConfig { AAVE_INCENTIVES?: string AAVE_EMISSIONS_MGR?: string AAVE_RESERVE_TREASURY?: string + AAVE_DATA_PROVIDER?: string COMPTROLLER?: string FLUX_FINANCE_COMPTROLLER?: string GNOSIS_EASY_AUCTION?: string @@ -224,6 +225,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', AAVE_EMISSIONS_MGR: '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -329,6 +331,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -428,6 +431,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', + AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -642,6 +646,10 @@ export interface IRTokenConfig { params: IConfig } +export interface IMonitorParams { + AAVE_V2_DATA_PROVIDER_ADDR: string +} + export interface IBackupInfo { backupUnit: string diversityFactor: BigNumber @@ -690,7 +698,7 @@ 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) +export const MAX_ORACLE_TIMEOUT = BigNumber.from(2).pow(48).sub(1).sub(300) export const MAX_TRADING_DELAY = 31536000 // 1 year export const MIN_WARMUP_PERIOD = 60 // 1 minute export const MAX_WARMUP_PERIOD = 31536000 // 1 year diff --git a/common/numbers.ts b/common/numbers.ts index 6d53f464d1..d49a2a6606 100644 --- a/common/numbers.ts +++ b/common/numbers.ts @@ -16,7 +16,9 @@ export const pow10 = (exponent: BigNumberish): BigNumber => { // Convert `x` to a new BigNumber with decimals = `decimals`. // Input should have SCALE_DECIMALS (18) decimal places, and `decimals` should be less than 18. export const toBNDecimals = (x: BigNumberish, decimals: number): BigNumber => { - return BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) + return decimals < SCALE_DECIMALS + ? BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) + : BigNumber.from(x).mul(pow10(decimals - SCALE_DECIMALS)) } // Convert to the BigNumber representing a Fix from a BigNumberish. diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 3534a1fa62..45f32b4f7c 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -117,11 +117,11 @@ contract FacadeAct is IFacadeAct, Multicall { } surpluses[i] = erc20s[i].balanceOf(address(revenueTrader)); - (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} - if (lotLow == 0) continue; + (uint192 low, ) = reg.assets[i].price(); // {UoA/tok} + if (low == 0) continue; // {qTok} = {UoA} / {UoA/tok} - minTradeAmounts[i] = minTradeVolume.safeDiv(lotLow, FLOOR).shiftl_toUint( + minTradeAmounts[i] = minTradeVolume.safeDiv(low, FLOOR).shiftl_toUint( int8(reg.assets[i].erc20Decimals()) ); diff --git a/contracts/facade/FacadeMonitor.sol b/contracts/facade/FacadeMonitor.sol new file mode 100644 index 0000000000..e8221a1195 --- /dev/null +++ b/contracts/facade/FacadeMonitor.sol @@ -0,0 +1,211 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; +import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; +import "../interfaces/IFacadeMonitor.sol"; +import "../interfaces/IRToken.sol"; +import "../libraries/Fixed.sol"; +import "../p1/RToken.sol"; +import "../plugins/assets/compoundv2/CTokenWrapper.sol"; +import "../plugins/assets/compoundv3/ICusdcV3Wrapper.sol"; +import "../plugins/assets/stargate/StargateRewardableWrapper.sol"; +import { StaticATokenV3LM } from "../plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol"; +import "../plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol"; + +interface IAaveProtocolDataProvider { + function getReserveData(address asset) + external + view + returns ( + uint256 availableLiquidity, + uint256 totalStableDebt, + uint256 totalVariableDebt, + uint256 liquidityRate, + uint256 variableBorrowRate, + uint256 stableBorrowRate, + uint256 averageStableBorrowRate, + uint256 liquidityIndex, + uint256 variableBorrowIndex, + uint40 lastUpdateTimestamp + ); +} + +interface IStaticATokenLM is IERC20 { + // solhint-disable-next-line func-name-mixedcase + function UNDERLYING_ASSET_ADDRESS() external view returns (address); + + function dynamicBalanceOf(address account) external view returns (uint256); +} + +/** + * @title FacadeMonitor + * @notice A UX-friendly layer for monitoring RTokens + */ +contract FacadeMonitor is Initializable, OwnableUpgradeable, UUPSUpgradeable, IFacadeMonitor { + using FixLib for uint192; + + /// @custom:oz-upgrades-unsafe-allow state-variable-immutable + // solhint-disable-next-line var-name-mixedcase + address public immutable AAVE_V2_DATA_PROVIDER; + + /// @custom:oz-upgrades-unsafe-allow constructor + constructor(MonitorParams memory params) { + AAVE_V2_DATA_PROVIDER = params.AAVE_V2_DATA_PROVIDER_ADDR; + _disableInitializers(); + } + + function init(address initialOwner) public initializer { + require(initialOwner != address(0), "invalid owner address"); + + __Ownable_init(); + __UUPSUpgradeable_init(); + _transferOwnership(initialOwner); + } + + // === Views === + + /// @return Whether batch auctions are disabled for a specific rToken + function batchAuctionsDisabled(IRToken rToken) external view returns (bool) { + return rToken.main().broker().batchTradeDisabled(); + } + + /// @return Whether any dutch auction is disabled for a specific rToken + function dutchAuctionsDisabled(IRToken rToken) external view returns (bool) { + bool disabled = false; + + IERC20[] memory erc20s = rToken.main().assetRegistry().erc20s(); + for (uint256 i = 0; i < erc20s.length; ++i) { + if (rToken.main().broker().dutchTradeDisabled(IERC20Metadata(address(erc20s[i])))) + disabled = true; + } + + return disabled; + } + + /// @return Which percentage of issuance throttle is still available for a specific rToken + function issuanceAvailable(IRToken rToken) external view returns (uint256) { + ThrottleLib.Params memory params = RTokenP1(address(rToken)).issuanceThrottleParams(); + + // Calculate hourly limit as: max(params.amtRate, supply.mul(params.pctRate)) + uint256 limit = (rToken.totalSupply() * params.pctRate) / FIX_ONE_256; // {qRTok} + if (params.amtRate > limit) limit = params.amtRate; + + uint256 issueAvailable = rToken.issuanceAvailable(); + if (issueAvailable >= limit) return FIX_ONE_256; + + return (issueAvailable * FIX_ONE_256) / limit; + } + + function redemptionAvailable(IRToken rToken) external view returns (uint256) { + ThrottleLib.Params memory params = RTokenP1(address(rToken)).redemptionThrottleParams(); + + uint256 supply = rToken.totalSupply(); + + if (supply == 0) return FIX_ONE_256; + + // Calculate hourly limit as: max(params.amtRate, supply.mul(params.pctRate)) + uint256 limit = (supply * params.pctRate) / FIX_ONE_256; // {qRTok} + if (params.amtRate > limit) limit = supply < params.amtRate ? supply : params.amtRate; + + uint256 redeemAvailable = rToken.redemptionAvailable(); + if (redeemAvailable >= limit) return FIX_ONE_256; + + return (redeemAvailable * FIX_ONE_256) / limit; + } + + function backingReedemable( + IRToken rToken, + CollPluginType collType, + IERC20 erc20 + ) external view returns (uint256) { + uint256 backingBalance; + uint256 availableLiquidity; + + if (collType == CollPluginType.AAVE_V2 || collType == CollPluginType.MORPHO_AAVE_V2) { + address underlying; + if (collType == CollPluginType.AAVE_V2) { + // AAVE V2 - Uses Static wrapper + IStaticATokenLM staticAToken = IStaticATokenLM(address(erc20)); + backingBalance = staticAToken.dynamicBalanceOf( + address(rToken.main().backingManager()) + ); + underlying = staticAToken.UNDERLYING_ASSET_ADDRESS(); + } else { + // MORPHO AAVE V2 + MorphoAaveV2TokenisedDeposit mrpTknDeposit = MorphoAaveV2TokenisedDeposit( + address(erc20) + ); + backingBalance = mrpTknDeposit.convertToAssets( + mrpTknDeposit.balanceOf(address(rToken.main().backingManager())) + ); + underlying = mrpTknDeposit.underlying(); + } + + (availableLiquidity, , , , , , , , , ) = IAaveProtocolDataProvider( + AAVE_V2_DATA_PROVIDER + ).getReserveData(underlying); + } else if (collType == CollPluginType.AAVE_V3) { + StaticATokenV3LM staticAToken = StaticATokenV3LM(address(erc20)); + IERC20 aToken = staticAToken.aToken(); + IERC20 underlying = IERC20(staticAToken.asset()); + + backingBalance = staticAToken.convertToAssets( + staticAToken.balanceOf(address(rToken.main().backingManager())) + ); + availableLiquidity = underlying.balanceOf(address(aToken)); + } else if (collType == CollPluginType.COMPOUND_V2 || collType == CollPluginType.FLUX) { + ICToken cToken; + uint256 cTokenBal; + if (collType == CollPluginType.COMPOUND_V2) { + // CompoundV2 uses a vault to wrap the CToken + CTokenWrapper cTokenVault = CTokenWrapper(address(erc20)); + cToken = ICToken(address(cTokenVault.underlying())); + cTokenBal = cTokenVault.balanceOf(address(rToken.main().backingManager())); + } else { + // FLUX - Uses FToken directly (fork of CToken) + cToken = ICToken(address(erc20)); + cTokenBal = cToken.balanceOf(address(rToken.main().backingManager())); + } + IERC20 underlying = IERC20(cToken.underlying()); + + uint256 exchangeRate = cToken.exchangeRateStored(); + + backingBalance = (cTokenBal * exchangeRate) / 1e18; + availableLiquidity = underlying.balanceOf(address(cToken)); + } else if (collType == CollPluginType.COMPOUND_V3) { + ICusdcV3Wrapper cTokenV3Wrapper = ICusdcV3Wrapper(address(erc20)); + CometInterface cTokenV3 = CometInterface(address(cTokenV3Wrapper.underlyingComet())); + IERC20 underlying = IERC20(cTokenV3.baseToken()); + + backingBalance = cTokenV3Wrapper.underlyingBalanceOf( + address(rToken.main().backingManager()) + ); + availableLiquidity = underlying.balanceOf(address(cTokenV3)); + } else if (collType == CollPluginType.STARGATE) { + StargateRewardableWrapper stgWrapper = StargateRewardableWrapper(address(erc20)); + IStargatePool stgPool = stgWrapper.pool(); + + uint256 wstgBal = stgWrapper.balanceOf(address(rToken.main().backingManager())); + + backingBalance = stgPool.amountLPtoLD(wstgBal); + availableLiquidity = stgPool.totalLiquidity(); + } + + if (availableLiquidity == 0) { + return 0; // Avoid division by zero + } + + if (availableLiquidity >= backingBalance) { + return FIX_ONE_256; + } + + // Calculate the percentage + return (availableLiquidity * FIX_ONE_256) / backingBalance; + } + + // solhint-disable-next-line no-empty-blocks + function _authorizeUpgrade(address newImplementation) internal override onlyOwner {} +} diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index eed25706aa..2e2ce936e0 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -34,7 +34,6 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); - main.furnace().melt(); // {BU} BasketRange memory basketsHeld = main.basketHandler().basketsHeldBy(account); @@ -75,7 +74,6 @@ contract FacadeRead is IFacadeRead { // Poke Main reg.refresh(); - main.furnace().melt(); // Compute # of baskets to create `amount` qRTok uint192 baskets = (rTok.totalSupply() > 0) // {BU} @@ -121,7 +119,6 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); - main.furnace().melt(); uint256 supply = rTok.totalSupply(); @@ -203,7 +200,7 @@ contract FacadeRead is IFacadeRead { IBasketHandler basketHandler = rToken.main().basketHandler(); // solhint-disable-next-line no-empty-blocks - try rToken.main().furnace().melt() {} catch {} + try rToken.main().furnace().melt() {} catch {} // <3.1.0 RTokens may revert while frozen (erc20s, deposits) = basketHandler.quote(FIX_ONE, CEIL); @@ -242,7 +239,6 @@ contract FacadeRead is IFacadeRead { { IMain main = rToken.main(); main.assetRegistry().refresh(); - main.furnace().melt(); erc20s = main.assetRegistry().erc20s(); balances = new uint256[](erc20s.length); @@ -270,25 +266,26 @@ contract FacadeRead is IFacadeRead { // === Views === + /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @return unstakings All the pending StRSR unstakings for an account - function pendingUnstakings(RTokenP1 rToken, address account) - external - view - returns (Pending[] memory unstakings) - { - StRSRP1Votes stRSR = StRSRP1Votes(address(rToken.main().stRSR())); - uint256 era = stRSR.currentEra(); - uint256 left = stRSR.firstRemainingDraft(era, account); - uint256 right = stRSR.draftQueueLen(era, account); + /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} + /// @return unstakings {qDrafts} All the pending StRSR unstakings for an account, in drafts + function pendingUnstakings( + RTokenP1 rToken, + uint256 draftEra, + address account + ) external view returns (Pending[] memory unstakings) { + StRSRP1 stRSR = StRSRP1(address(rToken.main().stRSR())); + uint256 left = stRSR.firstRemainingDraft(draftEra, account); + uint256 right = stRSR.draftQueueLen(draftEra, account); unstakings = new Pending[](right - left); for (uint256 i = 0; i < right - left; i++) { - (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(era, account, i + left); + (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); uint192 diff = drafts; if (i + left > 0) { - (uint192 prevDrafts, ) = stRSR.draftQueues(era, account, i + left - 1); + (uint192 prevDrafts, ) = stRSR.draftQueues(draftEra, account, i + left - 1); diff = drafts - prevDrafts; } diff --git a/contracts/facade/FacadeTest.sol b/contracts/facade/FacadeTest.sol index 512457c1b2..f95d350282 100644 --- a/contracts/facade/FacadeTest.sol +++ b/contracts/facade/FacadeTest.sol @@ -67,6 +67,7 @@ contract FacadeTest is IFacadeTest { erc20s ); try main.rsrTrader().manageTokens(rsrERC20s, rsrKinds) {} catch {} + try main.rsrTrader().distributeTokenToBuy() {} catch {} // Start exact RToken auctions (IERC20[] memory rTokenERC20s, TradeKind[] memory rTokenKinds) = traderERC20s( @@ -75,6 +76,7 @@ contract FacadeTest is IFacadeTest { erc20s ); try main.rTokenTrader().manageTokens(rTokenERC20s, rTokenKinds) {} catch {} + try main.rTokenTrader().distributeTokenToBuy() {} catch {} // solhint-enable no-empty-blocks } @@ -98,7 +100,6 @@ contract FacadeTest is IFacadeTest { // Poke Main reg.refresh(); - main.furnace().melt(); address backingManager = address(main.backingManager()); IERC20 rsr = main.rsr(); @@ -135,6 +136,7 @@ contract FacadeTest is IFacadeTest { IERC20[] memory traderERC20sAll = new IERC20[](erc20sAll.length); for (uint256 i = 0; i < erc20sAll.length; ++i) { if ( + erc20sAll[i] != trader.tokenToBuy() && address(trader.trades(erc20sAll[i])) == address(0) && erc20sAll[i].balanceOf(address(trader)) > 1 ) { diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index bd796190a7..8126aa12ce 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -27,12 +27,14 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert + /// low should be nonzero if the asset could be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); /// Should not revert /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); @@ -67,8 +69,14 @@ interface TestIAsset is IAsset { /// @return {s} Seconds that an oracle value is considered valid function oracleTimeout() external view returns (uint48); - /// @return {s} Seconds that the lotPrice should decay over, after stale price + /// @return {s} Seconds that the price() should decay over, after stale price function priceTimeout() external view returns (uint48); + + /// @return {UoA/tok} The last saved low price + function savedLowPrice() external view returns (uint192); + + /// @return {UoA/tok} The last saved high price + function savedHighPrice() external view returns (uint192); } /// CollateralStatus must obey a linear ordering. That is: diff --git a/contracts/interfaces/IAssetRegistry.sol b/contracts/interfaces/IAssetRegistry.sol index caeaac2f3e..add18d69b5 100644 --- a/contracts/interfaces/IAssetRegistry.sol +++ b/contracts/interfaces/IAssetRegistry.sol @@ -34,7 +34,7 @@ interface IAssetRegistry is IComponent { function init(IMain main_, IAsset[] memory assets_) external; /// Fully refresh all asset state - /// @custom:interaction + /// @custom:refresher function refresh() external; /// Register `asset` diff --git a/contracts/interfaces/IBackingManager.sol b/contracts/interfaces/IBackingManager.sol index 0699da6d6c..b9b3c5beca 100644 --- a/contracts/interfaces/IBackingManager.sol +++ b/contracts/interfaces/IBackingManager.sol @@ -2,10 +2,38 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "./IAssetRegistry.sol"; +import "./IBasketHandler.sol"; import "./IBroker.sol"; import "./IComponent.sol"; +import "./IRToken.sol"; +import "./IStRSR.sol"; import "./ITrading.sol"; +/// Memory struct for RecollateralizationLibP1 + RTokenAsset +/// Struct purposes: +/// 1. Configure trading +/// 2. Stay under stack limit with fewer vars +/// 3. Cache information such as component addresses and basket quantities, to save on gas +struct TradingContext { + BasketRange basketsHeld; // {BU} + // basketsHeld.top is the number of partial baskets units held + // basketsHeld.bottom is the number of full basket units held + + // Components + IBasketHandler bh; + IAssetRegistry ar; + IStRSR stRSR; + IERC20 rsr; + IRToken rToken; + // Gov Vars + uint192 minTradeVolume; // {UoA} + uint192 maxTradeSlippage; // {1} + // Cached values + uint192[] quantities; // {tok/BU} basket quantities + uint192[] bals; // {tok} balances in BackingManager + out on trades +} + /** * @title IBackingManager * @notice The BackingManager handles changes in the ERC20 balances that back an RToken. @@ -48,6 +76,15 @@ interface IBackingManager is IComponent, ITrading { /// @param erc20s The tokens to forward /// @custom:interaction RCEI function forwardRevenue(IERC20[] calldata erc20s) external; + + /// Structs for trading + /// @param basketsHeld The number of baskets held by the BackingManager + /// @return ctx The TradingContext + /// @return reg Contents of AssetRegistry.getRegistry() + function tradingContext(BasketRange memory basketsHeld) + external + view + returns (TradingContext memory ctx, Registry memory reg); } interface TestIBackingManager is IBackingManager, TestITrading { diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index 42bb8bf092..2ed829d1b9 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -133,12 +133,14 @@ interface IBasketHandler is IComponent { function basketsHeldBy(address account) external view returns (BasketRange memory); /// Should not revert + /// low should be nonzero when BUs are worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); /// Should not revert /// lotLow should be nonzero if a BU could be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index 20e2ed0cb0..fcaeac2c10 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -11,7 +11,7 @@ enum TradeKind { BATCH_AUCTION } -/// Cache of all (lot) prices for a pair to prevent re-lookup +/// Cache of all prices for a pair to prevent re-lookup struct TradePrices { uint192 sellLow; // {UoA/sellTok} can be 0 uint192 sellHigh; // {UoA/sellTok} should not be 0 diff --git a/contracts/interfaces/IFacadeMonitor.sol b/contracts/interfaces/IFacadeMonitor.sol new file mode 100644 index 0000000000..6c4f6f8d2d --- /dev/null +++ b/contracts/interfaces/IFacadeMonitor.sol @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "./IRToken.sol"; + +/** + * @title IFacadeMonitor + * @notice A monitoring layer for RTokens + */ + +/// PluginType +enum CollPluginType { + AAVE_V2, + AAVE_V3, + COMPOUND_V2, + COMPOUND_V3, + STARGATE, + FLUX, + MORPHO_AAVE_V2 +} + +/** + * @title MonitorParams + * @notice The set of protocol params needed for the required calculations + * Should be defined at deployment based on network + */ + +// solhint-disable var-name-mixedcase +struct MonitorParams { + // === AAVE_V2=== + address AAVE_V2_DATA_PROVIDER_ADDR; +} + +interface IFacadeMonitor { + // === Views === + function batchAuctionsDisabled(IRToken rToken) external view returns (bool); + + function dutchAuctionsDisabled(IRToken rToken) external view returns (bool); + + function issuanceAvailable(IRToken rToken) external view returns (uint256); + + function redemptionAvailable(IRToken rToken) external view returns (uint256); + + function backingReedemable( + IRToken rToken, + CollPluginType collType, + IERC20 erc20 + ) external view returns (uint256); +} diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IFacadeRead.sol index 44af758dec..df5f039d64 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IFacadeRead.sol @@ -85,12 +85,15 @@ interface IFacadeRead { uint256 amount; } + /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @return All the pending StRSR unstakings for an account - function pendingUnstakings(RTokenP1 rToken, address account) - external - view - returns (Pending[] memory); + /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} + /// @return {qDrafts} All the pending unstakings for an account, in drafts + function pendingUnstakings( + RTokenP1 rToken, + uint256 draftEra, + address account + ) external view returns (Pending[] memory); /// Returns the prime basket /// @dev Indices are shared across return values diff --git a/contracts/interfaces/ITrade.sol b/contracts/interfaces/ITrade.sol index d05e3028f6..f9e95114f9 100644 --- a/contracts/interfaces/ITrade.sol +++ b/contracts/interfaces/ITrade.sol @@ -27,6 +27,9 @@ interface ITrade { function buy() external view returns (IERC20Metadata); + /// @return {tok} The sell amount of the trade, in whole tokens + function sellAmount() external view returns (uint192); + /// @return The timestamp at which the trade is projected to become settle-able function endTime() external view returns (uint48); diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index 7518551125..c70c7a8857 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.0.1"; +string constant VERSION = "3.1.0"; /** * @title Versioned diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index c22df732c7..34a28ce66a 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -32,6 +32,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager { mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind + mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades + constructor() { ONE_BLOCK = NetworkConfigLib.blocktime(); } @@ -69,6 +71,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { returns (ITrade trade) { trade = super.settleTrade(sell); + delete tokensOut[trade.sell()]; // if the settler is the trade contract itself, try chaining with another rebalance() if (_msgSender() == address(trade)) { @@ -86,7 +89,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { /// @custom:interaction function rebalance(TradeKind kind) external notTradingPausedOrFrozen { main.assetRegistry().refresh(); - main.furnace().melt(); // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( @@ -135,7 +137,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // Execute Trade ITrade trade = tryTrade(kind, req, prices); - tradeEnd[kind] = trade.endTime(); + tradeEnd[kind] = trade.endTime(); // {s} + tokensOut[trade.sell()] = trade.sellAmount(); // {tok} } else { // Haircut time compromiseBasketsNeeded(basketsHeld.bottom); @@ -149,7 +152,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { require(ArrayLib.allUnique(erc20s), "duplicate tokens"); main.assetRegistry().refresh(); - main.furnace().melt(); require(tradesOpen == 0, "trade open"); require(main.basketHandler().isReady(), "basket not ready"); @@ -166,16 +168,20 @@ contract BackingManagerP0 is TradingP0, IBackingManager { uint256 rsrBal = main.rsr().balanceOf(address(this)); if (rsrBal > 0) { main.rsr().safeTransfer(address(main.stRSR()), rsrBal); + main.stRSR().payoutRewards(); } // Mint revenue RToken // Keep backingBuffer worth of collateral before recognizing revenue - uint192 needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // {BU} - if (basketsHeld.bottom.gt(needed)) { - main.rToken().mint(basketsHeld.bottom.minus(needed)); - needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // keep buffer + { + uint192 baskets = (basketsHeld.bottom.div(FIX_ONE + backingBuffer)); + if (baskets > main.rToken().basketsNeeded()) { + main.rToken().mint(baskets - main.rToken().basketsNeeded()); + } } + uint192 needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // {BU} + // Handout excess assets above what is needed, including any newly minted RToken RevenueTotals memory totals = main.distributor().totals(); for (uint256 i = 0; i < erc20s.length; i++) { @@ -203,6 +209,40 @@ contract BackingManagerP0 is TradingP0, IBackingManager { } } + // === View === + + /// Structs for trading + /// @param basketsHeld The number of baskets held by the BackingManager + /// @return ctx The TradingContext + /// @return reg Contents of AssetRegistry.getRegistry() + function tradingContext(BasketRange memory basketsHeld) + public + view + returns (TradingContext memory ctx, Registry memory reg) + { + reg = main.assetRegistry().getRegistry(); + + ctx.basketsHeld = basketsHeld; + ctx.bh = main.basketHandler(); + ctx.ar = main.assetRegistry(); + ctx.stRSR = main.stRSR(); + ctx.rsr = main.rsr(); + ctx.rToken = main.rToken(); + ctx.minTradeVolume = minTradeVolume; + ctx.maxTradeSlippage = maxTradeSlippage; + ctx.quantities = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.quantities[i] = ctx.bh.quantity(reg.erc20s[i]); + } + ctx.bals = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.bals[i] = reg.assets[i].bal(address(this)) + tokensOut[reg.erc20s[i]]; + + // include StRSR's balance for RSR + if (reg.erc20s[i] == ctx.rsr) ctx.bals[i] += reg.assets[i].bal(address(ctx.stRSR)); + } + } + // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 357b0a7251..998c25e65f 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -183,6 +183,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; + + trackStatus(); } /// Switch the basket, only callable directly by governance or after a default @@ -199,7 +201,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { require( main.hasRole(OWNER, _msgSender()) || - (status() == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), + (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); _switchBasket(); @@ -377,6 +379,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { /// Should not revert /// lowLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/BU} The lower end of the lot price estimate /// @return lotHigh {UoA/BU} The upper end of the lot price estimate // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 02b88de2f3..b53c2e0417 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -92,7 +92,7 @@ contract BrokerP0 is ComponentP0, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected - function reportViolation() external notTradingPausedOrFrozen { + function reportViolation() external { require(trades[_msgSender()], "unrecognized trade contract"); ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); @@ -239,6 +239,11 @@ contract BrokerP0 is ComponentP0, IBroker { "dutch auctions disabled for token pair" ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); + require( + priceNotDecayed(req.sell) && priceNotDecayed(req.buy), + "dutch auctions require live prices" + ); + DutchTrade trade = DutchTrade(Clones.clone(address(dutchTradeImplementation))); trades[address(trade)] = true; @@ -251,4 +256,10 @@ contract BrokerP0 is ComponentP0, IBroker { trade.init(caller, req.sell, req.buy, req.sellAmount, dutchAuctionLength, prices); return trade; } + + /// @return true iff the price is not decayed, or it's the RTokenAsset + function priceNotDecayed(IAsset asset) private view returns (bool) { + return + asset.lastSave() == block.timestamp || address(asset.erc20()) == address(main.rToken()); + } } diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index d305e9b521..264d7bfe7e 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -33,6 +33,11 @@ contract DistributorP0 is ComponentP0, IDistributor { /// Set the RevenueShare for destination `dest`. Destinations `FURNACE` and `ST_RSR` refer to /// main.furnace() and main.stRSR(). function setDistribution(address dest, RevenueShare memory share) external governance { + // solhint-disable-next-line no-empty-blocks + try main.rsrTrader().distributeTokenToBuy() {} catch {} + // solhint-disable-next-line no-empty-blocks + try main.rTokenTrader().distributeTokenToBuy() {} catch {} + _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); @@ -58,13 +63,15 @@ contract DistributorP0 is ComponentP0, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - require(totalShares > 0, "nothing to distribute"); - tokensPerShare = amount / totalShares; + if (totalShares > 0) tokensPerShare = amount / totalShares; + require(tokensPerShare > 0, "nothing to distribute"); } // Evenly distribute revenue tokens per distribution share. // This rounds "early", and that's deliberate! + bool accountRewards = false; + for (uint256 i = 0; i < destinations.length(); i++) { address addrTo = destinations.at(i); @@ -76,12 +83,23 @@ contract DistributorP0 is ComponentP0, IDistributor { if (addrTo == FURNACE) { addrTo = address(main.furnace()); + if (transferAmt > 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = address(main.stRSR()); + if (transferAmt > 0) accountRewards = true; } erc20.safeTransferFrom(_msgSender(), addrTo, transferAmt); } emit RevenueDistributed(erc20, _msgSender(), amount); + + // Perform reward accounting + if (accountRewards) { + if (isRSR) { + main.stRSR().payoutRewards(); + } else { + main.furnace().melt(); + } + } } /// Returns the rsr + rToken shareTotals diff --git a/contracts/p0/Furnace.sol b/contracts/p0/Furnace.sol index aa99a8140c..ea0a404a2e 100644 --- a/contracts/p0/Furnace.sol +++ b/contracts/p0/Furnace.sol @@ -36,7 +36,7 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Performs any melting that has vested since last call. /// @custom:refresher - function melt() public notFrozen { + function melt() public { if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; // # of whole periods that have passed since lastPayout @@ -58,15 +58,9 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { - if (lastPayout > 0) { - // solhint-disable-next-line no-empty-blocks - try this.melt() {} catch { - uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; - lastPayout += numPeriods * PERIOD; - lastPayoutBal = main.rToken().balanceOf(address(this)); - } - } require(ratio_ <= MAX_RATIO, "invalid ratio"); + melt(); // cannot revert + // The ratio can safely be set to 0, though it is not recommended emit RatioSet(ratio, ratio_); ratio = ratio_; diff --git a/contracts/p0/Main.sol b/contracts/p0/Main.sol index 9493b72c5c..1859ad8ecb 100644 --- a/contracts/p0/Main.sol +++ b/contracts/p0/Main.sol @@ -37,8 +37,7 @@ contract MainP0 is Versioned, Initializable, Auth, ComponentRegistry, IMain { /// @custom:refresher function poke() external { - assetRegistry.refresh(); - if (!frozen()) furnace.melt(); + assetRegistry.refresh(); // runs furnace.melt() stRSR.payoutRewards(); // NOT basketHandler.refreshBasket } diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index a62cf8bd18..8fecf2eb76 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -32,14 +32,14 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) - public - override(ITrading, TradingP0) - notTradingPausedOrFrozen - returns (ITrade trade) - { + function settleTrade(IERC20 sell) public override(ITrading, TradingP0) returns (ITrade trade) { trade = super.settleTrade(sell); - _distributeTokenToBuy(); + + // solhint-disable-next-line no-empty-blocks + try this.distributeTokenToBuy() {} catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + } // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -80,10 +80,18 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { { require(erc20s.length > 0, "empty erc20s list"); require(erc20s.length == kinds.length, "length mismatch"); + + RevenueTotals memory revTotals = main.distributor().totals(); + require( + (tokenToBuy == main.rsr() && revTotals.rsrTotal > 0) || + (address(tokenToBuy) == address(main.rToken()) && revTotals.rTokenTotal > 0), + "zero distribution" + ); + main.assetRegistry().refresh(); IAsset assetToBuy = main.assetRegistry().toAsset(tokenToBuy); - (uint192 buyLow, uint192 buyHigh) = assetToBuy.lotPrice(); // {UoA/tok} + (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); // For each ERC20: start auction of given kind @@ -99,7 +107,7 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { require(address(trades[erc20]) == address(0), "trade open"); require(erc20.balanceOf(address(this)) > 0, "0 balance"); - (uint192 sellLow, uint192 sellHigh) = assetToSell.lotPrice(); // {UoA/tok} + (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} TradingLibP0.TradeInfo memory trade = TradingLibP0.TradeInfo({ sell: assetToSell, diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index fe3676dcef..a9a3e597ec 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -77,9 +77,11 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // {qRSR} How much reward RSR was held the last time rewards were paid out uint256 internal rsrRewardsAtLastPayout; - // Era. If ever there's a total RSR wipeout, this is incremented - // This is only really here for equivalence with P1, which requires it + // Eras. These are only really here for equivalence with P1, which requires it + // If there's ever a total RSR wipeout to balances, this is incremented uint256 internal era; + // If there's ever a total RSR wipeout to pending withdrawals, this is incremented + uint256 internal draftEra; // The momentary stake/unstake rate is rsrBacking/totalStaked {RSR/stRSR} // That rate is locked in when slow unstaking *begins* @@ -136,6 +138,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { setRewardRatio(rewardRatio_); setWithdrawalLeak(withdrawalLeak_); era = 1; + draftEra = 1; } /// Assign reward payouts to the staker pool @@ -201,7 +204,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint256 lastAvailableAt = index > 0 ? withdrawals[account][index - 1].availableAt : 0; uint256 availableAt = Math.max(block.timestamp + unstakingDelay, lastAvailableAt); withdrawals[account].push(Withdrawal(account, rsrAmount, stakeAmount, availableAt)); - emit UnstakingStarted(index, era, account, rsrAmount, stakeAmount, availableAt); + emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); } /// Complete delayed staking for an account, up to but not including draft ID `endId` @@ -239,7 +242,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { require(bh.isReady(), "basket not ready"); // Execute accumulated withdrawals - emit UnstakingCompleted(start, i, era, account, total); + emit UnstakingCompleted(start, i, draftEra, account, total); main.rsr().safeTransfer(account, total); } @@ -280,7 +283,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } // Execute accumulated withdrawals - emit UnstakingCancelled(start, i, era, account, total); + emit UnstakingCancelled(start, i, draftEra, account, total); uint256 stakeAmount = total; if (totalStaked > 0) stakeAmount = (total * totalStaked) / rsrBacking; @@ -335,6 +338,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint256 withdrawalRSRtoTake = (rsrBeingWithdrawn() * rsrAmount + (rsrBalance - 1)) / rsrBalance; if ( + withdrawalRSRtoTake == 0 || rsrBeingWithdrawn() - withdrawalRSRtoTake < MIN_EXCHANGE_RATE.mulu_toUint(stakeBeingWithdrawn()) ) { @@ -382,7 +386,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address account = accounts.at(i); delete withdrawals[account]; } - emit AllUnstakingReset(era); + draftEra++; + emit AllUnstakingReset(draftEra); } /// @custom:governance diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index a71df6c027..6fe87988d1 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -60,7 +60,7 @@ library TradingLibP0 { ); // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} // Calculate equivalent buyAmount within [0, FIX_MAX] @@ -145,7 +145,7 @@ library TradingLibP0 { /// 2. Stay under stack limit with fewer vars /// 3. Cache information such as component addresses to save on gas - struct TradingContext { + struct TradingContextP0 { BasketRange basketsHeld; // {BU} // basketsHeld.top is the number of partial baskets units held // basketsHeld.bottom is the number of full basket units held @@ -190,7 +190,7 @@ library TradingLibP0 { // === Prepare cached values === IMain main = bm.main(); - TradingContext memory ctx = TradingContext({ + TradingContextP0 memory ctx = TradingContextP0({ basketsHeld: basketsHeld, bm: bm, bh: main.basketHandler(), @@ -241,14 +241,9 @@ library TradingLibP0 { // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty // the largest amount possible with each trade. // - // How do we know this algorithm converges? - // Assumption: constant oracle prices; monotonically increasing refPerTok() - // Any volume traded narrows the BU band. Why: - // - We might increase `basketsHeld.bottom` from run-to-run, but will never decrease it - // - We might decrease the UoA amount of excess balances beyond `basketsHeld.bottom` from - // run-to-run, but will never increase it - // - We might decrease the UoA amount of missing balances up-to `basketsHeld.top` from - // run-to-run, but will never increase it + // Algorithm Invariant: every increase of basketsHeld.bottom causes basketsRange().low to + // reach a new maximum. Note that basketRange().low may decrease slightly along the way. + // Assumptions: constant oracle prices; monotonically increasing refPerTok; no supply changes // // Preconditions: // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top @@ -269,12 +264,12 @@ library TradingLibP0 { // - range.bottom = min(rToken.basketsNeeded, basketsHeld.bottom + least baskets purchaseable) // where "least baskets purchaseable" involves trading at the worst price, // incurring the full maxTradeSlippage, and taking up to a minTradeVolume loss due to dust. - function basketRange(TradingContext memory ctx, IERC20[] memory erc20s) + function basketRange(TradingContextP0 memory ctx, IERC20[] memory erc20s) internal view returns (BasketRange memory range) { - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.lotPrice(); // {UoA/BU} + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} // Cap ctx.basketsHeld.top if (ctx.basketsHeld.top > ctx.rToken.basketsNeeded()) { @@ -303,21 +298,15 @@ library TradingLibP0 { bal = bal.plus(asset.bal(address(ctx.stRSR))); } - { - // Skip over dust-balance assets not in the basket - (uint192 lotLow, ) = asset.lotPrice(); // {UoA/tok} - - // Intentionally include value of IFFY/DISABLED collateral - if ( - ctx.bh.quantity(erc20s[i]) == 0 && - !isEnoughToSell(asset, bal, lotLow, ctx.minTradeVolume) - ) continue; - } - (uint192 low, uint192 high) = asset.price(); // {UoA/tok} - // price() is better than lotPrice() here: it's important to not underestimate how - // much value could be in a token that is unpriced by using a decaying high lotPrice. - // price() will return [0, FIX_MAX] in this case, which is preferable. + // low decays down; high decays up + + // Skip over dust-balance assets not in the basket + // Intentionally include value of IFFY/DISABLED collateral + if ( + ctx.bh.quantity(erc20s[i]) == 0 && + !isEnoughToSell(asset, bal, low, ctx.minTradeVolume) + ) continue; // throughout these sections +/- is same as Fix.plus/Fix.minus and is Fix.gt/.lt @@ -354,7 +343,7 @@ library TradingLibP0 { // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price (lotLow, technically), + // A: Our use of isEnoughToSell always uses the low price, // so min trade volumes are always assesed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up @@ -434,10 +423,12 @@ library TradingLibP0 { // Sell IFFY last because it may recover value in the future. // All collateral in the basket have already been guaranteed to be SOUND by upstream checks. function nextTradePair( - TradingContext memory ctx, + TradingContextP0 memory ctx, IERC20[] memory erc20s, BasketRange memory range ) private view returns (TradeInfo memory trade) { + // assert(tradesOpen == 0); // guaranteed by BackingManager.rebalance() + MaxSurplusDeficit memory maxes; maxes.surplusStatus = CollateralStatus.IFFY; // least-desirable sell status @@ -453,19 +444,19 @@ library TradingLibP0 { // {tok} = {BU} * {tok/BU} uint192 needed = range.top.mul(ctx.bh.quantity(erc20s[i]), CEIL); // {tok} if (bal.gt(needed)) { - (uint192 lotLow, uint192 lotHigh) = asset.lotPrice(); // {UoA/sellTok} - if (lotHigh == 0) continue; // Skip worthless assets + (uint192 low, uint192 high) = asset.price(); // {UoA/sellTok} + if (high == 0) continue; // Skip worthless assets // by calculating this early we can duck the stack limit but be less gas-efficient bool enoughToSell = isEnoughToSell( asset, bal.minus(needed), - lotLow, + low, ctx.minTradeVolume ); // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = bal.minus(needed).mul(lotLow, FLOOR); + uint192 delta = bal.minus(needed).mul(low, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -476,8 +467,8 @@ library TradingLibP0 { if (isBetterSurplus(maxes, status, delta) && enoughToSell) { trade.sell = asset; trade.sellAmount = bal.minus(needed); - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; maxes.surplusStatus = status; maxes.surplus = delta; @@ -487,17 +478,17 @@ library TradingLibP0 { needed = range.bottom.mul(ctx.bh.quantity(erc20s[i]), CEIL); // {buyTok}; if (bal.lt(needed)) { uint192 amtShort = needed.minus(bal); // {buyTok} - (uint192 lotLow, uint192 lotHigh) = asset.lotPrice(); // {UoA/buyTok} + (uint192 low, uint192 high) = asset.price(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} - uint192 delta = amtShort.mul(lotHigh, CEIL); + uint192 delta = amtShort.mul(high, CEIL); // The best asset to buy is whichever asset has the largest deficit if (delta.gt(maxes.deficit)) { trade.buy = ICollateral(address(asset)); trade.buyAmount = amtShort; - trade.prices.buyLow = lotLow; - trade.prices.buyHigh = lotHigh; + trade.prices.buyLow = low; + trade.prices.buyHigh = high; maxes.deficit = delta; } @@ -512,13 +503,13 @@ library TradingLibP0 { uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( rsrAsset.bal(address(ctx.stRSR)) ); - (uint192 lotLow, uint192 lotHigh) = rsrAsset.lotPrice(); // {UoA/RSR} + (uint192 low, uint192 high) = rsrAsset.price(); // {UoA/RSR} - if (lotHigh > 0 && isEnoughToSell(rsrAsset, rsrAvailable, lotLow, ctx.minTradeVolume)) { + if (high > 0 && isEnoughToSell(rsrAsset, rsrAvailable, low, ctx.minTradeVolume)) { trade.sell = rsrAsset; trade.sellAmount = rsrAvailable; - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; } } } diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 098e47f93a..c556a96120 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -57,6 +57,8 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { // tracks basket status on basketHandler function refresh() public { // It's a waste of gas to require notPausedOrFrozen because assets can be updated directly + // Assuming an RTokenAsset is registered, furnace.melt() will also be called + uint256 length = _erc20s.length(); for (uint256 i = 0; i < length; ++i) { assets[IERC20(_erc20s.at(i))].refresh(); diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index a64ff3f412..b7191aa097 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -45,6 +45,9 @@ contract BackingManagerP1 is TradingP1, IBackingManager { IFurnace private furnace; mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind + // === 3.1.0 === + mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades + // ==== Invariants ==== // tradingDelay <= MAX_TRADING_DELAY and backingBuffer <= MAX_BACKING_BUFFER @@ -90,6 +93,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// @return trade The ITrade contract settled /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { + delete tokensOut[sell]; trade = super.settleTrade(sell); // nonReentrant // if the settler is the trade contract itself, try chaining with another rebalance() @@ -113,7 +117,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { function rebalance(TradeKind kind) external nonReentrant notTradingPausedOrFrozen { // == Refresh == assetRegistry.refresh(); - furnace.melt(); // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( @@ -149,22 +152,26 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * rToken.basketsNeeded to the current basket holdings. Haircut time. */ + (TradingContext memory ctx, Registry memory reg) = tradingContext(basketsHeld); ( bool doTrade, TradeRequest memory req, TradePrices memory prices - ) = RecollateralizationLibP1.prepareRecollateralizationTrade(this, basketsHeld); + ) = RecollateralizationLibP1.prepareRecollateralizationTrade(ctx, reg); if (doTrade) { + IERC20 sellERC20 = req.sell.erc20(); + // Seize RSR if needed - if (req.sell.erc20() == rsr) { - uint256 bal = req.sell.erc20().balanceOf(address(this)); + if (sellERC20 == rsr) { + uint256 bal = sellERC20.balanceOf(address(this)); if (req.sellAmount > bal) stRSR.seizeRSR(req.sellAmount - bal); } // Execute Trade ITrade trade = tryTrade(kind, req, prices); - tradeEnd[kind] = trade.endTime(); + tradeEnd[kind] = trade.endTime(); // {s} + tokensOut[sellERC20] = trade.sellAmount(); // {tok} } else { // Haircut time compromiseBasketsNeeded(basketsHeld.bottom); @@ -184,7 +191,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { require(ArrayLib.allUnique(erc20s), "duplicate tokens"); assetRegistry.refresh(); - furnace.melt(); BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(this)); @@ -212,20 +218,23 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * RToken traders according to the distribution totals. */ - // Forward any RSR held to StRSR pool; RSR should never be sold for RToken yield + // Forward any RSR held to StRSR pool and payout rewards + // RSR should never be sold for RToken yield if (rsr.balanceOf(address(this)) > 0) { // For CEI, this is an interaction "within our system" even though RSR is already live IERC20(address(rsr)).safeTransfer(address(stRSR), rsr.balanceOf(address(this))); + stRSR.payoutRewards(); } // Mint revenue RToken // Keep backingBuffer worth of collateral before recognizing revenue - uint192 needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // {BU} - if (basketsHeld.bottom > needed) { - rToken.mint(basketsHeld.bottom - needed); - needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // keep buffer + uint192 baskets = (basketsHeld.bottom.div(FIX_ONE + backingBuffer)); + if (baskets > rToken.basketsNeeded()) { + rToken.mint(baskets - rToken.basketsNeeded()); } + uint192 needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // {BU} + // At this point, even though basketsNeeded may have changed, we are: // - We're fully collateralized // - The BU exchange rate {BU/rTok} did not decrease @@ -245,6 +254,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // delta: {qTok}, the excess quantity of this asset that we hold uint256 delta = bal.minus(req).shiftl_toUint(int8(asset.erc20Decimals())); uint256 tokensPerShare = delta / (totals.rTokenTotal + totals.rsrTotal); + if (tokensPerShare == 0) continue; // no div-by-0: Distributor guarantees (totals.rTokenTotal + totals.rsrTotal) > 0 // initial division is intentional here! We'd rather save the dust than be unfair @@ -263,6 +273,40 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // It's okay if there is leftover dust for RToken or a surplus asset (not RSR) } + // === View === + + /// Structs for trading + /// @param basketsHeld The number of baskets held by the BackingManager + /// @return ctx The TradingContext + /// @return reg Contents of AssetRegistry.getRegistry() + function tradingContext(BasketRange memory basketsHeld) + public + view + returns (TradingContext memory ctx, Registry memory reg) + { + reg = assetRegistry.getRegistry(); + + ctx.basketsHeld = basketsHeld; + ctx.bh = basketHandler; + ctx.ar = assetRegistry; + ctx.stRSR = stRSR; + ctx.rsr = rsr; + ctx.rToken = rToken; + ctx.minTradeVolume = minTradeVolume; + ctx.maxTradeSlippage = maxTradeSlippage; + ctx.quantities = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.quantities[i] = basketHandler.quantityUnsafe(reg.erc20s[i], reg.assets[i]); + } + ctx.bals = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.bals[i] = reg.assets[i].bal(address(this)) + tokensOut[reg.erc20s[i]]; + + // include StRSR's balance for RSR + if (reg.erc20s[i] == rsr) ctx.bals[i] += reg.assets[i].bal(address(stRSR)); + } + } + // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting @@ -307,5 +351,5 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[39] private __gap; + uint256[38] private __gap; } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 2cb493d1a3..fa076253bd 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -121,6 +121,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 i = 0; i < len; ++i) refAmts[i] = basket.refAmts[basket.erc20s[i]]; emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; + + trackStatus(); } /// Switch the basket, only callable directly by governance or after a default @@ -137,7 +139,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { require( main.hasRole(OWNER, _msgSender()) || - (status() == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), + (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); _switchBasket(); @@ -318,6 +320,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { /// Should not revert /// lowLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/BU} The lower end of the lot price estimate /// @return lotHigh {UoA/BU} The upper end of the lot price estimate // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) @@ -421,7 +424,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 k = 0; k < len; ++k) { if (b.erc20s[j] == erc20sAll[k]) { erc20Index = k; - continue; + break; } } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index cfc6100a93..0111d25bc3 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -63,6 +63,10 @@ contract BrokerP1 is ComponentP1, IBroker { // Whether Dutch Auctions are currently disabled, per ERC20 mapping(IERC20Metadata => bool) public dutchTradeDisabled; + // === 3.1.0 === + + IRToken private rToken; + // ==== Invariant ==== // (trades[addr] == true) iff this contract has created an ITrade clone at addr @@ -81,10 +85,7 @@ contract BrokerP1 is ComponentP1, IBroker { uint48 dutchAuctionLength_ ) external initializer { __Component_init(main_); - - backingManager = main_.backingManager(); - rsrTrader = main_.rsrTrader(); - rTokenTrader = main_.rTokenTrader(); + cacheComponents(); setGnosis(gnosis_); setBatchTradeImplementation(batchTradeImplementation_); @@ -93,6 +94,14 @@ contract BrokerP1 is ComponentP1, IBroker { setDutchAuctionLength(dutchAuctionLength_); } + /// Call after upgrade to >= 3.1.0 + function cacheComponents() public { + backingManager = main.backingManager(); + rsrTrader = main.rsrTrader(); + rTokenTrader = main.rTokenTrader(); + rToken = main.rToken(); + } + /// Handle a trade request by deploying a customized disposable trading contract /// @param kind TradeKind.DUTCH_AUCTION or TradeKind.BATCH_AUCTION /// @dev Requires setting an allowance in advance @@ -127,9 +136,9 @@ contract BrokerP1 is ComponentP1, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected - // checks: not paused (trading), not frozen, caller is a Trade this contract cloned + // checks: caller is a Trade this contract cloned // effects: disabled' = true - function reportViolation() external notTradingPausedOrFrozen { + function reportViolation() external { require(trades[_msgSender()], "unrecognized trade contract"); ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); @@ -256,6 +265,11 @@ contract BrokerP1 is ComponentP1, IBroker { "dutch auctions disabled for token pair" ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); + require( + priceNotDecayed(req.sell) && priceNotDecayed(req.buy), + "dutch auctions require live prices" + ); + DutchTrade trade = DutchTrade(address(dutchTradeImplementation).clone()); trades[address(trade)] = true; @@ -270,10 +284,15 @@ contract BrokerP1 is ComponentP1, IBroker { return trade; } + /// @return true iff the price is not decayed, or it's the RTokenAsset + function priceNotDecayed(IAsset asset) private view returns (bool) { + return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(rToken); + } + /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[42] private __gap; + uint256[41] private __gap; } diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index ca818f5a14..776e19fe5a 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -57,13 +57,17 @@ contract DistributorP1 is ComponentP1, IDistributor { // destinations' = destinations.add(dest) // distribution' = distribution.set(dest, share) function setDistribution(address dest, RevenueShare memory share) external governance { + // solhint-disable-next-line no-empty-blocks + try main.rsrTrader().distributeTokenToBuy() {} catch {} + // solhint-disable-next-line no-empty-blocks + try main.rTokenTrader().distributeTokenToBuy() {} catch {} + _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); } struct Transfer { - IERC20 erc20; address addrTo; uint256 amount; } @@ -94,8 +98,8 @@ contract DistributorP1 is ComponentP1, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - require(totalShares > 0, "nothing to distribute"); - tokensPerShare = amount / totalShares; + if (totalShares > 0) tokensPerShare = amount / totalShares; + require(tokensPerShare > 0, "nothing to distribute"); } // Evenly distribute revenue tokens per distribution share. @@ -107,6 +111,8 @@ contract DistributorP1 is ComponentP1, IDistributor { address furnaceAddr = furnace; // gas-saver address stRSRAddr = stRSR; // gas-saver + bool accountRewards = false; + for (uint256 i = 0; i < destinations.length(); ++i) { address addrTo = destinations.at(i); @@ -118,15 +124,13 @@ contract DistributorP1 is ComponentP1, IDistributor { if (addrTo == FURNACE) { addrTo = furnaceAddr; + if (transferAmt > 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = stRSRAddr; + if (transferAmt > 0) accountRewards = true; } - transfers[numTransfers] = Transfer({ - erc20: erc20, - addrTo: addrTo, - amount: transferAmt - }); + transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); numTransfers++; } emit RevenueDistributed(erc20, caller, amount); @@ -134,7 +138,16 @@ contract DistributorP1 is ComponentP1, IDistributor { // == Interactions == for (uint256 i = 0; i < numTransfers; i++) { Transfer memory t = transfers[i]; - IERC20Upgradeable(address(t.erc20)).safeTransferFrom(caller, t.addrTo, t.amount); + IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); + } + + // Perform reward accounting + if (accountRewards) { + if (isRSR) { + main.stRSR().payoutRewards(); + } else { + main.furnace().melt(); + } } } diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 923ba33737..63dcc695d4 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -71,7 +71,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { // actions: // rToken.melt(payoutAmount), paying payoutAmount to RToken holders - function melt() external notFrozen { + function melt() public { if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; // # of whole periods that have passed since lastPayout @@ -90,15 +90,9 @@ contract FurnaceP1 is ComponentP1, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { - if (lastPayout > 0) { - // solhint-disable-next-line no-empty-blocks - try this.melt() {} catch { - uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; - lastPayout += numPeriods * PERIOD; - lastPayoutBal = rToken.balanceOf(address(this)); - } - } require(ratio_ <= MAX_RATIO, "invalid ratio"); + melt(); // cannot revert + // The ratio can safely be set to 0 to turn off payouts, though it is not recommended emit RatioSet(ratio, ratio_); ratio = ratio_; diff --git a/contracts/p1/Main.sol b/contracts/p1/Main.sol index 43bddcaed7..21781ca082 100644 --- a/contracts/p1/Main.sol +++ b/contracts/p1/Main.sol @@ -43,10 +43,9 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad /// @dev Not intended to be used in production, only for equivalence with P0 function poke() external { // == Refresher == - assetRegistry.refresh(); + assetRegistry.refresh(); // runs furnace.melt() // == CE block == - if (!frozen()) furnace.melt(); stRSR.payoutRewards(); } diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 8b447d4273..1c07b650ef 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -108,7 +108,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Refresh == assetRegistry.refresh(); - furnace.melt(); // == Checks-effects block == @@ -182,8 +181,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { function redeemTo(address recipient, uint256 amount) public notFrozen { // == Refresh == assetRegistry.refresh(); - // solhint-disable-next-line no-empty-blocks - try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == @@ -255,8 +252,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { ) external notFrozen { // == Refresh == assetRegistry.refresh(); - // solhint-disable-next-line no-empty-blocks - try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 43253c6b0e..998bdc951f 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -53,7 +53,12 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant - _distributeTokenToBuy(); + + // solhint-disable-next-line no-empty-blocks + try this.distributeTokenToBuy() {} catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + } // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -107,6 +112,12 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { uint256 len = erc20s.length; require(len > 0, "empty erc20s list"); require(len == kinds.length, "length mismatch"); + RevenueTotals memory revTotals = distributor.totals(); + require( + (tokenToBuy == rsr && revTotals.rsrTotal > 0) || + (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal > 0), + "zero distribution" + ); // Calculate if the trade involves any RToken // Distribute tokenToBuy if supplied in ERC20s list @@ -123,10 +134,8 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { IAsset assetToBuy = assetRegistry.toAsset(tokenToBuy); // Refresh everything if RToken is involved - if (involvesRToken) { - assetRegistry.refresh(); - furnace.melt(); - } else { + if (involvesRToken) assetRegistry.refresh(); + else { // Otherwise: refresh just the needed assets and nothing more for (uint256 i = 0; i < len; ++i) { assetRegistry.toAsset(erc20s[i]).refresh(); @@ -135,7 +144,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { } // Cache and validate buyHigh - (uint192 buyLow, uint192 buyHigh) = assetToBuy.lotPrice(); // {UoA/tok} + (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); // For each ERC20 that isn't the tokenToBuy, start an auction of the given kind @@ -147,7 +156,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { require(erc20.balanceOf(address(this)) > 0, "0 balance"); IAsset assetToSell = assetRegistry.toAsset(erc20); - (uint192 sellLow, uint192 sellHigh) = assetToSell.lotPrice(); // {UoA/tok} + (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} TradeInfo memory trade = TradeInfo({ sell: assetToSell, diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 527d63f50c..faff182759 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -76,15 +76,15 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // === Financial State: Drafts === // Era. If drafts get wiped out due to RSR seizure, increment the era to zero draft values. // Only ever directly written by beginDraftEra() - uint256 internal draftEra; + uint256 internal draftEra; // {draftEra} // Drafts: share of the withdrawing tokens. Not transferrable and not revenue-earning. struct CumulativeDraft { // Avoid re-using uint192 in order to avoid confusion with our type system; 176 is enough uint176 drafts; // Total amount of drafts that will become available // {qDrafts} uint64 availableAt; // When the last of the drafts will become available } - // draftEra => ({account} => {drafts}) - mapping(uint256 => mapping(address => CumulativeDraft[])) public draftQueues; // {drafts} + // {draftEra} => ({account} => {qDrafts}) + mapping(uint256 => mapping(address => CumulativeDraft[])) public draftQueues; // {qDrafts} mapping(uint256 => mapping(address => uint256)) public firstRemainingDraft; // draft index uint256 private totalDrafts; // Total of all drafts {qDrafts} uint256 private draftRSR; // Amount of RSR backing all drafts {qRSR} @@ -285,7 +285,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // Create draft (uint256 index, uint64 availableAt) = pushDraft(account, rsrAmount); - emit UnstakingStarted(index, era, account, rsrAmount, stakeAmount, availableAt); + emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); } /// Complete an account's unstaking; callable by anyone @@ -564,6 +564,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab return totalDrafts; } + /// @return {draftEra} The current era for drafts (withdrawals) + function getDraftEra() external view returns (uint256) { + return draftEra; + } + // ==== Internal Functions ==== /// Assign reward payouts to the staker pool diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index dd86e45ca1..8edb10f86c 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -8,29 +8,6 @@ import "../../interfaces/IBackingManager.sol"; import "../../libraries/Fixed.sol"; import "./TradeLib.sol"; -/// Struct purposes: -/// 1. Configure trading -/// 2. Stay under stack limit with fewer vars -/// 3. Cache information such as component addresses to save on gas -struct TradingContext { - BasketRange basketsHeld; // {BU} - // basketsHeld.top is the number of partial baskets units held - // basketsHeld.bottom is the number of full basket units held - - // Components - IBackingManager bm; - IBasketHandler bh; - IAssetRegistry ar; - IStRSR stRSR; - IERC20 rsr; - IRToken rToken; - // Gov Vars - uint192 minTradeVolume; // {UoA} - uint192 maxTradeSlippage; // {1} - // Cached values - uint192[] quantities; // {tok/BU} basket quantities -} - /** * @title RecollateralizationLibP1 * @notice An informal extension of BackingManager that implements the rebalancing logic @@ -56,7 +33,7 @@ library RecollateralizationLibP1 { // let trade = nextTradePair(...) // if trade.sell is not a defaulted collateral, prepareTradeToCoverDeficit(...) // otherwise, prepareTradeSell(...) taking the minBuyAmount as the dependent variable - function prepareRecollateralizationTrade(IBackingManager bm, BasketRange memory basketsHeld) + function prepareRecollateralizationTrade(TradingContext memory ctx, Registry memory reg) external view returns ( @@ -65,31 +42,8 @@ library RecollateralizationLibP1 { TradePrices memory prices ) { - IMain main = bm.main(); - - // === Prepare TradingContext cache === - TradingContext memory ctx; - - ctx.basketsHeld = basketsHeld; - ctx.bm = bm; - ctx.bh = main.basketHandler(); - ctx.ar = main.assetRegistry(); - ctx.stRSR = main.stRSR(); - ctx.rsr = main.rsr(); - ctx.rToken = main.rToken(); - ctx.minTradeVolume = bm.minTradeVolume(); - ctx.maxTradeSlippage = bm.maxTradeSlippage(); - - // Calculate quantities - Registry memory reg = ctx.ar.getRegistry(); - ctx.quantities = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.quantities[i] = ctx.bh.quantityUnsafe(reg.erc20s[i], reg.assets[i]); - } - - // ============================ - // Compute a target basket range for trading - {BU} + // The basket range is the full range of projected outcomes for the rebalancing process BasketRange memory range = basketRange(ctx, reg); // Select a pair to trade next, if one exists @@ -131,22 +85,17 @@ library RecollateralizationLibP1 { // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty // the largest amount possible with each trade. // - // How do we know this algorithm converges? - // Assumption: constant oracle prices; monotonically increasing refPerTok() - // Any volume traded narrows the BU band. Why: - // - We might increase `basketsHeld.bottom` from run-to-run, but will never decrease it - // - We might decrease the UoA amount of excess balances beyond `basketsHeld.bottom` from - // run-to-run, but will never increase it - // - We might decrease the UoA amount of missing balances up-to `basketsHeld.top` from - // run-to-run, but will never increase it + // Algorithm Invariant: every increase of basketsHeld.bottom causes basketsRange().low to + // reach a new maximum. Note that basketRange().low may decrease slightly along the way. + // Assumptions: constant oracle prices; monotonically increasing refPerTok; no supply changes // // Preconditions: // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top // - reg contains erc20 + asset + quantities arrays in same order and without duplicates // Trading Strategy: // - We will not aim to hold more than rToken.basketsNeeded() BUs - // - No double trades: if we buy B in one trade, we won't sell B in another trade - // Caveat: Unless the asset we're selling is IFFY/DISABLED + // - No double trades: capital converted from token A to token B should not go to token C + // unless the clearing price was outside the expected price range // - The best price we might get for a trade is at the high sell price and low buy price // - The worst price we might get for a trade is at the low sell price and // the high buy price, multiplied by ( 1 - maxTradeSlippage ) @@ -164,7 +113,12 @@ library RecollateralizationLibP1 { view returns (BasketRange memory range) { - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.lotPrice(); // {UoA/BU} + // tradesOpen will be 0 when called by prepareRecollateralizationTrade() + // tradesOpen can be > 0 when called by RTokenAsset.basketRange() + + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} + require(buPriceLow > 0 && buPriceHigh < FIX_MAX, "BUs unpriced"); + uint192 basketsNeeded = ctx.rToken.basketsNeeded(); // {BU} // Cap ctx.basketsHeld.top @@ -189,28 +143,17 @@ library RecollateralizationLibP1 { // Exclude RToken balances to avoid double counting value if (reg.erc20s[i] == IERC20(address(ctx.rToken))) continue; - uint192 bal = reg.assets[i].bal(address(ctx.bm)); // {tok} - - // For RSR, include the staking balance - if (reg.erc20s[i] == ctx.rsr) { - bal = bal.plus(reg.assets[i].bal(address(ctx.stRSR))); - } - - if (ctx.quantities[i] == 0) { - // Skip over dust-balance assets not in the basket - (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} - // Intentionally include value of IFFY/DISABLED collateral - if (!TradeLib.isEnoughToSell(reg.assets[i], bal, lotLow, ctx.minTradeVolume)) { - continue; - } + // Skip over dust-balance assets not in the basket + // Intentionally include value of IFFY/DISABLED collateral + if ( + ctx.quantities[i] == 0 && + !TradeLib.isEnoughToSell(reg.assets[i], ctx.bals[i], low, ctx.minTradeVolume) + ) { + continue; } - (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} - // price() is better than lotPrice() here: it's important to not underestimate how - // much value could be in a token that is unpriced by using a decaying high lotPrice. - // price() will return [0, FIX_MAX] in this case, which is preferable. - // throughout these sections +/- is same as Fix.plus/Fix.minus and is Fix.gt/.lt // deltaTop: optimistic case @@ -220,17 +163,21 @@ library RecollateralizationLibP1 { // {tok} = {tok/BU} * {BU} uint192 anchor = ctx.quantities[i].mul(ctx.basketsHeld.top, CEIL); - if (anchor > bal) { + if (anchor > ctx.bals[i]) { // deficit: deduct optimistic estimate of baskets missing // {BU} = {UoA/tok} * {tok} / {UoA/BU} - deltaTop -= int256(uint256(low.mulDiv(anchor - bal, buPriceHigh, FLOOR))); + deltaTop -= int256( + uint256(low.mulDiv(anchor - ctx.bals[i], buPriceHigh, FLOOR)) + ); // does not need underflow protection: using low price of asset } else { // surplus: add-in optimistic estimate of baskets purchaseable // {BU} = {UoA/tok} * {tok} / {UoA/BU} - deltaTop += int256(uint256(high.safeMulDiv(bal - anchor, buPriceLow, CEIL))); + deltaTop += int256( + uint256(high.safeMulDiv(ctx.bals[i] - anchor, buPriceLow, CEIL)) + ); } } @@ -242,12 +189,12 @@ library RecollateralizationLibP1 { // (1) Sum token value at low price // {UoA} = {UoA/tok} * {tok} - uint192 val = low.mul(bal - anchor, FLOOR); + uint192 val = low.mul(ctx.bals[i] - anchor, FLOOR); // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price (lotLow, technically), - // so min trade volumes are always assesed based on low prices. At this point + // A: Our use of isEnoughToSell always uses the low price, + // so min trade volumes are always assessed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up // to straightforwardly deduct the minTradeVolume before trying to buy BUs. @@ -305,9 +252,9 @@ library RecollateralizationLibP1 { /// prices.buyLow {UoA/buyTok} The best-case price of the buy token on secondary markets /// prices.buyHigh {UoA/buyTok} The worst-case price of the buy token on secondary markets /// - // Defining "sell" and "buy": - // If bal(e) > (quantity(e) * range.top), then e is in surplus by the difference - // If bal(e) < (quantity(e) * range.bottom), then e is in deficit by the difference + // For each asset e: + // If bal(e) > (quantity(e) * range.top), then e is in surplus by the difference + // If bal(e) < (quantity(e) * range.bottom), then e is in deficit by the difference // // First, ignoring RSR: // `trade.sell` is the token from erc20s with the greatest surplus value (in UoA), @@ -330,26 +277,33 @@ library RecollateralizationLibP1 { Registry memory reg, BasketRange memory range ) private view returns (TradeInfo memory trade) { + // assert(tradesOpen == 0); // guaranteed by BackingManager.rebalance() + MaxSurplusDeficit memory maxes; maxes.surplusStatus = CollateralStatus.IFFY; // least-desirable sell status + uint256 rsrIndex = reg.erc20s.length; // invalid index, to-start + // Iterate over non-RSR/non-RToken assets // (no space on the stack to cache erc20s.length) for (uint256 i = 0; i < reg.erc20s.length; ++i) { - if (reg.erc20s[i] == ctx.rsr || address(reg.erc20s[i]) == address(ctx.rToken)) continue; - - uint192 bal = reg.assets[i].bal(address(ctx.bm)); // {tok} + if (address(reg.erc20s[i]) == address(ctx.rToken)) continue; + else if (reg.erc20s[i] == ctx.rsr) { + rsrIndex = i; + continue; + } // {tok} = {BU} * {tok/BU} // needed(Top): token balance needed for range.top baskets: quantity(e) * range.top uint192 needed = range.top.mul(ctx.quantities[i], CEIL); // {tok} - if (bal.gt(needed)) { - (uint192 lotLow, uint192 lotHigh) = reg.assets[i].lotPrice(); // {UoA/sellTok} - if (lotHigh == 0) continue; // skip over worthless assets + if (ctx.bals[i].gt(needed)) { + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/sellTok} + + if (high == 0) continue; // skip over worthless assets // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = bal.minus(needed).mul(lotLow, FLOOR); + uint192 delta = ctx.bals[i].minus(needed).mul(low, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -363,15 +317,15 @@ library RecollateralizationLibP1 { isBetterSurplus(maxes, status, delta) && TradeLib.isEnoughToSell( reg.assets[i], - bal.minus(needed), - lotLow, + ctx.bals[i].minus(needed), + low, ctx.minTradeVolume ) ) { trade.sell = reg.assets[i]; - trade.sellAmount = bal.minus(needed); - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.sellAmount = ctx.bals[i].minus(needed); + trade.prices.sellLow = low; + trade.prices.sellHigh = high; maxes.surplusStatus = status; maxes.surplus = delta; @@ -380,19 +334,19 @@ library RecollateralizationLibP1 { // needed(Bottom): token balance needed at bottom of the basket range needed = range.bottom.mul(ctx.quantities[i], CEIL); // {buyTok}; - if (bal.lt(needed)) { - uint192 amtShort = needed.minus(bal); // {buyTok} - (uint192 lotLow, uint192 lotHigh) = reg.assets[i].lotPrice(); // {UoA/buyTok} + if (ctx.bals[i].lt(needed)) { + uint192 amtShort = needed.minus(ctx.bals[i]); // {buyTok} + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} - uint192 delta = amtShort.mul(lotHigh, CEIL); + uint192 delta = amtShort.mul(high, CEIL); // The best asset to buy is whichever asset has the largest deficit if (delta.gt(maxes.deficit)) { trade.buy = reg.assets[i]; trade.buyAmount = amtShort; - trade.prices.buyLow = lotLow; - trade.prices.buyHigh = lotHigh; + trade.prices.buyLow = low; + trade.prices.buyHigh = high; maxes.deficit = delta; } @@ -402,21 +356,22 @@ library RecollateralizationLibP1 { // Use RSR if needed if (address(trade.sell) == address(0) && address(trade.buy) != address(0)) { - IAsset rsrAsset = ctx.ar.toAsset(ctx.rsr); - - uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( - rsrAsset.bal(address(ctx.stRSR)) - ); - (uint192 lotLow, uint192 lotHigh) = rsrAsset.lotPrice(); // {UoA/RSR} + (uint192 low, uint192 high) = reg.assets[rsrIndex].price(); // {UoA/RSR} + // if rsr does not have a registered asset the below array accesses will revert if ( - lotHigh > 0 && - TradeLib.isEnoughToSell(rsrAsset, rsrAvailable, lotLow, ctx.minTradeVolume) + high > 0 && + TradeLib.isEnoughToSell( + reg.assets[rsrIndex], + ctx.bals[rsrIndex], + low, + ctx.minTradeVolume + ) ) { - trade.sell = rsrAsset; - trade.sellAmount = rsrAvailable; - trade.prices.sellLow = lotLow; - trade.prices.sellHigh = lotHigh; + trade.sell = reg.assets[rsrIndex]; + trade.sellAmount = ctx.bals[rsrIndex]; + trade.prices.sellLow = low; + trade.prices.sellHigh = high; } } } diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index f0921dd511..8d3c8e01c9 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -62,7 +62,7 @@ library TradeLib { ); // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} // Calculate equivalent buyAmount within [0, FIX_MAX] diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 24b2044d38..1c6217e8ec 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -97,7 +97,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl // == Interactions == (uint256 soldAmt, uint256 boughtAmt) = trade.settle(); - emit TradeSettled(trade, trade.sell(), trade.buy(), soldAmt, boughtAmt); + emit TradeSettled(trade, sell, trade.buy(), soldAmt, boughtAmt); } /// Try to initiate a trade with a trading partner provided by the broker @@ -119,7 +119,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl TradePrices memory prices ) internal returns (ITrade trade) { IERC20 sell = req.sell.erc20(); - assert(address(trades[sell]) == address(0)); + assert(address(trades[sell]) == address(0)); // ensure calling class has checked this // Set allowance via custom approval -- first sets allowance to 0, then sets allowance // to either the requested amount or the maximum possible amount, if that fails. diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index bf7cef6022..60e575cf71 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -88,7 +88,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 1bb044c239..302a6a6731 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -7,10 +7,14 @@ import "../../interfaces/IAsset.sol"; import "./OracleLib.sol"; import "./VersionedAsset.sol"; +uint48 constant ORACLE_TIMEOUT_BUFFER = 300; // {s} 5 minutes + contract Asset is IAsset, VersionedAsset { using FixLib for uint192; using OracleLib for AggregatorV3Interface; + uint192 public constant MAX_HIGH_PRICE_BUFFER = 2 * FIX_ONE; // {UoA/tok} 200% + AggregatorV3Interface public immutable chainlinkFeed; // {UoA/tok} IERC20Metadata public immutable erc20; @@ -38,7 +42,7 @@ contract Asset is IAsset, VersionedAsset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of + /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, @@ -60,7 +64,7 @@ contract Asset is IAsset, VersionedAsset { erc20 = erc20_; erc20Decimals = erc20.decimals(); maxTradeVolume = maxTradeVolume_; - oracleTimeout = oracleTimeout_; + oracleTimeout = oracleTimeout_ + ORACLE_TIMEOUT_BUFFER; // add 300s as a buffer } /// Can revert, used by other contract functions in order to catch errors @@ -108,54 +112,69 @@ contract Asset is IAsset, VersionedAsset { } /// Should not revert + /// low should be nonzero if the asset could be worth selling /// @dev Should be general enough to not need to be overridden - /// @return {UoA/tok} The lower end of the price estimate - /// @return {UoA/tok} The upper end of the price estimate - function price() public view virtual returns (uint192, uint192) { - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - assert(low <= high); - return (low, high); - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return (0, FIX_MAX); - } - } - - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @dev Should be general enough to not need to be overridden - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + /// @return _low {UoA/tok} The lower end of the price estimate + /// @return _high {UoA/tok} The upper end of the price estimate + /// @notice If the price feed is broken, _low will decay downwards and _high will decay upwards + /// If tryPrice() is broken for more than `oracleTimeout + priceTimeout` seconds, + /// _low will be 0 and _high will be FIX_MAX. + /// Because the price decay begins at `oracleTimeout` seconds and not `updateTime` from the + /// price feed, the price feed can be broken for up to `2 * oracleTimeout` seconds without + /// affecting the price estimate. This could happen if the Asset is refreshed just before + /// the oracleTimeout is reached, forcing a second period of oracleTimeout to pass before + /// the price begins to decay. + function price() public view virtual returns (uint192 _low, uint192 _high) { try this.tryPrice() returns (uint192 low, uint192 high, uint192) { // if the price feed is still functioning, use that - lotLow = low; - lotHigh = high; + _low = low; + _high = high; } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - // if the price feed is broken, use a decayed historical value + // if the price feed is broken, decay _low downwards and _high upwards uint48 delta = uint48(block.timestamp) - lastSave; // {s} if (delta <= oracleTimeout) { - lotLow = savedLowPrice; - lotHigh = savedHighPrice; + // use saved prices for at least the oracleTimeout + _low = savedLowPrice; + _high = savedHighPrice; } else if (delta >= oracleTimeout + priceTimeout) { - return (0, 0); // no price after full timeout + // unpriced after a full timeout + return (0, FIX_MAX); } else { // oracleTimeout <= delta <= oracleTimeout + priceTimeout - // {1} = {s} / {s} - uint192 lotMultiplier = divuu(oracleTimeout + priceTimeout - delta, priceTimeout); - + // Decay _high upwards to 3x savedHighPrice // {UoA/tok} = {UoA/tok} * {1} - lotLow = savedLowPrice.mul(lotMultiplier); - lotHigh = savedHighPrice.mul(lotMultiplier); + _high = savedHighPrice.safeMul( + FIX_ONE + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout), + ROUND + ); // during overflow should not revert + + // if _high is FIX_MAX, leave at UNPRICED + if (_high != FIX_MAX) { + // Decay _low downwards from savedLowPrice to 0 + // {UoA/tok} = {UoA/tok} * {1} + _low = savedLowPrice.muluDivu( + oracleTimeout + priceTimeout - delta, + priceTimeout + ); + // during overflow should revert since a FIX_MAX _low breaks everything + } } } - assert(lotLow <= lotHigh); + assert(_low <= _high); + } + + /// Should not revert + /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + return price(); } /// @return {tok} The balance of the ERC20 in whole tokens diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index 67d0c12f34..dfc36ff73e 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -27,6 +27,8 @@ contract EURFiatCollateral is FiatCollateral { ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index 9110117bc5..d3afad43c5 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -75,6 +75,10 @@ contract FiatCollateral is ICollateral, Asset { } require(config.delayUntilDefault <= 1209600, "delayUntilDefault too long"); + // Note: This contract is designed to allow setting defaultThreshold = 0 to disable + // default checks. You can apply the check below to child contracts when required + // require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetName = config.targetName; delayUntilDefault = config.delayUntilDefault; @@ -122,7 +126,7 @@ contract FiatCollateral is ICollateral, Asset { function refresh() public virtual override(Asset, IAsset) { CollateralStatus oldStatus = status(); - // Check for soft default + save lotPrice + // Check for soft default + save price try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {target/ref} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index 0fc8e40884..60b0bd8329 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -30,6 +30,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_exchangeRateChainlinkFeed) != address(0), "missing exchangeRate feed"); require(_exchangeRateChainlinkTimeout != 0, "exchangeRateChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); exchangeRateChainlinkFeed = _exchangeRateChainlinkFeed; exchangeRateChainlinkTimeout = _exchangeRateChainlinkTimeout; @@ -52,7 +53,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/NonFiatCollateral.sol b/contracts/plugins/assets/NonFiatCollateral.sol index 2e6b3c531f..1923dea24a 100644 --- a/contracts/plugins/assets/NonFiatCollateral.sol +++ b/contracts/plugins/assets/NonFiatCollateral.sol @@ -27,6 +27,8 @@ contract NonFiatCollateral is FiatCollateral { ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index 68a9da9863..e9487fe671 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -18,12 +18,14 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { using OracleLib for AggregatorV3Interface; // Component addresses are not mutable in protocol, so it's safe to cache these - IMain public immutable main; - IBasketHandler public immutable basketHandler; IAssetRegistry public immutable assetRegistry; + IBasketHandler public immutable basketHandler; IBackingManager public immutable backingManager; + IFurnace public immutable furnace; + IERC20 public immutable rsr; + IStRSR public immutable stRSR; - IERC20Metadata public immutable erc20; + IERC20Metadata public immutable erc20; // The RToken uint8 public immutable erc20Decimals; @@ -37,10 +39,13 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { require(address(erc20_) != address(0), "missing erc20"); require(maxTradeVolume_ > 0, "invalid max trade volume"); - main = erc20_.main(); - basketHandler = main.basketHandler(); + IMain main = erc20_.main(); assetRegistry = main.assetRegistry(); + basketHandler = main.basketHandler(); backingManager = main.backingManager(); + furnace = main.furnace(); + rsr = main.rsr(); + stRSR = main.stRSR(); erc20 = IERC20Metadata(address(erc20_)); erc20Decimals = erc20_.decimals(); @@ -55,10 +60,8 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// `basketHandler.price()`. When `range.bottom == range.top` then there is no compounding. /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - function tryPrice(bool useLotPrice) external view virtual returns (uint192 low, uint192 high) { - (uint192 lowBUPrice, uint192 highBUPrice) = useLotPrice - ? basketHandler.lotPrice() - : basketHandler.price(); // {UoA/BU} + function tryPrice() external view virtual returns (uint192 low, uint192 high) { + (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(); // {UoA/BU} require(lowBUPrice != 0 && highBUPrice != FIX_MAX, "invalid price"); assert(lowBUPrice <= highBUPrice); // not obviously true just by inspection @@ -79,21 +82,21 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { assert(low <= high); // not obviously true } - // solhint-disable no-empty-blocks function refresh() public virtual override { - // No need to save lastPrice; can piggyback off the backing collateral's lotPrice() + // No need to save lastPrice; can piggyback off the backing collateral's saved prices + + furnace.melt(); + if (msg.sender != address(assetRegistry)) assetRegistry.refresh(); cachedOracleData.cachedAtTime = 0; // force oracle refresh } - // solhint-enable no-empty-blocks - /// Should not revert /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { - try this.tryPrice(false) returns (uint192 low, uint192 high) { + try this.tryPrice() returns (uint192 low, uint192 high) { return (low, high); } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data @@ -104,18 +107,11 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// Should not revert /// lotLow should be nonzero when the asset might be worth selling - /// @dev See `tryPrice` caveat about possible compounding error in calculating price + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - try this.tryPrice(true) returns (uint192 low, uint192 high) { - lotLow = low; - lotHigh = high; - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return (0, 0); - } + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { + return price(); } /// @return {tok} The balance of the ERC20 in whole tokens @@ -143,10 +139,15 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-enable no-empty-blocks + /// Force an update to the cache, including refreshing underlying assets + /// @dev Can revert if RToken is unpriced function forceUpdatePrice() external { _updateCachedPrice(); } + /// @dev Can revert if RToken is unpriced + /// @return rTokenPrice {UoA/tok} The mean price estimate + /// @return updatedAt {s} The timestamp of the cache update function latestPrice() external returns (uint192 rTokenPrice, uint256 updatedAt) { // Situations that require an update, from most common to least common. if ( @@ -158,15 +159,17 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { _updateCachedPrice(); } - return (cachedOracleData.cachedPrice, cachedOracleData.cachedAtTime); + rTokenPrice = cachedOracleData.cachedPrice; + updatedAt = cachedOracleData.cachedAtTime; } // ==== Private ==== // Update Oracle Data function _updateCachedPrice() internal { - (uint192 low, uint192 high) = price(); + assetRegistry.refresh(); // will call furnace.melt() + (uint192 low, uint192 high) = price(); require(low != 0 && high != FIX_MAX, "invalid price"); cachedOracleData = CachedOracleData( @@ -178,7 +181,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { ); } - /// Computationally expensive basketRange calculation; used in price() & lotPrice() + /// Computationally expensive basketRange calculation; used in price() function basketRange() private view returns (BasketRange memory range) { BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(backingManager)); uint192 basketsNeeded = IRToken(address(erc20)).basketsNeeded(); // {BU} @@ -193,24 +196,9 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // the absence of an external price feed. Any RToken that gets reasonably big // should switch over to an asset with a price feed. - TradingContext memory ctx; - - ctx.basketsHeld = basketsHeld; - ctx.bm = backingManager; - ctx.bh = basketHandler; - ctx.ar = assetRegistry; - ctx.stRSR = main.stRSR(); - ctx.rsr = main.rsr(); - ctx.rToken = main.rToken(); - ctx.minTradeVolume = backingManager.minTradeVolume(); - ctx.maxTradeSlippage = backingManager.maxTradeSlippage(); - - // Calculate quantities - Registry memory reg = ctx.ar.getRegistry(); - ctx.quantities = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.quantities[i] = ctx.bh.quantityUnsafe(reg.erc20s[i], reg.assets[i]); - } + (TradingContext memory ctx, Registry memory reg) = backingManager.tradingContext( + basketsHeld + ); // will exclude UoA value from RToken balances at BackingManager range = RecollateralizationLibP1.basketRange(ctx, reg); diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index ac8371e7f2..b36945769d 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.0.1"; +string constant ASSET_VERSION = "3.1.0"; /** * @title VersionedAsset diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index 2edfd5d65b..ba1843351c 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -20,7 +20,9 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index f6e98c267e..14e72a72ca 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -41,7 +41,9 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 594db5465e..59e921e774 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -33,6 +33,7 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 5c190e6050..40eb3a9d6e 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -32,6 +32,7 @@ contract CBEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index b745028f54..4e98b7c3f2 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -41,6 +41,7 @@ contract CBEthCollateralL2 is L2LSDCollateral { { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/README.md b/contracts/plugins/assets/cbeth/README.md index 15deec4f2c..351074009d 100644 --- a/contracts/plugins/assets/cbeth/README.md +++ b/contracts/plugins/assets/cbeth/README.md @@ -15,6 +15,7 @@ This plugin allows `CBETH` holders to use their tokens as collateral in the Rese ### Functions #### refPerTok {ref/tok} + The L1 implementation (CBETHCollateral.sol) uses `token.exchange_rate()` to get the cbETH/ETH {ref/tok} contract exchange rate. The L2 implementation (CBETHCollateralL2.sol) uses the relevant chainlink oracle to get the cbETH/ETH {ref/tok} contract exchange rate (oraclized from the L1). diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index a60744893a..ce76a72635 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -29,6 +29,8 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + ICToken _cToken = ICToken(address(config.erc20)); address _underlying = _cToken.underlying(); uint8 _referenceERC20Decimals; diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index f0a44584b5..3d7dcae18f 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -30,6 +30,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { ) CTokenFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol index 286787d42a..27b37d8382 100644 --- a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol +++ b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol @@ -35,9 +35,11 @@ contract CTokenWrapper is RewardableERC20Wrapper { // === Overrides === function _claimAssetRewards() internal virtual override { + address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); + holders[0] = address(this); cTokens[0] = address(underlying); - comptroller.claimComp(address(this), cTokens); + comptroller.claimComp(holders, cTokens, false, true); } // No overrides of _deposit()/_withdraw() necessary: no staking required diff --git a/contracts/plugins/assets/compoundv2/ICToken.sol b/contracts/plugins/assets/compoundv2/ICToken.sol index 9dafd86c80..c83f9a3552 100644 --- a/contracts/plugins/assets/compoundv2/ICToken.sol +++ b/contracts/plugins/assets/compoundv2/ICToken.sol @@ -33,10 +33,26 @@ interface ICToken is IERC20Metadata { function redeem(uint256 redeemTokens) external returns (uint256); } +interface TestICToken is ICToken { + /** + * @notice Sender borrows assets from the protocol to their own address + * @param borrowAmount The amount of the underlying asset to borrow + * @return uint 0=success, otherwise a failure + */ + function borrow(uint256 borrowAmount) external returns (uint256); +} + interface IComptroller { /// Claim comp for an account, to an account - function claimComp(address account, address[] memory cTokens) external; + function claimComp( + address[] memory holders, + address[] memory cTokens, + bool borrowers, + bool suppliers + ) external; /// @return The address for COMP token function getCompAddress() external view returns (address); + + function enterMarkets(address[] calldata) external returns (uint256[] memory); } diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 5e7bd1238c..17d46dc908 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -19,12 +19,6 @@ import "./vendor/IComet.sol"; * UoA = USD */ contract CTokenV3Collateral is AppreciatingFiatCollateral { - struct CometCollateralConfig { - IERC20 rewardERC20; - uint256 reservesThresholdIffy; - uint256 reservesThresholdDisabled; - } - using OracleLib for AggregatorV3Interface; using FixLib for uint192; @@ -39,16 +33,13 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { uint192 revenueHiding, uint256 reservesThresholdIffy_ ) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); rewardERC20 = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); reservesThresholdIffy = reservesThresholdIffy_; cometDecimals = comet.decimals(); } - function bal(address account) external view override(Asset, IAsset) returns (uint192) { - return shiftl_toFix(erc20.balanceOf(account), -int8(erc20Decimals)); - } - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins function claimRewards() external override(Asset, IRewardable) { IRewardable(address(erc20)).claimRewards(); @@ -76,7 +67,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 5b7b176061..afbab80784 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -43,7 +43,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { } /// @return number of decimals - function decimals() public pure override returns (uint8) { + function decimals() public pure override(IERC20Metadata, WrappedERC20) returns (uint8) { return 6; } @@ -81,7 +81,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { address dst, uint256 amount ) internal { - if (!hasPermission(src, operator)) revert Unauthorized(); + if (!underlyingComet.hasPermission(src, operator)) revert Unauthorized(); // {Comet} uint256 srcBal = underlyingComet.balanceOf(src); if (amount > srcBal) amount = srcBal; @@ -203,7 +203,10 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { rewardsClaimed[src] = accrued; rewardsAddr.claimTo(address(underlyingComet), address(this), address(this), true); - IERC20(rewardERC20).safeTransfer(dst, owed); + + uint256 bal = rewardERC20.balanceOf(address(this)); + if (owed > bal) owed = bal; + rewardERC20.safeTransfer(dst, owed); } emit RewardsClaimed(rewardERC20, owed); } diff --git a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol index 89a9dcfb35..de2ab80ebe 100644 --- a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol @@ -10,8 +10,8 @@ import "../../../interfaces/IRewardable.sol"; interface ICusdcV3Wrapper is IWrappedERC20, IRewardable { struct UserBasic { uint104 principal; - uint64 baseTrackingAccrued; uint64 baseTrackingIndex; + uint64 baseTrackingAccrued; uint256 rewardsClaimed; } diff --git a/contracts/plugins/assets/compoundv3/WrappedERC20.sol b/contracts/plugins/assets/compoundv3/WrappedERC20.sol index b3287711d7..290a2da080 100644 --- a/contracts/plugins/assets/compoundv3/WrappedERC20.sol +++ b/contracts/plugins/assets/compoundv3/WrappedERC20.sol @@ -75,6 +75,13 @@ abstract contract WrappedERC20 is IWrappedERC20 { return _symbol; } + /** + * @dev Returns the decimals places of the token. + */ + function decimals() public pure virtual returns (uint8) { + return 18; + } + /** * @dev See {IERC20-totalSupply}. */ diff --git a/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol b/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol index a144d69112..70d9664aac 100644 --- a/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol +++ b/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol @@ -95,4 +95,12 @@ abstract contract CometExtInterface { function allowance(address owner, address spender) external view virtual returns (uint256); event Approval(address indexed owner, address indexed spender, uint256 amount); + + /** + * @notice Determine if the manager has permission to act on behalf of the owner + * @param owner The owner account + * @param manager The manager account + * @return Whether or not the manager has permission + */ + function hasPermission(address owner, address manager) external view virtual returns (bool); } diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index 5d6f985401..c59994fd56 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -88,7 +88,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; + exposedReferencePrice = underlyingRefPerTok; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 7fd4fe005b..ad3cd6ac8e 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -13,6 +13,9 @@ interface ICurveMetaPool is ICurvePool, IERC20Metadata { * This plugin contract is intended for 2-fiattoken stable metapools that * DO NOT involve RTokens, such as LUSD-fraxBP or MIM-3CRV. * + * Does not support older metapools that have a separate contract for the + * metapool's LP token. + * * tok = ConvexStakingWrapper(PairedUSDToken/USDBasePool) * ref = PairedUSDToken/USDBasePool pool invariant * tar = USD diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 420e002f4a..780a083a8b 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -42,6 +42,11 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { pairedAssetRegistry = IRToken(address(pairedToken)).main().assetRegistry(); } + function refresh() public override { + pairedAssetRegistry.refresh(); // refresh all registered assets + super.refresh(); // already handles all necessary default checks + } + /// Can revert, used by `_anyDepeggedOutsidePool()` /// Should not return FIX_MAX for low /// @return lowPaired {UoA/pairedTok} The low price estimate of the paired token diff --git a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol index e4c893f024..8531894bb9 100644 --- a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol +++ b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol @@ -17,6 +17,16 @@ interface ILiquidityGauge { function withdraw(uint256 _value) external; } +// Note: Only supports CRV rewards. If a Curve pool with multiple reward tokens is +// used, other reward tokens beyond CRV will never be claimed and distributed to +// depositors. These unclaimed rewards will be lost forever. + +// In addition to this, each wrapper deployment must be tested individually, regardless +// of the number of reward tokens it has. This contract is not compatible with all gauges +// and may revert depending on the Curve Gauge being used. For example, the +// `RewardsOnlyGauge` does not have a user_checkpoint() function, which means the +// MINTER.mint() call in this contract would revert in that case. + contract CurveGaugeWrapper is RewardableERC20Wrapper { using SafeERC20 for IERC20; @@ -46,6 +56,7 @@ contract CurveGaugeWrapper is RewardableERC20Wrapper { gauge.withdraw(_amount); } + // claim rewards - only supports CRV rewards, may not work for all gauges function _claimAssetRewards() internal virtual override { MINTER.mint(address(gauge)); } diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index 250d5b63ae..6653f450c2 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -9,7 +9,6 @@ import "@openzeppelin/contracts-v0.7/token/ERC20/SafeERC20.sol"; import "@openzeppelin/contracts-v0.7/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts-v0.7/utils/ReentrancyGuard.sol"; import "./IRewardStaking.sol"; -import "./CvxMining.sol"; interface IBooster { function poolInfo(uint256 _pid) @@ -23,6 +22,8 @@ interface IBooster { address _stash, bool _shutdown ); + + function earmarkRewards(uint256 _pid) external returns (bool); } interface IConvexDeposits { @@ -39,9 +40,13 @@ interface IConvexDeposits { ) external; } +interface ITokenWrapper { + function token() external view returns (address); +} + // if used as collateral some modifications will be needed to fit the specific platform -// Based on audited contracts: https://github.com/convex-eth/platform/blob/main/contracts/contracts/wrappers/CvxCrvStakingWrapper.sol +// Based on audited contracts: https://github.com/convex-eth/platform/blob/933ace34d896e6684345c6795bf33d4089fbd8f6/contracts/contracts/wrappers/ConvexStakingWrapper.sol contract ConvexStakingWrapper is ERC20, ReentrancyGuard { using SafeERC20 for IERC20; using SafeMath for uint256; @@ -54,8 +59,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { struct RewardType { address reward_token; address reward_pool; - uint128 reward_integral; - uint128 reward_remaining; + uint256 reward_integral; + uint256 reward_remaining; mapping(address => uint256) reward_integral_for; mapping(address => uint256) claimable_reward; } @@ -75,11 +80,10 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //rewards RewardType[] public rewards; mapping(address => uint256) public registeredRewards; + mapping(address => address) public rewardRedirect; //management bool public isInit; - address public owner; - bool internal _isShutdown; string internal _tokenname; string internal _tokensymbol; @@ -91,15 +95,15 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { bool _wrapped ); event Withdrawn(address indexed _user, uint256 _amount, bool _unwrapped); - event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); + event RewardRedirected(address indexed _account, address _forward); + event RewardAdded(address _token); + event UserCheckpoint(address _userA, address _userB); event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); constructor() public ERC20("StakedConvexToken", "stkCvx") {} function initialize(uint256 _poolId) external virtual { require(!isInit, "already init"); - owner = msg.sender; - emit OwnershipTransferred(address(0), owner); (address _lptoken, address _token, , address _rewards, , ) = IBooster(convexBooster) .poolInfo(_poolId); @@ -131,32 +135,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return 18; } - modifier onlyOwner() { - require(owner == msg.sender, "Ownable: caller is not the owner"); - _; - } - - function transferOwnership(address newOwner) public virtual onlyOwner { - require(newOwner != address(0), "Ownable: new owner is the zero address"); - emit OwnershipTransferred(owner, newOwner); - owner = newOwner; - } - - function renounceOwnership() public virtual onlyOwner { - emit OwnershipTransferred(owner, address(0)); - owner = address(0); - } - - function shutdown() external onlyOwner { - _isShutdown = true; - } - - function isShutdown() public view returns (bool) { - if (_isShutdown) return true; - (, , , , , bool isShutdown_) = IBooster(convexBooster).poolInfo(convexPoolId); - return isShutdown_; - } - function setApprovals() public { IERC20(curveToken).safeApprove(convexBooster, 0); IERC20(curveToken).safeApprove(convexBooster, uint256(-1)); @@ -192,12 +170,18 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //send to self to warmup state //slither-disable-next-line unchecked-transfer IERC20(cvx).transfer(address(this), 0); + emit RewardAdded(crv); + emit RewardAdded(cvx); } uint256 extraCount = IRewardStaking(mainPool).extraRewardsLength(); for (uint256 i = 0; i < extraCount; i++) { address extraPool = IRewardStaking(mainPool).extraRewards(i); address extraToken = IRewardStaking(extraPool).rewardToken(); + //from pool 151, extra reward tokens are wrapped + if (convexPoolId >= 151) { + extraToken = ITokenWrapper(extraToken).token(); + } if (extraToken == cvx) { //update cvx reward pool address rewards[CVX_INDEX].reward_pool = extraPool; @@ -205,13 +189,14 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //add new token to list rewards.push( RewardType({ - reward_token: IRewardStaking(extraPool).rewardToken(), + reward_token: extraToken, reward_pool: extraPool, reward_integral: 0, reward_remaining: 0 }) ); registeredRewards[extraToken] = rewards.length; //mark registered at index+1 + emit RewardAdded(extraToken); } } } @@ -235,6 +220,15 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return totalSupply(); } + //internal transfer function to transfer rewards out on claim + function _transferReward( + address _token, + address _to, + uint256 _amount + ) internal virtual { + IERC20(_token).safeTransfer(_to, _amount); + } + function _calcRewardIntegral( uint256 _index, address[2] memory _accounts, @@ -243,16 +237,19 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { bool _isClaim ) internal { RewardType storage reward = rewards[_index]; + if (reward.reward_token == address(0)) { + return; + } //get difference in balance and remaining rewards //getReward is unguarded so we use reward_remaining to keep track of how much was actually claimed uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); - // uint256 d_reward = bal.sub(reward.reward_remaining); - if (_supply > 0 && bal.sub(reward.reward_remaining) > 0) { + //check that balance increased and update integral + if (_supply > 0 && bal > reward.reward_remaining) { reward.reward_integral = reward.reward_integral + - uint128(bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); + (bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); } //update user integrals @@ -266,20 +263,20 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { if (_isClaim || userI < reward.reward_integral) { if (_isClaim) { uint256 receiveable = reward.claimable_reward[_accounts[u]].add( - _balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20) + _balances[u].mul(reward.reward_integral.sub(userI)).div(1e20) ); if (receiveable > 0) { reward.claimable_reward[_accounts[u]] = 0; //cheat for gas savings by transfering to the second index in accounts list //if claiming only the 0 index will update so 1 index can hold forwarding info //guaranteed to have an address in u+1 so no need to check - IERC20(reward.reward_token).safeTransfer(_accounts[u + 1], receiveable); + _transferReward(reward.reward_token, _accounts[u + 1], receiveable); bal = bal.sub(receiveable); } } else { reward.claimable_reward[_accounts[u]] = reward .claimable_reward[_accounts[u]] - .add(_balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20)); + .add(_balances[u].mul(reward.reward_integral.sub(userI)).div(1e20)); } reward.reward_integral_for[_accounts[u]] = reward.reward_integral; } @@ -287,7 +284,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //update remaining reward here since balance could have changed if claiming if (bal != reward.reward_remaining) { - reward.reward_remaining = uint128(bal); + reward.reward_remaining = bal; } } @@ -297,16 +294,13 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { depositedBalance[0] = _getDepositedBalance(_accounts[0]); depositedBalance[1] = _getDepositedBalance(_accounts[1]); - if (!isShutdown()) { - IRewardStaking(convexPool).getReward(address(this), true); - } - - _claimExtras(); + IRewardStaking(convexPool).getReward(address(this), true); uint256 rewardCount = rewards.length; for (uint256 i = 0; i < rewardCount; i++) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, false); } + emit UserCheckpoint(_accounts[0], _accounts[1]); } function _checkpointAndClaim(address[2] memory _accounts) internal nonReentrant { @@ -316,17 +310,11 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { IRewardStaking(convexPool).getReward(address(this), true); - _claimExtras(); - uint256 rewardCount = rewards.length; for (uint256 i = 0; i < rewardCount; i++) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, true); } - } - - //claim any rewards not part of the convex pool - function _claimExtras() internal virtual { - //override and add external reward claiming + emit UserCheckpoint(_accounts[0], _accounts[1]); } function user_checkpoint(address _account) external returns (bool) { @@ -340,81 +328,54 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //run earned as a mutable function to claim everything before calculating earned rewards function earned(address _account) external returns (EarnedData[] memory claimable) { - IRewardStaking(convexPool).getReward(address(this), true); - _claimExtras(); - return _earned(_account); - } - - //run earned as a non-mutative function that may not claim everything, but should report standard convex rewards - function earnedView(address _account) external view returns (EarnedData[] memory claimable) { + //checkpoint to pull in and tally new rewards + _checkpoint([_account, address(0)]); return _earned(_account); } function _earned(address _account) internal view returns (EarnedData[] memory claimable) { - uint256 supply = _getTotalSupply(); - // uint256 depositedBalance = _getDepositedBalance(_account); uint256 rewardCount = rewards.length; claimable = new EarnedData[](rewardCount); for (uint256 i = 0; i < rewardCount; i++) { RewardType storage reward = rewards[i]; - - //change in reward is current balance - remaining reward + earned - uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); - uint256 d_reward = bal.sub(reward.reward_remaining); - - //some rewards (like minted cvx) may not have a reward pool directly on the convex pool so check if it exists - if (reward.reward_pool != address(0)) { - //add earned from the convex reward pool for the given token - d_reward = d_reward.add(IRewardStaking(reward.reward_pool).earned(address(this))); - } - - uint256 I = reward.reward_integral; - if (supply > 0) { - I = I + d_reward.mul(1e20).div(supply); + if (reward.reward_token == address(0)) { + continue; } - uint256 newlyClaimable = _getDepositedBalance(_account) - .mul(I.sub(reward.reward_integral_for[_account])) - .div(1e20); - claimable[i].amount = claimable[i].amount.add( - reward.claimable_reward[_account].add(newlyClaimable) - ); + claimable[i].amount = reward.claimable_reward[_account]; claimable[i].token = reward.reward_token; - - //calc cvx minted from crv and add to cvx claimables - //note: crv is always index 0 so will always run before cvx - if (i == CRV_INDEX) { - //because someone can call claim for the pool outside of checkpoints, need to recalculate crv without the local balance - I = reward.reward_integral; - if (supply > 0) { - I = - I + - IRewardStaking(reward.reward_pool).earned(address(this)).mul(1e20).div( - supply - ); - } - newlyClaimable = _getDepositedBalance(_account) - .mul(I.sub(reward.reward_integral_for[_account])) - .div(1e20); - claimable[CVX_INDEX].amount = CvxMining.ConvertCrvToCvx(newlyClaimable); - claimable[CVX_INDEX].token = cvx; - } } return claimable; } function claimRewards() external { - uint256 cvxOldBal = IERC20(cvx).balanceOf(msg.sender); - uint256 crvOldBal = IERC20(crv).balanceOf(msg.sender); - _checkpointAndClaim([address(msg.sender), address(msg.sender)]); - emit RewardsClaimed(IERC20(cvx), IERC20(cvx).balanceOf(msg.sender) - cvxOldBal); - emit RewardsClaimed(IERC20(crv), IERC20(crv).balanceOf(msg.sender) - crvOldBal); + address _account = rewardRedirect[msg.sender] == address(0) + ? msg.sender + : rewardRedirect[msg.sender]; + + uint256 cvxOldBal = IERC20(cvx).balanceOf(_account); + uint256 crvOldBal = IERC20(crv).balanceOf(_account); + _checkpointAndClaim([msg.sender, _account]); + emit RewardsClaimed(IERC20(cvx), IERC20(cvx).balanceOf(_account) - cvxOldBal); + emit RewardsClaimed(IERC20(crv), IERC20(crv).balanceOf(_account) - crvOldBal); + } + + //set any claimed rewards to automatically go to a different address + //set address to zero to disable + function setRewardRedirect(address _to) external nonReentrant { + rewardRedirect[msg.sender] = _to; + emit RewardRedirected(msg.sender, _to); } function getReward(address _account) external { - //claim directly in checkpoint logic to save a bit of gas - _checkpointAndClaim([_account, _account]); + //check if there is a redirect address + if (rewardRedirect[_account] != address(0)) { + _checkpointAndClaim([_account, rewardRedirect[_account]]); + } else { + //claim directly in checkpoint logic to save a bit of gas + _checkpointAndClaim([_account, _account]); + } } function getReward(address _account, address _forwardTo) external { @@ -426,8 +387,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //deposit a curve token function deposit(uint256 _amount, address _to) external { - require(!isShutdown(), "shutdown"); - //dont need to call checkpoint since _mint() will if (_amount > 0) { @@ -441,8 +400,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //stake a convex token function stake(uint256 _amount, address _to) external { - require(!isShutdown(), "shutdown"); - //dont need to call checkpoint since _mint() will if (_amount > 0) { @@ -488,5 +445,10 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { ) internal override { _checkpoint([_from, _to]); } + + //helper function + function earmarkRewards() external returns (bool) { + return IBooster(convexBooster).earmarkRewards(convexPoolId); + } } // slither-disable-end reentrancy-no-eth \ No newline at end of file diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 8e7643575f..5401b2ad5f 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -35,6 +35,7 @@ contract SDaiCollateral is AppreciatingFiatCollateral { uint192 revenueHiding, IPot _pot ) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); pot = _pot; } diff --git a/contracts/plugins/assets/erc20/RewardableERC20.sol b/contracts/plugins/assets/erc20/RewardableERC20.sol index 58fd23855c..ed741e15ec 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20.sol @@ -7,11 +7,14 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../../interfaces/IRewardable.sol"; +uint256 constant SHARE_DECIMAL_OFFSET = 9; // to prevent reward rounding issues + /** * @title RewardableERC20 * @notice An abstract class that can be extended to create rewardable wrapper. * @notice `_claimAssetRewards` keeps tracks of rewards by snapshotting the balance * and calculating the difference between the current balance and the previous balance. + * Limitation: Currently supports only one single reward token. * @dev To inherit: * - override _claimAssetRewards() * - call ERC20 constructor elsewhere during construction @@ -19,11 +22,11 @@ import "../../../interfaces/IRewardable.sol"; abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { using SafeERC20 for IERC20; - uint256 public immutable one; // {qShare/share} + uint256 public immutable one; // 1e9 * {qShare/share} IERC20 public immutable rewardToken; - uint256 public rewardsPerShare; // {qRewards/share} - mapping(address => uint256) public lastRewardsPerShare; // {qRewards/share} + uint256 public rewardsPerShare; // 1e9 * {qRewards/share} + mapping(address => uint256) public lastRewardsPerShare; // 1e9 * {qRewards/share} mapping(address => uint256) public accumulatedRewards; // {qRewards} mapping(address => uint256) public claimedRewards; // {qRewards} @@ -35,9 +38,11 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { /// @dev Extending class must ensure ERC20 constructor is called constructor(IERC20 _rewardToken, uint8 _decimals) { rewardToken = _rewardToken; - one = 10**_decimals; // set via pass-in to prevent inheritance issues + // set via pass-in to prevent inheritance issues + one = 10**(_decimals + SHARE_DECIMAL_OFFSET); } + // claim rewards - Only supports one single reward token function claimRewards() external nonReentrant { _claimAndSyncRewards(); _syncAccount(msg.sender); @@ -47,7 +52,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { function _syncAccount(address account) internal { if (account == address(0)) return; - // {qRewards/share} + // 1e9 * {qRewards/share} uint256 accountRewardsPerShare = lastRewardsPerShare[account]; // {qShare} @@ -56,37 +61,48 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { // {qRewards} uint256 _accumulatedRewards = accumulatedRewards[account]; - // {qRewards/share} + // 1e9 * {qRewards/share} uint256 _rewardsPerShare = rewardsPerShare; if (accountRewardsPerShare < _rewardsPerShare) { - // {qRewards/share} + // 1e9 * {qRewards/share} uint256 delta = _rewardsPerShare - accountRewardsPerShare; - // {qRewards} = {qRewards/share} * {qShare} + // {qRewards} = (1e9 * {qRewards/share}) * {qShare} / (1e9 * {qShare/share}) _accumulatedRewards += (delta * shares) / one; } lastRewardsPerShare[account] = _rewardsPerShare; accumulatedRewards[account] = _accumulatedRewards; } + function _rewardTokenBalance() internal view virtual returns (uint256) { + return rewardToken.balanceOf(address(this)); + } + + function _distributeReward(address account, uint256 amt) internal virtual { + rewardToken.safeTransfer(account, amt); + } + function _claimAndSyncRewards() internal virtual { uint256 _totalSupply = totalSupply(); if (_totalSupply == 0) { return; } _claimAssetRewards(); - uint256 balanceAfterClaimingRewards = rewardToken.balanceOf(address(this)); + uint256 balanceAfterClaimingRewards = _rewardTokenBalance(); uint256 _rewardsPerShare = rewardsPerShare; uint256 _previousBalance = lastRewardBalance; if (balanceAfterClaimingRewards > _previousBalance) { - uint256 delta = balanceAfterClaimingRewards - _previousBalance; + uint256 delta = balanceAfterClaimingRewards - _previousBalance; // {qRewards} + + // 1e9 * {qRewards/share} = {qRewards} * (1e9 * {qShare/share}) / {qShare} uint256 deltaPerShare = (delta * one) / _totalSupply; + // {qRewards} = {qRewards} + (1e9*(qRewards/share)) * {qShare} / (1e9*{qShare/share}) balanceAfterClaimingRewards = _previousBalance + (deltaPerShare * _totalSupply) / one; - // {qRewards/share} += {qRewards} * {qShare/share} / {qShare} + // 1e9 * {qRewards/share} += {qRewards} * (1e9*{qShare/share}) / {qShare} _rewardsPerShare += deltaPerShare; } @@ -105,7 +121,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { claimedRewards[account] = accumulatedRewards[account]; - uint256 currentRewardTokenBalance = rewardToken.balanceOf(address(this)); + uint256 currentRewardTokenBalance = _rewardTokenBalance(); // This is just to handle the edge case where totalSupply() == 0 and there // are still reward tokens in the contract. @@ -113,9 +129,9 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { ? currentRewardTokenBalance - lastRewardBalance : 0; - rewardToken.safeTransfer(account, claimableRewards); + _distributeReward(account, claimableRewards); - currentRewardTokenBalance = rewardToken.balanceOf(address(this)); + currentRewardTokenBalance = _rewardTokenBalance(); lastRewardBalance = currentRewardTokenBalance > nonDistributed ? currentRewardTokenBalance - nonDistributed : 0; diff --git a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol index e2a4ec927f..6ae34a21a8 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol @@ -30,6 +30,10 @@ abstract contract RewardableERC20Wrapper is RewardableERC20 { string memory _symbol, IERC20 _rewardToken ) ERC20(_name, _symbol) RewardableERC20(_rewardToken, _underlying.decimals()) { + require( + address(_rewardToken) != address(_underlying), + "reward and underlying cannot match" + ); underlying = _underlying; underlyingDecimals = _underlying.decimals(); } diff --git a/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol b/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol index 284f717c2e..3966e66ea9 100644 --- a/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol +++ b/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol @@ -27,7 +27,9 @@ abstract contract RewardableERC4626Vault is ERC4626, RewardableERC20 { ) ERC4626(_asset, _name, _symbol) RewardableERC20(_rewardToken, _asset.decimals() + _decimalsOffset()) - {} + { + require(address(_rewardToken) != address(_asset), "reward and asset cannot match"); + } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 4e95c0a05a..7d32cc254a 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -34,4 +34,4 @@ This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](h #### tryPrice -This function uses `refPerTok`, the chainlink price of `ETH/frxETH`, and the chainlink price of `USD/ETH` to return the current price range of the collateral. +This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 4697ec0da0..c3dbe91379 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -7,6 +7,12 @@ import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; import "./vendor/IsfrxEth.sol"; +/** + * ************************************************************ + * WARNING: this plugin is not ready to be used in Production + * ************************************************************ + */ + /** * @title SFraxEthCollateral * @notice Collateral plugin for Frax-ETH, @@ -23,14 +29,16 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { /// @param config.chainlinkFeed Feed units: {UoA/target} constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } // solhint-enable no-empty-blocks /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return pegPrice {target/ref} The actual price observed in the peg + /// @return pegPrice {target/ref} FIX_ONE until an oracle becomes available function tryPrice() external view @@ -49,6 +57,8 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { high = p + err; // assert(low <= high); obviously true just by inspection + // TODO: Currently not checking for depegs between `frxETH` and `ETH` + // Should be modified to use a `frxETH/ETH` oracle when available pegPrice = targetPerRef(); } diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 783896f2c0..9267f40e76 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -35,6 +35,8 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerRefChainlinkFeed) != address(0), "missing targetPerRef feed"); require(_targetPerRefChainlinkTimeout > 0, "targetPerRefChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); + targetPerRefChainlinkFeed = _targetPerRefChainlinkFeed; targetPerRefChainlinkTimeout = _targetPerRefChainlinkTimeout; } diff --git a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol index eff7ccd9b5..bc5f32abd8 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol @@ -3,13 +3,12 @@ pragma solidity 0.8.19; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol"; -import { IMorpho, IMorphoRewardsDistributor, IMorphoUsersLens } from "./IMorpho.sol"; +import { IMorpho, IMorphoUsersLens } from "./IMorpho.sol"; import { MorphoTokenisedDeposit, MorphoTokenisedDepositConfig } from "./MorphoTokenisedDeposit.sol"; struct MorphoAaveV2TokenisedDepositConfig { IMorpho morphoController; IMorphoUsersLens morphoLens; - IMorphoRewardsDistributor rewardsDistributor; IERC20Metadata underlyingERC20; IERC20Metadata poolToken; ERC20 rewardToken; @@ -22,7 +21,6 @@ contract MorphoAaveV2TokenisedDeposit is MorphoTokenisedDeposit { MorphoTokenisedDeposit( MorphoTokenisedDepositConfig({ morphoController: config.morphoController, - rewardsDistributor: config.rewardsDistributor, underlyingERC20: config.underlyingERC20, poolToken: config.poolToken, rewardToken: config.rewardToken diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 5959b944ec..248c24084c 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -28,6 +28,7 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20)); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 27449c2883..3f1fe73110 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -16,13 +16,13 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {target/ref} + AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {UoA/target} uint48 public immutable targetUnitOracleTimeout; // {s} /// @dev config.erc20 must be a MorphoTokenisedDeposit - /// @param config.chainlinkFeed Feed units: {UoA/target} + /// @param config.chainlinkFeed Feed units: {target/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide - /// @param targetUnitChainlinkFeed_ Feed units: {target/ref} + /// @param targetUnitChainlinkFeed_ Feed units: {UoA/target} /// @param targetUnitOracleTimeout_ {s} oracle timeout to use for targetUnitChainlinkFeed constructor( CollateralConfig memory config, @@ -48,11 +48,12 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { uint192 pegPrice ) { - // {tar/ref} Get current market peg - pegPrice = targetUnitChainlinkFeed.price(targetUnitOracleTimeout); + pegPrice = chainlinkFeed.price(oracleTimeout); // {target/ref} // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} - uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); + uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( + _underlyingRefPerTok() + ); uint192 err = p.mul(oracleError, CEIL); high = p + err; diff --git a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol index d2664e782c..e2bf558fe5 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol @@ -3,23 +3,34 @@ pragma solidity 0.8.19; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol"; -import { IMorpho, IMorphoRewardsDistributor, IMorphoUsersLens } from "./IMorpho.sol"; +import { IMorpho, IMorphoUsersLens } from "./IMorpho.sol"; import { RewardableERC4626Vault } from "../erc20/RewardableERC4626Vault.sol"; struct MorphoTokenisedDepositConfig { IMorpho morphoController; - IMorphoRewardsDistributor rewardsDistributor; IERC20Metadata underlyingERC20; IERC20Metadata poolToken; ERC20 rewardToken; } abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { - IMorphoRewardsDistributor public immutable rewardsDistributor; + struct MorphoTokenisedDepositRewardsAccountingState { + uint256 totalAccumulatedBalance; + uint256 totalPaidOutBalance; + uint256 pendingBalance; + uint256 availableBalance; + uint256 remainingPeriod; + uint256 lastSync; + } + + uint256 private constant PAYOUT_PERIOD = 7 days; + IMorpho public immutable morphoController; address public immutable poolToken; address public immutable underlying; + MorphoTokenisedDepositRewardsAccountingState private state; + constructor(MorphoTokenisedDepositConfig memory config) RewardableERC4626Vault( config.underlyingERC20, @@ -31,17 +42,53 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { underlying = address(config.underlyingERC20); morphoController = config.morphoController; poolToken = address(config.poolToken); - rewardsDistributor = config.rewardsDistributor; + state.lastSync = uint48(block.timestamp); } - function rewardTokenBalance(address account) external returns (uint256 claimableRewards) { + function sync() external { _claimAndSyncRewards(); - _syncAccount(account); - claimableRewards = accumulatedRewards[account] - claimedRewards[account]; } - // solhint-disable-next-line no-empty-blocks - function _claimAssetRewards() internal virtual override {} + function _claimAssetRewards() internal override { + // If we detect any new balances add it to pending and reset payout period + uint256 totalAccumulated = state.totalPaidOutBalance + rewardToken.balanceOf(address(this)); + uint256 newlyAccumulated = totalAccumulated - state.totalAccumulatedBalance; + + uint256 timeDelta = block.timestamp - state.lastSync; + if (timeDelta != 0 && state.remainingPeriod != 0) { + if (timeDelta > state.remainingPeriod) { + timeDelta = state.remainingPeriod; + } + + uint256 amtToPayOut = (state.pendingBalance * timeDelta) / state.remainingPeriod; + state.pendingBalance -= amtToPayOut; + state.availableBalance += amtToPayOut; + } + + if (newlyAccumulated != 0) { + state.totalAccumulatedBalance = totalAccumulated; + state.pendingBalance += newlyAccumulated; + + state.remainingPeriod = PAYOUT_PERIOD; + } else { + state.remainingPeriod = state.remainingPeriod < timeDelta + ? 0 + : state.remainingPeriod - timeDelta; + } + + state.lastSync = block.timestamp; + } + + function _rewardTokenBalance() internal view override returns (uint256) { + return state.availableBalance; + } + + function _distributeReward(address account, uint256 amt) internal override { + state.totalPaidOutBalance += amt; + state.availableBalance -= amt; + + SafeERC20.safeTransfer(rewardToken, account, amt); + } function getMorphoPoolBalance(address poolToken) internal view virtual returns (uint256); diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index f7f4386650..97c58aaef4 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -31,6 +31,7 @@ contract RethCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); + require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 8aaf4b2381..d31d7b04df 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -22,6 +22,7 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold > 0, "defaultThreshold zero"); pool = StargateRewardableWrapper(address(config.erc20)).pool(); } diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 9121982562..322eca9a75 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -3,9 +3,11 @@ pragma solidity 0.8.19; import "../curve/CurveStableCollateral.sol"; -interface IYearnV2 { - /// @return {qLP token/tok} - function pricePerShare() external view returns (uint256); +interface IPricePerShareHelper { + /// @param vault The yToken address + /// @param amount {qTok} + /// @return {qLP Token} + function amountToShares(address vault, uint256 amount) external view returns (uint256); } /** @@ -16,28 +18,27 @@ interface IYearnV2 { * tar = USD * UoA = USD * - * More on the ref token: crvUSDUSDC-f has a virtual price >=1. The ref token to measure is not the + * More on the ref token: crvUSDUSDC-f has a virtual price. The ref token to measure is not the * balance of crvUSDUSDC-f that the LP token is redeemable for, but the balance of the virtual * token that underlies crvUSDUSDC-f. This virtual token is an evolving mix of USDC and crvUSD. * - * Revenue hiding should be set to the largest % drawdown in a Yearn vault that should - * not result in default. While it is extremely rare for Yearn to have drawdowns, - * in principle it is possible and should be planned for. - * - * No rewards. + * Should only be used for Stable pools. + * No rewards (handled internally by the Yearn vault). + * Revenue hiding can be kept very small since stable curve pools should be up-only. */ contract YearnV2CurveFiatCollateral is CurveStableCollateral { using FixLib for uint192; - // solhint-disable no-empty-blocks + IPricePerShareHelper public immutable pricePerShareHelper; constructor( CollateralConfig memory config, uint192 revenueHiding, - PTConfiguration memory ptConfig - ) CurveStableCollateral(config, revenueHiding, ptConfig) {} - - // solhint-enable no-empty-blocks + PTConfiguration memory ptConfig, + IPricePerShareHelper pricePerShareHelper_ + ) CurveStableCollateral(config, revenueHiding, ptConfig) { + pricePerShareHelper = pricePerShareHelper_; + } /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low @@ -91,12 +92,18 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view virtual override returns (uint192) { // {ref/tok} = {ref/LP token} * {LP token/tok} - return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare()); + return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare(), FLOOR); } /// @return {LP token/tok} function _pricePerShare() internal view returns (uint192) { - // {LP token/tok} = {qLP token/tok} * {LP token/qLP token} - return shiftl_toFix(IYearnV2(address(erc20)).pricePerShare(), -int8(erc20Decimals)); + uint256 supply = erc20.totalSupply(); // {qTok} + uint256 shares = pricePerShareHelper.amountToShares(address(erc20), supply); // {qLP Token} + + // yvCurve tokens always have the same number of decimals as the underlying curve LP token, + // so we can divide the quanta units without converting to whole units + + // {LP token/tok} = {LP token} / {tok} + return divuu(shares, supply); } } diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index c20978fa02..96de231912 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -8,6 +8,9 @@ import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.so import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../../interfaces/IStRSRVotes.sol"; +import "../../libraries/NetworkConfigLib.sol"; + +uint256 constant ONE_DAY = 86400; // {s} /* * @title Governance @@ -30,7 +33,9 @@ contract Governance is // 100% uint256 public constant ONE_HUNDRED_PERCENT = 1e8; // {micro %} - // solhint-disable no-empty-blocks + // solhint-disable-next-line var-name-mixedcase + uint256 public immutable MIN_VOTING_DELAY; // {block} equal to ONE_DAY + constructor( IStRSRVotes token_, TimelockController timelock_, @@ -44,7 +49,12 @@ contract Governance is GovernorVotes(IVotes(address(token_))) GovernorVotesQuorumFraction(quorumPercent) GovernorTimelockControl(timelock_) - {} + { + MIN_VOTING_DELAY = + (ONE_DAY + NetworkConfigLib.blocktime() - 1) / + NetworkConfigLib.blocktime(); // ONE_DAY, in blocks + requireValidVotingDelay(votingDelay_); + } // solhint-enable no-empty-blocks @@ -56,6 +66,11 @@ contract Governance is return super.votingPeriod(); } + function setVotingDelay(uint256 newVotingDelay) public override { + requireValidVotingDelay(newVotingDelay); + super.setVotingDelay(newVotingDelay); // has onlyGovernance modifier + } + /// @return {qStRSR} The number of votes required in order for a voter to become a proposer function proposalThreshold() public @@ -175,4 +190,8 @@ contract Governance is uint256 currentEra = IStRSRVotes(address(token)).currentEra(); return currentEra == pastEra; } + + function requireValidVotingDelay(uint256 newVotingDelay) private view { + require(newVotingDelay >= MIN_VOTING_DELAY, "invalid votingDelay"); + } } diff --git a/contracts/plugins/mocks/AssetMock.sol b/contracts/plugins/mocks/AssetMock.sol index b6abe6fffb..0396a5ea35 100644 --- a/contracts/plugins/mocks/AssetMock.sol +++ b/contracts/plugins/mocks/AssetMock.sol @@ -4,6 +4,8 @@ pragma solidity 0.8.19; import "../assets/Asset.sol"; contract AssetMock is Asset { + bool public stale; + uint192 private lowPrice; uint192 private highPrice; @@ -12,7 +14,7 @@ contract AssetMock is Asset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of + /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, @@ -40,13 +42,18 @@ contract AssetMock is Asset { uint192 ) { + require(!stale, "stale price"); return (lowPrice, highPrice, 0); } /// Should not revert /// Refresh saved prices function refresh() public virtual override { - // pass + stale = false; + } + + function setStale(bool _stale) external { + stale = _stale; } function setPrice(uint192 low, uint192 high) external { diff --git a/contracts/plugins/mocks/CTokenWrapperMock.sol b/contracts/plugins/mocks/CTokenWrapperMock.sol index c0cd0922a6..78a93b44af 100644 --- a/contracts/plugins/mocks/CTokenWrapperMock.sol +++ b/contracts/plugins/mocks/CTokenWrapperMock.sol @@ -42,9 +42,11 @@ contract CTokenWrapperMock is ERC20Mock, IRewardable { revert("reverting claim rewards"); } uint256 oldBal = comp.balanceOf(msg.sender); + address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); + holders[0] = msg.sender; cTokens[0] = address(underlying); - comptroller.claimComp(msg.sender, cTokens); + comptroller.claimComp(holders, cTokens, false, true); emit RewardsClaimed(IERC20(address(comp)), comp.balanceOf(msg.sender) - oldBal); } diff --git a/contracts/plugins/mocks/ComptrollerMock.sol b/contracts/plugins/mocks/ComptrollerMock.sol index 9f95726479..249bcdb088 100644 --- a/contracts/plugins/mocks/ComptrollerMock.sol +++ b/contracts/plugins/mocks/ComptrollerMock.sol @@ -19,8 +19,14 @@ contract ComptrollerMock is IComptroller { compBalances[recipient] = amount; } - function claimComp(address holder, address[] memory) external { + function claimComp( + address[] memory holders, + address[] memory, + bool, + bool + ) external { // Mint amount and update internal balances + address holder = holders[0]; if (address(compToken) != address(0)) { uint256 amount = compBalances[holder]; compBalances[holder] = 0; @@ -31,4 +37,9 @@ contract ComptrollerMock is IComptroller { function getCompAddress() external view returns (address) { return address(compToken); } + + // mock + function enterMarkets(address[] calldata) external returns (uint256[] memory) { + return new uint256[](1); + } } diff --git a/contracts/plugins/mocks/RevenueTraderBackComp.sol b/contracts/plugins/mocks/RevenueTraderBackComp.sol index ed76f53346..73069f15ad 100644 --- a/contracts/plugins/mocks/RevenueTraderBackComp.sol +++ b/contracts/plugins/mocks/RevenueTraderBackComp.sol @@ -14,8 +14,10 @@ contract RevenueTraderCompatibleV2 is RevenueTraderP1, IRevenueTraderComp { erc20s[0] = sell; TradeKind[] memory kinds = new TradeKind[](1); kinds[0] = TradeKind.DUTCH_AUCTION; + // Mirror V3 logic (only the section relevant to tests) - this.manageTokens(erc20s, kinds); + // solhint-disable-next-line no-empty-blocks + try this.manageTokens(erc20s, kinds) {} catch {} } function version() public pure virtual override(Versioned, IVersioned) returns (string memory) { diff --git a/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol b/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol new file mode 100644 index 0000000000..ebbfc6b1c2 --- /dev/null +++ b/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../../facade/FacadeMonitor.sol"; + +/** + * @title FacadeMonitorV2 + * @notice Mock to test upgradeability for the FacadeMonitor contract + */ +contract FacadeMonitorV2 is FacadeMonitor { + /// @custom:oz-upgrades-unsafe-allow constructor + constructor(MonitorParams memory params) FacadeMonitor(params) {} + + uint256 public newValue; + + function setNewValue(uint256 newValue_) external onlyOwner { + newValue = newValue_; + } + + function version() public pure returns (string memory) { + return "2.0.0"; + } +} diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 9f52e6387a..c494ecee57 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -43,7 +43,8 @@ contract GnosisTrade is ITrade { address public origin; IERC20Metadata public sell; // address of token this trade is selling IERC20Metadata public buy; // address of token this trade is buying - uint256 public initBal; // {qTok}, this trade's balance of `sell` when init() was called + uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called + uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold; dup with initBal uint48 public endTime; // timestamp after which this trade's auction can be settled uint192 public worstCasePrice; // {buyTok/sellTok}, the worst price we expect to get at Auction // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` @@ -89,7 +90,8 @@ contract GnosisTrade is ITrade { sell = req.sell.erc20(); buy = req.buy.erc20(); - initBal = sell.balanceOf(address(this)); + initBal = sell.balanceOf(address(this)); // {qSellTok} + sellAmount = shiftl_toFix(initBal, -int8(sell.decimals())); // {sellTok} require(initBal <= type(uint96).max, "initBal too large"); require(initBal >= req.sellAmount, "unfunded trade"); @@ -107,8 +109,8 @@ contract GnosisTrade is ITrade { ); // Downsize our sell amount to adjust for fee - // {qTok} = {qTok} * {1} / {1} - uint96 sellAmount = uint96( + // {qSellTok} = {qSellTok} * {1} / {1} + uint96 _sellAmount = uint96( _divrnd( req.sellAmount * FEE_DENOMINATOR, FEE_DENOMINATOR + gnosis.feeNumerator(), @@ -143,7 +145,7 @@ contract GnosisTrade is ITrade { buy, endTime, endTime, - sellAmount, + _sellAmount, minBuyAmount, minBuyAmtPerOrder, 0, diff --git a/docs/collateral.md b/docs/collateral.md index 7c95883f58..e6ae0e039c 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -42,12 +42,14 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert + /// low should be nonzero when the asset might be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); /// Should not revert /// lotLow should be nonzero when the asset might be worth selling + /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); @@ -219,7 +221,7 @@ This would be sensible for many UNI v2 pools, but someone holding value in a two Revenue Hiding should be employed when the function underlying `refPerTok()` is not necessarily _strongly_ non-decreasing, or simply if there is uncertainty surrounding the guarantee. In general we recommend including a very small amount (1e-6) of revenue hiding for all appreciating collateral. This is already implemented in [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol). -When implementing Revenue Hiding, the `price/lotPrice()` functions should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. +When implementing Revenue Hiding, the `price` function should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. ## Important Properties for Collateral Plugins @@ -252,7 +254,7 @@ There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20W Because it’s called at the beginning of many transactions, `refresh()` should never revert. If `refresh()` encounters a critical error, it should change the Collateral contract’s state so that `status()` becomes `DISABLED`. -To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`lotPrice()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. +To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. ### The `IFFY` status should be temporary. @@ -299,7 +301,7 @@ The values returned by the following view methods should never change: Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) or [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol) can restrict their attention to overriding the following three functions: -- `tryPrice()` (not on the ICollateral interface; used by `price()`/`lotPrice()`/`refresh()`) +- `tryPrice()` (not on the ICollateral interface; used by `price()`/`refresh()`) - `refPerTok()` - `targetPerRef()` @@ -362,23 +364,21 @@ Should never revert. Should return the tightest possible lower and upper estimate for the price of the token on secondary markets. +The difference between the upper and lower estimate should not exceed 5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. + Lower estimate must be <= upper estimate. -Should return `(0, FIX_MAX)` if pricing data is unavailable or stale. +Under no price data, the low estimate shoulddecay downwards and high estimate upwards. -Should be gas-efficient. +Should return `(0, FIX_MAX)` if pricing data is _completely_ unavailable or stale. -The difference between the upper and lower estimate should not exceed ~5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. +Should be gas-efficient. ### lotPrice() `{UoA/tok}` -Should never revert. - -Lower estimate must be <= upper estimate. - -The low estimate should be nonzero while the asset is worth selling. +Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility. -Should be gas-efficient. +Recommend implement `lotPrice()` by calling `price()`. If you are inheriting from any of our existing collateral plugins, this is already done for you. See [Asset.sol](../contracts/plugins/Asset.sol) for the implementation. ### refPerTok() `{ref/tok}` diff --git a/docs/deployed-addresses/1-FacadeMonitor.md b/docs/deployed-addresses/1-FacadeMonitor.md new file mode 100644 index 0000000000..e8cf1a8c05 --- /dev/null +++ b/docs/deployed-addresses/1-FacadeMonitor.md @@ -0,0 +1,7 @@ +# FacadeMonitor (Mainnet) + +## Facade Monitor Proxy + +| Contract | Address | +| -------- | --------------------------------------------------------------------------------------------------------------------- | +| FacadeMonitor (Proxy) | [0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09](https://etherscan.io/address/0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09) | diff --git a/docs/deployed-addresses/8453-FacadeMonitor.md b/docs/deployed-addresses/8453-FacadeMonitor.md new file mode 100644 index 0000000000..4cba0e181a --- /dev/null +++ b/docs/deployed-addresses/8453-FacadeMonitor.md @@ -0,0 +1,8 @@ +8453-FacadeMonitor.md +# FacadeMonitor (Base) + +## Facade Monitor Proxy + +| Contract | Address | +| --------------------- | --------------------------------------------------------------------------------------------------------------------- | +| FacadeMonitor (Proxy) | [0x5bfc6df700ef23741B2e01Bd45826E4c9735ae60](https://basescan.org/address/0x5bfc6df700ef23741B2e01Bd45826E4c9735ae60) | diff --git a/docs/deployment.md b/docs/deployment.md index 6fbf565027..98c96678ef 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -220,7 +220,7 @@ yarn deploy:run:confirm --network mainnet This checks that: -- For each asset, confirm `lotPrice()` and `price()` are close. +- For each asset, confirm: - `main.tradingPaused()` and `main.issuancePaused()` are true - `timelockController.minDelay()` is > 1e12 diff --git a/docs/exhaustive-tests.md b/docs/exhaustive-tests.md index fef7f481e0..5fafdb48f3 100644 --- a/docs/exhaustive-tests.md +++ b/docs/exhaustive-tests.md @@ -1,6 +1,6 @@ # Exhaustive Testing -The exhaustive tests include `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExteremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. +The exhaustive tests include `Broker.test.ts`, `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExtremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. The env vars related to exhaustive testing are `EXTREME` and `SLOW`. @@ -12,7 +12,7 @@ I'm assuming you've already got `gcloud` installed on your dev machine. If not, ```bash gcloud auth login -gcloud config set project rtoken-fuzz +gcloud config set project rtoken-testing gcloud config list project # assumed defaults @@ -39,7 +39,7 @@ gcloud compute config-ssh Jump onto the instance: ``` -ssh exhaustive.us-central1-a.rtoken-fuzz +ssh exhaustive.us-central1-a.rtoken-testing ``` Add Matt's special seasoning, for tmux and emacs QoL improvements (NOTE: This sets the tmux `ctrl-b` to `ctrl-z`): @@ -93,7 +93,7 @@ gcloud compute config-ssh Jump onto the instance: ``` -ssh exhaustive.us-central1-a.rtoken-fuzz +ssh exhaustive.us-central1-a.rtoken-testing ``` ## 3) Run the tests @@ -113,7 +113,7 @@ Tmux and run the tests: ``` tmux -bash ./scripts/run-exhaustive-tests.sh +bash ./scripts/exhaustive-tests/run-exhaustive-tests.sh ``` When the test are complete, you'll find the console output in `tmux-1.log` and `tmux-2.log`. diff --git a/docs/monitoring.md b/docs/monitoring.md new file mode 100644 index 0000000000..df1c5f8baf --- /dev/null +++ b/docs/monitoring.md @@ -0,0 +1,35 @@ +# Monitoring the Reserve Protocol and Rtokens + +This document provides an overview of the monitoring setup for the Reserve Protocol and RTokens on both the Ethereum and Base networks. The monitoring is conducted through the [Hypernative](https://app.hypernative.xyz/) platform, utilizing the `FacadeMonitor` contract to retrieve the status for specific RTokens. This monitoring setup ensures continuous vigilance over the Reserve Protocol and RTokens, with alerts promptly notifying relevant channels in case of any issues. + +## Checks/Alerts + +The following alerts are currently setup for RTokens deployed in Mainnet and Base: + +### Status (Basket Handler) - HIGH + +Checks if the status of the Basket Handler for a specific RToken is SOUND. If not, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Fully collateralized (Basket Handler) - HIGH + +Checks if the Basket Handler for a specific RToken is FULLY COLLATERALIZED. If not, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Batch Auctions Disabled - HIGH + +Checks if the batch auctions for a specific RToken are DISABLED. If true, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Dutch Auctions Disabled - HIGH + +Checks if the any of the dutch auctions for a specific RToken is DISABLED. If true, triggers an alert via Slack, Discord, Telegram, and Pager Duty. + +### Issuance Depleted - MEDIUM + +Triggers and alert via Slack if the Issuance Throttle for a specific RToken is consumed > 99% + +### Redemption Depleted - MEDIUM + +Triggers and alert via Slack if the Redemption Throttle for a specific RToken is consumed > 99% + +### Backing Fully Redeemable- MEDIUM + +Triggers and alert via Slack if the backing of a specific RToken is not redeemable 100% on the underlying Defi Protocol. Provides checks for AAVE V2, AAVE V3, Compound V2, Compound V3, Stargate, Flux, and Morpho AAVE V2. diff --git a/docs/pause-freeze-states.md b/docs/pause-freeze-states.md new file mode 100644 index 0000000000..17b2785fcd --- /dev/null +++ b/docs/pause-freeze-states.md @@ -0,0 +1,73 @@ +# Pause Freeze States + +Some protocol functions may be halted while the protocol is either (i) issuance-paused; (ii) trading-paused; or (iii) frozen. Below is a table that shows which protocol interactions (`@custom:interaction`) and refreshers (`@custom:refresher`) execute during paused/frozen states, as of the 3.1.0 release. + +All governance functions (`@custom:governance`) remain enabled during all paused/frozen states. They are not mentioned here. + +A :heavy_check_mark: indicates the function still executes in this state. +A :x: indicates it reverts. + +| Function | Issuance-Paused | Trading-Paused | Frozen | +| --------------------------------------- | ------------------ | ----------------------- | ----------------------- | +| `BackingManager.claimRewards()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.claimRewardsSingle()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.grantRTokenAllowance()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `BackingManager.forwardRevenue()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.rebalance()` | :heavy_check_mark: | :x: | :x: | +| `BackingManager.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `BasketHandler.refreshBasket()` | :heavy_check_mark: | :x: (unless governance) | :x: (unless governance) | +| `Broker.openTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Broker.reportViolation()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Distributor.distribute()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Furnace.melt()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `Main.poke()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `RevenueTrader.claimRewards()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.claimRewardsSingle()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.distributeTokenToBuy()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.manageTokens()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.returnTokens()` | :heavy_check_mark: | :x: | :x: | +| `RevenueTrader.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `RToken.issue()` | :x: | :heavy_check_mark: | :x: | +| `RToken.issueTo()` | :x: | :heavy_check_mark: | :x: | +| `RToken.redeem()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `RToken.redeemTo()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `RToken.redeemCustom()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `StRSR.cancelUnstake()` | :heavy_check_mark: | :heavy_check_mark: | :x: | +| `StRSR.payoutRewards()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `StRSR.stake()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| `StRSR.seizeRSR()` | :heavy_check_mark: | :x: | :x: | +| `StRSR.unstake()` | :heavy_check_mark: | :x: | :x: | +| `StRSR.withdraw()` | :heavy_check_mark: | :x: | :x: | + +## Issuance-pause + +The issuance-paused states indicates that RToken issuance should be paused, and _only_ that. It is a narrow control knob that is designed solely to protect against a case where bad debt is being injected into the protocol, say, because default detection for an asset has a false negative. + +## Trading-pause + +The trading-paused state has significantly more scope than the issuance-paused state. It is designed to prevent against cases where the protocol may trade unneccesarily. Many other functions in addition to just `BackingManager.rebalance()` and `RevenueTrader.manageTokens()` are halted. In general anything that manages the backing and revenue for an RToken is halted. This may become neccessary to use due to (among other things): + +- An asset's `price()` malfunctions or is manipulated +- A collateral's default detection has a false positive or negative + +## Freezing + +The scope of freezing is the largest, and it should be used least frequently. Nearly all protocol interactions (`@custom:interaction`) are halted. Any refreshers (`@custom:refresher`) remain enabled, as well as `StRSR.stake()` and the "wrap up" routine `*.settleTrade()`. + +An important function of freezing is to provide a finite time for governance to push through a repair proposal an RToken in the event that a 0-day is discovered that requires a contract upgrade. + +### `Furnace.melt()` + +It is necessary for `Furnace.melt()` to remain emabled in order to allow `RTokenAsset.refresh()` to update its `price()`. Any revenue RToken that has already accumulated at the Furnace will continue to be melted, but the flow of new revenue RToken into the contract is halted. + +### `StRSR.payoutRewards()` + +It is necessary for `StRSR.payoutRewards()` to remain enabled in order for `StRSR.stake()` to use the up-to-date StRSR-RSR exchange rate. If it did not, then in the event of freezing there would be an unfair benefit to new stakers. Any revenue RSR that has already accumulated at the StRSR contract will continue to be paid out, but the flow of new revenue RSR into the contract is halted. + +### `StRSR.stake()` + +It is important for `StRSR.stake()` to remain emabled while frozen in order to allow honest RSR to flow into an RToken to vote against malicious governance proposals. + +### `*.settleTrade()` + +The settleTrade functionality must remain enabled in order to maintain the property that dutch auctions will discover the optimal price. If settleTrade were halted, it could become possible for a dutch auction to clear at a much lower price than it should have, simply because bidding was disabled during the earlier portion of the auction. diff --git a/docs/recollateralization.md b/docs/recollateralization.md index aecb345c94..06cf836594 100644 --- a/docs/recollateralization.md +++ b/docs/recollateralization.md @@ -64,21 +64,7 @@ If there does not exist a trade that meets these constraints, then the protocol #### Trade Sizing -The `IAsset` interface defines two types of prices: - -```solidity -/// @return low {UoA/tok} The lower end of the price estimate -/// @return high {UoA/tok} The upper end of the price estimate -function price() external view returns (uint192 low, uint192 high); - -/// lotLow should be nonzero when the asset might be worth selling -/// @return lotLow {UoA/tok} The lower end of the lot price estimate -/// @return lotHigh {UoA/tok} The upper end of the lot price estimate -function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - -``` - -All trades have a worst-case exchange rate that is a function of (among other things) the selling asset's `lotPrice().low` and the buying asset's `lotPrice().high`. +All trades have a worst-case exchange rate that is a function of (among other things) the selling asset's `price().low` and the buying asset's `price().high`. #### Trade Examples diff --git a/scripts/addresses/84531-RTKN-tmp-deployments.json b/scripts/addresses/84531-RTKN-tmp-deployments.json new file mode 100644 index 0000000000..e7ec7dc68f --- /dev/null +++ b/scripts/addresses/84531-RTKN-tmp-deployments.json @@ -0,0 +1,19 @@ +{ + "facadeWrite": "0x0903048fD4E948c60451B41A48B35E0bafc0967F", + "main": "0x1274F03639932140bBd48D8376a39ee86EbFEe66", + "components": { + "assetRegistry": "0x09909aD4e15167f18dc42f86F12Ba85137Fc51a3", + "backingManager": "0xd53F642B04ba005E9A27FC82961F7c1563BEF301", + "basketHandler": "0xE9E22548C92EF74c02A9dab73c33eBcEb53cA216", + "broker": "0x7466593929d61308C89ce651029B7019E644b398", + "distributor": "0xd3e333fb488e7DF8BA49D98399a7f42d7fAc7b2C", + "furnace": "0xfe702Ff577B0a9B3865a59af31D039fA92739d39", + "rsrTrader": "0xF0c203Be2ac6747C107D119FCb3d8BED28d9A2db", + "rTokenTrader": "0xc2C5542ceF5d6C8c79b538ff3c3DA976720F93bf", + "rToken": "0x41d5a65ba05bEB7C5Ce01FF3eFb2c52eF2D46469", + "stRSR": "0xB8f96Ec61B4f209F7562bC10375b374f8305De97" + }, + "rTokenAsset": "0xa9063D1153DA2160A298ea83CA388c827c623A5D", + "governance": "0x326A8309f9b5f1ee06e832cdc168eac7feBA2Bea", + "timelock": "0x9686C510f9b5d101c75f659D0Fd3De20c01649dE" +} diff --git a/scripts/confirmation/1_confirm_assets.ts b/scripts/confirmation/1_confirm_assets.ts index 0c62bfbac1..b5ea27b8ec 100644 --- a/scripts/confirmation/1_confirm_assets.ts +++ b/scripts/confirmation/1_confirm_assets.ts @@ -2,7 +2,8 @@ import hre from 'hardhat' import { getChainId } from '../../common/blockchain-utils' import { developmentChains, networkConfig } from '../../common/configuration' -import { CollateralStatus } from '../../common/constants' +import { CollateralStatus, MAX_UINT192 } from '../../common/constants' +import { getLatestBlockTimestamp } from '#/utils/time' import { getDeploymentFile, IAssetCollDeployments, @@ -27,18 +28,20 @@ async function main() { const assets = Object.values(assetsColls.assets) const collateral = Object.values(assetsColls.collateral) - // Confirm lotPrice() == price() for (const a of assets) { console.log(`confirming asset ${a}`) const asset = await hre.ethers.getContractAt('Asset', a) - const [lotLow, lotHigh] = await asset.lotPrice() const [low, high] = await asset.price() // {UoA/tok} - if (low.eq(0) || high.eq(0)) throw new Error('misconfigured oracle') - - if (!lotLow.eq(low) || !lotHigh.eq(high)) { - console.log('lotLow, low, lotHigh, high', lotLow, low, lotHigh, high) - throw new Error('lot price off') - } + const timestamp = await getLatestBlockTimestamp(hre) + if ( + low.eq(0) || + low.eq(MAX_UINT192) || + high.eq(0) || + high.eq(MAX_UINT192) || + await asset.lastSave() !== timestamp || + await asset.lastSave() !== timestamp + ) + throw new Error('misconfigured oracle') } // Collateral @@ -49,14 +52,18 @@ async function main() { if ((await coll.status()) != CollateralStatus.SOUND) throw new Error('collateral unsound') - const [lotLow, lotHigh] = await coll.lotPrice() const [low, high] = await coll.price() // {UoA/tok} - if (low.eq(0) || high.eq(0)) throw new Error('misconfigured oracle') - - if (!lotLow.eq(low) || !lotHigh.eq(high)) { - console.log('lotLow, low, lotHigh, high', lotLow, low, lotHigh, high) - throw new Error('lot price off') - } + const timestamp = await getLatestBlockTimestamp(hre) + if ( + low.eq(0) || + low.eq(MAX_UINT192) || + high.eq(0) || + high.eq(MAX_UINT192) || + await coll.lastSave() !== timestamp || + await coll.lastSave() !== timestamp + ) + throw new Error('misconfigured oracle') + } } } diff --git a/scripts/deploy.ts b/scripts/deploy.ts index eb9d82f713..e2916e7d00 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -62,6 +62,8 @@ async function main() { 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', + 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts', + 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts', 'phase2-assets/collaterals/deploy_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { diff --git a/scripts/deployment/phase1-common/1_deploy_libraries.ts b/scripts/deployment/phase1-common/1_deploy_libraries.ts index 35fc34e373..78a4efa683 100644 --- a/scripts/deployment/phase1-common/1_deploy_libraries.ts +++ b/scripts/deployment/phase1-common/1_deploy_libraries.ts @@ -8,7 +8,6 @@ import { BasketLibP1, CvxMining, RecollateralizationLibP1 } from '../../../typec let tradingLib: RecollateralizationLibP1 let basketLib: BasketLibP1 -let cvxMiningLib: CvxMining async function main() { // ==== Read Configuration ==== @@ -16,7 +15,7 @@ async function main() { const chainId = await getChainId(hre) console.log( - `Deploying TradingLib, BasketLib, and CvxMining to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}` + `Deploying TradingLib, BasketLib to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}` ) if (!networkConfig[chainId]) { @@ -46,20 +45,9 @@ async function main() { fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) - // Deploy CvxMining external library - if (!baseL2Chains.includes(hre.network.name)) { - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - cvxMiningLib = await CvxMiningFactory.connect(burner).deploy() - await cvxMiningLib.deployed() - deployments.cvxMiningLib = cvxMiningLib.address - - fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) - } - console.log(`Deployed to ${hre.network.name} (${chainId}): TradingLib: ${tradingLib.address} BasketLib: ${basketLib.address} - CvxMiningLib: ${cvxMiningLib ? cvxMiningLib.address : 'N/A'} Deployment file: ${deploymentFilename}`) } diff --git a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts b/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts index e67a33f602..f33da05e81 100644 --- a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts +++ b/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts @@ -6,7 +6,7 @@ import { networkConfig } from '../../../common/configuration' import { ZERO_ADDRESS } from '../../../common/constants' import { fp } from '../../../common/numbers' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../../deployment/common' -import { priceTimeout, oracleTimeout, validateImplementations } from '../../deployment/utils' +import { priceTimeout, validateImplementations } from '../../deployment/utils' import { Asset } from '../../../typechain' let rsrAsset: Asset @@ -36,7 +36,7 @@ async function main() { tokenAddress: deployments.prerequisites.RSR, rewardToken: ZERO_ADDRESS, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h + oracleTimeout: '86400', // 24h }) rsrAsset = await ethers.getContractAt('Asset', rsrAssetAddr) diff --git a/scripts/deployment/phase2-assets/1_deploy_assets.ts b/scripts/deployment/phase2-assets/1_deploy_assets.ts index cab49a5515..93a8a69392 100644 --- a/scripts/deployment/phase2-assets/1_deploy_assets.ts +++ b/scripts/deployment/phase2-assets/1_deploy_assets.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../deployment/utils' +import { priceTimeout } from '../../deployment/utils' import { Asset } from '../../../typechain' async function main() { @@ -44,7 +44,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.stkAAVE, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr }) await (await ethers.getContractAt('Asset', stkAAVEAsset)).refresh() @@ -60,7 +60,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.COMP, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr }) await (await ethers.getContractAt('Asset', compAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index cd8fdaa334..5a58c3bea8 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../common' -import { combinedError, priceTimeout, oracleTimeout, revenueHiding } from '../utils' +import { combinedError, priceTimeout, revenueHiding } from '../utils' import { ICollateral, ATokenMock, StaticATokenLM } from '../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { let collateral: ICollateral /******** Deploy Fiat Collateral - DAI **************************/ - const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? 86400 : 3600 // 24 hr (Base) or 1 hour + const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? '86400' : '3600' // 24 hr (Base) or 1 hour const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% if (networkConfig[chainId].tokens.DAI && networkConfig[chainId].chainlinkFeeds.DAI) { @@ -53,7 +53,7 @@ async function main() { oracleError: daiOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), + oracleTimeout: daiOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -69,7 +69,7 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% /******** Deploy Fiat Collateral - USDC **************************/ @@ -80,7 +80,7 @@ async function main() { oracleError: usdcOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + oracleTimeout: usdcOracleTimeout, // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -97,7 +97,7 @@ async function main() { } /******** Deploy Fiat Collateral - USDT **************************/ - const usdtOracleTimeout = 86400 // 24 hr + const usdtOracleTimeout = '86400' // 24 hr const usdtOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% if (networkConfig[chainId].tokens.USDT && networkConfig[chainId].chainlinkFeeds.USDT) { @@ -107,7 +107,7 @@ async function main() { oracleError: usdtOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdtOracleTimeout).toString(), // 24 hr + oracleTimeout: usdtOracleTimeout, // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdtOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -132,7 +132,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.USDP, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -156,7 +156,7 @@ async function main() { oracleError: fp('0.003').toString(), // 0.3% tokenAddress: networkConfig[chainId].tokens.TUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.013').toString(), // 1.3% delayUntilDefault: bn('86400').toString(), // 24h @@ -179,7 +179,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% tokenAddress: networkConfig[chainId].tokens.BUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -203,7 +203,7 @@ async function main() { oracleError: usdcOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDbC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + oracleTimeout: usdcOracleTimeout, // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1.3% delayUntilDefault: bn('86400').toString(), // 24h @@ -249,7 +249,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: adaiStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -293,7 +293,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: ausdcStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -337,7 +337,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: ausdtStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -380,7 +380,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% staticAToken: abusdStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -424,7 +424,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% staticAToken: ausdpStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -445,6 +445,242 @@ async function main() { const btcOracleError = fp('0.005') // 0.5% const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) + /*** Compound V2 not available in Base L2s */ + if (!baseL2Chains.includes(hre.network.name)) { + /******** Deploy CToken Fiat Collateral - cDAI **************************/ + const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') + const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) + + const cDaiVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cDAI!, + `${await cDai.name()} Vault`, + `${await cDai.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cDaiVault.deployed() + + console.log( + `Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} ` + ) + + const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cDaiVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cDaiCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cDAI = cDaiCollateral + assetCollDeployments.erc20s.cDAI = cDaiVault.address + deployedCollateral.push(cDaiCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDC **************************/ + const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) + + const cUsdcVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDC!, + `${await cUsdc.name()} Vault`, + `${await cUsdc.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdcVault.deployed() + + console.log( + `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` + ) + + const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cUsdcVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdcCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDC = cUsdcCollateral + assetCollDeployments.erc20s.cUSDC = cUsdcVault.address + deployedCollateral.push(cUsdcCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDT **************************/ + const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) + + const cUsdtVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDT!, + `${await cUsdt.name()} Vault`, + `${await cUsdt.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdtVault.deployed() + + console.log( + `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` + ) + + const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, + oracleError: fp('0.0025').toString(), // 0.25% + cToken: cUsdtVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdtCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDT = cUsdtCollateral + assetCollDeployments.erc20s.cUSDT = cUsdtVault.address + deployedCollateral.push(cUsdtCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Fiat Collateral - cUSDP **************************/ + const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) + + const cUsdpVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cUSDP!, + `${await cUsdp.name()} Vault`, + `${await cUsdp.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cUsdpVault.deployed() + + console.log( + `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` + ) + + const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, + oracleError: fp('0.01').toString(), // 1% + cToken: cUsdpVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cUsdpCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cUSDP = cUsdpCollateral + assetCollDeployments.erc20s.cUSDP = cUsdpVault.address + deployedCollateral.push(cUsdpCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ + const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) + + const cWBTCVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cWBTC!, + `${await cWBTC.name()} Vault`, + `${await cWBTC.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cWBTCVault.deployed() + + console.log( + `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` + ) + + const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { + priceTimeout: priceTimeout.toString(), + referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, + targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, + combinedOracleError: combinedBTCWBTCError.toString(), + cToken: cWBTCVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% + delayUntilDefault: bn('86400').toString(), // 24h + revenueHiding: revenueHiding.toString(), + }) + collateral = await ethers.getContractAt('ICollateral', cWBTCCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cWBTC = cWBTCCollateral + assetCollDeployments.erc20s.cWBTC = cWBTCVault.address + deployedCollateral.push(cWBTCCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + /******** Deploy CToken Self-Referential Collateral - cETH **************************/ + const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) + + const cETHVault = await CTokenFactory.deploy( + networkConfig[chainId].tokens.cETH!, + `${await cETH.name()} Vault`, + `${await cETH.symbol()}-VAULT`, + networkConfig[chainId].COMPTROLLER! + ) + + await cETHVault.deployed() + + console.log( + `Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} ` + ) + + const { collateral: cETHCollateral } = await hre.run( + 'deploy-ctoken-selfreferential-collateral', + { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: fp('0.005').toString(), // 0.5% + cToken: cETHVault.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + revenueHiding: revenueHiding.toString(), + referenceERC20Decimals: '18', + } + ) + collateral = await ethers.getContractAt('ICollateral', cETHCollateral) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.cETH = cETHCollateral + assetCollDeployments.erc20s.cETH = cETHVault.address + deployedCollateral.push(cETHCollateral.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + } + /******** Deploy Non-Fiat Collateral - wBTC **************************/ if ( networkConfig[chainId].tokens.WBTC && @@ -458,8 +694,8 @@ async function main() { combinedOracleError: combinedBTCWBTCError.toString(), tokenAddress: networkConfig[chainId].tokens.WBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -477,7 +713,7 @@ async function main() { /******** Deploy Self Referential Collateral - wETH **************************/ if (networkConfig[chainId].tokens.WETH && networkConfig[chainId].chainlinkFeeds.ETH) { - const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? '1200' : '3600' // 20 min (Base) or 1 hr const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% const { collateral: wETHCollateral } = await hre.run('deploy-selfreferential-collateral', { @@ -486,7 +722,7 @@ async function main() { oracleError: ethOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), + oracleTimeout: ethOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('ETH'), }) collateral = await ethers.getContractAt('ICollateral', wETHCollateral) @@ -515,8 +751,8 @@ async function main() { oracleError: eurtError.toString(), // 2% tokenAddress: networkConfig[chainId].tokens.EURT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: fp('0.03').toString(), // 3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/assets/deploy_crv.ts b/scripts/deployment/phase2-assets/assets/deploy_crv.ts index f0db202b9b..80eb3f6c19 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_crv.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_crv.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../../deployment/utils' +import { priceTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.CRV, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr }) await (await ethers.getContractAt('Asset', crvAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/assets/deploy_cvx.ts b/scripts/deployment/phase2-assets/assets/deploy_cvx.ts index 1c5aaa57ce..cb7eb2d5d2 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_cvx.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_cvx.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../../deployment/utils' +import { priceTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.02').toString(), // 2% tokenAddress: networkConfig[chainId].tokens.CVX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr }) await (await ethers.getContractAt('Asset', cvxAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts index e7fbc98512..f930201a21 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts @@ -13,7 +13,7 @@ import { } from '../../common' import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' -import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' // This file specifically deploys Aave V3 USDC collateral @@ -77,7 +77,7 @@ async function main() { oracleError: fp('0.003'), // 3% erc20: erc20.address, maxTradeVolume: fp('1e6'), - oracleTimeout: oracleTimeout(chainId, bn('86400')), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.013'), delayUntilDefault: bn('86400'), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts index 2d56f9d3f9..2d4eb8112d 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -13,7 +13,7 @@ import { } from '../../common' import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' -import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' // This file specifically deploys Aave V3 USDC collateral @@ -68,7 +68,7 @@ async function main() { ) /******** Deploy Aave V3 USDC collateral plugin **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') @@ -79,7 +79,7 @@ async function main() { oracleError: usdcOracleError, erc20: erc20.address, maxTradeVolume: fp('1e6'), - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout), + oracleTimeout: usdcOracleTimeout, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError), delayUntilDefault: bn('86400'), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts index eab6850157..18984099fe 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, combinedError } from '../../utils' +import { priceTimeout, combinedError } from '../../utils' import { CBEthCollateral, CBEthCollateralL2, @@ -62,14 +62,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout + '86400' // refPerTokChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() @@ -89,16 +89,16 @@ async function main() { oracleError: oracleError.toString(), // 0.15% & 0.5%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + oracleTimeout: '1200', // 20 min targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed - oracleTimeout(chainId, '86400').toString() // exchangeRateChainlinkTimeout + '86400' // exchangeRateChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts index d328a311dd..89b2464c55 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts @@ -12,8 +12,8 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { combinedError, priceTimeout, oracleTimeout, revenueHiding } from '../../utils' -import { ICollateral, ATokenMock, StaticATokenLM } from '../../../../typechain' +import { combinedError, priceTimeout, revenueHiding } from '../../utils' +import { ICollateral } from '../../../../typechain' async function main() { // ==== Read Configuration ==== @@ -71,7 +71,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cDaiVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -109,7 +109,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cUsdcVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -147,7 +147,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cUsdtVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -185,7 +185,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% cToken: cUsdpVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -224,8 +224,8 @@ async function main() { combinedOracleError: combinedBTCWBTCError.toString(), cToken: cWBTCVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr - targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '86400', // 24 hr + targetUnitOracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -265,7 +265,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% cToken: cETHVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: revenueHiding.toString(), referenceERC20Decimals: '18', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts index dae7875b30..b382962e58 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts @@ -14,7 +14,7 @@ import { fileExists, } from '../../common' import { CurveStableRTokenMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -63,13 +63,10 @@ async function main() { /******** Deploy Convex Stable Metapool for eUSD/fraxBP **************************/ - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory( 'CurveStableRTokenMetapoolCollateral' ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await ConvexStakingWrapperFactory.deploy() await wPool.deployed() @@ -87,7 +84,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -98,10 +95,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts index 72d0f7debe..6727ff25d7 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CurvePoolType, DELAY_UNTIL_DEFAULT, @@ -69,13 +69,10 @@ async function main() { /******** Deploy Convex Stable Metapool for MIM/3Pool **************************/ - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory( 'CurveStableMetapoolCollateral' ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await ConvexStakingWrapperFactory.deploy() await wPool.deployed() @@ -105,11 +102,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts index 97a8fc4f2b..abd65d88b6 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts @@ -14,7 +14,7 @@ import { fileExists, } from '../../common' import { CurveStableCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -65,11 +65,8 @@ async function main() { /******** Deploy Convex Stable Pool for 3pool **************************/ - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const w3Pool = await ConvexStakingWrapperFactory.deploy() await w3Pool.deployed() @@ -88,7 +85,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -99,11 +96,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts deleted file mode 100644 index ab71316676..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts +++ /dev/null @@ -1,142 +0,0 @@ -import fs from 'fs' -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' -import { bn } from '../../../../common/numbers' -import { expect } from 'chai' -import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - IDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { CurveVolatileCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' -import { - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - TRI_CRYPTO_CVX_POOL_ID, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../../test/plugins/individual-collateral/curve/constants' - -// This file specifically deploys Convex Volatile Plugin for Tricrypto - -async function main() { - // ==== Read Configuration ==== - const [deployer] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${deployer.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - const deployments = getDeploymentFile(phase1File) - - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - const deployedCollateral: string[] = [] - - /******** Deploy Convex Volatile Pool for 3pool **************************/ - - const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) - const CurveVolatileCollateralFactory = await hre.ethers.getContractFactory( - 'CurveVolatileCollateral' - ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: CvxMining.address }, - }) - - const w3Pool = await ConvexStakingWrapperFactory.deploy() - await w3Pool.deployed() - await (await w3Pool.initialize(TRI_CRYPTO_CVX_POOL_ID)).wait() - - console.log( - `Deployed wrapper for Convex Volatile TriCrypto on ${hre.network.name} (${chainId}): ${w3Pool.address} ` - ) - - const collateral = await CurveVolatileCollateralFactory.connect( - deployer - ).deploy( - { - erc20: w3Pool.address, - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDT_ORACLE_TIMEOUT), // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - } - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - console.log( - `Deployed Convex Volatile Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - - assetCollDeployments.collateral.cvxTriCrypto = collateral.address - assetCollDeployments.erc20s.cvxTriCrypto = w3Pool.address - deployedCollateral.push(collateral.address.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts index 3f4755ff72..21e78893af 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -61,7 +61,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = fp('0.003') // 0.3% (Base) const collateral = await CTokenV3Factory.connect(deployer).deploy( @@ -71,7 +71,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts index 873b8fbcc0..a05ac5bbc7 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -59,7 +59,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% const collateral = await CTokenV3Factory.connect(deployer).deploy( @@ -69,7 +69,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts index e886d6d806..c2d760a2f9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableRTokenMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CRV, CurvePoolType, @@ -88,7 +88,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -99,10 +99,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts index f97882d214..e62840d7e1 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts @@ -12,7 +12,7 @@ import { fileExists, } from '../../common' import { CurveStableMetapoolCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CRV, CurvePoolType, @@ -105,11 +105,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts index b2d6462d6c..6b9f415d01 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' +import { revenueHiding } from '../../utils' import { CRV, CurvePoolType, @@ -89,7 +89,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -100,11 +100,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts deleted file mode 100644 index f3b6e3e615..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts +++ /dev/null @@ -1,142 +0,0 @@ -import fs from 'fs' -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' -import { bn } from '../../../../common/numbers' -import { expect } from 'chai' -import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { CurveVolatileCollateral } from '../../../../typechain' -import { revenueHiding, oracleTimeout } from '../../utils' -import { - CRV, - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - TRI_CRYPTO_GAUGE, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../../test/plugins/individual-collateral/curve/constants' - -// Deploy Curve Volatile Plugin for Tricrypto - -async function main() { - // ==== Read Configuration ==== - const [deployer] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${deployer.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - const deployedCollateral: string[] = [] - - /******** Deploy Curve Volatile Pool for 3pool **************************/ - - const CurveVolatileCollateralFactory = await hre.ethers.getContractFactory( - 'CurveVolatileCollateral' - ) - const CurveStakingWrapperFactory = await ethers.getContractFactory('CurveGaugeWrapper') - const w3Pool = await CurveStakingWrapperFactory.deploy( - TRI_CRYPTO_TOKEN, - 'Wrapped Curve.fi USD-BTC-ETH', - 'wcrv3crypto', - CRV, - TRI_CRYPTO_GAUGE - ) - await w3Pool.deployed() - - console.log( - `Deployed wrapper for Curve Volatile TriCrypto on ${hre.network.name} (${chainId}): ${w3Pool.address} ` - ) - - const collateral = await CurveVolatileCollateralFactory.connect( - deployer - ).deploy( - { - erc20: w3Pool.address, - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDT_ORACLE_TIMEOUT), // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - } - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - console.log( - `Deployed Curve Volatile Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - - assetCollDeployments.collateral.crvTriCrypto = collateral.address - assetCollDeployments.erc20s.crvTriCrypto = w3Pool.address - deployedCollateral.push(collateral.address.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts index 26ab8341ac..aa6e840436 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts @@ -13,7 +13,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { SDaiCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -54,12 +54,12 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: networkConfig[chainId].tokens.sDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }, - fp('1e-6').toString(), // revenueHiding = 0.0001% + bn(0), // does not require revenue hiding POT ) await collateral.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts index af7258ec4c..6acbcccf8f 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding } from '../../utils' import { ICollateral } from '../../../../typechain' async function main() { @@ -49,7 +49,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fUsdc.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -74,7 +74,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fUsdt.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -99,7 +99,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fDai.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -124,7 +124,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% cToken: fFrax.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts index bc6a8b160a..30884eae2d 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { LidoStakedEthCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -79,14 +79,14 @@ async function main() { oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% stethEthOracleAddress, // targetPerRefChainlinkFeed - oracleTimeout(chainId, '86400').toString() // targetPerRefChainlinkTimeout + '86400' // targetPerRefChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index 535b4fd9f1..cb659b1889 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -11,7 +11,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, combinedError } from '../../utils' +import { priceTimeout, combinedError } from '../../utils' async function main() { // ==== Read Configuration ==== @@ -46,11 +46,9 @@ async function main() { const MorphoTokenisedDepositFactory = await ethers.getContractFactory( 'MorphoAaveV2TokenisedDeposit' ) - const maUSDT = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDT!, poolToken: networkConfig[chainId].tokens.aUSDT!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -59,7 +57,6 @@ async function main() { const maUSDC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDC!, poolToken: networkConfig[chainId].tokens.aUSDC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -68,7 +65,6 @@ async function main() { const maDAI = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.DAI!, poolToken: networkConfig[chainId].tokens.aDAI!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -77,7 +73,6 @@ async function main() { const maWBTC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.WBTC!, poolToken: networkConfig[chainId].tokens.aWBTC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -86,7 +81,6 @@ async function main() { const maWETH = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.WETH!, poolToken: networkConfig[chainId].tokens.aWETH!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -95,7 +89,6 @@ async function main() { const maStETH = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.stETH!, poolToken: networkConfig[chainId].tokens.astETH!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -127,7 +120,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: stablesOracleError.toString(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr + oracleTimeout: '86400', // 24h targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: stablesOracleError.add(fp('0.01')), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -165,6 +158,7 @@ async function main() { const collateral = await FiatCollateralFactory.connect(deployer).deploy( { ...baseStableConfig, + oracleTimeout: '3600', // 1 hr chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI!, erc20: maDAI.address, }, @@ -185,16 +179,16 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedBTCWBTCError, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} erc20: maWBTC.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} - oracleTimeout(chainId, '86400').toString() // 1 hr + networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} + '3600' // 1 hr ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) @@ -208,7 +202,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: fp('0.005'), maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h @@ -237,16 +231,16 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedOracleErrors, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} erc20: maStETH.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} - oracleTimeout(chainId, '86400').toString() // 1 hr + networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} + '3600' // 1 hr ) assetCollDeployments.collateral.maStETH = collateral.address deployedCollateral.push(collateral.address.toString()) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts index 7f8b308993..d90520b97a 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout, combinedError } from '../../utils' +import { priceTimeout, combinedError } from '../../utils' import { RethCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -70,14 +70,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% rethOracleAddress, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout + '86400' // refPerTokChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts index 1510377f20..600505d84e 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, oracleTimeout } from '../../utils' +import { priceTimeout } from '../../utils' import { SFraxCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -53,7 +53,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% erc20: networkConfig[chainId].tokens.sFRAX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% = 1% oracleError + 1% buffer delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts index 5db4436ea9..dfd837767f 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts @@ -12,17 +12,12 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { revenueHiding, priceTimeout, oracleTimeout } from '../../utils' +import { revenueHiding, priceTimeout } from '../../utils' import { StargatePoolFiatCollateral, StargatePoolFiatCollateral__factory, } from '../../../../typechain' import { ContractFactory } from 'ethers' - -import { - STAKING_CONTRACT, - SUSDC, -} from '../../../../test/plugins/individual-collateral/stargate/constants' import { useEnv } from '#/utils/env' async function main() { @@ -51,8 +46,10 @@ async function main() { /******** Deploy Stargate USDC Wrapper **************************/ - const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') - let chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' + const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory( + 'StargateRewardableWrapper' + ) + const chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' let USDC_NAME = 'USDC' let name = 'Wrapped Stargate USDC' let symbol = 'wsgUSDC' @@ -93,7 +90,7 @@ async function main() { oracleError: oracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainIdKey, '86400').toString(), // 24h hr, + oracleTimeout: '86400', // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(oracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -104,7 +101,9 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - console.log(`Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}`) + console.log( + `Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}` + ) if (chainIdKey == '8453') { assetCollDeployments.collateral.wsgUSDbC = collateral.address diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts index 8a43556a52..4ac4e4c6c8 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { revenueHiding, priceTimeout, oracleTimeout } from '../../utils' +import { revenueHiding, priceTimeout } from '../../utils' import { StargatePoolFiatCollateral, StargatePoolFiatCollateral__factory, @@ -77,7 +77,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25%, erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, + oracleTimeout: '86400', // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts new file mode 100644 index 0000000000..e8f9f1f154 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts @@ -0,0 +1,104 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout } from '../../utils' +import { YearnV2CurveFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' +import { + PRICE_PER_SHARE_HELPER, + YVUSDC_LP_TOKEN, +} from '../../../../test/plugins/individual-collateral/yearnv2/constants' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Yearn V2 Curve Fiat Collateral - yvCurveUSDCcrvUSD **************************/ + + const YearnV2CurveCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'YearnV2CurveFiatCollateral' + ) + + const collateral = await YearnV2CurveCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, // not used but can't be empty + oracleError: fp('0.0025').toString(), // not used but can't be empty + erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only + { + nTokens: '2', + curvePool: YVUSDC_LP_TOKEN, + poolType: '0', + feeds: [ + [networkConfig[chainId].chainlinkFeeds.USDC], + [networkConfig[chainId].chainlinkFeeds.crvUSD], + ], + oracleTimeouts: [['86400'], ['86400']], + oracleErrors: [[fp('0.0025').toString()], [fp('0.005').toString()]], + lpToken: YVUSDC_LP_TOKEN, + }, + PRICE_PER_SHARE_HELPER + ) + await collateral.deployed() + + console.log( + `Deployed Yearn Curve yvUSDCcrvUSD to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.yvCurveUSDCcrvUSD = collateral.address + assetCollDeployments.erc20s.yvCurveUSDCcrvUSD = networkConfig[chainId].tokens.yvCurveUSDCcrvUSD + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts new file mode 100644 index 0000000000..cbb2c89cc0 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts @@ -0,0 +1,104 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout } from '../../utils' +import { YearnV2CurveFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' +import { + PRICE_PER_SHARE_HELPER, + YVUSDP_LP_TOKEN, +} from '../../../../test/plugins/individual-collateral/yearnv2/constants' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Yearn V2 Curve Fiat Collateral - yvCurveUSDPcrvUSD **************************/ + + const YearnV2CurveCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'YearnV2CurveFiatCollateral' + ) + + const collateral = await YearnV2CurveCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDP, // not used but can't be empty + oracleError: fp('0.0025').toString(), // not used but can't be empty + erc20: networkConfig[chainId].tokens.yvCurveUSDPcrvUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.02').toString(), // 2% = max oracleError + 1% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only + { + nTokens: '2', + curvePool: YVUSDP_LP_TOKEN, + poolType: '0', + feeds: [ + [networkConfig[chainId].chainlinkFeeds.USDP], + [networkConfig[chainId].chainlinkFeeds.crvUSD], + ], + oracleTimeouts: [['3600'], ['86400']], + oracleErrors: [[fp('0.01').toString()], [fp('0.005').toString()]], + lpToken: YVUSDP_LP_TOKEN, + }, + PRICE_PER_SHARE_HELPER + ) + await collateral.deployed() + + console.log( + `Deployed Yearn Curve yvUSDPcrvUSD to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.yvCurveUSDPcrvUSD = collateral.address + assetCollDeployments.erc20s.yvCurveUSDPcrvUSD = networkConfig[chainId].tokens.yvCurveUSDPcrvUSD + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index 84dad2be5e..a8c2083e09 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -2,7 +2,7 @@ import hre, { tenderly } from 'hardhat' import * as readline from 'readline' import axios from 'axios' import { exec } from 'child_process' -import { BigNumber, BigNumberish } from 'ethers' +import { BigNumber } from 'ethers' import { bn, fp } from '../../common/numbers' import { IComponents, baseL2Chains } from '../../common/configuration' import { isValidContract } from '../../common/blockchain-utils' @@ -13,13 +13,6 @@ export const priceTimeout = bn('604800') // 1 week export const revenueHiding = fp('1e-6') // 1 part in a million -export const longOracleTimeout = bn('4294967296') - -// Returns the base plus 1 minute -export const oracleTimeout = (chainId: string, base: BigNumberish) => { - return chainId == '1' || chainId == '8453' ? bn('60').add(base) : longOracleTimeout -} - export const combinedError = (x: BigNumber, y: BigNumber): BigNumber => { return fp('1').add(x).mul(fp('1').add(y)).div(fp('1')).sub(fp('1')) } diff --git a/scripts/exhaustive-tests/run-1.sh b/scripts/exhaustive-tests/run-1.sh index fbad597e14..bf214a6ba0 100644 --- a/scripts/exhaustive-tests/run-1.sh +++ b/scripts/exhaustive-tests/run-1.sh @@ -1,3 +1,3 @@ -echo "Running RToken & Furnace exhaustive tests for commit hash: " +echo "Running Broker, RToken, & Furnace exhaustive tests for commit hash: " git rev-parse HEAD; -NODE_OPTIONS=--max-old-space-size=30000 EXTREME=1 SLOW=1 PROTO_IMPL=1 npx hardhat test test/RTokenExtremes.test.ts test/Furnace.test.ts; +NODE_OPTIONS=--max-old-space-size=30000 EXTREME=1 SLOW=1 PROTO_IMPL=1 npx hardhat test test/RTokenExtremes.test.ts test/Broker.test.ts test/Furnace.test.ts; diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index f857f28877..fbcfe84d23 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -8,13 +8,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../deployment/common' -import { - combinedError, - priceTimeout, - oracleTimeout, - revenueHiding, - verifyContract, -} from '../deployment/utils' +import { combinedError, priceTimeout, revenueHiding, verifyContract } from '../deployment/utils' import { ATokenMock, ATokenFiatCollateral, ICToken, CTokenFiatCollateral } from '../../typechain' let deployments: IAssetCollDeployments @@ -47,7 +41,7 @@ async function main() { oracleError: daiOracleError.toString(), erc20: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), + oracleTimeout: daiOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -71,7 +65,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: networkConfig[chainId].tokens.USDbC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), + oracleTimeout: usdcOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -99,7 +93,7 @@ async function main() { 'Static ' + (await aToken.name()), 's' + (await aToken.symbol()), ], - 'contracts/plugins/assets/aave/StaticATokenLM.sol:StaticATokenLM' + 'contracts/plugins/assets/aave/vendor/StaticATokenLM.sol:StaticATokenLM' ) /******** Verify ATokenFiatCollateral - aDAI **************************/ await verifyContract( @@ -112,7 +106,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: await aTokenCollateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -151,7 +145,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: deployments.erc20s.cDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -176,13 +170,13 @@ async function main() { oracleError: combinedBTCWBTCError.toString(), erc20: deployments.erc20s.cWBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.BTC, - oracleTimeout(chainId, '3600').toString(), + '3600', revenueHiding.toString(), ], 'contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol:CTokenNonFiatCollateral' @@ -198,7 +192,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% erc20: deployments.erc20s.cETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', @@ -219,13 +213,13 @@ async function main() { oracleError: combinedBTCWBTCError.toString(), erc20: networkConfig[chainId].tokens.WBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), + oracleTimeout: '86400', // 24h targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.BTC, - oracleTimeout(chainId, '3600').toString(), + '3600', ], 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' ) @@ -244,7 +238,7 @@ async function main() { oracleError: ethOracleError.toString(), // 0.5% erc20: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), + oracleTimeout: ethOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', @@ -264,13 +258,13 @@ async function main() { oracleError: fp('0.02').toString(), // 2% erc20: networkConfig[chainId].tokens.EURT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), + oracleTimeout: '86400', // 24hr targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: fp('0.03').toString(), // 3% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.EUR, - oracleTimeout(chainId, '86400').toString(), + '86400', ], 'contracts/plugins/assets/EURFiatCollateral.sol:EURFiatCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts index edb092d1af..3a373573dc 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { fp, bn } from '../../../common/numbers' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -54,7 +54,7 @@ async function main() { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: fp('0.003').toString(), // 3% - oracleTimeout: oracleTimeout(chainId, bn('86400')).toString(), // 24 hr + oracleTimeout: '86400', // 24 hr maxTradeVolume: fp('1e6').toString(), defaultThreshold: fp('0.013').toString(), delayUntilDefault: bn('86400').toString(), diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts index 1486c37cab..3ffce9a0a5 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { fp, bn } from '../../../common/numbers' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -39,7 +39,7 @@ async function main() { ) /******** Verify Aave V3 USDC plugin **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% await verifyContract( @@ -52,7 +52,7 @@ async function main() { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: usdcOracleError.toString(), - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr + oracleTimeout: usdcOracleTimeout, // 24 hr maxTradeVolume: fp('1e6').toString(), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), diff --git a/scripts/verification/collateral-plugins/verify_cbeth.ts b/scripts/verification/collateral-plugins/verify_cbeth.ts index 4e58ad88d5..9b52d6323b 100644 --- a/scripts/verification/collateral-plugins/verify_cbeth.ts +++ b/scripts/verification/collateral-plugins/verify_cbeth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -40,14 +40,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout ], 'contracts/plugins/assets/cbeth/CBETHCollateral.sol:CBEthCollateral' ) @@ -63,16 +63,16 @@ async function main() { oracleError: oracleError.toString(), // 0.15% & 0.5%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min + oracleTimeout: '1200', // 20 min targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // exchangeRateChainlinkTimeout + '86400', // exchangeRateChainlinkTimeout ], 'contracts/plugins/assets/cbeth/CBETHCollateralL2.sol:CBEthCollateralL2' ) diff --git a/scripts/verification/collateral-plugins/verify_convex_stable.ts b/scripts/verification/collateral-plugins/verify_convex_stable.ts index 3c22ae2557..127ef39143 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable.ts @@ -11,7 +11,7 @@ import { IDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -61,17 +61,7 @@ async function main() { chainId, await w3PoolCollateral.erc20(), [], - 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper', - { CvxMining: coreDeployments.cvxMiningLib } - ) - - /******** Verify CvxMining Lib **************************/ - - await verifyContract( - chainId, - coreDeployments.cvxMiningLib, - [], - 'contracts/plugins/assets/curve/cvx/vendor/CvxMining.sol:CvxMining' + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' ) /******** Verify 3Pool plugin **************************/ @@ -85,7 +75,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -96,11 +86,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts index 440f8854b2..fedb2d418a 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -75,11 +75,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts index 771f6bc767..400c23d10e 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), + oracleTimeout: USDC_ORACLE_TIMEOUT, maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -70,10 +70,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_volatile.ts b/scripts/verification/collateral-plugins/verify_convex_volatile.ts deleted file mode 100644 index 8c48da0e56..0000000000 --- a/scripts/verification/collateral-plugins/verify_convex_volatile.ts +++ /dev/null @@ -1,98 +0,0 @@ -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' -import { bn } from '../../../common/numbers' -import { ONE_ADDRESS } from '../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, -} from '../../deployment/common' -import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' -import { - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../test/plugins/individual-collateral/curve/constants' - -let deployments: IAssetCollDeployments - -async function main() { - // ********** Read config ********** - const chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (developmentChains.includes(hre.network.name)) { - throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) - } - - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - deployments = getDeploymentFile(assetCollDeploymentFilename) - - const wTriCrypto = await ethers.getContractAt( - 'CurveVolatileCollateral', - deployments.collateral.cvxTriCrypto as string - ) - - /******** Verify TriCrypto plugin **************************/ - await verifyContract( - chainId, - deployments.collateral.cvxTriCrypto, - [ - { - erc20: await wTriCrypto.erc20(), - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - }, - ], - 'contracts/plugins/assets/convex/CurveVolatileCollateral.sol:CurveVolatileCollateral' - ) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verification/collateral-plugins/verify_curve_stable.ts b/scripts/verification/collateral-plugins/verify_curve_stable.ts index ce1120f618..3f4b66190a 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CRV, CurvePoolType, @@ -72,7 +72,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -83,11 +83,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts index 60be29f1e0..e1b433bbd5 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -75,11 +75,7 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts index a48df02d1f..43d2172f10 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -70,10 +70,7 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], - ], + oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_volatile.ts b/scripts/verification/collateral-plugins/verify_curve_volatile.ts deleted file mode 100644 index 2f5c53b2c1..0000000000 --- a/scripts/verification/collateral-plugins/verify_curve_volatile.ts +++ /dev/null @@ -1,98 +0,0 @@ -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' -import { bn } from '../../../common/numbers' -import { ONE_ADDRESS } from '../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, -} from '../../deployment/common' -import { verifyContract } from '../../deployment/utils' -import { revenueHiding, oracleTimeout } from '../../deployment/utils' -import { - CurvePoolType, - BTC_USD_ORACLE_ERROR, - BTC_ORACLE_TIMEOUT, - BTC_USD_FEED, - DEFAULT_THRESHOLD, - DELAY_UNTIL_DEFAULT, - MAX_TRADE_VOL, - PRICE_TIMEOUT, - TRI_CRYPTO, - TRI_CRYPTO_TOKEN, - WBTC_BTC_ORACLE_ERROR, - WETH_ORACLE_TIMEOUT, - WBTC_BTC_FEED, - WBTC_ORACLE_TIMEOUT, - WETH_USD_FEED, - WETH_ORACLE_ERROR, - USDT_ORACLE_ERROR, - USDT_ORACLE_TIMEOUT, - USDT_USD_FEED, -} from '../../../test/plugins/individual-collateral/curve/constants' - -let deployments: IAssetCollDeployments - -async function main() { - // ********** Read config ********** - const chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (developmentChains.includes(hre.network.name)) { - throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) - } - - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - deployments = getDeploymentFile(assetCollDeploymentFilename) - - const wTriCrypto = await ethers.getContractAt( - 'CurveVolatileCollateral', - deployments.collateral.crvTriCrypto as string - ) - - /******** Verify TriCrypto plugin **************************/ - await verifyContract( - chainId, - deployments.collateral.crvTriCrypto, - [ - { - erc20: await wTriCrypto.erc20(), - targetName: ethers.utils.formatBytes32String('TRICRYPTO'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: bn('1'), // unused but cannot be zero - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 3, - curvePool: TRI_CRYPTO, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], - oracleTimeouts: [ - [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], - [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], - ], - oracleErrors: [ - [USDT_ORACLE_ERROR], - [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], - [WETH_ORACLE_ERROR], - ], - lpToken: TRI_CRYPTO_TOKEN, - }, - ], - 'contracts/plugins/assets/convex/CurveVolatileCollateral.sol:CurveVolatileCollateral' - ) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts index c3a6cb314e..d0eb672ef2 100644 --- a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -50,7 +50,7 @@ async function main() { /******** Verify Collateral - wcUSDbCv3 **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = fp('0.003') // 0.3% (Base) await verifyContract( @@ -63,7 +63,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_cusdcv3.ts b/scripts/verification/collateral-plugins/verify_cusdcv3.ts index 62c1389289..09a6eceb34 100644 --- a/scripts/verification/collateral-plugins/verify_cusdcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdcv3.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -45,7 +45,7 @@ async function main() { /******** Verify Collateral - wcUSDCv3 **************************/ - const usdcOracleTimeout = 86400 // 24 hr + const usdcOracleTimeout = '86400' // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% await verifyContract( @@ -58,7 +58,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, + oracleTimeout: usdcOracleTimeout, // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_morpho.ts b/scripts/verification/collateral-plugins/verify_morpho.ts index ba7658f5af..4f9e6d832b 100644 --- a/scripts/verification/collateral-plugins/verify_morpho.ts +++ b/scripts/verification/collateral-plugins/verify_morpho.ts @@ -7,13 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { - combinedError, - priceTimeout, - oracleTimeout, - verifyContract, - revenueHiding, -} from '../../deployment/utils' +import { combinedError, priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -64,7 +58,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: fp('0.0025').toString(), // 0.25% maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr + oracleTimeout: '86400', // 1 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0025').add(fp('0.01')).toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -92,7 +86,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: combinedBTCWBTCError.toString(), // 0.25% maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h @@ -101,7 +95,7 @@ async function main() { }, revenueHiding, networkConfig[chainId].chainlinkFeeds.WBTC!, - oracleTimeout(chainId, '86400').toString(), // 1 hr + '86400', // 1 hr ], 'contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol:MorphoNonFiatCollateral' ) @@ -121,7 +115,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: fp('0.005'), maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h diff --git a/scripts/verification/collateral-plugins/verify_reth.ts b/scripts/verification/collateral-plugins/verify_reth.ts index 324a081859..077cc76e0d 100644 --- a/scripts/verification/collateral-plugins/verify_reth.ts +++ b/scripts/verification/collateral-plugins/verify_reth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -37,14 +37,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.rETH, // refPerTokChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout + '86400', // refPerTokChainlinkTimeout ], 'contracts/plugins/assets/rocket-eth/RethCollateral.sol:RethCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_sdai.ts b/scripts/verification/collateral-plugins/verify_sdai.ts index e5d9290c39..393c6264b3 100644 --- a/scripts/verification/collateral-plugins/verify_sdai.ts +++ b/scripts/verification/collateral-plugins/verify_sdai.ts @@ -42,7 +42,7 @@ async function main() { defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }, - fp('1e-6').toString(), // revenueHiding = 0.0001% + bn(0), POT, ], 'contracts/plugins/assets/dsr/SDaiCollateral.sol:SDaiCollateral' diff --git a/scripts/verification/collateral-plugins/verify_wsteth.ts b/scripts/verification/collateral-plugins/verify_wsteth.ts index c0b73b2fb0..b84c9aad57 100644 --- a/scripts/verification/collateral-plugins/verify_wsteth.ts +++ b/scripts/verification/collateral-plugins/verify_wsteth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { priceTimeout, verifyContract } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -38,14 +38,14 @@ async function main() { oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, + oracleTimeout: '3600', // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethETH feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.stETHETH, // targetPerRefChainlinkFeed - oracleTimeout(chainId, '86400').toString(), // targetPerRefChainlinkTimeout + '86400', // targetPerRefChainlinkTimeout ], 'contracts/plugins/assets/lido/LidoStakedEthCollateral.sol:LidoStakedEthCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts new file mode 100644 index 0000000000..7505cfdb85 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts @@ -0,0 +1,73 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { + PRICE_PER_SHARE_HELPER, + YVUSDC_LP_TOKEN, +} from '../../../test/plugins/individual-collateral/yearnv2/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify yvCurveUSDCcrvUSD **************************/ + await verifyContract( + chainId, + deployments.collateral.yvCurveUSDCcrvUSD, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, // not used but can't be empty + oracleError: fp('0.0025').toString(), // not used but can't be empty + erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24hr -- max of all oracleTimeouts + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only + { + nTokens: '2', + curvePool: YVUSDC_LP_TOKEN, + poolType: '0', + feeds: [ + networkConfig[chainId].chainlinkFeeds.USDC, + networkConfig[chainId].chainlinkFeeds.crvUSD, + ], + oracleTimeouts: [ + oracleTimeout(chainId, '86400').toString(), + oracleTimeout(chainId, '86400').toString(), + ], + oracleErrors: [fp('0.0025').toString(), fp('0.005').toString()], + lpToken: YVUSDC_LP_TOKEN, + }, + PRICE_PER_SHARE_HELPER, + ], + 'contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol:YearnV2CurveFiatCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index a0a69c2281..dd200b6248 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -62,6 +62,8 @@ async function main() { 'collateral-plugins/verify_sdai.ts', 'collateral-plugins/verify_morpho.ts', 'collateral-plugins/verify_aave_v3_usdc.ts', + 'collateral-plugins/verify_yearn_v2_curve_usdc.ts', + 'collateral-plugins/verify_yearn_v2_curve_usdp.ts', 'collateral-plugins/verify_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { diff --git a/tasks/deployment/deploy-facade-monitor.ts b/tasks/deployment/deploy-facade-monitor.ts new file mode 100644 index 0000000000..290a77f647 --- /dev/null +++ b/tasks/deployment/deploy-facade-monitor.ts @@ -0,0 +1,107 @@ +import { getChainId } from '../../common/blockchain-utils' +import { task, types } from 'hardhat/config' +import { FacadeMonitor } from '../../typechain' +import { developmentChains, networkConfig, IMonitorParams } from '../../common/configuration' +import { ZERO_ADDRESS } from '../../common/constants' +import { ContractFactory } from 'ethers' + +let facadeMonitor: FacadeMonitor + +task( + 'deploy-facade-monitor', + 'Deploys the FacadeMonitor implementation and proxy (if its not an upgrade)' +) + .addParam('upgrade', 'Set to true if this is for a later upgrade', false, types.boolean) + .addOptionalParam('owner', 'The address that will own the FacadeMonitor', '', types.string) + .addOptionalParam('noOutput', 'Suppress output', false, types.boolean) + .setAction(async (params, hre) => { + const [wallet] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + // ********** Read config ********** + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (!params.upgrade) { + if (!params.owner) { + throw new Error( + `An --owner must be specified for the initial deployment to ${hre.network.name}` + ) + } + } + + if (!params.noOutput) { + console.log( + `Deploying FacadeMonitor to ${hre.network.name} (${chainId}) with burner account ${wallet.address}` + ) + } + + // Setup Monitor Params + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, + } + + // Deploy FacadeMonitor + const FacadeMonitorFactory: ContractFactory = await hre.ethers.getContractFactory( + 'FacadeMonitor' + ) + const facadeMonitorImplAddr = (await hre.upgrades.deployImplementation(FacadeMonitorFactory, { + kind: 'uups', + constructorArgs: [monitorParams], + })) as string + + if (!params.noOutput) { + console.log( + `Deployed FacadeMonitor (Implementation) to ${hre.network.name} (${chainId}): ${facadeMonitorImplAddr}` + ) + } + + if (!params.upgrade) { + facadeMonitor = await hre.upgrades.deployProxy( + FacadeMonitorFactory, + [params.owner], + { + kind: 'uups', + initializer: 'init', + constructorArgs: [monitorParams], + } + ) + + if (!params.noOutput) { + console.log( + `Deployed FacadeMonitor (Proxy) to ${hre.network.name} (${chainId}): ${facadeMonitor.address}` + ) + } + } + // Verify if its not a development chain + if (!developmentChains.includes(hre.network.name)) { + // Uncomment to verify + if (!params.noOutput) { + console.log('sleeping 30s') + } + + // Sleep to ensure API is in sync with chain + await new Promise((r) => setTimeout(r, 30000)) // 30s + + if (!params.noOutput) { + console.log('verifying') + } + + /** ******************** Verify FacadeMonitor ****************************************/ + console.time('Verifying FacadeMonitor Implementation') + await hre.run('verify:verify', { + address: facadeMonitorImplAddr, + constructorArguments: [monitorParams], + contract: 'contracts/facade/FacadeMonitor.sol:FacadeMonitor', + }) + console.timeEnd('Verifying FacadeMonitor Implementation') + + if (!params.noOutput) { + console.log('verified') + } + } + + return { facadeMonitor: facadeMonitor ? facadeMonitor.address : 'N/A', facadeMonitorImplAddr } + }) diff --git a/tasks/index.ts b/tasks/index.ts index 4f167da7a5..b1a9df3b56 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -16,6 +16,7 @@ import './deployment/mock/deploy-mock-aave' import './deployment/mock/deploy-mock-wbtc' import './deployment/mock/deploy-mock-easyauction' import './deployment/create-deployer-registry' +import './deployment/deploy-facade-monitor' import './deployment/empty-wallet' import './deployment/cancel-tx' import './deployment/sign-msg' diff --git a/test/Broker.test.ts b/test/Broker.test.ts index ff345cabd4..8ef43c0721 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -42,7 +42,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, SLOW, } from './fixtures' @@ -54,7 +54,7 @@ import { getLatestBlockTimestamp, getLatestBlockNumber, } from './utils/time' -import { ITradeRequest } from './utils/trades' +import { ITradeRequest, disableBatchTrade, disableDutchTrade } from './utils/trades' import { useEnv } from '#/utils/env' import { parseUnits } from 'ethers/lib/utils' @@ -132,30 +132,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { prices = { sellLow: fp('1'), sellHigh: fp('1'), buyLow: fp('1'), buyHigh: fp('1') } }) - const disableBatchTrade = async () => { - if (IMPLEMENTATION == Implementation.P1) { - const slot = await getStorageAt(broker.address, 205) - await setStorageAt( - broker.address, - 205, - slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) - ) - } else { - const slot = await getStorageAt(broker.address, 56) - await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) - } - expect(await broker.batchTradeDisabled()).to.equal(true) - } - - const disableDutchTrade = async (erc20: string) => { - const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') - const p = mappingSlot.toHexString().slice(2).padStart(64, '0') - const key = erc20.slice(2).padStart(64, '0') - const slot = ethers.utils.keccak256('0x' + key + p) - await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) - expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) - } - describe('Deployment', () => { it('Should setup Broker correctly', async () => { expect(await broker.gnosis()).to.equal(gnosis.address) @@ -412,7 +388,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Disable batch trade manually - await disableBatchTrade() + await disableBatchTrade(broker) expect(await broker.batchTradeDisabled()).to.equal(true) // Enable batch trade with owner @@ -425,7 +401,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Disable dutch trade manually - await disableDutchTrade(token0.address) + await disableDutchTrade(broker, token0.address) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(true) // Enable dutch trade with owner @@ -444,7 +420,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { describe('Trade Management', () => { it('Should not allow to open Batch trade if Disabled', async () => { // Disable Broker Batch Auctions - await disableBatchTrade() + await disableBatchTrade(broker) const tradeRequest: ITradeRequest = { sell: collateral0.address, @@ -473,12 +449,13 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await token0.connect(bmSigner).approve(broker.address, tradeRequest.sellAmount) // Should succeed in callStatic + await assetRegistry.refresh() await broker .connect(bmSigner) .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token0 - await disableDutchTrade(token0.address) + await disableDutchTrade(broker, token0.address) // Dutch Auction openTrade should fail now await expect( @@ -491,12 +468,13 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .withArgs(token0.address, true, false) // Should succeed in callStatic + await assetRegistry.refresh() await broker .connect(bmSigner) .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token1 - await disableDutchTrade(token1.address) + await disableDutchTrade(broker, token1.address) // Dutch Auction openTrade should fail now await expect( @@ -572,28 +550,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Check nothing changed expect(await broker.batchTradeDisabled()).to.equal(false) }) - - it('Should not allow to report violation if paused or frozen', async () => { - // Check not disabled - expect(await broker.batchTradeDisabled()).to.equal(false) - - await main.connect(owner).pauseTrading() - - await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( - 'frozen or trading paused' - ) - - await main.connect(owner).unpauseTrading() - - await main.connect(owner).freezeShort() - - await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( - 'frozen or trading paused' - ) - - // Check nothing changed - expect(await broker.batchTradeDisabled()).to.equal(false) - }) }) describe('Trades', () => { @@ -1271,7 +1227,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: bn(500), - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1436,7 +1392,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: bn('1'), // minimize erc20: sellTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -1448,7 +1404,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: bn('1'), // minimize erc20: buyTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -1660,6 +1616,14 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { let TradeFactory: ContractFactory let newTrade: DutchTrade + // Increment `lastSave` in storage slot 1 + const incrementLastSave = async (addr: string) => { + const asArray = ethers.utils.arrayify(await getStorageAt(addr, 1)) + asArray[7] = asArray[7] + 1 // increment least significant byte of lastSave + const asHex = ethers.utils.hexlify(asArray) + await setStorageAt(addr, 1, asHex) + } + beforeEach(async () => { amount = bn('100e18') @@ -1687,6 +1651,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Backing Manager await whileImpersonating(backingManager.address, async (bmSigner) => { await token0.connect(bmSigner).approve(broker.address, amount) + await assetRegistry.refresh() + await incrementLastSave(tradeRequest.sell) + await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(bmSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) @@ -1695,6 +1662,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // RSR Trader await whileImpersonating(rsrTrader.address, async (rsrSigner) => { await token0.connect(rsrSigner).approve(broker.address, amount) + await assetRegistry.refresh() + await incrementLastSave(tradeRequest.sell) + await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(rsrSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) @@ -1703,6 +1673,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // RToken Trader await whileImpersonating(rTokenTrader.address, async (rtokSigner) => { await token0.connect(rtokSigner).approve(broker.address, amount) + await assetRegistry.refresh() + await incrementLastSave(tradeRequest.sell) + await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(rtokSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 207263b706..f20428e2a4 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -3,11 +3,13 @@ import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' -import { ethers } from 'hardhat' +import { ethers, upgrades } from 'hardhat' import { expectEvents } from '../common/events' -import { IConfig } from '#/common/configuration' +import { IConfig, IMonitorParams } from '#/common/configuration' import { bn, fp } from '../common/numbers' import { setOraclePrice } from './utils/oracles' +import { disableBatchTrade, disableDutchTrade } from './utils/trades' +import { whileImpersonating } from './utils/impersonation' import { Asset, BackingManagerP1, @@ -18,6 +20,8 @@ import { CTokenWrapperMock, ERC20Mock, FacadeAct, + FacadeMonitor, + FacadeMonitorV2, FacadeRead, FacadeTest, MockV3Aggregator, @@ -45,9 +49,17 @@ import { IMPLEMENTATION, defaultFixture, ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, } from './fixtures' import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' -import { CollateralStatus, TradeKind, MAX_UINT256, ZERO_ADDRESS } from '#/common/constants' +import { + CollateralStatus, + TradeKind, + MAX_UINT256, + ONE_PERIOD, + ZERO_ADDRESS, +} from '#/common/constants' import { expectTrade } from './utils/trades' import { mintCollaterals } from './utils/tokens' @@ -55,7 +67,7 @@ const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.ski const itP1 = IMPLEMENTATION == Implementation.P1 ? it : it.skip -describe('FacadeRead + FacadeAct contracts', () => { +describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { let owner: SignerWithAddress let addr1: SignerWithAddress let addr2: SignerWithAddress @@ -83,6 +95,7 @@ describe('FacadeRead + FacadeAct contracts', () => { let facade: FacadeRead let facadeTest: FacadeTest let facadeAct: FacadeAct + let facadeMonitor: FacadeMonitor // Main let rToken: TestIRToken @@ -125,6 +138,7 @@ describe('FacadeRead + FacadeAct contracts', () => { facade, facadeAct, facadeTest, + facadeMonitor, rToken, main, basketHandler, @@ -270,7 +284,7 @@ describe('FacadeRead + FacadeAct contracts', () => { it('Should handle UNPRICED when returning issuable quantities', async () => { // Set unpriced assets, should return UoA = 0 - await setOraclePrice(tokenAsset.address, MAX_UINT256.div(2).sub(1)) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) const [toks, quantities, uoas] = await facade.callStatic.issue(rToken.address, issueAmount) expect(toks.length).to.equal(4) expect(toks[0]).to.equal(token.address) @@ -283,9 +297,9 @@ describe('FacadeRead + FacadeAct contracts', () => { expect(quantities[2]).to.equal(issueAmount.div(4)) expect(quantities[3]).to.equal(issueAmount.div(4).mul(50).div(bn('1e10'))) expect(uoas.length).to.equal(4) - // Three assets are unpriced + // Assets are unpriced expect(uoas[0]).to.equal(0) - expect(uoas[1]).to.equal(issueAmount.div(4)) + expect(uoas[1]).to.equal(0) expect(uoas[2]).to.equal(0) expect(uoas[3]).to.equal(0) }) @@ -481,6 +495,10 @@ describe('FacadeRead + FacadeAct contracts', () => { // Set price to 0 await setOraclePrice(rsrAsset.address, bn(0)) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, bn('1e8')) + await setOraclePrice(usdcAsset.address, bn('1e8')) + await assetRegistry.refresh() const [backing2, overCollateralization2] = await facade.callStatic.backingOverview( rToken.address @@ -505,7 +523,10 @@ describe('FacadeRead + FacadeAct contracts', () => { expect(backing).to.equal(fp('1')) expect(overCollateralization).to.equal(fp('0.5')) - await setOraclePrice(rsrAsset.address, MAX_UINT256.div(2).sub(1)) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, bn('1e8')) + await setOraclePrice(usdcAsset.address, bn('1e8')) + await assetRegistry.refresh() ;[backing, overCollateralization] = await facade.callStatic.backingOverview(rToken.address) // Check values - Fully collateralized and no over-collateralization @@ -551,98 +572,98 @@ describe('FacadeRead + FacadeAct contracts', () => { }) it('Should return revenue + chain into FacadeAct.runRevenueAuctions', async () => { - const traders = [rTokenTrader, rsrTrader] - const initialPrice = await usdcAsset.price() + // Set low to 0 == revenueOverview() should not revert + const minTradeVolume = await rsrTrader.minTradeVolume() + const auctionLength = await broker.dutchAuctionLength() + const tokenSurplus = bn('0.5e18') + await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) - // Set lotLow to 0 == revenueOverview() should not revert await setOraclePrice(usdcAsset.address, bn('0')) - await usdcAsset.refresh() - for (let traderIndex = 0; traderIndex < traders.length; traderIndex++) { - const trader = traders[traderIndex] - - const minTradeVolume = await trader.minTradeVolume() - const auctionLength = await broker.dutchAuctionLength() - const tokenSurplus = bn('0.5e18') - await token.connect(addr1).transfer(trader.address, tokenSurplus) - - const [lotLow] = await usdcAsset.lotPrice() - expect(lotLow).to.equal(initialPrice[0]) - - // revenue - let [erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s - - const erc20sToStart = [] - for (let i = 0; i < 8; i++) { - if (erc20s[i] == token.address) { - erc20sToStart.push(erc20s[i]) - expect(canStart[i]).to.equal(true) - expect(surpluses[i]).to.equal(tokenSurplus) - } else { - expect(canStart[i]).to.equal(false) - expect(surpluses[i]).to.equal(0) - } - const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) - const [low] = await asset.lotPrice() - expect(minTradeAmounts[i]).to.equal( - low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 - ) // 1% oracleError - } + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, bn('1e8')) + await setOraclePrice(rsrAsset.address, bn('1e8')) + await assetRegistry.refresh() - // Run revenue auctions via multicall - const funcSig = ethers.utils.id('runRevenueAuctions(address,address[],address[],uint8[])') - const args = ethers.utils.defaultAbiCoder.encode( - ['address', 'address[]', 'address[]', 'uint8[]'], - [trader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] - ) - const data = funcSig.substring(0, 10) + args.slice(2) - await expect(facadeAct.multicall([data])).to.emit(trader, 'TradeStarted') - - // Another call to revenueOverview should not propose any auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - expect(canStart).to.eql(Array(8).fill(false)) - - // Nothing should be settleable - expect((await facade.auctionsSettleable(trader.address)).length).to.equal(0) - - // Advance time till auction is over - await advanceBlocks(2 + auctionLength / 12) - - // Now should be settleable - const settleable = await facade.auctionsSettleable(trader.address) - expect(settleable.length).to.equal(1) - expect(settleable[0]).to.equal(token.address) - - // Another call to revenueOverview should settle and propose new auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - - // Should repeat the same auctions - for (let i = 0; i < 8; i++) { - if (erc20s[i] == token.address) { - expect(canStart[i]).to.equal(true) - expect(surpluses[i]).to.equal(tokenSurplus) - } else { - expect(canStart[i]).to.equal(false) - expect(surpluses[i]).to.equal(0) - } + const [low] = await usdcAsset.price() + expect(low).to.equal(0) + + // revenue + let [erc20s, canStart, surpluses, minTradeAmounts] = + await facadeAct.callStatic.revenueOverview(rsrTrader.address) + expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s + + const erc20sToStart = [] + for (let i = 0; i < 8; i++) { + if (erc20s[i] == token.address) { + erc20sToStart.push(erc20s[i]) + expect(canStart[i]).to.equal(true) + expect(surpluses[i]).to.equal(tokenSurplus) + } else { + expect(canStart[i]).to.equal(false) + expect(surpluses[i]).to.equal(0) } + const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) + const [low] = await asset.price() + expect(minTradeAmounts[i]).to.equal( + low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 + ) // 1% oracleError + } + + // Run revenue auctions via multicall + const funcSig = ethers.utils.id('runRevenueAuctions(address,address[],address[],uint8[])') + const args = ethers.utils.defaultAbiCoder.encode( + ['address', 'address[]', 'address[]', 'uint8[]'], + [rsrTrader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] + ) + const data = funcSig.substring(0, 10) + args.slice(2) + await expect(facadeAct.multicall([data])).to.emit(rsrTrader, 'TradeStarted') - // Settle and start new auction - await facadeAct.runRevenueAuctions(trader.address, erc20sToStart, erc20sToStart, [ - TradeKind.DUTCH_AUCTION, - ]) + // Another call to revenueOverview should not propose any auction + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + rsrTrader.address + ) + expect(canStart).to.eql(Array(8).fill(false)) - // Send additional revenues - await token.connect(addr1).transfer(trader.address, tokenSurplus) + // Nothing should be settleable + expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) + + // Advance time till auction is over + await advanceBlocks(2 + auctionLength / 12) - // Call revenueOverview, cannot open new auctions - ;[erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(trader.address) - expect(canStart).to.eql(Array(8).fill(false)) + // Now should be settleable + const settleable = await facade.auctionsSettleable(rsrTrader.address) + expect(settleable.length).to.equal(1) + expect(settleable[0]).to.equal(token.address) + + // Another call to revenueOverview should settle and propose new auction + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + rsrTrader.address + ) + + // Should repeat the same auctions + for (let i = 0; i < 8; i++) { + if (erc20s[i] == token.address) { + expect(canStart[i]).to.equal(true) + expect(surpluses[i]).to.equal(tokenSurplus) + } else { + expect(canStart[i]).to.equal(false) + expect(surpluses[i]).to.equal(0) + } } + + // Settle and start new auction + await facadeAct.runRevenueAuctions(rsrTrader.address, erc20sToStart, erc20sToStart, [ + TradeKind.DUTCH_AUCTION, + ]) + + // Send additional revenues + await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) + + // Call revenueOverview, cannot open new auctions + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + rsrTrader.address + ) + expect(canStart).to.eql(Array(8).fill(false)) }) itP1('Should handle invalid versions when running revenueOverview', async () => { @@ -892,7 +913,11 @@ describe('FacadeRead + FacadeAct contracts', () => { ) // set price of dai to 0 await chainlinkFeed.updateAnswer(0) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(usdcAsset.address, bn('1e8')) + await assetRegistry.refresh() await main.connect(owner).pauseTrading() + const [erc20s, breakdown, targets] = await facade.callStatic.basketBreakdown(rToken.address) expect(erc20s.length).to.equal(4) expect(breakdown.length).to.equal(4) @@ -941,16 +966,24 @@ describe('FacadeRead + FacadeAct contracts', () => { }) it('Should return pending unstakings', async () => { - const unstakeAmount = bn('10000e18') - await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(10)) + // Bump draftEra by seizing RSR when the withdrawal queue is empty + await rsr.connect(owner).mint(stRSRP1.address, 1) + await whileImpersonating(backingManager.address, async (signer) => { + await stRSRP1.connect(signer).seizeRSR(1) + }) + const draftEra = await stRSRP1.getDraftEra() + expect(draftEra).to.equal(2) // Stake + const unstakeAmount = bn('10000e18') + await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(10)) await rsr.connect(addr1).approve(stRSR.address, unstakeAmount.mul(10)) await stRSRP1.connect(addr1).stake(unstakeAmount.mul(10)) + await stRSRP1.connect(addr1).unstake(unstakeAmount) await stRSRP1.connect(addr1).unstake(unstakeAmount.add(1)) - const pendings = await facade.pendingUnstakings(rToken.address, addr1.address) + const pendings = await facade.pendingUnstakings(rToken.address, draftEra, addr1.address) expect(pendings.length).to.eql(2) expect(pendings[0][0]).to.eql(bn(0)) // index expect(pendings[0][2]).to.eql(unstakeAmount) // amount @@ -1034,6 +1067,339 @@ describe('FacadeRead + FacadeAct contracts', () => { } }) + describe('FacadeMonitor', () => { + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: ZERO_ADDRESS, + } + + beforeEach(async () => { + // Mint Tokens + initialBal = bn('10000000000e18') + await token.connect(owner).mint(addr1.address, initialBal) + await usdc.connect(owner).mint(addr1.address, initialBal) + await aToken.connect(owner).mint(addr1.address, initialBal) + await cTokenVault.connect(owner).mint(addr1.address, initialBal) + + // Provide approvals + await token.connect(addr1).approve(rToken.address, initialBal) + await usdc.connect(addr1).approve(rToken.address, initialBal) + await aToken.connect(addr1).approve(rToken.address, initialBal) + await cTokenVault.connect(addr1).approve(rToken.address, initialBal) + }) + + it('should return batch auctions disabled correctly', async () => { + expect(await facadeMonitor.batchAuctionsDisabled(rToken.address)).to.equal(false) + + // Disable Broker Batch Auctions + await disableBatchTrade(broker) + + expect(await facadeMonitor.batchAuctionsDisabled(rToken.address)).to.equal(true) + }) + + it('should return dutch auctions disabled correctly', async () => { + expect(await facadeMonitor.dutchAuctionsDisabled(rToken.address)).to.equal(false) + + // Disable Broker Dutch Auctions for token0 + await disableDutchTrade(broker, token.address) + + expect(await facadeMonitor.dutchAuctionsDisabled(rToken.address)).to.equal(true) + }) + + it('should return issuance available', async () => { + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) // no supply + + // Issue some RTokens (1%) + const issueAmount = bn('10000e18') + + // Issue rTokens (1%) + await rToken.connect(addr1).issue(issueAmount) + + // check throttles updated + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('0.99')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issue additional rTokens (another 1%) + await rToken.connect(addr1).issue(issueAmount) + + // Should be 2% down minus some recharging + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.98'), + fp('0.001') + ) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Advance time significantly + await advanceTime(10000000) + + // Check new issuance available - fully recharged + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issuance #2 - Consume all throttle + const issueAmount2: BigNumber = config.issuanceThrottle.amtRate + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount2) + + // Check new issuance available - all consumed + expect(await rToken.issuanceAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + }) + + it('should return redemption available', async () => { + const issueAmount = bn('100000e18') + + // Decrease redemption allowed amount + const redeemThrottleParams = { amtRate: issueAmount.div(2), pctRate: fp('0.1') } // 50K + await rToken.connect(owner).setRedemptionThrottleParams(redeemThrottleParams) + + // Check with no supply + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issue some RTokens + await rToken.connect(addr1).issue(issueAmount) + + // check throttles - redemption still fully available + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('0.9')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redeem RTokens (50% of throttle) + await rToken.connect(addr1).redeem(issueAmount.div(4)) + + // check throttle - redemption allowed decreased to 50% + expect(await rToken.redemptionAvailable()).to.equal(issueAmount.div(4)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('0.5')) + + // Advance time significantly + await advanceTime(10000000) + + // Check redemption available - fully recharged + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redemption #2 - Consume all throttle + await rToken.connect(addr1).redeem(issueAmount.div(2)) + + // Check new redemption available - all consumed + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(bn(0)) + }) + + it('Should handle issuance/redemption throttles correctly, using percent', async function () { + // Full issuance available. Nothing to redeem + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issue full throttle + const issueAmount1: BigNumber = config.issuanceThrottle.amtRate + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount1) + + // Check redemption throttles updated + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Advance time significantly + await advanceTime(1000000000) + + // Check new issuance available - fully recharged + expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) + expect(await rToken.redemptionAvailable()).to.equal(issueAmount1) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issuance #2 - Full throttle again - will be processed + const issueAmount2: BigNumber = config.issuanceThrottle.amtRate + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount2) + + // Check new issuance available - all consumed + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) + + // Check redemption throttle updated - fixed in max (does not exceed) + expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Set issuance throttle to percent only + const issuanceThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } // 10% + await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) + + // Advance time significantly + await advanceTime(1000000000) + + // Check new issuance available - 10% of supply (2 M) = 200K + const supplyThrottle = bn('200000e18') + expect(await rToken.issuanceAvailable()).to.equal(supplyThrottle) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + + // Check redemption throttle unchanged + expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Issuance #3 - Should be allowed, does not exceed supply restriction + const issueAmount3: BigNumber = bn('100000e18') + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount3) + + // Check issuance throttle updated - Previous issuances recharged + expect(await rToken.issuanceAvailable()).to.equal(supplyThrottle.sub(issueAmount3)) + + // Hourly Limit: 210K (10% of total supply of 2.1 M) + // Available: 100 K / 201K (~ 0.47619) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.476'), + fp('0.001') + ) + + // Check redemption throttle unchanged + expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Check all issuances are confirmed + expect(await rToken.balanceOf(addr1.address)).to.equal( + issueAmount1.add(issueAmount2).add(issueAmount3) + ) + + // Advance time, issuance will recharge a bit + await advanceTime(100) + + // Now 50% of hourly limit available (~105.8K / 210 K) + expect(await rToken.issuanceAvailable()).to.be.closeTo(fp('105800'), fp('100')) + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.5'), + fp('0.01') + ) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + const issueAmount4: BigNumber = fp('105800') + // Issuance #4 - almost all available + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await rToken.connect(addr1).issue(issueAmount4) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( + fp('0.003'), + fp('0.001') + ) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Advance time significantly to fully recharge + await advanceTime(1000000000) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Check redemptions + // Set redemption throttle to percent only + const redemptionThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } // 10% + await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) + + const totalSupply = await rToken.totalSupply() + expect(await rToken.redemptionAvailable()).to.equal(totalSupply.div(10)) // 10% + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redeem half of the available throttle + await rToken.connect(addr1).redeem(totalSupply.div(10).div(2)) + + // About 52% now used of redemption throttle + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.be.closeTo( + fp('0.52'), + fp('0.01') + ) + + // Advance time significantly to fully recharge + await advanceTime(1000000000) + + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) + + // Redeem all remaining + await rToken.connect(addr1).redeem(await rToken.redemptionAvailable()) + + // Check all consumed + expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) + expect(await rToken.redemptionAvailable()).to.equal(bn(0)) + expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(bn(0)) + }) + + it('Should not allow empty owner on initialization', async () => { + const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') + + const newFacadeMonitor = await upgrades.deployProxy(FacadeMonitorFactory, [], { + constructorArgs: [monitorParams], + kind: 'uups', + }) + + await expect(newFacadeMonitor.init(ZERO_ADDRESS)).to.be.revertedWith('invalid owner address') + }) + + it('Should allow owner to transfer ownership', async () => { + expect(await facadeMonitor.owner()).to.equal(owner.address) + + // Attempt to transfer ownership with another account + await expect( + facadeMonitor.connect(addr1).transferOwnership(addr1.address) + ).to.be.revertedWith('Ownable: caller is not the owner') + + // Owner remains the same + expect(await facadeMonitor.owner()).to.equal(owner.address) + + // Transfer ownership with owner + await expect(facadeMonitor.connect(owner).transferOwnership(addr1.address)) + .to.emit(facadeMonitor, 'OwnershipTransferred') + .withArgs(owner.address, addr1.address) + + // Owner changed + expect(await facadeMonitor.owner()).to.equal(addr1.address) + }) + + it('Should only allow owner to upgrade', async () => { + const FacadeMonitorV2Factory: ContractFactory = await ethers.getContractFactory( + 'FacadeMonitorV2' + ) + const facadeMonitorV2 = await FacadeMonitorV2Factory.deploy(monitorParams) + + await expect( + facadeMonitor.connect(addr1).upgradeTo(facadeMonitorV2.address) + ).to.be.revertedWith('Ownable: caller is not the owner') + await expect(facadeMonitor.connect(owner).upgradeTo(facadeMonitorV2.address)).to.not.be + .reverted + }) + + it('Should upgrade correctly', async () => { + // Upgrading + const FacadeMonitorV2Factory: ContractFactory = await ethers.getContractFactory( + 'FacadeMonitorV2' + ) + const facadeMonitorV2: FacadeMonitorV2 = await upgrades.upgradeProxy( + facadeMonitor.address, + FacadeMonitorV2Factory, + { + constructorArgs: [monitorParams], + } + ) + + // Check address is maintained + expect(facadeMonitorV2.address).to.equal(facadeMonitor.address) + + // Check state is preserved + expect(await facadeMonitorV2.owner()).to.equal(owner.address) + + // Check new version is implemented + expect(await facadeMonitorV2.version()).to.equal('2.0.0') + + expect(await facadeMonitorV2.newValue()).to.equal(0) + await facadeMonitorV2.connect(owner).setNewValue(bn(1000)) + expect(await facadeMonitorV2.newValue()).to.equal(bn(1000)) + }) + }) + // P1 only describeP1('FacadeAct', () => { let issueAmount: BigNumber @@ -1139,10 +1505,7 @@ describe('FacadeRead + FacadeAct contracts', () => { expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) // Advance time till auction ended - await advanceBlocks(2 + auctionLength / 12) - - // Settleable now - expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(1) + await advanceBlocks(1 + auctionLength / 12) // Settle and start new auction - Will retry await expectEvents( @@ -1167,18 +1530,6 @@ describe('FacadeRead + FacadeAct contracts', () => { }, ] ) - - // Nothing should be settleable - expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) - - // Advance time till auction ended - await advanceBlocks(2 + auctionLength / 12) - - // Settleable now - expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(1) - - // Should not revert, even when not starting new auctions - await facadeAct.runRevenueAuctions(rsrTrader.address, [token.address], [], []) }) it('Should handle other versions when running revenue auctions', async () => { diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 97210ce749..9176c71ac0 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -195,8 +195,8 @@ describe('FacadeWrite contract', () => { // Set governance params govParams = { - votingDelay: bn(5), // 5 blocks - votingPeriod: bn(100), // 100 blocks + votingDelay: bn(7200), // 1 day + votingPeriod: bn(21600), // 3 days proposalThresholdAsMicroPercent: bn(1e6), // 1% quorumPercent: bn(4), // 4% timelockDelay: bn(60 * 60 * 24), // 1 day diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 15776210be..84d16f32c7 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -204,9 +204,9 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await furnace.connect(addr1).melt() }) - it('Should not melt if frozen #fast', async () => { + it('Should melt if frozen #fast', async () => { await main.connect(owner).freezeShort() - await expect(furnace.connect(addr1).melt()).to.be.revertedWith('frozen') + await furnace.connect(addr1).melt() }) it('Should not melt any funds in the initial block #fast', async () => { @@ -450,40 +450,57 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { it('Regression test -- C4 June 2023 Issue #29', async () => { // https://github.com/code-423n4/2023-06-reserve-findings/issues/29 + const firstRatio = fp('1e-6') + const secondRatio = fp('1e-4') + const mintAmount = fp('100') + + // Set ratio to something cleaner + await expect(furnace.connect(owner).setRatio(firstRatio)) + .to.emit(furnace, 'RatioSet') + .withArgs(config.rewardRatio, firstRatio) + // Transfer to Furnace and do first melt - await rToken.connect(addr1).transfer(furnace.address, bn('10e18')) + await rToken.connect(addr1).transfer(furnace.address, mintAmount) await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) await furnace.melt() // Should have updated lastPayout + lastPayoutBal expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) + expect(await furnace.lastPayoutBal()).to.equal(mintAmount) - // Advance 99 periods -- should melt at old ratio - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 99 * Number(ONE_PERIOD)) + // Advance 100 periods -- should melt at old ratio + await setNextBlockTimestamp( + Number(await getLatestBlockTimestamp()) + 100 * Number(ONE_PERIOD) + ) - // Freeze and change ratio + // Freeze and change ratio (melting as a pre-step) await main.connect(owner).freezeForever() - const maxRatio = bn('1e14') - await expect(furnace.connect(owner).setRatio(maxRatio)) + await expect(furnace.connect(owner).setRatio(secondRatio)) .to.emit(furnace, 'RatioSet') - .withArgs(config.rewardRatio, maxRatio) + .withArgs(firstRatio, secondRatio) - // Should have updated lastPayout + lastPayoutBal + // Should have melted expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) // no change + expect(await furnace.lastPayoutBal()).to.eq(fp('99.990000494983830300')) - // Unfreeze and advance 1 period + // Unfreeze and advance 100 periods await main.connect(owner).unfreeze() - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp( + Number(await getLatestBlockTimestamp()) + 100 * Number(ONE_PERIOD) + ) await expect(furnace.melt()).to.emit(rToken, 'Melted') - // Should have updated lastPayout + lastPayoutBal + // Should have updated lastPayout + lastPayoutBal and melted at new ratio expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(bn('9.999e18')) + expect(await furnace.lastPayoutBal()).to.equal(fp('98.995033865808581644')) + // if the ratio were not increased 100x, this would be more like 99.980001989868666200 + + // Total supply should have decreased by the cumulative melted amount + expect(await rToken.totalSupply()).to.equal(mintAmount.add(await furnace.lastPayoutBal())) + expect(await rToken.basketsNeeded()).to.equal(mintAmount.mul(2)) }) }) diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 83dffb413a..53b7f7d2f1 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -59,8 +59,8 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { let initialBal: BigNumber const MIN_DELAY = 7 * 60 * 60 * 24 // 7 days - const VOTING_DELAY = 5 // 5 blocks - const VOTING_PERIOD = 100 // 100 blocks + const VOTING_DELAY = 7200 // 1 day (in blocks) + const VOTING_PERIOD = 21600 // 3 days (in blocks) const PROPOSAL_THRESHOLD = 1e6 // 1% const QUORUM_PERCENTAGE = 4 // 4% @@ -306,13 +306,39 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { expect(await governor.supportsInterface(interfaceID._hex)).to.equal(true) }) + + it('Should perform validations on votingDelay at deployment', async () => { + // Attempt to deploy with 0 voting delay + await expect( + GovernorFactory.deploy( + stRSRVotes.address, + timelock.address, + bn(0), + VOTING_PERIOD, + PROPOSAL_THRESHOLD, + QUORUM_PERCENTAGE + ) + ).to.be.revertedWith('invalid votingDelay') + + // Attempt to deploy with voting delay below minium (1 day) + await expect( + GovernorFactory.deploy( + stRSRVotes.address, + timelock.address, + bn(2000), // less than 1 day + VOTING_PERIOD, + PROPOSAL_THRESHOLD, + QUORUM_PERCENTAGE + ) + ).to.be.revertedWith('invalid votingDelay') + }) }) describe('Proposals', () => { // Proposal details const newValue: BigNumber = bn('360') - const proposalDescription = 'Proposal #1 - Update Trading Delay to 360' - const proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + let proposalDescription = 'Proposal #1 - Update Trading Delay to 360' + let proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) let encodedFunctionCall: string let stkAmt1: BigNumber let stkAmt2: BigNumber @@ -873,5 +899,143 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Check role was granted expect(await main.hasRole(SHORT_FREEZER, other.address)).to.equal(true) }) + + it('Should allow to update GovernorSettings via governance', async () => { + // Attempt to update if not governance + await expect(governor.setVotingDelay(bn(14400))).to.be.revertedWith( + 'Governor: onlyGovernance' + ) + + // Attempt to update without governance process in place + await whileImpersonating(timelock.address, async (signer) => { + await expect(governor.connect(signer).setVotingDelay(bn(14400))).to.be.reverted + }) + + // Update votingDelay via proposal + encodedFunctionCall = governor.interface.encodeFunctionData('setVotingDelay', [ + VOTING_DELAY * 2, + ]) + proposalDescription = 'Proposal #2 - Update Voting Delay to double' + proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + + // Check current value + expect(await governor.votingDelay()).to.equal(VOTING_DELAY) + + // Propose + const proposeTx = await governor + .connect(addr1) + .propose([governor.address], [0], [encodedFunctionCall], proposalDescription) + + const proposeReceipt = await proposeTx.wait(1) + const proposalId = proposeReceipt.events![0].args!.proposalId + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) + + // Advance time to start voting + await advanceBlocks(VOTING_DELAY + 1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + const voteWay = 1 // for + + // vote + await governor.connect(addr1).castVote(proposalId, voteWay) + await advanceBlocks(1) + + // Advance time till voting is complete + await advanceBlocks(VOTING_PERIOD + 1) + + // Finished voting - Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) + + // Queue propoal + await governor + .connect(addr1) + .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Advance time required by timelock + await advanceTime(MIN_DELAY + 1) + await advanceBlocks(1) + + // Execute + await governor + .connect(addr1) + .execute([governor.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Executed) + + // Check value was updated + expect(await governor.votingDelay()).to.equal(VOTING_DELAY * 2) + }) + + it('Should perform validations on votingDelay when updating', async () => { + // Update via proposal - Invalid value + encodedFunctionCall = governor.interface.encodeFunctionData('setVotingDelay', [bn(7100)]) + proposalDescription = 'Proposal #2 - Update Voting Delay to invalid' + proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + + // Check current value + expect(await governor.votingDelay()).to.equal(VOTING_DELAY) + + // Propose + const proposeTx = await governor + .connect(addr1) + .propose([governor.address], [0], [encodedFunctionCall], proposalDescription) + + const proposeReceipt = await proposeTx.wait(1) + const proposalId = proposeReceipt.events![0].args!.proposalId + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) + + // Advance time to start voting + await advanceBlocks(VOTING_DELAY + 1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + const voteWay = 1 // for + + // vote + await governor.connect(addr1).castVote(proposalId, voteWay) + await advanceBlocks(1) + + // Advance time till voting is complete + await advanceBlocks(VOTING_PERIOD + 1) + + // Finished voting - Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) + + // Queue propoal + await governor + .connect(addr1) + .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Advance time required by timelock + await advanceTime(MIN_DELAY + 1) + await advanceBlocks(1) + + // Execute + await expect( + governor + .connect(addr1) + .execute([governor.address], [0], [encodedFunctionCall], proposalDescHash) + ).to.be.revertedWith('TimelockController: underlying transaction reverted') + + // Check proposal state, still queued + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Check value was not updated + expect(await governor.votingDelay()).to.equal(VOTING_DELAY) + }) }) }) diff --git a/test/Main.test.ts b/test/Main.test.ts index 788d4eba4b..9d00c3b0a6 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -70,6 +70,8 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, + ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from './fixtures' @@ -1180,7 +1182,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1202,7 +1204,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1228,7 +1230,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await gasGuzzlingColl.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1627,7 +1629,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20s[5].address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -1723,7 +1725,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: eurToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -1946,7 +1948,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('NEW_TARGET'), defaultThreshold: fp('0.01'), delayUntilDefault: await collateral0.delayUntilDefault(), @@ -2756,8 +2758,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Check BU price -- 1/4 of the basket has lost half its value await expectPrice(basketHandler.address, fp('0.875'), ORACLE_ERROR, true) - // Set collateral1 price to invalid value that should produce [0, FIX_MAX] - await setOraclePrice(collateral1.address, MAX_UINT192) + // Set collateral1 price to [0, FIX_MAX] + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(collateral0.address, bn('1e8')) + await assetRegistry.refresh() // Check BU price -- 1/4 of the basket has lost all its value const asset = await ethers.getContractAt('Asset', basketHandler.address) @@ -2799,7 +2803,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2812,6 +2816,8 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Set price = 0, which hits 3 of our 4 collateral in the basket await setOraclePrice(newColl2.address, bn('0')) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(collateral1.address, bn('1e8')) // Check status and price again const p = await basketHandler.price() @@ -2832,7 +2838,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2840,17 +2846,9 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { REVENUE_HIDING ) await assetRegistry.connect(owner).swapRegistered(newColl.address) - await setOraclePrice(newColl.address, MAX_UINT192) // overflow - await expectUnpriced(newColl.address) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) await newColl.setTargetPerRef(1) - await freshBasketHandler.setPrimeBasket([await newColl.erc20()], [fp('1000')]) - await freshBasketHandler.refreshBasket() - - // Expect [something > 0, FIX_MAX] - const bh = await ethers.getContractAt('Asset', basketHandler.address) - const [lowPrice, highPrice] = await bh.price() - expect(lowPrice).to.be.gt(0) - expect(highPrice).to.equal(MAX_UINT192) + await expectUnpriced(basketHandler.address) }) it('Should handle overflow in price calculation and return [FIX_MAX, FIX_MAX] - case 1', async () => { @@ -2865,7 +2863,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2907,35 +2905,6 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(highPrice).to.equal(MAX_UINT192) }) - it('Should distinguish between price/lotPrice', async () => { - // Set basket with single collateral - await basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await basketHandler.refreshBasket() - - await collateral0.refresh() - const [low, high] = await collateral0.price() - await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // oracle error - - // lotPrice() should begin at 100% - let [lowPrice, highPrice] = await basketHandler.price() - let [lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() - expect(lowPrice).to.equal(0) - expect(highPrice).to.equal(MAX_UINT192) - expect(lotLowPrice).to.be.eq(low) - expect(lotHighPrice).to.be.eq(high) - - // Advance time past 100% period -- lotPrice() should begin to fall - await advanceTime(await collateral0.oracleTimeout()) - ;[lowPrice, highPrice] = await basketHandler.price() - ;[lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() - expect(lowPrice).to.equal(0) - expect(highPrice).to.equal(MAX_UINT192) - expect(lotLowPrice).to.be.closeTo(low, low.div(bn('1e5'))) // small decay expected - expect(lotLowPrice).to.be.lt(low) - expect(lotHighPrice).to.be.closeTo(high, high.div(bn('1e5'))) // small decay expected - expect(lotHighPrice).to.be.lt(high) - }) - it('Should disable basket on asset deregistration + return quantities correctly', async () => { // Check values expect(await facadeTest.wholeBasketsHeldBy(rToken.address, addr1.address)).to.equal( @@ -3116,7 +3085,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3160,7 +3129,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral2.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3181,6 +3150,15 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expectPrice(basketHandler.address, fp('0.75'), ORACLE_ERROR, true) }) + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await basketHandler.lotPrice() + const price = await basketHandler.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) + it('Should not put backup tokens with different targetName in the basket', async () => { // Swap out collateral for bad target name const CollFactory = await ethers.getContractFactory('FiatCollateral') @@ -3190,7 +3168,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: await collateral0.oracleTimeout(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: await ethers.utils.formatBytes32String('NEW TARGET'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index f11c415f6a..f5c8afa994 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -21,7 +21,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, SLOW, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, defaultFixtureNoBasket, } from './fixtures' @@ -66,7 +66,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: fp('1e36'), - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), delayUntilDefault: bn(86400), @@ -155,7 +155,6 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Recharge throttle await advanceTime(3600) - await advanceTime(await basketHandler.warmupPeriod()) // ==== Issue the "initial" rtoken supply to owner diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index e806d4b316..83d0b04af6 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -51,6 +51,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' @@ -643,7 +644,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -656,7 +657,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: backupToken1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -1015,9 +1016,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('Should not recollateralize when switching basket if all assets are UNPRICED', async () => { - // Set price to use lot price - await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) - // Setup prime basket await basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')]) @@ -1029,7 +1027,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Advance time post warmup period - temporary IFFY->SOUND await advanceTime(Number(config.warmupPeriod) + 1) - // Set to sell price = 0 + // Set all assets to UNPRICED await advanceTime(Number(ORACLE_TIMEOUT.add(PRICE_TIMEOUT))) // Check state remains SOUND @@ -1188,8 +1186,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) }) - it('Should recollateralize correctly when switching basket - Using lot price', async () => { - // Set price to unpriced (will use lotPrice to size trade) + it('Should recollateralize correctly when switching basket', async () => { + // Set oracle value out-of-range await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // Setup prime basket @@ -1218,7 +1216,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await toMinBuyAmt(sellAmt, fp('1'), fp('1')), 6 ).add(1) - // since within oracleTimeout lotPrice() should still be at 100% of original price + // since within oracleTimeout, price() should still be at 100% of original price await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) .to.emit(backingManager, 'TradeStarted') @@ -1352,11 +1350,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- no backing currently - const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR + // Check price in USD of the current RToken -- should track backing out on auction await expectRTokenPrice( rTokenAsset.address, - rTokenPrice, + fp('1'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -1476,11 +1473,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- no backing currently - const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR + // Check price in USD of the current RToken -- should track balances out on trade await expectRTokenPrice( rTokenAsset.address, - rTokenPrice, + fp('1'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -1610,11 +1606,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- no backing currently - const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR + // Check price in USD of the current RToken -- backing is tracked while out on trade await expectRTokenPrice( rTokenAsset.address, - rTokenPrice, + fp('1'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -2148,7 +2143,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: fp('25'), - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -2212,7 +2207,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ).div(2) const sellAmt = sellAmtBeforeSlippage .mul(BN_SCALE_FACTOR) - .div(BN_SCALE_FACTOR.add(ORACLE_ERROR)) + .div(BN_SCALE_FACTOR.sub(ORACLE_ERROR)) const minBuyAmt = await toMinBuyAmt(sellAmt, fp('0.5'), fp('1')) await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) @@ -2255,64 +2250,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await advanceTime(config.batchAuctionLength.add(100).toString()) // Run auctions - will end current, and will open a new auction for the same amount - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: backingManager, - name: 'TradeSettled', - args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], - emitted: true, - }, - { - contract: backingManager, - name: 'TradeStarted', - args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], - emitted: true, - }, - ]) - const leftoverSellAmt = issueAmount.sub(sellAmt.mul(2)) - - // Check new auction - // Token0 -> Backup Token Auction - await expectTrade(backingManager, { - sell: token0.address, - buy: backupToken1.address, - endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), - externalId: bn('1'), - }) - - // Check state - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.add(leftoverSellAmt.div(2)) - ) - expect(await token0.balanceOf(backingManager.address)).to.equal(leftoverSellAmt) - expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) - expect(await rToken.totalSupply()).to.equal(issueAmount) - - // Check price in USD of the current RToken - await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) - - // Perform Mock Bids (addr1 has balance) - // Pay at worst-case price - await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt, - }) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Check staking situation remains unchanged - expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) - expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Run auctions - will end current, and will open a new auction for the same amount + const leftoverSellAmt = issueAmount.sub(sellAmt) const leftoverMinBuyAmt = await toMinBuyAmt(leftoverSellAmt, fp('0.5'), fp('1')) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { @@ -2341,17 +2279,14 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: token0.address, buy: backupToken1.address, endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), - externalId: bn('2'), + externalId: bn('1'), }) // Check state expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.mul(2) - ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) - expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt.mul(2)) + expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) expect(await rToken.totalSupply()).to.equal(issueAmount) // Check price in USD of the current RToken @@ -2360,7 +2295,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) - await gnosis.placeBid(2, { + await gnosis.placeBid(1, { bidder: addr1.address, sellAmount: leftoverSellAmt, buyAmount: leftoverMinBuyAmt, @@ -2373,11 +2308,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) - // End current auction, should start a new one to sell RSR for collateral - // ~51e18 Tokens left to buy - Sets Buy amount as independent value - const buyAmtBidRSR: BigNumber = issueAmount - .sub(minBuyAmt.mul(2).add(leftoverMinBuyAmt)) - .add(1) + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Run auctions - will end current, and will open a new auction for the same amount + const buyAmtBidRSR: BigNumber = issueAmount.sub(minBuyAmt.add(leftoverMinBuyAmt)).add(1) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: backingManager, @@ -2407,7 +2342,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: rsr.address, buy: backupToken1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('3'), + externalId: bn('2'), }) const t = await getTrade(backingManager, rsr.address) @@ -2418,11 +2353,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.mul(2).add(leftoverMinBuyAmt) + minBuyAmt.add(leftoverMinBuyAmt) ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) expect(await backupToken1.balanceOf(backingManager.address)).to.equal( - minBuyAmt.mul(2).add(leftoverMinBuyAmt) + minBuyAmt.add(leftoverMinBuyAmt) ) expect(await rToken.totalSupply()).to.equal(issueAmount) @@ -2435,7 +2370,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids for RSR (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, buyAmtBidRSR) - await gnosis.placeBid(3, { + await gnosis.placeBid(2, { bidder: addr1.address, sellAmount: sellAmtRSR, buyAmount: buyAmtBidRSR, @@ -3311,7 +3246,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { collateral1.address, collateral0.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ), bn('1e12') @@ -3375,7 +3309,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { collateral0.address, collateral1.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ), bn('1e12') // decimals @@ -4528,10 +4461,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }, ]) - // Check price in USD of the current RToken - capital out on auction + // Check price in USD of the current RToken - should track the capital out on auction await expectRTokenPrice( rTokenAsset.address, - fp('0.5'), + fp('0.625'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 4277386931..3858ba4290 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -13,6 +13,7 @@ import { CollateralStatus, TradeKind, MAX_UINT192, + ONE_PERIOD, } from '../common/constants' import { expectEvents } from '../common/events' import { bn, divCeil, fp, near } from '../common/numbers' @@ -59,6 +60,7 @@ import { REVENUE_HIDING, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import { expectRTokenPrice, setOraclePrice } from './utils/oracles' @@ -554,7 +556,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) }) - it('Should forward RSR revenue directly to StRSR', async () => { + it('Should forward RSR revenue directly to StRSR and call payoutRewards()', async () => { const amount = bn('2000e18') await rsr.connect(owner).mint(backingManager.address, amount) expect(await rsr.balanceOf(backingManager.address)).to.equal(amount) @@ -562,20 +564,36 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(0) - await expect(backingManager.forwardRevenue([rsr.address])).to.emit(rsr, 'Transfer') + // Advance to the end of noop period + await advanceTime(Number(ONE_PERIOD)) + + await expectEvents(backingManager.forwardRevenue([rsr.address]), [ + { + contract: rsr, + name: 'Transfer', + args: [backingManager.address, stRSR.address, amount], + emitted: true, + }, + { + contract: stRSR, + name: 'RewardsPaid', + emitted: true, + }, + ]) + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) expect(await rsr.balanceOf(stRSR.address)).to.equal(amount) expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(0) }) - it('Should launch revenue auction at lotPrice if UNPRICED', async () => { - // After oracleTimeout the lotPrice should be the original price still + it('Should launch revenue auction if UNPRICED', async () => { + // After oracleTimeout it should still launch auction for RToken await advanceTime(ORACLE_TIMEOUT.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.callStatic.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) - // After oracleTimeout the lotPrice should be the original price still + // After priceTimeout it should not buy RToken await advanceTime(PRICE_TIMEOUT.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await expect( @@ -651,9 +669,113 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) }) + it('Should distribute tokenToBuy before updating distribution', async () => { + // Check initial status + const [rTokenTotal, rsrTotal] = await distributor.totals() + expect(rsrTotal).equal(bn(60)) + expect(rTokenTotal).equal(bn(40)) + + // Set some balance of token-to-buy in traders + const issueAmount = bn('100e18') + + // RSR Trader + const stRSRBal = await rsr.balanceOf(stRSR.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + + // RToken Trader + const rTokenBal = await rToken.balanceOf(furnace.address) + await rToken.connect(addr1).issueTo(rTokenTrader.address, issueAmount) + + // Update distributions with owner - Set f = 1 + await distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + + // Check tokens were transferred from Traders + const expectedAmountRSR = stRSRBal.add(issueAmount) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountRSR, 100) + expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(bn(0), 100) + + const expectedAmountRToken = rTokenBal.add(issueAmount) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expectedAmountRToken, 100) + expect(await rsr.balanceOf(rTokenTrader.address)).to.be.closeTo(bn(0), 100) + + // Check updated distributions + const [newRTokenTotal, newRsrTotal] = await distributor.totals() + expect(newRsrTotal).equal(bn(60)) + expect(newRTokenTotal).equal(bn(0)) + }) + + it('Should avoid zero transfers when distributing tokenToBuy', async () => { + // Distribute with no balance + await expect(rsrTrader.distributeTokenToBuy()).to.be.revertedWith('nothing to distribute') + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + + // Small amount which ends in zero distribution due to rounding + await rsr.connect(owner).mint(rsrTrader.address, bn(1)) + await expect(rsrTrader.distributeTokenToBuy()).to.be.revertedWith('nothing to distribute') + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + }) + + it('Should account rewards when distributing tokenToBuy', async () => { + // 1. StRSR.payoutRewards() + const stRSRBal = await rsr.balanceOf(stRSR.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + await advanceTime(Number(ONE_PERIOD)) + await expect(rsrTrader.distributeTokenToBuy()).to.emit(stRSR, 'RewardsPaid') + const expectedAmountStRSR = stRSRBal.add(issueAmount) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountStRSR, 100) + + // 2. Furnace.melt() + // Transfer RTokens to Furnace (to trigger melting later) + const hndAmt: BigNumber = bn('10e18') + await rToken.connect(addr1).transfer(furnace.address, hndAmt) + await advanceTime(Number(ONE_PERIOD)) + await furnace.melt() + + // Transfer and distribute tokens in Trader (will melt) + await advanceTime(Number(ONE_PERIOD)) + await rToken.connect(addr1).transfer(rTokenTrader.address, hndAmt) + await expect(rTokenTrader.distributeTokenToBuy()).to.emit(rToken, 'Melted') + const expectedAmountFurnace = hndAmt.mul(2) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( + expectedAmountFurnace, + expectedAmountFurnace.div(1000) + ) // within 0.1% + }) + + it('Should update distribution even if distributeTokenToBuy() reverts', async () => { + // Check initial status + const [rTokenTotal, rsrTotal] = await distributor.totals() + expect(rsrTotal).equal(bn(60)) + expect(rTokenTotal).equal(bn(40)) + + // Set some balance of token-to-buy in RSR trader + const issueAmount = bn('100e18') + const stRSRBal = await rsr.balanceOf(stRSR.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + + // Pause the system, makes distributeTokenToBuy() revert + await main.connect(owner).pauseTrading() + await expect(rsrTrader.distributeTokenToBuy()).to.be.reverted + + // Update distributions with owner - Set f = 1 + await distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + + // Check no tokens were transferred + expect(await rsr.balanceOf(stRSR.address)).to.equal(stRSRBal) + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(issueAmount) + + // Check updated distributions + const [newRTokenTotal, newRsrTotal] = await distributor.totals() + expect(newRsrTotal).equal(bn(60)) + expect(newRTokenTotal).equal(bn(0)) + }) + it('Should return tokens to BackingManager correctly - rsrTrader.returnTokens()', async () => { // Mint tokens - await rsr.connect(owner).mint(rsrTrader.address, issueAmount) await token0.connect(owner).mint(rsrTrader.address, issueAmount.add(1)) await token1.connect(owner).mint(rsrTrader.address, issueAmount.add(2)) @@ -676,6 +798,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ).to.be.revertedWith('rsrTotal > 0') await distributor.setDistribution(STRSR_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) + // Mint RSR + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + // Should fail for unregistered token await assetRegistry.connect(owner).unregister(collateral1.address) await expect( @@ -981,6 +1106,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { minBuyAmtRToken.div(bn('1e15')) ) }) + it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { const minTrade = bn('1e18') @@ -1036,26 +1162,26 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should only be able to start a dust auction BATCH_AUCTION (and not DUTCH_AUCTION) if oracle has failed', async () => { const minTrade = bn('1e18') - await rTokenTrader.connect(owner).setMinTradeVolume(minTrade) + await rsrTrader.connect(owner).setMinTradeVolume(minTrade) const dustAmount = bn('1e17') - await token0.connect(addr1).transfer(rTokenTrader.address, dustAmount) + await token0.connect(addr1).transfer(rsrTrader.address, dustAmount) - const p1RevenueTrader = await ethers.getContractAt('RevenueTraderP1', rTokenTrader.address) await setOraclePrice(collateral0.address, bn(0)) await collateral0.refresh() await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) - await setOraclePrice(collateral1.address, bn('1e8')) + await setOraclePrice(rsrAsset.address, bn('1e8')) - const p = await collateral0.lotPrice() + const p = await collateral0.price() expect(p[0]).to.equal(0) - expect(p[1]).to.equal(0) - await expect( - p1RevenueTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - ).to.revertedWith('bad sell pricing') + expect(p[1]).to.equal(MAX_UINT192) await expect( - p1RevenueTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION]) - ).to.emit(rTokenTrader, 'TradeStarted') + rsrTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + ).to.revertedWith('dutch auctions require live prices') + await expect(rsrTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])).to.emit( + rsrTrader, + 'TradeStarted' + ) }) it('Should not launch an auction for 1 qTok', async () => { @@ -1100,7 +1226,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, bn(606), // 2 qTok auction at $300 (after accounting for price.high) - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) // Set a very high price @@ -1181,7 +1307,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, MAX_UINT192, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1192,7 +1318,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_UINT192, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1360,7 +1486,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1411,7 +1537,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) // Expected values based on Prices between AAVE and RSR = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to oracle error + const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to oracle error const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) // Run auctions @@ -1559,7 +1685,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1593,7 +1719,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RToken = 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) await expectEvents(backingManager.claimRewards(), [ @@ -1758,7 +1884,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1791,7 +1917,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.mul(20).div(100) // All Rtokens can be sold - 20% of total comp based on f @@ -1969,10 +2095,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should only allow RevenueTraders to call distribute()', async () => { const distAmount: BigNumber = bn('100e18') - // Transfer some RSR to RevenueTraders - await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) - await rsr.connect(addr1).transfer(rsrTrader.address, distAmount) - // Set f = 1 await expect( distributor @@ -1990,6 +2112,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .to.emit(distributor, 'DistributionSet') .withArgs(STRSR_DEST, bn(0), bn(1)) + // Transfer some RSR to RevenueTraders + await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) + await rsr.connect(addr1).transfer(rsrTrader.address, distAmount) + // Check funds in RevenueTraders and destinations expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(distAmount) expect(await rsr.balanceOf(rsrTrader.address)).to.equal(distAmount) @@ -2008,52 +2134,365 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ).to.be.revertedWith('RevenueTraders only') }) - // Should succeed for RevenueTraders - await whileImpersonating(rTokenTrader.address, async (bmSigner) => { - await rsr.connect(bmSigner).approve(distributor.address, distAmount) - await distributor.connect(bmSigner).distribute(rsr.address, distAmount) + // Should succeed for RevenueTraders + await whileImpersonating(rTokenTrader.address, async (bmSigner) => { + await rsr.connect(bmSigner).approve(distributor.address, distAmount) + await distributor.connect(bmSigner).distribute(rsr.address, distAmount) + }) + await whileImpersonating(rsrTrader.address, async (bmSigner) => { + await rsr.connect(bmSigner).approve(distributor.address, distAmount) + await distributor.connect(bmSigner).distribute(rsr.address, distAmount) + }) + + // RSR should be in staking pool + expect(await rsr.balanceOf(stRSR.address)).to.equal(distAmount.mul(2)) + }) + + it('Should revert if no distribution exists for a specific token', async () => { + // Check funds in Backing Manager and destinations + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + await whileImpersonating(rTokenTrader.address, async (bmSigner) => { + await expect( + distributor.connect(bmSigner).distribute(rsr.address, bn(100)) + ).to.be.revertedWith('nothing to distribute') + }) + + // Check funds, nothing changed + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + }) + + it('Should not start trades if no distribution defined', async () => { + // Check funds in Backing Manager and destinations + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + await expect( + rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) + ).to.be.revertedWith('zero distribution') + + // Check funds, nothing changed + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + }) + + it('Should handle no distribution defined when settling trade', async () => { + // Set COMP tokens as reward + rewardAmountCOMP = bn('0.8e18') + + // COMP Rewards + await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) + + // Collect revenue + // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, rewardAmountCOMP], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, bn(0)], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + compToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // COMP -> RSR Auction + await expectTrade(rsrTrader, { + sell: compToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // COMP -> RToken Auction + await expectTrade(rTokenTrader, { + sell: compToken.address, + buy: rToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check funds in Market + expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken, + }) + + // Set no distribution for StRSR + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check balances + // StRSR - Still in trader, was not distributed due to zero distribution + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + + // Furnace - RTokens transferred to destination + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(furnace.address)).to.closeTo( + minBuyAmtRToken, + minBuyAmtRToken.div(bn('1e15')) + ) + }) + + it('Should allow to settle trade (and not distribute) even if trading paused or frozen', async () => { + // Set COMP tokens as reward + rewardAmountCOMP = bn('0.8e18') + + // COMP Rewards + await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) + + // Collect revenue + // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: token3, + name: 'RewardsClaimed', + args: [compToken.address, rewardAmountCOMP], + emitted: true, + }, + { + contract: token2, + name: 'RewardsClaimed', + args: [aaveToken.address, bn(0)], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + compToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // COMP -> RSR Auction + await expectTrade(rsrTrader, { + sell: compToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // COMP -> RToken Auction + await expectTrade(rTokenTrader, { + sell: compToken.address, + buy: rToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check funds in Market + expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, }) - await whileImpersonating(rsrTrader.address, async (bmSigner) => { - await rsr.connect(bmSigner).approve(distributor.address, distAmount) - await distributor.connect(bmSigner).distribute(rsr.address, distAmount) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken, }) - // RSR should be in staking pool - expect(await rsr.balanceOf(stRSR.address)).to.equal(distAmount.mul(2)) - }) - - it('Should revert if no distribution exists for a specific token', async () => { - // Check funds in Backing Manager and destinations - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) + // Pause Trading + await main.connect(owner).pauseTrading() - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) - await whileImpersonating(rTokenTrader.address, async (bmSigner) => { - await expect( - distributor.connect(bmSigner).distribute(rsr.address, bn(100)) - ).to.be.revertedWith('nothing to distribute') - }) + // Distribution did not occurr, funds are in Traders + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(minBuyAmtRToken) - // Check funds, nothing changed - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(furnace.address)).to.equal(bn(0)) }) it('Should trade even if price for buy token = 0', async () => { @@ -2244,11 +2683,133 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { }, ]) + // Check broker disabled (batch) + expect(await broker.batchTradeDisabled()).to.equal(true) + // Check funds at destinations expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt.sub(10), 50) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) }) + it('Should report violation even if paused or frozen', async () => { + // This test needs to be in this file and not Broker.test.ts because settleTrade() + // requires the BackingManager _actually_ started the trade + + rewardAmountAAVE = bn('0.5e18') + + // AAVE Rewards + await token2.setRewards(backingManager.address, rewardAmountAAVE) + + // Collect revenue + // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) + const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) + + const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder + const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) + + // Claim rewards + await facadeTest.claimRewards(rToken.address) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Run auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmtRToken, + withinQuad(minBuyAmtRToken), + ], + emitted: true, + }, + ]) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + // In order to force deactivation we provide an amount below minBuyAmt, this will represent for our tests an invalid behavior although in a real scenario would retrigger auction + // NOTE: DIFFERENT BEHAVIOR WILL BE OBSERVED ON PRODUCTION GNOSIS AUCTIONS + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt.sub(10), // Forces in our mock an invalid behavior + }) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmtRToken, + buyAmount: minBuyAmtRToken.sub(10), // Forces in our mock an invalid behavior + }) + + // Freeze protocol + await main.connect(owner).freezeShort() + + // Close auctions - Will end trades and also report violation + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: broker, + name: 'BatchTradeDisabledSet', + args: [false, true], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, aaveToken.address, rsr.address, sellAmt, minBuyAmt.sub(10)], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmtRToken, + minBuyAmtRToken.sub(10), + ], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check broker disabled (batch) + expect(await broker.batchTradeDisabled()).to.equal(true) + + // Funds are not distributed if paused or frozen + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(minBuyAmt.sub(10), 50) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo( + minBuyAmtRToken.sub(10), + 50 + ) + }) + it('Should not report violation when Dutch Auction clears in geometric phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade @@ -2827,7 +3388,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.05'), delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2954,7 +3515,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rTokenAsset.address, collateral0.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ) expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) @@ -3014,7 +3574,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rTokenAsset.address, collateral0.address, issueAmount, - config.minTradeVolume, config.maxTradeSlippage ) expect(await rTokenTrader.tradesOpen()).to.equal(0) @@ -3791,6 +4350,106 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await token2.balanceOf(rsrTrader.address)).to.equal(0) expect(await token2.balanceOf(rTokenTrader.address)).to.equal(0) }) + + it('Should handle backingBuffer when minting RTokens from collateral appreciation', async () => { + // Set distribution for RToken only (f=0) + await distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + + await distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + + // Set Backing buffer + const backingBuffer = fp('0.05') + await backingManager.connect(owner).setBackingBuffer(backingBuffer) + + // Issue additional RTokens + const newIssueAmount = bn('900e18') + await rToken.connect(addr1).issue(newIssueAmount) + + // Check Price and Assets value + const totalIssuedAmount = issueAmount.add(newIssueAmount) + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount + ) + expect(await rToken.totalSupply()).to.equal(totalIssuedAmount) + + // Change redemption rate for AToken and CToken to double + await token2.setExchangeRate(fp('1.10')) + await token3.setExchangeRate(fp('1.10')) + await collateral2.refresh() + await collateral3.refresh() + + // Check Price (unchanged) and Assets value (now 10% higher) + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount.mul(110).div(100) + ) + expect(await rToken.totalSupply()).to.equal(totalIssuedAmount) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set expected minting, based on f = 0.6 + const excessRevenue = totalIssuedAmount + .mul(110) + .div(100) + .mul(BN_SCALE_FACTOR) + .div(fp('1').add(backingBuffer)) + .sub(await rToken.basketsNeeded()) + + // Set expected auction values + const expectedToFurnace = excessRevenue + const currentTotalSupply: BigNumber = await rToken.totalSupply() + const newTotalSupply: BigNumber = currentTotalSupply.add(excessRevenue) + + // Collect revenue and mint new tokens + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rToken, + name: 'Transfer', + args: [ZERO_ADDRESS, backingManager.address, withinQuad(excessRevenue)], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check Price (unchanged) and Assets value - Supply has increased 10% + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount.mul(110).div(100) + ) + expect(await rToken.totalSupply()).to.be.closeTo( + newTotalSupply, + newTotalSupply.mul(5).div(1000) + ) // within 0.5% + + // Check destinations after newly minted tokens + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( + expectedToFurnace, + expectedToFurnace.mul(5).div(1000) + ) + + // Check Price and Assets value - RToken price increases due to melting + const updatedRTokenPrice: BigNumber = newTotalSupply + .mul(BN_SCALE_FACTOR) + .div(await rToken.totalSupply()) + await expectRTokenPrice(rTokenAsset.address, updatedRTokenPrice, ORACLE_ERROR) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + totalIssuedAmount.mul(110).div(100) + ) + }) }) context('With simple basket of ATokens and CTokens: no issued RTokens', function () { @@ -3931,7 +4590,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 927858718f..81629b3426 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -1,5 +1,6 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' import { signERC2612Permit } from 'eth-permit' import { BigNumber, ContractFactory } from 'ethers' @@ -536,6 +537,24 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await expect(stRSR.connect(addr1).unstake(0)).to.be.revertedWith('frozen or trading paused') }) + it('Should emit UnstakingStarted event with draftEra -- regression test 01/18/2024', async () => { + const amount: BigNumber = bn('1000e18') + + // Stake + await rsr.connect(addr1).approve(stRSR.address, amount) + await stRSR.connect(addr1).stake(amount) + + // Seize half the RSR, bumping the draftEra because the withdrawal queue is empty + await whileImpersonating(backingManager.address, async (signer) => { + await stRSR.connect(signer).seizeRSR(amount.div(2)) + }) + + // Unstake + await expect(stRSR.connect(addr1).unstake(amount)) + .emit(stRSR, 'UnstakingStarted') + .withArgs(0, 2, addr1.address, amount.div(2), amount, anyValue) + }) + it('Should create Pending withdrawal when unstaking', async () => { const amount: BigNumber = bn('1000e18') @@ -2009,7 +2028,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await expect(stRSR.connect(addr1).unstake(one)) .emit(stRSR, 'UnstakingStarted') - .withArgs(0, 1, addr1.address, bn(0), one, availableAt) + .withArgs(0, 2, addr1.address, bn(0), one, availableAt) // Check withdrawal properly registered - Check draft era //await expectWithdrawal(addr1.address, 0, { rsrAmount: bn(1) }) diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index fc823d852b..634c60aac7 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -2,20 +2,20 @@ exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `251984`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `361087`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `366975`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `363202`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `369090`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `365340`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `371228`; exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `451427`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `453893`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `541279`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `543745`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `529117`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `531583`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `531255`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `533721`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113056`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113028`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 848354f559..5318fd2f61 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8393668`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8330567`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Furnace.test.ts.snap b/test/__snapshots__/Furnace.test.ts.snap index af06969a2f..e905f3eec0 100644 --- a/test/__snapshots__/Furnace.test.ts.snap +++ b/test/__snapshots__/Furnace.test.ts.snap @@ -1,35 +1,35 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `83931`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `71626`; -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `89820`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `77515`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `83931`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `71626`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `64031`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `51726`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `80663`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `68358`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `78303`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `65998`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `40761`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `28452`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 06ba9d68c7..0771900efd 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357705`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393855`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `245356`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `195889`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `245356`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167045`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `224015`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80532`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70044`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70022`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index f50430c9b4..600063cf88 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787453`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782176`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614457`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609176`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589230`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583880`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 9e0d532f8e..1bcce9471c 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1384418`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1396756`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1510705`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1518120`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `747331`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `750910`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1680908`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1715195`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `179696`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1613640`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1657793`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `179696`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1702037`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1733823`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `207769`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 81fa8bb746..24037c7f9a 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -1,27 +1,27 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `164974`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `168005`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165027`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `168058`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165027`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `168058`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208624`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `211655`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `232408`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `215308`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1008567`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1044935`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `773918`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `820357`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1181227`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1222455`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `368496`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `318685`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739718`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `786157`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `285704`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index dbc65bb91d..36ee8b72fa 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -2,7 +2,7 @@ exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; -exports[`StRSRP1 contract Gas Reporting Stake 2`] = `151759`; +exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63409`; @@ -14,6 +14,6 @@ exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `572011`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606291`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `526015`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536425`; diff --git a/test/fixtures.ts b/test/fixtures.ts index ff881e60d0..a787359e1b 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -1,11 +1,23 @@ import { ContractFactory } from 'ethers' import { expect } from 'chai' -import hre, { ethers } from 'hardhat' +import hre, { ethers, upgrades } from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { IConfig, IImplementations, IRevenueShare, networkConfig } from '../common/configuration' +import { + IConfig, + IImplementations, + IMonitorParams, + IRevenueShare, + networkConfig, +} from '../common/configuration' import { expectInReceipt } from '../common/events' import { bn, fp } from '../common/numbers' -import { CollateralStatus, PAUSER, LONG_FREEZER, SHORT_FREEZER } from '../common/constants' +import { + CollateralStatus, + PAUSER, + LONG_FREEZER, + SHORT_FREEZER, + ZERO_ADDRESS, +} from '../common/constants' import { Asset, AssetRegistryP1, @@ -24,6 +36,7 @@ import { DutchTrade, FacadeRead, FacadeAct, + FacadeMonitor, FacadeTest, DistributorP1, FiatCollateral, @@ -71,14 +84,16 @@ export const SLOW = !!useEnv('SLOW') export const PRICE_TIMEOUT = bn('604800') // 1 week -export const ORACLE_TIMEOUT = bn('281474976710655').div(2) // type(uint48).max / 2 +export const ORACLE_TIMEOUT_PRE_BUFFER = bn('281474976710655').div(100) // type(uint48).max / 100 + +export const ORACLE_TIMEOUT = ORACLE_TIMEOUT_PRE_BUFFER.add(300) export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.0.1' +export const VERSION = '3.1.0' export type Collateral = | FiatCollateral @@ -183,7 +198,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -203,7 +218,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -223,7 +238,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -252,7 +267,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -280,7 +295,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -410,6 +425,7 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt facade: FacadeRead facadeAct: FacadeAct facadeTest: FacadeTest + facadeMonitor: FacadeMonitor broker: TestIBroker rsrTrader: TestIRevenueTrader rTokenTrader: TestIRevenueTrader @@ -466,6 +482,11 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = }, } + // Setup Monitor Params (mock addrs for local deployment) + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: ZERO_ADDRESS, + } + // Deploy TradingLib external library const TradingLibFactory: ContractFactory = await ethers.getContractFactory('TradingLibP0') const tradingLib: TradingLibP0 = await TradingLibFactory.deploy() @@ -482,6 +503,19 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() + // Deploy FacadeMonitor + const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') + + const facadeMonitor = await upgrades.deployProxy( + FacadeMonitorFactory, + [owner.address], + { + kind: 'uups', + initializer: 'init', + constructorArgs: [monitorParams], + } + ) + // Deploy RSR chainlink feed const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( 'MockV3Aggregator' @@ -499,7 +533,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await rsrAsset.refresh() @@ -631,7 +665,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await aaveAsset.refresh() @@ -646,7 +680,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await compAsset.refresh() @@ -749,6 +783,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, facadeAct, facadeTest, + facadeMonitor, rsrTrader, rTokenTrader, bySymbol, diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 7e067fa875..71ae4bf11d 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -8,6 +8,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -19,7 +20,14 @@ import { expectEvents } from '../../common/events' import { bn, fp, toBNDecimals } from '../../common/numbers' import { advanceBlocks, advanceTime } from '../utils/time' import { whileImpersonating } from '../utils/impersonation' -import { expectPrice, expectRTokenPrice, expectUnpriced, setOraclePrice } from '../utils/oracles' +import { + expectDecayedPrice, + expectExactPrice, + expectPrice, + expectRTokenPrice, + expectUnpriced, + setOraclePrice, +} from '../utils/oracles' import forkBlockNumber from './fork-block-numbers' import { Asset, @@ -39,6 +47,7 @@ import { MockV3Aggregator, NonFiatCollateral, RTokenAsset, + SelfReferentialCollateral, StaticATokenLM, TestIBackingManager, TestIBasketHandler, @@ -1082,7 +1091,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, }) it('Should handle invalid/stale Price - Assets', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Stale Oracle await expectUnpriced(compAsset.address) @@ -1114,19 +1123,30 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, ORACLE_ERROR, networkConfig[chainId].tokens.stkAAVE || '', config.rTokenMaxTradeVolume, - MAX_ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) + await setOraclePrice(zeroPriceAsset.address, bn('1e10')) + await zeroPriceAsset.refresh() + + const initialPrice = await zeroPriceAsset.price() + await setOraclePrice(zeroPriceAsset.address, bn(0)) + await expectExactPrice(zeroPriceAsset.address, initialPrice) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceAsset.address, bn(0)) + await expectDecayedPrice(zeroPriceAsset.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceAsset.address, bn(0)) await expectUnpriced(zeroPriceAsset.address) }) it('Should handle invalid/stale Price - Collateral - Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) await expectUnpriced(daiCollateral.address) await expectUnpriced(usdcCollateral.address) @@ -1183,19 +1203,30 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: dai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }) + await setOraclePrice(zeroFiatCollateral.address, bn('1e8')) await zeroFiatCollateral.refresh() + expect(await zeroFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + const initialPrice = await zeroFiatCollateral.price() await setOraclePrice(zeroFiatCollateral.address, bn(0)) + await expectExactPrice(zeroFiatCollateral.address, initialPrice) - // Unpriced + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeroFiatCollateral.address, bn(0)) + await expectDecayedPrice(zeroFiatCollateral.address) + + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroFiatCollateral.address, bn(0)) await expectUnpriced(zeroFiatCollateral.address) - // Refresh should mark status IFFY + // Marked IFFY after refresh await zeroFiatCollateral.refresh() expect(await zeroFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1206,7 +1237,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await cUsdtCollateral.status()).to.equal(CollateralStatus.SOUND) // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cDaiCollateral.address) @@ -1258,18 +1289,29 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }, REVENUE_HIDING ) + await setOraclePrice(zeropriceCtokenCollateral.address, bn('1e8')) await zeropriceCtokenCollateral.refresh() + expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await zeropriceCtokenCollateral.price() + await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) + await expectExactPrice(zeropriceCtokenCollateral.address, initialPrice) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) + await expectDecayedPrice(zeropriceCtokenCollateral.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) await expectUnpriced(zeropriceCtokenCollateral.address) // Refresh should mark status IFFY @@ -1279,7 +1321,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - ATokens Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(aDaiCollateral.address) @@ -1335,18 +1377,29 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: stataDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }, REVENUE_HIDING ) + await setOraclePrice(zeroPriceAtokenCollateral.address, bn('1e8')) await zeroPriceAtokenCollateral.refresh() + expect(await zeroPriceAtokenCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await zeroPriceAtokenCollateral.price() + await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) + await expectExactPrice(zeroPriceAtokenCollateral.address, initialPrice) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceAtokenCollateral.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) await expectUnpriced(zeroPriceAtokenCollateral.address) // Refresh should mark status IFFY @@ -1356,7 +1409,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - Non-Fiatcoins', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(wbtcCollateral.address) @@ -1403,32 +1456,35 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: wbtc.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - MAX_ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn('1e10')) await zeroPriceNonFiatCollateral.refresh() - // Set price = 0 - const chainlinkFeedAddr = await zeroPriceNonFiatCollateral.chainlinkFeed() - const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) - await v3Aggregator.updateAnswer(bn(0)) + const initialPrice = await zeroPriceNonFiatCollateral.price() + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + await expectExactPrice(zeroPriceNonFiatCollateral.address, initialPrice) - // Unpriced - await expectUnpriced(zeroPriceNonFiatCollateral.address) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceNonFiatCollateral.address) - // Refresh should mark status IFFY - await zeroPriceNonFiatCollateral.refresh() - expect(await zeroPriceNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + await expectUnpriced(zeroPriceNonFiatCollateral.address) }) it('Should handle invalid/stale Price - Collateral - CTokens Non-Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cWBTCCollateral.address) @@ -1480,36 +1536,39 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cWBTCVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - MAX_ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ) + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn('1e10')) await zeropriceCtokenNonFiatCollateral.refresh() - // Set price = 0 - const chainlinkFeedAddr = await zeropriceCtokenNonFiatCollateral.targetUnitChainlinkFeed() - const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) - await v3Aggregator.updateAnswer(bn(0)) + const initialPrice = await zeropriceCtokenNonFiatCollateral.price() + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + await expectExactPrice(zeropriceCtokenNonFiatCollateral.address, initialPrice) - // Unpriced - await expectUnpriced(zeropriceCtokenNonFiatCollateral.address) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + await expectDecayedPrice(zeropriceCtokenNonFiatCollateral.address) - // Refresh should mark status IFFY - await zeropriceCtokenNonFiatCollateral.refresh() - expect(await zeropriceCtokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + await expectUnpriced(zeropriceCtokenNonFiatCollateral.address) }) it('Should handle invalid/stale Price - Collateral - Self-Referential', async () => { const delayUntilDefault = bn('86400') // 24h // Dows not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(wethCollateral.address) @@ -1518,8 +1577,10 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await wethCollateral.status()).to.equal(CollateralStatus.IFFY) // Self referential collateral with no price - const nonpriceSelfReferentialCollateral: FiatCollateral = await ( - await ethers.getContractFactory('FiatCollateral') + const nonpriceSelfReferentialCollateral: SelfReferentialCollateral = < + SelfReferentialCollateral + >await ( + await ethers.getContractFactory('SelfReferentialCollateral') ).deploy({ priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, @@ -1540,28 +1601,40 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await nonpriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) // Self referential collateral with zero price - const zeroPriceSelfReferentialCollateral: FiatCollateral = await ( - await ethers.getContractFactory('FiatCollateral') + const zeroPriceSelfReferentialCollateral: SelfReferentialCollateral = < + SelfReferentialCollateral + >await ( + await ethers.getContractFactory('SelfReferentialCollateral') ).deploy({ priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, erc20: weth.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, }) + await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn('1e10')) await zeroPriceSelfReferentialCollateral.refresh() + expect(await zeroPriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await zeroPriceSelfReferentialCollateral.price() + await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) + await expectExactPrice(zeroPriceSelfReferentialCollateral.address, initialPrice) - // Set price = 0 + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceSelfReferentialCollateral.address) - // Unpriced + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) await expectUnpriced(zeroPriceSelfReferentialCollateral.address) - // Refresh should mark status IFFY + // Refresh should mark status DISABLED await zeroPriceSelfReferentialCollateral.refresh() expect(await zeroPriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1570,7 +1643,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const delayUntilDefault = bn('86400') // 24h // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cETHCollateral.address) @@ -1621,7 +1694,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cETHVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1629,12 +1702,24 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, REVENUE_HIDING, await weth.decimals() ) + await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn('1e10')) await zeroPriceCtokenSelfReferentialCollateral.refresh() + expect(await zeroPriceCtokenSelfReferentialCollateral.status()).to.equal( + CollateralStatus.SOUND + ) - // Set price = 0 + const initialPrice = await zeroPriceCtokenSelfReferentialCollateral.price() await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) + await expectExactPrice(zeroPriceCtokenSelfReferentialCollateral.address, initialPrice) - // Unpriced + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(zeroPriceCtokenSelfReferentialCollateral.address) + + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) await expectUnpriced(zeroPriceCtokenSelfReferentialCollateral.address) // Refresh should mark status IFFY @@ -1646,7 +1731,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - EUR Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) await expectUnpriced(eurtCollateral.address) @@ -1692,22 +1777,30 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: eurt.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: MAX_ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - MAX_ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) + await setOraclePrice(invalidPriceEURCollateral.address, bn('1e10')) await invalidPriceEURCollateral.refresh() + expect(await invalidPriceEURCollateral.status()).to.equal(CollateralStatus.SOUND) + + const initialPrice = await invalidPriceEURCollateral.price() + await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) + await expectExactPrice(invalidPriceEURCollateral.address, initialPrice) - // Set price = 0 - const chainlinkFeedAddr = await invalidPriceEURCollateral.targetUnitChainlinkFeed() - const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) - await v3Aggregator.updateAnswer(bn(0)) + // After oracle timeout, begins decay + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) + await expectDecayedPrice(invalidPriceEURCollateral.address) - // With zero price + // After price timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) await expectUnpriced(invalidPriceEURCollateral.address) // Refresh should mark status IFFY diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 3d63f9e5b8..355d92f00c 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -551,10 +551,11 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function }) it('should be able to scoop entire auction cheaply when minBuyAmount = 0', async () => { - // Make collateral0 lotPrice (0, 0) + // Make collateral0 price (0, FIX_MAX) await setOraclePrice(collateral0.address, bn('0')) await collateral0.refresh() await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await setOraclePrice(collateral0.address, bn('0')) await setOraclePrice(await assetRegistry.toAsset(rsr.address), bn('1e8')) // force a revenue dust auction @@ -752,7 +753,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function oracleError: ORACLE_ERROR, // shouldn't matter erc20: sellTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -764,7 +765,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function oracleError: ORACLE_ERROR, // shouldn't matter erc20: buyTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48, + oracleTimeout: MAX_UINT48.sub(300), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter diff --git a/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap b/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap deleted file mode 100644 index a9ec5a85ce..0000000000 --- a/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap +++ /dev/null @@ -1,25 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Issue RToken 1`] = `816857`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Issue RToken 2`] = `677455`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Redeem RToken 1`] = `679421`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 1`] = `159307`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 2`] = `127937`; - -exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 3`] = `110849`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Issue RToken 1`] = `965241`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Issue RToken 2`] = `753143`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Redeem RToken 1`] = `748958`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 1`] = `310005`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 2`] = `193085`; - -exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 3`] = `175997`; diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index f22f9a1f1e..c9778bb7df 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -1,8 +1,14 @@ import { BigNumber, ContractFactory } from 'ethers' import hre, { ethers } from 'hardhat' import { getChainId } from '../../common/blockchain-utils' -import { IConfig, IImplementations, IRevenueShare, networkConfig } from '../../common/configuration' -import { PAUSER, SHORT_FREEZER, LONG_FREEZER } from '../../common/constants' +import { + IConfig, + IImplementations, + IMonitorParams, + IRevenueShare, + networkConfig, +} from '../../common/configuration' +import { PAUSER, SHORT_FREEZER, LONG_FREEZER, ZERO_ADDRESS } from '../../common/constants' import { expectInReceipt } from '../../common/events' import { advanceTime } from '../utils/time' import { bn, fp } from '../../common/numbers' @@ -54,13 +60,14 @@ import { TestIRToken, TestIStRSR, RecollateralizationLibP1, + FacadeMonitor, } from '../../typechain' import { Collateral, Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -190,7 +197,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -219,7 +226,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -247,6 +254,7 @@ export async function collateralFixture( 'stat' + symbol ) ) + const coll = await ATokenCollateralFactory.deploy( { priceTimeout: PRICE_TIMEOUT, @@ -254,7 +262,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: staticErc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -280,13 +288,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await coll.refresh() return [erc20, coll] @@ -314,13 +322,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) await coll.refresh() @@ -339,7 +347,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -371,7 +379,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -399,13 +407,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await coll.refresh() return [erc20, coll] @@ -584,7 +592,7 @@ type RSRAndCompAaveAndCollateralAndModuleFixture = RSRFixture & CollateralFixture & ModuleFixture -interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { +export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { config: IConfig dist: IRevenueShare deployer: TestIDeployer @@ -603,6 +611,7 @@ interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { facade: FacadeRead facadeAct: FacadeAct facadeTest: FacadeTest + facadeMonitor: FacadeMonitor broker: TestIBroker rsrTrader: TestIRevenueTrader rTokenTrader: TestIRevenueTrader @@ -663,6 +672,11 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = }, } + // Setup Monitor Params based on network + const monitorParams: IMonitorParams = { + AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, + } + // Deploy FacadeRead const FacadeReadFactory: ContractFactory = await ethers.getContractFactory('FacadeRead') const facade = await FacadeReadFactory.deploy() @@ -675,6 +689,10 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() + // Deploy FacadeMonitor - Use implementation to simplify deployments + const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') + const facadeMonitor = await FacadeMonitorFactory.deploy(monitorParams) + // Deploy TradingLib external library const TradingLibFactory: ContractFactory = await ethers.getContractFactory( 'RecollateralizationLibP1' @@ -696,7 +714,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await rsrAsset.refresh() @@ -820,7 +838,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await aaveAsset.refresh() @@ -834,7 +852,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await compAsset.refresh() @@ -930,6 +948,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, facadeAct, facadeTest, + facadeMonitor, rsrTrader, rTokenTrader, } diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index c575f48e3d..f5b5dff068 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -5,6 +5,7 @@ const forkBlockNumber = { 'mainnet-deployment': 15690042, // Ethereum 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum + 'facade-monitor': 18742016, // Ethereum default: 18522901, // Ethereum } diff --git a/test/monitor/FacadeMonitor.test.ts b/test/monitor/FacadeMonitor.test.ts new file mode 100644 index 0000000000..45b7bf1d22 --- /dev/null +++ b/test/monitor/FacadeMonitor.test.ts @@ -0,0 +1,1417 @@ +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { expect } from 'chai' +import { BigNumber, Contract } from 'ethers' +import hre, { ethers } from 'hardhat' +import { Collateral, IMPLEMENTATION } from '../fixtures' +import { defaultFixtureNoBasket, DefaultFixture } from '../integration/fixtures' +import { getChainId } from '../../common/blockchain-utils' +import { IConfig, baseL2Chains, networkConfig } from '../../common/configuration' +import { bn, fp, toBNDecimals } from '../../common/numbers' +import { advanceTime } from '../utils/time' +import { whileImpersonating } from '../utils/impersonation' +import { pushOracleForward } from '../utils/oracles' + +import forkBlockNumber from '../integration/fork-block-numbers' +import { + ATokenFiatCollateral, + AaveV3FiatCollateral, + CTokenV3Collateral, + CTokenFiatCollateral, + ERC20Mock, + FacadeTest, + FacadeMonitor, + FiatCollateral, + IAToken, + IComptroller, + IERC20, + ILendingPool, + IPool, + IWETH, + StaticATokenLM, + IAssetRegistry, + TestIBackingManager, + TestIBasketHandler, + TestICToken, + TestIRToken, + USDCMock, + CTokenWrapper, + StaticATokenV3LM, + CusdcV3Wrapper, + CometInterface, + StargateRewardableWrapper, + StargatePoolFiatCollateral, + IStargatePool, + MorphoAaveV2TokenisedDeposit, +} from '../../typechain' +import { useEnv } from '#/utils/env' +import { MAX_UINT256 } from '#/common/constants' + +enum CollPluginType { + AAVE_V2, + AAVE_V3, + COMPOUND_V2, + COMPOUND_V3, + STARGATE, + FLUX, + MORPHO_AAVE_V2, +} + +// Relevant addresses (Mainnet) +const holderDAI = '0x075e72a5eDf65F0A5f44699c7654C1a76941Ddc8' +const holderCDAI = '0x01d127D90513CCB6071F83eFE15611C4d9890668' +const holderADAI = '0x07edE94cF6316F4809f2B725f5d79AD303fB4Dc8' +const holderaUSDCV3 = '0x1eAb3B222A5B57474E0c237E7E1C4312C1066855' +const holderWETH = '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' +const holdercUSDCV3 = '0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03' +const holdersUSDC = '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' +const holderfUSDC = '0x86A07dDED024121b282362f4e7A249b00F5dAB37' +const holderUSDC = '0x28C6c06298d514Db089934071355E5743bf21d60' + +let owner: SignerWithAddress + +const describeFork = useEnv('FORK') ? describe : describe.skip + +describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, function () { + let addr1: SignerWithAddress + let addr2: SignerWithAddress + + // Assets + let collateral: Collateral[] + + // Tokens and Assets + let dai: ERC20Mock + let aDai: IAToken + let stataDai: StaticATokenLM + let usdc: USDCMock + let aUsdcV3: IAToken + let sUsdc: IStargatePool + let fUsdc: TestICToken + let weth: IWETH + let cDai: TestICToken + let cDaiVault: CTokenWrapper + let cusdcV3: CometInterface + let daiCollateral: FiatCollateral + let aDaiCollateral: ATokenFiatCollateral + + // Contracts to retrieve after deploy + let rToken: TestIRToken + let facadeTest: FacadeTest + let facadeMonitor: FacadeMonitor + let assetRegistry: IAssetRegistry + let basketHandler: TestIBasketHandler + let backingManager: TestIBackingManager + let config: IConfig + + let initialBal: BigNumber + let basket: Collateral[] + let erc20s: IERC20[] + + let fullLiquidityAmt: BigNumber + let chainId: number + + // Setup test environment + const setup = async (blockNumber: number) => { + // Use Mainnet fork + await hre.network.provider.request({ + method: 'hardhat_reset', + params: [ + { + forking: { + jsonRpcUrl: useEnv('MAINNET_RPC_URL'), + blockNumber: blockNumber, + }, + }, + ], + }) + } + + describe('FacadeMonitor', () => { + before(async () => { + await setup(forkBlockNumber['facade-monitor']) + + chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + }) + + beforeEach(async () => { + ;[owner, addr1, addr2] = await ethers.getSigners() + ;({ + erc20s, + collateral, + basket, + assetRegistry, + basketHandler, + backingManager, + rToken, + facadeTest, + facadeMonitor, + config, + } = await loadFixture(defaultFixtureNoBasket)) + + // Get tokens + dai = erc20s[0] // DAI + cDaiVault = erc20s[6] // cDAI + cDai = await ethers.getContractAt('TestICToken', await cDaiVault.underlying()) // cDAI + stataDai = erc20s[10] // static aDAI + + // Get plain aTokens + aDai = ( + await ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', + networkConfig[chainId].tokens.aDAI || '' + ) + ) + + // Get collaterals + daiCollateral = collateral[0] // DAI + aDaiCollateral = collateral[10] // aDAI + + // Get assets and tokens for default basket + daiCollateral = basket[0] + aDaiCollateral = basket[1] + + dai = await ethers.getContractAt('ERC20Mock', await daiCollateral.erc20()) + stataDai = ( + await ethers.getContractAt('StaticATokenLM', await aDaiCollateral.erc20()) + ) + + // Get plain aToken + aDai = ( + await ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', + networkConfig[chainId].tokens.aDAI || '' + ) + ) + + usdc = ( + await ethers.getContractAt('USDCMock', networkConfig[chainId].tokens.USDC || '') + ) + aUsdcV3 = await ethers.getContractAt( + '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', // use V2 interface, it includes ERC20 + networkConfig[chainId].tokens.aEthUSDC || '' + ) + + cusdcV3 = ( + await ethers.getContractAt('CometInterface', networkConfig[chainId].tokens.cUSDCv3 || '') + ) + + sUsdc = ( + await ethers.getContractAt('IStargatePool', networkConfig[chainId].tokens.sUSDC || '') + ) + + fUsdc = ( + await ethers.getContractAt('TestICToken', networkConfig[chainId].tokens.fUSDC || '') + ) + + initialBal = bn('2500000e18') + + // Fund user with static aDAI + await whileImpersonating(holderADAI, async (adaiSigner) => { + // Wrap ADAI into static ADAI + await aDai.connect(adaiSigner).transfer(addr1.address, initialBal) + await aDai.connect(addr1).approve(stataDai.address, initialBal) + await stataDai.connect(addr1).deposit(addr1.address, initialBal, 0, false) + }) + + // Fund user with aUSDCV3 + await whileImpersonating(holderaUSDCV3, async (ausdcV3Signer) => { + await aUsdcV3.connect(ausdcV3Signer).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with DAI + await whileImpersonating(holderDAI, async (daiSigner) => { + await dai.connect(daiSigner).transfer(addr1.address, initialBal.mul(8)) + }) + + // Fund user with cDAI + await whileImpersonating(holderCDAI, async (cdaiSigner) => { + await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) + await cDai.connect(addr1).approve(cDaiVault.address, toBNDecimals(initialBal, 8).mul(100)) + await cDaiVault.connect(addr1).deposit(toBNDecimals(initialBal, 8).mul(100), addr1.address) + }) + + // Fund user with cUSDCV3 + await whileImpersonating(holdercUSDCV3, async (cusdcV3Signer) => { + await cusdcV3.connect(cusdcV3Signer).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with sUSDC + await whileImpersonating(holdersUSDC, async (susdcSigner) => { + await sUsdc.connect(susdcSigner).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with fUSDC + await whileImpersonating(holderfUSDC, async (fusdcSigner) => { + await fUsdc + .connect(fusdcSigner) + .transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) + }) + + // Fund user with USDC + await whileImpersonating(holderUSDC, async (usdcSigner) => { + await usdc.connect(usdcSigner).transfer(addr1.address, toBNDecimals(initialBal, 6)) + }) + + // Fund user with WETH + weth = await ethers.getContractAt('IWETH', networkConfig[chainId].tokens.WETH || '') + await whileImpersonating(holderWETH, async (signer) => { + await weth.connect(signer).transfer(addr1.address, fp('500000')) + }) + }) + + describe('AAVE V2', () => { + const issueAmount: BigNumber = bn('1000000e18') + let lendingPool: ILendingPool + let aaveV2DataProvider: Contract + + beforeEach(async () => { + // Setup basket + await basketHandler.connect(owner).setPrimeBasket([stataDai.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await stataDai.connect(addr1).approve(rToken.address, issueAmount) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + lendingPool = ( + await ethers.getContractAt('ILendingPool', networkConfig[chainId].AAVE_LENDING_POOL || '') + ) + + const aaveV2DataProviderAbi = [ + 'function getReserveData(address asset) external view returns (uint256 availableLiquidity,uint256 totalStableDebt,uint256 totalVariableDebt,uint256 liquidityRate,uint256 variableBorrowRate,uint256 stableBorrowRate,uint256 averageStableBorrowRate,uint256 liquidityIndex,uint256 variableBorrowIndex,uint40 lastUpdateTimestamp)', + ] + aaveV2DataProvider = await ethers.getContractAt( + aaveV2DataProviderAbi, + networkConfig[chainId].AAVE_DATA_PROVIDER || '' + ) + + // Get current liquidity + ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider + .connect(addr1) + .getReserveData(dai.address) + + // Provide liquidity in AAVE V2 to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(lendingPool.address, amountToDeposit) + await lendingPool.connect(addr1).deposit(weth.address, amountToDeposit, addr1.address, 0) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) + await expect(lendingPool.connect(addr2).withdraw(dai.address, MAX_UINT256, addr2.address)) + .to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await aDai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing available to be redeemed + const borrowAmount = fullLiquidityAmt.sub(issueAmount.mul(80).div(100)) + await lendingPool.connect(addr1).borrow(dai.address, borrowAmount, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await lendingPool + .connect(addr1) + .borrow(dai.address, remainingLiquidity.div(2), 2, 0, addr1.address) + + // Now only 40% is available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) + await expect(lendingPool.connect(addr2).withdraw(dai.address, MAX_UINT256, addr2.address)) + .to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // But we can redeem if we reduce the amount to 30% + await expect( + lendingPool + .connect(addr2) + .withdraw( + dai.address, + (await aDai.balanceOf(addr2.address)).mul(30).div(100), + addr2.address + ) + ).to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await lendingPool.connect(addr1).borrow(dai.address, fullLiquidityAmt, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V2, + stataDai.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) + await expect( + lendingPool + .connect(addr2) + .withdraw(dai.address, (await aDai.balanceOf(addr2.address)).div(100), addr2.address) + ).to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('AAVE V3', () => { + const issueAmount: BigNumber = bn('1000000e18') + let stataUsdcV3: StaticATokenV3LM + let pool: IPool + + beforeEach(async () => { + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + stataUsdcV3 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + + await stataUsdcV3.deployed() + await ( + await stataUsdcV3.initialize( + networkConfig[chainId].tokens.aEthUSDC!, + 'Static Aave Ethereum USDC', + 'saEthUSDC' + ) + ).wait() + + /******** Deploy Aave V3 USDC collateral plugin **************************/ + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const collateral = await CollateralFactory.connect(owner).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError, + erc20: stataUsdcV3.address, + maxTradeVolume: fp('1e6'), + oracleTimeout: usdcOracleTimeout, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError), + delayUntilDefault: bn('86400'), + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Wrap aUsdcV3 + await aUsdcV3.connect(addr1).approve(stataUsdcV3.address, toBNDecimals(initialBal, 6)) + await stataUsdcV3 + .connect(addr1) + ['deposit(uint256,address,uint16,bool)']( + toBNDecimals(initialBal, 6), + addr1.address, + 0, + false + ) + + // Get current liquidity + fullLiquidityAmt = await usdc.balanceOf(aUsdcV3.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([stataUsdcV3.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await stataUsdcV3.connect(addr1).approve(rToken.address, issueAmount) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + pool = await ethers.getContractAt('IPool', networkConfig[chainId].AAVE_V3_POOL || '') + + // Provide liquidity to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(pool.address, amountToDeposit) + await pool.connect(addr1).supply(weth.address, amountToDeposit, addr1.address, 0) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataUsdcV3 + .connect(addr2) + ['redeem(uint256,address,address,bool)']( + bmBalanceAmt, + addr2.address, + addr2.address, + false + ) + await expect(pool.connect(addr2).withdraw(usdc.address, MAX_UINT256, addr2.address)).to.not + .be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await aUsdcV3.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing to be able to be redeemed + const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) + await pool.connect(addr1).borrow(usdc.address, borrowAmount, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await pool + .connect(addr1) + .borrow(usdc.address, remainingLiquidity.div(2), 2, 0, addr1.address) + + // Only 40% available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataUsdcV3 + .connect(addr2) + ['redeem(uint256,address,address,bool)']( + bmBalanceAmt, + addr2.address, + addr2.address, + false + ) + await expect(pool.connect(addr2).withdraw(usdc.address, MAX_UINT256, addr2.address)).to.be + .reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // We can redeem if we reduce to 30% + await expect( + pool + .connect(addr2) + .withdraw( + usdc.address, + (await aUsdcV3.balanceOf(addr2.address)).mul(30).div(100), + addr2.address + ) + ).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await pool.connect(addr1).borrow(usdc.address, fullLiquidityAmt, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.AAVE_V3, + stataUsdcV3.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await stataUsdcV3 + .connect(addr2) + ['redeem(uint256,address,address,bool)']( + bmBalanceAmt, + addr2.address, + addr2.address, + false + ) + await expect( + pool + .connect(addr2) + .withdraw( + usdc.address, + (await aUsdcV3.balanceOf(addr2.address)).div(100), + addr2.address + ) + ).to.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('Compound V2', () => { + const issueAmount: BigNumber = bn('1000000e18') + let comptroller: IComptroller + + beforeEach(async () => { + // Setup basket + await basketHandler.connect(owner).setPrimeBasket([cDaiVault.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await cDaiVault + .connect(addr1) + .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + // Get current liquidity + fullLiquidityAmt = await dai.balanceOf(cDai.address) + + // Compound Comptroller + comptroller = await ethers.getContractAt( + 'ComptrollerMock', + networkConfig[chainId].COMPTROLLER || '' + ) + + // Deposit ETH to be able to borrow + const cEtherAbi = [ + 'function mint(uint256 mintAmount) external payable returns (uint256)', + 'function balanceOf(address owner) external view returns (uint256 balance)', + ] + const cEth = await ethers.getContractAt(cEtherAbi, networkConfig[chainId].tokens.cETH || '') + await comptroller.connect(addr1).enterMarkets([cEth.address]) + const amountToDeposit = fp('500000') + await weth.connect(addr1).withdraw(amountToDeposit) + await cEth.connect(addr1).mint(amountToDeposit, { value: amountToDeposit }) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // COMPOUND V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) + expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) + + await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await cDai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // COMPOUND V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing to be able to be redeemed + const borrowAmount = fullLiquidityAmt.sub(issueAmount.mul(80).div(100)) + await cDai.connect(addr1).borrow(borrowAmount) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await cDai.connect(addr1).borrow(bn(remainingLiquidity.div(2))) + + // Now only 40% of backing can be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) + await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // We can redeem iff we reduce to 30% + await expect(cDai.connect(addr2).redeem(bmBalanceAmt.mul(30).div(100))).to.not.be.reverted + expect(await dai.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await cDai.connect(addr1).borrow(fullLiquidityAmt) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V2, + cDaiVault.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) + expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) + + await expect(cDai.connect(addr2).redeem((await cDai.balanceOf(addr2.address)).div(100))).to + .be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('Compound V3', () => { + const issueAmount: BigNumber = bn('1000000e18') + let wcusdcV3: CusdcV3Wrapper + + beforeEach(async () => { + const CUsdcV3WrapperFactory = await hre.ethers.getContractFactory('CusdcV3Wrapper') + + wcusdcV3 = ( + await CUsdcV3WrapperFactory.deploy( + cusdcV3.address, + networkConfig[chainId].COMET_REWARDS || '', + networkConfig[chainId].tokens.COMP || '' + ) + ) + await wcusdcV3.deployed() + + /******** Deploy Compound V3 USDC collateral plugin **************************/ + const CollateralFactory = await ethers.getContractFactory('CTokenV3Collateral') + + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await CollateralFactory.connect(owner).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError.toString(), + erc20: wcusdcV3.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: usdcOracleTimeout, // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6'), + bn('10000e6').toString() // $10k + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Wrap cUSDCV3 + await cusdcV3.connect(addr1).allow(wcusdcV3.address, true) + await wcusdcV3.connect(addr1).deposit(toBNDecimals(initialBal, 6)) + + // Get current liquidity + fullLiquidityAmt = await usdc.balanceOf(cusdcV3.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([wcusdcV3.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await wcusdcV3.connect(addr1).approve(rToken.address, MAX_UINT256) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + // Provide liquidity to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(cusdcV3.address, amountToDeposit) + await cusdcV3.connect(addr1).supply(weth.address, amountToDeposit.div(2)) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // Compound V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) + + await expect(cusdcV3.connect(addr2).withdraw(usdc.address, MAX_UINT256)).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await cusdcV3.balanceOf(addr2.address)).to.equal(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.equal(fp('1')) + + // Leave only 80% of backing to be able to be redeemed + const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) + await cusdcV3.connect(addr1).withdraw(usdc.address, borrowAmount) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await cusdcV3.connect(addr1).withdraw(usdc.address, remainingLiquidity.div(2)) + + // Only 40% available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) + + await expect(cusdcV3.connect(addr2).withdraw(usdc.address, MAX_UINT256)).to.be.reverted + expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) + + // We can redeem if we reduce to 30% + await expect( + cusdcV3 + .connect(addr2) + .withdraw(usdc.address, (await cusdcV3.balanceOf(addr2.address)).mul(30).div(100)) + ).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.equal(fp('1')) + + // Borrow full liquidity + await cusdcV3.connect(addr1).withdraw(usdc.address, fullLiquidityAmt) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.COMPOUND_V3, + wcusdcV3.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) + + await expect( + cusdcV3 + .connect(addr2) + .withdraw(usdc.address, (await cusdcV3.balanceOf(addr2.address)).div(100)) + ).to.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('Stargate', () => { + const issueAmount: BigNumber = bn('1000000e18') + let wstgUsdc: StargateRewardableWrapper + + beforeEach(async () => { + const SthWrapperFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') + + wstgUsdc = await SthWrapperFactory.deploy( + 'Wrapped Stargate USDC', + 'wsgUSDC', + networkConfig[chainId].tokens.STG!, + networkConfig[chainId].STARGATE_STAKING_CONTRACT!, + networkConfig[chainId].tokens.sUSDC! + ) + await wstgUsdc.deployed() + + /******** Deploy Stargate USDC collateral plugin **************************/ + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const CollateralFactory = await hre.ethers.getContractFactory('StargatePoolFiatCollateral') + const collateral = await CollateralFactory.connect( + owner + ).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError, + erc20: wstgUsdc.address, + maxTradeVolume: fp('1e6'), + oracleTimeout: usdcOracleTimeout, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError), + delayUntilDefault: bn('86400'), + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Wrap sUsdc + await sUsdc.connect(addr1).approve(wstgUsdc.address, toBNDecimals(initialBal, 6)) + await wstgUsdc.connect(addr1).deposit(toBNDecimals(initialBal, 6), addr1.address) + + // Get current liquidity + fullLiquidityAmt = await sUsdc.totalLiquidity() + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([wstgUsdc.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await wstgUsdc.connect(addr1).approve(rToken.address, issueAmount) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + }) + + it('Should return 100%, full liquidity available at all times', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // AAVE V3 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.STARGATE, + wstgUsdc.address + ) + ).to.equal(fp('1')) + }) + }) + + describe('Flux', () => { + const issueAmount: BigNumber = bn('1000000e18') + + beforeEach(async () => { + /******** Deploy Flux USDC collateral plugin **************************/ + const CollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') + + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await CollateralFactory.connect(owner).deploy( + { + priceTimeout: bn('604800'), + chainlinkFeed: chainlinkFeed.address, + oracleError: usdcOracleError.toString(), + erc20: fUsdc.address, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: usdcOracleTimeout, // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(usdcOracleError).toString(), + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + // Get current liquidity + fullLiquidityAmt = await usdc.balanceOf(fUsdc.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([fUsdc.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await fUsdc.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // FLUX - All redeemable + expect( + await facadeMonitor.backingReedemable(rToken.address, CollPluginType.FLUX, fUsdc.address) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await fUsdc.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await fUsdc.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + await expect(fUsdc.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + expect(await fUsdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + + describe('MORPHO - AAVE V2', () => { + const issueAmount: BigNumber = bn('1000000e18') + let lendingPool: ILendingPool + let maUSDC: MorphoAaveV2TokenisedDeposit + let aaveV2DataProvider: Contract + + beforeEach(async () => { + /******** Deploy Morpho AAVE V2 USDC collateral plugin **************************/ + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDeposit' + ) + maUSDC = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, + underlyingERC20: networkConfig[chainId].tokens.USDC!, + poolToken: networkConfig[chainId].tokens.aUSDC!, + rewardToken: networkConfig[chainId].tokens.MORPHO!, + }) + + const CollateralFactory = await hre.ethers.getContractFactory('MorphoFiatCollateral') + + const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const baseStableConfig = { + priceTimeout: bn('604800').toString(), + oracleError: usdcOracleError.toString(), + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: usdcOracleTimeout, // 24h + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: usdcOracleError.add(fp('0.01')), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + } + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await CollateralFactory.connect(owner).deploy( + { + ...baseStableConfig, + chainlinkFeed: chainlinkFeed.address, + erc20: maUSDC.address, + }, + fp('1e-6') + ) + + // Register and update collateral + await collateral.deployed() + await (await collateral.refresh()).wait() + await pushOracleForward(chainlinkFeed.address) + await assetRegistry.connect(owner).register(collateral.address) + + const aaveV2DataProviderAbi = [ + 'function getReserveData(address asset) external view returns (uint256 availableLiquidity,uint256 totalStableDebt,uint256 totalVariableDebt,uint256 liquidityRate,uint256 variableBorrowRate,uint256 stableBorrowRate,uint256 averageStableBorrowRate,uint256 liquidityIndex,uint256 variableBorrowIndex,uint40 lastUpdateTimestamp)', + ] + aaveV2DataProvider = await ethers.getContractAt( + aaveV2DataProviderAbi, + networkConfig[chainId].AAVE_DATA_PROVIDER || '' + ) + + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + + // Wrap maUSDC + await usdc.connect(addr1).approve(maUSDC.address, 0) + await usdc.connect(addr1).approve(maUSDC.address, MAX_UINT256) + await maUSDC.connect(addr1).mint(toBNDecimals(initialBal, 15), addr1.address) + + // Setup basket + await pushOracleForward(chainlinkFeed.address) + await basketHandler.connect(owner).setPrimeBasket([maUSDC.address], [fp('1')]) + await basketHandler.connect(owner).refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + + // Provide approvals + await maUSDC.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 15)) + + // Advance time significantly - Recharge throttle + await advanceTime(100000) + await pushOracleForward(chainlinkFeed.address) + + // Issue rTokens + await rToken.connect(addr1).issue(issueAmount) + + lendingPool = ( + await ethers.getContractAt('ILendingPool', networkConfig[chainId].AAVE_LENDING_POOL || '') + ) + + // Provide liquidity in AAVE V2 to be able to borrow + const amountToDeposit = fp('500000') + await weth.connect(addr1).approve(lendingPool.address, amountToDeposit) + await lendingPool.connect(addr1).deposit(weth.address, amountToDeposit, addr1.address, 0) + }) + + it('Should return 100% when full liquidity available', async function () { + // Check asset value + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmount, + fp('150') + ) + + // MORPHO AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.equal(fp('1')) + + // Confirm all can be redeemed + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) + await expect(maUSDC.connect(addr2).withdraw(maxWithdraw, addr2.address, addr2.address)).to + .not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) + }) + + it('Should return backing redeemable percent correctly', async function () { + // MORPHO AAVE V2 - All redeemable + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.equal(fp('1')) + + // Get current liquidity from Aave V2 (Morpho relies on this) + ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider + .connect(addr1) + .getReserveData(usdc.address) + + // Leave only 80% of backing available to be redeemed + const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) + await lendingPool.connect(addr1).borrow(usdc.address, borrowAmount, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.be.closeTo(fp('0.80'), fp('0.01')) + + // Borrow half of the remaining liquidity + const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) + await lendingPool + .connect(addr1) + .borrow(usdc.address, remainingLiquidity.div(2), 2, 0, addr1.address) + + // Now only 40% is available to be redeemed + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.be.closeTo(fp('0.40'), fp('0.01')) + + // Confirm we cannot redeem full balance + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) + await expect(maUSDC.connect(addr2).withdraw(maxWithdraw, addr2.address, addr2.address)).to + .be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + + // But we can redeem if we reduce the amount to 30% + await expect( + maUSDC.connect(addr2).withdraw(maxWithdraw.mul(30).div(100), addr2.address, addr2.address) + ).to.not.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) + }) + + it('Should handle no liquidity', async function () { + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.equal(fp('1')) + + // Get current liquidity from Aave V2 (Morpho relies on this) + ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider + .connect(addr1) + .getReserveData(usdc.address) + + // Borrow full liquidity + await lendingPool.connect(addr1).borrow(usdc.address, fullLiquidityAmt, 2, 0, addr1.address) + + expect( + await facadeMonitor.backingReedemable( + rToken.address, + CollPluginType.MORPHO_AAVE_V2, + maUSDC.address + ) + ).to.be.closeTo(fp('0'), fp('0.01')) + + // Confirm we cannot redeem anything, not even 1% + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) + await whileImpersonating(backingManager.address, async (bmSigner) => { + await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + }) + const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) + await expect( + maUSDC.connect(addr2).withdraw(maxWithdraw.div(100), addr2.address, addr2.address) + ).to.be.reverted + expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) + }) + }) + }) +}) diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 0a534ae9cc..5d801071a7 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -7,11 +7,14 @@ import { advanceBlocks, advanceTime, getLatestBlockTimestamp, + getLatestBlockNumber, setNextBlockTimestamp, } from '../utils/time' -import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../common/constants' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192, TradeKind } from '../../common/constants' import { bn, fp } from '../../common/numbers' import { + expectDecayedPrice, + expectExactPrice, expectPrice, expectRTokenPrice, expectUnpriced, @@ -26,12 +29,15 @@ import { CTokenWrapperMock, ERC20Mock, FiatCollateral, + GnosisMock, IAssetRegistry, InvalidFiatCollateral, InvalidMockV3Aggregator, RTokenAsset, StaticATokenMock, TestIBackingManager, + TestIBasketHandler, + TestIFurnace, TestIRToken, USDCMock, UnpricedAssetMock, @@ -42,10 +48,12 @@ import { IMPLEMENTATION, Implementation, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, VERSION, } from '../fixtures' +import { getTrade } from '../utils/trades' import { useEnv } from '#/utils/env' import snapshotGasCost from '../utils/snapshotGasCost' @@ -86,11 +94,16 @@ describe('Assets contracts #fast', () => { let wallet: Wallet let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler + let furnace: TestIFurnace // Factory let AssetFactory: ContractFactory let RTokenAssetFactory: ContractFactory + // Gnosis + let gnosis: GnosisMock + const amt = fp('1e4') before('create fixture loader', async () => { @@ -109,7 +122,10 @@ describe('Assets contracts #fast', () => { basket, assetRegistry, backingManager, + basketHandler, config, + gnosis, + furnace, rToken, rTokenAsset, } = await loadFixture(defaultFixture)) @@ -260,34 +276,51 @@ describe('Assets contracts #fast', () => { await setOraclePrice(compAsset.address, bn('0')) await setOraclePrice(aaveAsset.address, bn('0')) await setOraclePrice(rsrAsset.address, bn('0')) + await setOraclePrice(collateral0.address, bn('0')) + await setOraclePrice(collateral1.address, bn('0')) + + // Fallback prices should be initial prices + await expectExactPrice(compAsset.address, compInitPrice) + await expectExactPrice(rsrAsset.address, rsrInitPrice) + await expectExactPrice(aaveAsset.address, aaveInitPrice) + await expectExactPrice(rTokenAsset.address, rTokenInitPrice) + + // Advance past oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(compAsset.address, bn('0')) + await setOraclePrice(aaveAsset.address, bn('0')) + await setOraclePrice(rsrAsset.address, bn('0')) + await setOraclePrice(collateral0.address, bn('0')) + await setOraclePrice(collateral1.address, bn('0')) + await compAsset.refresh() + await rsrAsset.refresh() + await aaveAsset.refresh() + await collateral0.refresh() + await collateral1.refresh() + + // Prices should be decaying + await expectDecayedPrice(compAsset.address) + await expectDecayedPrice(rsrAsset.address) + await expectDecayedPrice(aaveAsset.address) + const p = await rTokenAsset.price() + expect(p[0]).to.be.gt(0) + expect(p[0]).to.be.lt(rTokenInitPrice[0]) + expect(p[1]).to.be.gt(rTokenInitPrice[1]) + expect(p[1]).to.be.lt(MAX_UINT192) + + // After price timeout, should be unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(compAsset.address, bn('0')) + await setOraclePrice(aaveAsset.address, bn('0')) + await setOraclePrice(rsrAsset.address, bn('0')) + await setOraclePrice(collateral0.address, bn('0')) + await setOraclePrice(collateral1.address, bn('0')) - // Should be unpriced + // Should be unpriced now await expectUnpriced(rsrAsset.address) await expectUnpriced(compAsset.address) await expectUnpriced(aaveAsset.address) - - // Fallback prices should be initial prices - let [lotLow, lotHigh] = await compAsset.lotPrice() - expect(lotLow).to.eq(compInitPrice[0]) - expect(lotHigh).to.eq(compInitPrice[1]) - ;[lotLow, lotHigh] = await rsrAsset.lotPrice() - expect(lotLow).to.eq(rsrInitPrice[0]) - expect(lotHigh).to.eq(rsrInitPrice[1]) - ;[lotLow, lotHigh] = await aaveAsset.lotPrice() - expect(lotLow).to.eq(aaveInitPrice[0]) - expect(lotHigh).to.eq(aaveInitPrice[1]) - - // Update values of underlying tokens of RToken to 0 - await setOraclePrice(collateral0.address, bn(0)) - await setOraclePrice(collateral1.address, bn(0)) - - // RTokenAsset should be unpriced now await expectUnpriced(rTokenAsset.address) - - // Should have initial lot price - ;[lotLow, lotHigh] = await rTokenAsset.lotPrice() - expect(lotLow).to.eq(rTokenInitPrice[0]) - expect(lotHigh).to.eq(rTokenInitPrice[1]) }) it('Should return 0 price for RTokenAsset in full haircut scenario', async () => { @@ -317,12 +350,6 @@ describe('Assets contracts #fast', () => { config.minTradeVolume.mul((await assetRegistry.erc20s()).length) ) expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) - - // Should have lot price, equal to price when feed works OK - const [lowPrice, highPrice] = await rTokenAsset.price() - const [lotLow, lotHigh] = await rTokenAsset.lotPrice() - expect(lotLow).to.equal(lowPrice) - expect(lotHigh).to.equal(highPrice) }) it('Should calculate trade min correctly', async () => { @@ -349,38 +376,62 @@ describe('Assets contracts #fast', () => { expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) }) - it('Should be unpriced if price is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + it('Should remain at saved price if oracle is stale', async () => { + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // Check unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + // lastSave should not be block timestamp after refresh + await rsrAsset.refresh() + await compAsset.refresh() + await aaveAsset.refresh() + expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) - it('Should be unpriced in case of invalid timestamp', async () => { + it('Should remain at saved price in case of invalid timestamp', async () => { await setInvalidOracleTimestamp(rsrAsset.address) await setInvalidOracleTimestamp(compAsset.address) await setInvalidOracleTimestamp(aaveAsset.address) - // Check unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + // lastSave should not be block timestamp after refresh + await rsrAsset.refresh() + await compAsset.refresh() + await aaveAsset.refresh() + expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) - it('Should be unpriced in case of invalid answered round', async () => { + it('Should remain at saved price in case of invalid answered round', async () => { await setInvalidOracleAnsweredRound(rsrAsset.address) await setInvalidOracleAnsweredRound(compAsset.address) await setInvalidOracleAnsweredRound(aaveAsset.address) - // Check unpriced - await expectUnpriced(rsrAsset.address) - await expectUnpriced(compAsset.address) - await expectUnpriced(aaveAsset.address) + // lastSave should not be block timestamp after refresh + await rsrAsset.refresh() + await compAsset.refresh() + await aaveAsset.refresh() + expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) }) - it('Should handle reverting edge cases for RToken', async () => { + it('Should handle reverting edge cases for RTokenAsset', async () => { // Swap one of the collaterals for an invalid one const InvalidFiatCollateralFactory = await ethers.getContractFactory('InvalidFiatCollateral') const invalidFiatCollateral: InvalidFiatCollateral = ( @@ -390,7 +441,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -415,7 +466,7 @@ describe('Assets contracts #fast', () => { await expect(rTokenAsset.price()).to.be.reverted }) - it('Regression test -- Should handle unpriced collateral for RToken', async () => { + it('Regression test -- Should handle unpriced collateral for RTokenAsset', async () => { // https://github.com/code-423n4/2023-07-reserve-findings/issues/20 // Swap one of the collaterals for an invalid one @@ -427,7 +478,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -444,6 +495,115 @@ describe('Assets contracts #fast', () => { await expectUnpriced(rTokenAsset.address) }) + it('Regression test -- RTokenAsset.refresh() should refresh everything', async () => { + // AssetRegistry should refresh + const lastRefreshed = await assetRegistry.lastRefresh() + await rTokenAsset.refresh() + expect(await assetRegistry.lastRefresh()).to.be.gt(lastRefreshed) + + // Furnace should melt + const lastPayout = await furnace.lastPayout() + await advanceTime(12) + await rTokenAsset.refresh() + expect(await furnace.lastPayout()).to.be.gt(lastPayout) + + // Should clear oracle cache + await rTokenAsset.forceUpdatePrice() + let [, cachedAtTime] = await rTokenAsset.cachedOracleData() + expect(cachedAtTime).to.be.gt(0) + await rTokenAsset.refresh() + ;[, cachedAtTime] = await rTokenAsset.cachedOracleData() + expect(cachedAtTime).to.eq(0) + }) + + it('Should handle tokens being out on trade for RTokenAsset', async () => { + // Summary: + // - Run a dutch auction that does not fill + // - Run a batch auction that fills for partial volume + // - Run a dutch auction that fills for full volume + + const low0 = fp('0.99') + const low1 = bn('975344098811881188') // after a 50% basket change + const low2 = bn('975343128415841584') // after batch auction at half volume + const low3 = bn('975560049627103964') // after dutch auction at full volume + + // Price should be [$0.99, $1.01] to start + await expectExactPrice(rTokenAsset.address, [low0, fp('1.01')]) + + // After 50% basket change, expected trading should decrease the lower price to ~$0.9753 + // Upper price remains $1.01 because of uncertainty around how trading will go + await basketHandler + .connect(wallet) + .setPrimeBasket([token.address, usdc.address], [fp('0.5'), fp('0.5')]) + await basketHandler.connect(wallet).refreshBasket() + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // After launching a trade token price should not change + // Regression -- I've confirmed the lower price drops to ~$0.7352 when not tracking balances out on trade + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(1) + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // Settling trade without bidding should not change price + let trade = await ethers.getContractAt( + 'DutchTrade', + await backingManager.trades(aToken.address) + ) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber())) + await expect(backingManager.settleTrade(aToken.address)).to.emit( + backingManager, + 'TradeSettled' + ) + expect(await backingManager.tradesOpen()).to.equal(0) + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // Launching the trade a second time, this time Batch Auction, should not change price + await setNextBlockTimestamp((await trade.endTime()) + 13) + await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(1) + await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) + + // Bid in Gnosis for half volume at even prices + const t = await getTrade(backingManager, aToken.address) + const sellAmt = (await t.initBal()).div(2) // half volume + await token.connect(wallet).approve(gnosis.address, sellAmt) + await gnosis.placeBid(0, { + bidder: wallet.address, + sellAmount: sellAmt, + buyAmount: sellAmt, + }) + await advanceTime(config.batchAuctionLength.toNumber()) + await expect(backingManager.settleTrade(aToken.address)).not.to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(0) + await expectExactPrice(rTokenAsset.address, [low2, fp('1.01')]) + + // Starting a 3rd auction should not change balances + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.emit( + backingManager, + 'TradeStarted' + ) + expect(await backingManager.tradesOpen()).to.equal(1) + await expectExactPrice(rTokenAsset.address, [low2, fp('1.01')]) + + // Settle 3rd auction for full volume + trade = await ethers.getContractAt('DutchTrade', await backingManager.trades(cToken.address)) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await usdc.approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await expect(trade.bid()).to.emit(backingManager, 'TradeSettled') + expect(await backingManager.tradesOpen()).to.equal(1) // launches another trade! + await expectExactPrice(rTokenAsset.address, [low3, bn('1007427552565834095')]) // high end starts to fall + }) + it('Should be able to refresh saved prices', async () => { // Check initial prices - use RSR as example let currBlockTimestamp: number = await getLatestBlockTimestamp() @@ -494,7 +654,7 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -533,37 +693,35 @@ describe('Assets contracts #fast', () => { expect(await unpricedRSRAsset.lastSave()).to.equal(currBlockTimestamp) }) - it('Should not revert on refresh if unpriced', async () => { + it('Should not revert on refresh if stale', async () => { // Check initial prices - use RSR as example - const currBlockTimestamp: number = await getLatestBlockTimestamp() - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, true) + const startBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) const [prevLowPrice, prevHighPrice] = await rsrAsset.price() expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) // Set invalid oracle await setInvalidOracleTimestamp(rsrAsset.address) - // Check unpriced - uses still previous prices - await expectUnpriced(rsrAsset.address) + // Check price - uses still previous prices + await rsrAsset.refresh() let [lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(bn(0)) - expect(highPrice).to.equal(MAX_UINT192) + expect(lowPrice).to.equal(prevLowPrice) + expect(highPrice).to.equal(prevHighPrice) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) - // Perform refresh + // Check price - no update on prices/timestamp await rsrAsset.refresh() - - // Check still unpriced - no update on prices/timestamp - await expectUnpriced(rsrAsset.address) ;[lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(bn(0)) - expect(highPrice).to.equal(MAX_UINT192) + expect(lowPrice).to.equal(prevLowPrice) + expect(highPrice).to.equal(prevHighPrice) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) }) it('Reverts if Chainlink feed reverts or runs out of gas', async () => { @@ -581,79 +739,82 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) // Reverting with no reason await invalidChainlinkFeed.setSimplyRevert(true) await expect(invalidRSRAsset.price()).to.be.reverted - await expect(invalidRSRAsset.lotPrice()).to.be.reverted await expect(invalidRSRAsset.refresh()).to.be.reverted // Runnning out of gas (same error) await invalidChainlinkFeed.setSimplyRevert(false) await expect(invalidRSRAsset.price()).to.be.reverted - await expect(invalidRSRAsset.lotPrice()).to.be.reverted await expect(invalidRSRAsset.refresh()).to.be.reverted }) - it('Should handle lot price correctly', async () => { + it('Should handle price decay correctly', async () => { await rsrAsset.refresh() - // Check lot prices - use RSR as example - const currBlockTimestamp: number = await getLatestBlockTimestamp() - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, true) + // Check prices - use RSR as example + const startBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) const [prevLowPrice, prevHighPrice] = await rsrAsset.price() expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) - - // Lot price equals price when feed works OK - const [lotLowPrice1, lotHighPrice1] = await rsrAsset.lotPrice() - expect(lotLowPrice1).to.equal(prevLowPrice) - expect(lotHighPrice1).to.equal(prevHighPrice) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) // Set invalid oracle await setInvalidOracleTimestamp(rsrAsset.address) // Check unpriced - uses still previous prices - await expectUnpriced(rsrAsset.address) const [lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(bn(0)) - expect(highPrice).to.equal(MAX_UINT192) + expect(lowPrice).to.equal(prevLowPrice) + expect(highPrice).to.equal(prevHighPrice) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) - // At first lot price doesn't decrease - const [lotLowPrice2, lotHighPrice2] = await rsrAsset.lotPrice() - expect(lotLowPrice2).to.eq(lotLowPrice1) - expect(lotHighPrice2).to.eq(lotHighPrice1) + // At first price doesn't decrease + const [lowPrice2, highPrice2] = await rsrAsset.price() + expect(lowPrice2).to.eq(lowPrice) + expect(highPrice2).to.eq(highPrice) // Advance past oracleTimeout await advanceTime(await rsrAsset.oracleTimeout()) - // Now lot price decreases - const [lotLowPrice3, lotHighPrice3] = await rsrAsset.lotPrice() - expect(lotLowPrice3).to.be.lt(lotLowPrice2) - expect(lotHighPrice3).to.be.lt(lotHighPrice2) + // Now price widens + const [lowPrice3, highPrice3] = await rsrAsset.price() + expect(lowPrice3).to.be.lt(lowPrice2) + expect(highPrice3).to.be.gt(highPrice2) - // Advance block, lot price keeps decreasing + // Advance block, price keeps widening await advanceBlocks(1) - const [lotLowPrice4, lotHighPrice4] = await rsrAsset.lotPrice() - expect(lotLowPrice4).to.be.lt(lotLowPrice3) - expect(lotHighPrice4).to.be.lt(lotHighPrice3) + const [lowPrice4, highPrice4] = await rsrAsset.price() + expect(lowPrice4).to.be.lt(lowPrice3) + expect(highPrice4).to.be.gt(highPrice3) - // Advance blocks beyond PRICE_TIMEOUT + // Advance blocks beyond PRICE_TIMEOUT; price should be [O, FIX_MAX] await advanceTime(PRICE_TIMEOUT.toNumber()) // Lot price returns 0 once time elapses - const [lotLowPrice5, lotHighPrice5] = await rsrAsset.lotPrice() - expect(lotLowPrice5).to.be.lt(lotLowPrice4) - expect(lotHighPrice5).to.be.lt(lotHighPrice4) - expect(lotLowPrice5).to.be.equal(bn(0)) - expect(lotHighPrice5).to.be.equal(bn(0)) + const [lowPrice5, highPrice5] = await rsrAsset.price() + expect(lowPrice5).to.be.lt(lowPrice4) + expect(highPrice5).to.be.gt(highPrice4) + expect(lowPrice5).to.be.equal(bn(0)) + expect(highPrice5).to.be.equal(MAX_UINT192) + }) + + it('lotPrice (deprecated) is equal to price()', async () => { + for (const asset of [rsrAsset, compAsset, aaveAsset, rTokenAsset]) { + const lotPrice = await asset.lotPrice() + const price = await asset.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + } }) }) @@ -724,9 +885,9 @@ describe('Assets contracts #fast', () => { it('refresh() after full price timeout', async () => { await advanceTime((await rsrAsset.priceTimeout()) + (await rsrAsset.oracleTimeout())) - const lotP = await rsrAsset.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await rsrAsset.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) }) }) }) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index ff0441b43c..21ca93859c 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -39,6 +39,8 @@ import { } from '../utils/time' import snapshotGasCost from '../utils/snapshotGasCost' import { + expectDecayedPrice, + expectExactPrice, expectPrice, expectRTokenPrice, expectUnpriced, @@ -50,6 +52,7 @@ import { Collateral, defaultFixture, ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, REVENUE_HIDING, @@ -252,7 +255,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.constants.HashZero, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -260,6 +263,44 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetName missing') }) + it('Should not allow 0 defaultThreshold', async () => { + // ATokenFiatCollateral + await expect( + ATokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await tokenCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: aToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') + + // CTokenFiatCollateral + await expect( + CTokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await tokenCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: cToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should not allow missing delayUntilDefault', async () => { await expect( FiatCollateralFactory.deploy({ @@ -268,7 +309,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -284,7 +325,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -302,7 +343,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -320,7 +361,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -336,7 +377,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -354,7 +395,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -373,7 +414,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -389,7 +430,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -407,7 +448,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -426,7 +467,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -442,7 +483,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -460,7 +501,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -481,7 +522,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -499,7 +540,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -582,7 +623,7 @@ describe('Collateral contracts', () => { ) }) - it('Should become unpriced if price is zero', async () => { + it('Should handle prices correctly when price is zero', async () => { const compInitPrice = await tokenCollateral.price() const aaveInitPrice = await aTokenCollateral.price() const rsrInitPrice = await cTokenCollateral.price() @@ -590,22 +631,25 @@ describe('Collateral contracts', () => { // Update values in Oracles to 0 await setOraclePrice(tokenCollateral.address, bn('0')) - // Should be unpriced - await expectUnpriced(cTokenCollateral.address) - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - // Fallback prices should be initial prices - let [lotLow, lotHigh] = await tokenCollateral.lotPrice() + let [lotLow, lotHigh] = await tokenCollateral.price() expect(lotLow).to.eq(compInitPrice[0]) expect(lotHigh).to.eq(compInitPrice[1]) - ;[lotLow, lotHigh] = await cTokenCollateral.lotPrice() + ;[lotLow, lotHigh] = await cTokenCollateral.price() expect(lotLow).to.eq(rsrInitPrice[0]) expect(lotHigh).to.eq(rsrInitPrice[1]) - ;[lotLow, lotHigh] = await aTokenCollateral.lotPrice() + ;[lotLow, lotHigh] = await aTokenCollateral.price() expect(lotLow).to.eq(aaveInitPrice[0]) expect(lotHigh).to.eq(aaveInitPrice[1]) + // Advance past timeouts + await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + + // Should be unpriced + await expectUnpriced(cTokenCollateral.address) + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) + // When refreshed, sets status to Unpriced await tokenCollateral.refresh() await aTokenCollateral.refresh() @@ -616,38 +660,56 @@ describe('Collateral contracts', () => { expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Should be unpriced in case of invalid timestamp', async () => { + it('Should remain at saved price in case of invalid timestamp', async () => { await setInvalidOracleTimestamp(tokenCollateral.address) + await setInvalidOracleTimestamp(usdcCollateral.address) - // Check price of token - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - await expectUnpriced(cTokenCollateral.address) - - // When refreshed, sets status to Unpriced + // lastSave should not be block timestamp after refresh await tokenCollateral.refresh() + await usdcCollateral.refresh() await aTokenCollateral.refresh() await cTokenCollateral.refresh() - + expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) + + // Sets status to IFFY expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) + expect(await usdcCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Should be unpriced in case of invalid answered round', async () => { + it('Should remain at saved price in case of invalid answered round', async () => { await setInvalidOracleAnsweredRound(tokenCollateral.address) + await setInvalidOracleAnsweredRound(usdcCollateral.address) - // Check price of token - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - await expectUnpriced(cTokenCollateral.address) - - // When refreshed, sets status to Unpriced + // lastSave should not be block timestamp after refresh await tokenCollateral.refresh() + await usdcCollateral.refresh() await aTokenCollateral.refresh() await cTokenCollateral.refresh() - + expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price is still at saved price + await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) + + // Sets status to IFFY expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) + expect(await usdcCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -714,7 +776,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -756,6 +818,17 @@ describe('Collateral contracts', () => { expect(await unpricedAppFiatCollateral.savedHighPrice()).to.equal(highPrice) expect(await unpricedAppFiatCollateral.lastSave()).to.equal(currBlockTimestamp) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + for (const coll of [tokenCollateral, usdcCollateral, aTokenCollateral, cTokenCollateral]) { + const lotPrice = await coll.lotPrice() + const price = await coll.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + } + }) }) describe('Status', () => { @@ -908,14 +981,24 @@ describe('Collateral contracts', () => { } }) - it('Unpriced if price is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + it('Should remain at saved price if oracle is stale', async () => { + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // Check unpriced - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(usdcCollateral.address) - await expectUnpriced(cTokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) + // lastSave should not be block timestamp after refresh + await tokenCollateral.refresh() + await usdcCollateral.refresh() + await cTokenCollateral.refresh() + await aTokenCollateral.refresh() + expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + + // Check price + await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) + await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) + await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) }) it('Enters IFFY state when price becomes stale', async () => { @@ -1109,13 +1192,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) await nonFiatCollateral.refresh() @@ -1132,13 +1215,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('delayUntilDefault zero') }) @@ -1152,13 +1235,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('missing targetUnit feed') }) @@ -1172,13 +1255,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ).to.be.revertedWith('missing chainlink feed') }) @@ -1192,7 +1275,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1203,6 +1286,26 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) + it('Should not allow 0 defaultThreshold', async () => { + await expect( + NonFiatCollFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: referenceUnitOracle.address, + oracleError: ORACLE_ERROR, + erc20: nonFiatToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT_PRE_BUFFER + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should setup collateral correctly', async function () { // Non-Fiat Token expect(await nonFiatCollateral.isCollateral()).to.equal(true) @@ -1231,6 +1334,8 @@ describe('Collateral contracts', () => { }) it('Should calculate prices correctly', async function () { + const initialPrice = await nonFiatCollateral.price() + // Check initial prices await expectPrice(nonFiatCollateral.address, fp('20000'), ORACLE_ERROR, true) @@ -1240,26 +1345,37 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(nonFiatCollateral.address, fp('22000'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices + // Cached but IFFY if price is zero await targetUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(nonFiatCollateral.address) - - // When refreshed, sets status to IFFY await nonFiatCollateral.refresh() expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + await expectExactPrice(nonFiatCollateral.address, initialPrice) + + // Should become disabled after just ORACLE_TIMEOUT + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await targetUnitOracle.updateAnswer(bn('0')) + expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + await expectDecayedPrice(nonFiatCollateral.address) // Restore price await targetUnitOracle.updateAnswer(bn('20000e8')) + await referenceUnitOracle.updateAnswer(bn('1e8')) await nonFiatCollateral.refresh() - expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(nonFiatCollateral.address, initialPrice) - // Check the other oracle + // Check the other oracle's impact await referenceUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(nonFiatCollateral.address) + await expectExactPrice(nonFiatCollateral.address, initialPrice) - // When refreshed, sets status to IFFY - await nonFiatCollateral.refresh() - expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + // Advance past oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectDecayedPrice(nonFiatCollateral.address) + + // Advance past price timeout + await advanceTime(PRICE_TIMEOUT.toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectUnpriced(nonFiatCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -1275,13 +1391,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -1303,13 +1419,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, invalidChainlinkFeed.address, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) // Reverting with no reason @@ -1364,13 +1480,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) await cTokenNonFiatCollateral.refresh() @@ -1388,13 +1504,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('delayUntilDefault zero') @@ -1409,13 +1525,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, fp('1') ) ).to.be.revertedWith('revenueHiding out of range') @@ -1430,13 +1546,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('missing chainlink feed') @@ -1451,13 +1567,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, REVENUE_HIDING ) ).to.be.revertedWith('missing targetUnit feed') @@ -1472,7 +1588,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1484,6 +1600,27 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) + it('Should not allow 0 defaultThreshold', async () => { + await expect( + CTokenNonFiatFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: referenceUnitOracle.address, + oracleError: ORACLE_ERROR, + erc20: cNonFiatTokenVault.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT_PRE_BUFFER, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should setup collateral correctly', async function () { // Non-Fiat Token expect(await cTokenNonFiatCollateral.isCollateral()).to.equal(true) @@ -1522,47 +1659,128 @@ describe('Collateral contracts', () => { }) it('Should calculate prices correctly', async function () { + // Check initial prices await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - - // Check refPerTok initial values expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.02')) // Increase rate to double await cNonFiatTokenVault.setExchangeRate(fp(2)) await cTokenNonFiatCollateral.refresh() - // Check price doubled - await expectPrice(cTokenNonFiatCollateral.address, fp('800'), ORACLE_ERROR, true) - // RefPerTok also doubles in this case expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.04')) + // Check new prices + await expectPrice(cTokenNonFiatCollateral.address, fp('800'), ORACLE_ERROR, true) + // Update values in Oracle increase by 10% await targetUnitOracle.updateAnswer(bn('22000e8')) // $22k // Check new price await expectPrice(cTokenNonFiatCollateral.address, fp('880'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices - await targetUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(cTokenNonFiatCollateral.address) + // Should be SOUND + await cTokenNonFiatCollateral.refresh() + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - // When refreshed, sets status to IFFY + const initialPrice = await cTokenNonFiatCollateral.price() + + // Cached but IFFY when price becomes zero + await targetUnitOracle.updateAnswer(bn('0')) await cTokenNonFiatCollateral.refresh() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - // Restore + // Should become disabled after just ORACLE_TIMEOUT + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await targetUnitOracle.updateAnswer(bn('0')) + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + await cTokenNonFiatCollateral.refresh() + await expectDecayedPrice(cTokenNonFiatCollateral.address) + + // Restore price await targetUnitOracle.updateAnswer(bn('22000e8')) + await referenceUnitOracle.updateAnswer(bn('1e8')) await cTokenNonFiatCollateral.refresh() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) + + // Check the other oracle's impact + await referenceUnitOracle.updateAnswer(bn('0')) + await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) + + // Advance past oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectDecayedPrice(cTokenNonFiatCollateral.address) - // Revert if price is zero - Update the other Oracle + // Advance past price timeout + await advanceTime(PRICE_TIMEOUT.toString()) await referenceUnitOracle.updateAnswer(bn('0')) await expectUnpriced(cTokenNonFiatCollateral.address) + }) - // When refreshed, sets status to IFFY - await cTokenNonFiatCollateral.refresh() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cNonFiatTokenVault.exchangeRateStored() + const [currLow, currHigh] = await cTokenNonFiatCollateral.price() + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenNonFiatCollateral.refresh()) + .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenNonFiatCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cNonFiatTokenVault.exchangeRateStored() + const [currLow, currHigh] = await cTokenNonFiatCollateral.price() + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenNonFiatCollateral.refresh()) + .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenNonFiatCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { @@ -1610,7 +1828,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1639,7 +1857,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1681,7 +1899,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1721,7 +1939,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(100), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1739,9 +1957,17 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(selfReferentialCollateral.address, fp('1.1'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices + await selfReferentialCollateral.refresh() + const initialPrice = await selfReferentialCollateral.price() + + // Cached price if oracle price is zero await setOraclePrice(selfReferentialCollateral.address, bn(0)) - await expectUnpriced(selfReferentialCollateral.address) + await expectExactPrice(selfReferentialCollateral.address, initialPrice) + + // Decay starts after oracle timeout + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(selfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(selfReferentialCollateral.address) // When refreshed, sets status to IFFY await selfReferentialCollateral.refresh() @@ -1758,6 +1984,12 @@ describe('Collateral contracts', () => { // Another call would not change the state await selfReferentialCollateral.refresh() expect(await selfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + + // Final price checks + await expectDecayedPrice(selfReferentialCollateral.address) + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(selfReferentialCollateral.address, bn(0)) + await expectUnpriced(selfReferentialCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -1772,7 +2004,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1822,7 +2054,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1846,7 +2078,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1866,7 +2098,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1886,7 +2118,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(200), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1950,13 +2182,90 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.044'), ORACLE_ERROR, true) - // Unpriced if price is zero - Update Oracles and check prices + await cTokenSelfReferentialCollateral.refresh() + const initialPrice = await cTokenSelfReferentialCollateral.price() await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) - await expectUnpriced(cTokenSelfReferentialCollateral.address) + await expectExactPrice(cTokenSelfReferentialCollateral.address, initialPrice) - // When refreshed, sets status to IFFY + // Decays if price is zero await cTokenSelfReferentialCollateral.refresh() expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) + await expectDecayedPrice(cTokenSelfReferentialCollateral.address) + + // Unpriced after price timeout + await advanceTime(PRICE_TIMEOUT.toString()) + await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) + await expectUnpriced(cTokenSelfReferentialCollateral.address) + + // When refreshed, sets status to DISABLED + await cTokenSelfReferentialCollateral.refresh() + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + }) + + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cSelfRefToken.exchangeRateStored() + const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenSelfReferentialCollateral.refresh()) + .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + const currRate = await cSelfRefToken.exchangeRateStored() + const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + + // Make cToken revert on exchangeRateCurrent() + const cTokenErc20Mock = ( + await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) + ) + await cTokenErc20Mock.setRevertExchangeRate(true) + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenSelfReferentialCollateral.refresh()) + .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { @@ -2004,7 +2313,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2054,7 +2363,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2077,7 +2386,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -2097,7 +2406,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2117,7 +2426,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2137,7 +2446,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2148,6 +2457,26 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) + it('Should not allow 0 defaultThreshold', async () => { + await expect( + EURFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: referenceUnitOracle.address, + oracleError: ORACLE_ERROR, + erc20: eurFiatToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: bn(0), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + ).to.be.revertedWith('defaultThreshold zero') + }) + it('Should not revert during refresh when price2 is 0', async () => { const targetFeedAddr = await eurFiatCollateral.targetUnitChainlinkFeed() const targetFeed = await ethers.getContractAt('MockV3Aggregator', targetFeedAddr) @@ -2193,10 +2522,12 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(eurFiatCollateral.address, fp('2'), ORACLE_ERROR, true) + await eurFiatCollateral.refresh() + const initialPrice = await eurFiatCollateral.price() - // Unpriced if price is zero - Update Oracles and check prices + // Decays if price is zero await referenceUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(eurFiatCollateral.address) + await expectExactPrice(eurFiatCollateral.address, initialPrice) // When refreshed, sets status to IFFY await eurFiatCollateral.refresh() @@ -2211,6 +2542,18 @@ describe('Collateral contracts', () => { await targetUnitOracle.updateAnswer(bn('0')) await eurFiatCollateral.refresh() expect(await eurFiatCollateral.status()).to.equal(CollateralStatus.IFFY) + + // Decays if price is zero + await referenceUnitOracle.updateAnswer(bn('0')) + await expectExactPrice(eurFiatCollateral.address, initialPrice) + await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectDecayedPrice(eurFiatCollateral.address) + + // After timeout, unpriced + await advanceTime(PRICE_TIMEOUT.toString()) + await referenceUnitOracle.updateAnswer(bn('0')) + await expectUnpriced(eurFiatCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -2226,7 +2569,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2254,7 +2597,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2329,15 +2672,15 @@ describe('Collateral contracts', () => { const oracleTimeout = await tokenCollateral.oracleTimeout() await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(bn(oracleTimeout).div(12)) + await snapshotGasCost(tokenCollateral.refresh()) }) it('after full price timeout', async () => { await advanceTime( (await tokenCollateral.priceTimeout()) + (await tokenCollateral.oracleTimeout()) ) - const lotP = await tokenCollateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + await expectUnpriced(tokenCollateral.address) + await snapshotGasCost(tokenCollateral.refresh()) }) }) }) diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index abc94deb66..2b10d1847b 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -18,12 +18,16 @@ import snapshotGasCost from '../utils/snapshotGasCost' import { formatUnits, parseUnits } from 'ethers/lib/utils' import { MAX_UINT256 } from '#/common/constants' +const SHARE_DECIMAL_OFFSET = 9 // decimals buffer for shares and rewards per share +const BN_SHARE_FACTOR = bn(10).pow(SHARE_DECIMAL_OFFSET) + type Fixture = () => Promise interface RewardableERC20Fixture { rewardableVault: RewardableERC4626VaultTest | RewardableERC20WrapperTest rewardableAsset: ERC20MockRewarding rewardToken: ERC20MockDecimals + rewardableVaultFactory: ContractFactory } // 18 cases: test two wrappers with 2 combinations of decimals [6, 8, 18] @@ -76,6 +80,7 @@ for (const wrapperName of wrapperNames) { rewardableVault, rewardableAsset, rewardToken, + rewardableVaultFactory, } } return fixture @@ -118,18 +123,19 @@ for (const wrapperName of wrapperNames) { describe(wrapperName, () => { // Decimals let shareDecimals: number - + let rewardShareDecimals: number // Assets let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest let rewardableAsset: ERC20MockRewarding let rewardToken: ERC20MockDecimals + let rewardableVaultFactory: ContractFactory // Main let alice: Wallet let bob: Wallet const initBalance = parseUnits('10000', assetDecimals) - const rewardAmount = parseUnits('200', rewardDecimals) + let rewardAmount = parseUnits('200', rewardDecimals) let oneShare: BigNumber let initShares: BigNumber @@ -141,14 +147,16 @@ for (const wrapperName of wrapperNames) { beforeEach(async () => { // Deploy fixture - ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) + ;({ rewardableVault, rewardableAsset, rewardToken, rewardableVaultFactory } = + await loadFixture(fixture)) await rewardableAsset.mint(alice.address, initBalance) await rewardableAsset.connect(alice).approve(rewardableVault.address, initBalance) await rewardableAsset.mint(bob.address, initBalance) await rewardableAsset.connect(bob).approve(rewardableVault.address, initBalance) - shareDecimals = await rewardableVault.decimals() + shareDecimals = (await rewardableVault.decimals()) + SHARE_DECIMAL_OFFSET + rewardShareDecimals = rewardDecimals + SHARE_DECIMAL_OFFSET initShares = toShares(initBalance, assetDecimals, shareDecimals) oneShare = bn('1').mul(bn(10).pow(shareDecimals)) }) @@ -181,7 +189,9 @@ for (const wrapperName of wrapperNames) { expect(await rewardableVault.lastRewardsPerShare(alice.address)).to.equal(bn(0)) await rewardToken.mint(rewardableVault.address, parseUnits('10', rewardDecimals)) await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) + expect(await rewardableVault.rewardsPerShare()).to.equal( + parseUnits('1', rewardShareDecimals) + ) }) it('correctly handles reward tracking if supply is burned', async () => { @@ -192,7 +202,9 @@ for (const wrapperName of wrapperNames) { expect(await rewardableVault.lastRewardsPerShare(alice.address)).to.equal(bn(0)) await rewardToken.mint(rewardableVault.address, parseUnits('10', rewardDecimals)) await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) + expect(await rewardableVault.rewardsPerShare()).to.equal( + parseUnits('1', rewardShareDecimals) + ) // Setting supply to 0 await withdrawAll(rewardableVault.connect(alice)) @@ -211,7 +223,9 @@ for (const wrapperName of wrapperNames) { // Nothing updates.. as totalSupply as totalSupply is 0 await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) + expect(await rewardableVault.rewardsPerShare()).to.equal( + parseUnits('1', rewardShareDecimals) + ) await rewardableVault .connect(alice) .deposit(parseUnits('10', assetDecimals), alice.address) @@ -223,6 +237,23 @@ for (const wrapperName of wrapperNames) { ) }) + it('checks reward and underlying token are not the same', async () => { + const errorMsg = + wrapperName == Wrapper.ERC4626 + ? 'reward and asset cannot match' + : 'reward and underlying cannot match' + + // Attempt to deploy with same reward and underlying + await expect( + rewardableVaultFactory.deploy( + rewardableAsset.address, + 'Rewarding Test Asset Vault', + 'vrewardTEST', + rewardableAsset.address + ) + ).to.be.revertedWith(errorMsg) + }) + it('1 wei supply', async () => { await rewardableVault.connect(alice).deposit('1', alice.address) expect(await rewardableVault.rewardsPerShare()).to.equal(bn(0)) @@ -259,7 +290,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.mul(3).div(8)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.mul(3).div(8).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -267,7 +300,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(8)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(8).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -276,7 +311,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -303,7 +340,9 @@ for (const wrapperName of wrapperNames) { it('alice shows correct lastRewardsPerShare', async () => { // rewards / alice's deposit - expect(initRewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(initRewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) expect(initRewardsPerShare).equal( await rewardableVault.lastRewardsPerShare(alice.address) ) @@ -314,6 +353,7 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) + .mul(BN_SHARE_FACTOR) expect(rewardsPerShare).equal(expectedRewardsPerShare) expect(rewardsPerShare).equal(await rewardableVault.lastRewardsPerShare(bob.address)) }) @@ -337,7 +377,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -378,7 +420,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -404,7 +448,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -413,7 +459,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) @@ -433,7 +481,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice has claimed rewards', async () => { @@ -445,7 +495,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(8)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(8).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -454,10 +506,29 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) + ) }) }) + it('Cannot frontrun claimRewards by inflating your shares', async () => { + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance.mul(100)) + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + + // Bob 'flashloans' 100x the current balance of the vault and claims rewards + await rewardableVault.connect(bob).deposit(initBalance.mul(100), bob.address) + await rewardableVault.connect(bob).claimRewards() + + // Alice claimsRewards a bit later + await rewardableVault.connect(alice).claimRewards() + expect(await rewardToken.balanceOf(alice.address)).to.be.gt( + await rewardToken.balanceOf(bob.address) + ) + }) + describe('alice deposit, accrue, bob deposit, accrue, bob claim, alice claim', () => { let rewardsPerShare: BigNumber @@ -480,7 +551,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice has claimed rewards', async () => { @@ -494,7 +567,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -511,6 +586,7 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) + .mul(BN_SHARE_FACTOR) expect(rewardsPerShare).equal(expectedRewardsPerShare) }) }) @@ -540,7 +616,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -552,7 +630,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -565,7 +645,9 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // (rewards / alice's deposit) + (rewards / bob's deposit) - expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4)).mul(2)) + expect(rewardsPerShare).equal( + rewardAmount.mul(oneShare).div(initShares.div(4)).mul(2).mul(BN_SHARE_FACTOR) + ) }) }) @@ -576,7 +658,9 @@ for (const wrapperName of wrapperNames) { await rewardableVault.connect(alice).deposit(initBalance.div(4), alice.address) await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.connect(bob).deposit(initBalance.div(4), bob.address) - await rewardableVault.connect(alice).transfer(bob.address, initShares.div(4)) + await rewardableVault + .connect(alice) + .transfer(bob.address, initShares.div(4).div(BN_SHARE_FACTOR)) await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.connect(alice).deposit(initBalance.div(4), alice.address) await rewardableVault.connect(bob).claimRewards() @@ -586,7 +670,9 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) + expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(alice.address) + ) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -598,7 +684,9 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(2)).equal(await rewardableVault.balanceOf(bob.address)) + expect(initShares.div(2).div(BN_SHARE_FACTOR)).equal( + await rewardableVault.balanceOf(bob.address) + ) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -616,6 +704,84 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) + .mul(BN_SHARE_FACTOR) + ) + }) + }) + + describe('correctly applies fractional reward tracking', () => { + rewardAmount = parseUnits('1.9', rewardDecimals) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Correctly handles fractional rewards', async () => { + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + + for (let i = 0; i < 10; i++) { + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + await rewardableVault.claimRewards() + expect(await rewardableVault.rewardsPerShare()).to.equal( + rewardAmount + .mul(i + 1) + .mul(oneShare) + .div(initShares) + .mul(BN_SHARE_FACTOR) + ) + } + }) + }) + + describe(`correctly rounds rewards`, () => { + // Assets + rewardAmount = parseUnits('1.7', rewardDecimals) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Avoids wrong distribution of rewards when rounding', async () => { + expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(0)) + expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(0)) + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + // alice deposit and accrue rewards + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + + // bob deposit + await rewardableVault.connect(bob).deposit(initBalance, bob.address) + + // accrue additional rewards (twice the amount) + await rewardableAsset.accrueRewards(rewardAmount.mul(2), rewardableVault.address) + + // claim all rewards + await rewardableVault.connect(bob).claimRewards() + await rewardableVault.connect(alice).claimRewards() + + // Alice got all first rewards plus half of the second + expect(await rewardToken.balanceOf(alice.address)).to.equal(rewardAmount.mul(2)) + + // Bob only got half of the second rewards + expect(await rewardToken.balanceOf(bob.address)).to.equal(rewardAmount) + + expect(await rewardableVault.rewardsPerShare()).equal( + rewardAmount.mul(2).mul(oneShare).div(initShares).mul(BN_SHARE_FACTOR) ) }) }) @@ -667,12 +833,70 @@ for (const wrapperName of wrapperNames) { for (let i = 0; i < 10; i++) { await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.claimRewards() - - expect(await rewardableVault.rewardsPerShare()).to.equal(Math.floor(1.9 * (i + 1))) + expect(await rewardableVault.rewardsPerShare()).to.equal( + bn(`1.9e${SHARE_DECIMAL_OFFSET}`).mul(i + 1) + ) } }) }) + describe(`${wrapperName.replace('Test', '')} Special Case: Rounding - Regression test`, () => { + // Assets + let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest + let rewardableAsset: ERC20MockRewarding + let rewardToken: ERC20MockDecimals + // Main + let alice: Wallet + let bob: Wallet + + const initBalance = parseUnits('1000000', 18) + const rewardAmount = parseUnits('1.7', 6) + + const fixture = getFixture(18, 6) + + before('load wallets', async () => { + ;[alice, bob] = (await ethers.getSigners()) as unknown as Wallet[] + }) + + beforeEach(async () => { + // Deploy fixture + ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) + + await rewardableAsset.mint(alice.address, initBalance) + await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) + await rewardableAsset.mint(bob.address, initBalance) + await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) + }) + + it('Avoids wrong distribution of rewards when rounding', async () => { + expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(0)) + expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(0)) + expect(await rewardableVault.rewardsPerShare()).to.equal(0) + + // alice deposit and accrue rewards + await rewardableVault.connect(alice).deposit(initBalance, alice.address) + await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) + + // bob deposit + await rewardableVault.connect(bob).deposit(initBalance, bob.address) + + // accrue additional rewards (twice the amount) + await rewardableAsset.accrueRewards(rewardAmount.mul(2), rewardableVault.address) + + // claim all rewards + await rewardableVault.connect(bob).claimRewards() + await rewardableVault.connect(alice).claimRewards() + + // Alice got all first rewards plus half of the second + expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(3.4e6)) + + // Bob only got half of the second rewards + expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(1.7e6)) + + expect(await rewardableVault.rewardsPerShare()).to.equal(bn(`3.4e${SHARE_DECIMAL_OFFSET}`)) + }) + }) + const IMPLEMENTATION: Implementation = useEnv('PROTO_IMPL') == Implementation.P1.toString() ? Implementation.P1 : Implementation.P0 diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index 83c6bf2eb6..926d33902f 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,8 +1,12 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71881`; +exports[`Collateral contracts Gas Reporting refresh() after full price timeout 1`] = `46228`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75163`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71859`; + +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75141`; + +exports[`Collateral contracts Gas Reporting refresh() after oracle timeout 1`] = `46228`; exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `61571`; diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index 89bc877c66..a15ac37a23 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -15,6 +15,7 @@ import { noop } from 'lodash' import { PRICE_TIMEOUT } from '#/test/fixtures' import { resetFork } from './helpers' import { whileImpersonating } from '#/test/utils/impersonation' +import { pushOracleForward } from '../../../utils/oracles' import { forkNetwork, AUSDC_V3, @@ -72,6 +73,9 @@ export const deployCollateral = async (opts: Partial = {}) => ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(combinedOpts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -211,6 +215,7 @@ export const stableOpts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, itIsPricedByPeg: true, chainlinkDefaultAnswer: 1e8, itChecksPriceChanges: it, diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap index 62ee74c7f7..996921a268 100644 --- a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting ERC20 transfer 2`] = `36409`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69299`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69288`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67631`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67620`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72125`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72103`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64443`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64421`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69299`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69288`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67631`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67620`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `67290`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `87699`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `67290`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `87625`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87706`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87684`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87706`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87684`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89656`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89708`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87988`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87966`; diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index ed84d0b200..7a4a52862c 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -10,7 +10,13 @@ import { PRICE_TIMEOUT, REVENUE_HIDING, } from '../../../fixtures' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { + DefaultFixture, + Fixture, + getDefaultFixture, + ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, +} from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' import { @@ -22,15 +28,20 @@ import { IRTokenSetup, networkConfig, } from '../../../../common/configuration' -import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../../../common/constants' +import { + CollateralStatus, + MAX_UINT48, + MAX_UINT192, + ZERO_ADDRESS, +} from '../../../../common/constants' import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' import { expectPrice, expectRTokenPrice, - expectUnpriced, setOraclePrice, + expectUnpriced, } from '../../../utils/oracles' import { advanceBlocks, @@ -204,7 +215,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, stkAave.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -228,7 +239,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -423,7 +434,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Validate constructor arguments // Note: Adapt it to your plugin constructor validations it('Should validate constructor arguments correctly', async () => { - // stkAAVEtroller + // Missing erc20 await expect( ATokenFiatCollateralFactory.deploy( { @@ -432,7 +443,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -440,6 +451,24 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi REVENUE_HIDING ) ).to.be.revertedWith('missing erc20') + + // defaultThreshold = 0 + await expect( + ATokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, + oracleError: ORACLE_ERROR, + erc20: staticAToken.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') }) }) @@ -653,10 +682,14 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // stkAAVEound - await expectUnpriced(aDaiCollateral.address) + // Price is at saved prices + const savedLowPrice = await aDaiCollateral.savedLowPrice() + const savedHighPrice = await aDaiCollateral.savedHighPrice() + const p = await aDaiCollateral.price() + expect(p[0]).to.equal(savedLowPrice) + expect(p[1]).to.equal(savedHighPrice) // Refresh should mark status IFFY await aDaiCollateral.refresh() @@ -672,7 +705,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -697,7 +730,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -714,6 +747,15 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await zeropriceCtokenCollateral.refresh() expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await aDaiCollateral.lotPrice() + const price = await aDaiCollateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) }) // Note: Here the idea is to test all possible statuses and check all possible paths to default @@ -968,9 +1010,9 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime( (await aDaiCollateral.priceTimeout()) + (await aDaiCollateral.oracleTimeout()) ) - const lotP = await aDaiCollateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await aDaiCollateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) await snapshotGasCost(aDaiCollateral.refresh()) await snapshotGasCost(aDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 6cc30614b8..13f8ae6777 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 Wrapper t exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 Wrapper transfer 2`] = `53409`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74365`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74354`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72697`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72686`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72960`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72938`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65278`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65256`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74365`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74354`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72697`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72686`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91169`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91073`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91095`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91073`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92233`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92285`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92307`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92285`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127378`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127282`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91436`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91488`; diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index 79f063c586..e21a0f66a0 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -10,6 +10,7 @@ import { TestICollateral, IAnkrETH, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -100,6 +101,9 @@ export const deployCollateral = async ( ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -285,6 +289,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'AnkrStakedETH', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index 513e5ca5b6..64458dcd1a 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting ERC20 exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting ERC20 transfer 2`] = `43994`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60337`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60326`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55868`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55857`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99413`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99391`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91730`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91708`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60337`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60326`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55868`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55857`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55527`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55516`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55527`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55516`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91657`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91635`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91657`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91635`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99208`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99186`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91939`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91917`; diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 9f659f1b45..8f5bb5efe1 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -12,6 +12,7 @@ import { ORACLE_TIMEOUT, PRICE_TIMEOUT, } from './constants' +import { pushOracleForward } from '../../../utils/oracles' import { BigNumber, BigNumberish, ContractFactory } from 'ethers' import { bn, fp } from '#/common/numbers' import { TestICollateral } from '@typechain/TestICollateral' @@ -60,6 +61,10 @@ export const deployCollateral = async ( ) await collateral.deployed() + // Push forward chainlink feeds + await pushOracleForward(opts.chainlinkFeed!) + await pushOracleForward(opts.targetPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED) + await expect(collateral.refresh()) return collateral @@ -241,6 +246,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'CBEthCollateral', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts index 489f89d3df..fbc3f6874b 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -277,6 +277,7 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'CBEthCollateralL2', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index afb2111ab5..f7366a3fb9 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting ERC2 exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `48379`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59824`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59813`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55355`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55344`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98317`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98295`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90634`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90612`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59824`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59813`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55355`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55344`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55014`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55003`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55014`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55003`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90631`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90609`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90631`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90609`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98182`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98160`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90913`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90891`; diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 40465f48dc..dcb238c332 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -1,35 +1,59 @@ import { expect } from 'chai' import hre, { ethers } from 'hardhat' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { BigNumber } from 'ethers' +import { BigNumber, ContractFactory } from 'ethers' import { useEnv } from '#/utils/env' import { getChainId } from '../../../common/blockchain-utils' -import { networkConfig } from '../../../common/configuration' -import { bn, fp } from '../../../common/numbers' -import { - IERC20Metadata, - InvalidMockV3Aggregator, - MockV3Aggregator, - TestICollateral, -} from '../../../typechain' +import { bn, fp, toBNDecimals } from '../../../common/numbers' +import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from './fixtures' +import { expectInIndirectReceipt } from '../../../common/events' +import { whileImpersonating } from '../../utils/impersonation' +import { IGovParams, IGovRoles, IRTokenSetup, networkConfig } from '../../../common/configuration' import { advanceTime, advanceBlocks, + getLatestBlockNumber, getLatestBlockTimestamp, setNextBlockTimestamp, } from '../../utils/time' -import { MAX_UINT48, MAX_UINT192 } from '../../../common/constants' +import { + MAX_UINT48, + MAX_UINT192, + MAX_UINT256, + TradeKind, + ZERO_ADDRESS, +} from '../../../common/constants' import { CollateralFixtureContext, CollateralTestSuiteFixtures, CollateralStatus, } from './pluginTestTypes' -import { expectPrice, expectUnpriced } from '../../utils/oracles' +import { + expectDecayedPrice, + expectExactPrice, + expectPrice, + expectUnpriced, +} from '../../utils/oracles' +import { + ERC20Mock, + FacadeWrite, + IAssetRegistry, + IERC20Metadata, + InvalidMockV3Aggregator, + MockV3Aggregator, + TestIBackingManager, + TestIBasketHandler, + TestICollateral, + TestIDeployer, + TestIMain, + TestIRevenueTrader, + TestIRToken, +} from '../../../typechain' import snapshotGasCost from '../../utils/snapshotGasCost' -import { IMPLEMENTATION, Implementation } from '../../fixtures' +import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../../fixtures' -// const describeFork = useEnv('FORK') ? describe : describe.skip const getDescribeFork = (targetNetwork = 'mainnet') => { return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip } @@ -56,6 +80,7 @@ export default function fn( itChecksTargetPerRefDefault, itChecksRefPerTokDefault, itChecksPriceChanges, + itChecksNonZeroDefaultThreshold, itHasRevenueHiding, itIsPricedByPeg, resetFork, @@ -105,6 +130,12 @@ export default function fn( ) }) + itChecksNonZeroDefaultThreshold('does not allow 0 defaultThreshold', async () => { + await expect(deployCollateral({ defaultThreshold: bn('0') })).to.be.revertedWith( + 'defaultThreshold zero' + ) + }) + describe('collateral-specific tests', collateralSpecificConstructorTests) }) @@ -286,28 +317,40 @@ export default function fn( expect(newHigh).to.be.gt(initHigh) }) - it('returns unpriced for 0-valued oracle', async () => { + it('decays for 0-valued oracle', async () => { + const initialPrice = await collateral.price() + // Set price of underlying to 0 const updateAnswerTx = await chainlinkFeed.updateAnswer(0) await updateAnswerTx.wait() - // (0, FIX_MAX) is returned + // Price remains same at first, though IFFY + await collateral.refresh() + await expectExactPrice(collateral.address, initialPrice) + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + + // After oracle timeout decay begins + const oracleTimeout = await collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(1 + oracleTimeout / 12) + await collateral.refresh() + await expectDecayedPrice(collateral.address) + + // After price timeout it becomes unpriced + const priceTimeout = await collateral.priceTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceBlocks(1 + priceTimeout / 12) await expectUnpriced(collateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to DISABLED await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) }) - it('reverts in case of invalid timestamp', async () => { + it('does not revert in case of invalid timestamp', async () => { await chainlinkFeed.setInvalidTimestamp() - // Check price of token - const [low, high] = await collateral.price() - expect(low).to.equal(0) - expect(high).to.equal(MAX_UINT192) - - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -319,14 +362,29 @@ export default function fn( }) // Should remain SOUND after a 1% decrease + let refPerTok = await ctx.collateral.refPerTok() await reduceRefPerTok(ctx, 1) // 1% decrease await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) + // refPerTok should be unchanged + expect(await ctx.collateral.refPerTok()).to.be.closeTo( + refPerTok, + refPerTok.div(bn('1e3')) + ) // within 1-part-in-1-thousand + // Should become DISABLED if drops more than that + refPerTok = await ctx.collateral.refPerTok() await reduceRefPerTok(ctx, 1) // another 1% decrease await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await ctx.collateral.refPerTok()).to.be.closeTo( + refPerTok, + refPerTok.div(bn('1e3')) + ) // within 1-part-in-1-thousand }) it('reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -361,29 +419,36 @@ export default function fn( expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('decays lotPrice over priceTimeout period', async () => { - // Prices should start out equal + it('decays price over priceTimeout period', async () => { await collateral.refresh() - const p = await collateral.price() - let lotP = await collateral.lotPrice() - expect(p.length).to.equal(lotP.length) - expect(p[0]).to.equal(lotP[0]) - expect(p[1]).to.equal(lotP[1]) + const savedLow = await collateral.savedLowPrice() + const savedHigh = await collateral.savedHighPrice() + // Price should start out at saved prices + let p = await collateral.price() + expect(p[0]).to.equal(savedLow) + expect(p[1]).to.equal(savedHigh) await advanceTime(await collateral.oracleTimeout()) // Should be roughly half, after half of priceTimeout const priceTimeout = await collateral.priceTimeout() await advanceTime(priceTimeout / 2) - lotP = await collateral.lotPrice() - expect(lotP[0]).to.be.closeTo(p[0].div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand - expect(lotP[1]).to.be.closeTo(p[1].div(2), p[1].div(2).div(10000)) // 1 part in 10 thousand + p = await collateral.price() + expect(p[0]).to.be.closeTo(savedLow.div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand + expect(p[1]).to.be.closeTo(savedHigh.mul(2), p[1].mul(2).div(10000)) // 1 part in 10 thousand - // Should be 0 after full priceTimeout + // Should be unpriced after full priceTimeout await advanceTime(priceTimeout / 2) - lotP = await collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + await expectUnpriced(collateral.address) + }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await collateral.lotPrice() + const price = await collateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) }) }) @@ -547,9 +612,9 @@ export default function fn( await advanceTime( (await collateral.priceTimeout()) + (await collateral.oracleTimeout()) ) - const lotP = await collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await collateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) }) itChecksRefPerTokDefault('after hard default', async () => { @@ -568,5 +633,368 @@ export default function fn( }) }) }) + + describe('integration tests', () => { + before(resetFork) + + let ctx: X + let owner: SignerWithAddress + let addr1: SignerWithAddress + + let chainId: number + + let defaultFixture: Fixture + + let supply: BigNumber + + // Tokens/Assets + let pairedColl: TestICollateral + let pairedERC20: ERC20Mock + let collateralERC20: IERC20Metadata + let collateral: TestICollateral + + // Core Contracts + let main: TestIMain + let rToken: TestIRToken + let assetRegistry: IAssetRegistry + let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler + let rTokenTrader: TestIRevenueTrader + + let deployer: TestIDeployer + let facadeWrite: FacadeWrite + let govParams: IGovParams + let govRoles: IGovRoles + + const config = { + dist: { + rTokenDist: bn(100), // 100% RToken + rsrDist: bn(0), // 0% RSR + }, + minTradeVolume: bn('0'), // $0 + rTokenMaxTradeVolume: MAX_UINT192, // +inf + shortFreeze: bn('259200'), // 3 days + longFreeze: bn('2592000'), // 30 days + rewardRatio: bn('1069671574938'), // approx. half life of 90 days + unstakingDelay: bn('1209600'), // 2 weeks + withdrawalLeak: fp('0'), // 0%; always refresh + warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) + tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) + batchAuctionLength: bn('900'), // 15 minutes + dutchAuctionLength: bn('1800'), // 30 minutes + backingBuffer: fp('0'), // 0% + maxTradeSlippage: fp('0.01'), // 1% + issuanceThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + redemptionThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + } + + interface IntegrationFixture { + ctx: X + protocol: DefaultFixture + } + + const integrationFixture: Fixture = + async function (): Promise { + return { + ctx: await loadFixture( + makeCollateralFixtureContext(owner, { maxTradeVolume: MAX_UINT192 }) + ), + protocol: await loadFixture(defaultFixture), + } + } + + before(async () => { + defaultFixture = await getDefaultFixture(collateralName) + chainId = await getChainId(hre) + if (useEnv('FORK_NETWORK').toLowerCase() === 'base') chainId = 8453 + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + ;[, owner, addr1] = await ethers.getSigners() + }) + + beforeEach(async () => { + let protocol: DefaultFixture + ;({ ctx, protocol } = await loadFixture(integrationFixture)) + ;({ collateral } = ctx) + ;({ deployer, facadeWrite, govParams } = protocol) + + supply = fp('1') + + // Create a paired collateral of the same targetName + pairedColl = await makePairedCollateral(await collateral.targetName()) + await pairedColl.refresh() + expect(await pairedColl.status()).to.equal(CollateralStatus.SOUND) + pairedERC20 = await ethers.getContractAt('ERC20Mock', await pairedColl.erc20()) + + // Prep collateral + collateralERC20 = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + await mintCollateralTo( + ctx, + toBNDecimals(fp('1'), await collateralERC20.decimals()), + addr1, + addr1.address + ) + + // Set primary basket + const rTokenSetup: IRTokenSetup = { + assets: [], + primaryBasket: [collateral.address, pairedColl.address], + weights: [fp('0.5e-4'), fp('0.5e-4')], + backups: [], + beneficiaries: [], + } + + // Deploy RToken via FacadeWrite + const receipt = await ( + await facadeWrite.connect(owner).deployRToken( + { + name: 'RTKN RToken', + symbol: 'RTKN', + mandate: 'mandate', + params: config, + }, + rTokenSetup + ) + ).wait() + + // Get Main + const mainAddr = expectInIndirectReceipt(receipt, deployer.interface, 'RTokenCreated').args + .main + main = await ethers.getContractAt('TestIMain', mainAddr) + + // Get core contracts + assetRegistry = ( + await ethers.getContractAt('IAssetRegistry', await main.assetRegistry()) + ) + backingManager = ( + await ethers.getContractAt('TestIBackingManager', await main.backingManager()) + ) + basketHandler = ( + await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) + ) + rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) + rTokenTrader = ( + await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) + ) + + // Set initial governance roles + govRoles = { + owner: owner.address, + guardian: ZERO_ADDRESS, + pausers: [], + shortFreezers: [], + longFreezers: [], + } + // Setup owner and unpause + await facadeWrite.connect(owner).setupGovernance( + rToken.address, + false, // do not deploy governance + true, // unpaused + govParams, // mock values, not relevant + govRoles + ) + + // Advance past warmup period + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) + ) + + // Should issue + await collateralERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await pairedERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await rToken.connect(addr1).issue(supply) + }) + + it('can be put into an RToken basket', async () => { + await assetRegistry.refresh() + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + }) + + it('issues', async () => { + // Issuance in beforeEach + expect(await rToken.totalSupply()).to.equal(supply) + }) + + it('redeems', async () => { + await rToken.connect(addr1).redeem(supply) + expect(await rToken.totalSupply()).to.equal(0) + const initialCollBal = toBNDecimals(fp('1'), await collateralERC20.decimals()) + expect(await collateralERC20.balanceOf(addr1.address)).to.be.closeTo( + initialCollBal, + initialCollBal.div(bn('1e5')) // 1-part-in-100k + ) + }) + + it('rebalances out of the collateral', async () => { + // Remove collateral from basket + await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) + await expect(basketHandler.connect(owner).refreshBasket()) + .to.emit(basketHandler, 'BasketSet') + .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() + ) + + // Run rebalancing auction + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) + .to.emit(backingManager, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, pairedERC20.address, anyValue, anyValue) + const tradeAddr = await backingManager.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(pairedERC20.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await pairedERC20.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + const pairedBal = await pairedERC20.balanceOf(backingManager.address) + await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) + expect(await backingManager.tradesOpen()).to.equal(0) + }) + + it('forwards revenue and sells in a revenue auction', async () => { + // Send excess collateral to the RToken trader via forwardRevenue() + const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) + await mintCollateralTo( + ctx, + mintAmt.gt('150') ? mintAmt : bn('150'), + addr1, + backingManager.address + ) + await backingManager.forwardRevenue([collateralERC20.address]) + expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) + + // Run revenue auction + await expect( + rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) + ) + .to.emit(rTokenTrader, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) + const tradeAddr = await rTokenTrader.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(rToken.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await rToken.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') + expect(await rTokenTrader.tradesOpen()).to.equal(0) + }) + + // === Integration Test Helpers === + + const makePairedCollateral = async (target: string): Promise => { + const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' + const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( + 'MockV3Aggregator' + ) + const chainlinkFeed: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + + if (target == ethers.utils.formatBytes32String('USD')) { + // USD + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + onBase ? networkConfig[chainId].tokens.USDbC! : networkConfig[chainId].tokens.USDC! + ) + const whale = onBase + ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' + : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' + await whileImpersonating(whale, async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'FiatCollateral' + ) + return await FiatCollateralFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }) + } else if (target == ethers.utils.formatBytes32String('ETH')) { + // ETH + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WETH! + ) + const whale = onBase + ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' + : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' + await whileImpersonating(whale, async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const SelfReferentialFactory: ContractFactory = await ethers.getContractFactory( + 'SelfReferentialCollateral' + ) + return await SelfReferentialFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0'), // 0% + delayUntilDefault: bn('0'), // 0, + }) + } else if (target == ethers.utils.formatBytes32String('BTC')) { + // No official WBTC on base yet + if (onBase) throw new Error('no WBTC on base') + // BTC + const targetUnitOracle: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WBTC! + ) + await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const NonFiatFactory: ContractFactory = await ethers.getContractFactory( + 'NonFiatCollateral' + ) + return await NonFiatFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + } else { + throw new Error(`Unknown target: ${target}`) + } + } + }) }) } diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 876b6e5e52..921b3f1bec 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -10,7 +10,13 @@ import { PRICE_TIMEOUT, REVENUE_HIDING, } from '../../../fixtures' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { + DefaultFixture, + Fixture, + getDefaultFixture, + ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, +} from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' import { @@ -22,7 +28,12 @@ import { IRTokenSetup, networkConfig, } from '../../../../common/configuration' -import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../../../common/constants' +import { + CollateralStatus, + MAX_UINT48, + MAX_UINT192, + ZERO_ADDRESS, +} from '../../../../common/constants' import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp, toBNDecimals } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' @@ -207,7 +218,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) @@ -230,7 +241,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -425,7 +436,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -461,7 +472,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -469,6 +480,24 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi REVENUE_HIDING ) ).to.be.revertedWith('referenceERC20Decimals missing') + + // defaultThreshold = 0 + await expect( + CTokenCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, + oracleError: ORACLE_ERROR, + erc20: cDaiVault.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: bn(0), + delayUntilDefault, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('defaultThreshold zero') }) }) @@ -666,10 +695,14 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - // Compound - await expectUnpriced(cDaiCollateral.address) + // Price is at saved prices + const savedLowPrice = await cDaiCollateral.savedLowPrice() + const savedHighPrice = await cDaiCollateral.savedHighPrice() + const p = await cDaiCollateral.price() + expect(p[0]).to.equal(savedLowPrice) + expect(p[1]).to.equal(savedHighPrice) // Refresh should mark status IFFY await cDaiCollateral.refresh() @@ -685,7 +718,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -710,7 +743,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -727,6 +760,15 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await zeropriceCtokenCollateral.refresh() expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await cDaiCollateral.lotPrice() + const price = await cDaiCollateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) + }) }) // Note: Here the idea is to test all possible statuses and check all possible paths to default @@ -1054,9 +1096,9 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime( (await cDaiCollateral.priceTimeout()) + (await cDaiCollateral.oracleTimeout()) ) - const lotP = await cDaiCollateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await cDaiCollateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) await snapshotGasCost(cDaiCollateral.refresh()) await snapshotGasCost(cDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index b0874c79c7..23638304fb 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 transfer exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 transfer 2`] = `173113`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119361`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119350`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117692`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117681`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76242`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76220`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68560`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68538`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119361`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119350`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117692`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117681`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138781`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138759`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138707`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138685`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139858`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139836`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139858`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139836`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175004`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174982`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139061`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139039`; diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 45f9e0cc8e..7c91bd2064 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -22,6 +22,7 @@ import { CometMock__factory, TestICollateral, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { MAX_UINT48 } from '../../../../common/constants' import { expect } from 'chai' @@ -119,6 +120,9 @@ export const deployCollateral = async ( ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -353,6 +357,7 @@ const collateralSpecificStatusTests = () => { }) // Should remain SOUND after a 1% decrease + let refPerTok = await collateral.refPerTok() let currentExchangeRate = await wcusdcV3Mock.exchangeRate() await wcusdcV3Mock.setMockExchangeRate( true, @@ -361,7 +366,11 @@ const collateralSpecificStatusTests = () => { await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + // refPerTok should be unchanged + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand + // Should become DISABLED if drops more than that + refPerTok = await collateral.refPerTok() currentExchangeRate = await wcusdcV3Mock.exchangeRate() await wcusdcV3Mock.setMockExchangeRate( true, @@ -369,6 +378,10 @@ const collateralSpecificStatusTests = () => { ) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) } @@ -396,6 +409,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemented in this file itIsPricedByPeg: true, resetFork, diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index cbbd48ed43..7e4d782570 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -103,12 +103,43 @@ describeFork('Wrapped CUSDCv3', () => { expect(await wcusdcV3.balanceOf(don.address)).to.eq(expectedAmount) }) + it('checks for correct approval on deposit - regression test', async () => { + await expect( + wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) + ).revertedWithCustomError(wcusdcV3, 'Unauthorized') + + // Provide approval on the wrapper + await wcusdcV3.connect(bob).allow(don.address, true) + + const expectedAmount = await wcusdcV3.convertDynamicToStatic( + await cusdcV3.balanceOf(bob.address) + ) + + // This should fail even when bob approved wcusdcv3 to spend his tokens, + // because there is no explicit approval of cUSDCv3 from bob to don, only + // approval on the wrapper + await expect( + wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) + ).to.be.revertedWithCustomError(cusdcV3, 'Unauthorized') + + // Add explicit approval of cUSDCv3 and retry + await cusdcV3.connect(bob).allow(don.address, true) + await wcusdcV3 + .connect(don) + .depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) + + expect(await wcusdcV3.balanceOf(bob.address)).to.eq(0) + expect(await wcusdcV3.balanceOf(charles.address)).to.eq(expectedAmount) + }) + it('deposits from a different account', async () => { expect(await wcusdcV3.balanceOf(charles.address)).to.eq(0) await expect( wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) ).revertedWithCustomError(wcusdcV3, 'Unauthorized') - await wcusdcV3.connect(bob).connect(bob).allow(don.address, true) + + // Approval has to be on cUsdcV3, not the wrapper + await cusdcV3.connect(bob).allow(don.address, true) const expectedAmount = await wcusdcV3.convertDynamicToStatic( await cusdcV3.balanceOf(bob.address) ) @@ -623,6 +654,44 @@ describeFork('Wrapped CUSDCv3', () => { expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(0) }) + it('caps at balance to avoid reverts when claiming rewards (claimTo)', async () => { + const compToken = await ethers.getContractAt('ERC20Mock', COMP) + expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) + await advanceTime(1000) + await enableRewardsAccrual(cusdcV3) + + // Accrue multiple times + for (let i = 0; i < 10; i++) { + await advanceTime(1000) + await wcusdcV3.accrue() + } + + // Get rewards from Comet + const cometRewards = await ethers.getContractAt('ICometRewards', REWARDS) + await whileImpersonating(wcusdcV3.address, async (signer) => { + await cometRewards + .connect(signer) + .claimTo(cusdcV3.address, wcusdcV3.address, wcusdcV3.address, true) + }) + + // Accrue individual account + await wcusdcV3.accrueAccount(bob.address) + + // Due to rounding, balance is smaller that owed + const owed = await wcusdcV3.getRewardOwed(bob.address) + const bal = await compToken.balanceOf(wcusdcV3.address) + expect(owed).to.be.greaterThan(bal) + + // Should still be able to claimTo (caps at balance) + const balanceBobPrev = await compToken.balanceOf(bob.address) + await expect(wcusdcV3.connect(bob).claimTo(bob.address, bob.address)).to.emit( + wcusdcV3, + 'RewardsClaimed' + ) + + expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(balanceBobPrev) + }) + it('claims rewards and sends to claimer (claimRewards)', async () => { const compToken = await ethers.getContractAt('ERC20Mock', COMP) expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index a899da3b86..d2dee358c6 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting ERC20 exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `90521`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109063`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109052`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104326`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104315`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134471`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134449`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126788`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126766`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109063`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109052`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104326`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104315`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107053`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `132572`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103985`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `126704`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126785`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126763`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126785`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126763`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134336`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134314`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127067`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127045`; diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 2cd38cd51e..1e4fe95ab9 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -4,29 +4,67 @@ import { CurveCollateralTestSuiteFixtures, } from './pluginTestTypes' import { CollateralStatus } from '../pluginTestTypes' -import { ethers } from 'hardhat' -import { ERC20Mock, InvalidMockV3Aggregator } from '../../../../typechain' -import { BigNumber } from 'ethers' -import { bn, fp } from '../../../../common/numbers' -import { MAX_UINT48, ZERO_ADDRESS, ONE_ADDRESS } from '../../../../common/constants' +import hre, { ethers } from 'hardhat' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { BigNumber, ContractFactory } from 'ethers' +import { getChainId } from '../../../../common/blockchain-utils' +import { bn, fp, toBNDecimals } from '../../../../common/numbers' +import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { expectInIndirectReceipt } from '../../../../common/events' +import { whileImpersonating } from '../../../utils/impersonation' +import { + MAX_UINT48, + MAX_UINT192, + MAX_UINT256, + TradeKind, + ZERO_ADDRESS, + ONE_ADDRESS, +} from '../../../../common/constants' import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { useEnv } from '#/utils/env' -import { expectUnpriced } from '../../../utils/oracles' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../utils/oracles' +import { + IGovParams, + IGovRoles, + IRTokenSetup, + networkConfig, +} from '../../../../common/configuration' import { advanceBlocks, advanceTime, + getLatestBlockNumber, getLatestBlockTimestamp, setNextBlockTimestamp, } from '#/test/utils/time' +import { + ERC20Mock, + FacadeWrite, + IAssetRegistry, + IERC20Metadata, + InvalidMockV3Aggregator, + MockV3Aggregator, + TestIBackingManager, + TestIBasketHandler, + TestICollateral, + TestIDeployer, + TestIMain, + TestIRevenueTrader, + TestIRToken, +} from '../../../../typechain' import snapshotGasCost from '../../../utils/snapshotGasCost' -import { IMPLEMENTATION, Implementation } from '../../../fixtures' +import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../../../fixtures' const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip const describeFork = useEnv('FORK') ? describe : describe.skip +const getDescribeFork = (targetNetwork = 'mainnet') => { + return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip +} + export default function fn( fixtures: CurveCollateralTestSuiteFixtures ) { @@ -392,29 +430,49 @@ export default function fn( } }) - it('returns unpriced for 0-valued oracle', async () => { + it('decays for 0-valued oracle', async () => { + const initialPrice = await ctx.collateral.price() + + // Set price of underlyings to 0 for (const feed of ctx.feeds) { await feed.updateAnswer(0).then((e) => e.wait()) } - // (0, FIX_MAX) is returned + // Price remains same at first, though IFFY + await ctx.collateral.refresh() + await expectExactPrice(ctx.collateral.address, initialPrice) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + + // After oracle timeout decay begins + const oracleTimeout = await ctx.collateral.oracleTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceBlocks(1 + oracleTimeout / 12) + await ctx.collateral.refresh() + await expectDecayedPrice(ctx.collateral.address) + + // After price timeout it becomes unpriced + const priceTimeout = await ctx.collateral.priceTimeout() + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceBlocks(1 + priceTimeout / 12) await expectUnpriced(ctx.collateral.address) - // When refreshed, sets status to Unpriced + // When refreshed, sets status to DISABLED await ctx.collateral.refresh() - expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) }) it('does not revert in case of invalid timestamp', async () => { await ctx.feeds[0].setInvalidTimestamp() - // When refreshed, sets status to Unpriced + // When refreshed, sets status to IFFY await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Handles stale price', async () => { - await advanceTime(await ctx.collateral.priceTimeout()) + it('handles stale price', async () => { + await advanceTime( + (await ctx.collateral.oracleTimeout()) + (await ctx.collateral.priceTimeout()) + ) // (0, FIX_MAX) is returned await expectUnpriced(ctx.collateral.address) @@ -424,28 +482,36 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('decays lotPrice over priceTimeout period', async () => { - // Prices should start out equal - const p = await ctx.collateral.price() - let lotP = await ctx.collateral.lotPrice() - expect(p.length).to.equal(lotP.length) - expect(p[0]).to.equal(lotP[0]) - expect(p[1]).to.equal(lotP[1]) + it('decays price over priceTimeout period', async () => { + const savedLow = await ctx.collateral.savedLowPrice() + const savedHigh = await ctx.collateral.savedHighPrice() + // Price should start out at saved prices + await ctx.collateral.refresh() + let p = await ctx.collateral.price() + expect(p[0]).to.equal(savedLow) + expect(p[1]).to.equal(savedHigh) await advanceTime(await ctx.collateral.oracleTimeout()) // Should be roughly half, after half of priceTimeout const priceTimeout = await ctx.collateral.priceTimeout() await advanceTime(priceTimeout / 2) - lotP = await ctx.collateral.lotPrice() - expect(lotP[0]).to.be.closeTo(p[0].div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand - expect(lotP[1]).to.be.closeTo(p[1].div(2), p[1].div(2).div(10000)) // 1 part in 10 thousand + p = await ctx.collateral.price() + expect(p[0]).to.be.closeTo(savedLow.div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand + expect(p[1]).to.be.closeTo(savedHigh.mul(2), p[1].mul(2).div(10000)) // 1 part in 10 thousand // Should be 0 after full priceTimeout await advanceTime(priceTimeout / 2) - lotP = await ctx.collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + await expectUnpriced(ctx.collateral.address) + }) + + it('lotPrice (deprecated) is equal to price()', async () => { + const lotPrice = await ctx.collateral.lotPrice() + const price = await ctx.collateral.price() + expect(price.length).to.equal(2) + expect(lotPrice.length).to.equal(price.length) + expect(lotPrice[0]).to.equal(price[0]) + expect(lotPrice[1]).to.equal(price[1]) }) }) @@ -617,7 +683,8 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // Decrease refPerTok by nearly 1 part in a million + // Decrease refPerTok by 1 part in a million + const refPerTok = await ctx.collateral.refPerTok() const currentExchangeRate = await ctx.curvePool.get_virtual_price() const newVirtualPrice = currentExchangeRate.sub(currentExchangeRate.div(bn('1e6'))).add(2) await ctx.curvePool.setVirtualPrice(newVirtualPrice) @@ -635,6 +702,9 @@ export default function fn( await expect(ctx.collateral.refresh()).to.emit(ctx.collateral, 'CollateralStatusChanged') expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) + + // refPerTok should have fallen exactly 2e-18 + expect(await ctx.collateral.refPerTok()).to.equal(refPerTok.sub(2)) }) describe('collateral-specific tests', collateralSpecificStatusTests) @@ -684,9 +754,9 @@ export default function fn( await advanceTime( (await ctx.collateral.priceTimeout()) + (await ctx.collateral.oracleTimeout()) ) - const lotP = await ctx.collateral.lotPrice() - expect(lotP[0]).to.equal(0) - expect(lotP[1]).to.equal(0) + const p = await ctx.collateral.price() + expect(p[0]).to.equal(0) + expect(p[1]).to.equal(MAX_UINT192) }) it('after hard default', async () => { @@ -708,5 +778,360 @@ export default function fn( }) }) }) + + // Only run full protocol integration tests on mainnet + // Protocol integration fixture not currently set up to deploy onto base + getDescribeFork('mainnet')('integration tests', () => { + before(resetFork) + + let ctx: X + let owner: SignerWithAddress + let addr1: SignerWithAddress + + let chainId: number + + let defaultFixture: Fixture + + let supply: BigNumber + + // Tokens/Assets + let pairedColl: TestICollateral + let pairedERC20: ERC20Mock + let collateralERC20: IERC20Metadata + let collateral: TestICollateral + + // Core Contracts + let main: TestIMain + let rToken: TestIRToken + let assetRegistry: IAssetRegistry + let backingManager: TestIBackingManager + let basketHandler: TestIBasketHandler + let rTokenTrader: TestIRevenueTrader + + let deployer: TestIDeployer + let facadeWrite: FacadeWrite + let govParams: IGovParams + let govRoles: IGovRoles + + const config = { + dist: { + rTokenDist: bn(100), // 100% RToken + rsrDist: bn(0), // 0% RSR + }, + minTradeVolume: bn('0'), // $0 + rTokenMaxTradeVolume: MAX_UINT192, // +inf + shortFreeze: bn('259200'), // 3 days + longFreeze: bn('2592000'), // 30 days + rewardRatio: bn('1069671574938'), // approx. half life of 90 days + unstakingDelay: bn('1209600'), // 2 weeks + withdrawalLeak: fp('0'), // 0%; always refresh + warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) + tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) + batchAuctionLength: bn('900'), // 15 minutes + dutchAuctionLength: bn('1800'), // 30 minutes + backingBuffer: fp('0'), // 0% + maxTradeSlippage: fp('0.01'), // 1% + issuanceThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + redemptionThrottle: { + amtRate: fp('1e6'), // 1M RToken + pctRate: fp('0.05'), // 5% + }, + } + + interface IntegrationFixture { + ctx: X + protocol: DefaultFixture + } + + const integrationFixture: Fixture = + async function (): Promise { + return { + ctx: await loadFixture( + makeCollateralFixtureContext(owner, { maxTradeVolume: MAX_UINT192 }) + ), + protocol: await loadFixture(defaultFixture), + } + } + + before(async () => { + defaultFixture = await getDefaultFixture(collateralName) + chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + ;[, owner, addr1] = await ethers.getSigners() + }) + + beforeEach(async () => { + let protocol: DefaultFixture + ;({ ctx, protocol } = await loadFixture(integrationFixture)) + ;({ collateral } = ctx) + ;({ deployer, facadeWrite, govParams } = protocol) + + supply = fp('1') + + // Create a paired collateral of the same targetName + pairedColl = await makePairedCollateral(await collateral.targetName()) + await pairedColl.refresh() + expect(await pairedColl.status()).to.equal(CollateralStatus.SOUND) + pairedERC20 = await ethers.getContractAt('ERC20Mock', await pairedColl.erc20()) + + // Prep collateral + collateralERC20 = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + await mintCollateralTo( + ctx, + toBNDecimals(fp('1'), await collateralERC20.decimals()), + addr1, + addr1.address + ) + + // Set primary basket + const rTokenSetup: IRTokenSetup = { + assets: [], + primaryBasket: [collateral.address, pairedColl.address], + weights: [fp('0.5e-4'), fp('0.5e-4')], + backups: [], + beneficiaries: [], + } + + // Deploy RToken via FacadeWrite + const receipt = await ( + await facadeWrite.connect(owner).deployRToken( + { + name: 'RTKN RToken', + symbol: 'RTKN', + mandate: 'mandate', + params: config, + }, + rTokenSetup + ) + ).wait() + + // Get Main + const mainAddr = expectInIndirectReceipt(receipt, deployer.interface, 'RTokenCreated').args + .main + main = await ethers.getContractAt('TestIMain', mainAddr) + + // Get core contracts + assetRegistry = ( + await ethers.getContractAt('IAssetRegistry', await main.assetRegistry()) + ) + backingManager = ( + await ethers.getContractAt('TestIBackingManager', await main.backingManager()) + ) + basketHandler = ( + await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) + ) + rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) + rTokenTrader = ( + await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) + ) + + // Set initial governance roles + govRoles = { + owner: owner.address, + guardian: ZERO_ADDRESS, + pausers: [], + shortFreezers: [], + longFreezers: [], + } + // Setup owner and unpause + await facadeWrite.connect(owner).setupGovernance( + rToken.address, + false, // do not deploy governance + true, // unpaused + govParams, // mock values, not relevant + govRoles + ) + + // Advance past warmup period + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) + ) + + // Should issue + await collateralERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await pairedERC20.connect(addr1).approve(rToken.address, MAX_UINT256) + await rToken.connect(addr1).issue(supply) + }) + + it('can be put into an RToken basket', async () => { + await assetRegistry.refresh() + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + }) + + it('issues', async () => { + // Issuance in beforeEach + expect(await rToken.totalSupply()).to.equal(supply) + }) + + it('redeems', async () => { + await rToken.connect(addr1).redeem(supply) + expect(await rToken.totalSupply()).to.equal(0) + const initialCollBal = toBNDecimals(fp('1'), await collateralERC20.decimals()) + expect(await collateralERC20.balanceOf(addr1.address)).to.be.closeTo( + initialCollBal, + initialCollBal.div(bn('1e5')) // 1-part-in-100k + ) + }) + + it('rebalances out of the collateral', async () => { + // Remove collateral from basket + await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) + await expect(basketHandler.connect(owner).refreshBasket()) + .to.emit(basketHandler, 'BasketSet') + .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) + await setNextBlockTimestamp( + (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() + ) + + // Run rebalancing auction + await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) + .to.emit(backingManager, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, pairedERC20.address, anyValue, anyValue) + const tradeAddr = await backingManager.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(pairedERC20.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await pairedERC20.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + const pairedBal = await pairedERC20.balanceOf(backingManager.address) + await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') + expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) + expect(await backingManager.tradesOpen()).to.equal(0) + }) + + it('forwards revenue and sells in a revenue auction', async () => { + // Send excess collateral to the RToken trader via forwardRevenue() + const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) + await mintCollateralTo( + ctx, + mintAmt.gt('150') ? mintAmt : bn('150'), + addr1, + backingManager.address + ) + await backingManager.forwardRevenue([collateralERC20.address]) + expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) + + // Run revenue auction + await expect( + rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) + ) + .to.emit(rTokenTrader, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) + const tradeAddr = await rTokenTrader.trades(collateralERC20.address) + expect(tradeAddr).to.not.equal(ZERO_ADDRESS) + const trade = await ethers.getContractAt('DutchTrade', tradeAddr) + expect(await trade.sell()).to.equal(collateralERC20.address) + expect(await trade.buy()).to.equal(rToken.address) + const buyAmt = await trade.bidAmount(await trade.endBlock()) + await rToken.connect(addr1).approve(trade.address, buyAmt) + await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') + expect(await rTokenTrader.tradesOpen()).to.equal(0) + }) + + // === Integration Test Helpers === + + const makePairedCollateral = async (target: string): Promise => { + const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( + 'MockV3Aggregator' + ) + const chainlinkFeed: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + + if (target == ethers.utils.formatBytes32String('USD')) { + // USD + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.USDC! + ) + await whileImpersonating('0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'FiatCollateral' + ) + return await FiatCollateralFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }) + } else if (target == ethers.utils.formatBytes32String('ETH')) { + // ETH + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WETH! + ) + await whileImpersonating('0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const SelfReferentialFactory: ContractFactory = await ethers.getContractFactory( + 'SelfReferentialCollateral' + ) + return await SelfReferentialFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0'), // 0% + delayUntilDefault: bn('0'), // 0, + }) + } else if (target == ethers.utils.formatBytes32String('BTC')) { + // BTC + const targetUnitOracle: MockV3Aggregator = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + const erc20 = await ethers.getContractAt( + 'IERC20Metadata', + networkConfig[chainId].tokens.WBTC! + ) + await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { + await erc20 + .connect(signer) + .transfer(addr1.address, await erc20.balanceOf(signer.address)) + }) + const NonFiatFactory: ContractFactory = await ethers.getContractFactory( + 'NonFiatCollateral' + ) + return await NonFiatFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UINT192, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01'), // 1% + delayUntilDefault: bn('86400'), // 24h, + }, + targetUnitOracle.address, + ORACLE_TIMEOUT + ) + } else { + throw new Error(`Unknown target: ${target}`) + } + } + }) }) } diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index 3ff406f171..bbabc4c8aa 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -7,13 +7,14 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' -import { expectUnpriced } from '../../../../utils/oracles' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, } from '../../../../../typechain' +import { advanceTime } from '../../../../utils/time' import { bn } from '../../../../../common/numbers' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' @@ -227,17 +228,53 @@ const collateralSpecificStatusTests = () => { // Set RTokenAsset to unpriced // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset await mockRTokenAsset.setPrice(0, MAX_UINT192) + await expectExactPrice(collateral.address, initialPrice) + + // Should decay after oracle timeout + await advanceTime(await collateral.oracleTimeout()) + await expectDecayedPrice(collateral.address) + + // Should be unpriced after price timeout + await advanceTime(await collateral.priceTimeout()) + await expectUnpriced(collateral.address) // refresh() should not revert await collateral.refresh() + }) - // Should be unpriced - await expectUnpriced(collateral.address) + it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out eUSD's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + eUSD, + bn('1'), // unused + bn('1') // unused + ) + const eUSDAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { + await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset price to stale + await mockRTokenAsset.setStale(true) + expect(await mockRTokenAsset.stale()).to.be.true + + // Refresh CurveStableRTokenMetapoolCollateral + await collateral.refresh() - // Lot price should be initial price - const lotP = await collateral.lotPrice() - expect(lotP[0]).to.eq(initialPrice[0]) - expect(lotP[1]).to.eq(initialPrice[1]) + // Stale should be false again + expect(await mockRTokenAsset.stale()).to.be.false }) } diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index ea00035779..4e3d02729f 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collatera exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `360937`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251771`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246889`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `79713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `79713`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254482`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247214`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index 7c535da1b7..b1bc4df8a7 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper col exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `385743`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480752`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589926`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478768`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474226`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544663`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713211`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713581`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701051`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693709`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index 5f891c6870..ffa84bf243 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functi exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `369452`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199560`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194678`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194675`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194675`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181820`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174552`; diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 5abe5c1ec6..9000295bb8 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -7,13 +7,14 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' -import { expectUnpriced } from '../../../../utils/oracles' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, } from '../../../../../typechain' +import { advanceTime } from '../../../../utils/time' import { bn } from '../../../../../common/numbers' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' @@ -229,17 +230,53 @@ const collateralSpecificStatusTests = () => { // Set RTokenAsset to unpriced // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset await mockRTokenAsset.setPrice(0, MAX_UINT192) + await expectExactPrice(collateral.address, initialPrice) + + // Should decay after oracle timeout + await advanceTime(await collateral.oracleTimeout()) + await expectDecayedPrice(collateral.address) + + // Should be unpriced after price timeout + await advanceTime(await collateral.priceTimeout()) + await expectUnpriced(collateral.address) // refresh() should not revert await collateral.refresh() + }) - // Should be unpriced - await expectUnpriced(collateral.address) + it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out eUSD's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + eUSD, + bn('1'), // unused + bn('1') // unused + ) + const eUSDAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { + await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset price to stale + await mockRTokenAsset.setStale(true) + expect(await mockRTokenAsset.stale()).to.be.true + + // Refresh CurveStableRTokenMetapoolCollateral + await collateral.refresh() - // Lot price should be initial price - const lotP = await collateral.lotPrice() - expect(lotP[0]).to.eq(initialPrice[0]) - expect(lotP[1]).to.eq(initialPrice[1]) + // Stale should be false again + expect(await mockRTokenAsset.stale()).to.be.false }) } diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index c86ae829d6..8cbdd58345 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -9,7 +9,6 @@ import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { ERC20Mock, - IERC20, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -43,7 +42,6 @@ import { CRV, THREE_POOL_HOLDER, } from '../constants' -import { whileImpersonating } from '#/test/utils/impersonation' type Fixture = () => Promise @@ -413,53 +411,6 @@ const collateralSpecificStatusTests = () => { const finalRefPerTok = await multiFeedCollateral.refPerTok() expect(finalRefPerTok).to.equal(initialRefPerTok) }) - - it('handles shutdown correctly', async () => { - const fix = await makeW3PoolStable() - const [, alice, bob] = await ethers.getSigners() - const amount = fp('100') - const rewardPerBlock = bn('83197823300') - - const lpToken = ( - await ethers.getContractAt( - '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', - await fix.wrapper.curveToken() - ) - ) - const CRV = ( - await ethers.getContractAt( - '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', - '0xD533a949740bb3306d119CC777fa900bA034cd52' - ) - ) - await whileImpersonating(THREE_POOL_HOLDER, async (signer) => { - await lpToken.connect(signer).transfer(alice.address, amount.mul(2)) - }) - - await lpToken.connect(alice).approve(fix.wrapper.address, ethers.constants.MaxUint256) - await fix.wrapper.connect(alice).deposit(amount, alice.address) - - // let's shutdown! - await fix.wrapper.shutdown() - - const prevBalance = await CRV.balanceOf(alice.address) - await fix.wrapper.connect(alice).claimRewards() - expect(await CRV.balanceOf(alice.address)).to.be.eq(prevBalance.add(rewardPerBlock)) - - const prevBalanceBob = await CRV.balanceOf(bob.address) - - // transfer to bob - await fix.wrapper - .connect(alice) - .transfer(bob.address, await fix.wrapper.balanceOf(alice.address)) - - await fix.wrapper.connect(bob).claimRewards() - expect(await CRV.balanceOf(bob.address)).to.be.eq(prevBalanceBob.add(rewardPerBlock)) - - await expect(fix.wrapper.connect(alice).deposit(amount, alice.address)).to.be.reverted - await expect(fix.wrapper.connect(bob).withdraw(await fix.wrapper.balanceOf(bob.address))).to.not - .be.reverted - }) } /* diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 7ccdd8462f..7920079d2a 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collat exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `172551`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251771`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246889`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `79713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `79713`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246886`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254482`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247214`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index d4975bf94d..876202c6a6 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `175188`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480900`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589778`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478546`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474004`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544811`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713433`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713507`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701125`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693635`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index 20e9558ee6..80285bbb17 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral fun exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `123705`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199560`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194678`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194675`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194675`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181820`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174552`; diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index 77081254f6..a3bfbb93dc 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -71,14 +71,8 @@ export const makeW3PoolStable = async (): Promise => ) await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) - // Deploy external cvxMining lib - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - const cvxMining = await CvxMiningFactory.deploy() - // Deploy Wrapper - const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: cvxMining.address }, - }) + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wrapper = await wrapperFactory.deploy() await wrapper.initialize(THREE_POOL_CVX_POOL_ID) @@ -124,14 +118,8 @@ export const makeWSUSDPoolStable = async (): Promise => { await realMetapool.balanceOf(MIM_THREE_POOL_HOLDER) ) - // Deploy external cvxMining lib - const CvxMiningFactory = await ethers.getContractFactory('CvxMining') - const cvxMining = await CvxMiningFactory.deploy() - // Deploy Wrapper - const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { - libraries: { CvxMining: cvxMining.address }, - }) + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await wrapperFactory.deploy() await wPool.initialize(MIM_THREE_POOL_POOL_ID) diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 7ee5c7dc01..4d539a4a25 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -12,6 +12,7 @@ import { PotMock, TestICollateral, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -69,6 +70,10 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise = () => Promise @@ -39,8 +42,7 @@ interface RSRFixture { rsr: ERC20Mock } -async function rsrFixture(): Promise { - const chainId = await getChainId(hre) +async function rsrFixture(chainId: number): Promise { const rsr: ERC20Mock = ( await ethers.getContractAt('ERC20Mock', networkConfig[chainId].tokens.RSR || '') ) @@ -72,9 +74,10 @@ export interface DefaultFixture extends RSRAndModuleFixture { export const getDefaultFixture = async function (salt: string) { const defaultFixture: Fixture = async function (): Promise { - const { rsr } = await rsrFixture() + let chainId = await getChainId(hre) + if (useEnv('FORK_NETWORK').toLowerCase() == 'base') chainId = 8453 + const { rsr } = await rsrFixture(chainId) const { gnosis } = await gnosisFixture() - const chainId = await getChainId(hre) if (!networkConfig[chainId]) { throw new Error(`Missing network configuration for ${hre.network.name}`) } diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index 8d0a4fe8e3..ea7c5554f2 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -9,6 +9,7 @@ import { MockV3Aggregator__factory, TestICollateral, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' @@ -128,6 +129,9 @@ all.forEach((curr: FTokenEnumeration) => { ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -252,6 +256,7 @@ all.forEach((curr: FTokenEnumeration) => { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: curr.testName, diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index b11dbcda01..da1cb92e3a 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -4,110 +4,110 @@ exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting ERC2 exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117361`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117350`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115692`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115681`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140981`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140959`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139167`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139145`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117361`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117350`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115692`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115681`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115338`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `139157`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115338`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `139083`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139177`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139155`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139177`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139155`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141202`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141106`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139459`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139511`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117553`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117542`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115884`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115873`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141237`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141215`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139423`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139401`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117553`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117542`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115884`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115873`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115530`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `139413`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115530`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `139339`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139433`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139411`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139433`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139411`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141458`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141362`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139789`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139693`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125843`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125832`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124174`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150019`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149997`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148135`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148183`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125843`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125832`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124174`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124163`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123820`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `148121`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123820`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `148121`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148215`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148193`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148145`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148193`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150096`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150074`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148427`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148475`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120491`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120480`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118822`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118811`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144383`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144361`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142569`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142477`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120491`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120480`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118822`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118811`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118468`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `142485`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118468`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `142415`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142579`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142487`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142509`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142557`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144530`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144438`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142861`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142839`; diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index d47e23919f..7ac77c01d1 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -12,6 +12,7 @@ import { TestICollateral, IsfrxEth, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { CollateralStatus } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -84,6 +85,10 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise {} // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => { - it('does revenue hiding', async () => { + it('does revenue hiding correctly', async () => { const MockFactory = await ethers.getContractFactory('SfraxEthMock') const erc20 = (await MockFactory.deploy()) as SfraxEthMock let currentPPS = await (await ethers.getContractAt('IsfrxEth', SFRX_ETH)).pricePerShare() @@ -210,14 +215,24 @@ const collateralSpecificStatusTests = () => { }) // Should remain SOUND after a 1% decrease - await erc20.setPricePerShare(currentPPS.sub(currentPPS.div(100))) + let refPerTok = await collateral.refPerTok() + const newPPS = currentPPS.sub(currentPPS.div(100)) + await erc20.setPricePerShare(newPPS) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - // Should become DISABLED if drops more than that - await erc20.setPricePerShare(currentPPS.sub(currentPPS.div(99))) + // refPerTok should be unchanged + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand + + // Should become DISABLED if drops another 1% + refPerTok = await collateral.refPerTok() + await erc20.setPricePerShare(newPPS.sub(newPPS.div(100))) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) } @@ -244,6 +259,7 @@ const opts = { itChecksTargetPerRefDefault: it.skip, itChecksRefPerTokDefault: it.skip, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemnted in this file resetFork, collateralName: 'SFraxEthCollateral', diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index 30de100fa3..58a27e8317 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -4,14 +4,14 @@ exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting E exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `34204`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58995`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58984`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54258`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54247`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59695`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59684`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58026`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58015`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73831`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73809`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73831`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73809`; diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index cf4038f9aa..43d09c95be 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,6 +193,7 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, + itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it.skip, diff --git a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts index 94593665b0..1f4213ac61 100644 --- a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts @@ -12,6 +12,7 @@ import { TestICollateral, IWSTETH, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -91,6 +92,11 @@ export const deployCollateral = async ( opts.targetPerRefChainlinkTimeout, { gasLimit: 2000000000 } ) + + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + await pushOracleForward(opts.targetPerRefChainlinkFeed!) + await collateral.deployed() // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible @@ -261,6 +267,7 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: 'LidoStakedETH', diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index dab42bfd76..7abbfa8057 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting ERC20 exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting ERC20 transfer 2`] = `34564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88044`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88033`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83575`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132898`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132876`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125215`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125193`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88044`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88033`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83575`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83234`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83223`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83234`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83223`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125212`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125190`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125212`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125190`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129963`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129941`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125494`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125472`; diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index 6ecee49770..5ffecb6582 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -10,6 +10,7 @@ import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' import { CollateralOpts } from '../pluginTestTypes' +import { pushOracleForward } from '../../../utils/oracles' import { DEFAULT_THRESHOLD, DELAY_UNTIL_DEFAULT, @@ -23,7 +24,7 @@ import { MorphoAaveCollateralFixtureContext, mintCollateralTo } from './mintColl import { setCode } from '@nomicfoundation/hardhat-network-helpers' import { whileImpersonating } from '#/utils/impersonation' import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' -import { formatEther } from 'ethers/lib/utils' +import { advanceBlocks, advanceTime } from '#/utils/time' interface MAFiatCollateralOpts extends CollateralOpts { underlyingToken?: string @@ -34,7 +35,8 @@ interface MAFiatCollateralOpts extends CollateralOpts { const makeAaveFiatCollateralTestSuite = ( collateralName: string, - defaultCollateralOpts: MAFiatCollateralOpts + defaultCollateralOpts: MAFiatCollateralOpts, + specificTests = false ) => { const networkConfigToUse = networkConfig[31337] const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { @@ -52,7 +54,6 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) opts.erc20 = wrapperMock.address @@ -75,6 +76,9 @@ const makeAaveFiatCollateralTestSuite = ( ) await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + await expect(collateral.refresh()) return collateral @@ -99,7 +103,6 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) @@ -193,7 +196,9 @@ const makeAaveFiatCollateralTestSuite = ( */ const collateralSpecificConstructorTests = () => { it('tokenised deposits can correctly claim rewards', async () => { - const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' + const alice = hre.ethers.provider.getSigner(1) + const aliceAddress = await alice.getAddress() + const forkBlock = 17574117 const claimer = '0x05e818959c2Aa4CD05EDAe9A099c38e7Bdc377C6' const reset = getResetFork(forkBlock) @@ -206,42 +211,41 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: defaultCollateralOpts.underlyingToken!, poolToken: defaultCollateralOpts.poolToken!, - rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) + + const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' const vaultCode = await ethers.provider.getCode(usdtVault.address) await setCode(claimer, vaultCode) const vaultWithClaimableRewards = usdtVault.attach(claimer) + await whileImpersonating(hre, morphoTokenOwner, async (signer) => { + const morphoTokenInst = await ethers.getContractAt( + 'IMorphoToken', + networkConfigToUse.tokens.MORPHO!, + signer + ) + + await morphoTokenInst + .connect(signer) + .setUserRole(vaultWithClaimableRewards.address, 0, true) + }) const erc20Factory = await ethers.getContractFactory('ERC20Mock') const underlyingERC20 = erc20Factory.attach(defaultCollateralOpts.underlyingToken!) const depositAmount = utils.parseUnits('1000', 6) - const user = hre.ethers.provider.getSigner(0) - const userAddress = await user.getAddress() - - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('0.0') - await whileImpersonating( hre, whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], async (whaleSigner) => { - await underlyingERC20.connect(whaleSigner).approve(vaultWithClaimableRewards.address, 0) - await underlyingERC20 - .connect(whaleSigner) - .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) - await vaultWithClaimableRewards.connect(whaleSigner).mint(depositAmount, userAddress) + await underlyingERC20.connect(whaleSigner).transfer(aliceAddress, depositAmount) } ) - - expect( - formatEther( - await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) - ).slice(0, '8.60295466891613'.length) - ).to.be.equal('8.60295466891613') - + await underlyingERC20.connect(alice).approve(vaultWithClaimableRewards.address, 0) + await underlyingERC20 + .connect(alice) + .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) + await vaultWithClaimableRewards.connect(alice).mint(depositAmount, aliceAddress) const morphoRewards = await ethers.getContractAt( 'IMorphoRewardsDistributor', networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR! @@ -261,47 +265,79 @@ const makeAaveFiatCollateralTestSuite = ( '0xea8c2ee8d43e37ceb7b0c04d59106eff88afbe3e911b656dec7caebd415ea696', ]) - expect( - formatEther( - await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) - ).slice(0, '14.162082619942089'.length) - ).to.be.equal('14.162082619942089') + // sync needs to be called after a claim to start a new payout period + // new tokens will only be moved into pending after a _claimAssetRewards call + // which sync allows you to do without the other stuff that happens in claimRewards + await vaultWithClaimableRewards.sync() - // MORPHO is not a transferable token. - // POST Launch we could ask the Morpho team if our TokenVaults could get permission to transfer the MORPHO tokens. - // Otherwise owners of the TokenVault shares need to wait until the protocol enables the transfer function on the MORPHO token. + await advanceTime(hre, 86400 * 7) + await advanceBlocks(hre, 7200 * 7) + expect(await vaultWithClaimableRewards.connect(alice).claimRewards()) + expect( + await erc20Factory.attach(networkConfigToUse.tokens.MORPHO!).balanceOf(aliceAddress) + ).to.be.eq(bn('14162082619942089266')) + }) + it('Frontrunning claiming rewards is not economical', async () => { + const alice = hre.ethers.provider.getSigner(1) + const aliceAddress = await alice.getAddress() + const bob = hre.ethers.provider.getSigner(2) + const bobAddress = await bob.getAddress() - await whileImpersonating(hre, morphoTokenOwner, async (signer) => { - const morphoTokenInst = await ethers.getContractAt( - 'IMorphoToken', - networkConfigToUse.tokens.MORPHO!, - signer - ) + const MorphoTokenisedDepositFactory = await ethers.getContractFactory( + 'MorphoAaveV2TokenisedDeposit' + ) + const ERC20Factory = await ethers.getContractFactory('ERC20Mock') + const mockRewardsToken = await ERC20Factory.deploy('MockMorphoReward', 'MMrp') + const underlyingERC20 = ERC20Factory.attach(defaultCollateralOpts.underlyingToken!) - await morphoTokenInst - .connect(signer) - .setUserRole(vaultWithClaimableRewards.address, 0, true) + const vault = await MorphoTokenisedDepositFactory.deploy({ + morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, + morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, + underlyingERC20: defaultCollateralOpts.underlyingToken!, + poolToken: defaultCollateralOpts.poolToken!, + rewardToken: mockRewardsToken.address, }) - const morphoTokenInst = await ethers.getContractAt( - 'IMorphoToken', - networkConfigToUse.tokens.MORPHO!, - user + const depositAmount = utils.parseUnits('1000', 6) + + await whileImpersonating( + hre, + whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], + async (whaleSigner) => { + await underlyingERC20.connect(whaleSigner).transfer(aliceAddress, depositAmount) + await underlyingERC20.connect(whaleSigner).transfer(bobAddress, depositAmount.mul(10)) + } ) - expect(formatEther(await morphoTokenInst.balanceOf(userAddress))).to.be.equal('0.0') - await vaultWithClaimableRewards.claimRewards() + await underlyingERC20.connect(alice).approve(vault.address, ethers.constants.MaxUint256) + await vault.connect(alice).mint(depositAmount, aliceAddress) - expect( - formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) - ).to.be.equal('0.0') + // Simulate inflation attack + await underlyingERC20.connect(bob).approve(vault.address, ethers.constants.MaxUint256) + await vault.connect(bob).mint(depositAmount.mul(10), bobAddress) - expect( - formatEther(await morphoTokenInst.balanceOf(userAddress)).slice( - 0, - '14.162082619942089'.length - ) - ).to.be.equal('14.162082619942089') + await mockRewardsToken.mint(vault.address, bn('1000000000000000000000')) + await vault.sync() + + await vault.connect(bob).claimRewards() + await vault.connect(bob).redeem(depositAmount.mul(10), bobAddress, bobAddress) + + // After the inflation attack + await advanceTime(hre, 86400 * 7) + await advanceBlocks(hre, 7200 * 7) + await vault.connect(alice).claimRewards() + + // Shown below is that it is no longer economical to inflate own shares + // bob only managed to steal approx 1/7200 * 90% of the reward because hardhat increments block by 1 + // in practise it would be 0 as inflation attacks typically flashloan assets. + expect(await mockRewardsToken.balanceOf(aliceAddress)).to.be.closeTo( + bn('999996993746993746995'), + bn('1e15') + ) + expect(await mockRewardsToken.balanceOf(bobAddress)).to.be.closeTo( + bn('1503126503126502'), + bn('1e12') + ) }) } @@ -312,7 +348,9 @@ const makeAaveFiatCollateralTestSuite = ( const opts = { deployCollateral, - collateralSpecificConstructorTests: collateralSpecificConstructorTests, + collateralSpecificConstructorTests: specificTests + ? collateralSpecificConstructorTests + : () => void 0, collateralSpecificStatusTests, beforeEachRewardsTest, makeCollateralFixtureContext, @@ -326,6 +364,7 @@ const makeAaveFiatCollateralTestSuite = ( itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork: getResetFork(FORK_BLOCK), collateralName, @@ -364,7 +403,8 @@ const makeOpts = ( const { tokens, chainlinkFeeds } = networkConfig[31337] makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDT', - makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!) + makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!), + true // Only run specific tests once, since they are slow ) makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDC', diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index c745f73174..28614aff7d 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -15,6 +15,7 @@ import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' import { CollateralOpts } from '../pluginTestTypes' +import { pushOracleForward } from '../../../utils/oracles' import { DEFAULT_THRESHOLD, DELAY_UNTIL_DEFAULT, @@ -53,7 +54,6 @@ const makeAaveNonFiatCollateralTestSuite = ( morphoLens: configToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: configToUse.tokens.MORPHO!, }) opts.erc20 = wrapperMock.address @@ -77,6 +77,10 @@ const makeAaveNonFiatCollateralTestSuite = ( )) as unknown as TestICollateral await collateral.deployed() + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + await pushOracleForward(opts.targetPrRefFeed!) + await expect(collateral.refresh()) return collateral @@ -100,7 +104,6 @@ const makeAaveNonFiatCollateralTestSuite = ( morphoLens: configToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, - rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: configToUse.tokens.MORPHO!, }) @@ -146,18 +149,18 @@ const makeAaveNonFiatCollateralTestSuite = ( ctx: MorphoAaveCollateralFixtureContext, pctDecrease: BigNumberish ) => { - const lastRound = await ctx.targetPrRefFeed!.latestRoundData() + const lastRound = await ctx.chainlinkFeed!.latestRoundData() const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) - await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) + await ctx.chainlinkFeed!.updateAnswer(nextAnswer) } const increaseTargetPerRef = async ( ctx: MorphoAaveCollateralFixtureContext, pctIncrease: BigNumberish ) => { - const lastRound = await ctx.targetPrRefFeed!.latestRoundData() + const lastRound = await ctx.chainlinkFeed!.latestRoundData() const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) - await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) + await ctx.chainlinkFeed!.updateAnswer(nextAnswer) } const changeRefPerTok = async ( @@ -168,25 +171,17 @@ const makeAaveNonFiatCollateralTestSuite = ( await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) } - // prettier-ignore const reduceRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, pctDecrease: BigNumberish ) => { - await changeRefPerTok( - ctx, - bn(pctDecrease).mul(-1) - ) + await changeRefPerTok(ctx, bn(pctDecrease).mul(-1)) } - // prettier-ignore const increaseRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, pctIncrease: BigNumberish ) => { - await changeRefPerTok( - ctx, - bn(pctIncrease) - ) + await changeRefPerTok(ctx, bn(pctIncrease)) } const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { @@ -196,11 +191,12 @@ const makeAaveNonFiatCollateralTestSuite = ( const clRptData = await ctx.targetPrRefFeed!.latestRoundData() const clRptDecimals = await ctx.targetPrRefFeed!.decimals() - const expctPrice = clData.answer - .mul(bn(10).pow(18 - clDecimals)) - .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) + const expectedPrice = clRptData.answer + .mul(bn(10).pow(18 - clRptDecimals)) + .mul(clData.answer.mul(bn(10).pow(18 - clDecimals))) .div(fp('1')) - return expctPrice + + return expectedPrice } /* @@ -212,6 +208,7 @@ const makeAaveNonFiatCollateralTestSuite = ( // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function const beforeEachRewardsTest = async () => {} const opts = { @@ -230,6 +227,7 @@ const makeAaveNonFiatCollateralTestSuite = ( itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, itIsPricedByPeg: true, resetFork: getResetFork(FORK_BLOCK), @@ -248,17 +246,17 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - WBTC', { underlyingToken: configToUse.tokens.WBTC!, poolToken: configToUse.tokens.aWBTC!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.BTC!, - targetPrRefFeed: configToUse.chainlinkFeeds.WBTC!, + chainlinkFeed: configToUse.chainlinkFeeds.WBTC!, + targetPrRefFeed: configToUse.chainlinkFeeds.BTC!, oracleTimeout: ORACLE_TIMEOUT, + refPerTokChainlinkTimeout: ORACLE_TIMEOUT.div(24), oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - defaultPrice: parseUnits('30000', 8), - defaultRefPerTok: parseUnits('1', 8), - refPerTokChainlinkTimeout: PRICE_TIMEOUT, + defaultPrice: parseUnits('1', 8), + defaultRefPerTok: parseUnits('30000', 8), }) makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { @@ -266,15 +264,15 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { underlyingToken: configToUse.tokens.stETH!, poolToken: configToUse.tokens.astETH!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.ETH!, - targetPrRefFeed: configToUse.chainlinkFeeds.stETHETH!, + chainlinkFeed: configToUse.chainlinkFeeds.stETHETH!, + targetPrRefFeed: configToUse.chainlinkFeeds.ETH!, oracleTimeout: ORACLE_TIMEOUT, + refPerTokChainlinkTimeout: ORACLE_TIMEOUT.div(24), oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - defaultPrice: parseUnits('1800', 8), - defaultRefPerTok: parseUnits('1', 8), - refPerTokChainlinkTimeout: PRICE_TIMEOUT, + defaultPrice: parseUnits('1', 8), + defaultRefPerTok: parseUnits('1800', 8), }) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 16dd346ae7..4bf7730685 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -15,6 +15,7 @@ import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' import { CollateralOpts } from '../pluginTestTypes' +import { pushOracleForward } from '../../../utils/oracles' import { DELAY_UNTIL_DEFAULT, FORK_BLOCK, @@ -48,7 +49,6 @@ const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise { - return formatUnits( - await instances.tokenVault - .connect(owner) - .callStatic.rewardTokenBalance(await owner.getAddress()), - 18 - ) - }, claimRewards: async (owner: Signer) => { await instances.tokenVault.connect(owner).claimRewards() }, @@ -179,7 +175,8 @@ const execTestForToken = ({ type ITestContext = ReturnType extends Promise ? U : never let context: ITestContext - // const resetFork = getResetFork(17591000) + before(getResetFork(FORK_BLOCK)) + beforeEach(async () => { context = await loadFixture(beforeEachFn) }) @@ -297,9 +294,162 @@ const execTestForToken = ({ expect(postWithdrawalBalance).lt(parseFloat(orignalBalance)) }) - /** - * There is a test for claiming rewards in the MorphoAAVEFiatCollateral.test.ts - */ + it('linearly distributes rewards', async () => { + const { + users: { alice, bob, charlie }, + methods, + instances, + amountBN, + } = context + + await methods.deposit(bob, '1') + + // Enable transfers on Morpho + // ugh + await whileImpersonating( + '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa', + async (whaleSigner) => { + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159daa9059cbb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159da23b872dd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + } + ) + + // Let's drop 700 MORPHO to the tokenVault + await whileImpersonating( + '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', + async (whaleSigner) => { + await instances.morpho + .connect(whaleSigner) + .transfer( + instances.tokenVault.address, + parseUnits('700', await instances.morpho.decimals()) + ) + } + ) + + // Account for rewards + await instances.tokenVault.sync() + + // Simulate 8 days.. + for (let i = 0; i < 8; i++) { + await advanceTime(hre, 24 * 60 * 60 - 1) + await methods.claimRewards(bob) + + if (i < 7) { + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(i + 1) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } else { + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(7) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } + } + }) + + it('linearly distributes rewards, even with multiple claims', async () => { + const { + users: { alice, bob, charlie }, + methods, + instances, + amountBN, + } = context + + await methods.deposit(bob, '1') + + // Enable transfers on Morpho + // ugh + await whileImpersonating( + '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa', + async (whaleSigner) => { + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159daa9059cbb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + await whaleSigner.sendTransaction({ + to: '0x9994e35db50125e0df82e4c2dde62496ce330999', + data: '0x4b5159da23b872dd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', + }) + } + ) + + // Let's drop 700 MORPHO to the tokenVault + await whileImpersonating( + '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', + async (whaleSigner) => { + await instances.morpho + .connect(whaleSigner) + .transfer( + instances.tokenVault.address, + parseUnits('700', await instances.morpho.decimals()) + ) + } + ) + + // Account for rewards + await instances.tokenVault.sync() + + // Simulate 3 days.. + for (let i = 0; i < 3; i++) { + await advanceTime(hre, 24 * 60 * 60 - 1) + await methods.claimRewards(bob) + + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(i + 1) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } + + // Let's drop another 300 MORPHO to the tokenVault + await whileImpersonating( + '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', + async (whaleSigner) => { + await instances.morpho + .connect(whaleSigner) + .transfer( + instances.tokenVault.address, + parseUnits('300', await instances.morpho.decimals()) + ) + } + ) + + // Account for rewards + await instances.tokenVault.sync() + + for (let i = 3; i < 10; i++) { + await advanceTime(hre, 24 * 60 * 60 - 1) + await methods.claimRewards(bob) + + // console.log( + // 'MORPHO:', + // formatUnits( + // await instances.morpho.balanceOf(await bob.getAddress()), + // await instances.morpho.decimals() + // ) + // ) + + expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( + BigNumber.from(i + 1) + .mul(100) + .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), + bn('1e18') + ) + } + }) }) } diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index d55a1ae734..99f876bb27 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -4,82 +4,94 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality G exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134222`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129753`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179834`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134211`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172151`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129742`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134222`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179812`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129753`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172129`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129412`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134211`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129412`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129742`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172148`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `172067`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172148`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `172067`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179699`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172126`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172430`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172126`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179677`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172408`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 1`] = `73881`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134425`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129956`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134414`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180240`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129945`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172557`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180218`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134425`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172535`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129956`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134414`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129615`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129945`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129615`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `172473`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172554`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `172473`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172554`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172532`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180105`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172532`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172836`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180083`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172814`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 1`] = `73881`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133578`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; + +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133567`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129109`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129098`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178546`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178524`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170863`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170841`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133578`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133567`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129109`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129098`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128768`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `170779`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128768`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `170779`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170860`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170838`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170860`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170838`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178411`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178389`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171142`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171120`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index de69e7ba61..26e77e6a88 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -4,54 +4,54 @@ exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionali exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133645`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133634`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129176`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129165`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199843`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199810`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192160`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192127`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182889`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182878`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178420`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178409`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178079`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `192065`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178079`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `192065`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192157`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192124`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192157`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192124`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199708`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199675`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192439`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192406`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting ERC20 transfer 1`] = `73881`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167277`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167266`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162808`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162797`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239107`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239074`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231424`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231391`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222153`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222142`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217684`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217673`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217343`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `231329`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217343`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `231329`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231421`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231388`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231421`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231388`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238972`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238939`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231703`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231670`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index 9148485dab..a420cba2b6 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -4,18 +4,18 @@ exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral fun exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201563`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201552`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197094`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197083`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217785`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217763`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210102`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210080`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201563`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201552`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197094`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197083`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210099`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210077`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210099`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210077`; diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 11b73fbaa1..34bfefbb20 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -100,6 +100,9 @@ export interface CollateralTestSuiteFixtures // toggle on or off: tests that focus on revenue hiding (off if plugin does not hide revenue) itHasRevenueHiding: Mocha.TestFunction | Mocha.PendingTestFunction + // toggle on or off: tests that check that defaultThreshold is not zero + itChecksNonZeroDefaultThreshold: Mocha.TestFunction | Mocha.PendingTestFunction + // does the peg price matter for the results of tryPrice()? itIsPricedByPeg?: boolean diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index 7b2cd8e9a5..d10488770e 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -12,6 +12,7 @@ import { IReth, WETH9, } from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -89,6 +90,11 @@ export const deployCollateral = async (opts: RethCollateralOpts = {}): Promise { oracleTimeouts: opts.oracleTimeouts, oracleErrors: opts.oracleErrors, lpToken: opts.lpToken, - } + }, + PRICE_PER_SHARE_HELPER ) await collateral.deployed() diff --git a/test/plugins/individual-collateral/yearnv2/constants.ts b/test/plugins/individual-collateral/yearnv2/constants.ts index 832ccbb813..2d480c5cb4 100644 --- a/test/plugins/individual-collateral/yearnv2/constants.ts +++ b/test/plugins/individual-collateral/yearnv2/constants.ts @@ -9,6 +9,8 @@ export const yvCurveUSDCcrvUSD = networkConfig['31337'].tokens.yvCurveUSDCcrvUSD export const USDP_USD_FEED = networkConfig['31337'].chainlinkFeeds.USDP as string export const CRV_USD_USD_FEED = networkConfig['31337'].chainlinkFeeds.crvUSD as string +export const PRICE_PER_SHARE_HELPER = '0x444443bae5bB8640677A8cdF94CB8879Fec948Ec' + export const YVUSDC_LP_TOKEN = '0x4DEcE678ceceb27446b35C672dC7d61F30bAD69E' export const YVUSDP_LP_TOKEN = '0xCa978A0528116DDA3cbA9ACD3e68bc6191CA53D0' diff --git a/test/scenario/BadCollateralPlugin.test.ts b/test/scenario/BadCollateralPlugin.test.ts index ec2e04c0ee..9745c962b5 100644 --- a/test/scenario/BadCollateralPlugin.test.ts +++ b/test/scenario/BadCollateralPlugin.test.ts @@ -27,7 +27,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -104,7 +104,7 @@ describe(`Bad Collateral Plugin - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index f55d5a3652..6b7479212c 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -34,7 +34,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -172,7 +172,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_TRADE_VOLUME, - ORACLE_TIMEOUT + ORACLE_TIMEOUT_PRE_BUFFER ) ) await assetRegistry.connect(owner).swapRegistered(newRSRAsset.address) @@ -203,7 +203,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: usdToken.address, // DAI Token maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -227,8 +227,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: eurToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -248,7 +248,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cUSDTokenVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -269,7 +269,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), staticAToken: aUSDToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -293,8 +293,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), tokenAddress: wbtc.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -323,8 +323,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), cToken: cWBTCVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -349,7 +349,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: weth.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), noOutput: true, }) @@ -380,7 +380,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cETHVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT.toString(), + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: REVENUE_HIDING.toString(), referenceERC20Decimals: bn(18).toString(), @@ -1598,8 +1598,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - cETHVault partial sale for weth // Will sell about 841K of cETHVault, expect to receive 8167 wETH (minimum) // We would still have about 438K to sell of cETHVault - let [, lotHigh] = await cETHVaultCollateral.lotPrice() - const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(lotHigh) + let [low] = await cETHVaultCollateral.price() + const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) const sellAmt = toBNDecimals(sellAmtUnscaled, 8) const sellAmtRemainder = (await cETHVault.balanceOf(backingManager.address)).sub(sellAmt) // Price for cETHVault = 1200 / 50 = $24 at rate 50% = $12 @@ -1744,8 +1744,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // 13K wETH @ 1200 = 15,600,000 USD of value, in RSR ~= 156,000 RSR (@100 usd) // We exceed maxTradeVolume so we need two auctions - Will first sell 10M in value // Sells about 101K RSR, for 8167 WETH minimum - ;[, lotHigh] = await rsrAsset.lotPrice() - const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(lotHigh) + ;[low] = await rsrAsset.price() + const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) const buyAmtBidRSR1 = toMinBuyAmt( sellAmtRSR1, rsrPrice, diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index a3ab632140..f1380b63f7 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -28,7 +28,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -158,7 +158,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -198,7 +198,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: atoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -245,7 +245,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: ctoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NestedRTokens.test.ts b/test/scenario/NestedRTokens.test.ts index 6386b158fd..38b11aba25 100644 --- a/test/scenario/NestedRTokens.test.ts +++ b/test/scenario/NestedRTokens.test.ts @@ -22,7 +22,7 @@ import { DefaultFixture, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -119,7 +119,7 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: staticATokenERC20.address, maxTradeVolume: one.config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NontrivialPeg.test.ts b/test/scenario/NontrivialPeg.test.ts index 70e0fa263f..c247b1cf98 100644 --- a/test/scenario/NontrivialPeg.test.ts +++ b/test/scenario/NontrivialPeg.test.ts @@ -23,7 +23,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from '../fixtures' @@ -82,7 +82,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -124,7 +124,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 8b1cfa00fb..815ff2f7fb 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from '../fixtures' @@ -116,7 +116,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME oracleError: ORACLE_ERROR, erc20: cDAI.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/SetProtocol.test.ts b/test/scenario/SetProtocol.test.ts index a2a67dd94a..a9021be240 100644 --- a/test/scenario/SetProtocol.test.ts +++ b/test/scenario/SetProtocol.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from '../fixtures' @@ -91,7 +91,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -106,7 +106,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('MKR'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -121,7 +121,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, + oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, targetName: ethers.utils.formatBytes32String('COMP'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 89a9ca08e6..22ad1e5662 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12092382`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082311`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9830758`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9823907`; -exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; +exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2436571`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13617164`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653658`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20897690`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21271957`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10991870`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984061`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8713158`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8720813`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6561504`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592432`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15130053`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15036720`; diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 30c290f242..2444878fe4 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -8,6 +8,13 @@ import { MAX_UINT192 } from '../../common/constants' const toleranceDivisor = bn('1e15') // 1 part in 1000 trillions +export const expectExactPrice = async (assetAddr: string, price: [BigNumber, BigNumber]) => { + const asset = await ethers.getContractAt('Asset', assetAddr) + const [lowPrice, highPrice] = await asset.price() + expect(lowPrice).to.equal(price[0]) + expect(highPrice).to.equal(price[1]) +} + // Expects a price around `avgPrice` assuming a consistent percentage oracle error // If near is truthy, allows a small error of 1 part in 1000 trillions export const expectPrice = async ( @@ -86,6 +93,15 @@ export const expectRTokenPrice = async ( expect(highPrice).to.be.gte(avgPrice) } +export const expectDecayedPrice = async (assetAddr: string) => { + const asset = await ethers.getContractAt('Asset', assetAddr) + const [lowPrice, highPrice] = await asset.price() + expect(lowPrice).to.be.gt(0) + expect(lowPrice).to.be.lt(await asset.savedLowPrice()) + expect(highPrice).to.be.gt(await asset.savedHighPrice()) + expect(highPrice).to.be.lt(MAX_UINT192) +} + // Expects an unpriced asset with low = 0 and high = FIX_MAX export const expectUnpriced = async (assetAddr: string) => { const asset = await ethers.getContractAt('Asset', assetAddr) diff --git a/test/utils/trades.ts b/test/utils/trades.ts index 433c9e453a..99e0f4c22f 100644 --- a/test/utils/trades.ts +++ b/test/utils/trades.ts @@ -1,9 +1,11 @@ +import { getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { Decimal } from 'decimal.js' import { BigNumber } from 'ethers' import { ethers } from 'hardhat' import { expect } from 'chai' -import { TestITrading, GnosisTrade } from '../../typechain' +import { TestITrading, GnosisTrade, TestIBroker } from '../../typechain' import { bn, fp, divCeil, divRound } from '../../common/numbers' +import { IMPLEMENTATION, Implementation } from '../fixtures' export const expectTrade = async (trader: TestITrading, auctionInfo: Partial) => { if (!auctionInfo.sell) throw new Error('Must provide sell token to find trade') @@ -81,7 +83,6 @@ export const dutchBuyAmount = async ( assetInAddr: string, assetOutAddr: string, outAmount: BigNumber, - minTradeVolume: BigNumber, maxTradeSlippage: BigNumber ): Promise => { const assetIn = await ethers.getContractAt('IAsset', assetInAddr) @@ -119,3 +120,23 @@ export const dutchBuyAmount = async ( } else price = worstPrice return divCeil(outAmount.mul(price), fp('1')) } + +export const disableBatchTrade = async (broker: TestIBroker) => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt(broker.address, 205, slot.replace(slot.slice(2, 14), '1'.padStart(12, '0'))) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) +} + +export const disableDutchTrade = async (broker: TestIBroker, erc20: string) => { + const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') + const p = mappingSlot.toHexString().slice(2).padStart(64, '0') + const key = erc20.slice(2).padStart(64, '0') + const slot = ethers.utils.keccak256('0x' + key + p) + await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) + expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) +} From 58e04980dd4b021b0070bc8946004b4dd03e9982 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Tue, 6 Feb 2024 21:00:20 -0500 Subject: [PATCH 200/450] Revert "3.1.0" (#1060) --- .github/workflows/tests.yml | 28 - .openzeppelin/base_8453.json | 184 --- .openzeppelin/mainnet.json | 200 +-- CHANGELOG.md | 102 +- README.md | 1 - common/configuration.ts | 10 +- common/numbers.ts | 4 +- contracts/facade/FacadeAct.sol | 6 +- contracts/facade/FacadeMonitor.sol | 211 --- contracts/facade/FacadeRead.sol | 31 +- contracts/facade/FacadeTest.sol | 4 +- contracts/interfaces/IAsset.sol | 10 +- contracts/interfaces/IAssetRegistry.sol | 2 +- contracts/interfaces/IBackingManager.sol | 37 - contracts/interfaces/IBasketHandler.sol | 2 - contracts/interfaces/IBroker.sol | 2 +- contracts/interfaces/IFacadeMonitor.sol | 49 - contracts/interfaces/IFacadeRead.sol | 13 +- contracts/interfaces/ITrade.sol | 3 - contracts/mixins/Versioned.sol | 2 +- contracts/p0/BackingManager.sol | 54 +- contracts/p0/BasketHandler.sol | 5 +- contracts/p0/Broker.sol | 13 +- contracts/p0/Distributor.sol | 22 +- contracts/p0/Furnace.sol | 12 +- contracts/p0/Main.sol | 3 +- contracts/p0/RevenueTrader.sol | 26 +- contracts/p0/StRSR.sol | 17 +- contracts/p0/mixins/TradingLib.sol | 77 +- contracts/p1/AssetRegistry.sol | 2 - contracts/p1/BackingManager.sol | 68 +- contracts/p1/BasketHandler.sol | 7 +- contracts/p1/Broker.sol | 33 +- contracts/p1/Distributor.sol | 31 +- contracts/p1/Furnace.sol | 12 +- contracts/p1/Main.sol | 3 +- contracts/p1/RToken.sol | 5 + contracts/p1/RevenueTrader.sol | 23 +- contracts/p1/StRSR.sol | 13 +- .../p1/mixins/RecollateralizationLib.sol | 189 ++- contracts/p1/mixins/TradeLib.sol | 2 +- contracts/p1/mixins/Trading.sol | 4 +- .../assets/AppreciatingFiatCollateral.sol | 2 +- contracts/plugins/assets/Asset.sol | 85 +- .../plugins/assets/EURFiatCollateral.sol | 2 - contracts/plugins/assets/FiatCollateral.sol | 6 +- contracts/plugins/assets/L2LSDCollateral.sol | 3 +- .../plugins/assets/NonFiatCollateral.sol | 2 - contracts/plugins/assets/RTokenAsset.sol | 78 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- .../assets/aave-v3/AaveV3FiatCollateral.sol | 4 +- .../assets/aave/ATokenFiatCollateral.sol | 4 +- .../assets/ankr/AnkrStakedEthCollateral.sol | 1 - .../plugins/assets/cbeth/CBETHCollateral.sol | 1 - .../assets/cbeth/CBETHCollateralL2.sol | 1 - contracts/plugins/assets/cbeth/README.md | 1 - .../compoundv2/CTokenFiatCollateral.sol | 2 - .../compoundv2/CTokenNonFiatCollateral.sol | 1 - .../assets/compoundv2/CTokenWrapper.sol | 4 +- .../plugins/assets/compoundv2/ICToken.sol | 18 +- .../assets/compoundv3/CTokenV3Collateral.sol | 13 +- .../assets/compoundv3/CusdcV3Wrapper.sol | 9 +- .../assets/compoundv3/ICusdcV3Wrapper.sol | 2 +- .../assets/compoundv3/WrappedERC20.sol | 7 - .../compoundv3/vendor/CometExtInterface.sol | 8 - .../assets/curve/CurveStableCollateral.sol | 2 +- .../curve/CurveStableMetapoolCollateral.sol | 3 - .../CurveStableRTokenMetapoolCollateral.sol | 5 - .../assets/curve/crv/CurveGaugeWrapper.sol | 11 - .../curve/cvx/vendor/ConvexStakingWrapper.sol | 190 ++- .../plugins/assets/dsr/SDaiCollateral.sol | 1 - .../plugins/assets/erc20/RewardableERC20.sol | 44 +- .../assets/erc20/RewardableERC20Wrapper.sol | 4 - .../assets/erc20/RewardableERC4626Vault.sol | 4 +- contracts/plugins/assets/frax-eth/README.md | 2 +- .../assets/frax-eth/SFraxEthCollateral.sol | 14 +- .../assets/lido/LidoStakedEthCollateral.sol | 2 - .../MorphoAaveV2TokenisedDeposit.sol | 4 +- .../morpho-aave/MorphoFiatCollateral.sol | 1 - .../morpho-aave/MorphoNonFiatCollateral.sol | 13 +- .../morpho-aave/MorphoTokenisedDeposit.sol | 65 +- .../assets/rocket-eth/RethCollateral.sol | 1 - .../stargate/StargatePoolFiatCollateral.sol | 1 - .../yearnv2/YearnV2CurveFiatCollateral.sol | 41 +- contracts/plugins/governance/Governance.sol | 23 +- contracts/plugins/mocks/AssetMock.sol | 11 +- contracts/plugins/mocks/CTokenWrapperMock.sol | 4 +- contracts/plugins/mocks/ComptrollerMock.sol | 13 +- .../plugins/mocks/RevenueTraderBackComp.sol | 4 +- .../mocks/upgrades/FacadeMonitorV2.sol | 23 - contracts/plugins/trading/GnosisTrade.sol | 12 +- docs/collateral.md | 24 +- docs/deployed-addresses/1-FacadeMonitor.md | 7 - docs/deployed-addresses/8453-FacadeMonitor.md | 8 - docs/deployment.md | 2 +- docs/exhaustive-tests.md | 10 +- docs/monitoring.md | 35 - docs/pause-freeze-states.md | 73 - docs/recollateralization.md | 16 +- .../addresses/84531-RTKN-tmp-deployments.json | 19 - scripts/confirmation/1_confirm_assets.ts | 39 +- scripts/deploy.ts | 2 - .../phase1-common/1_deploy_libraries.ts | 14 +- .../phase1-common/3_deploy_rsrAsset.ts | 4 +- .../phase2-assets/1_deploy_assets.ts | 6 +- .../phase2-assets/2_deploy_collateral.ts | 280 +--- .../phase2-assets/assets/deploy_crv.ts | 4 +- .../phase2-assets/assets/deploy_cvx.ts | 4 +- .../collaterals/deploy_aave_v3_usdbc.ts | 4 +- .../collaterals/deploy_aave_v3_usdc.ts | 6 +- .../collaterals/deploy_cbeth_collateral.ts | 12 +- .../deploy_compound_v2_collateral.ts | 18 +- .../deploy_convex_rToken_metapool_plugin.ts | 14 +- .../deploy_convex_stable_metapool_plugin.ts | 13 +- .../deploy_convex_stable_plugin.ts | 15 +- .../deploy_convex_volatile_plugin.ts | 142 ++ .../deploy_ctokenv3_usdbc_collateral.ts | 6 +- .../deploy_ctokenv3_usdc_collateral.ts | 6 +- .../deploy_curve_rToken_metapool_plugin.ts | 9 +- .../deploy_curve_stable_metapool_plugin.ts | 8 +- .../collaterals/deploy_curve_stable_plugin.ts | 10 +- .../deploy_curve_volatile_plugin.ts | 142 ++ .../collaterals/deploy_dsr_sdai.ts | 6 +- .../deploy_flux_finance_collateral.ts | 10 +- .../deploy_lido_wsteth_collateral.ts | 6 +- .../deploy_morpho_aavev2_plugin.ts | 30 +- .../deploy_rocket_pool_reth_collateral.ts | 6 +- .../phase2-assets/collaterals/deploy_sfrax.ts | 4 +- .../deploy_stargate_usdc_collateral.ts | 19 +- .../deploy_stargate_usdt_collateral.ts | 4 +- .../collaterals/deploy_yearn_v2_curve_usdc.ts | 104 -- .../collaterals/deploy_yearn_v2_curve_usdp.ts | 104 -- scripts/deployment/utils.ts | 9 +- scripts/exhaustive-tests/run-1.sh | 4 +- scripts/verification/6_verify_collateral.ts | 34 +- .../verify_aave_v3_usdbc.ts | 4 +- .../collateral-plugins/verify_aave_v3_usdc.ts | 6 +- .../collateral-plugins/verify_cbeth.ts | 12 +- .../verify_convex_stable.ts | 22 +- .../verify_convex_stable_metapool.ts | 8 +- .../verify_convex_stable_rtoken_metapool.ts | 9 +- .../verify_convex_volatile.ts | 98 ++ .../collateral-plugins/verify_curve_stable.ts | 10 +- .../verify_curve_stable_metapool.ts | 8 +- .../verify_curve_stable_rtoken_metapool.ts | 9 +- .../verify_curve_volatile.ts | 98 ++ .../collateral-plugins/verify_cusdbcv3.ts | 6 +- .../collateral-plugins/verify_cusdcv3.ts | 6 +- .../collateral-plugins/verify_morpho.ts | 16 +- .../collateral-plugins/verify_reth.ts | 6 +- .../collateral-plugins/verify_sdai.ts | 2 +- .../collateral-plugins/verify_wsteth.ts | 6 +- .../verify_yearn_v2_curve_usdc.ts | 73 - scripts/verify_etherscan.ts | 2 - tasks/deployment/deploy-facade-monitor.ts | 107 -- tasks/index.ts | 1 - test/Broker.test.ts | 85 +- test/Facade.test.ts | 573 ++----- test/FacadeWrite.test.ts | 4 +- test/Furnace.test.ts | 49 +- test/Governance.test.ts | 172 +- test/Main.test.ts | 84 +- test/RTokenExtremes.test.ts | 5 +- test/Recollateralization.test.ts | 127 +- test/Revenues.test.ts | 815 +--------- test/ZZStRSR.test.ts | 21 +- test/__snapshots__/Broker.test.ts.snap | 16 +- test/__snapshots__/FacadeWrite.test.ts.snap | 2 +- test/__snapshots__/Furnace.test.ts.snap | 34 +- test/__snapshots__/Main.test.ts.snap | 12 +- test/__snapshots__/RToken.test.ts.snap | 6 +- .../Recollateralization.test.ts.snap | 18 +- test/__snapshots__/Revenues.test.ts.snap | 26 +- test/__snapshots__/ZZStRSR.test.ts.snap | 6 +- test/fixtures.ts | 61 +- test/integration/AssetPlugins.test.ts | 211 +-- test/integration/EasyAuction.test.ts | 7 +- .../__snapshots__/CTokenVaultGas.test.ts.snap | 25 + test/integration/fixtures.ts | 55 +- test/integration/fork-block-numbers.ts | 1 - test/monitor/FacadeMonitor.test.ts | 1417 ----------------- test/plugins/Asset.test.ts | 369 ++--- test/plugins/Collateral.test.ts | 591 ++----- test/plugins/RewardableERC20.test.ts | 280 +--- .../__snapshots__/Collateral.test.ts.snap | 8 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 5 - .../AaveV3FiatCollateral.test.ts.snap | 24 +- .../aave/ATokenFiatCollateral.test.ts | 72 +- .../ATokenFiatCollateral.test.ts.snap | 24 +- .../ankr/AnkrEthCollateralTestSuite.test.ts | 5 - .../AnkrEthCollateralTestSuite.test.ts.snap | 24 +- .../cbeth/CBETHCollateral.test.ts | 6 - .../cbeth/CBETHCollateralL2.test.ts | 1 - .../CBETHCollateral.test.ts.snap | 24 +- .../individual-collateral/collateralTests.ts | 510 +----- .../compoundv2/CTokenFiatCollateral.test.ts | 70 +- .../CTokenFiatCollateral.test.ts.snap | 24 +- .../compoundv3/CometTestSuite.test.ts | 14 - .../compoundv3/CusdcV3Wrapper.test.ts | 71 +- .../__snapshots__/CometTestSuite.test.ts.snap | 24 +- .../curve/collateralTests.ts | 487 +----- .../CrvStableRTokenMetapoolTestSuite.test.ts | 51 +- .../CrvStableMetapoolSuite.test.ts.snap | 24 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +- .../CrvStableTestSuite.test.ts.snap | 24 +- .../CvxStableRTokenMetapoolTestSuite.test.ts | 51 +- .../curve/cvx/CvxStableTestSuite.test.ts | 49 + .../CvxStableMetapoolSuite.test.ts.snap | 24 +- ...StableRTokenMetapoolTestSuite.test.ts.snap | 24 +- .../CvxStableTestSuite.test.ts.snap | 24 +- .../curve/cvx/helpers.ts | 40 +- .../dsr/SDaiCollateralTestSuite.test.ts | 8 +- .../SDaiCollateralTestSuite.test.ts.snap | 24 +- .../plugins/individual-collateral/fixtures.ts | 13 +- .../flux-finance/FTokenFiatCollateral.test.ts | 5 - .../FTokenFiatCollateral.test.ts.snap | 96 +- .../frax-eth/SFrxEthTestSuite.test.ts | 24 +- .../SFrxEthTestSuite.test.ts.snap | 12 +- .../frax/SFraxCollateralTestSuite.test.ts | 1 - .../lido/LidoStakedEthTestSuite.test.ts | 7 - .../LidoStakedEthTestSuite.test.ts.snap | 24 +- .../MorphoAAVEFiatCollateral.test.ts | 158 +- .../MorphoAAVENonFiatCollateral.test.ts | 58 +- ...orphoAAVESelfReferentialCollateral.test.ts | 7 +- .../MorphoAaveV2TokenisedDeposit.test.ts | 176 +- .../MorphoAAVEFiatCollateral.test.ts.snap | 84 +- .../MorphoAAVENonFiatCollateral.test.ts.snap | 48 +- ...AAVESelfReferentialCollateral.test.ts.snap | 16 +- .../individual-collateral/pluginTestTypes.ts | 3 - .../RethCollateralTestSuite.test.ts | 7 - .../RethCollateralTestSuite.test.ts.snap | 24 +- .../stargate/StargateUSDCTestSuite.test.ts | 1 - .../StargateETHTestSuite.test.ts.snap | 57 + .../StargateUSDCTestSuite.test.ts.snap | 29 - .../YearnV2CurveFiatCollateral.test.ts | 4 +- .../yearnv2/constants.ts | 2 - test/scenario/BadCollateralPlugin.test.ts | 4 +- test/scenario/ComplexBasket.test.ts | 34 +- test/scenario/MaxBasketSize.test.ts | 8 +- test/scenario/NestedRTokens.test.ts | 4 +- test/scenario/NontrivialPeg.test.ts | 6 +- test/scenario/RevenueHiding.test.ts | 4 +- test/scenario/SetProtocol.test.ts | 8 +- .../__snapshots__/MaxBasketSize.test.ts.snap | 18 +- test/utils/oracles.ts | 16 - test/utils/trades.ts | 25 +- 246 files changed, 2975 insertions(+), 8917 deletions(-) delete mode 100644 contracts/facade/FacadeMonitor.sol delete mode 100644 contracts/interfaces/IFacadeMonitor.sol delete mode 100644 contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol delete mode 100644 docs/deployed-addresses/1-FacadeMonitor.md delete mode 100644 docs/deployed-addresses/8453-FacadeMonitor.md delete mode 100644 docs/monitoring.md delete mode 100644 docs/pause-freeze-states.md delete mode 100644 scripts/addresses/84531-RTKN-tmp-deployments.json create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts create mode 100644 scripts/verification/collateral-plugins/verify_convex_volatile.ts create mode 100644 scripts/verification/collateral-plugins/verify_curve_volatile.ts delete mode 100644 scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts delete mode 100644 tasks/deployment/deploy-facade-monitor.ts create mode 100644 test/integration/__snapshots__/CTokenVaultGas.test.ts.snap delete mode 100644 test/monitor/FacadeMonitor.test.ts create mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateETHTestSuite.test.ts.snap delete mode 100644 test/plugins/individual-collateral/stargate/__snapshots__/StargateUSDCTestSuite.test.ts.snap diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3bd5b1a460..7b553d57d7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -187,34 +187,6 @@ jobs: TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet - - monitor-tests: - name: 'Monitor Tests (Mainnet)' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16.x - cache: 'yarn' - - run: yarn install --immutable - - name: 'Cache hardhat network fork' - uses: actions/cache@v3 - with: - path: cache/hardhat-network-fork - key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} - restore-keys: | - hardhat-network-fork-${{ runner.os }}- - hardhat-network-fork- - - run: npx hardhat test ./test/monitor/*.test.ts - env: - NODE_OPTIONS: '--max-old-space-size=8192' - TS_NODE_SKIP_IGNORE: true - MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} - FORK_NETWORK: mainnet - FORK: 1 - PROTO_IMPL: 1 - slither: name: 'Slither' runs-on: ubuntu-latest diff --git a/.openzeppelin/base_8453.json b/.openzeppelin/base_8453.json index 0d90ea97cb..6c4c4a3671 100644 --- a/.openzeppelin/base_8453.json +++ b/.openzeppelin/base_8453.json @@ -3144,190 +3144,6 @@ } } } - }, - "83264eb95f2f9ab0055f3cdf3d195b52003b35099a624ee29920f6a83be6b884": { - "address": "0xD45a441F334f6f27CDDA3728414FD26Cc5798E66", - "txHash": "0xcce3cfb75dad5e947efeab8a30cd981ca578d96f7a8bee1512a86b2849a0fa24", - "layout": { - "solcVersion": "0.8.19", - "storage": [ - { - "label": "_initialized", - "offset": 0, - "slot": "0", - "type": "t_uint8", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", - "retypedFrom": "bool" - }, - { - "label": "_initializing", - "offset": 1, - "slot": "0", - "type": "t_bool", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" - }, - { - "label": "__gap", - "offset": 0, - "slot": "1", - "type": "t_array(t_uint256)50_storage", - "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" - }, - { - "label": "_owner", - "offset": 0, - "slot": "51", - "type": "t_address", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" - }, - { - "label": "__gap", - "offset": 0, - "slot": "52", - "type": "t_array(t_uint256)49_storage", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" - }, - { - "label": "__gap", - "offset": 0, - "slot": "101", - "type": "t_array(t_uint256)50_storage", - "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" - }, - { - "label": "__gap", - "offset": 0, - "slot": "151", - "type": "t_array(t_uint256)50_storage", - "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" - } - ], - "types": { - "t_address": { - "label": "address", - "numberOfBytes": "20" - }, - "t_array(t_uint256)49_storage": { - "label": "uint256[49]", - "numberOfBytes": "1568" - }, - "t_array(t_uint256)50_storage": { - "label": "uint256[50]", - "numberOfBytes": "1600" - }, - "t_bool": { - "label": "bool", - "numberOfBytes": "1" - }, - "t_uint256": { - "label": "uint256", - "numberOfBytes": "32" - }, - "t_uint8": { - "label": "uint8", - "numberOfBytes": "1" - } - } - } - }, - "07b40b651527d3b3c3f0d1fb77a991853411f5b7fd564a45478bb03e177adcae": { - "address": "0x69c20aD99eb1054cd7Da2809572205186975dA17", - "txHash": "0x05c19fbc6774d5e85aadba888cc56e0764a104c1da7e3fa9f0774dfba8a46215", - "layout": { - "solcVersion": "0.8.19", - "storage": [ - { - "label": "_initialized", - "offset": 0, - "slot": "0", - "type": "t_uint8", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", - "retypedFrom": "bool" - }, - { - "label": "_initializing", - "offset": 1, - "slot": "0", - "type": "t_bool", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" - }, - { - "label": "__gap", - "offset": 0, - "slot": "1", - "type": "t_array(t_uint256)50_storage", - "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" - }, - { - "label": "_owner", - "offset": 0, - "slot": "51", - "type": "t_address", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" - }, - { - "label": "__gap", - "offset": 0, - "slot": "52", - "type": "t_array(t_uint256)49_storage", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" - }, - { - "label": "__gap", - "offset": 0, - "slot": "101", - "type": "t_array(t_uint256)50_storage", - "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" - }, - { - "label": "__gap", - "offset": 0, - "slot": "151", - "type": "t_array(t_uint256)50_storage", - "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" - } - ], - "types": { - "t_address": { - "label": "address", - "numberOfBytes": "20" - }, - "t_array(t_uint256)49_storage": { - "label": "uint256[49]", - "numberOfBytes": "1568" - }, - "t_array(t_uint256)50_storage": { - "label": "uint256[50]", - "numberOfBytes": "1600" - }, - "t_bool": { - "label": "bool", - "numberOfBytes": "1" - }, - "t_uint256": { - "label": "uint256", - "numberOfBytes": "32" - }, - "t_uint8": { - "label": "uint8", - "numberOfBytes": "1" - } - } - } } } } diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index d0dae943ca..8ae5721830 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -3747,7 +3747,10 @@ }, "t_enum(TradeKind)25002": { "label": "enum TradeKind", - "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { @@ -4040,7 +4043,11 @@ }, "t_enum(CollateralStatus)24460": { "label": "enum CollateralStatus", - "members": ["SOUND", "IFFY", "DISABLED"], + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -6333,7 +6340,10 @@ }, "t_enum(TradeKind)17751": { "label": "enum TradeKind", - "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { @@ -6642,190 +6652,6 @@ } } } - }, - "f0632c54f5763a16d6d87d14d0e7a80a079e8b998507fa1d081ee3b631c3961c": { - "address": "0xA42850A760151bb3ACF17E7f8643EB4d864bF7a6", - "txHash": "0xfa37e2544175813e2b4308c62f14f05f336a62ea25c94dd9346f710449498d0c", - "layout": { - "solcVersion": "0.8.19", - "storage": [ - { - "label": "_initialized", - "offset": 0, - "slot": "0", - "type": "t_uint8", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", - "retypedFrom": "bool" - }, - { - "label": "_initializing", - "offset": 1, - "slot": "0", - "type": "t_bool", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" - }, - { - "label": "__gap", - "offset": 0, - "slot": "1", - "type": "t_array(t_uint256)50_storage", - "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" - }, - { - "label": "_owner", - "offset": 0, - "slot": "51", - "type": "t_address", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" - }, - { - "label": "__gap", - "offset": 0, - "slot": "52", - "type": "t_array(t_uint256)49_storage", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" - }, - { - "label": "__gap", - "offset": 0, - "slot": "101", - "type": "t_array(t_uint256)50_storage", - "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" - }, - { - "label": "__gap", - "offset": 0, - "slot": "151", - "type": "t_array(t_uint256)50_storage", - "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" - } - ], - "types": { - "t_address": { - "label": "address", - "numberOfBytes": "20" - }, - "t_array(t_uint256)49_storage": { - "label": "uint256[49]", - "numberOfBytes": "1568" - }, - "t_array(t_uint256)50_storage": { - "label": "uint256[50]", - "numberOfBytes": "1600" - }, - "t_bool": { - "label": "bool", - "numberOfBytes": "1" - }, - "t_uint256": { - "label": "uint256", - "numberOfBytes": "32" - }, - "t_uint8": { - "label": "uint8", - "numberOfBytes": "1" - } - } - } - }, - "ebc9c3f1c253e562c3d21649a4c7d904b40ed64689bc3d3bc57bbe09fcd1d120": { - "address": "0x35fDc5537c32588bfc97b393A8ed522Df737af5A", - "txHash": "0xc1d9400b9492c969e5a156fa8e419ccd8a1138160f6eb4079192455e3af357e6", - "layout": { - "solcVersion": "0.8.19", - "storage": [ - { - "label": "_initialized", - "offset": 0, - "slot": "0", - "type": "t_uint8", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", - "retypedFrom": "bool" - }, - { - "label": "_initializing", - "offset": 1, - "slot": "0", - "type": "t_bool", - "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" - }, - { - "label": "__gap", - "offset": 0, - "slot": "1", - "type": "t_array(t_uint256)50_storage", - "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" - }, - { - "label": "_owner", - "offset": 0, - "slot": "51", - "type": "t_address", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" - }, - { - "label": "__gap", - "offset": 0, - "slot": "52", - "type": "t_array(t_uint256)49_storage", - "contract": "OwnableUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" - }, - { - "label": "__gap", - "offset": 0, - "slot": "101", - "type": "t_array(t_uint256)50_storage", - "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" - }, - { - "label": "__gap", - "offset": 0, - "slot": "151", - "type": "t_array(t_uint256)50_storage", - "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" - } - ], - "types": { - "t_address": { - "label": "address", - "numberOfBytes": "20" - }, - "t_array(t_uint256)49_storage": { - "label": "uint256[49]", - "numberOfBytes": "1568" - }, - "t_array(t_uint256)50_storage": { - "label": "uint256[50]", - "numberOfBytes": "1600" - }, - "t_bool": { - "label": "bool", - "numberOfBytes": "1" - }, - "t_uint256": { - "label": "uint256", - "numberOfBytes": "32" - }, - "t_uint8": { - "label": "uint8", - "numberOfBytes": "1" - } - } - } } } } diff --git a/CHANGELOG.md b/CHANGELOG.md index a5330e5235..693d32bd91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,93 +1,5 @@ # Changelog -# 3.1.0 - -### Upgrade Steps -- Required - -Upgrade all core contracts and _all_ assets. Most ERC20s do not need to be upgraded. Use `Deployer.deployRTokenAsset()` to create a new `RTokenAsset` instance. This asset should be swapped too. - -ERC20s that _do_ need to be upgraded: - -- Morpho -- Convex -- CompoundV3 - -Then, call `Broker.cacheComponents()`. - -Finally, call `Broker.setBatchTradeImplementation(newGnosisTrade)`. - -### Core Protocol Contracts - -- `BackingManager` [+2 slots] - - Replace use of `lotPrice()` with `price()` everywhere - - Track `tokensOut` on trades and account for during collateralization math - - Call `StRSR.payoutRewards()` after forwarding RSR - - Make `backingBuffer` math precise - - Add caching in `RecollateralizationLibP1` - - Use `price().low` instead of `price().high` to compute maximum sell amounts -- `BasketHandler` - - Replace use of `lotPrice()` with `price()` everywhere - - Minor gas optimizations to status tracking and custom redemption math -- `Broker` [+1 slot] - - Cache `rToken` address and add `cacheComponents()` helper - - Allow `reportViolation()` to be called when paused or frozen - - Disallow starting dutch trades with non-RTokenAsset assets when `lastSave() != block.timestamp` -- `Distributor` - - Call `RevenueTrader.distributeTokenToBuy()` before distribution table changes - - Call `StRSR.payoutRewards()` or `Furnace.melt()` after distributions - - Minor gas optimizations -- `Furnace` - - Allow melting while frozen -- `Main` - - Remove `furnace.melt()` from `poke()` -- `RevenueTrader` - - Replace use of `lotPrice()` with `price()` everywhere - - Ensure `settleTrade` cannot be reverted due to `tokenToBuy` distribution - - Ensure during `manageTokens()` that the Distributor is configured for the `tokenToBuy` -- `StRSR` - - Use correct era in `UnstakingStarted` event - - Expose `draftEra` via `getDraftEra()` view - -### Facades - -- `FacadeMonitor` - - Add `batchAuctionsDisabled()` view - - Add `dutchAuctionsDisabled()` view - - Add `issuanceAvailable()` view - - Add `redemptionAvailable()` view - - Add `backingRedeemable()` view -- `FacadeRead` - - Add `draftEra` argument to `pendingUnstakings()` - - Remove `.melt()` calls during pokes - -## Plugins - -### Assets - -- ALL - - Deprecate `lotPrice()` - - Alter `price().low` to decay downwards to 0 over the price timeout - - Alter `price().high` to decay upwards to 3x over the price timeout - - Move `ORACLE_TIMEOUT_BUFFER` into code, as opposed to incorporating at the deployment script level - - Make`refPerTok()` smoother during event of hard default - - Check for `defaultThreshold > 0` in constructors - - Add 9 more decimals of precision to reward accounting (some wrappers excluded) -- compoundv2: make wrapper much more gas efficient during COMP claim -- compoundv3 bugfix: check permission correctly on underlying comet -- curve: Also `refresh()` the RToken's AssetRegistry during `refresh()` -- convex: Update to latest approved wrapper from Convex team -- morpho-aave: Add ability to track and handout MORPHO rewards -- yearnv2: Use pricePerShare helper for more precision - -### Governance - -- Add a minimum voting delay of 1 day - -### Trading - -- `GnosisTrade` - - Add `sellAmount() returns (uint192)` view - # 3.0.1 ### Upgrade steps @@ -96,8 +8,6 @@ Update `BackingManager`, both `RevenueTraders` (rTokenTrader/rsrTrader), and cal # 3.0.0 -Bump solidity version to 0.8.19 - ### Upgrade Steps #### Required Steps @@ -128,7 +38,9 @@ It is acceptable to leave these function calls out of the initial upgrade tx and ### Core Protocol Contracts - `AssetRegistry` [+1 slot] - Summary: Other component contracts need to know when refresh() was last called + Summary: StRSR contract need to know when refresh() was last called + - # Add last refresh timestamp tracking and expose via `lastRefresh()` getter + Summary: Other component contracts need to know when refresh() was last called - Add `lastRefresh()` timestamp getter - Add `size()` getter for number of registered assets - Require asset is SOUND on registration @@ -268,10 +180,10 @@ Remove `FacadeMonitor` - now redundant with `nextRecollateralizationAuction()` a - `FacadeRead` Summary: Add new data summary views frontends may be interested in -- Remove `basketNonce` from `redeem(.., uint48 basketNonce)` -- Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions -- Remove `traderBalances(..)` -- Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` + - Remove `basketNonce` from `redeem(.., uint48 basketNonce)` + - Add `redeemCustom(.., uint48[] memory basketNonces, uint192[] memory portions)` callstatic to simulate multi-basket redemptions + - Remove `traderBalances(..)` + - Add `balancesAcrossAllTraders(IBackingManager) returns (IERC20[] memory erc20s, uint256[] memory balances, uint256[] memory balancesNeededByBackingManager)` - `FacadeWrite` Summary: More expressive and fine-grained control over the set of pausers and freezers diff --git a/README.md b/README.md index e8ab78faec..1c569eb492 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ For a much more detailed explanation of the economic design, including an hour-l - [Testing with Echidna](https://github.com/reserve-protocol/protocol/blob/master/docs/using-echidna.md): Notes so far on setup and usage of Echidna (which is decidedly an integration-in-progress!) - [Deployment](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment.md): How to do test deployments in our environment. - [System Design](https://github.com/reserve-protocol/protocol/blob/master/docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. -- [Pause and Freeze States](https://github.com/reserve-protocol/protocol/blob/master/docs/pause-freeze-states.md): An overview of which protocol functions are halted in the paused and frozen states. - [Deployment Variables](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment-variables.md) A detailed description of the governance variables of the protocol. - [Our Solidity Style](https://github.com/reserve-protocol/protocol/blob/master/docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. - [Writing Collateral Plugins](https://github.com/reserve-protocol/protocol/blob/master/docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. diff --git a/common/configuration.ts b/common/configuration.ts index 3692d8068f..308bfc671e 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -109,7 +109,6 @@ interface INetworkConfig { AAVE_INCENTIVES?: string AAVE_EMISSIONS_MGR?: string AAVE_RESERVE_TREASURY?: string - AAVE_DATA_PROVIDER?: string COMPTROLLER?: string FLUX_FINANCE_COMPTROLLER?: string GNOSIS_EASY_AUCTION?: string @@ -225,7 +224,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', AAVE_EMISSIONS_MGR: '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', - AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -331,7 +329,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', - AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -431,7 +428,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', - AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', @@ -646,10 +642,6 @@ export interface IRTokenConfig { params: IConfig } -export interface IMonitorParams { - AAVE_V2_DATA_PROVIDER_ADDR: string -} - export interface IBackupInfo { backupUnit: string diversityFactor: BigNumber @@ -698,7 +690,7 @@ 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).sub(300) +export const MAX_ORACLE_TIMEOUT = BigNumber.from(2).pow(48).sub(1) export const MAX_TRADING_DELAY = 31536000 // 1 year export const MIN_WARMUP_PERIOD = 60 // 1 minute export const MAX_WARMUP_PERIOD = 31536000 // 1 year diff --git a/common/numbers.ts b/common/numbers.ts index d49a2a6606..6d53f464d1 100644 --- a/common/numbers.ts +++ b/common/numbers.ts @@ -16,9 +16,7 @@ export const pow10 = (exponent: BigNumberish): BigNumber => { // Convert `x` to a new BigNumber with decimals = `decimals`. // Input should have SCALE_DECIMALS (18) decimal places, and `decimals` should be less than 18. export const toBNDecimals = (x: BigNumberish, decimals: number): BigNumber => { - return decimals < SCALE_DECIMALS - ? BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) - : BigNumber.from(x).mul(pow10(decimals - SCALE_DECIMALS)) + return BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) } // Convert to the BigNumber representing a Fix from a BigNumberish. diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/FacadeAct.sol index 45f32b4f7c..3534a1fa62 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/FacadeAct.sol @@ -117,11 +117,11 @@ contract FacadeAct is IFacadeAct, Multicall { } surpluses[i] = erc20s[i].balanceOf(address(revenueTrader)); - (uint192 low, ) = reg.assets[i].price(); // {UoA/tok} - if (low == 0) continue; + (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} + if (lotLow == 0) continue; // {qTok} = {UoA} / {UoA/tok} - minTradeAmounts[i] = minTradeVolume.safeDiv(low, FLOOR).shiftl_toUint( + minTradeAmounts[i] = minTradeVolume.safeDiv(lotLow, FLOOR).shiftl_toUint( int8(reg.assets[i].erc20Decimals()) ); diff --git a/contracts/facade/FacadeMonitor.sol b/contracts/facade/FacadeMonitor.sol deleted file mode 100644 index e8221a1195..0000000000 --- a/contracts/facade/FacadeMonitor.sol +++ /dev/null @@ -1,211 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol"; -import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; -import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; -import "../interfaces/IFacadeMonitor.sol"; -import "../interfaces/IRToken.sol"; -import "../libraries/Fixed.sol"; -import "../p1/RToken.sol"; -import "../plugins/assets/compoundv2/CTokenWrapper.sol"; -import "../plugins/assets/compoundv3/ICusdcV3Wrapper.sol"; -import "../plugins/assets/stargate/StargateRewardableWrapper.sol"; -import { StaticATokenV3LM } from "../plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol"; -import "../plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol"; - -interface IAaveProtocolDataProvider { - function getReserveData(address asset) - external - view - returns ( - uint256 availableLiquidity, - uint256 totalStableDebt, - uint256 totalVariableDebt, - uint256 liquidityRate, - uint256 variableBorrowRate, - uint256 stableBorrowRate, - uint256 averageStableBorrowRate, - uint256 liquidityIndex, - uint256 variableBorrowIndex, - uint40 lastUpdateTimestamp - ); -} - -interface IStaticATokenLM is IERC20 { - // solhint-disable-next-line func-name-mixedcase - function UNDERLYING_ASSET_ADDRESS() external view returns (address); - - function dynamicBalanceOf(address account) external view returns (uint256); -} - -/** - * @title FacadeMonitor - * @notice A UX-friendly layer for monitoring RTokens - */ -contract FacadeMonitor is Initializable, OwnableUpgradeable, UUPSUpgradeable, IFacadeMonitor { - using FixLib for uint192; - - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - address public immutable AAVE_V2_DATA_PROVIDER; - - /// @custom:oz-upgrades-unsafe-allow constructor - constructor(MonitorParams memory params) { - AAVE_V2_DATA_PROVIDER = params.AAVE_V2_DATA_PROVIDER_ADDR; - _disableInitializers(); - } - - function init(address initialOwner) public initializer { - require(initialOwner != address(0), "invalid owner address"); - - __Ownable_init(); - __UUPSUpgradeable_init(); - _transferOwnership(initialOwner); - } - - // === Views === - - /// @return Whether batch auctions are disabled for a specific rToken - function batchAuctionsDisabled(IRToken rToken) external view returns (bool) { - return rToken.main().broker().batchTradeDisabled(); - } - - /// @return Whether any dutch auction is disabled for a specific rToken - function dutchAuctionsDisabled(IRToken rToken) external view returns (bool) { - bool disabled = false; - - IERC20[] memory erc20s = rToken.main().assetRegistry().erc20s(); - for (uint256 i = 0; i < erc20s.length; ++i) { - if (rToken.main().broker().dutchTradeDisabled(IERC20Metadata(address(erc20s[i])))) - disabled = true; - } - - return disabled; - } - - /// @return Which percentage of issuance throttle is still available for a specific rToken - function issuanceAvailable(IRToken rToken) external view returns (uint256) { - ThrottleLib.Params memory params = RTokenP1(address(rToken)).issuanceThrottleParams(); - - // Calculate hourly limit as: max(params.amtRate, supply.mul(params.pctRate)) - uint256 limit = (rToken.totalSupply() * params.pctRate) / FIX_ONE_256; // {qRTok} - if (params.amtRate > limit) limit = params.amtRate; - - uint256 issueAvailable = rToken.issuanceAvailable(); - if (issueAvailable >= limit) return FIX_ONE_256; - - return (issueAvailable * FIX_ONE_256) / limit; - } - - function redemptionAvailable(IRToken rToken) external view returns (uint256) { - ThrottleLib.Params memory params = RTokenP1(address(rToken)).redemptionThrottleParams(); - - uint256 supply = rToken.totalSupply(); - - if (supply == 0) return FIX_ONE_256; - - // Calculate hourly limit as: max(params.amtRate, supply.mul(params.pctRate)) - uint256 limit = (supply * params.pctRate) / FIX_ONE_256; // {qRTok} - if (params.amtRate > limit) limit = supply < params.amtRate ? supply : params.amtRate; - - uint256 redeemAvailable = rToken.redemptionAvailable(); - if (redeemAvailable >= limit) return FIX_ONE_256; - - return (redeemAvailable * FIX_ONE_256) / limit; - } - - function backingReedemable( - IRToken rToken, - CollPluginType collType, - IERC20 erc20 - ) external view returns (uint256) { - uint256 backingBalance; - uint256 availableLiquidity; - - if (collType == CollPluginType.AAVE_V2 || collType == CollPluginType.MORPHO_AAVE_V2) { - address underlying; - if (collType == CollPluginType.AAVE_V2) { - // AAVE V2 - Uses Static wrapper - IStaticATokenLM staticAToken = IStaticATokenLM(address(erc20)); - backingBalance = staticAToken.dynamicBalanceOf( - address(rToken.main().backingManager()) - ); - underlying = staticAToken.UNDERLYING_ASSET_ADDRESS(); - } else { - // MORPHO AAVE V2 - MorphoAaveV2TokenisedDeposit mrpTknDeposit = MorphoAaveV2TokenisedDeposit( - address(erc20) - ); - backingBalance = mrpTknDeposit.convertToAssets( - mrpTknDeposit.balanceOf(address(rToken.main().backingManager())) - ); - underlying = mrpTknDeposit.underlying(); - } - - (availableLiquidity, , , , , , , , , ) = IAaveProtocolDataProvider( - AAVE_V2_DATA_PROVIDER - ).getReserveData(underlying); - } else if (collType == CollPluginType.AAVE_V3) { - StaticATokenV3LM staticAToken = StaticATokenV3LM(address(erc20)); - IERC20 aToken = staticAToken.aToken(); - IERC20 underlying = IERC20(staticAToken.asset()); - - backingBalance = staticAToken.convertToAssets( - staticAToken.balanceOf(address(rToken.main().backingManager())) - ); - availableLiquidity = underlying.balanceOf(address(aToken)); - } else if (collType == CollPluginType.COMPOUND_V2 || collType == CollPluginType.FLUX) { - ICToken cToken; - uint256 cTokenBal; - if (collType == CollPluginType.COMPOUND_V2) { - // CompoundV2 uses a vault to wrap the CToken - CTokenWrapper cTokenVault = CTokenWrapper(address(erc20)); - cToken = ICToken(address(cTokenVault.underlying())); - cTokenBal = cTokenVault.balanceOf(address(rToken.main().backingManager())); - } else { - // FLUX - Uses FToken directly (fork of CToken) - cToken = ICToken(address(erc20)); - cTokenBal = cToken.balanceOf(address(rToken.main().backingManager())); - } - IERC20 underlying = IERC20(cToken.underlying()); - - uint256 exchangeRate = cToken.exchangeRateStored(); - - backingBalance = (cTokenBal * exchangeRate) / 1e18; - availableLiquidity = underlying.balanceOf(address(cToken)); - } else if (collType == CollPluginType.COMPOUND_V3) { - ICusdcV3Wrapper cTokenV3Wrapper = ICusdcV3Wrapper(address(erc20)); - CometInterface cTokenV3 = CometInterface(address(cTokenV3Wrapper.underlyingComet())); - IERC20 underlying = IERC20(cTokenV3.baseToken()); - - backingBalance = cTokenV3Wrapper.underlyingBalanceOf( - address(rToken.main().backingManager()) - ); - availableLiquidity = underlying.balanceOf(address(cTokenV3)); - } else if (collType == CollPluginType.STARGATE) { - StargateRewardableWrapper stgWrapper = StargateRewardableWrapper(address(erc20)); - IStargatePool stgPool = stgWrapper.pool(); - - uint256 wstgBal = stgWrapper.balanceOf(address(rToken.main().backingManager())); - - backingBalance = stgPool.amountLPtoLD(wstgBal); - availableLiquidity = stgPool.totalLiquidity(); - } - - if (availableLiquidity == 0) { - return 0; // Avoid division by zero - } - - if (availableLiquidity >= backingBalance) { - return FIX_ONE_256; - } - - // Calculate the percentage - return (availableLiquidity * FIX_ONE_256) / backingBalance; - } - - // solhint-disable-next-line no-empty-blocks - function _authorizeUpgrade(address newImplementation) internal override onlyOwner {} -} diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 2e2ce936e0..eed25706aa 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -34,6 +34,7 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); + main.furnace().melt(); // {BU} BasketRange memory basketsHeld = main.basketHandler().basketsHeldBy(account); @@ -74,6 +75,7 @@ contract FacadeRead is IFacadeRead { // Poke Main reg.refresh(); + main.furnace().melt(); // Compute # of baskets to create `amount` qRTok uint192 baskets = (rTok.totalSupply() > 0) // {BU} @@ -119,6 +121,7 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); + main.furnace().melt(); uint256 supply = rTok.totalSupply(); @@ -200,7 +203,7 @@ contract FacadeRead is IFacadeRead { IBasketHandler basketHandler = rToken.main().basketHandler(); // solhint-disable-next-line no-empty-blocks - try rToken.main().furnace().melt() {} catch {} // <3.1.0 RTokens may revert while frozen + try rToken.main().furnace().melt() {} catch {} (erc20s, deposits) = basketHandler.quote(FIX_ONE, CEIL); @@ -239,6 +242,7 @@ contract FacadeRead is IFacadeRead { { IMain main = rToken.main(); main.assetRegistry().refresh(); + main.furnace().melt(); erc20s = main.assetRegistry().erc20s(); balances = new uint256[](erc20s.length); @@ -266,26 +270,25 @@ contract FacadeRead is IFacadeRead { // === Views === - /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} - /// @return unstakings {qDrafts} All the pending StRSR unstakings for an account, in drafts - function pendingUnstakings( - RTokenP1 rToken, - uint256 draftEra, - address account - ) external view returns (Pending[] memory unstakings) { - StRSRP1 stRSR = StRSRP1(address(rToken.main().stRSR())); - uint256 left = stRSR.firstRemainingDraft(draftEra, account); - uint256 right = stRSR.draftQueueLen(draftEra, account); + /// @return unstakings All the pending StRSR unstakings for an account + function pendingUnstakings(RTokenP1 rToken, address account) + external + view + returns (Pending[] memory unstakings) + { + StRSRP1Votes stRSR = StRSRP1Votes(address(rToken.main().stRSR())); + uint256 era = stRSR.currentEra(); + uint256 left = stRSR.firstRemainingDraft(era, account); + uint256 right = stRSR.draftQueueLen(era, account); unstakings = new Pending[](right - left); for (uint256 i = 0; i < right - left; i++) { - (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); + (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(era, account, i + left); uint192 diff = drafts; if (i + left > 0) { - (uint192 prevDrafts, ) = stRSR.draftQueues(draftEra, account, i + left - 1); + (uint192 prevDrafts, ) = stRSR.draftQueues(era, account, i + left - 1); diff = drafts - prevDrafts; } diff --git a/contracts/facade/FacadeTest.sol b/contracts/facade/FacadeTest.sol index f95d350282..512457c1b2 100644 --- a/contracts/facade/FacadeTest.sol +++ b/contracts/facade/FacadeTest.sol @@ -67,7 +67,6 @@ contract FacadeTest is IFacadeTest { erc20s ); try main.rsrTrader().manageTokens(rsrERC20s, rsrKinds) {} catch {} - try main.rsrTrader().distributeTokenToBuy() {} catch {} // Start exact RToken auctions (IERC20[] memory rTokenERC20s, TradeKind[] memory rTokenKinds) = traderERC20s( @@ -76,7 +75,6 @@ contract FacadeTest is IFacadeTest { erc20s ); try main.rTokenTrader().manageTokens(rTokenERC20s, rTokenKinds) {} catch {} - try main.rTokenTrader().distributeTokenToBuy() {} catch {} // solhint-enable no-empty-blocks } @@ -100,6 +98,7 @@ contract FacadeTest is IFacadeTest { // Poke Main reg.refresh(); + main.furnace().melt(); address backingManager = address(main.backingManager()); IERC20 rsr = main.rsr(); @@ -136,7 +135,6 @@ contract FacadeTest is IFacadeTest { IERC20[] memory traderERC20sAll = new IERC20[](erc20sAll.length); for (uint256 i = 0; i < erc20sAll.length; ++i) { if ( - erc20sAll[i] != trader.tokenToBuy() && address(trader.trades(erc20sAll[i])) == address(0) && erc20sAll[i].balanceOf(address(trader)) > 1 ) { diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index 8126aa12ce..bd796190a7 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -27,14 +27,12 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert - /// low should be nonzero if the asset could be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); /// Should not revert /// lotLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); @@ -69,14 +67,8 @@ interface TestIAsset is IAsset { /// @return {s} Seconds that an oracle value is considered valid function oracleTimeout() external view returns (uint48); - /// @return {s} Seconds that the price() should decay over, after stale price + /// @return {s} Seconds that the lotPrice should decay over, after stale price function priceTimeout() external view returns (uint48); - - /// @return {UoA/tok} The last saved low price - function savedLowPrice() external view returns (uint192); - - /// @return {UoA/tok} The last saved high price - function savedHighPrice() external view returns (uint192); } /// CollateralStatus must obey a linear ordering. That is: diff --git a/contracts/interfaces/IAssetRegistry.sol b/contracts/interfaces/IAssetRegistry.sol index add18d69b5..caeaac2f3e 100644 --- a/contracts/interfaces/IAssetRegistry.sol +++ b/contracts/interfaces/IAssetRegistry.sol @@ -34,7 +34,7 @@ interface IAssetRegistry is IComponent { function init(IMain main_, IAsset[] memory assets_) external; /// Fully refresh all asset state - /// @custom:refresher + /// @custom:interaction function refresh() external; /// Register `asset` diff --git a/contracts/interfaces/IBackingManager.sol b/contracts/interfaces/IBackingManager.sol index b9b3c5beca..0699da6d6c 100644 --- a/contracts/interfaces/IBackingManager.sol +++ b/contracts/interfaces/IBackingManager.sol @@ -2,38 +2,10 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./IAssetRegistry.sol"; -import "./IBasketHandler.sol"; import "./IBroker.sol"; import "./IComponent.sol"; -import "./IRToken.sol"; -import "./IStRSR.sol"; import "./ITrading.sol"; -/// Memory struct for RecollateralizationLibP1 + RTokenAsset -/// Struct purposes: -/// 1. Configure trading -/// 2. Stay under stack limit with fewer vars -/// 3. Cache information such as component addresses and basket quantities, to save on gas -struct TradingContext { - BasketRange basketsHeld; // {BU} - // basketsHeld.top is the number of partial baskets units held - // basketsHeld.bottom is the number of full basket units held - - // Components - IBasketHandler bh; - IAssetRegistry ar; - IStRSR stRSR; - IERC20 rsr; - IRToken rToken; - // Gov Vars - uint192 minTradeVolume; // {UoA} - uint192 maxTradeSlippage; // {1} - // Cached values - uint192[] quantities; // {tok/BU} basket quantities - uint192[] bals; // {tok} balances in BackingManager + out on trades -} - /** * @title IBackingManager * @notice The BackingManager handles changes in the ERC20 balances that back an RToken. @@ -76,15 +48,6 @@ interface IBackingManager is IComponent, ITrading { /// @param erc20s The tokens to forward /// @custom:interaction RCEI function forwardRevenue(IERC20[] calldata erc20s) external; - - /// Structs for trading - /// @param basketsHeld The number of baskets held by the BackingManager - /// @return ctx The TradingContext - /// @return reg Contents of AssetRegistry.getRegistry() - function tradingContext(BasketRange memory basketsHeld) - external - view - returns (TradingContext memory ctx, Registry memory reg); } interface TestIBackingManager is IBackingManager, TestITrading { diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index 2ed829d1b9..42bb8bf092 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -133,14 +133,12 @@ interface IBasketHandler is IComponent { function basketsHeldBy(address account) external view returns (BasketRange memory); /// Should not revert - /// low should be nonzero when BUs are worth selling /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); /// Should not revert /// lotLow should be nonzero if a BU could be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index fcaeac2c10..20e2ed0cb0 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -11,7 +11,7 @@ enum TradeKind { BATCH_AUCTION } -/// Cache of all prices for a pair to prevent re-lookup +/// Cache of all (lot) prices for a pair to prevent re-lookup struct TradePrices { uint192 sellLow; // {UoA/sellTok} can be 0 uint192 sellHigh; // {UoA/sellTok} should not be 0 diff --git a/contracts/interfaces/IFacadeMonitor.sol b/contracts/interfaces/IFacadeMonitor.sol deleted file mode 100644 index 6c4f6f8d2d..0000000000 --- a/contracts/interfaces/IFacadeMonitor.sol +++ /dev/null @@ -1,49 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "./IRToken.sol"; - -/** - * @title IFacadeMonitor - * @notice A monitoring layer for RTokens - */ - -/// PluginType -enum CollPluginType { - AAVE_V2, - AAVE_V3, - COMPOUND_V2, - COMPOUND_V3, - STARGATE, - FLUX, - MORPHO_AAVE_V2 -} - -/** - * @title MonitorParams - * @notice The set of protocol params needed for the required calculations - * Should be defined at deployment based on network - */ - -// solhint-disable var-name-mixedcase -struct MonitorParams { - // === AAVE_V2=== - address AAVE_V2_DATA_PROVIDER_ADDR; -} - -interface IFacadeMonitor { - // === Views === - function batchAuctionsDisabled(IRToken rToken) external view returns (bool); - - function dutchAuctionsDisabled(IRToken rToken) external view returns (bool); - - function issuanceAvailable(IRToken rToken) external view returns (uint256); - - function redemptionAvailable(IRToken rToken) external view returns (uint256); - - function backingReedemable( - IRToken rToken, - CollPluginType collType, - IERC20 erc20 - ) external view returns (uint256); -} diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IFacadeRead.sol index df5f039d64..44af758dec 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IFacadeRead.sol @@ -85,15 +85,12 @@ interface IFacadeRead { uint256 amount; } - /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query - /// @dev Use stRSR.draftRate() to convert {qDrafts} to {qRSR} - /// @return {qDrafts} All the pending unstakings for an account, in drafts - function pendingUnstakings( - RTokenP1 rToken, - uint256 draftEra, - address account - ) external view returns (Pending[] memory); + /// @return All the pending StRSR unstakings for an account + function pendingUnstakings(RTokenP1 rToken, address account) + external + view + returns (Pending[] memory); /// Returns the prime basket /// @dev Indices are shared across return values diff --git a/contracts/interfaces/ITrade.sol b/contracts/interfaces/ITrade.sol index f9e95114f9..d05e3028f6 100644 --- a/contracts/interfaces/ITrade.sol +++ b/contracts/interfaces/ITrade.sol @@ -27,9 +27,6 @@ interface ITrade { function buy() external view returns (IERC20Metadata); - /// @return {tok} The sell amount of the trade, in whole tokens - function sellAmount() external view returns (uint192); - /// @return The timestamp at which the trade is projected to become settle-able function endTime() external view returns (uint48); diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index c70c7a8857..7518551125 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.1.0"; +string constant VERSION = "3.0.1"; /** * @title Versioned diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 34a28ce66a..c22df732c7 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -32,8 +32,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind - mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades - constructor() { ONE_BLOCK = NetworkConfigLib.blocktime(); } @@ -71,7 +69,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { returns (ITrade trade) { trade = super.settleTrade(sell); - delete tokensOut[trade.sell()]; // if the settler is the trade contract itself, try chaining with another rebalance() if (_msgSender() == address(trade)) { @@ -89,6 +86,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { /// @custom:interaction function rebalance(TradeKind kind) external notTradingPausedOrFrozen { main.assetRegistry().refresh(); + main.furnace().melt(); // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( @@ -137,8 +135,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // Execute Trade ITrade trade = tryTrade(kind, req, prices); - tradeEnd[kind] = trade.endTime(); // {s} - tokensOut[trade.sell()] = trade.sellAmount(); // {tok} + tradeEnd[kind] = trade.endTime(); } else { // Haircut time compromiseBasketsNeeded(basketsHeld.bottom); @@ -152,6 +149,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { require(ArrayLib.allUnique(erc20s), "duplicate tokens"); main.assetRegistry().refresh(); + main.furnace().melt(); require(tradesOpen == 0, "trade open"); require(main.basketHandler().isReady(), "basket not ready"); @@ -168,19 +166,15 @@ contract BackingManagerP0 is TradingP0, IBackingManager { uint256 rsrBal = main.rsr().balanceOf(address(this)); if (rsrBal > 0) { main.rsr().safeTransfer(address(main.stRSR()), rsrBal); - main.stRSR().payoutRewards(); } // Mint revenue RToken // Keep backingBuffer worth of collateral before recognizing revenue - { - uint192 baskets = (basketsHeld.bottom.div(FIX_ONE + backingBuffer)); - if (baskets > main.rToken().basketsNeeded()) { - main.rToken().mint(baskets - main.rToken().basketsNeeded()); - } - } - uint192 needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // {BU} + if (basketsHeld.bottom.gt(needed)) { + main.rToken().mint(basketsHeld.bottom.minus(needed)); + needed = main.rToken().basketsNeeded().mul(FIX_ONE.plus(backingBuffer)); // keep buffer + } // Handout excess assets above what is needed, including any newly minted RToken RevenueTotals memory totals = main.distributor().totals(); @@ -209,40 +203,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { } } - // === View === - - /// Structs for trading - /// @param basketsHeld The number of baskets held by the BackingManager - /// @return ctx The TradingContext - /// @return reg Contents of AssetRegistry.getRegistry() - function tradingContext(BasketRange memory basketsHeld) - public - view - returns (TradingContext memory ctx, Registry memory reg) - { - reg = main.assetRegistry().getRegistry(); - - ctx.basketsHeld = basketsHeld; - ctx.bh = main.basketHandler(); - ctx.ar = main.assetRegistry(); - ctx.stRSR = main.stRSR(); - ctx.rsr = main.rsr(); - ctx.rToken = main.rToken(); - ctx.minTradeVolume = minTradeVolume; - ctx.maxTradeSlippage = maxTradeSlippage; - ctx.quantities = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.quantities[i] = ctx.bh.quantity(reg.erc20s[i]); - } - ctx.bals = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.bals[i] = reg.assets[i].bal(address(this)) + tokensOut[reg.erc20s[i]]; - - // include StRSR's balance for RSR - if (reg.erc20s[i] == ctx.rsr) ctx.bals[i] += reg.assets[i].bal(address(ctx.stRSR)); - } - } - // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 998c25e65f..357b0a7251 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -183,8 +183,6 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; - - trackStatus(); } /// Switch the basket, only callable directly by governance or after a default @@ -201,7 +199,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { require( main.hasRole(OWNER, _msgSender()) || - (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), + (status() == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); _switchBasket(); @@ -379,7 +377,6 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { /// Should not revert /// lowLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/BU} The lower end of the lot price estimate /// @return lotHigh {UoA/BU} The upper end of the lot price estimate // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index b53c2e0417..02b88de2f3 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -92,7 +92,7 @@ contract BrokerP0 is ComponentP0, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected - function reportViolation() external { + function reportViolation() external notTradingPausedOrFrozen { require(trades[_msgSender()], "unrecognized trade contract"); ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); @@ -239,11 +239,6 @@ contract BrokerP0 is ComponentP0, IBroker { "dutch auctions disabled for token pair" ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); - require( - priceNotDecayed(req.sell) && priceNotDecayed(req.buy), - "dutch auctions require live prices" - ); - DutchTrade trade = DutchTrade(Clones.clone(address(dutchTradeImplementation))); trades[address(trade)] = true; @@ -256,10 +251,4 @@ contract BrokerP0 is ComponentP0, IBroker { trade.init(caller, req.sell, req.buy, req.sellAmount, dutchAuctionLength, prices); return trade; } - - /// @return true iff the price is not decayed, or it's the RTokenAsset - function priceNotDecayed(IAsset asset) private view returns (bool) { - return - asset.lastSave() == block.timestamp || address(asset.erc20()) == address(main.rToken()); - } } diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 264d7bfe7e..d305e9b521 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -33,11 +33,6 @@ contract DistributorP0 is ComponentP0, IDistributor { /// Set the RevenueShare for destination `dest`. Destinations `FURNACE` and `ST_RSR` refer to /// main.furnace() and main.stRSR(). function setDistribution(address dest, RevenueShare memory share) external governance { - // solhint-disable-next-line no-empty-blocks - try main.rsrTrader().distributeTokenToBuy() {} catch {} - // solhint-disable-next-line no-empty-blocks - try main.rTokenTrader().distributeTokenToBuy() {} catch {} - _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); @@ -63,15 +58,13 @@ contract DistributorP0 is ComponentP0, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - if (totalShares > 0) tokensPerShare = amount / totalShares; - require(tokensPerShare > 0, "nothing to distribute"); + require(totalShares > 0, "nothing to distribute"); + tokensPerShare = amount / totalShares; } // Evenly distribute revenue tokens per distribution share. // This rounds "early", and that's deliberate! - bool accountRewards = false; - for (uint256 i = 0; i < destinations.length(); i++) { address addrTo = destinations.at(i); @@ -83,23 +76,12 @@ contract DistributorP0 is ComponentP0, IDistributor { if (addrTo == FURNACE) { addrTo = address(main.furnace()); - if (transferAmt > 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = address(main.stRSR()); - if (transferAmt > 0) accountRewards = true; } erc20.safeTransferFrom(_msgSender(), addrTo, transferAmt); } emit RevenueDistributed(erc20, _msgSender(), amount); - - // Perform reward accounting - if (accountRewards) { - if (isRSR) { - main.stRSR().payoutRewards(); - } else { - main.furnace().melt(); - } - } } /// Returns the rsr + rToken shareTotals diff --git a/contracts/p0/Furnace.sol b/contracts/p0/Furnace.sol index ea0a404a2e..aa99a8140c 100644 --- a/contracts/p0/Furnace.sol +++ b/contracts/p0/Furnace.sol @@ -36,7 +36,7 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Performs any melting that has vested since last call. /// @custom:refresher - function melt() public { + function melt() public notFrozen { if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; // # of whole periods that have passed since lastPayout @@ -58,9 +58,15 @@ contract FurnaceP0 is ComponentP0, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { + if (lastPayout > 0) { + // solhint-disable-next-line no-empty-blocks + try this.melt() {} catch { + uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; + lastPayout += numPeriods * PERIOD; + lastPayoutBal = main.rToken().balanceOf(address(this)); + } + } require(ratio_ <= MAX_RATIO, "invalid ratio"); - melt(); // cannot revert - // The ratio can safely be set to 0, though it is not recommended emit RatioSet(ratio, ratio_); ratio = ratio_; diff --git a/contracts/p0/Main.sol b/contracts/p0/Main.sol index 1859ad8ecb..9493b72c5c 100644 --- a/contracts/p0/Main.sol +++ b/contracts/p0/Main.sol @@ -37,7 +37,8 @@ contract MainP0 is Versioned, Initializable, Auth, ComponentRegistry, IMain { /// @custom:refresher function poke() external { - assetRegistry.refresh(); // runs furnace.melt() + assetRegistry.refresh(); + if (!frozen()) furnace.melt(); stRSR.payoutRewards(); // NOT basketHandler.refreshBasket } diff --git a/contracts/p0/RevenueTrader.sol b/contracts/p0/RevenueTrader.sol index 8fecf2eb76..a62cf8bd18 100644 --- a/contracts/p0/RevenueTrader.sol +++ b/contracts/p0/RevenueTrader.sol @@ -32,14 +32,14 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction - function settleTrade(IERC20 sell) public override(ITrading, TradingP0) returns (ITrade trade) { + function settleTrade(IERC20 sell) + public + override(ITrading, TradingP0) + notTradingPausedOrFrozen + returns (ITrade trade) + { trade = super.settleTrade(sell); - - // solhint-disable-next-line no-empty-blocks - try this.distributeTokenToBuy() {} catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - } + _distributeTokenToBuy(); // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -80,18 +80,10 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { { require(erc20s.length > 0, "empty erc20s list"); require(erc20s.length == kinds.length, "length mismatch"); - - RevenueTotals memory revTotals = main.distributor().totals(); - require( - (tokenToBuy == main.rsr() && revTotals.rsrTotal > 0) || - (address(tokenToBuy) == address(main.rToken()) && revTotals.rTokenTotal > 0), - "zero distribution" - ); - main.assetRegistry().refresh(); IAsset assetToBuy = main.assetRegistry().toAsset(tokenToBuy); - (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} + (uint192 buyLow, uint192 buyHigh) = assetToBuy.lotPrice(); // {UoA/tok} require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); // For each ERC20: start auction of given kind @@ -107,7 +99,7 @@ contract RevenueTraderP0 is TradingP0, IRevenueTrader { require(address(trades[erc20]) == address(0), "trade open"); require(erc20.balanceOf(address(this)) > 0, "0 balance"); - (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} + (uint192 sellLow, uint192 sellHigh) = assetToSell.lotPrice(); // {UoA/tok} TradingLibP0.TradeInfo memory trade = TradingLibP0.TradeInfo({ sell: assetToSell, diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index a9a3e597ec..fe3676dcef 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -77,11 +77,9 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // {qRSR} How much reward RSR was held the last time rewards were paid out uint256 internal rsrRewardsAtLastPayout; - // Eras. These are only really here for equivalence with P1, which requires it - // If there's ever a total RSR wipeout to balances, this is incremented + // Era. If ever there's a total RSR wipeout, this is incremented + // This is only really here for equivalence with P1, which requires it uint256 internal era; - // If there's ever a total RSR wipeout to pending withdrawals, this is incremented - uint256 internal draftEra; // The momentary stake/unstake rate is rsrBacking/totalStaked {RSR/stRSR} // That rate is locked in when slow unstaking *begins* @@ -138,7 +136,6 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { setRewardRatio(rewardRatio_); setWithdrawalLeak(withdrawalLeak_); era = 1; - draftEra = 1; } /// Assign reward payouts to the staker pool @@ -204,7 +201,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint256 lastAvailableAt = index > 0 ? withdrawals[account][index - 1].availableAt : 0; uint256 availableAt = Math.max(block.timestamp + unstakingDelay, lastAvailableAt); withdrawals[account].push(Withdrawal(account, rsrAmount, stakeAmount, availableAt)); - emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); + emit UnstakingStarted(index, era, account, rsrAmount, stakeAmount, availableAt); } /// Complete delayed staking for an account, up to but not including draft ID `endId` @@ -242,7 +239,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { require(bh.isReady(), "basket not ready"); // Execute accumulated withdrawals - emit UnstakingCompleted(start, i, draftEra, account, total); + emit UnstakingCompleted(start, i, era, account, total); main.rsr().safeTransfer(account, total); } @@ -283,7 +280,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } // Execute accumulated withdrawals - emit UnstakingCancelled(start, i, draftEra, account, total); + emit UnstakingCancelled(start, i, era, account, total); uint256 stakeAmount = total; if (totalStaked > 0) stakeAmount = (total * totalStaked) / rsrBacking; @@ -338,7 +335,6 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint256 withdrawalRSRtoTake = (rsrBeingWithdrawn() * rsrAmount + (rsrBalance - 1)) / rsrBalance; if ( - withdrawalRSRtoTake == 0 || rsrBeingWithdrawn() - withdrawalRSRtoTake < MIN_EXCHANGE_RATE.mulu_toUint(stakeBeingWithdrawn()) ) { @@ -386,8 +382,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address account = accounts.at(i); delete withdrawals[account]; } - draftEra++; - emit AllUnstakingReset(draftEra); + emit AllUnstakingReset(era); } /// @custom:governance diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index 6fe87988d1..a71df6c027 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -60,7 +60,7 @@ library TradingLibP0 { ); // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); // {sellTok} uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} // Calculate equivalent buyAmount within [0, FIX_MAX] @@ -145,7 +145,7 @@ library TradingLibP0 { /// 2. Stay under stack limit with fewer vars /// 3. Cache information such as component addresses to save on gas - struct TradingContextP0 { + struct TradingContext { BasketRange basketsHeld; // {BU} // basketsHeld.top is the number of partial baskets units held // basketsHeld.bottom is the number of full basket units held @@ -190,7 +190,7 @@ library TradingLibP0 { // === Prepare cached values === IMain main = bm.main(); - TradingContextP0 memory ctx = TradingContextP0({ + TradingContext memory ctx = TradingContext({ basketsHeld: basketsHeld, bm: bm, bh: main.basketHandler(), @@ -241,9 +241,14 @@ library TradingLibP0 { // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty // the largest amount possible with each trade. // - // Algorithm Invariant: every increase of basketsHeld.bottom causes basketsRange().low to - // reach a new maximum. Note that basketRange().low may decrease slightly along the way. - // Assumptions: constant oracle prices; monotonically increasing refPerTok; no supply changes + // How do we know this algorithm converges? + // Assumption: constant oracle prices; monotonically increasing refPerTok() + // Any volume traded narrows the BU band. Why: + // - We might increase `basketsHeld.bottom` from run-to-run, but will never decrease it + // - We might decrease the UoA amount of excess balances beyond `basketsHeld.bottom` from + // run-to-run, but will never increase it + // - We might decrease the UoA amount of missing balances up-to `basketsHeld.top` from + // run-to-run, but will never increase it // // Preconditions: // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top @@ -264,12 +269,12 @@ library TradingLibP0 { // - range.bottom = min(rToken.basketsNeeded, basketsHeld.bottom + least baskets purchaseable) // where "least baskets purchaseable" involves trading at the worst price, // incurring the full maxTradeSlippage, and taking up to a minTradeVolume loss due to dust. - function basketRange(TradingContextP0 memory ctx, IERC20[] memory erc20s) + function basketRange(TradingContext memory ctx, IERC20[] memory erc20s) internal view returns (BasketRange memory range) { - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.lotPrice(); // {UoA/BU} // Cap ctx.basketsHeld.top if (ctx.basketsHeld.top > ctx.rToken.basketsNeeded()) { @@ -298,15 +303,21 @@ library TradingLibP0 { bal = bal.plus(asset.bal(address(ctx.stRSR))); } - (uint192 low, uint192 high) = asset.price(); // {UoA/tok} - // low decays down; high decays up + { + // Skip over dust-balance assets not in the basket + (uint192 lotLow, ) = asset.lotPrice(); // {UoA/tok} + + // Intentionally include value of IFFY/DISABLED collateral + if ( + ctx.bh.quantity(erc20s[i]) == 0 && + !isEnoughToSell(asset, bal, lotLow, ctx.minTradeVolume) + ) continue; + } - // Skip over dust-balance assets not in the basket - // Intentionally include value of IFFY/DISABLED collateral - if ( - ctx.bh.quantity(erc20s[i]) == 0 && - !isEnoughToSell(asset, bal, low, ctx.minTradeVolume) - ) continue; + (uint192 low, uint192 high) = asset.price(); // {UoA/tok} + // price() is better than lotPrice() here: it's important to not underestimate how + // much value could be in a token that is unpriced by using a decaying high lotPrice. + // price() will return [0, FIX_MAX] in this case, which is preferable. // throughout these sections +/- is same as Fix.plus/Fix.minus and is Fix.gt/.lt @@ -343,7 +354,7 @@ library TradingLibP0 { // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price, + // A: Our use of isEnoughToSell always uses the low price (lotLow, technically), // so min trade volumes are always assesed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up @@ -423,12 +434,10 @@ library TradingLibP0 { // Sell IFFY last because it may recover value in the future. // All collateral in the basket have already been guaranteed to be SOUND by upstream checks. function nextTradePair( - TradingContextP0 memory ctx, + TradingContext memory ctx, IERC20[] memory erc20s, BasketRange memory range ) private view returns (TradeInfo memory trade) { - // assert(tradesOpen == 0); // guaranteed by BackingManager.rebalance() - MaxSurplusDeficit memory maxes; maxes.surplusStatus = CollateralStatus.IFFY; // least-desirable sell status @@ -444,19 +453,19 @@ library TradingLibP0 { // {tok} = {BU} * {tok/BU} uint192 needed = range.top.mul(ctx.bh.quantity(erc20s[i]), CEIL); // {tok} if (bal.gt(needed)) { - (uint192 low, uint192 high) = asset.price(); // {UoA/sellTok} - if (high == 0) continue; // Skip worthless assets + (uint192 lotLow, uint192 lotHigh) = asset.lotPrice(); // {UoA/sellTok} + if (lotHigh == 0) continue; // Skip worthless assets // by calculating this early we can duck the stack limit but be less gas-efficient bool enoughToSell = isEnoughToSell( asset, bal.minus(needed), - low, + lotLow, ctx.minTradeVolume ); // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = bal.minus(needed).mul(low, FLOOR); + uint192 delta = bal.minus(needed).mul(lotLow, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -467,8 +476,8 @@ library TradingLibP0 { if (isBetterSurplus(maxes, status, delta) && enoughToSell) { trade.sell = asset; trade.sellAmount = bal.minus(needed); - trade.prices.sellLow = low; - trade.prices.sellHigh = high; + trade.prices.sellLow = lotLow; + trade.prices.sellHigh = lotHigh; maxes.surplusStatus = status; maxes.surplus = delta; @@ -478,17 +487,17 @@ library TradingLibP0 { needed = range.bottom.mul(ctx.bh.quantity(erc20s[i]), CEIL); // {buyTok}; if (bal.lt(needed)) { uint192 amtShort = needed.minus(bal); // {buyTok} - (uint192 low, uint192 high) = asset.price(); // {UoA/buyTok} + (uint192 lotLow, uint192 lotHigh) = asset.lotPrice(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} - uint192 delta = amtShort.mul(high, CEIL); + uint192 delta = amtShort.mul(lotHigh, CEIL); // The best asset to buy is whichever asset has the largest deficit if (delta.gt(maxes.deficit)) { trade.buy = ICollateral(address(asset)); trade.buyAmount = amtShort; - trade.prices.buyLow = low; - trade.prices.buyHigh = high; + trade.prices.buyLow = lotLow; + trade.prices.buyHigh = lotHigh; maxes.deficit = delta; } @@ -503,13 +512,13 @@ library TradingLibP0 { uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( rsrAsset.bal(address(ctx.stRSR)) ); - (uint192 low, uint192 high) = rsrAsset.price(); // {UoA/RSR} + (uint192 lotLow, uint192 lotHigh) = rsrAsset.lotPrice(); // {UoA/RSR} - if (high > 0 && isEnoughToSell(rsrAsset, rsrAvailable, low, ctx.minTradeVolume)) { + if (lotHigh > 0 && isEnoughToSell(rsrAsset, rsrAvailable, lotLow, ctx.minTradeVolume)) { trade.sell = rsrAsset; trade.sellAmount = rsrAvailable; - trade.prices.sellLow = low; - trade.prices.sellHigh = high; + trade.prices.sellLow = lotLow; + trade.prices.sellHigh = lotHigh; } } } diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index c556a96120..098e47f93a 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -57,8 +57,6 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { // tracks basket status on basketHandler function refresh() public { // It's a waste of gas to require notPausedOrFrozen because assets can be updated directly - // Assuming an RTokenAsset is registered, furnace.melt() will also be called - uint256 length = _erc20s.length(); for (uint256 i = 0; i < length; ++i) { assets[IERC20(_erc20s.at(i))].refresh(); diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index b7191aa097..a64ff3f412 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -45,9 +45,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { IFurnace private furnace; mapping(TradeKind => uint48) private tradeEnd; // {s} last endTime() of an auction per kind - // === 3.1.0 === - mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades - // ==== Invariants ==== // tradingDelay <= MAX_TRADING_DELAY and backingBuffer <= MAX_BACKING_BUFFER @@ -93,7 +90,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { /// @return trade The ITrade contract settled /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { - delete tokensOut[sell]; trade = super.settleTrade(sell); // nonReentrant // if the settler is the trade contract itself, try chaining with another rebalance() @@ -117,6 +113,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { function rebalance(TradeKind kind) external nonReentrant notTradingPausedOrFrozen { // == Refresh == assetRegistry.refresh(); + furnace.melt(); // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( @@ -152,26 +149,22 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * rToken.basketsNeeded to the current basket holdings. Haircut time. */ - (TradingContext memory ctx, Registry memory reg) = tradingContext(basketsHeld); ( bool doTrade, TradeRequest memory req, TradePrices memory prices - ) = RecollateralizationLibP1.prepareRecollateralizationTrade(ctx, reg); + ) = RecollateralizationLibP1.prepareRecollateralizationTrade(this, basketsHeld); if (doTrade) { - IERC20 sellERC20 = req.sell.erc20(); - // Seize RSR if needed - if (sellERC20 == rsr) { - uint256 bal = sellERC20.balanceOf(address(this)); + if (req.sell.erc20() == rsr) { + uint256 bal = req.sell.erc20().balanceOf(address(this)); if (req.sellAmount > bal) stRSR.seizeRSR(req.sellAmount - bal); } // Execute Trade ITrade trade = tryTrade(kind, req, prices); - tradeEnd[kind] = trade.endTime(); // {s} - tokensOut[sellERC20] = trade.sellAmount(); // {tok} + tradeEnd[kind] = trade.endTime(); } else { // Haircut time compromiseBasketsNeeded(basketsHeld.bottom); @@ -191,6 +184,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { require(ArrayLib.allUnique(erc20s), "duplicate tokens"); assetRegistry.refresh(); + furnace.melt(); BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(this)); @@ -218,22 +212,19 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * RToken traders according to the distribution totals. */ - // Forward any RSR held to StRSR pool and payout rewards - // RSR should never be sold for RToken yield + // Forward any RSR held to StRSR pool; RSR should never be sold for RToken yield if (rsr.balanceOf(address(this)) > 0) { // For CEI, this is an interaction "within our system" even though RSR is already live IERC20(address(rsr)).safeTransfer(address(stRSR), rsr.balanceOf(address(this))); - stRSR.payoutRewards(); } // Mint revenue RToken // Keep backingBuffer worth of collateral before recognizing revenue - uint192 baskets = (basketsHeld.bottom.div(FIX_ONE + backingBuffer)); - if (baskets > rToken.basketsNeeded()) { - rToken.mint(baskets - rToken.basketsNeeded()); - } - uint192 needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // {BU} + if (basketsHeld.bottom > needed) { + rToken.mint(basketsHeld.bottom - needed); + needed = rToken.basketsNeeded().mul(FIX_ONE + backingBuffer); // keep buffer + } // At this point, even though basketsNeeded may have changed, we are: // - We're fully collateralized @@ -254,7 +245,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // delta: {qTok}, the excess quantity of this asset that we hold uint256 delta = bal.minus(req).shiftl_toUint(int8(asset.erc20Decimals())); uint256 tokensPerShare = delta / (totals.rTokenTotal + totals.rsrTotal); - if (tokensPerShare == 0) continue; // no div-by-0: Distributor guarantees (totals.rTokenTotal + totals.rsrTotal) > 0 // initial division is intentional here! We'd rather save the dust than be unfair @@ -273,40 +263,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // It's okay if there is leftover dust for RToken or a surplus asset (not RSR) } - // === View === - - /// Structs for trading - /// @param basketsHeld The number of baskets held by the BackingManager - /// @return ctx The TradingContext - /// @return reg Contents of AssetRegistry.getRegistry() - function tradingContext(BasketRange memory basketsHeld) - public - view - returns (TradingContext memory ctx, Registry memory reg) - { - reg = assetRegistry.getRegistry(); - - ctx.basketsHeld = basketsHeld; - ctx.bh = basketHandler; - ctx.ar = assetRegistry; - ctx.stRSR = stRSR; - ctx.rsr = rsr; - ctx.rToken = rToken; - ctx.minTradeVolume = minTradeVolume; - ctx.maxTradeSlippage = maxTradeSlippage; - ctx.quantities = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.quantities[i] = basketHandler.quantityUnsafe(reg.erc20s[i], reg.assets[i]); - } - ctx.bals = new uint192[](reg.erc20s.length); - for (uint256 i = 0; i < reg.erc20s.length; ++i) { - ctx.bals[i] = reg.assets[i].bal(address(this)) + tokensOut[reg.erc20s[i]]; - - // include StRSR's balance for RSR - if (reg.erc20s[i] == rsr) ctx.bals[i] += reg.assets[i].bal(address(stRSR)); - } - } - // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting @@ -351,5 +307,5 @@ contract BackingManagerP1 is TradingP1, IBackingManager { * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[38] private __gap; + uint256[39] private __gap; } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index fa076253bd..2cb493d1a3 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -121,8 +121,6 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 i = 0; i < len; ++i) refAmts[i] = basket.refAmts[basket.erc20s[i]]; emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; - - trackStatus(); } /// Switch the basket, only callable directly by governance or after a default @@ -139,7 +137,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { require( main.hasRole(OWNER, _msgSender()) || - (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), + (status() == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); _switchBasket(); @@ -320,7 +318,6 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { /// Should not revert /// lowLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/BU} The lower end of the lot price estimate /// @return lotHigh {UoA/BU} The upper end of the lot price estimate // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) @@ -424,7 +421,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 k = 0; k < len; ++k) { if (b.erc20s[j] == erc20sAll[k]) { erc20Index = k; - break; + continue; } } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0111d25bc3..cfc6100a93 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -63,10 +63,6 @@ contract BrokerP1 is ComponentP1, IBroker { // Whether Dutch Auctions are currently disabled, per ERC20 mapping(IERC20Metadata => bool) public dutchTradeDisabled; - // === 3.1.0 === - - IRToken private rToken; - // ==== Invariant ==== // (trades[addr] == true) iff this contract has created an ITrade clone at addr @@ -85,7 +81,10 @@ contract BrokerP1 is ComponentP1, IBroker { uint48 dutchAuctionLength_ ) external initializer { __Component_init(main_); - cacheComponents(); + + backingManager = main_.backingManager(); + rsrTrader = main_.rsrTrader(); + rTokenTrader = main_.rTokenTrader(); setGnosis(gnosis_); setBatchTradeImplementation(batchTradeImplementation_); @@ -94,14 +93,6 @@ contract BrokerP1 is ComponentP1, IBroker { setDutchAuctionLength(dutchAuctionLength_); } - /// Call after upgrade to >= 3.1.0 - function cacheComponents() public { - backingManager = main.backingManager(); - rsrTrader = main.rsrTrader(); - rTokenTrader = main.rTokenTrader(); - rToken = main.rToken(); - } - /// Handle a trade request by deploying a customized disposable trading contract /// @param kind TradeKind.DUTCH_AUCTION or TradeKind.BATCH_AUCTION /// @dev Requires setting an allowance in advance @@ -136,9 +127,9 @@ contract BrokerP1 is ComponentP1, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected - // checks: caller is a Trade this contract cloned + // checks: not paused (trading), not frozen, caller is a Trade this contract cloned // effects: disabled' = true - function reportViolation() external { + function reportViolation() external notTradingPausedOrFrozen { require(trades[_msgSender()], "unrecognized trade contract"); ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); @@ -265,11 +256,6 @@ contract BrokerP1 is ComponentP1, IBroker { "dutch auctions disabled for token pair" ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); - require( - priceNotDecayed(req.sell) && priceNotDecayed(req.buy), - "dutch auctions require live prices" - ); - DutchTrade trade = DutchTrade(address(dutchTradeImplementation).clone()); trades[address(trade)] = true; @@ -284,15 +270,10 @@ contract BrokerP1 is ComponentP1, IBroker { return trade; } - /// @return true iff the price is not decayed, or it's the RTokenAsset - function priceNotDecayed(IAsset asset) private view returns (bool) { - return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(rToken); - } - /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[41] private __gap; + uint256[42] private __gap; } diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 776e19fe5a..ca818f5a14 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -57,17 +57,13 @@ contract DistributorP1 is ComponentP1, IDistributor { // destinations' = destinations.add(dest) // distribution' = distribution.set(dest, share) function setDistribution(address dest, RevenueShare memory share) external governance { - // solhint-disable-next-line no-empty-blocks - try main.rsrTrader().distributeTokenToBuy() {} catch {} - // solhint-disable-next-line no-empty-blocks - try main.rTokenTrader().distributeTokenToBuy() {} catch {} - _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); } struct Transfer { + IERC20 erc20; address addrTo; uint256 amount; } @@ -98,8 +94,8 @@ contract DistributorP1 is ComponentP1, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - if (totalShares > 0) tokensPerShare = amount / totalShares; - require(tokensPerShare > 0, "nothing to distribute"); + require(totalShares > 0, "nothing to distribute"); + tokensPerShare = amount / totalShares; } // Evenly distribute revenue tokens per distribution share. @@ -111,8 +107,6 @@ contract DistributorP1 is ComponentP1, IDistributor { address furnaceAddr = furnace; // gas-saver address stRSRAddr = stRSR; // gas-saver - bool accountRewards = false; - for (uint256 i = 0; i < destinations.length(); ++i) { address addrTo = destinations.at(i); @@ -124,13 +118,15 @@ contract DistributorP1 is ComponentP1, IDistributor { if (addrTo == FURNACE) { addrTo = furnaceAddr; - if (transferAmt > 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = stRSRAddr; - if (transferAmt > 0) accountRewards = true; } - transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); + transfers[numTransfers] = Transfer({ + erc20: erc20, + addrTo: addrTo, + amount: transferAmt + }); numTransfers++; } emit RevenueDistributed(erc20, caller, amount); @@ -138,16 +134,7 @@ contract DistributorP1 is ComponentP1, IDistributor { // == Interactions == for (uint256 i = 0; i < numTransfers; i++) { Transfer memory t = transfers[i]; - IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); - } - - // Perform reward accounting - if (accountRewards) { - if (isRSR) { - main.stRSR().payoutRewards(); - } else { - main.furnace().melt(); - } + IERC20Upgradeable(address(t.erc20)).safeTransferFrom(caller, t.addrTo, t.amount); } } diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 63dcc695d4..923ba33737 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -71,7 +71,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { // actions: // rToken.melt(payoutAmount), paying payoutAmount to RToken holders - function melt() public { + function melt() external notFrozen { if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; // # of whole periods that have passed since lastPayout @@ -90,9 +90,15 @@ contract FurnaceP1 is ComponentP1, IFurnace { /// Ratio setting /// @custom:governance function setRatio(uint192 ratio_) public governance { + if (lastPayout > 0) { + // solhint-disable-next-line no-empty-blocks + try this.melt() {} catch { + uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; + lastPayout += numPeriods * PERIOD; + lastPayoutBal = rToken.balanceOf(address(this)); + } + } require(ratio_ <= MAX_RATIO, "invalid ratio"); - melt(); // cannot revert - // The ratio can safely be set to 0 to turn off payouts, though it is not recommended emit RatioSet(ratio, ratio_); ratio = ratio_; diff --git a/contracts/p1/Main.sol b/contracts/p1/Main.sol index 21781ca082..43bddcaed7 100644 --- a/contracts/p1/Main.sol +++ b/contracts/p1/Main.sol @@ -43,9 +43,10 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad /// @dev Not intended to be used in production, only for equivalence with P0 function poke() external { // == Refresher == - assetRegistry.refresh(); // runs furnace.melt() + assetRegistry.refresh(); // == CE block == + if (!frozen()) furnace.melt(); stRSR.payoutRewards(); } diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 1c07b650ef..8b447d4273 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -108,6 +108,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Refresh == assetRegistry.refresh(); + furnace.melt(); // == Checks-effects block == @@ -181,6 +182,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { function redeemTo(address recipient, uint256 amount) public notFrozen { // == Refresh == assetRegistry.refresh(); + // solhint-disable-next-line no-empty-blocks + try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == @@ -252,6 +255,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { ) external notFrozen { // == Refresh == assetRegistry.refresh(); + // solhint-disable-next-line no-empty-blocks + try furnace.melt() {} catch {} // nice for the redeemer, but not necessary // == Checks and Effects == diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 998bdc951f..43253c6b0e 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -53,12 +53,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { /// @custom:interaction function settleTrade(IERC20 sell) public override(ITrading, TradingP1) returns (ITrade trade) { trade = super.settleTrade(sell); // nonReentrant - - // solhint-disable-next-line no-empty-blocks - try this.distributeTokenToBuy() {} catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - } + _distributeTokenToBuy(); // unlike BackingManager, do _not_ chain trades; b2b trades of the same token are unlikely } @@ -112,12 +107,6 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { uint256 len = erc20s.length; require(len > 0, "empty erc20s list"); require(len == kinds.length, "length mismatch"); - RevenueTotals memory revTotals = distributor.totals(); - require( - (tokenToBuy == rsr && revTotals.rsrTotal > 0) || - (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal > 0), - "zero distribution" - ); // Calculate if the trade involves any RToken // Distribute tokenToBuy if supplied in ERC20s list @@ -134,8 +123,10 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { IAsset assetToBuy = assetRegistry.toAsset(tokenToBuy); // Refresh everything if RToken is involved - if (involvesRToken) assetRegistry.refresh(); - else { + if (involvesRToken) { + assetRegistry.refresh(); + furnace.melt(); + } else { // Otherwise: refresh just the needed assets and nothing more for (uint256 i = 0; i < len; ++i) { assetRegistry.toAsset(erc20s[i]).refresh(); @@ -144,7 +135,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { } // Cache and validate buyHigh - (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} + (uint192 buyLow, uint192 buyHigh) = assetToBuy.lotPrice(); // {UoA/tok} require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); // For each ERC20 that isn't the tokenToBuy, start an auction of the given kind @@ -156,7 +147,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { require(erc20.balanceOf(address(this)) > 0, "0 balance"); IAsset assetToSell = assetRegistry.toAsset(erc20); - (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} + (uint192 sellLow, uint192 sellHigh) = assetToSell.lotPrice(); // {UoA/tok} TradeInfo memory trade = TradeInfo({ sell: assetToSell, diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index faff182759..527d63f50c 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -76,15 +76,15 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // === Financial State: Drafts === // Era. If drafts get wiped out due to RSR seizure, increment the era to zero draft values. // Only ever directly written by beginDraftEra() - uint256 internal draftEra; // {draftEra} + uint256 internal draftEra; // Drafts: share of the withdrawing tokens. Not transferrable and not revenue-earning. struct CumulativeDraft { // Avoid re-using uint192 in order to avoid confusion with our type system; 176 is enough uint176 drafts; // Total amount of drafts that will become available // {qDrafts} uint64 availableAt; // When the last of the drafts will become available } - // {draftEra} => ({account} => {qDrafts}) - mapping(uint256 => mapping(address => CumulativeDraft[])) public draftQueues; // {qDrafts} + // draftEra => ({account} => {drafts}) + mapping(uint256 => mapping(address => CumulativeDraft[])) public draftQueues; // {drafts} mapping(uint256 => mapping(address => uint256)) public firstRemainingDraft; // draft index uint256 private totalDrafts; // Total of all drafts {qDrafts} uint256 private draftRSR; // Amount of RSR backing all drafts {qRSR} @@ -285,7 +285,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // Create draft (uint256 index, uint64 availableAt) = pushDraft(account, rsrAmount); - emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); + emit UnstakingStarted(index, era, account, rsrAmount, stakeAmount, availableAt); } /// Complete an account's unstaking; callable by anyone @@ -564,11 +564,6 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab return totalDrafts; } - /// @return {draftEra} The current era for drafts (withdrawals) - function getDraftEra() external view returns (uint256) { - return draftEra; - } - // ==== Internal Functions ==== /// Assign reward payouts to the staker pool diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index 8edb10f86c..dd86e45ca1 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -8,6 +8,29 @@ import "../../interfaces/IBackingManager.sol"; import "../../libraries/Fixed.sol"; import "./TradeLib.sol"; +/// Struct purposes: +/// 1. Configure trading +/// 2. Stay under stack limit with fewer vars +/// 3. Cache information such as component addresses to save on gas +struct TradingContext { + BasketRange basketsHeld; // {BU} + // basketsHeld.top is the number of partial baskets units held + // basketsHeld.bottom is the number of full basket units held + + // Components + IBackingManager bm; + IBasketHandler bh; + IAssetRegistry ar; + IStRSR stRSR; + IERC20 rsr; + IRToken rToken; + // Gov Vars + uint192 minTradeVolume; // {UoA} + uint192 maxTradeSlippage; // {1} + // Cached values + uint192[] quantities; // {tok/BU} basket quantities +} + /** * @title RecollateralizationLibP1 * @notice An informal extension of BackingManager that implements the rebalancing logic @@ -33,7 +56,7 @@ library RecollateralizationLibP1 { // let trade = nextTradePair(...) // if trade.sell is not a defaulted collateral, prepareTradeToCoverDeficit(...) // otherwise, prepareTradeSell(...) taking the minBuyAmount as the dependent variable - function prepareRecollateralizationTrade(TradingContext memory ctx, Registry memory reg) + function prepareRecollateralizationTrade(IBackingManager bm, BasketRange memory basketsHeld) external view returns ( @@ -42,8 +65,31 @@ library RecollateralizationLibP1 { TradePrices memory prices ) { + IMain main = bm.main(); + + // === Prepare TradingContext cache === + TradingContext memory ctx; + + ctx.basketsHeld = basketsHeld; + ctx.bm = bm; + ctx.bh = main.basketHandler(); + ctx.ar = main.assetRegistry(); + ctx.stRSR = main.stRSR(); + ctx.rsr = main.rsr(); + ctx.rToken = main.rToken(); + ctx.minTradeVolume = bm.minTradeVolume(); + ctx.maxTradeSlippage = bm.maxTradeSlippage(); + + // Calculate quantities + Registry memory reg = ctx.ar.getRegistry(); + ctx.quantities = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.quantities[i] = ctx.bh.quantityUnsafe(reg.erc20s[i], reg.assets[i]); + } + + // ============================ + // Compute a target basket range for trading - {BU} - // The basket range is the full range of projected outcomes for the rebalancing process BasketRange memory range = basketRange(ctx, reg); // Select a pair to trade next, if one exists @@ -85,17 +131,22 @@ library RecollateralizationLibP1 { // token balances requiring trading vs not requiring trading. Seek to decrease uncertainty // the largest amount possible with each trade. // - // Algorithm Invariant: every increase of basketsHeld.bottom causes basketsRange().low to - // reach a new maximum. Note that basketRange().low may decrease slightly along the way. - // Assumptions: constant oracle prices; monotonically increasing refPerTok; no supply changes + // How do we know this algorithm converges? + // Assumption: constant oracle prices; monotonically increasing refPerTok() + // Any volume traded narrows the BU band. Why: + // - We might increase `basketsHeld.bottom` from run-to-run, but will never decrease it + // - We might decrease the UoA amount of excess balances beyond `basketsHeld.bottom` from + // run-to-run, but will never increase it + // - We might decrease the UoA amount of missing balances up-to `basketsHeld.top` from + // run-to-run, but will never increase it // // Preconditions: // - ctx is correctly populated, with current basketsHeld.bottom + basketsHeld.top // - reg contains erc20 + asset + quantities arrays in same order and without duplicates // Trading Strategy: // - We will not aim to hold more than rToken.basketsNeeded() BUs - // - No double trades: capital converted from token A to token B should not go to token C - // unless the clearing price was outside the expected price range + // - No double trades: if we buy B in one trade, we won't sell B in another trade + // Caveat: Unless the asset we're selling is IFFY/DISABLED // - The best price we might get for a trade is at the high sell price and low buy price // - The worst price we might get for a trade is at the low sell price and // the high buy price, multiplied by ( 1 - maxTradeSlippage ) @@ -113,12 +164,7 @@ library RecollateralizationLibP1 { view returns (BasketRange memory range) { - // tradesOpen will be 0 when called by prepareRecollateralizationTrade() - // tradesOpen can be > 0 when called by RTokenAsset.basketRange() - - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} - require(buPriceLow > 0 && buPriceHigh < FIX_MAX, "BUs unpriced"); - + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.lotPrice(); // {UoA/BU} uint192 basketsNeeded = ctx.rToken.basketsNeeded(); // {BU} // Cap ctx.basketsHeld.top @@ -143,17 +189,28 @@ library RecollateralizationLibP1 { // Exclude RToken balances to avoid double counting value if (reg.erc20s[i] == IERC20(address(ctx.rToken))) continue; - (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} + uint192 bal = reg.assets[i].bal(address(ctx.bm)); // {tok} - // Skip over dust-balance assets not in the basket - // Intentionally include value of IFFY/DISABLED collateral - if ( - ctx.quantities[i] == 0 && - !TradeLib.isEnoughToSell(reg.assets[i], ctx.bals[i], low, ctx.minTradeVolume) - ) { - continue; + // For RSR, include the staking balance + if (reg.erc20s[i] == ctx.rsr) { + bal = bal.plus(reg.assets[i].bal(address(ctx.stRSR))); + } + + if (ctx.quantities[i] == 0) { + // Skip over dust-balance assets not in the basket + (uint192 lotLow, ) = reg.assets[i].lotPrice(); // {UoA/tok} + + // Intentionally include value of IFFY/DISABLED collateral + if (!TradeLib.isEnoughToSell(reg.assets[i], bal, lotLow, ctx.minTradeVolume)) { + continue; + } } + (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/tok} + // price() is better than lotPrice() here: it's important to not underestimate how + // much value could be in a token that is unpriced by using a decaying high lotPrice. + // price() will return [0, FIX_MAX] in this case, which is preferable. + // throughout these sections +/- is same as Fix.plus/Fix.minus and is Fix.gt/.lt // deltaTop: optimistic case @@ -163,21 +220,17 @@ library RecollateralizationLibP1 { // {tok} = {tok/BU} * {BU} uint192 anchor = ctx.quantities[i].mul(ctx.basketsHeld.top, CEIL); - if (anchor > ctx.bals[i]) { + if (anchor > bal) { // deficit: deduct optimistic estimate of baskets missing // {BU} = {UoA/tok} * {tok} / {UoA/BU} - deltaTop -= int256( - uint256(low.mulDiv(anchor - ctx.bals[i], buPriceHigh, FLOOR)) - ); + deltaTop -= int256(uint256(low.mulDiv(anchor - bal, buPriceHigh, FLOOR))); // does not need underflow protection: using low price of asset } else { // surplus: add-in optimistic estimate of baskets purchaseable // {BU} = {UoA/tok} * {tok} / {UoA/BU} - deltaTop += int256( - uint256(high.safeMulDiv(ctx.bals[i] - anchor, buPriceLow, CEIL)) - ); + deltaTop += int256(uint256(high.safeMulDiv(bal - anchor, buPriceLow, CEIL))); } } @@ -189,12 +242,12 @@ library RecollateralizationLibP1 { // (1) Sum token value at low price // {UoA} = {UoA/tok} * {tok} - uint192 val = low.mul(ctx.bals[i] - anchor, FLOOR); + uint192 val = low.mul(bal - anchor, FLOOR); // (2) Lose minTradeVolume to dust (why: auctions can return tokens) // Q: Why is this precisely where we should take out minTradeVolume? - // A: Our use of isEnoughToSell always uses the low price, - // so min trade volumes are always assessed based on low prices. At this point + // A: Our use of isEnoughToSell always uses the low price (lotLow, technically), + // so min trade volumes are always assesed based on low prices. At this point // in the calculation we have already calculated the UoA amount corresponding to // the excess token balance based on its low price, so we are already set up // to straightforwardly deduct the minTradeVolume before trying to buy BUs. @@ -252,9 +305,9 @@ library RecollateralizationLibP1 { /// prices.buyLow {UoA/buyTok} The best-case price of the buy token on secondary markets /// prices.buyHigh {UoA/buyTok} The worst-case price of the buy token on secondary markets /// - // For each asset e: - // If bal(e) > (quantity(e) * range.top), then e is in surplus by the difference - // If bal(e) < (quantity(e) * range.bottom), then e is in deficit by the difference + // Defining "sell" and "buy": + // If bal(e) > (quantity(e) * range.top), then e is in surplus by the difference + // If bal(e) < (quantity(e) * range.bottom), then e is in deficit by the difference // // First, ignoring RSR: // `trade.sell` is the token from erc20s with the greatest surplus value (in UoA), @@ -277,33 +330,26 @@ library RecollateralizationLibP1 { Registry memory reg, BasketRange memory range ) private view returns (TradeInfo memory trade) { - // assert(tradesOpen == 0); // guaranteed by BackingManager.rebalance() - MaxSurplusDeficit memory maxes; maxes.surplusStatus = CollateralStatus.IFFY; // least-desirable sell status - uint256 rsrIndex = reg.erc20s.length; // invalid index, to-start - // Iterate over non-RSR/non-RToken assets // (no space on the stack to cache erc20s.length) for (uint256 i = 0; i < reg.erc20s.length; ++i) { - if (address(reg.erc20s[i]) == address(ctx.rToken)) continue; - else if (reg.erc20s[i] == ctx.rsr) { - rsrIndex = i; - continue; - } + if (reg.erc20s[i] == ctx.rsr || address(reg.erc20s[i]) == address(ctx.rToken)) continue; + + uint192 bal = reg.assets[i].bal(address(ctx.bm)); // {tok} // {tok} = {BU} * {tok/BU} // needed(Top): token balance needed for range.top baskets: quantity(e) * range.top uint192 needed = range.top.mul(ctx.quantities[i], CEIL); // {tok} - if (ctx.bals[i].gt(needed)) { - (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/sellTok} - - if (high == 0) continue; // skip over worthless assets + if (bal.gt(needed)) { + (uint192 lotLow, uint192 lotHigh) = reg.assets[i].lotPrice(); // {UoA/sellTok} + if (lotHigh == 0) continue; // skip over worthless assets // {UoA} = {sellTok} * {UoA/sellTok} - uint192 delta = ctx.bals[i].minus(needed).mul(low, FLOOR); + uint192 delta = bal.minus(needed).mul(lotLow, FLOOR); // status = asset.status() if asset.isCollateral() else SOUND CollateralStatus status; // starts SOUND @@ -317,15 +363,15 @@ library RecollateralizationLibP1 { isBetterSurplus(maxes, status, delta) && TradeLib.isEnoughToSell( reg.assets[i], - ctx.bals[i].minus(needed), - low, + bal.minus(needed), + lotLow, ctx.minTradeVolume ) ) { trade.sell = reg.assets[i]; - trade.sellAmount = ctx.bals[i].minus(needed); - trade.prices.sellLow = low; - trade.prices.sellHigh = high; + trade.sellAmount = bal.minus(needed); + trade.prices.sellLow = lotLow; + trade.prices.sellHigh = lotHigh; maxes.surplusStatus = status; maxes.surplus = delta; @@ -334,19 +380,19 @@ library RecollateralizationLibP1 { // needed(Bottom): token balance needed at bottom of the basket range needed = range.bottom.mul(ctx.quantities[i], CEIL); // {buyTok}; - if (ctx.bals[i].lt(needed)) { - uint192 amtShort = needed.minus(ctx.bals[i]); // {buyTok} - (uint192 low, uint192 high) = reg.assets[i].price(); // {UoA/buyTok} + if (bal.lt(needed)) { + uint192 amtShort = needed.minus(bal); // {buyTok} + (uint192 lotLow, uint192 lotHigh) = reg.assets[i].lotPrice(); // {UoA/buyTok} // {UoA} = {buyTok} * {UoA/buyTok} - uint192 delta = amtShort.mul(high, CEIL); + uint192 delta = amtShort.mul(lotHigh, CEIL); // The best asset to buy is whichever asset has the largest deficit if (delta.gt(maxes.deficit)) { trade.buy = reg.assets[i]; trade.buyAmount = amtShort; - trade.prices.buyLow = low; - trade.prices.buyHigh = high; + trade.prices.buyLow = lotLow; + trade.prices.buyHigh = lotHigh; maxes.deficit = delta; } @@ -356,22 +402,21 @@ library RecollateralizationLibP1 { // Use RSR if needed if (address(trade.sell) == address(0) && address(trade.buy) != address(0)) { - (uint192 low, uint192 high) = reg.assets[rsrIndex].price(); // {UoA/RSR} + IAsset rsrAsset = ctx.ar.toAsset(ctx.rsr); + + uint192 rsrAvailable = rsrAsset.bal(address(ctx.bm)).plus( + rsrAsset.bal(address(ctx.stRSR)) + ); + (uint192 lotLow, uint192 lotHigh) = rsrAsset.lotPrice(); // {UoA/RSR} - // if rsr does not have a registered asset the below array accesses will revert if ( - high > 0 && - TradeLib.isEnoughToSell( - reg.assets[rsrIndex], - ctx.bals[rsrIndex], - low, - ctx.minTradeVolume - ) + lotHigh > 0 && + TradeLib.isEnoughToSell(rsrAsset, rsrAvailable, lotLow, ctx.minTradeVolume) ) { - trade.sell = reg.assets[rsrIndex]; - trade.sellAmount = ctx.bals[rsrIndex]; - trade.prices.sellLow = low; - trade.prices.sellHigh = high; + trade.sell = rsrAsset; + trade.sellAmount = rsrAvailable; + trade.prices.sellLow = lotLow; + trade.prices.sellHigh = lotHigh; } } } diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index 8d3c8e01c9..f0921dd511 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -62,7 +62,7 @@ library TradeLib { ); // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); // {sellTok} uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} // Calculate equivalent buyAmount within [0, FIX_MAX] diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 1c6217e8ec..24b2044d38 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -97,7 +97,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl // == Interactions == (uint256 soldAmt, uint256 boughtAmt) = trade.settle(); - emit TradeSettled(trade, sell, trade.buy(), soldAmt, boughtAmt); + emit TradeSettled(trade, trade.sell(), trade.buy(), soldAmt, boughtAmt); } /// Try to initiate a trade with a trading partner provided by the broker @@ -119,7 +119,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl TradePrices memory prices ) internal returns (ITrade trade) { IERC20 sell = req.sell.erc20(); - assert(address(trades[sell]) == address(0)); // ensure calling class has checked this + assert(address(trades[sell]) == address(0)); // Set allowance via custom approval -- first sets allowance to 0, then sets allowance // to either the requested amount or the maximum possible amount, if that fails. diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 60e575cf71..bf7cef6022 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -88,7 +88,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; + exposedReferencePrice = hiddenReferencePrice; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 302a6a6731..1bb044c239 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -7,14 +7,10 @@ import "../../interfaces/IAsset.sol"; import "./OracleLib.sol"; import "./VersionedAsset.sol"; -uint48 constant ORACLE_TIMEOUT_BUFFER = 300; // {s} 5 minutes - contract Asset is IAsset, VersionedAsset { using FixLib for uint192; using OracleLib for AggregatorV3Interface; - uint192 public constant MAX_HIGH_PRICE_BUFFER = 2 * FIX_ONE; // {UoA/tok} 200% - AggregatorV3Interface public immutable chainlinkFeed; // {UoA/tok} IERC20Metadata public immutable erc20; @@ -42,7 +38,7 @@ contract Asset is IAsset, VersionedAsset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of + /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, @@ -64,7 +60,7 @@ contract Asset is IAsset, VersionedAsset { erc20 = erc20_; erc20Decimals = erc20.decimals(); maxTradeVolume = maxTradeVolume_; - oracleTimeout = oracleTimeout_ + ORACLE_TIMEOUT_BUFFER; // add 300s as a buffer + oracleTimeout = oracleTimeout_; } /// Can revert, used by other contract functions in order to catch errors @@ -112,69 +108,54 @@ contract Asset is IAsset, VersionedAsset { } /// Should not revert - /// low should be nonzero if the asset could be worth selling /// @dev Should be general enough to not need to be overridden - /// @return _low {UoA/tok} The lower end of the price estimate - /// @return _high {UoA/tok} The upper end of the price estimate - /// @notice If the price feed is broken, _low will decay downwards and _high will decay upwards - /// If tryPrice() is broken for more than `oracleTimeout + priceTimeout` seconds, - /// _low will be 0 and _high will be FIX_MAX. - /// Because the price decay begins at `oracleTimeout` seconds and not `updateTime` from the - /// price feed, the price feed can be broken for up to `2 * oracleTimeout` seconds without - /// affecting the price estimate. This could happen if the Asset is refreshed just before - /// the oracleTimeout is reached, forcing a second period of oracleTimeout to pass before - /// the price begins to decay. - function price() public view virtual returns (uint192 _low, uint192 _high) { + /// @return {UoA/tok} The lower end of the price estimate + /// @return {UoA/tok} The upper end of the price estimate + function price() public view virtual returns (uint192, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + assert(low <= high); + return (low, high); + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return (0, FIX_MAX); + } + } + + /// Should not revert + /// lotLow should be nonzero when the asset might be worth selling + /// @dev Should be general enough to not need to be overridden + /// @return lotLow {UoA/tok} The lower end of the lot price estimate + /// @return lotHigh {UoA/tok} The upper end of the lot price estimate + function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { try this.tryPrice() returns (uint192 low, uint192 high, uint192) { // if the price feed is still functioning, use that - _low = low; - _high = high; + lotLow = low; + lotHigh = high; } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string - // if the price feed is broken, decay _low downwards and _high upwards + // if the price feed is broken, use a decayed historical value uint48 delta = uint48(block.timestamp) - lastSave; // {s} if (delta <= oracleTimeout) { - // use saved prices for at least the oracleTimeout - _low = savedLowPrice; - _high = savedHighPrice; + lotLow = savedLowPrice; + lotHigh = savedHighPrice; } else if (delta >= oracleTimeout + priceTimeout) { - // unpriced after a full timeout - return (0, FIX_MAX); + return (0, 0); // no price after full timeout } else { // oracleTimeout <= delta <= oracleTimeout + priceTimeout - // Decay _high upwards to 3x savedHighPrice + // {1} = {s} / {s} + uint192 lotMultiplier = divuu(oracleTimeout + priceTimeout - delta, priceTimeout); + // {UoA/tok} = {UoA/tok} * {1} - _high = savedHighPrice.safeMul( - FIX_ONE + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout), - ROUND - ); // during overflow should not revert - - // if _high is FIX_MAX, leave at UNPRICED - if (_high != FIX_MAX) { - // Decay _low downwards from savedLowPrice to 0 - // {UoA/tok} = {UoA/tok} * {1} - _low = savedLowPrice.muluDivu( - oracleTimeout + priceTimeout - delta, - priceTimeout - ); - // during overflow should revert since a FIX_MAX _low breaks everything - } + lotLow = savedLowPrice.mul(lotMultiplier); + lotHigh = savedHighPrice.mul(lotMultiplier); } } - assert(_low <= _high); - } - - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { - return price(); + assert(lotLow <= lotHigh); } /// @return {tok} The balance of the ERC20 in whole tokens diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index dfc36ff73e..67d0c12f34 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -27,8 +27,6 @@ contract EURFiatCollateral is FiatCollateral { ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); - targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index d3afad43c5..9110117bc5 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -75,10 +75,6 @@ contract FiatCollateral is ICollateral, Asset { } require(config.delayUntilDefault <= 1209600, "delayUntilDefault too long"); - // Note: This contract is designed to allow setting defaultThreshold = 0 to disable - // default checks. You can apply the check below to child contracts when required - // require(config.defaultThreshold > 0, "defaultThreshold zero"); - targetName = config.targetName; delayUntilDefault = config.delayUntilDefault; @@ -126,7 +122,7 @@ contract FiatCollateral is ICollateral, Asset { function refresh() public virtual override(Asset, IAsset) { CollateralStatus oldStatus = status(); - // Check for soft default + save price + // Check for soft default + save lotPrice try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {target/ref} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index 60b0bd8329..0fc8e40884 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -30,7 +30,6 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_exchangeRateChainlinkFeed) != address(0), "missing exchangeRate feed"); require(_exchangeRateChainlinkTimeout != 0, "exchangeRateChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); exchangeRateChainlinkFeed = _exchangeRateChainlinkFeed; exchangeRateChainlinkTimeout = _exchangeRateChainlinkTimeout; @@ -53,7 +52,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; + exposedReferencePrice = hiddenReferencePrice; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/NonFiatCollateral.sol b/contracts/plugins/assets/NonFiatCollateral.sol index 1923dea24a..2e6b3c531f 100644 --- a/contracts/plugins/assets/NonFiatCollateral.sol +++ b/contracts/plugins/assets/NonFiatCollateral.sol @@ -27,8 +27,6 @@ contract NonFiatCollateral is FiatCollateral { ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); - targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index e9487fe671..68a9da9863 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -18,14 +18,12 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { using OracleLib for AggregatorV3Interface; // Component addresses are not mutable in protocol, so it's safe to cache these - IAssetRegistry public immutable assetRegistry; + IMain public immutable main; IBasketHandler public immutable basketHandler; + IAssetRegistry public immutable assetRegistry; IBackingManager public immutable backingManager; - IFurnace public immutable furnace; - IERC20 public immutable rsr; - IStRSR public immutable stRSR; - IERC20Metadata public immutable erc20; // The RToken + IERC20Metadata public immutable erc20; uint8 public immutable erc20Decimals; @@ -39,13 +37,10 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { require(address(erc20_) != address(0), "missing erc20"); require(maxTradeVolume_ > 0, "invalid max trade volume"); - IMain main = erc20_.main(); - assetRegistry = main.assetRegistry(); + main = erc20_.main(); basketHandler = main.basketHandler(); + assetRegistry = main.assetRegistry(); backingManager = main.backingManager(); - furnace = main.furnace(); - rsr = main.rsr(); - stRSR = main.stRSR(); erc20 = IERC20Metadata(address(erc20_)); erc20Decimals = erc20_.decimals(); @@ -60,8 +55,10 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// `basketHandler.price()`. When `range.bottom == range.top` then there is no compounding. /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - function tryPrice() external view virtual returns (uint192 low, uint192 high) { - (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(); // {UoA/BU} + function tryPrice(bool useLotPrice) external view virtual returns (uint192 low, uint192 high) { + (uint192 lowBUPrice, uint192 highBUPrice) = useLotPrice + ? basketHandler.lotPrice() + : basketHandler.price(); // {UoA/BU} require(lowBUPrice != 0 && highBUPrice != FIX_MAX, "invalid price"); assert(lowBUPrice <= highBUPrice); // not obviously true just by inspection @@ -82,21 +79,21 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { assert(low <= high); // not obviously true } + // solhint-disable no-empty-blocks function refresh() public virtual override { - // No need to save lastPrice; can piggyback off the backing collateral's saved prices - - furnace.melt(); - if (msg.sender != address(assetRegistry)) assetRegistry.refresh(); + // No need to save lastPrice; can piggyback off the backing collateral's lotPrice() cachedOracleData.cachedAtTime = 0; // force oracle refresh } + // solhint-enable no-empty-blocks + /// Should not revert /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { - try this.tryPrice() returns (uint192 low, uint192 high) { + try this.tryPrice(false) returns (uint192 low, uint192 high) { return (low, high); } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data @@ -107,11 +104,18 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// Should not revert /// lotLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility + /// @dev See `tryPrice` caveat about possible compounding error in calculating price /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view virtual returns (uint192 lotLow, uint192 lotHigh) { - return price(); + function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { + try this.tryPrice(true) returns (uint192 low, uint192 high) { + lotLow = low; + lotHigh = high; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return (0, 0); + } } /// @return {tok} The balance of the ERC20 in whole tokens @@ -139,15 +143,10 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-enable no-empty-blocks - /// Force an update to the cache, including refreshing underlying assets - /// @dev Can revert if RToken is unpriced function forceUpdatePrice() external { _updateCachedPrice(); } - /// @dev Can revert if RToken is unpriced - /// @return rTokenPrice {UoA/tok} The mean price estimate - /// @return updatedAt {s} The timestamp of the cache update function latestPrice() external returns (uint192 rTokenPrice, uint256 updatedAt) { // Situations that require an update, from most common to least common. if ( @@ -159,17 +158,15 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { _updateCachedPrice(); } - rTokenPrice = cachedOracleData.cachedPrice; - updatedAt = cachedOracleData.cachedAtTime; + return (cachedOracleData.cachedPrice, cachedOracleData.cachedAtTime); } // ==== Private ==== // Update Oracle Data function _updateCachedPrice() internal { - assetRegistry.refresh(); // will call furnace.melt() - (uint192 low, uint192 high) = price(); + require(low != 0 && high != FIX_MAX, "invalid price"); cachedOracleData = CachedOracleData( @@ -181,7 +178,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { ); } - /// Computationally expensive basketRange calculation; used in price() + /// Computationally expensive basketRange calculation; used in price() & lotPrice() function basketRange() private view returns (BasketRange memory range) { BasketRange memory basketsHeld = basketHandler.basketsHeldBy(address(backingManager)); uint192 basketsNeeded = IRToken(address(erc20)).basketsNeeded(); // {BU} @@ -196,9 +193,24 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // the absence of an external price feed. Any RToken that gets reasonably big // should switch over to an asset with a price feed. - (TradingContext memory ctx, Registry memory reg) = backingManager.tradingContext( - basketsHeld - ); + TradingContext memory ctx; + + ctx.basketsHeld = basketsHeld; + ctx.bm = backingManager; + ctx.bh = basketHandler; + ctx.ar = assetRegistry; + ctx.stRSR = main.stRSR(); + ctx.rsr = main.rsr(); + ctx.rToken = main.rToken(); + ctx.minTradeVolume = backingManager.minTradeVolume(); + ctx.maxTradeSlippage = backingManager.maxTradeSlippage(); + + // Calculate quantities + Registry memory reg = ctx.ar.getRegistry(); + ctx.quantities = new uint192[](reg.erc20s.length); + for (uint256 i = 0; i < reg.erc20s.length; ++i) { + ctx.quantities[i] = ctx.bh.quantityUnsafe(reg.erc20s[i], reg.assets[i]); + } // will exclude UoA value from RToken balances at BackingManager range = RecollateralizationLibP1.basketRange(ctx, reg); diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index b36945769d..ac8371e7f2 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.1.0"; +string constant ASSET_VERSION = "3.0.1"; /** * @title VersionedAsset diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index ba1843351c..2edfd5d65b 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -20,9 +20,7 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - { - require(config.defaultThreshold > 0, "defaultThreshold zero"); - } + {} // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index 14e72a72ca..f6e98c267e 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -41,9 +41,7 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - { - require(config.defaultThreshold > 0, "defaultThreshold zero"); - } + {} // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 59e921e774..594db5465e 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -33,7 +33,6 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 40eb3a9d6e..5c190e6050 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -32,7 +32,6 @@ contract CBEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index 4e98b7c3f2..b745028f54 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -41,7 +41,6 @@ contract CBEthCollateralL2 is L2LSDCollateral { { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/README.md b/contracts/plugins/assets/cbeth/README.md index 351074009d..15deec4f2c 100644 --- a/contracts/plugins/assets/cbeth/README.md +++ b/contracts/plugins/assets/cbeth/README.md @@ -15,7 +15,6 @@ This plugin allows `CBETH` holders to use their tokens as collateral in the Rese ### Functions #### refPerTok {ref/tok} - The L1 implementation (CBETHCollateral.sol) uses `token.exchange_rate()` to get the cbETH/ETH {ref/tok} contract exchange rate. The L2 implementation (CBETHCollateralL2.sol) uses the relevant chainlink oracle to get the cbETH/ETH {ref/tok} contract exchange rate (oraclized from the L1). diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index ce76a72635..a60744893a 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -29,8 +29,6 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); - ICToken _cToken = ICToken(address(config.erc20)); address _underlying = _cToken.underlying(); uint8 _referenceERC20Decimals; diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 3d7dcae18f..f0a44584b5 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -30,7 +30,6 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { ) CTokenFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; } diff --git a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol index 27b37d8382..286787d42a 100644 --- a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol +++ b/contracts/plugins/assets/compoundv2/CTokenWrapper.sol @@ -35,11 +35,9 @@ contract CTokenWrapper is RewardableERC20Wrapper { // === Overrides === function _claimAssetRewards() internal virtual override { - address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); - holders[0] = address(this); cTokens[0] = address(underlying); - comptroller.claimComp(holders, cTokens, false, true); + comptroller.claimComp(address(this), cTokens); } // No overrides of _deposit()/_withdraw() necessary: no staking required diff --git a/contracts/plugins/assets/compoundv2/ICToken.sol b/contracts/plugins/assets/compoundv2/ICToken.sol index c83f9a3552..9dafd86c80 100644 --- a/contracts/plugins/assets/compoundv2/ICToken.sol +++ b/contracts/plugins/assets/compoundv2/ICToken.sol @@ -33,26 +33,10 @@ interface ICToken is IERC20Metadata { function redeem(uint256 redeemTokens) external returns (uint256); } -interface TestICToken is ICToken { - /** - * @notice Sender borrows assets from the protocol to their own address - * @param borrowAmount The amount of the underlying asset to borrow - * @return uint 0=success, otherwise a failure - */ - function borrow(uint256 borrowAmount) external returns (uint256); -} - interface IComptroller { /// Claim comp for an account, to an account - function claimComp( - address[] memory holders, - address[] memory cTokens, - bool borrowers, - bool suppliers - ) external; + function claimComp(address account, address[] memory cTokens) external; /// @return The address for COMP token function getCompAddress() external view returns (address); - - function enterMarkets(address[] calldata) external returns (uint256[] memory); } diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 17d46dc908..5e7bd1238c 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -19,6 +19,12 @@ import "./vendor/IComet.sol"; * UoA = USD */ contract CTokenV3Collateral is AppreciatingFiatCollateral { + struct CometCollateralConfig { + IERC20 rewardERC20; + uint256 reservesThresholdIffy; + uint256 reservesThresholdDisabled; + } + using OracleLib for AggregatorV3Interface; using FixLib for uint192; @@ -33,13 +39,16 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { uint192 revenueHiding, uint256 reservesThresholdIffy_ ) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); rewardERC20 = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); reservesThresholdIffy = reservesThresholdIffy_; cometDecimals = comet.decimals(); } + function bal(address account) external view override(Asset, IAsset) returns (uint192) { + return shiftl_toFix(erc20.balanceOf(account), -int8(erc20Decimals)); + } + /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins function claimRewards() external override(Asset, IRewardable) { IRewardable(address(erc20)).claimRewards(); @@ -67,7 +76,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; + exposedReferencePrice = hiddenReferencePrice; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index afbab80784..5b7b176061 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -43,7 +43,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { } /// @return number of decimals - function decimals() public pure override(IERC20Metadata, WrappedERC20) returns (uint8) { + function decimals() public pure override returns (uint8) { return 6; } @@ -81,7 +81,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { address dst, uint256 amount ) internal { - if (!underlyingComet.hasPermission(src, operator)) revert Unauthorized(); + if (!hasPermission(src, operator)) revert Unauthorized(); // {Comet} uint256 srcBal = underlyingComet.balanceOf(src); if (amount > srcBal) amount = srcBal; @@ -203,10 +203,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { rewardsClaimed[src] = accrued; rewardsAddr.claimTo(address(underlyingComet), address(this), address(this), true); - - uint256 bal = rewardERC20.balanceOf(address(this)); - if (owed > bal) owed = bal; - rewardERC20.safeTransfer(dst, owed); + IERC20(rewardERC20).safeTransfer(dst, owed); } emit RewardsClaimed(rewardERC20, owed); } diff --git a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol index de2ab80ebe..89a9dcfb35 100644 --- a/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/ICusdcV3Wrapper.sol @@ -10,8 +10,8 @@ import "../../../interfaces/IRewardable.sol"; interface ICusdcV3Wrapper is IWrappedERC20, IRewardable { struct UserBasic { uint104 principal; - uint64 baseTrackingIndex; uint64 baseTrackingAccrued; + uint64 baseTrackingIndex; uint256 rewardsClaimed; } diff --git a/contracts/plugins/assets/compoundv3/WrappedERC20.sol b/contracts/plugins/assets/compoundv3/WrappedERC20.sol index 290a2da080..b3287711d7 100644 --- a/contracts/plugins/assets/compoundv3/WrappedERC20.sol +++ b/contracts/plugins/assets/compoundv3/WrappedERC20.sol @@ -75,13 +75,6 @@ abstract contract WrappedERC20 is IWrappedERC20 { return _symbol; } - /** - * @dev Returns the decimals places of the token. - */ - function decimals() public pure virtual returns (uint8) { - return 18; - } - /** * @dev See {IERC20-totalSupply}. */ diff --git a/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol b/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol index 70d9664aac..a144d69112 100644 --- a/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol +++ b/contracts/plugins/assets/compoundv3/vendor/CometExtInterface.sol @@ -95,12 +95,4 @@ abstract contract CometExtInterface { function allowance(address owner, address spender) external view virtual returns (uint256); event Approval(address indexed owner, address indexed spender, uint256 amount); - - /** - * @notice Determine if the manager has permission to act on behalf of the owner - * @param owner The owner account - * @param manager The manager account - * @return Whether or not the manager has permission - */ - function hasPermission(address owner, address manager) external view virtual returns (bool); } diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index c59994fd56..5d6f985401 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -88,7 +88,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // uint192(<) is equivalent to Fix.lt if (underlyingRefPerTok < exposedReferencePrice) { - exposedReferencePrice = underlyingRefPerTok; + exposedReferencePrice = hiddenReferencePrice; markStatus(CollateralStatus.DISABLED); } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index ad3cd6ac8e..7fd4fe005b 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -13,9 +13,6 @@ interface ICurveMetaPool is ICurvePool, IERC20Metadata { * This plugin contract is intended for 2-fiattoken stable metapools that * DO NOT involve RTokens, such as LUSD-fraxBP or MIM-3CRV. * - * Does not support older metapools that have a separate contract for the - * metapool's LP token. - * * tok = ConvexStakingWrapper(PairedUSDToken/USDBasePool) * ref = PairedUSDToken/USDBasePool pool invariant * tar = USD diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 780a083a8b..420e002f4a 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -42,11 +42,6 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { pairedAssetRegistry = IRToken(address(pairedToken)).main().assetRegistry(); } - function refresh() public override { - pairedAssetRegistry.refresh(); // refresh all registered assets - super.refresh(); // already handles all necessary default checks - } - /// Can revert, used by `_anyDepeggedOutsidePool()` /// Should not return FIX_MAX for low /// @return lowPaired {UoA/pairedTok} The low price estimate of the paired token diff --git a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol index 8531894bb9..e4c893f024 100644 --- a/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol +++ b/contracts/plugins/assets/curve/crv/CurveGaugeWrapper.sol @@ -17,16 +17,6 @@ interface ILiquidityGauge { function withdraw(uint256 _value) external; } -// Note: Only supports CRV rewards. If a Curve pool with multiple reward tokens is -// used, other reward tokens beyond CRV will never be claimed and distributed to -// depositors. These unclaimed rewards will be lost forever. - -// In addition to this, each wrapper deployment must be tested individually, regardless -// of the number of reward tokens it has. This contract is not compatible with all gauges -// and may revert depending on the Curve Gauge being used. For example, the -// `RewardsOnlyGauge` does not have a user_checkpoint() function, which means the -// MINTER.mint() call in this contract would revert in that case. - contract CurveGaugeWrapper is RewardableERC20Wrapper { using SafeERC20 for IERC20; @@ -56,7 +46,6 @@ contract CurveGaugeWrapper is RewardableERC20Wrapper { gauge.withdraw(_amount); } - // claim rewards - only supports CRV rewards, may not work for all gauges function _claimAssetRewards() internal virtual override { MINTER.mint(address(gauge)); } diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index 6653f450c2..250d5b63ae 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -9,6 +9,7 @@ import "@openzeppelin/contracts-v0.7/token/ERC20/SafeERC20.sol"; import "@openzeppelin/contracts-v0.7/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts-v0.7/utils/ReentrancyGuard.sol"; import "./IRewardStaking.sol"; +import "./CvxMining.sol"; interface IBooster { function poolInfo(uint256 _pid) @@ -22,8 +23,6 @@ interface IBooster { address _stash, bool _shutdown ); - - function earmarkRewards(uint256 _pid) external returns (bool); } interface IConvexDeposits { @@ -40,13 +39,9 @@ interface IConvexDeposits { ) external; } -interface ITokenWrapper { - function token() external view returns (address); -} - // if used as collateral some modifications will be needed to fit the specific platform -// Based on audited contracts: https://github.com/convex-eth/platform/blob/933ace34d896e6684345c6795bf33d4089fbd8f6/contracts/contracts/wrappers/ConvexStakingWrapper.sol +// Based on audited contracts: https://github.com/convex-eth/platform/blob/main/contracts/contracts/wrappers/CvxCrvStakingWrapper.sol contract ConvexStakingWrapper is ERC20, ReentrancyGuard { using SafeERC20 for IERC20; using SafeMath for uint256; @@ -59,8 +54,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { struct RewardType { address reward_token; address reward_pool; - uint256 reward_integral; - uint256 reward_remaining; + uint128 reward_integral; + uint128 reward_remaining; mapping(address => uint256) reward_integral_for; mapping(address => uint256) claimable_reward; } @@ -80,10 +75,11 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //rewards RewardType[] public rewards; mapping(address => uint256) public registeredRewards; - mapping(address => address) public rewardRedirect; //management bool public isInit; + address public owner; + bool internal _isShutdown; string internal _tokenname; string internal _tokensymbol; @@ -95,15 +91,15 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { bool _wrapped ); event Withdrawn(address indexed _user, uint256 _amount, bool _unwrapped); - event RewardRedirected(address indexed _account, address _forward); - event RewardAdded(address _token); - event UserCheckpoint(address _userA, address _userB); + event OwnershipTransferred(address indexed previousOwner, address indexed newOwner); event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); constructor() public ERC20("StakedConvexToken", "stkCvx") {} function initialize(uint256 _poolId) external virtual { require(!isInit, "already init"); + owner = msg.sender; + emit OwnershipTransferred(address(0), owner); (address _lptoken, address _token, , address _rewards, , ) = IBooster(convexBooster) .poolInfo(_poolId); @@ -135,6 +131,32 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return 18; } + modifier onlyOwner() { + require(owner == msg.sender, "Ownable: caller is not the owner"); + _; + } + + function transferOwnership(address newOwner) public virtual onlyOwner { + require(newOwner != address(0), "Ownable: new owner is the zero address"); + emit OwnershipTransferred(owner, newOwner); + owner = newOwner; + } + + function renounceOwnership() public virtual onlyOwner { + emit OwnershipTransferred(owner, address(0)); + owner = address(0); + } + + function shutdown() external onlyOwner { + _isShutdown = true; + } + + function isShutdown() public view returns (bool) { + if (_isShutdown) return true; + (, , , , , bool isShutdown_) = IBooster(convexBooster).poolInfo(convexPoolId); + return isShutdown_; + } + function setApprovals() public { IERC20(curveToken).safeApprove(convexBooster, 0); IERC20(curveToken).safeApprove(convexBooster, uint256(-1)); @@ -170,18 +192,12 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //send to self to warmup state //slither-disable-next-line unchecked-transfer IERC20(cvx).transfer(address(this), 0); - emit RewardAdded(crv); - emit RewardAdded(cvx); } uint256 extraCount = IRewardStaking(mainPool).extraRewardsLength(); for (uint256 i = 0; i < extraCount; i++) { address extraPool = IRewardStaking(mainPool).extraRewards(i); address extraToken = IRewardStaking(extraPool).rewardToken(); - //from pool 151, extra reward tokens are wrapped - if (convexPoolId >= 151) { - extraToken = ITokenWrapper(extraToken).token(); - } if (extraToken == cvx) { //update cvx reward pool address rewards[CVX_INDEX].reward_pool = extraPool; @@ -189,14 +205,13 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //add new token to list rewards.push( RewardType({ - reward_token: extraToken, + reward_token: IRewardStaking(extraPool).rewardToken(), reward_pool: extraPool, reward_integral: 0, reward_remaining: 0 }) ); registeredRewards[extraToken] = rewards.length; //mark registered at index+1 - emit RewardAdded(extraToken); } } } @@ -220,15 +235,6 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return totalSupply(); } - //internal transfer function to transfer rewards out on claim - function _transferReward( - address _token, - address _to, - uint256 _amount - ) internal virtual { - IERC20(_token).safeTransfer(_to, _amount); - } - function _calcRewardIntegral( uint256 _index, address[2] memory _accounts, @@ -237,19 +243,16 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { bool _isClaim ) internal { RewardType storage reward = rewards[_index]; - if (reward.reward_token == address(0)) { - return; - } //get difference in balance and remaining rewards //getReward is unguarded so we use reward_remaining to keep track of how much was actually claimed uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); + // uint256 d_reward = bal.sub(reward.reward_remaining); - //check that balance increased and update integral - if (_supply > 0 && bal > reward.reward_remaining) { + if (_supply > 0 && bal.sub(reward.reward_remaining) > 0) { reward.reward_integral = reward.reward_integral + - (bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); + uint128(bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); } //update user integrals @@ -263,20 +266,20 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { if (_isClaim || userI < reward.reward_integral) { if (_isClaim) { uint256 receiveable = reward.claimable_reward[_accounts[u]].add( - _balances[u].mul(reward.reward_integral.sub(userI)).div(1e20) + _balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20) ); if (receiveable > 0) { reward.claimable_reward[_accounts[u]] = 0; //cheat for gas savings by transfering to the second index in accounts list //if claiming only the 0 index will update so 1 index can hold forwarding info //guaranteed to have an address in u+1 so no need to check - _transferReward(reward.reward_token, _accounts[u + 1], receiveable); + IERC20(reward.reward_token).safeTransfer(_accounts[u + 1], receiveable); bal = bal.sub(receiveable); } } else { reward.claimable_reward[_accounts[u]] = reward .claimable_reward[_accounts[u]] - .add(_balances[u].mul(reward.reward_integral.sub(userI)).div(1e20)); + .add(_balances[u].mul(uint256(reward.reward_integral).sub(userI)).div(1e20)); } reward.reward_integral_for[_accounts[u]] = reward.reward_integral; } @@ -284,7 +287,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //update remaining reward here since balance could have changed if claiming if (bal != reward.reward_remaining) { - reward.reward_remaining = bal; + reward.reward_remaining = uint128(bal); } } @@ -294,13 +297,16 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { depositedBalance[0] = _getDepositedBalance(_accounts[0]); depositedBalance[1] = _getDepositedBalance(_accounts[1]); - IRewardStaking(convexPool).getReward(address(this), true); + if (!isShutdown()) { + IRewardStaking(convexPool).getReward(address(this), true); + } + + _claimExtras(); uint256 rewardCount = rewards.length; for (uint256 i = 0; i < rewardCount; i++) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, false); } - emit UserCheckpoint(_accounts[0], _accounts[1]); } function _checkpointAndClaim(address[2] memory _accounts) internal nonReentrant { @@ -310,11 +316,17 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { IRewardStaking(convexPool).getReward(address(this), true); + _claimExtras(); + uint256 rewardCount = rewards.length; for (uint256 i = 0; i < rewardCount; i++) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, true); } - emit UserCheckpoint(_accounts[0], _accounts[1]); + } + + //claim any rewards not part of the convex pool + function _claimExtras() internal virtual { + //override and add external reward claiming } function user_checkpoint(address _account) external returns (bool) { @@ -328,54 +340,81 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //run earned as a mutable function to claim everything before calculating earned rewards function earned(address _account) external returns (EarnedData[] memory claimable) { - //checkpoint to pull in and tally new rewards - _checkpoint([_account, address(0)]); + IRewardStaking(convexPool).getReward(address(this), true); + _claimExtras(); + return _earned(_account); + } + + //run earned as a non-mutative function that may not claim everything, but should report standard convex rewards + function earnedView(address _account) external view returns (EarnedData[] memory claimable) { return _earned(_account); } function _earned(address _account) internal view returns (EarnedData[] memory claimable) { + uint256 supply = _getTotalSupply(); + // uint256 depositedBalance = _getDepositedBalance(_account); uint256 rewardCount = rewards.length; claimable = new EarnedData[](rewardCount); for (uint256 i = 0; i < rewardCount; i++) { RewardType storage reward = rewards[i]; - if (reward.reward_token == address(0)) { - continue; + + //change in reward is current balance - remaining reward + earned + uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); + uint256 d_reward = bal.sub(reward.reward_remaining); + + //some rewards (like minted cvx) may not have a reward pool directly on the convex pool so check if it exists + if (reward.reward_pool != address(0)) { + //add earned from the convex reward pool for the given token + d_reward = d_reward.add(IRewardStaking(reward.reward_pool).earned(address(this))); + } + + uint256 I = reward.reward_integral; + if (supply > 0) { + I = I + d_reward.mul(1e20).div(supply); } - claimable[i].amount = reward.claimable_reward[_account]; + uint256 newlyClaimable = _getDepositedBalance(_account) + .mul(I.sub(reward.reward_integral_for[_account])) + .div(1e20); + claimable[i].amount = claimable[i].amount.add( + reward.claimable_reward[_account].add(newlyClaimable) + ); claimable[i].token = reward.reward_token; + + //calc cvx minted from crv and add to cvx claimables + //note: crv is always index 0 so will always run before cvx + if (i == CRV_INDEX) { + //because someone can call claim for the pool outside of checkpoints, need to recalculate crv without the local balance + I = reward.reward_integral; + if (supply > 0) { + I = + I + + IRewardStaking(reward.reward_pool).earned(address(this)).mul(1e20).div( + supply + ); + } + newlyClaimable = _getDepositedBalance(_account) + .mul(I.sub(reward.reward_integral_for[_account])) + .div(1e20); + claimable[CVX_INDEX].amount = CvxMining.ConvertCrvToCvx(newlyClaimable); + claimable[CVX_INDEX].token = cvx; + } } return claimable; } function claimRewards() external { - address _account = rewardRedirect[msg.sender] == address(0) - ? msg.sender - : rewardRedirect[msg.sender]; - - uint256 cvxOldBal = IERC20(cvx).balanceOf(_account); - uint256 crvOldBal = IERC20(crv).balanceOf(_account); - _checkpointAndClaim([msg.sender, _account]); - emit RewardsClaimed(IERC20(cvx), IERC20(cvx).balanceOf(_account) - cvxOldBal); - emit RewardsClaimed(IERC20(crv), IERC20(crv).balanceOf(_account) - crvOldBal); - } - - //set any claimed rewards to automatically go to a different address - //set address to zero to disable - function setRewardRedirect(address _to) external nonReentrant { - rewardRedirect[msg.sender] = _to; - emit RewardRedirected(msg.sender, _to); + uint256 cvxOldBal = IERC20(cvx).balanceOf(msg.sender); + uint256 crvOldBal = IERC20(crv).balanceOf(msg.sender); + _checkpointAndClaim([address(msg.sender), address(msg.sender)]); + emit RewardsClaimed(IERC20(cvx), IERC20(cvx).balanceOf(msg.sender) - cvxOldBal); + emit RewardsClaimed(IERC20(crv), IERC20(crv).balanceOf(msg.sender) - crvOldBal); } function getReward(address _account) external { - //check if there is a redirect address - if (rewardRedirect[_account] != address(0)) { - _checkpointAndClaim([_account, rewardRedirect[_account]]); - } else { - //claim directly in checkpoint logic to save a bit of gas - _checkpointAndClaim([_account, _account]); - } + //claim directly in checkpoint logic to save a bit of gas + _checkpointAndClaim([_account, _account]); } function getReward(address _account, address _forwardTo) external { @@ -387,6 +426,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //deposit a curve token function deposit(uint256 _amount, address _to) external { + require(!isShutdown(), "shutdown"); + //dont need to call checkpoint since _mint() will if (_amount > 0) { @@ -400,6 +441,8 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { //stake a convex token function stake(uint256 _amount, address _to) external { + require(!isShutdown(), "shutdown"); + //dont need to call checkpoint since _mint() will if (_amount > 0) { @@ -445,10 +488,5 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { ) internal override { _checkpoint([_from, _to]); } - - //helper function - function earmarkRewards() external returns (bool) { - return IBooster(convexBooster).earmarkRewards(convexPoolId); - } } // slither-disable-end reentrancy-no-eth \ No newline at end of file diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 5401b2ad5f..8e7643575f 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -35,7 +35,6 @@ contract SDaiCollateral is AppreciatingFiatCollateral { uint192 revenueHiding, IPot _pot ) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); pot = _pot; } diff --git a/contracts/plugins/assets/erc20/RewardableERC20.sol b/contracts/plugins/assets/erc20/RewardableERC20.sol index ed741e15ec..58fd23855c 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20.sol @@ -7,14 +7,11 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../../interfaces/IRewardable.sol"; -uint256 constant SHARE_DECIMAL_OFFSET = 9; // to prevent reward rounding issues - /** * @title RewardableERC20 * @notice An abstract class that can be extended to create rewardable wrapper. * @notice `_claimAssetRewards` keeps tracks of rewards by snapshotting the balance * and calculating the difference between the current balance and the previous balance. - * Limitation: Currently supports only one single reward token. * @dev To inherit: * - override _claimAssetRewards() * - call ERC20 constructor elsewhere during construction @@ -22,11 +19,11 @@ uint256 constant SHARE_DECIMAL_OFFSET = 9; // to prevent reward rounding issues abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { using SafeERC20 for IERC20; - uint256 public immutable one; // 1e9 * {qShare/share} + uint256 public immutable one; // {qShare/share} IERC20 public immutable rewardToken; - uint256 public rewardsPerShare; // 1e9 * {qRewards/share} - mapping(address => uint256) public lastRewardsPerShare; // 1e9 * {qRewards/share} + uint256 public rewardsPerShare; // {qRewards/share} + mapping(address => uint256) public lastRewardsPerShare; // {qRewards/share} mapping(address => uint256) public accumulatedRewards; // {qRewards} mapping(address => uint256) public claimedRewards; // {qRewards} @@ -38,11 +35,9 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { /// @dev Extending class must ensure ERC20 constructor is called constructor(IERC20 _rewardToken, uint8 _decimals) { rewardToken = _rewardToken; - // set via pass-in to prevent inheritance issues - one = 10**(_decimals + SHARE_DECIMAL_OFFSET); + one = 10**_decimals; // set via pass-in to prevent inheritance issues } - // claim rewards - Only supports one single reward token function claimRewards() external nonReentrant { _claimAndSyncRewards(); _syncAccount(msg.sender); @@ -52,7 +47,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { function _syncAccount(address account) internal { if (account == address(0)) return; - // 1e9 * {qRewards/share} + // {qRewards/share} uint256 accountRewardsPerShare = lastRewardsPerShare[account]; // {qShare} @@ -61,48 +56,37 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { // {qRewards} uint256 _accumulatedRewards = accumulatedRewards[account]; - // 1e9 * {qRewards/share} + // {qRewards/share} uint256 _rewardsPerShare = rewardsPerShare; if (accountRewardsPerShare < _rewardsPerShare) { - // 1e9 * {qRewards/share} + // {qRewards/share} uint256 delta = _rewardsPerShare - accountRewardsPerShare; - // {qRewards} = (1e9 * {qRewards/share}) * {qShare} / (1e9 * {qShare/share}) + // {qRewards} = {qRewards/share} * {qShare} _accumulatedRewards += (delta * shares) / one; } lastRewardsPerShare[account] = _rewardsPerShare; accumulatedRewards[account] = _accumulatedRewards; } - function _rewardTokenBalance() internal view virtual returns (uint256) { - return rewardToken.balanceOf(address(this)); - } - - function _distributeReward(address account, uint256 amt) internal virtual { - rewardToken.safeTransfer(account, amt); - } - function _claimAndSyncRewards() internal virtual { uint256 _totalSupply = totalSupply(); if (_totalSupply == 0) { return; } _claimAssetRewards(); - uint256 balanceAfterClaimingRewards = _rewardTokenBalance(); + uint256 balanceAfterClaimingRewards = rewardToken.balanceOf(address(this)); uint256 _rewardsPerShare = rewardsPerShare; uint256 _previousBalance = lastRewardBalance; if (balanceAfterClaimingRewards > _previousBalance) { - uint256 delta = balanceAfterClaimingRewards - _previousBalance; // {qRewards} - - // 1e9 * {qRewards/share} = {qRewards} * (1e9 * {qShare/share}) / {qShare} + uint256 delta = balanceAfterClaimingRewards - _previousBalance; uint256 deltaPerShare = (delta * one) / _totalSupply; - // {qRewards} = {qRewards} + (1e9*(qRewards/share)) * {qShare} / (1e9*{qShare/share}) balanceAfterClaimingRewards = _previousBalance + (deltaPerShare * _totalSupply) / one; - // 1e9 * {qRewards/share} += {qRewards} * (1e9*{qShare/share}) / {qShare} + // {qRewards/share} += {qRewards} * {qShare/share} / {qShare} _rewardsPerShare += deltaPerShare; } @@ -121,7 +105,7 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { claimedRewards[account] = accumulatedRewards[account]; - uint256 currentRewardTokenBalance = _rewardTokenBalance(); + uint256 currentRewardTokenBalance = rewardToken.balanceOf(address(this)); // This is just to handle the edge case where totalSupply() == 0 and there // are still reward tokens in the contract. @@ -129,9 +113,9 @@ abstract contract RewardableERC20 is IRewardable, ERC20, ReentrancyGuard { ? currentRewardTokenBalance - lastRewardBalance : 0; - _distributeReward(account, claimableRewards); + rewardToken.safeTransfer(account, claimableRewards); - currentRewardTokenBalance = _rewardTokenBalance(); + currentRewardTokenBalance = rewardToken.balanceOf(address(this)); lastRewardBalance = currentRewardTokenBalance > nonDistributed ? currentRewardTokenBalance - nonDistributed : 0; diff --git a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol index 6ae34a21a8..e2a4ec927f 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol @@ -30,10 +30,6 @@ abstract contract RewardableERC20Wrapper is RewardableERC20 { string memory _symbol, IERC20 _rewardToken ) ERC20(_name, _symbol) RewardableERC20(_rewardToken, _underlying.decimals()) { - require( - address(_rewardToken) != address(_underlying), - "reward and underlying cannot match" - ); underlying = _underlying; underlyingDecimals = _underlying.decimals(); } diff --git a/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol b/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol index 3966e66ea9..284f717c2e 100644 --- a/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol +++ b/contracts/plugins/assets/erc20/RewardableERC4626Vault.sol @@ -27,9 +27,7 @@ abstract contract RewardableERC4626Vault is ERC4626, RewardableERC20 { ) ERC4626(_asset, _name, _symbol) RewardableERC20(_rewardToken, _asset.decimals() + _decimalsOffset()) - { - require(address(_rewardToken) != address(_asset), "reward and asset cannot match"); - } + {} // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 7d32cc254a..4e95c0a05a 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -34,4 +34,4 @@ This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](h #### tryPrice -This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. +This function uses `refPerTok`, the chainlink price of `ETH/frxETH`, and the chainlink price of `USD/ETH` to return the current price range of the collateral. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index c3dbe91379..4697ec0da0 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -7,12 +7,6 @@ import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; import "./vendor/IsfrxEth.sol"; -/** - * ************************************************************ - * WARNING: this plugin is not ready to be used in Production - * ************************************************************ - */ - /** * @title SFraxEthCollateral * @notice Collateral plugin for Frax-ETH, @@ -29,16 +23,14 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { /// @param config.chainlinkFeed Feed units: {UoA/target} constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - { - require(config.defaultThreshold > 0, "defaultThreshold zero"); - } + {} // solhint-enable no-empty-blocks /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return pegPrice {target/ref} FIX_ONE until an oracle becomes available + /// @return pegPrice {target/ref} The actual price observed in the peg function tryPrice() external view @@ -57,8 +49,6 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { high = p + err; // assert(low <= high); obviously true just by inspection - // TODO: Currently not checking for depegs between `frxETH` and `ETH` - // Should be modified to use a `frxETH/ETH` oracle when available pegPrice = targetPerRef(); } diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 9267f40e76..783896f2c0 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -35,8 +35,6 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerRefChainlinkFeed) != address(0), "missing targetPerRef feed"); require(_targetPerRefChainlinkTimeout > 0, "targetPerRefChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); - targetPerRefChainlinkFeed = _targetPerRefChainlinkFeed; targetPerRefChainlinkTimeout = _targetPerRefChainlinkTimeout; } diff --git a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol index bc5f32abd8..eff7ccd9b5 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoAaveV2TokenisedDeposit.sol @@ -3,12 +3,13 @@ pragma solidity 0.8.19; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol"; -import { IMorpho, IMorphoUsersLens } from "./IMorpho.sol"; +import { IMorpho, IMorphoRewardsDistributor, IMorphoUsersLens } from "./IMorpho.sol"; import { MorphoTokenisedDeposit, MorphoTokenisedDepositConfig } from "./MorphoTokenisedDeposit.sol"; struct MorphoAaveV2TokenisedDepositConfig { IMorpho morphoController; IMorphoUsersLens morphoLens; + IMorphoRewardsDistributor rewardsDistributor; IERC20Metadata underlyingERC20; IERC20Metadata poolToken; ERC20 rewardToken; @@ -21,6 +22,7 @@ contract MorphoAaveV2TokenisedDeposit is MorphoTokenisedDeposit { MorphoTokenisedDeposit( MorphoTokenisedDepositConfig({ morphoController: config.morphoController, + rewardsDistributor: config.rewardsDistributor, underlyingERC20: config.underlyingERC20, poolToken: config.poolToken, rewardToken: config.rewardToken diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 248c24084c..5959b944ec 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -28,7 +28,6 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20)); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 3f1fe73110..27449c2883 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -16,13 +16,13 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {UoA/target} + AggregatorV3Interface public immutable targetUnitChainlinkFeed; // {target/ref} uint48 public immutable targetUnitOracleTimeout; // {s} /// @dev config.erc20 must be a MorphoTokenisedDeposit - /// @param config.chainlinkFeed Feed units: {target/ref} + /// @param config.chainlinkFeed Feed units: {UoA/target} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide - /// @param targetUnitChainlinkFeed_ Feed units: {UoA/target} + /// @param targetUnitChainlinkFeed_ Feed units: {target/ref} /// @param targetUnitOracleTimeout_ {s} oracle timeout to use for targetUnitChainlinkFeed constructor( CollateralConfig memory config, @@ -48,12 +48,11 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { uint192 pegPrice ) { - pegPrice = chainlinkFeed.price(oracleTimeout); // {target/ref} + // {tar/ref} Get current market peg + pegPrice = targetUnitChainlinkFeed.price(targetUnitOracleTimeout); // {UoA/tok} = {UoA/target} * {target/ref} * {ref/tok} - uint192 p = targetUnitChainlinkFeed.price(targetUnitOracleTimeout).mul(pegPrice).mul( - _underlyingRefPerTok() - ); + uint192 p = chainlinkFeed.price(oracleTimeout).mul(pegPrice).mul(_underlyingRefPerTok()); uint192 err = p.mul(oracleError, CEIL); high = p + err; diff --git a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol index e2bf558fe5..d2664e782c 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoTokenisedDeposit.sol @@ -3,34 +3,23 @@ pragma solidity 0.8.19; import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import { IERC20, IERC20Metadata } from "@openzeppelin/contracts/interfaces/IERC20Metadata.sol"; -import { IMorpho, IMorphoUsersLens } from "./IMorpho.sol"; +import { IMorpho, IMorphoRewardsDistributor, IMorphoUsersLens } from "./IMorpho.sol"; import { RewardableERC4626Vault } from "../erc20/RewardableERC4626Vault.sol"; struct MorphoTokenisedDepositConfig { IMorpho morphoController; + IMorphoRewardsDistributor rewardsDistributor; IERC20Metadata underlyingERC20; IERC20Metadata poolToken; ERC20 rewardToken; } abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { - struct MorphoTokenisedDepositRewardsAccountingState { - uint256 totalAccumulatedBalance; - uint256 totalPaidOutBalance; - uint256 pendingBalance; - uint256 availableBalance; - uint256 remainingPeriod; - uint256 lastSync; - } - - uint256 private constant PAYOUT_PERIOD = 7 days; - + IMorphoRewardsDistributor public immutable rewardsDistributor; IMorpho public immutable morphoController; address public immutable poolToken; address public immutable underlying; - MorphoTokenisedDepositRewardsAccountingState private state; - constructor(MorphoTokenisedDepositConfig memory config) RewardableERC4626Vault( config.underlyingERC20, @@ -42,53 +31,17 @@ abstract contract MorphoTokenisedDeposit is RewardableERC4626Vault { underlying = address(config.underlyingERC20); morphoController = config.morphoController; poolToken = address(config.poolToken); - state.lastSync = uint48(block.timestamp); + rewardsDistributor = config.rewardsDistributor; } - function sync() external { + function rewardTokenBalance(address account) external returns (uint256 claimableRewards) { _claimAndSyncRewards(); + _syncAccount(account); + claimableRewards = accumulatedRewards[account] - claimedRewards[account]; } - function _claimAssetRewards() internal override { - // If we detect any new balances add it to pending and reset payout period - uint256 totalAccumulated = state.totalPaidOutBalance + rewardToken.balanceOf(address(this)); - uint256 newlyAccumulated = totalAccumulated - state.totalAccumulatedBalance; - - uint256 timeDelta = block.timestamp - state.lastSync; - if (timeDelta != 0 && state.remainingPeriod != 0) { - if (timeDelta > state.remainingPeriod) { - timeDelta = state.remainingPeriod; - } - - uint256 amtToPayOut = (state.pendingBalance * timeDelta) / state.remainingPeriod; - state.pendingBalance -= amtToPayOut; - state.availableBalance += amtToPayOut; - } - - if (newlyAccumulated != 0) { - state.totalAccumulatedBalance = totalAccumulated; - state.pendingBalance += newlyAccumulated; - - state.remainingPeriod = PAYOUT_PERIOD; - } else { - state.remainingPeriod = state.remainingPeriod < timeDelta - ? 0 - : state.remainingPeriod - timeDelta; - } - - state.lastSync = block.timestamp; - } - - function _rewardTokenBalance() internal view override returns (uint256) { - return state.availableBalance; - } - - function _distributeReward(address account, uint256 amt) internal override { - state.totalPaidOutBalance += amt; - state.availableBalance -= amt; - - SafeERC20.safeTransfer(rewardToken, account, amt); - } + // solhint-disable-next-line no-empty-blocks + function _claimAssetRewards() internal virtual override {} function getMorphoPoolBalance(address poolToken) internal view virtual returns (uint256); diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index 97c58aaef4..f7f4386650 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -31,7 +31,6 @@ contract RethCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index d31d7b04df..8aaf4b2381 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -22,7 +22,6 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); pool = StargateRewardableWrapper(address(config.erc20)).pool(); } diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 322eca9a75..9121982562 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -3,11 +3,9 @@ pragma solidity 0.8.19; import "../curve/CurveStableCollateral.sol"; -interface IPricePerShareHelper { - /// @param vault The yToken address - /// @param amount {qTok} - /// @return {qLP Token} - function amountToShares(address vault, uint256 amount) external view returns (uint256); +interface IYearnV2 { + /// @return {qLP token/tok} + function pricePerShare() external view returns (uint256); } /** @@ -18,27 +16,28 @@ interface IPricePerShareHelper { * tar = USD * UoA = USD * - * More on the ref token: crvUSDUSDC-f has a virtual price. The ref token to measure is not the + * More on the ref token: crvUSDUSDC-f has a virtual price >=1. The ref token to measure is not the * balance of crvUSDUSDC-f that the LP token is redeemable for, but the balance of the virtual * token that underlies crvUSDUSDC-f. This virtual token is an evolving mix of USDC and crvUSD. * - * Should only be used for Stable pools. - * No rewards (handled internally by the Yearn vault). - * Revenue hiding can be kept very small since stable curve pools should be up-only. + * Revenue hiding should be set to the largest % drawdown in a Yearn vault that should + * not result in default. While it is extremely rare for Yearn to have drawdowns, + * in principle it is possible and should be planned for. + * + * No rewards. */ contract YearnV2CurveFiatCollateral is CurveStableCollateral { using FixLib for uint192; - IPricePerShareHelper public immutable pricePerShareHelper; + // solhint-disable no-empty-blocks constructor( CollateralConfig memory config, uint192 revenueHiding, - PTConfiguration memory ptConfig, - IPricePerShareHelper pricePerShareHelper_ - ) CurveStableCollateral(config, revenueHiding, ptConfig) { - pricePerShareHelper = pricePerShareHelper_; - } + PTConfiguration memory ptConfig + ) CurveStableCollateral(config, revenueHiding, ptConfig) {} + + // solhint-enable no-empty-blocks /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low @@ -92,18 +91,12 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function _underlyingRefPerTok() internal view virtual override returns (uint192) { // {ref/tok} = {ref/LP token} * {LP token/tok} - return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare(), FLOOR); + return _safeWrap(curvePool.get_virtual_price()).mul(_pricePerShare()); } /// @return {LP token/tok} function _pricePerShare() internal view returns (uint192) { - uint256 supply = erc20.totalSupply(); // {qTok} - uint256 shares = pricePerShareHelper.amountToShares(address(erc20), supply); // {qLP Token} - - // yvCurve tokens always have the same number of decimals as the underlying curve LP token, - // so we can divide the quanta units without converting to whole units - - // {LP token/tok} = {LP token} / {tok} - return divuu(shares, supply); + // {LP token/tok} = {qLP token/tok} * {LP token/qLP token} + return shiftl_toFix(IYearnV2(address(erc20)).pricePerShare(), -int8(erc20Decimals)); } } diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 96de231912..c20978fa02 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -8,9 +8,6 @@ import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.so import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../../interfaces/IStRSRVotes.sol"; -import "../../libraries/NetworkConfigLib.sol"; - -uint256 constant ONE_DAY = 86400; // {s} /* * @title Governance @@ -33,9 +30,7 @@ contract Governance is // 100% uint256 public constant ONE_HUNDRED_PERCENT = 1e8; // {micro %} - // solhint-disable-next-line var-name-mixedcase - uint256 public immutable MIN_VOTING_DELAY; // {block} equal to ONE_DAY - + // solhint-disable no-empty-blocks constructor( IStRSRVotes token_, TimelockController timelock_, @@ -49,12 +44,7 @@ contract Governance is GovernorVotes(IVotes(address(token_))) GovernorVotesQuorumFraction(quorumPercent) GovernorTimelockControl(timelock_) - { - MIN_VOTING_DELAY = - (ONE_DAY + NetworkConfigLib.blocktime() - 1) / - NetworkConfigLib.blocktime(); // ONE_DAY, in blocks - requireValidVotingDelay(votingDelay_); - } + {} // solhint-enable no-empty-blocks @@ -66,11 +56,6 @@ contract Governance is return super.votingPeriod(); } - function setVotingDelay(uint256 newVotingDelay) public override { - requireValidVotingDelay(newVotingDelay); - super.setVotingDelay(newVotingDelay); // has onlyGovernance modifier - } - /// @return {qStRSR} The number of votes required in order for a voter to become a proposer function proposalThreshold() public @@ -190,8 +175,4 @@ contract Governance is uint256 currentEra = IStRSRVotes(address(token)).currentEra(); return currentEra == pastEra; } - - function requireValidVotingDelay(uint256 newVotingDelay) private view { - require(newVotingDelay >= MIN_VOTING_DELAY, "invalid votingDelay"); - } } diff --git a/contracts/plugins/mocks/AssetMock.sol b/contracts/plugins/mocks/AssetMock.sol index 0396a5ea35..b6abe6fffb 100644 --- a/contracts/plugins/mocks/AssetMock.sol +++ b/contracts/plugins/mocks/AssetMock.sol @@ -4,8 +4,6 @@ pragma solidity 0.8.19; import "../assets/Asset.sol"; contract AssetMock is Asset { - bool public stale; - uint192 private lowPrice; uint192 private highPrice; @@ -14,7 +12,7 @@ contract AssetMock is Asset { /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of + /// @dev oracleTimeout_ is also used as the timeout value in lotPrice(), should be highest of /// all assets' oracleTimeout in a collateral if there are multiple oracles constructor( uint48 priceTimeout_, @@ -42,18 +40,13 @@ contract AssetMock is Asset { uint192 ) { - require(!stale, "stale price"); return (lowPrice, highPrice, 0); } /// Should not revert /// Refresh saved prices function refresh() public virtual override { - stale = false; - } - - function setStale(bool _stale) external { - stale = _stale; + // pass } function setPrice(uint192 low, uint192 high) external { diff --git a/contracts/plugins/mocks/CTokenWrapperMock.sol b/contracts/plugins/mocks/CTokenWrapperMock.sol index 78a93b44af..c0cd0922a6 100644 --- a/contracts/plugins/mocks/CTokenWrapperMock.sol +++ b/contracts/plugins/mocks/CTokenWrapperMock.sol @@ -42,11 +42,9 @@ contract CTokenWrapperMock is ERC20Mock, IRewardable { revert("reverting claim rewards"); } uint256 oldBal = comp.balanceOf(msg.sender); - address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); - holders[0] = msg.sender; cTokens[0] = address(underlying); - comptroller.claimComp(holders, cTokens, false, true); + comptroller.claimComp(msg.sender, cTokens); emit RewardsClaimed(IERC20(address(comp)), comp.balanceOf(msg.sender) - oldBal); } diff --git a/contracts/plugins/mocks/ComptrollerMock.sol b/contracts/plugins/mocks/ComptrollerMock.sol index 249bcdb088..9f95726479 100644 --- a/contracts/plugins/mocks/ComptrollerMock.sol +++ b/contracts/plugins/mocks/ComptrollerMock.sol @@ -19,14 +19,8 @@ contract ComptrollerMock is IComptroller { compBalances[recipient] = amount; } - function claimComp( - address[] memory holders, - address[] memory, - bool, - bool - ) external { + function claimComp(address holder, address[] memory) external { // Mint amount and update internal balances - address holder = holders[0]; if (address(compToken) != address(0)) { uint256 amount = compBalances[holder]; compBalances[holder] = 0; @@ -37,9 +31,4 @@ contract ComptrollerMock is IComptroller { function getCompAddress() external view returns (address) { return address(compToken); } - - // mock - function enterMarkets(address[] calldata) external returns (uint256[] memory) { - return new uint256[](1); - } } diff --git a/contracts/plugins/mocks/RevenueTraderBackComp.sol b/contracts/plugins/mocks/RevenueTraderBackComp.sol index 73069f15ad..ed76f53346 100644 --- a/contracts/plugins/mocks/RevenueTraderBackComp.sol +++ b/contracts/plugins/mocks/RevenueTraderBackComp.sol @@ -14,10 +14,8 @@ contract RevenueTraderCompatibleV2 is RevenueTraderP1, IRevenueTraderComp { erc20s[0] = sell; TradeKind[] memory kinds = new TradeKind[](1); kinds[0] = TradeKind.DUTCH_AUCTION; - // Mirror V3 logic (only the section relevant to tests) - // solhint-disable-next-line no-empty-blocks - try this.manageTokens(erc20s, kinds) {} catch {} + this.manageTokens(erc20s, kinds); } function version() public pure virtual override(Versioned, IVersioned) returns (string memory) { diff --git a/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol b/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol deleted file mode 100644 index ebbfc6b1c2..0000000000 --- a/contracts/plugins/mocks/upgrades/FacadeMonitorV2.sol +++ /dev/null @@ -1,23 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "../../../facade/FacadeMonitor.sol"; - -/** - * @title FacadeMonitorV2 - * @notice Mock to test upgradeability for the FacadeMonitor contract - */ -contract FacadeMonitorV2 is FacadeMonitor { - /// @custom:oz-upgrades-unsafe-allow constructor - constructor(MonitorParams memory params) FacadeMonitor(params) {} - - uint256 public newValue; - - function setNewValue(uint256 newValue_) external onlyOwner { - newValue = newValue_; - } - - function version() public pure returns (string memory) { - return "2.0.0"; - } -} diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index c494ecee57..9f52e6387a 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -43,8 +43,7 @@ contract GnosisTrade is ITrade { address public origin; IERC20Metadata public sell; // address of token this trade is selling IERC20Metadata public buy; // address of token this trade is buying - uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called - uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold; dup with initBal + uint256 public initBal; // {qTok}, this trade's balance of `sell` when init() was called uint48 public endTime; // timestamp after which this trade's auction can be settled uint192 public worstCasePrice; // {buyTok/sellTok}, the worst price we expect to get at Auction // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` @@ -90,8 +89,7 @@ contract GnosisTrade is ITrade { sell = req.sell.erc20(); buy = req.buy.erc20(); - initBal = sell.balanceOf(address(this)); // {qSellTok} - sellAmount = shiftl_toFix(initBal, -int8(sell.decimals())); // {sellTok} + initBal = sell.balanceOf(address(this)); require(initBal <= type(uint96).max, "initBal too large"); require(initBal >= req.sellAmount, "unfunded trade"); @@ -109,8 +107,8 @@ contract GnosisTrade is ITrade { ); // Downsize our sell amount to adjust for fee - // {qSellTok} = {qSellTok} * {1} / {1} - uint96 _sellAmount = uint96( + // {qTok} = {qTok} * {1} / {1} + uint96 sellAmount = uint96( _divrnd( req.sellAmount * FEE_DENOMINATOR, FEE_DENOMINATOR + gnosis.feeNumerator(), @@ -145,7 +143,7 @@ contract GnosisTrade is ITrade { buy, endTime, endTime, - _sellAmount, + sellAmount, minBuyAmount, minBuyAmtPerOrder, 0, diff --git a/docs/collateral.md b/docs/collateral.md index e6ae0e039c..7c95883f58 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -42,14 +42,12 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert - /// low should be nonzero when the asset might be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); /// Should not revert /// lotLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility /// @return lotLow {UoA/tok} The lower end of the lot price estimate /// @return lotHigh {UoA/tok} The upper end of the lot price estimate function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); @@ -221,7 +219,7 @@ This would be sensible for many UNI v2 pools, but someone holding value in a two Revenue Hiding should be employed when the function underlying `refPerTok()` is not necessarily _strongly_ non-decreasing, or simply if there is uncertainty surrounding the guarantee. In general we recommend including a very small amount (1e-6) of revenue hiding for all appreciating collateral. This is already implemented in [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol). -When implementing Revenue Hiding, the `price` function should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. +When implementing Revenue Hiding, the `price/lotPrice()` functions should NOT hide revenue; they should use the current underlying exchange rate to calculate a best-effort estimate of what the collateral will trade at on secondary markets. A side-effect of this approach is that the RToken's price on markets becomes more variable. ## Important Properties for Collateral Plugins @@ -254,7 +252,7 @@ There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20W Because it’s called at the beginning of many transactions, `refresh()` should never revert. If `refresh()` encounters a critical error, it should change the Collateral contract’s state so that `status()` becomes `DISABLED`. -To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. +To prevent `refresh()` from reverting due to overflow or other numeric errors, the base collateral plugin [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) has a `tryPrice()` function that encapsulates both the oracle lookup as well as any subsequent math required. This function is always executed via a try-catch in `price()`/`lotPrice()`/`refresh()`. Extenders of this contract should not have to override any of these three functions, just `tryPrice()`. ### The `IFFY` status should be temporary. @@ -301,7 +299,7 @@ The values returned by the following view methods should never change: Collateral implementors who extend from [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) or [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol) can restrict their attention to overriding the following three functions: -- `tryPrice()` (not on the ICollateral interface; used by `price()`/`refresh()`) +- `tryPrice()` (not on the ICollateral interface; used by `price()`/`lotPrice()`/`refresh()`) - `refPerTok()` - `targetPerRef()` @@ -364,21 +362,23 @@ Should never revert. Should return the tightest possible lower and upper estimate for the price of the token on secondary markets. -The difference between the upper and lower estimate should not exceed 5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. - Lower estimate must be <= upper estimate. -Under no price data, the low estimate shoulddecay downwards and high estimate upwards. - -Should return `(0, FIX_MAX)` if pricing data is _completely_ unavailable or stale. +Should return `(0, FIX_MAX)` if pricing data is unavailable or stale. Should be gas-efficient. +The difference between the upper and lower estimate should not exceed ~5%, though this is not a hard-and-fast rule. When the difference (usually arising from an oracleError) is large, it can lead to [the price estimation of the RToken](../contracts/plugins/assets/RTokenAsset.sol) somewhat degrading. While this is not usually an issue it can come into play when one RToken is using another RToken as collateral either directly or indirectly through an LP token. If there is RSR overcollateralization then this issue is mitigated. + ### lotPrice() `{UoA/tok}` -Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility. +Should never revert. + +Lower estimate must be <= upper estimate. + +The low estimate should be nonzero while the asset is worth selling. -Recommend implement `lotPrice()` by calling `price()`. If you are inheriting from any of our existing collateral plugins, this is already done for you. See [Asset.sol](../contracts/plugins/Asset.sol) for the implementation. +Should be gas-efficient. ### refPerTok() `{ref/tok}` diff --git a/docs/deployed-addresses/1-FacadeMonitor.md b/docs/deployed-addresses/1-FacadeMonitor.md deleted file mode 100644 index e8cf1a8c05..0000000000 --- a/docs/deployed-addresses/1-FacadeMonitor.md +++ /dev/null @@ -1,7 +0,0 @@ -# FacadeMonitor (Mainnet) - -## Facade Monitor Proxy - -| Contract | Address | -| -------- | --------------------------------------------------------------------------------------------------------------------- | -| FacadeMonitor (Proxy) | [0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09](https://etherscan.io/address/0xAeA6BD7b231C0eC7f35C2bdf47A76053D09dbD09) | diff --git a/docs/deployed-addresses/8453-FacadeMonitor.md b/docs/deployed-addresses/8453-FacadeMonitor.md deleted file mode 100644 index 4cba0e181a..0000000000 --- a/docs/deployed-addresses/8453-FacadeMonitor.md +++ /dev/null @@ -1,8 +0,0 @@ -8453-FacadeMonitor.md -# FacadeMonitor (Base) - -## Facade Monitor Proxy - -| Contract | Address | -| --------------------- | --------------------------------------------------------------------------------------------------------------------- | -| FacadeMonitor (Proxy) | [0x5bfc6df700ef23741B2e01Bd45826E4c9735ae60](https://basescan.org/address/0x5bfc6df700ef23741B2e01Bd45826E4c9735ae60) | diff --git a/docs/deployment.md b/docs/deployment.md index 98c96678ef..6fbf565027 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -220,7 +220,7 @@ yarn deploy:run:confirm --network mainnet This checks that: -- For each asset, confirm: +- For each asset, confirm `lotPrice()` and `price()` are close. - `main.tradingPaused()` and `main.issuancePaused()` are true - `timelockController.minDelay()` is > 1e12 diff --git a/docs/exhaustive-tests.md b/docs/exhaustive-tests.md index 5fafdb48f3..fef7f481e0 100644 --- a/docs/exhaustive-tests.md +++ b/docs/exhaustive-tests.md @@ -1,6 +1,6 @@ # Exhaustive Testing -The exhaustive tests include `Broker.test.ts`, `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExtremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. +The exhaustive tests include `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExteremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. The env vars related to exhaustive testing are `EXTREME` and `SLOW`. @@ -12,7 +12,7 @@ I'm assuming you've already got `gcloud` installed on your dev machine. If not, ```bash gcloud auth login -gcloud config set project rtoken-testing +gcloud config set project rtoken-fuzz gcloud config list project # assumed defaults @@ -39,7 +39,7 @@ gcloud compute config-ssh Jump onto the instance: ``` -ssh exhaustive.us-central1-a.rtoken-testing +ssh exhaustive.us-central1-a.rtoken-fuzz ``` Add Matt's special seasoning, for tmux and emacs QoL improvements (NOTE: This sets the tmux `ctrl-b` to `ctrl-z`): @@ -93,7 +93,7 @@ gcloud compute config-ssh Jump onto the instance: ``` -ssh exhaustive.us-central1-a.rtoken-testing +ssh exhaustive.us-central1-a.rtoken-fuzz ``` ## 3) Run the tests @@ -113,7 +113,7 @@ Tmux and run the tests: ``` tmux -bash ./scripts/exhaustive-tests/run-exhaustive-tests.sh +bash ./scripts/run-exhaustive-tests.sh ``` When the test are complete, you'll find the console output in `tmux-1.log` and `tmux-2.log`. diff --git a/docs/monitoring.md b/docs/monitoring.md deleted file mode 100644 index df1c5f8baf..0000000000 --- a/docs/monitoring.md +++ /dev/null @@ -1,35 +0,0 @@ -# Monitoring the Reserve Protocol and Rtokens - -This document provides an overview of the monitoring setup for the Reserve Protocol and RTokens on both the Ethereum and Base networks. The monitoring is conducted through the [Hypernative](https://app.hypernative.xyz/) platform, utilizing the `FacadeMonitor` contract to retrieve the status for specific RTokens. This monitoring setup ensures continuous vigilance over the Reserve Protocol and RTokens, with alerts promptly notifying relevant channels in case of any issues. - -## Checks/Alerts - -The following alerts are currently setup for RTokens deployed in Mainnet and Base: - -### Status (Basket Handler) - HIGH - -Checks if the status of the Basket Handler for a specific RToken is SOUND. If not, triggers an alert via Slack, Discord, Telegram, and Pager Duty. - -### Fully collateralized (Basket Handler) - HIGH - -Checks if the Basket Handler for a specific RToken is FULLY COLLATERALIZED. If not, triggers an alert via Slack, Discord, Telegram, and Pager Duty. - -### Batch Auctions Disabled - HIGH - -Checks if the batch auctions for a specific RToken are DISABLED. If true, triggers an alert via Slack, Discord, Telegram, and Pager Duty. - -### Dutch Auctions Disabled - HIGH - -Checks if the any of the dutch auctions for a specific RToken is DISABLED. If true, triggers an alert via Slack, Discord, Telegram, and Pager Duty. - -### Issuance Depleted - MEDIUM - -Triggers and alert via Slack if the Issuance Throttle for a specific RToken is consumed > 99% - -### Redemption Depleted - MEDIUM - -Triggers and alert via Slack if the Redemption Throttle for a specific RToken is consumed > 99% - -### Backing Fully Redeemable- MEDIUM - -Triggers and alert via Slack if the backing of a specific RToken is not redeemable 100% on the underlying Defi Protocol. Provides checks for AAVE V2, AAVE V3, Compound V2, Compound V3, Stargate, Flux, and Morpho AAVE V2. diff --git a/docs/pause-freeze-states.md b/docs/pause-freeze-states.md deleted file mode 100644 index 17b2785fcd..0000000000 --- a/docs/pause-freeze-states.md +++ /dev/null @@ -1,73 +0,0 @@ -# Pause Freeze States - -Some protocol functions may be halted while the protocol is either (i) issuance-paused; (ii) trading-paused; or (iii) frozen. Below is a table that shows which protocol interactions (`@custom:interaction`) and refreshers (`@custom:refresher`) execute during paused/frozen states, as of the 3.1.0 release. - -All governance functions (`@custom:governance`) remain enabled during all paused/frozen states. They are not mentioned here. - -A :heavy_check_mark: indicates the function still executes in this state. -A :x: indicates it reverts. - -| Function | Issuance-Paused | Trading-Paused | Frozen | -| --------------------------------------- | ------------------ | ----------------------- | ----------------------- | -| `BackingManager.claimRewards()` | :heavy_check_mark: | :x: | :x: | -| `BackingManager.claimRewardsSingle()` | :heavy_check_mark: | :x: | :x: | -| `BackingManager.grantRTokenAllowance()` | :heavy_check_mark: | :heavy_check_mark: | :x: | -| `BackingManager.forwardRevenue()` | :heavy_check_mark: | :x: | :x: | -| `BackingManager.rebalance()` | :heavy_check_mark: | :x: | :x: | -| `BackingManager.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `BasketHandler.refreshBasket()` | :heavy_check_mark: | :x: (unless governance) | :x: (unless governance) | -| `Broker.openTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `Broker.reportViolation()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `Distributor.distribute()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `Furnace.melt()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `Main.poke()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `RevenueTrader.claimRewards()` | :heavy_check_mark: | :x: | :x: | -| `RevenueTrader.claimRewardsSingle()` | :heavy_check_mark: | :x: | :x: | -| `RevenueTrader.distributeTokenToBuy()` | :heavy_check_mark: | :x: | :x: | -| `RevenueTrader.manageTokens()` | :heavy_check_mark: | :x: | :x: | -| `RevenueTrader.returnTokens()` | :heavy_check_mark: | :x: | :x: | -| `RevenueTrader.settleTrade()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `RToken.issue()` | :x: | :heavy_check_mark: | :x: | -| `RToken.issueTo()` | :x: | :heavy_check_mark: | :x: | -| `RToken.redeem()` | :heavy_check_mark: | :heavy_check_mark: | :x: | -| `RToken.redeemTo()` | :heavy_check_mark: | :heavy_check_mark: | :x: | -| `RToken.redeemCustom()` | :heavy_check_mark: | :heavy_check_mark: | :x: | -| `StRSR.cancelUnstake()` | :heavy_check_mark: | :heavy_check_mark: | :x: | -| `StRSR.payoutRewards()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `StRSR.stake()` | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| `StRSR.seizeRSR()` | :heavy_check_mark: | :x: | :x: | -| `StRSR.unstake()` | :heavy_check_mark: | :x: | :x: | -| `StRSR.withdraw()` | :heavy_check_mark: | :x: | :x: | - -## Issuance-pause - -The issuance-paused states indicates that RToken issuance should be paused, and _only_ that. It is a narrow control knob that is designed solely to protect against a case where bad debt is being injected into the protocol, say, because default detection for an asset has a false negative. - -## Trading-pause - -The trading-paused state has significantly more scope than the issuance-paused state. It is designed to prevent against cases where the protocol may trade unneccesarily. Many other functions in addition to just `BackingManager.rebalance()` and `RevenueTrader.manageTokens()` are halted. In general anything that manages the backing and revenue for an RToken is halted. This may become neccessary to use due to (among other things): - -- An asset's `price()` malfunctions or is manipulated -- A collateral's default detection has a false positive or negative - -## Freezing - -The scope of freezing is the largest, and it should be used least frequently. Nearly all protocol interactions (`@custom:interaction`) are halted. Any refreshers (`@custom:refresher`) remain enabled, as well as `StRSR.stake()` and the "wrap up" routine `*.settleTrade()`. - -An important function of freezing is to provide a finite time for governance to push through a repair proposal an RToken in the event that a 0-day is discovered that requires a contract upgrade. - -### `Furnace.melt()` - -It is necessary for `Furnace.melt()` to remain emabled in order to allow `RTokenAsset.refresh()` to update its `price()`. Any revenue RToken that has already accumulated at the Furnace will continue to be melted, but the flow of new revenue RToken into the contract is halted. - -### `StRSR.payoutRewards()` - -It is necessary for `StRSR.payoutRewards()` to remain enabled in order for `StRSR.stake()` to use the up-to-date StRSR-RSR exchange rate. If it did not, then in the event of freezing there would be an unfair benefit to new stakers. Any revenue RSR that has already accumulated at the StRSR contract will continue to be paid out, but the flow of new revenue RSR into the contract is halted. - -### `StRSR.stake()` - -It is important for `StRSR.stake()` to remain emabled while frozen in order to allow honest RSR to flow into an RToken to vote against malicious governance proposals. - -### `*.settleTrade()` - -The settleTrade functionality must remain enabled in order to maintain the property that dutch auctions will discover the optimal price. If settleTrade were halted, it could become possible for a dutch auction to clear at a much lower price than it should have, simply because bidding was disabled during the earlier portion of the auction. diff --git a/docs/recollateralization.md b/docs/recollateralization.md index 06cf836594..aecb345c94 100644 --- a/docs/recollateralization.md +++ b/docs/recollateralization.md @@ -64,7 +64,21 @@ If there does not exist a trade that meets these constraints, then the protocol #### Trade Sizing -All trades have a worst-case exchange rate that is a function of (among other things) the selling asset's `price().low` and the buying asset's `price().high`. +The `IAsset` interface defines two types of prices: + +```solidity +/// @return low {UoA/tok} The lower end of the price estimate +/// @return high {UoA/tok} The upper end of the price estimate +function price() external view returns (uint192 low, uint192 high); + +/// lotLow should be nonzero when the asset might be worth selling +/// @return lotLow {UoA/tok} The lower end of the lot price estimate +/// @return lotHigh {UoA/tok} The upper end of the lot price estimate +function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); + +``` + +All trades have a worst-case exchange rate that is a function of (among other things) the selling asset's `lotPrice().low` and the buying asset's `lotPrice().high`. #### Trade Examples diff --git a/scripts/addresses/84531-RTKN-tmp-deployments.json b/scripts/addresses/84531-RTKN-tmp-deployments.json deleted file mode 100644 index e7ec7dc68f..0000000000 --- a/scripts/addresses/84531-RTKN-tmp-deployments.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "facadeWrite": "0x0903048fD4E948c60451B41A48B35E0bafc0967F", - "main": "0x1274F03639932140bBd48D8376a39ee86EbFEe66", - "components": { - "assetRegistry": "0x09909aD4e15167f18dc42f86F12Ba85137Fc51a3", - "backingManager": "0xd53F642B04ba005E9A27FC82961F7c1563BEF301", - "basketHandler": "0xE9E22548C92EF74c02A9dab73c33eBcEb53cA216", - "broker": "0x7466593929d61308C89ce651029B7019E644b398", - "distributor": "0xd3e333fb488e7DF8BA49D98399a7f42d7fAc7b2C", - "furnace": "0xfe702Ff577B0a9B3865a59af31D039fA92739d39", - "rsrTrader": "0xF0c203Be2ac6747C107D119FCb3d8BED28d9A2db", - "rTokenTrader": "0xc2C5542ceF5d6C8c79b538ff3c3DA976720F93bf", - "rToken": "0x41d5a65ba05bEB7C5Ce01FF3eFb2c52eF2D46469", - "stRSR": "0xB8f96Ec61B4f209F7562bC10375b374f8305De97" - }, - "rTokenAsset": "0xa9063D1153DA2160A298ea83CA388c827c623A5D", - "governance": "0x326A8309f9b5f1ee06e832cdc168eac7feBA2Bea", - "timelock": "0x9686C510f9b5d101c75f659D0Fd3De20c01649dE" -} diff --git a/scripts/confirmation/1_confirm_assets.ts b/scripts/confirmation/1_confirm_assets.ts index b5ea27b8ec..0c62bfbac1 100644 --- a/scripts/confirmation/1_confirm_assets.ts +++ b/scripts/confirmation/1_confirm_assets.ts @@ -2,8 +2,7 @@ import hre from 'hardhat' import { getChainId } from '../../common/blockchain-utils' import { developmentChains, networkConfig } from '../../common/configuration' -import { CollateralStatus, MAX_UINT192 } from '../../common/constants' -import { getLatestBlockTimestamp } from '#/utils/time' +import { CollateralStatus } from '../../common/constants' import { getDeploymentFile, IAssetCollDeployments, @@ -28,20 +27,18 @@ async function main() { const assets = Object.values(assetsColls.assets) const collateral = Object.values(assetsColls.collateral) + // Confirm lotPrice() == price() for (const a of assets) { console.log(`confirming asset ${a}`) const asset = await hre.ethers.getContractAt('Asset', a) + const [lotLow, lotHigh] = await asset.lotPrice() const [low, high] = await asset.price() // {UoA/tok} - const timestamp = await getLatestBlockTimestamp(hre) - if ( - low.eq(0) || - low.eq(MAX_UINT192) || - high.eq(0) || - high.eq(MAX_UINT192) || - await asset.lastSave() !== timestamp || - await asset.lastSave() !== timestamp - ) - throw new Error('misconfigured oracle') + if (low.eq(0) || high.eq(0)) throw new Error('misconfigured oracle') + + if (!lotLow.eq(low) || !lotHigh.eq(high)) { + console.log('lotLow, low, lotHigh, high', lotLow, low, lotHigh, high) + throw new Error('lot price off') + } } // Collateral @@ -52,18 +49,14 @@ async function main() { if ((await coll.status()) != CollateralStatus.SOUND) throw new Error('collateral unsound') + const [lotLow, lotHigh] = await coll.lotPrice() const [low, high] = await coll.price() // {UoA/tok} - const timestamp = await getLatestBlockTimestamp(hre) - if ( - low.eq(0) || - low.eq(MAX_UINT192) || - high.eq(0) || - high.eq(MAX_UINT192) || - await coll.lastSave() !== timestamp || - await coll.lastSave() !== timestamp - ) - throw new Error('misconfigured oracle') - } + if (low.eq(0) || high.eq(0)) throw new Error('misconfigured oracle') + + if (!lotLow.eq(low) || !lotHigh.eq(high)) { + console.log('lotLow, low, lotHigh, high', lotLow, low, lotHigh, high) + throw new Error('lot price off') + } } } diff --git a/scripts/deploy.ts b/scripts/deploy.ts index e2916e7d00..eb9d82f713 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -62,8 +62,6 @@ async function main() { 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', - 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts', - 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts', 'phase2-assets/collaterals/deploy_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { diff --git a/scripts/deployment/phase1-common/1_deploy_libraries.ts b/scripts/deployment/phase1-common/1_deploy_libraries.ts index 78a4efa683..35fc34e373 100644 --- a/scripts/deployment/phase1-common/1_deploy_libraries.ts +++ b/scripts/deployment/phase1-common/1_deploy_libraries.ts @@ -8,6 +8,7 @@ import { BasketLibP1, CvxMining, RecollateralizationLibP1 } from '../../../typec let tradingLib: RecollateralizationLibP1 let basketLib: BasketLibP1 +let cvxMiningLib: CvxMining async function main() { // ==== Read Configuration ==== @@ -15,7 +16,7 @@ async function main() { const chainId = await getChainId(hre) console.log( - `Deploying TradingLib, BasketLib to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}` + `Deploying TradingLib, BasketLib, and CvxMining to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}` ) if (!networkConfig[chainId]) { @@ -45,9 +46,20 @@ async function main() { fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) + // Deploy CvxMining external library + if (!baseL2Chains.includes(hre.network.name)) { + const CvxMiningFactory = await ethers.getContractFactory('CvxMining') + cvxMiningLib = await CvxMiningFactory.connect(burner).deploy() + await cvxMiningLib.deployed() + deployments.cvxMiningLib = cvxMiningLib.address + + fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) + } + console.log(`Deployed to ${hre.network.name} (${chainId}): TradingLib: ${tradingLib.address} BasketLib: ${basketLib.address} + CvxMiningLib: ${cvxMiningLib ? cvxMiningLib.address : 'N/A'} Deployment file: ${deploymentFilename}`) } diff --git a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts b/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts index f33da05e81..e67a33f602 100644 --- a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts +++ b/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts @@ -6,7 +6,7 @@ import { networkConfig } from '../../../common/configuration' import { ZERO_ADDRESS } from '../../../common/constants' import { fp } from '../../../common/numbers' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../../deployment/common' -import { priceTimeout, validateImplementations } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, validateImplementations } from '../../deployment/utils' import { Asset } from '../../../typechain' let rsrAsset: Asset @@ -36,7 +36,7 @@ async function main() { tokenAddress: deployments.prerequisites.RSR, rewardToken: ZERO_ADDRESS, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24h + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h }) rsrAsset = await ethers.getContractAt('Asset', rsrAssetAddr) diff --git a/scripts/deployment/phase2-assets/1_deploy_assets.ts b/scripts/deployment/phase2-assets/1_deploy_assets.ts index 93a8a69392..cab49a5515 100644 --- a/scripts/deployment/phase2-assets/1_deploy_assets.ts +++ b/scripts/deployment/phase2-assets/1_deploy_assets.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../deployment/common' -import { priceTimeout } from '../../deployment/utils' +import { priceTimeout, oracleTimeout } from '../../deployment/utils' import { Asset } from '../../../typechain' async function main() { @@ -44,7 +44,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.stkAAVE, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr }) await (await ethers.getContractAt('Asset', stkAAVEAsset)).refresh() @@ -60,7 +60,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.COMP, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr }) await (await ethers.getContractAt('Asset', compAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index 5a58c3bea8..cd8fdaa334 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../common' -import { combinedError, priceTimeout, revenueHiding } from '../utils' +import { combinedError, priceTimeout, oracleTimeout, revenueHiding } from '../utils' import { ICollateral, ATokenMock, StaticATokenLM } from '../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { let collateral: ICollateral /******** Deploy Fiat Collateral - DAI **************************/ - const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? '86400' : '3600' // 24 hr (Base) or 1 hour + const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? 86400 : 3600 // 24 hr (Base) or 1 hour const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% if (networkConfig[chainId].tokens.DAI && networkConfig[chainId].chainlinkFeeds.DAI) { @@ -53,7 +53,7 @@ async function main() { oracleError: daiOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: daiOracleTimeout, + oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -69,7 +69,7 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% /******** Deploy Fiat Collateral - USDC **************************/ @@ -80,7 +80,7 @@ async function main() { oracleError: usdcOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24 hr + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -97,7 +97,7 @@ async function main() { } /******** Deploy Fiat Collateral - USDT **************************/ - const usdtOracleTimeout = '86400' // 24 hr + const usdtOracleTimeout = 86400 // 24 hr const usdtOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% if (networkConfig[chainId].tokens.USDT && networkConfig[chainId].chainlinkFeeds.USDT) { @@ -107,7 +107,7 @@ async function main() { oracleError: usdtOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdtOracleTimeout, // 24 hr + oracleTimeout: oracleTimeout(chainId, usdtOracleTimeout).toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdtOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -132,7 +132,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.USDP, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -156,7 +156,7 @@ async function main() { oracleError: fp('0.003').toString(), // 0.3% tokenAddress: networkConfig[chainId].tokens.TUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.013').toString(), // 1.3% delayUntilDefault: bn('86400').toString(), // 24h @@ -179,7 +179,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% tokenAddress: networkConfig[chainId].tokens.BUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -203,7 +203,7 @@ async function main() { oracleError: usdcOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.USDbC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24 hr + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1.3% delayUntilDefault: bn('86400').toString(), // 24h @@ -249,7 +249,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: adaiStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -293,7 +293,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: ausdcStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -337,7 +337,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% staticAToken: ausdtStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -380,7 +380,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% staticAToken: abusdStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -424,7 +424,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% staticAToken: ausdpStaticToken.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -445,242 +445,6 @@ async function main() { const btcOracleError = fp('0.005') // 0.5% const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) - /*** Compound V2 not available in Base L2s */ - if (!baseL2Chains.includes(hre.network.name)) { - /******** Deploy CToken Fiat Collateral - cDAI **************************/ - const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') - const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) - - const cDaiVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cDAI!, - `${await cDai.name()} Vault`, - `${await cDai.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cDaiVault.deployed() - - console.log( - `Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} ` - ) - - const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cDaiVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cDaiCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cDAI = cDaiCollateral - assetCollDeployments.erc20s.cDAI = cDaiVault.address - deployedCollateral.push(cDaiCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDC **************************/ - const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) - - const cUsdcVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDC!, - `${await cUsdc.name()} Vault`, - `${await cUsdc.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdcVault.deployed() - - console.log( - `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` - ) - - const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdcVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdcCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDC = cUsdcCollateral - assetCollDeployments.erc20s.cUSDC = cUsdcVault.address - deployedCollateral.push(cUsdcCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDT **************************/ - const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) - - const cUsdtVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDT!, - `${await cUsdt.name()} Vault`, - `${await cUsdt.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdtVault.deployed() - - console.log( - `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` - ) - - const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdtVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDT = cUsdtCollateral - assetCollDeployments.erc20s.cUSDT = cUsdtVault.address - deployedCollateral.push(cUsdtCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDP **************************/ - const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) - - const cUsdpVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDP!, - `${await cUsdp.name()} Vault`, - `${await cUsdp.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdpVault.deployed() - - console.log( - `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` - ) - - const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, - oracleError: fp('0.01').toString(), // 1% - cToken: cUsdpVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.02').toString(), // 2% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdpCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDP = cUsdpCollateral - assetCollDeployments.erc20s.cUSDP = cUsdpVault.address - deployedCollateral.push(cUsdpCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ - const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) - - const cWBTCVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cWBTC!, - `${await cWBTC.name()} Vault`, - `${await cWBTC.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cWBTCVault.deployed() - - console.log( - `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` - ) - - const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { - priceTimeout: priceTimeout.toString(), - referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, - targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, - combinedOracleError: combinedBTCWBTCError.toString(), - cToken: cWBTCVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetUnitOracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cWBTCCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cWBTC = cWBTCCollateral - assetCollDeployments.erc20s.cWBTC = cWBTCVault.address - deployedCollateral.push(cWBTCCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Self-Referential Collateral - cETH **************************/ - const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) - - const cETHVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cETH!, - `${await cETH.name()} Vault`, - `${await cETH.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cETHVault.deployed() - - console.log( - `Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} ` - ) - - const { collateral: cETHCollateral } = await hre.run( - 'deploy-ctoken-selfreferential-collateral', - { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: fp('0.005').toString(), // 0.5% - cToken: cETHVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('ETH'), - revenueHiding: revenueHiding.toString(), - referenceERC20Decimals: '18', - } - ) - collateral = await ethers.getContractAt('ICollateral', cETHCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cETH = cETHCollateral - assetCollDeployments.erc20s.cETH = cETHVault.address - deployedCollateral.push(cETHCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - } - /******** Deploy Non-Fiat Collateral - wBTC **************************/ if ( networkConfig[chainId].tokens.WBTC && @@ -694,8 +458,8 @@ async function main() { combinedOracleError: combinedBTCWBTCError.toString(), tokenAddress: networkConfig[chainId].tokens.WBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetUnitOracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -713,7 +477,7 @@ async function main() { /******** Deploy Self Referential Collateral - wETH **************************/ if (networkConfig[chainId].tokens.WETH && networkConfig[chainId].chainlinkFeeds.ETH) { - const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? '1200' : '3600' // 20 min (Base) or 1 hr + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% const { collateral: wETHCollateral } = await hre.run('deploy-selfreferential-collateral', { @@ -722,7 +486,7 @@ async function main() { oracleError: ethOracleError.toString(), tokenAddress: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: ethOracleTimeout, + oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), }) collateral = await ethers.getContractAt('ICollateral', wETHCollateral) @@ -751,8 +515,8 @@ async function main() { oracleError: eurtError.toString(), // 2% tokenAddress: networkConfig[chainId].tokens.EURT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetUnitOracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetUnitOracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: fp('0.03').toString(), // 3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/assets/deploy_crv.ts b/scripts/deployment/phase2-assets/assets/deploy_crv.ts index 80eb3f6c19..f0db202b9b 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_crv.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_crv.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout } from '../../../deployment/utils' +import { priceTimeout, oracleTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% tokenAddress: networkConfig[chainId].tokens.CRV, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr }) await (await ethers.getContractAt('Asset', crvAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/assets/deploy_cvx.ts b/scripts/deployment/phase2-assets/assets/deploy_cvx.ts index cb7eb2d5d2..1c5aaa57ce 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_cvx.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_cvx.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout } from '../../../deployment/utils' +import { priceTimeout, oracleTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.02').toString(), // 2% tokenAddress: networkConfig[chainId].tokens.CVX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr }) await (await ethers.getContractAt('Asset', cvxAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts index f930201a21..e7fbc98512 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts @@ -13,7 +13,7 @@ import { } from '../../common' import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' -import { priceTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' // This file specifically deploys Aave V3 USDC collateral @@ -77,7 +77,7 @@ async function main() { oracleError: fp('0.003'), // 3% erc20: erc20.address, maxTradeVolume: fp('1e6'), - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, bn('86400')), // 24 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.013'), delayUntilDefault: bn('86400'), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts index 2d4eb8112d..2d56f9d3f9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -13,7 +13,7 @@ import { } from '../../common' import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' -import { priceTimeout, revenueHiding } from '../../utils' +import { priceTimeout, revenueHiding, oracleTimeout } from '../../utils' // This file specifically deploys Aave V3 USDC collateral @@ -68,7 +68,7 @@ async function main() { ) /******** Deploy Aave V3 USDC collateral plugin **************************/ - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') @@ -79,7 +79,7 @@ async function main() { oracleError: usdcOracleError, erc20: erc20.address, maxTradeVolume: fp('1e6'), - oracleTimeout: usdcOracleTimeout, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError), delayUntilDefault: bn('86400'), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts index 18984099fe..eab6850157 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_cbeth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, combinedError } from '../../utils' +import { priceTimeout, oracleTimeout, combinedError } from '../../utils' import { CBEthCollateral, CBEthCollateralL2, @@ -62,14 +62,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - '86400' // refPerTokChainlinkTimeout + oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() @@ -89,16 +89,16 @@ async function main() { oracleError: oracleError.toString(), // 0.15% & 0.5%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '1200', // 20 min + oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - '86400', // refPerTokChainlinkTimeout + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed - '86400' // exchangeRateChainlinkTimeout + oracleTimeout(chainId, '86400').toString() // exchangeRateChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts index 89b2464c55..d328a311dd 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts @@ -12,8 +12,8 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { combinedError, priceTimeout, revenueHiding } from '../../utils' -import { ICollateral } from '../../../../typechain' +import { combinedError, priceTimeout, oracleTimeout, revenueHiding } from '../../utils' +import { ICollateral, ATokenMock, StaticATokenLM } from '../../../../typechain' async function main() { // ==== Read Configuration ==== @@ -71,7 +71,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cDaiVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -109,7 +109,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cUsdcVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -147,7 +147,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: cUsdtVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -185,7 +185,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% cToken: cUsdpVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h @@ -224,8 +224,8 @@ async function main() { combinedOracleError: combinedBTCWBTCError.toString(), cToken: cWBTCVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetUnitOracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + targetUnitOracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h @@ -265,7 +265,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% cToken: cETHVault.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: revenueHiding.toString(), referenceERC20Decimals: '18', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts index b382962e58..dae7875b30 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts @@ -14,7 +14,7 @@ import { fileExists, } from '../../common' import { CurveStableRTokenMetapoolCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { revenueHiding, oracleTimeout } from '../../utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -63,10 +63,13 @@ async function main() { /******** Deploy Convex Stable Metapool for eUSD/fraxBP **************************/ + const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory( 'CurveStableRTokenMetapoolCollateral' ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { + libraries: { CvxMining: CvxMining.address }, + }) const wPool = await ConvexStakingWrapperFactory.deploy() await wPool.deployed() @@ -84,7 +87,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -95,7 +98,10 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + ], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts index 6727ff25d7..72d0f7debe 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableMetapoolCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { revenueHiding, oracleTimeout } from '../../utils' import { CurvePoolType, DELAY_UNTIL_DEFAULT, @@ -69,10 +69,13 @@ async function main() { /******** Deploy Convex Stable Metapool for MIM/3Pool **************************/ + const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory( 'CurveStableMetapoolCollateral' ) - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { + libraries: { CvxMining: CvxMining.address }, + }) const wPool = await ConvexStakingWrapperFactory.deploy() await wPool.deployed() @@ -102,7 +105,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts index abd65d88b6..97a8fc4f2b 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts @@ -14,7 +14,7 @@ import { fileExists, } from '../../common' import { CurveStableCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { revenueHiding, oracleTimeout } from '../../utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -65,8 +65,11 @@ async function main() { /******** Deploy Convex Stable Pool for 3pool **************************/ + const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { + libraries: { CvxMining: CvxMining.address }, + }) const w3Pool = await ConvexStakingWrapperFactory.deploy() await w3Pool.deployed() @@ -85,7 +88,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -96,7 +99,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts new file mode 100644 index 0000000000..ab71316676 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_volatile_plugin.ts @@ -0,0 +1,142 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + IDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { CurveVolatileCollateral } from '../../../../typechain' +import { revenueHiding, oracleTimeout } from '../../utils' +import { + CurvePoolType, + BTC_USD_ORACLE_ERROR, + BTC_ORACLE_TIMEOUT, + BTC_USD_FEED, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + TRI_CRYPTO, + TRI_CRYPTO_TOKEN, + TRI_CRYPTO_CVX_POOL_ID, + WBTC_BTC_ORACLE_ERROR, + WETH_ORACLE_TIMEOUT, + WBTC_BTC_FEED, + WBTC_ORACLE_TIMEOUT, + WETH_USD_FEED, + WETH_ORACLE_ERROR, + USDT_ORACLE_ERROR, + USDT_ORACLE_TIMEOUT, + USDT_USD_FEED, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// This file specifically deploys Convex Volatile Plugin for Tricrypto + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + const deployments = getDeploymentFile(phase1File) + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Convex Volatile Pool for 3pool **************************/ + + const CvxMining = await ethers.getContractAt('CvxMining', deployments.cvxMiningLib) + const CurveVolatileCollateralFactory = await hre.ethers.getContractFactory( + 'CurveVolatileCollateral' + ) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { + libraries: { CvxMining: CvxMining.address }, + }) + + const w3Pool = await ConvexStakingWrapperFactory.deploy() + await w3Pool.deployed() + await (await w3Pool.initialize(TRI_CRYPTO_CVX_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Volatile TriCrypto on ${hre.network.name} (${chainId}): ${w3Pool.address} ` + ) + + const collateral = await CurveVolatileCollateralFactory.connect( + deployer + ).deploy( + { + erc20: w3Pool.address, + targetName: ethers.utils.formatBytes32String('TRICRYPTO'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: oracleTimeout(chainId, USDT_ORACLE_TIMEOUT), // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 3, + curvePool: TRI_CRYPTO, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], + oracleTimeouts: [ + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], + ], + oracleErrors: [ + [USDT_ORACLE_ERROR], + [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], + [WETH_ORACLE_ERROR], + ], + lpToken: TRI_CRYPTO_TOKEN, + } + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Convex Volatile Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.cvxTriCrypto = collateral.address + assetCollDeployments.erc20s.cvxTriCrypto = w3Pool.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts index 21e78893af..3f4755ff72 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, revenueHiding } from '../../utils' +import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -61,7 +61,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = fp('0.003') // 0.3% (Base) const collateral = await CTokenV3Factory.connect(deployer).deploy( @@ -71,7 +71,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h hr, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts index a05ac5bbc7..873b8fbcc0 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, revenueHiding } from '../../utils' +import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -59,7 +59,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% const collateral = await CTokenV3Factory.connect(deployer).deploy( @@ -69,7 +69,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h hr, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts index c2d760a2f9..e886d6d806 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableRTokenMetapoolCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { revenueHiding, oracleTimeout } from '../../utils' import { CRV, CurvePoolType, @@ -88,7 +88,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -99,7 +99,10 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + ], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts index e62840d7e1..f97882d214 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts @@ -12,7 +12,7 @@ import { fileExists, } from '../../common' import { CurveStableMetapoolCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { revenueHiding, oracleTimeout } from '../../utils' import { CRV, CurvePoolType, @@ -105,7 +105,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts index 6b9f415d01..b2d6462d6c 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts @@ -13,7 +13,7 @@ import { fileExists, } from '../../common' import { CurveStableCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { revenueHiding, oracleTimeout } from '../../utils' import { CRV, CurvePoolType, @@ -89,7 +89,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -100,7 +100,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts new file mode 100644 index 0000000000..f3b6e3e615 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_volatile_plugin.ts @@ -0,0 +1,142 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { CurveVolatileCollateral } from '../../../../typechain' +import { revenueHiding, oracleTimeout } from '../../utils' +import { + CRV, + CurvePoolType, + BTC_USD_ORACLE_ERROR, + BTC_ORACLE_TIMEOUT, + BTC_USD_FEED, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + TRI_CRYPTO, + TRI_CRYPTO_TOKEN, + TRI_CRYPTO_GAUGE, + WBTC_BTC_ORACLE_ERROR, + WETH_ORACLE_TIMEOUT, + WBTC_BTC_FEED, + WBTC_ORACLE_TIMEOUT, + WETH_USD_FEED, + WETH_ORACLE_ERROR, + USDT_ORACLE_ERROR, + USDT_ORACLE_TIMEOUT, + USDT_USD_FEED, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// Deploy Curve Volatile Plugin for Tricrypto + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Curve Volatile Pool for 3pool **************************/ + + const CurveVolatileCollateralFactory = await hre.ethers.getContractFactory( + 'CurveVolatileCollateral' + ) + const CurveStakingWrapperFactory = await ethers.getContractFactory('CurveGaugeWrapper') + const w3Pool = await CurveStakingWrapperFactory.deploy( + TRI_CRYPTO_TOKEN, + 'Wrapped Curve.fi USD-BTC-ETH', + 'wcrv3crypto', + CRV, + TRI_CRYPTO_GAUGE + ) + await w3Pool.deployed() + + console.log( + `Deployed wrapper for Curve Volatile TriCrypto on ${hre.network.name} (${chainId}): ${w3Pool.address} ` + ) + + const collateral = await CurveVolatileCollateralFactory.connect( + deployer + ).deploy( + { + erc20: w3Pool.address, + targetName: ethers.utils.formatBytes32String('TRICRYPTO'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: oracleTimeout(chainId, USDT_ORACLE_TIMEOUT), // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 3, + curvePool: TRI_CRYPTO, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], + oracleTimeouts: [ + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], + ], + oracleErrors: [ + [USDT_ORACLE_ERROR], + [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], + [WETH_ORACLE_ERROR], + ], + lpToken: TRI_CRYPTO_TOKEN, + } + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Curve Volatile Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.crvTriCrypto = collateral.address + assetCollDeployments.erc20s.crvTriCrypto = w3Pool.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts index aa6e840436..26ab8341ac 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_dsr_sdai.ts @@ -13,7 +13,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout } from '../../utils' +import { priceTimeout, oracleTimeout } from '../../utils' import { SDaiCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -54,12 +54,12 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: networkConfig[chainId].tokens.sDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }, - bn(0), // does not require revenue hiding + fp('1e-6').toString(), // revenueHiding = 0.0001% POT ) await collateral.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts index 6acbcccf8f..af7258ec4c 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_flux_finance_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, revenueHiding } from '../../utils' +import { priceTimeout, oracleTimeout, revenueHiding } from '../../utils' import { ICollateral } from '../../../../typechain' async function main() { @@ -49,7 +49,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fUsdc.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -74,7 +74,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fUsdt.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -99,7 +99,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% cToken: fDai.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -124,7 +124,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% cToken: fFrax.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts index 30884eae2d..bc6a8b160a 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout } from '../../utils' +import { priceTimeout, oracleTimeout } from '../../utils' import { LidoStakedEthCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -79,14 +79,14 @@ async function main() { oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% stethEthOracleAddress, // targetPerRefChainlinkFeed - '86400' // targetPerRefChainlinkTimeout + oracleTimeout(chainId, '86400').toString() // targetPerRefChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts index cb659b1889..535b4fd9f1 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts @@ -11,7 +11,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, combinedError } from '../../utils' +import { priceTimeout, oracleTimeout, combinedError } from '../../utils' async function main() { // ==== Read Configuration ==== @@ -46,9 +46,11 @@ async function main() { const MorphoTokenisedDepositFactory = await ethers.getContractFactory( 'MorphoAaveV2TokenisedDeposit' ) + const maUSDT = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDT!, poolToken: networkConfig[chainId].tokens.aUSDT!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -57,6 +59,7 @@ async function main() { const maUSDC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDC!, poolToken: networkConfig[chainId].tokens.aUSDC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -65,6 +68,7 @@ async function main() { const maDAI = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.DAI!, poolToken: networkConfig[chainId].tokens.aDAI!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -73,6 +77,7 @@ async function main() { const maWBTC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.WBTC!, poolToken: networkConfig[chainId].tokens.aWBTC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -81,6 +86,7 @@ async function main() { const maWETH = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.WETH!, poolToken: networkConfig[chainId].tokens.aWETH!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -89,6 +95,7 @@ async function main() { const maStETH = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, + rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.stETH!, poolToken: networkConfig[chainId].tokens.astETH!, rewardToken: networkConfig[chainId].tokens.MORPHO!, @@ -120,7 +127,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: stablesOracleError.toString(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24h + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: stablesOracleError.add(fp('0.01')), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -158,7 +165,6 @@ async function main() { const collateral = await FiatCollateralFactory.connect(deployer).deploy( { ...baseStableConfig, - oracleTimeout: '3600', // 1 hr chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI!, erc20: maDAI.address, }, @@ -179,16 +185,16 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedBTCWBTCError, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} erc20: maWBTC.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.BTC!, // {UoA/target} - '3600' // 1 hr + networkConfig[chainId].chainlinkFeeds.WBTC!, // {target/ref} + oracleTimeout(chainId, '86400').toString() // 1 hr ) assetCollDeployments.collateral.maWBTC = collateral.address deployedCollateral.push(collateral.address.toString()) @@ -202,7 +208,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: fp('0.005'), maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h @@ -231,16 +237,16 @@ async function main() { priceTimeout: priceTimeout, oracleError: combinedOracleErrors, maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.01').add(combinedOracleErrors), // ~1.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} erc20: maStETH.address, }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.ETH!, // {UoA/target} - '3600' // 1 hr + networkConfig[chainId].chainlinkFeeds.stETHETH!, // {target/ref} + oracleTimeout(chainId, '86400').toString() // 1 hr ) assetCollDeployments.collateral.maStETH = collateral.address deployedCollateral.push(collateral.address.toString()) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts index d90520b97a..7f8b308993 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, combinedError } from '../../utils' +import { priceTimeout, oracleTimeout, combinedError } from '../../utils' import { RethCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -70,14 +70,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4').toString(), // revenueHiding = 0.01% rethOracleAddress, // refPerTokChainlinkFeed - '86400' // refPerTokChainlinkTimeout + oracleTimeout(chainId, '86400').toString() // refPerTokChainlinkTimeout ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts index 600505d84e..1510377f20 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout } from '../../utils' +import { priceTimeout, oracleTimeout } from '../../utils' import { SFraxCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -53,7 +53,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% erc20: networkConfig[chainId].tokens.sFRAX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% = 1% oracleError + 1% buffer delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts index dfd837767f..5db4436ea9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts @@ -12,12 +12,17 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { revenueHiding, priceTimeout } from '../../utils' +import { revenueHiding, priceTimeout, oracleTimeout } from '../../utils' import { StargatePoolFiatCollateral, StargatePoolFiatCollateral__factory, } from '../../../../typechain' import { ContractFactory } from 'ethers' + +import { + STAKING_CONTRACT, + SUSDC, +} from '../../../../test/plugins/individual-collateral/stargate/constants' import { useEnv } from '#/utils/env' async function main() { @@ -46,10 +51,8 @@ async function main() { /******** Deploy Stargate USDC Wrapper **************************/ - const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory( - 'StargateRewardableWrapper' - ) - const chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' + const WrapperFactory: ContractFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') + let chainIdKey = useEnv('FORK_NETWORK', 'mainnet') == 'mainnet' ? '1' : '8453' let USDC_NAME = 'USDC' let name = 'Wrapped Stargate USDC' let symbol = 'wsgUSDC' @@ -90,7 +93,7 @@ async function main() { oracleError: oracleError.toString(), erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24h hr, + oracleTimeout: oracleTimeout(chainIdKey, '86400').toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(oracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -101,9 +104,7 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - console.log( - `Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}` - ) + console.log(`Deployed Stargate ${USDC_NAME} to ${hre.network.name} (${chainIdKey}): ${collateral.address}`) if (chainIdKey == '8453') { assetCollDeployments.collateral.wsgUSDbC = collateral.address diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts index 4ac4e4c6c8..8a43556a52 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdt_collateral.ts @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { revenueHiding, priceTimeout } from '../../utils' +import { revenueHiding, priceTimeout, oracleTimeout } from '../../utils' import { StargatePoolFiatCollateral, StargatePoolFiatCollateral__factory, @@ -77,7 +77,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25%, erc20: erc20.address, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24h hr, + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts deleted file mode 100644 index e8f9f1f154..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts +++ /dev/null @@ -1,104 +0,0 @@ -import fs from 'fs' -import hre from 'hardhat' -import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' -import { bn, fp } from '../../../../common/numbers' -import { expect } from 'chai' -import { CollateralStatus } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { priceTimeout } from '../../utils' -import { YearnV2CurveFiatCollateral } from '../../../../typechain' -import { ContractFactory } from 'ethers' -import { - PRICE_PER_SHARE_HELPER, - YVUSDC_LP_TOKEN, -} from '../../../../test/plugins/individual-collateral/yearnv2/constants' - -async function main() { - // ==== Read Configuration ==== - const [deployer] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${deployer.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - const deployedCollateral: string[] = [] - - /******** Deploy Yearn V2 Curve Fiat Collateral - yvCurveUSDCcrvUSD **************************/ - - const YearnV2CurveCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( - 'YearnV2CurveFiatCollateral' - ) - - const collateral = await YearnV2CurveCollateralFactory.connect( - deployer - ).deploy( - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, // not used but can't be empty - oracleError: fp('0.0025').toString(), // not used but can't be empty - erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only - { - nTokens: '2', - curvePool: YVUSDC_LP_TOKEN, - poolType: '0', - feeds: [ - [networkConfig[chainId].chainlinkFeeds.USDC], - [networkConfig[chainId].chainlinkFeeds.crvUSD], - ], - oracleTimeouts: [['86400'], ['86400']], - oracleErrors: [[fp('0.0025').toString()], [fp('0.005').toString()]], - lpToken: YVUSDC_LP_TOKEN, - }, - PRICE_PER_SHARE_HELPER - ) - await collateral.deployed() - - console.log( - `Deployed Yearn Curve yvUSDCcrvUSD to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.yvCurveUSDCcrvUSD = collateral.address - assetCollDeployments.erc20s.yvCurveUSDCcrvUSD = networkConfig[chainId].tokens.yvCurveUSDCcrvUSD - deployedCollateral.push(collateral.address.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts b/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts deleted file mode 100644 index cbb2c89cc0..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts +++ /dev/null @@ -1,104 +0,0 @@ -import fs from 'fs' -import hre from 'hardhat' -import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' -import { bn, fp } from '../../../../common/numbers' -import { expect } from 'chai' -import { CollateralStatus } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { priceTimeout } from '../../utils' -import { YearnV2CurveFiatCollateral } from '../../../../typechain' -import { ContractFactory } from 'ethers' -import { - PRICE_PER_SHARE_HELPER, - YVUSDP_LP_TOKEN, -} from '../../../../test/plugins/individual-collateral/yearnv2/constants' - -async function main() { - // ==== Read Configuration ==== - const [deployer] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${deployer.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - const deployedCollateral: string[] = [] - - /******** Deploy Yearn V2 Curve Fiat Collateral - yvCurveUSDPcrvUSD **************************/ - - const YearnV2CurveCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( - 'YearnV2CurveFiatCollateral' - ) - - const collateral = await YearnV2CurveCollateralFactory.connect( - deployer - ).deploy( - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDP, // not used but can't be empty - oracleError: fp('0.0025').toString(), // not used but can't be empty - erc20: networkConfig[chainId].tokens.yvCurveUSDPcrvUSD, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.02').toString(), // 2% = max oracleError + 1% - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only - { - nTokens: '2', - curvePool: YVUSDP_LP_TOKEN, - poolType: '0', - feeds: [ - [networkConfig[chainId].chainlinkFeeds.USDP], - [networkConfig[chainId].chainlinkFeeds.crvUSD], - ], - oracleTimeouts: [['3600'], ['86400']], - oracleErrors: [[fp('0.01').toString()], [fp('0.005').toString()]], - lpToken: YVUSDP_LP_TOKEN, - }, - PRICE_PER_SHARE_HELPER - ) - await collateral.deployed() - - console.log( - `Deployed Yearn Curve yvUSDPcrvUSD to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.yvCurveUSDPcrvUSD = collateral.address - assetCollDeployments.erc20s.yvCurveUSDPcrvUSD = networkConfig[chainId].tokens.yvCurveUSDPcrvUSD - deployedCollateral.push(collateral.address.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index a8c2083e09..84dad2be5e 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -2,7 +2,7 @@ import hre, { tenderly } from 'hardhat' import * as readline from 'readline' import axios from 'axios' import { exec } from 'child_process' -import { BigNumber } from 'ethers' +import { BigNumber, BigNumberish } from 'ethers' import { bn, fp } from '../../common/numbers' import { IComponents, baseL2Chains } from '../../common/configuration' import { isValidContract } from '../../common/blockchain-utils' @@ -13,6 +13,13 @@ export const priceTimeout = bn('604800') // 1 week export const revenueHiding = fp('1e-6') // 1 part in a million +export const longOracleTimeout = bn('4294967296') + +// Returns the base plus 1 minute +export const oracleTimeout = (chainId: string, base: BigNumberish) => { + return chainId == '1' || chainId == '8453' ? bn('60').add(base) : longOracleTimeout +} + export const combinedError = (x: BigNumber, y: BigNumber): BigNumber => { return fp('1').add(x).mul(fp('1').add(y)).div(fp('1')).sub(fp('1')) } diff --git a/scripts/exhaustive-tests/run-1.sh b/scripts/exhaustive-tests/run-1.sh index bf214a6ba0..fbad597e14 100644 --- a/scripts/exhaustive-tests/run-1.sh +++ b/scripts/exhaustive-tests/run-1.sh @@ -1,3 +1,3 @@ -echo "Running Broker, RToken, & Furnace exhaustive tests for commit hash: " +echo "Running RToken & Furnace exhaustive tests for commit hash: " git rev-parse HEAD; -NODE_OPTIONS=--max-old-space-size=30000 EXTREME=1 SLOW=1 PROTO_IMPL=1 npx hardhat test test/RTokenExtremes.test.ts test/Broker.test.ts test/Furnace.test.ts; +NODE_OPTIONS=--max-old-space-size=30000 EXTREME=1 SLOW=1 PROTO_IMPL=1 npx hardhat test test/RTokenExtremes.test.ts test/Furnace.test.ts; diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index fbcfe84d23..f857f28877 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -8,7 +8,13 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../deployment/common' -import { combinedError, priceTimeout, revenueHiding, verifyContract } from '../deployment/utils' +import { + combinedError, + priceTimeout, + oracleTimeout, + revenueHiding, + verifyContract, +} from '../deployment/utils' import { ATokenMock, ATokenFiatCollateral, ICToken, CTokenFiatCollateral } from '../../typechain' let deployments: IAssetCollDeployments @@ -41,7 +47,7 @@ async function main() { oracleError: daiOracleError.toString(), erc20: networkConfig[chainId].tokens.DAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: daiOracleTimeout, + oracleTimeout: oracleTimeout(chainId, daiOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(daiOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -65,7 +71,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: networkConfig[chainId].tokens.USDbC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h @@ -93,7 +99,7 @@ async function main() { 'Static ' + (await aToken.name()), 's' + (await aToken.symbol()), ], - 'contracts/plugins/assets/aave/vendor/StaticATokenLM.sol:StaticATokenLM' + 'contracts/plugins/assets/aave/StaticATokenLM.sol:StaticATokenLM' ) /******** Verify ATokenFiatCollateral - aDAI **************************/ await verifyContract( @@ -106,7 +112,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: await aTokenCollateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -145,7 +151,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: deployments.erc20s.cDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -170,13 +176,13 @@ async function main() { oracleError: combinedBTCWBTCError.toString(), erc20: deployments.erc20s.cWBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.BTC, - '3600', + oracleTimeout(chainId, '3600').toString(), revenueHiding.toString(), ], 'contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol:CTokenNonFiatCollateral' @@ -192,7 +198,7 @@ async function main() { oracleError: fp('0.005').toString(), // 0.5% erc20: deployments.erc20s.cETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', @@ -213,13 +219,13 @@ async function main() { oracleError: combinedBTCWBTCError.toString(), erc20: networkConfig[chainId].tokens.WBTC, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24h + oracleTimeout: oracleTimeout(chainId, '86400').toString(), targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.BTC, - '3600', + oracleTimeout(chainId, '3600').toString(), ], 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' ) @@ -238,7 +244,7 @@ async function main() { oracleError: ethOracleError.toString(), // 0.5% erc20: networkConfig[chainId].tokens.WETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: ethOracleTimeout, + oracleTimeout: oracleTimeout(chainId, ethOracleTimeout).toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: '0', delayUntilDefault: '0', @@ -258,13 +264,13 @@ async function main() { oracleError: fp('0.02').toString(), // 2% erc20: networkConfig[chainId].tokens.EURT, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: fp('0.03').toString(), // 3% delayUntilDefault: bn('86400').toString(), // 24h }, networkConfig[chainId].chainlinkFeeds.EUR, - '86400', + oracleTimeout(chainId, '86400').toString(), ], 'contracts/plugins/assets/EURFiatCollateral.sol:EURFiatCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts index 3a373573dc..edb092d1af 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { fp, bn } from '../../../common/numbers' -import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -54,7 +54,7 @@ async function main() { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: fp('0.003').toString(), // 3% - oracleTimeout: '86400', // 24 hr + oracleTimeout: oracleTimeout(chainId, bn('86400')).toString(), // 24 hr maxTradeVolume: fp('1e6').toString(), defaultThreshold: fp('0.013').toString(), delayUntilDefault: bn('86400').toString(), diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts index 3ffce9a0a5..1486c37cab 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { fp, bn } from '../../../common/numbers' -import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -39,7 +39,7 @@ async function main() { ) /******** Verify Aave V3 USDC plugin **************************/ - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% await verifyContract( @@ -52,7 +52,7 @@ async function main() { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: usdcOracleError.toString(), - oracleTimeout: usdcOracleTimeout, // 24 hr + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24 hr maxTradeVolume: fp('1e6').toString(), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), diff --git a/scripts/verification/collateral-plugins/verify_cbeth.ts b/scripts/verification/collateral-plugins/verify_cbeth.ts index 9b52d6323b..4e58ad88d5 100644 --- a/scripts/verification/collateral-plugins/verify_cbeth.ts +++ b/scripts/verification/collateral-plugins/verify_cbeth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -40,14 +40,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2% erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - '86400', // refPerTokChainlinkTimeout + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout ], 'contracts/plugins/assets/cbeth/CBETHCollateral.sol:CBEthCollateral' ) @@ -63,16 +63,16 @@ async function main() { oracleError: oracleError.toString(), // 0.15% & 0.5%, erc20: networkConfig[chainId].tokens.cbETH!, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '1200', // 20 min + oracleTimeout: oracleTimeout(chainId, '1200').toString(), // 20 min targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.cbETH!, // refPerTokChainlinkFeed - '86400', // refPerTokChainlinkTimeout + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout networkConfig[chainId].chainlinkFeeds.cbETHETHexr!, // exchangeRateChainlinkFeed - '86400', // exchangeRateChainlinkTimeout + oracleTimeout(chainId, '86400').toString(), // exchangeRateChainlinkTimeout ], 'contracts/plugins/assets/cbeth/CBETHCollateralL2.sol:CBEthCollateralL2' ) diff --git a/scripts/verification/collateral-plugins/verify_convex_stable.ts b/scripts/verification/collateral-plugins/verify_convex_stable.ts index 127ef39143..3c22ae2557 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable.ts @@ -11,7 +11,7 @@ import { IDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -61,7 +61,17 @@ async function main() { chainId, await w3PoolCollateral.erc20(), [], - 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper', + { CvxMining: coreDeployments.cvxMiningLib } + ) + + /******** Verify CvxMining Lib **************************/ + + await verifyContract( + chainId, + coreDeployments.cvxMiningLib, + [], + 'contracts/plugins/assets/curve/cvx/vendor/CvxMining.sol:CvxMining' ) /******** Verify 3Pool plugin **************************/ @@ -75,7 +85,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -86,7 +96,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts index fedb2d418a..440f8854b2 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_metapool.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -75,7 +75,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts index 400c23d10e..771f6bc767 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -70,7 +70,10 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + ], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_convex_volatile.ts b/scripts/verification/collateral-plugins/verify_convex_volatile.ts new file mode 100644 index 0000000000..8c48da0e56 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_convex_volatile.ts @@ -0,0 +1,98 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { bn } from '../../../common/numbers' +import { ONE_ADDRESS } from '../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { + CurvePoolType, + BTC_USD_ORACLE_ERROR, + BTC_ORACLE_TIMEOUT, + BTC_USD_FEED, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + TRI_CRYPTO, + TRI_CRYPTO_TOKEN, + WBTC_BTC_ORACLE_ERROR, + WETH_ORACLE_TIMEOUT, + WBTC_BTC_FEED, + WBTC_ORACLE_TIMEOUT, + WETH_USD_FEED, + WETH_ORACLE_ERROR, + USDT_ORACLE_ERROR, + USDT_ORACLE_TIMEOUT, + USDT_USD_FEED, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const wTriCrypto = await ethers.getContractAt( + 'CurveVolatileCollateral', + deployments.collateral.cvxTriCrypto as string + ) + + /******** Verify TriCrypto plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxTriCrypto, + [ + { + erc20: await wTriCrypto.erc20(), + targetName: ethers.utils.formatBytes32String('TRICRYPTO'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 3, + curvePool: TRI_CRYPTO, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], + oracleTimeouts: [ + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], + ], + oracleErrors: [ + [USDT_ORACLE_ERROR], + [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], + [WETH_ORACLE_ERROR], + ], + lpToken: TRI_CRYPTO_TOKEN, + }, + ], + 'contracts/plugins/assets/convex/CurveVolatileCollateral.sol:CurveVolatileCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_curve_stable.ts b/scripts/verification/collateral-plugins/verify_curve_stable.ts index 3f4b66190a..ce1120f618 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' import { CRV, CurvePoolType, @@ -72,7 +72,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -83,7 +83,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts index e1b433bbd5..60be29f1e0 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_metapool.ts @@ -7,7 +7,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' import { CurvePoolType, DAI_ORACLE_ERROR, @@ -75,7 +75,11 @@ async function main() { curvePool: THREE_POOL, poolType: CurvePoolType.Plain, feeds: [[DAI_USD_FEED], [USDC_USD_FEED], [USDT_USD_FEED]], - oracleTimeouts: [[DAI_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT], [USDT_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, DAI_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + ], oracleErrors: [[DAI_ORACLE_ERROR], [USDC_ORACLE_ERROR], [USDT_ORACLE_ERROR]], lpToken: THREE_POOL_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts index 43d2172f10..a48df02d1f 100644 --- a/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_curve_stable_rtoken_metapool.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -59,7 +59,7 @@ async function main() { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleTimeout: oracleTimeout(chainId, USDC_ORACLE_TIMEOUT), // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, // 2%: 1% error on FRAX oracle + 1% base defaultThreshold delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, @@ -70,7 +70,10 @@ async function main() { curvePool: FRAX_BP, poolType: CurvePoolType.Plain, feeds: [[FRAX_USD_FEED], [USDC_USD_FEED]], - oracleTimeouts: [[FRAX_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleTimeouts: [ + [oracleTimeout(chainId, FRAX_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, USDC_ORACLE_TIMEOUT)], + ], oracleErrors: [[FRAX_ORACLE_ERROR], [USDC_ORACLE_ERROR]], lpToken: FRAX_BP_TOKEN, }, diff --git a/scripts/verification/collateral-plugins/verify_curve_volatile.ts b/scripts/verification/collateral-plugins/verify_curve_volatile.ts new file mode 100644 index 0000000000..2f5c53b2c1 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_curve_volatile.ts @@ -0,0 +1,98 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { bn } from '../../../common/numbers' +import { ONE_ADDRESS } from '../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { revenueHiding, oracleTimeout } from '../../deployment/utils' +import { + CurvePoolType, + BTC_USD_ORACLE_ERROR, + BTC_ORACLE_TIMEOUT, + BTC_USD_FEED, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + TRI_CRYPTO, + TRI_CRYPTO_TOKEN, + WBTC_BTC_ORACLE_ERROR, + WETH_ORACLE_TIMEOUT, + WBTC_BTC_FEED, + WBTC_ORACLE_TIMEOUT, + WETH_USD_FEED, + WETH_ORACLE_ERROR, + USDT_ORACLE_ERROR, + USDT_ORACLE_TIMEOUT, + USDT_USD_FEED, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const wTriCrypto = await ethers.getContractAt( + 'CurveVolatileCollateral', + deployments.collateral.crvTriCrypto as string + ) + + /******** Verify TriCrypto plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.crvTriCrypto, + [ + { + erc20: await wTriCrypto.erc20(), + targetName: ethers.utils.formatBytes32String('TRICRYPTO'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 3, + curvePool: TRI_CRYPTO, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [WBTC_BTC_FEED, BTC_USD_FEED], [WETH_USD_FEED]], + oracleTimeouts: [ + [oracleTimeout(chainId, USDT_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WBTC_ORACLE_TIMEOUT), oracleTimeout(chainId, BTC_ORACLE_TIMEOUT)], + [oracleTimeout(chainId, WETH_ORACLE_TIMEOUT)], + ], + oracleErrors: [ + [USDT_ORACLE_ERROR], + [WBTC_BTC_ORACLE_ERROR, BTC_USD_ORACLE_ERROR], + [WETH_ORACLE_ERROR], + ], + lpToken: TRI_CRYPTO_TOKEN, + }, + ], + 'contracts/plugins/assets/convex/CurveVolatileCollateral.sol:CurveVolatileCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts index d0eb672ef2..c3a6cb314e 100644 --- a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -50,7 +50,7 @@ async function main() { /******** Verify Collateral - wcUSDbCv3 **************************/ - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = fp('0.003') // 0.3% (Base) await verifyContract( @@ -63,7 +63,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h hr, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_cusdcv3.ts b/scripts/verification/collateral-plugins/verify_cusdcv3.ts index 09a6eceb34..62c1389289 100644 --- a/scripts/verification/collateral-plugins/verify_cusdcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdcv3.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -45,7 +45,7 @@ async function main() { /******** Verify Collateral - wcUSDCv3 **************************/ - const usdcOracleTimeout = '86400' // 24 hr + const usdcOracleTimeout = 86400 // 24 hr const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% await verifyContract( @@ -58,7 +58,7 @@ async function main() { oracleError: usdcOracleError.toString(), erc20: await collateral.erc20(), maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h hr, + oracleTimeout: oracleTimeout(chainId, usdcOracleTimeout).toString(), // 24h hr, targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_morpho.ts b/scripts/verification/collateral-plugins/verify_morpho.ts index 4f9e6d832b..ba7658f5af 100644 --- a/scripts/verification/collateral-plugins/verify_morpho.ts +++ b/scripts/verification/collateral-plugins/verify_morpho.ts @@ -7,7 +7,13 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { combinedError, priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { + combinedError, + priceTimeout, + oracleTimeout, + verifyContract, + revenueHiding, +} from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -58,7 +64,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: fp('0.0025').toString(), // 0.25% maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 1 hr + oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 1 hr targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0025').add(fp('0.01')).toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h @@ -86,7 +92,7 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: combinedBTCWBTCError.toString(), // 0.25% maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h @@ -95,7 +101,7 @@ async function main() { }, revenueHiding, networkConfig[chainId].chainlinkFeeds.WBTC!, - '86400', // 1 hr + oracleTimeout(chainId, '86400').toString(), // 1 hr ], 'contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol:MorphoNonFiatCollateral' ) @@ -115,7 +121,7 @@ async function main() { priceTimeout: priceTimeout, oracleError: fp('0.005'), maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: oracleTimeout(chainId, '3600'), // 1 hr targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0'), // 0% -- no soft default for self-referential collateral delayUntilDefault: bn('86400'), // 24h diff --git a/scripts/verification/collateral-plugins/verify_reth.ts b/scripts/verification/collateral-plugins/verify_reth.ts index 077cc76e0d..324a081859 100644 --- a/scripts/verification/collateral-plugins/verify_reth.ts +++ b/scripts/verification/collateral-plugins/verify_reth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -37,14 +37,14 @@ async function main() { oracleError: oracleError.toString(), // 0.5% & 2%, erc20: networkConfig[chainId].tokens.rETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.rETH, // refPerTokChainlinkFeed - '86400', // refPerTokChainlinkTimeout + oracleTimeout(chainId, '86400').toString(), // refPerTokChainlinkTimeout ], 'contracts/plugins/assets/rocket-eth/RethCollateral.sol:RethCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_sdai.ts b/scripts/verification/collateral-plugins/verify_sdai.ts index 393c6264b3..e5d9290c39 100644 --- a/scripts/verification/collateral-plugins/verify_sdai.ts +++ b/scripts/verification/collateral-plugins/verify_sdai.ts @@ -42,7 +42,7 @@ async function main() { defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h }, - bn(0), + fp('1e-6').toString(), // revenueHiding = 0.0001% POT, ], 'contracts/plugins/assets/dsr/SDaiCollateral.sol:SDaiCollateral' diff --git a/scripts/verification/collateral-plugins/verify_wsteth.ts b/scripts/verification/collateral-plugins/verify_wsteth.ts index b84c9aad57..c0b73b2fb0 100644 --- a/scripts/verification/collateral-plugins/verify_wsteth.ts +++ b/scripts/verification/collateral-plugins/verify_wsteth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, verifyContract } from '../../deployment/utils' +import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -38,14 +38,14 @@ async function main() { oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr, targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethETH feed oracleError delayUntilDefault: bn('86400').toString(), // 24h }, fp('1e-4'), // revenueHiding = 0.01% networkConfig[chainId].chainlinkFeeds.stETHETH, // targetPerRefChainlinkFeed - '86400', // targetPerRefChainlinkTimeout + oracleTimeout(chainId, '86400').toString(), // targetPerRefChainlinkTimeout ], 'contracts/plugins/assets/lido/LidoStakedEthCollateral.sol:LidoStakedEthCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts deleted file mode 100644 index 7505cfdb85..0000000000 --- a/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts +++ /dev/null @@ -1,73 +0,0 @@ -import hre from 'hardhat' -import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' -import { fp, bn } from '../../../common/numbers' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, -} from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' -import { - PRICE_PER_SHARE_HELPER, - YVUSDC_LP_TOKEN, -} from '../../../test/plugins/individual-collateral/yearnv2/constants' - -let deployments: IAssetCollDeployments - -async function main() { - // ********** Read config ********** - const chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (developmentChains.includes(hre.network.name)) { - throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) - } - - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - deployments = getDeploymentFile(assetCollDeploymentFilename) - - /******** Verify yvCurveUSDCcrvUSD **************************/ - await verifyContract( - chainId, - deployments.collateral.yvCurveUSDCcrvUSD, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, // not used but can't be empty - oracleError: fp('0.0025').toString(), // not used but can't be empty - erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24hr -- max of all oracleTimeouts - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-6').toString(), // revenueHiding = 0.0001%, low since underlying curve pool should be up-only - { - nTokens: '2', - curvePool: YVUSDC_LP_TOKEN, - poolType: '0', - feeds: [ - networkConfig[chainId].chainlinkFeeds.USDC, - networkConfig[chainId].chainlinkFeeds.crvUSD, - ], - oracleTimeouts: [ - oracleTimeout(chainId, '86400').toString(), - oracleTimeout(chainId, '86400').toString(), - ], - oracleErrors: [fp('0.0025').toString(), fp('0.005').toString()], - lpToken: YVUSDC_LP_TOKEN, - }, - PRICE_PER_SHARE_HELPER, - ], - 'contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol:YearnV2CurveFiatCollateral' - ) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index dd200b6248..a0a69c2281 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -62,8 +62,6 @@ async function main() { 'collateral-plugins/verify_sdai.ts', 'collateral-plugins/verify_morpho.ts', 'collateral-plugins/verify_aave_v3_usdc.ts', - 'collateral-plugins/verify_yearn_v2_curve_usdc.ts', - 'collateral-plugins/verify_yearn_v2_curve_usdp.ts', 'collateral-plugins/verify_sfrax.ts' ) } else if (chainId == '8453' || chainId == '84531') { diff --git a/tasks/deployment/deploy-facade-monitor.ts b/tasks/deployment/deploy-facade-monitor.ts deleted file mode 100644 index 290a77f647..0000000000 --- a/tasks/deployment/deploy-facade-monitor.ts +++ /dev/null @@ -1,107 +0,0 @@ -import { getChainId } from '../../common/blockchain-utils' -import { task, types } from 'hardhat/config' -import { FacadeMonitor } from '../../typechain' -import { developmentChains, networkConfig, IMonitorParams } from '../../common/configuration' -import { ZERO_ADDRESS } from '../../common/constants' -import { ContractFactory } from 'ethers' - -let facadeMonitor: FacadeMonitor - -task( - 'deploy-facade-monitor', - 'Deploys the FacadeMonitor implementation and proxy (if its not an upgrade)' -) - .addParam('upgrade', 'Set to true if this is for a later upgrade', false, types.boolean) - .addOptionalParam('owner', 'The address that will own the FacadeMonitor', '', types.string) - .addOptionalParam('noOutput', 'Suppress output', false, types.boolean) - .setAction(async (params, hre) => { - const [wallet] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - // ********** Read config ********** - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (!params.upgrade) { - if (!params.owner) { - throw new Error( - `An --owner must be specified for the initial deployment to ${hre.network.name}` - ) - } - } - - if (!params.noOutput) { - console.log( - `Deploying FacadeMonitor to ${hre.network.name} (${chainId}) with burner account ${wallet.address}` - ) - } - - // Setup Monitor Params - const monitorParams: IMonitorParams = { - AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, - } - - // Deploy FacadeMonitor - const FacadeMonitorFactory: ContractFactory = await hre.ethers.getContractFactory( - 'FacadeMonitor' - ) - const facadeMonitorImplAddr = (await hre.upgrades.deployImplementation(FacadeMonitorFactory, { - kind: 'uups', - constructorArgs: [monitorParams], - })) as string - - if (!params.noOutput) { - console.log( - `Deployed FacadeMonitor (Implementation) to ${hre.network.name} (${chainId}): ${facadeMonitorImplAddr}` - ) - } - - if (!params.upgrade) { - facadeMonitor = await hre.upgrades.deployProxy( - FacadeMonitorFactory, - [params.owner], - { - kind: 'uups', - initializer: 'init', - constructorArgs: [monitorParams], - } - ) - - if (!params.noOutput) { - console.log( - `Deployed FacadeMonitor (Proxy) to ${hre.network.name} (${chainId}): ${facadeMonitor.address}` - ) - } - } - // Verify if its not a development chain - if (!developmentChains.includes(hre.network.name)) { - // Uncomment to verify - if (!params.noOutput) { - console.log('sleeping 30s') - } - - // Sleep to ensure API is in sync with chain - await new Promise((r) => setTimeout(r, 30000)) // 30s - - if (!params.noOutput) { - console.log('verifying') - } - - /** ******************** Verify FacadeMonitor ****************************************/ - console.time('Verifying FacadeMonitor Implementation') - await hre.run('verify:verify', { - address: facadeMonitorImplAddr, - constructorArguments: [monitorParams], - contract: 'contracts/facade/FacadeMonitor.sol:FacadeMonitor', - }) - console.timeEnd('Verifying FacadeMonitor Implementation') - - if (!params.noOutput) { - console.log('verified') - } - } - - return { facadeMonitor: facadeMonitor ? facadeMonitor.address : 'N/A', facadeMonitorImplAddr } - }) diff --git a/tasks/index.ts b/tasks/index.ts index b1a9df3b56..4f167da7a5 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -16,7 +16,6 @@ import './deployment/mock/deploy-mock-aave' import './deployment/mock/deploy-mock-wbtc' import './deployment/mock/deploy-mock-easyauction' import './deployment/create-deployer-registry' -import './deployment/deploy-facade-monitor' import './deployment/empty-wallet' import './deployment/cancel-tx' import './deployment/sign-msg' diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 8ef43c0721..ff345cabd4 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -42,7 +42,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, SLOW, } from './fixtures' @@ -54,7 +54,7 @@ import { getLatestBlockTimestamp, getLatestBlockNumber, } from './utils/time' -import { ITradeRequest, disableBatchTrade, disableDutchTrade } from './utils/trades' +import { ITradeRequest } from './utils/trades' import { useEnv } from '#/utils/env' import { parseUnits } from 'ethers/lib/utils' @@ -132,6 +132,30 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { prices = { sellLow: fp('1'), sellHigh: fp('1'), buyLow: fp('1'), buyHigh: fp('1') } }) + const disableBatchTrade = async () => { + if (IMPLEMENTATION == Implementation.P1) { + const slot = await getStorageAt(broker.address, 205) + await setStorageAt( + broker.address, + 205, + slot.replace(slot.slice(2, 14), '1'.padStart(12, '0')) + ) + } else { + const slot = await getStorageAt(broker.address, 56) + await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) + } + expect(await broker.batchTradeDisabled()).to.equal(true) + } + + const disableDutchTrade = async (erc20: string) => { + const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') + const p = mappingSlot.toHexString().slice(2).padStart(64, '0') + const key = erc20.slice(2).padStart(64, '0') + const slot = ethers.utils.keccak256('0x' + key + p) + await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) + expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) + } + describe('Deployment', () => { it('Should setup Broker correctly', async () => { expect(await broker.gnosis()).to.equal(gnosis.address) @@ -388,7 +412,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Disable batch trade manually - await disableBatchTrade(broker) + await disableBatchTrade() expect(await broker.batchTradeDisabled()).to.equal(true) // Enable batch trade with owner @@ -401,7 +425,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await broker.dutchTradeDisabled(token0.address)).to.equal(false) // Disable dutch trade manually - await disableDutchTrade(broker, token0.address) + await disableDutchTrade(token0.address) expect(await broker.dutchTradeDisabled(token0.address)).to.equal(true) // Enable dutch trade with owner @@ -420,7 +444,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { describe('Trade Management', () => { it('Should not allow to open Batch trade if Disabled', async () => { // Disable Broker Batch Auctions - await disableBatchTrade(broker) + await disableBatchTrade() const tradeRequest: ITradeRequest = { sell: collateral0.address, @@ -449,13 +473,12 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await token0.connect(bmSigner).approve(broker.address, tradeRequest.sellAmount) // Should succeed in callStatic - await assetRegistry.refresh() await broker .connect(bmSigner) .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token0 - await disableDutchTrade(broker, token0.address) + await disableDutchTrade(token0.address) // Dutch Auction openTrade should fail now await expect( @@ -468,13 +491,12 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .withArgs(token0.address, true, false) // Should succeed in callStatic - await assetRegistry.refresh() await broker .connect(bmSigner) .callStatic.openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) // Disable Broker Dutch Auctions for token1 - await disableDutchTrade(broker, token1.address) + await disableDutchTrade(token1.address) // Dutch Auction openTrade should fail now await expect( @@ -550,6 +572,28 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Check nothing changed expect(await broker.batchTradeDisabled()).to.equal(false) }) + + it('Should not allow to report violation if paused or frozen', async () => { + // Check not disabled + expect(await broker.batchTradeDisabled()).to.equal(false) + + await main.connect(owner).pauseTrading() + + await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( + 'frozen or trading paused' + ) + + await main.connect(owner).unpauseTrading() + + await main.connect(owner).freezeShort() + + await expect(broker.connect(addr1).reportViolation()).to.be.revertedWith( + 'frozen or trading paused' + ) + + // Check nothing changed + expect(await broker.batchTradeDisabled()).to.equal(false) + }) }) describe('Trades', () => { @@ -1227,7 +1271,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: bn(500), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1392,7 +1436,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: bn('1'), // minimize erc20: sellTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48.sub(300), + oracleTimeout: MAX_UINT48, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -1404,7 +1448,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: bn('1'), // minimize erc20: buyTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48.sub(300), + oracleTimeout: MAX_UINT48, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -1616,14 +1660,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { let TradeFactory: ContractFactory let newTrade: DutchTrade - // Increment `lastSave` in storage slot 1 - const incrementLastSave = async (addr: string) => { - const asArray = ethers.utils.arrayify(await getStorageAt(addr, 1)) - asArray[7] = asArray[7] + 1 // increment least significant byte of lastSave - const asHex = ethers.utils.hexlify(asArray) - await setStorageAt(addr, 1, asHex) - } - beforeEach(async () => { amount = bn('100e18') @@ -1651,9 +1687,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Backing Manager await whileImpersonating(backingManager.address, async (bmSigner) => { await token0.connect(bmSigner).approve(broker.address, amount) - await assetRegistry.refresh() - await incrementLastSave(tradeRequest.sell) - await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(bmSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) @@ -1662,9 +1695,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // RSR Trader await whileImpersonating(rsrTrader.address, async (rsrSigner) => { await token0.connect(rsrSigner).approve(broker.address, amount) - await assetRegistry.refresh() - await incrementLastSave(tradeRequest.sell) - await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(rsrSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) @@ -1673,9 +1703,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // RToken Trader await whileImpersonating(rTokenTrader.address, async (rtokSigner) => { await token0.connect(rtokSigner).approve(broker.address, amount) - await assetRegistry.refresh() - await incrementLastSave(tradeRequest.sell) - await incrementLastSave(tradeRequest.buy) await snapshotGasCost( broker.connect(rtokSigner).openTrade(TradeKind.DUTCH_AUCTION, tradeRequest, prices) ) diff --git a/test/Facade.test.ts b/test/Facade.test.ts index f20428e2a4..207263b706 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -3,13 +3,11 @@ import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' -import { ethers, upgrades } from 'hardhat' +import { ethers } from 'hardhat' import { expectEvents } from '../common/events' -import { IConfig, IMonitorParams } from '#/common/configuration' +import { IConfig } from '#/common/configuration' import { bn, fp } from '../common/numbers' import { setOraclePrice } from './utils/oracles' -import { disableBatchTrade, disableDutchTrade } from './utils/trades' -import { whileImpersonating } from './utils/impersonation' import { Asset, BackingManagerP1, @@ -20,8 +18,6 @@ import { CTokenWrapperMock, ERC20Mock, FacadeAct, - FacadeMonitor, - FacadeMonitorV2, FacadeRead, FacadeTest, MockV3Aggregator, @@ -49,17 +45,9 @@ import { IMPLEMENTATION, defaultFixture, ORACLE_ERROR, - ORACLE_TIMEOUT, - PRICE_TIMEOUT, } from './fixtures' import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' -import { - CollateralStatus, - TradeKind, - MAX_UINT256, - ONE_PERIOD, - ZERO_ADDRESS, -} from '#/common/constants' +import { CollateralStatus, TradeKind, MAX_UINT256, ZERO_ADDRESS } from '#/common/constants' import { expectTrade } from './utils/trades' import { mintCollaterals } from './utils/tokens' @@ -67,7 +55,7 @@ const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.ski const itP1 = IMPLEMENTATION == Implementation.P1 ? it : it.skip -describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { +describe('FacadeRead + FacadeAct contracts', () => { let owner: SignerWithAddress let addr1: SignerWithAddress let addr2: SignerWithAddress @@ -95,7 +83,6 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { let facade: FacadeRead let facadeTest: FacadeTest let facadeAct: FacadeAct - let facadeMonitor: FacadeMonitor // Main let rToken: TestIRToken @@ -138,7 +125,6 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { facade, facadeAct, facadeTest, - facadeMonitor, rToken, main, basketHandler, @@ -284,7 +270,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { it('Should handle UNPRICED when returning issuable quantities', async () => { // Set unpriced assets, should return UoA = 0 - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(tokenAsset.address, MAX_UINT256.div(2).sub(1)) const [toks, quantities, uoas] = await facade.callStatic.issue(rToken.address, issueAmount) expect(toks.length).to.equal(4) expect(toks[0]).to.equal(token.address) @@ -297,9 +283,9 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(quantities[2]).to.equal(issueAmount.div(4)) expect(quantities[3]).to.equal(issueAmount.div(4).mul(50).div(bn('1e10'))) expect(uoas.length).to.equal(4) - // Assets are unpriced + // Three assets are unpriced expect(uoas[0]).to.equal(0) - expect(uoas[1]).to.equal(0) + expect(uoas[1]).to.equal(issueAmount.div(4)) expect(uoas[2]).to.equal(0) expect(uoas[3]).to.equal(0) }) @@ -495,10 +481,6 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Set price to 0 await setOraclePrice(rsrAsset.address, bn(0)) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) - await setOraclePrice(tokenAsset.address, bn('1e8')) - await setOraclePrice(usdcAsset.address, bn('1e8')) - await assetRegistry.refresh() const [backing2, overCollateralization2] = await facade.callStatic.backingOverview( rToken.address @@ -523,10 +505,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(backing).to.equal(fp('1')) expect(overCollateralization).to.equal(fp('0.5')) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) - await setOraclePrice(tokenAsset.address, bn('1e8')) - await setOraclePrice(usdcAsset.address, bn('1e8')) - await assetRegistry.refresh() + await setOraclePrice(rsrAsset.address, MAX_UINT256.div(2).sub(1)) ;[backing, overCollateralization] = await facade.callStatic.backingOverview(rToken.address) // Check values - Fully collateralized and no over-collateralization @@ -572,98 +551,98 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) it('Should return revenue + chain into FacadeAct.runRevenueAuctions', async () => { - // Set low to 0 == revenueOverview() should not revert - const minTradeVolume = await rsrTrader.minTradeVolume() - const auctionLength = await broker.dutchAuctionLength() - const tokenSurplus = bn('0.5e18') - await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) + const traders = [rTokenTrader, rsrTrader] + const initialPrice = await usdcAsset.price() + // Set lotLow to 0 == revenueOverview() should not revert await setOraclePrice(usdcAsset.address, bn('0')) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) - await setOraclePrice(tokenAsset.address, bn('1e8')) - await setOraclePrice(rsrAsset.address, bn('1e8')) - await assetRegistry.refresh() - - const [low] = await usdcAsset.price() - expect(low).to.equal(0) - - // revenue - let [erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(rsrTrader.address) - expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s - - const erc20sToStart = [] - for (let i = 0; i < 8; i++) { - if (erc20s[i] == token.address) { - erc20sToStart.push(erc20s[i]) - expect(canStart[i]).to.equal(true) - expect(surpluses[i]).to.equal(tokenSurplus) - } else { - expect(canStart[i]).to.equal(false) - expect(surpluses[i]).to.equal(0) + await usdcAsset.refresh() + for (let traderIndex = 0; traderIndex < traders.length; traderIndex++) { + const trader = traders[traderIndex] + + const minTradeVolume = await trader.minTradeVolume() + const auctionLength = await broker.dutchAuctionLength() + const tokenSurplus = bn('0.5e18') + await token.connect(addr1).transfer(trader.address, tokenSurplus) + + const [lotLow] = await usdcAsset.lotPrice() + expect(lotLow).to.equal(initialPrice[0]) + + // revenue + let [erc20s, canStart, surpluses, minTradeAmounts] = + await facadeAct.callStatic.revenueOverview(trader.address) + expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s + + const erc20sToStart = [] + for (let i = 0; i < 8; i++) { + if (erc20s[i] == token.address) { + erc20sToStart.push(erc20s[i]) + expect(canStart[i]).to.equal(true) + expect(surpluses[i]).to.equal(tokenSurplus) + } else { + expect(canStart[i]).to.equal(false) + expect(surpluses[i]).to.equal(0) + } + const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) + const [low] = await asset.lotPrice() + expect(minTradeAmounts[i]).to.equal( + low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 + ) // 1% oracleError } - const asset = await ethers.getContractAt('IAsset', await assetRegistry.toAsset(erc20s[i])) - const [low] = await asset.price() - expect(minTradeAmounts[i]).to.equal( - low.gt(0) ? minTradeVolume.mul(bn('10').pow(await asset.erc20Decimals())).div(low) : 0 - ) // 1% oracleError - } - - // Run revenue auctions via multicall - const funcSig = ethers.utils.id('runRevenueAuctions(address,address[],address[],uint8[])') - const args = ethers.utils.defaultAbiCoder.encode( - ['address', 'address[]', 'address[]', 'uint8[]'], - [rsrTrader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] - ) - const data = funcSig.substring(0, 10) + args.slice(2) - await expect(facadeAct.multicall([data])).to.emit(rsrTrader, 'TradeStarted') - - // Another call to revenueOverview should not propose any auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( - rsrTrader.address - ) - expect(canStart).to.eql(Array(8).fill(false)) - // Nothing should be settleable - expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) - - // Advance time till auction is over - await advanceBlocks(2 + auctionLength / 12) - - // Now should be settleable - const settleable = await facade.auctionsSettleable(rsrTrader.address) - expect(settleable.length).to.equal(1) - expect(settleable[0]).to.equal(token.address) - - // Another call to revenueOverview should settle and propose new auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( - rsrTrader.address - ) - - // Should repeat the same auctions - for (let i = 0; i < 8; i++) { - if (erc20s[i] == token.address) { - expect(canStart[i]).to.equal(true) - expect(surpluses[i]).to.equal(tokenSurplus) - } else { - expect(canStart[i]).to.equal(false) - expect(surpluses[i]).to.equal(0) + // Run revenue auctions via multicall + const funcSig = ethers.utils.id('runRevenueAuctions(address,address[],address[],uint8[])') + const args = ethers.utils.defaultAbiCoder.encode( + ['address', 'address[]', 'address[]', 'uint8[]'], + [trader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] + ) + const data = funcSig.substring(0, 10) + args.slice(2) + await expect(facadeAct.multicall([data])).to.emit(trader, 'TradeStarted') + + // Another call to revenueOverview should not propose any auction + ;[erc20s, canStart, surpluses, minTradeAmounts] = + await facadeAct.callStatic.revenueOverview(trader.address) + expect(canStart).to.eql(Array(8).fill(false)) + + // Nothing should be settleable + expect((await facade.auctionsSettleable(trader.address)).length).to.equal(0) + + // Advance time till auction is over + await advanceBlocks(2 + auctionLength / 12) + + // Now should be settleable + const settleable = await facade.auctionsSettleable(trader.address) + expect(settleable.length).to.equal(1) + expect(settleable[0]).to.equal(token.address) + + // Another call to revenueOverview should settle and propose new auction + ;[erc20s, canStart, surpluses, minTradeAmounts] = + await facadeAct.callStatic.revenueOverview(trader.address) + + // Should repeat the same auctions + for (let i = 0; i < 8; i++) { + if (erc20s[i] == token.address) { + expect(canStart[i]).to.equal(true) + expect(surpluses[i]).to.equal(tokenSurplus) + } else { + expect(canStart[i]).to.equal(false) + expect(surpluses[i]).to.equal(0) + } } - } - // Settle and start new auction - await facadeAct.runRevenueAuctions(rsrTrader.address, erc20sToStart, erc20sToStart, [ - TradeKind.DUTCH_AUCTION, - ]) + // Settle and start new auction + await facadeAct.runRevenueAuctions(trader.address, erc20sToStart, erc20sToStart, [ + TradeKind.DUTCH_AUCTION, + ]) - // Send additional revenues - await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) + // Send additional revenues + await token.connect(addr1).transfer(trader.address, tokenSurplus) - // Call revenueOverview, cannot open new auctions - ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( - rsrTrader.address - ) - expect(canStart).to.eql(Array(8).fill(false)) + // Call revenueOverview, cannot open new auctions + ;[erc20s, canStart, surpluses, minTradeAmounts] = + await facadeAct.callStatic.revenueOverview(trader.address) + expect(canStart).to.eql(Array(8).fill(false)) + } }) itP1('Should handle invalid versions when running revenueOverview', async () => { @@ -913,11 +892,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { ) // set price of dai to 0 await chainlinkFeed.updateAnswer(0) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) - await setOraclePrice(usdcAsset.address, bn('1e8')) - await assetRegistry.refresh() await main.connect(owner).pauseTrading() - const [erc20s, breakdown, targets] = await facade.callStatic.basketBreakdown(rToken.address) expect(erc20s.length).to.equal(4) expect(breakdown.length).to.equal(4) @@ -966,24 +941,16 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) it('Should return pending unstakings', async () => { - // Bump draftEra by seizing RSR when the withdrawal queue is empty - await rsr.connect(owner).mint(stRSRP1.address, 1) - await whileImpersonating(backingManager.address, async (signer) => { - await stRSRP1.connect(signer).seizeRSR(1) - }) - const draftEra = await stRSRP1.getDraftEra() - expect(draftEra).to.equal(2) - - // Stake const unstakeAmount = bn('10000e18') await rsr.connect(owner).mint(addr1.address, unstakeAmount.mul(10)) + + // Stake await rsr.connect(addr1).approve(stRSR.address, unstakeAmount.mul(10)) await stRSRP1.connect(addr1).stake(unstakeAmount.mul(10)) - await stRSRP1.connect(addr1).unstake(unstakeAmount) await stRSRP1.connect(addr1).unstake(unstakeAmount.add(1)) - const pendings = await facade.pendingUnstakings(rToken.address, draftEra, addr1.address) + const pendings = await facade.pendingUnstakings(rToken.address, addr1.address) expect(pendings.length).to.eql(2) expect(pendings[0][0]).to.eql(bn(0)) // index expect(pendings[0][2]).to.eql(unstakeAmount) // amount @@ -1067,339 +1034,6 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { } }) - describe('FacadeMonitor', () => { - const monitorParams: IMonitorParams = { - AAVE_V2_DATA_PROVIDER_ADDR: ZERO_ADDRESS, - } - - beforeEach(async () => { - // Mint Tokens - initialBal = bn('10000000000e18') - await token.connect(owner).mint(addr1.address, initialBal) - await usdc.connect(owner).mint(addr1.address, initialBal) - await aToken.connect(owner).mint(addr1.address, initialBal) - await cTokenVault.connect(owner).mint(addr1.address, initialBal) - - // Provide approvals - await token.connect(addr1).approve(rToken.address, initialBal) - await usdc.connect(addr1).approve(rToken.address, initialBal) - await aToken.connect(addr1).approve(rToken.address, initialBal) - await cTokenVault.connect(addr1).approve(rToken.address, initialBal) - }) - - it('should return batch auctions disabled correctly', async () => { - expect(await facadeMonitor.batchAuctionsDisabled(rToken.address)).to.equal(false) - - // Disable Broker Batch Auctions - await disableBatchTrade(broker) - - expect(await facadeMonitor.batchAuctionsDisabled(rToken.address)).to.equal(true) - }) - - it('should return dutch auctions disabled correctly', async () => { - expect(await facadeMonitor.dutchAuctionsDisabled(rToken.address)).to.equal(false) - - // Disable Broker Dutch Auctions for token0 - await disableDutchTrade(broker, token.address) - - expect(await facadeMonitor.dutchAuctionsDisabled(rToken.address)).to.equal(true) - }) - - it('should return issuance available', async () => { - expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) // no supply - - // Issue some RTokens (1%) - const issueAmount = bn('10000e18') - - // Issue rTokens (1%) - await rToken.connect(addr1).issue(issueAmount) - - // check throttles updated - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('0.99')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Issue additional rTokens (another 1%) - await rToken.connect(addr1).issue(issueAmount) - - // Should be 2% down minus some recharging - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( - fp('0.98'), - fp('0.001') - ) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Advance time significantly - await advanceTime(10000000) - - // Check new issuance available - fully recharged - expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Issuance #2 - Consume all throttle - const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) - await rToken.connect(addr1).issue(issueAmount2) - - // Check new issuance available - all consumed - expect(await rToken.issuanceAvailable()).to.equal(bn(0)) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - }) - - it('should return redemption available', async () => { - const issueAmount = bn('100000e18') - - // Decrease redemption allowed amount - const redeemThrottleParams = { amtRate: issueAmount.div(2), pctRate: fp('0.1') } // 50K - await rToken.connect(owner).setRedemptionThrottleParams(redeemThrottleParams) - - // Check with no supply - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await rToken.redemptionAvailable()).to.equal(bn(0)) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Issue some RTokens - await rToken.connect(addr1).issue(issueAmount) - - // check throttles - redemption still fully available - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('0.9')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Redeem RTokens (50% of throttle) - await rToken.connect(addr1).redeem(issueAmount.div(4)) - - // check throttle - redemption allowed decreased to 50% - expect(await rToken.redemptionAvailable()).to.equal(issueAmount.div(4)) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('0.5')) - - // Advance time significantly - await advanceTime(10000000) - - // Check redemption available - fully recharged - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Redemption #2 - Consume all throttle - await rToken.connect(addr1).redeem(issueAmount.div(2)) - - // Check new redemption available - all consumed - expect(await rToken.redemptionAvailable()).to.equal(bn(0)) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(bn(0)) - }) - - it('Should handle issuance/redemption throttles correctly, using percent', async function () { - // Full issuance available. Nothing to redeem - expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) - expect(await rToken.redemptionAvailable()).to.equal(bn(0)) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Issue full throttle - const issueAmount1: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) - await rToken.connect(addr1).issue(issueAmount1) - - // Check redemption throttles updated - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Advance time significantly - await advanceTime(1000000000) - - // Check new issuance available - fully recharged - expect(await rToken.issuanceAvailable()).to.equal(config.issuanceThrottle.amtRate) - expect(await rToken.redemptionAvailable()).to.equal(issueAmount1) - - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Issuance #2 - Full throttle again - will be processed - const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) - await rToken.connect(addr1).issue(issueAmount2) - - // Check new issuance available - all consumed - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(bn(0)) - - // Check redemption throttle updated - fixed in max (does not exceed) - expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Set issuance throttle to percent only - const issuanceThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } // 10% - await rToken.connect(owner).setIssuanceThrottleParams(issuanceThrottleParams) - - // Advance time significantly - await advanceTime(1000000000) - - // Check new issuance available - 10% of supply (2 M) = 200K - const supplyThrottle = bn('200000e18') - expect(await rToken.issuanceAvailable()).to.equal(supplyThrottle) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - - // Check redemption throttle unchanged - expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Issuance #3 - Should be allowed, does not exceed supply restriction - const issueAmount3: BigNumber = bn('100000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) - await rToken.connect(addr1).issue(issueAmount3) - - // Check issuance throttle updated - Previous issuances recharged - expect(await rToken.issuanceAvailable()).to.equal(supplyThrottle.sub(issueAmount3)) - - // Hourly Limit: 210K (10% of total supply of 2.1 M) - // Available: 100 K / 201K (~ 0.47619) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( - fp('0.476'), - fp('0.001') - ) - - // Check redemption throttle unchanged - expect(await rToken.redemptionAvailable()).to.equal(config.redemptionThrottle.amtRate) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Check all issuances are confirmed - expect(await rToken.balanceOf(addr1.address)).to.equal( - issueAmount1.add(issueAmount2).add(issueAmount3) - ) - - // Advance time, issuance will recharge a bit - await advanceTime(100) - - // Now 50% of hourly limit available (~105.8K / 210 K) - expect(await rToken.issuanceAvailable()).to.be.closeTo(fp('105800'), fp('100')) - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( - fp('0.5'), - fp('0.01') - ) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - const issueAmount4: BigNumber = fp('105800') - // Issuance #4 - almost all available - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) - await rToken.connect(addr1).issue(issueAmount4) - - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( - fp('0.003'), - fp('0.001') - ) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Advance time significantly to fully recharge - await advanceTime(1000000000) - - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Check redemptions - // Set redemption throttle to percent only - const redemptionThrottleParams = { amtRate: fp('1'), pctRate: fp('0.1') } // 10% - await rToken.connect(owner).setRedemptionThrottleParams(redemptionThrottleParams) - - const totalSupply = await rToken.totalSupply() - expect(await rToken.redemptionAvailable()).to.equal(totalSupply.div(10)) // 10% - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Redeem half of the available throttle - await rToken.connect(addr1).redeem(totalSupply.div(10).div(2)) - - // About 52% now used of redemption throttle - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.be.closeTo( - fp('0.52'), - fp('0.01') - ) - - // Advance time significantly to fully recharge - await advanceTime(1000000000) - - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(fp('1')) - - // Redeem all remaining - await rToken.connect(addr1).redeem(await rToken.redemptionAvailable()) - - // Check all consumed - expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.equal(fp('1')) - expect(await rToken.redemptionAvailable()).to.equal(bn(0)) - expect(await facadeMonitor.redemptionAvailable(rToken.address)).to.equal(bn(0)) - }) - - it('Should not allow empty owner on initialization', async () => { - const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') - - const newFacadeMonitor = await upgrades.deployProxy(FacadeMonitorFactory, [], { - constructorArgs: [monitorParams], - kind: 'uups', - }) - - await expect(newFacadeMonitor.init(ZERO_ADDRESS)).to.be.revertedWith('invalid owner address') - }) - - it('Should allow owner to transfer ownership', async () => { - expect(await facadeMonitor.owner()).to.equal(owner.address) - - // Attempt to transfer ownership with another account - await expect( - facadeMonitor.connect(addr1).transferOwnership(addr1.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - - // Owner remains the same - expect(await facadeMonitor.owner()).to.equal(owner.address) - - // Transfer ownership with owner - await expect(facadeMonitor.connect(owner).transferOwnership(addr1.address)) - .to.emit(facadeMonitor, 'OwnershipTransferred') - .withArgs(owner.address, addr1.address) - - // Owner changed - expect(await facadeMonitor.owner()).to.equal(addr1.address) - }) - - it('Should only allow owner to upgrade', async () => { - const FacadeMonitorV2Factory: ContractFactory = await ethers.getContractFactory( - 'FacadeMonitorV2' - ) - const facadeMonitorV2 = await FacadeMonitorV2Factory.deploy(monitorParams) - - await expect( - facadeMonitor.connect(addr1).upgradeTo(facadeMonitorV2.address) - ).to.be.revertedWith('Ownable: caller is not the owner') - await expect(facadeMonitor.connect(owner).upgradeTo(facadeMonitorV2.address)).to.not.be - .reverted - }) - - it('Should upgrade correctly', async () => { - // Upgrading - const FacadeMonitorV2Factory: ContractFactory = await ethers.getContractFactory( - 'FacadeMonitorV2' - ) - const facadeMonitorV2: FacadeMonitorV2 = await upgrades.upgradeProxy( - facadeMonitor.address, - FacadeMonitorV2Factory, - { - constructorArgs: [monitorParams], - } - ) - - // Check address is maintained - expect(facadeMonitorV2.address).to.equal(facadeMonitor.address) - - // Check state is preserved - expect(await facadeMonitorV2.owner()).to.equal(owner.address) - - // Check new version is implemented - expect(await facadeMonitorV2.version()).to.equal('2.0.0') - - expect(await facadeMonitorV2.newValue()).to.equal(0) - await facadeMonitorV2.connect(owner).setNewValue(bn(1000)) - expect(await facadeMonitorV2.newValue()).to.equal(bn(1000)) - }) - }) - // P1 only describeP1('FacadeAct', () => { let issueAmount: BigNumber @@ -1505,7 +1139,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) // Advance time till auction ended - await advanceBlocks(1 + auctionLength / 12) + await advanceBlocks(2 + auctionLength / 12) + + // Settleable now + expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(1) // Settle and start new auction - Will retry await expectEvents( @@ -1530,6 +1167,18 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }, ] ) + + // Nothing should be settleable + expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) + + // Advance time till auction ended + await advanceBlocks(2 + auctionLength / 12) + + // Settleable now + expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(1) + + // Should not revert, even when not starting new auctions + await facadeAct.runRevenueAuctions(rsrTrader.address, [token.address], [], []) }) it('Should handle other versions when running revenue auctions', async () => { diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 9176c71ac0..97210ce749 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -195,8 +195,8 @@ describe('FacadeWrite contract', () => { // Set governance params govParams = { - votingDelay: bn(7200), // 1 day - votingPeriod: bn(21600), // 3 days + votingDelay: bn(5), // 5 blocks + votingPeriod: bn(100), // 100 blocks proposalThresholdAsMicroPercent: bn(1e6), // 1% quorumPercent: bn(4), // 4% timelockDelay: bn(60 * 60 * 24), // 1 day diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 84d16f32c7..15776210be 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -204,9 +204,9 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await furnace.connect(addr1).melt() }) - it('Should melt if frozen #fast', async () => { + it('Should not melt if frozen #fast', async () => { await main.connect(owner).freezeShort() - await furnace.connect(addr1).melt() + await expect(furnace.connect(addr1).melt()).to.be.revertedWith('frozen') }) it('Should not melt any funds in the initial block #fast', async () => { @@ -450,57 +450,40 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { it('Regression test -- C4 June 2023 Issue #29', async () => { // https://github.com/code-423n4/2023-06-reserve-findings/issues/29 - const firstRatio = fp('1e-6') - const secondRatio = fp('1e-4') - const mintAmount = fp('100') - - // Set ratio to something cleaner - await expect(furnace.connect(owner).setRatio(firstRatio)) - .to.emit(furnace, 'RatioSet') - .withArgs(config.rewardRatio, firstRatio) - // Transfer to Furnace and do first melt - await rToken.connect(addr1).transfer(furnace.address, mintAmount) + await rToken.connect(addr1).transfer(furnace.address, bn('10e18')) await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) await furnace.melt() // Should have updated lastPayout + lastPayoutBal expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(mintAmount) + expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) - // Advance 100 periods -- should melt at old ratio - await setNextBlockTimestamp( - Number(await getLatestBlockTimestamp()) + 100 * Number(ONE_PERIOD) - ) + // Advance 99 periods -- should melt at old ratio + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 99 * Number(ONE_PERIOD)) - // Freeze and change ratio (melting as a pre-step) + // Freeze and change ratio await main.connect(owner).freezeForever() - await expect(furnace.connect(owner).setRatio(secondRatio)) + const maxRatio = bn('1e14') + await expect(furnace.connect(owner).setRatio(maxRatio)) .to.emit(furnace, 'RatioSet') - .withArgs(firstRatio, secondRatio) + .withArgs(config.rewardRatio, maxRatio) - // Should have melted + // Should have updated lastPayout + lastPayoutBal expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.eq(fp('99.990000494983830300')) + expect(await furnace.lastPayoutBal()).to.equal(bn('10e18')) // no change - // Unfreeze and advance 100 periods + // Unfreeze and advance 1 period await main.connect(owner).unfreeze() - await setNextBlockTimestamp( - Number(await getLatestBlockTimestamp()) + 100 * Number(ONE_PERIOD) - ) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) await expect(furnace.melt()).to.emit(rToken, 'Melted') - // Should have updated lastPayout + lastPayoutBal and melted at new ratio + // Should have updated lastPayout + lastPayoutBal expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(fp('98.995033865808581644')) - // if the ratio were not increased 100x, this would be more like 99.980001989868666200 - - // Total supply should have decreased by the cumulative melted amount - expect(await rToken.totalSupply()).to.equal(mintAmount.add(await furnace.lastPayoutBal())) - expect(await rToken.basketsNeeded()).to.equal(mintAmount.mul(2)) + expect(await furnace.lastPayoutBal()).to.equal(bn('9.999e18')) }) }) diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 53b7f7d2f1..83dffb413a 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -59,8 +59,8 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { let initialBal: BigNumber const MIN_DELAY = 7 * 60 * 60 * 24 // 7 days - const VOTING_DELAY = 7200 // 1 day (in blocks) - const VOTING_PERIOD = 21600 // 3 days (in blocks) + const VOTING_DELAY = 5 // 5 blocks + const VOTING_PERIOD = 100 // 100 blocks const PROPOSAL_THRESHOLD = 1e6 // 1% const QUORUM_PERCENTAGE = 4 // 4% @@ -306,39 +306,13 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { expect(await governor.supportsInterface(interfaceID._hex)).to.equal(true) }) - - it('Should perform validations on votingDelay at deployment', async () => { - // Attempt to deploy with 0 voting delay - await expect( - GovernorFactory.deploy( - stRSRVotes.address, - timelock.address, - bn(0), - VOTING_PERIOD, - PROPOSAL_THRESHOLD, - QUORUM_PERCENTAGE - ) - ).to.be.revertedWith('invalid votingDelay') - - // Attempt to deploy with voting delay below minium (1 day) - await expect( - GovernorFactory.deploy( - stRSRVotes.address, - timelock.address, - bn(2000), // less than 1 day - VOTING_PERIOD, - PROPOSAL_THRESHOLD, - QUORUM_PERCENTAGE - ) - ).to.be.revertedWith('invalid votingDelay') - }) }) describe('Proposals', () => { // Proposal details const newValue: BigNumber = bn('360') - let proposalDescription = 'Proposal #1 - Update Trading Delay to 360' - let proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) + const proposalDescription = 'Proposal #1 - Update Trading Delay to 360' + const proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) let encodedFunctionCall: string let stkAmt1: BigNumber let stkAmt2: BigNumber @@ -899,143 +873,5 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Check role was granted expect(await main.hasRole(SHORT_FREEZER, other.address)).to.equal(true) }) - - it('Should allow to update GovernorSettings via governance', async () => { - // Attempt to update if not governance - await expect(governor.setVotingDelay(bn(14400))).to.be.revertedWith( - 'Governor: onlyGovernance' - ) - - // Attempt to update without governance process in place - await whileImpersonating(timelock.address, async (signer) => { - await expect(governor.connect(signer).setVotingDelay(bn(14400))).to.be.reverted - }) - - // Update votingDelay via proposal - encodedFunctionCall = governor.interface.encodeFunctionData('setVotingDelay', [ - VOTING_DELAY * 2, - ]) - proposalDescription = 'Proposal #2 - Update Voting Delay to double' - proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) - - // Check current value - expect(await governor.votingDelay()).to.equal(VOTING_DELAY) - - // Propose - const proposeTx = await governor - .connect(addr1) - .propose([governor.address], [0], [encodedFunctionCall], proposalDescription) - - const proposeReceipt = await proposeTx.wait(1) - const proposalId = proposeReceipt.events![0].args!.proposalId - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) - - // Advance time to start voting - await advanceBlocks(VOTING_DELAY + 1) - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Active) - - const voteWay = 1 // for - - // vote - await governor.connect(addr1).castVote(proposalId, voteWay) - await advanceBlocks(1) - - // Advance time till voting is complete - await advanceBlocks(VOTING_PERIOD + 1) - - // Finished voting - Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - - // Queue propoal - await governor - .connect(addr1) - .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) - - // Advance time required by timelock - await advanceTime(MIN_DELAY + 1) - await advanceBlocks(1) - - // Execute - await governor - .connect(addr1) - .execute([governor.address], [0], [encodedFunctionCall], proposalDescHash) - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Executed) - - // Check value was updated - expect(await governor.votingDelay()).to.equal(VOTING_DELAY * 2) - }) - - it('Should perform validations on votingDelay when updating', async () => { - // Update via proposal - Invalid value - encodedFunctionCall = governor.interface.encodeFunctionData('setVotingDelay', [bn(7100)]) - proposalDescription = 'Proposal #2 - Update Voting Delay to invalid' - proposalDescHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes(proposalDescription)) - - // Check current value - expect(await governor.votingDelay()).to.equal(VOTING_DELAY) - - // Propose - const proposeTx = await governor - .connect(addr1) - .propose([governor.address], [0], [encodedFunctionCall], proposalDescription) - - const proposeReceipt = await proposeTx.wait(1) - const proposalId = proposeReceipt.events![0].args!.proposalId - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) - - // Advance time to start voting - await advanceBlocks(VOTING_DELAY + 1) - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Active) - - const voteWay = 1 // for - - // vote - await governor.connect(addr1).castVote(proposalId, voteWay) - await advanceBlocks(1) - - // Advance time till voting is complete - await advanceBlocks(VOTING_PERIOD + 1) - - // Finished voting - Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - - // Queue propoal - await governor - .connect(addr1) - .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) - - // Check proposal state - expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) - - // Advance time required by timelock - await advanceTime(MIN_DELAY + 1) - await advanceBlocks(1) - - // Execute - await expect( - governor - .connect(addr1) - .execute([governor.address], [0], [encodedFunctionCall], proposalDescHash) - ).to.be.revertedWith('TimelockController: underlying transaction reverted') - - // Check proposal state, still queued - expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) - - // Check value was not updated - expect(await governor.votingDelay()).to.equal(VOTING_DELAY) - }) }) }) diff --git a/test/Main.test.ts b/test/Main.test.ts index 9d00c3b0a6..788d4eba4b 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -70,8 +70,6 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from './fixtures' @@ -1182,7 +1180,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral0.oracleTimeout(), targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1204,7 +1202,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral0.oracleTimeout(), targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1230,7 +1228,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await gasGuzzlingColl.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral0.oracleTimeout(), targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1629,7 +1627,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20s[5].address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral2.oracleTimeout(), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -1725,7 +1723,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: eurToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral0.oracleTimeout(), targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -1948,7 +1946,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral0.oracleTimeout(), targetName: ethers.utils.formatBytes32String('NEW_TARGET'), defaultThreshold: fp('0.01'), delayUntilDefault: await collateral0.delayUntilDefault(), @@ -2758,10 +2756,8 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Check BU price -- 1/4 of the basket has lost half its value await expectPrice(basketHandler.address, fp('0.875'), ORACLE_ERROR, true) - // Set collateral1 price to [0, FIX_MAX] - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) - await setOraclePrice(collateral0.address, bn('1e8')) - await assetRegistry.refresh() + // Set collateral1 price to invalid value that should produce [0, FIX_MAX] + await setOraclePrice(collateral1.address, MAX_UINT192) // Check BU price -- 1/4 of the basket has lost all its value const asset = await ethers.getContractAt('Asset', basketHandler.address) @@ -2803,7 +2799,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral2.oracleTimeout(), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2816,8 +2812,6 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Set price = 0, which hits 3 of our 4 collateral in the basket await setOraclePrice(newColl2.address, bn('0')) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) - await setOraclePrice(collateral1.address, bn('1e8')) // Check status and price again const p = await basketHandler.price() @@ -2838,7 +2832,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral2.oracleTimeout(), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2846,9 +2840,17 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { REVENUE_HIDING ) await assetRegistry.connect(owner).swapRegistered(newColl.address) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(newColl.address, MAX_UINT192) // overflow + await expectUnpriced(newColl.address) await newColl.setTargetPerRef(1) - await expectUnpriced(basketHandler.address) + await freshBasketHandler.setPrimeBasket([await newColl.erc20()], [fp('1000')]) + await freshBasketHandler.refreshBasket() + + // Expect [something > 0, FIX_MAX] + const bh = await ethers.getContractAt('Asset', basketHandler.address) + const [lowPrice, highPrice] = await bh.price() + expect(lowPrice).to.be.gt(0) + expect(highPrice).to.equal(MAX_UINT192) }) it('Should handle overflow in price calculation and return [FIX_MAX, FIX_MAX] - case 1', async () => { @@ -2863,7 +2865,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral2.oracleTimeout(), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -2905,6 +2907,35 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(highPrice).to.equal(MAX_UINT192) }) + it('Should distinguish between price/lotPrice', async () => { + // Set basket with single collateral + await basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await basketHandler.refreshBasket() + + await collateral0.refresh() + const [low, high] = await collateral0.price() + await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // oracle error + + // lotPrice() should begin at 100% + let [lowPrice, highPrice] = await basketHandler.price() + let [lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() + expect(lowPrice).to.equal(0) + expect(highPrice).to.equal(MAX_UINT192) + expect(lotLowPrice).to.be.eq(low) + expect(lotHighPrice).to.be.eq(high) + + // Advance time past 100% period -- lotPrice() should begin to fall + await advanceTime(await collateral0.oracleTimeout()) + ;[lowPrice, highPrice] = await basketHandler.price() + ;[lotLowPrice, lotHighPrice] = await basketHandler.lotPrice() + expect(lowPrice).to.equal(0) + expect(highPrice).to.equal(MAX_UINT192) + expect(lotLowPrice).to.be.closeTo(low, low.div(bn('1e5'))) // small decay expected + expect(lotLowPrice).to.be.lt(low) + expect(lotHighPrice).to.be.closeTo(high, high.div(bn('1e5'))) // small decay expected + expect(lotHighPrice).to.be.lt(high) + }) + it('Should disable basket on asset deregistration + return quantities correctly', async () => { // Check values expect(await facadeTest.wholeBasketsHeldBy(rToken.address, addr1.address)).to.equal( @@ -3085,7 +3116,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral2.oracleTimeout(), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3129,7 +3160,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral2.oracleTimeout(), targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3150,15 +3181,6 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expectPrice(basketHandler.address, fp('0.75'), ORACLE_ERROR, true) }) - it('lotPrice (deprecated) is equal to price()', async () => { - const lotPrice = await basketHandler.lotPrice() - const price = await basketHandler.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) - }) - it('Should not put backup tokens with different targetName in the basket', async () => { // Swap out collateral for bad target name const CollFactory = await ethers.getContractFactory('FiatCollateral') @@ -3168,7 +3190,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: await collateral0.oracleTimeout(), targetName: await ethers.utils.formatBytes32String('NEW TARGET'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index f5c8afa994..f11c415f6a 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -21,7 +21,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, SLOW, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, defaultFixtureNoBasket, } from './fixtures' @@ -66,7 +66,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: fp('1e36'), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), delayUntilDefault: bn(86400), @@ -155,6 +155,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Recharge throttle await advanceTime(3600) + await advanceTime(await basketHandler.warmupPeriod()) // ==== Issue the "initial" rtoken supply to owner diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 83d0b04af6..e806d4b316 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -51,7 +51,6 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' @@ -644,7 +643,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -657,7 +656,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: backupToken1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -1016,6 +1015,9 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('Should not recollateralize when switching basket if all assets are UNPRICED', async () => { + // Set price to use lot price + await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) + // Setup prime basket await basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')]) @@ -1027,7 +1029,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Advance time post warmup period - temporary IFFY->SOUND await advanceTime(Number(config.warmupPeriod) + 1) - // Set all assets to UNPRICED + // Set to sell price = 0 await advanceTime(Number(ORACLE_TIMEOUT.add(PRICE_TIMEOUT))) // Check state remains SOUND @@ -1186,8 +1188,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) }) - it('Should recollateralize correctly when switching basket', async () => { - // Set oracle value out-of-range + it('Should recollateralize correctly when switching basket - Using lot price', async () => { + // Set price to unpriced (will use lotPrice to size trade) await setOraclePrice(collateral0.address, MAX_UINT256.div(2)) // Setup prime basket @@ -1216,7 +1218,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await toMinBuyAmt(sellAmt, fp('1'), fp('1')), 6 ).add(1) - // since within oracleTimeout, price() should still be at 100% of original price + // since within oracleTimeout lotPrice() should still be at 100% of original price await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) .to.emit(backingManager, 'TradeStarted') @@ -1350,10 +1352,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- should track backing out on auction + // Check price in USD of the current RToken -- no backing currently + const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR await expectRTokenPrice( rTokenAsset.address, - fp('1'), + rTokenPrice, ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -1473,10 +1476,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- should track balances out on trade + // Check price in USD of the current RToken -- no backing currently + const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR await expectRTokenPrice( rTokenAsset.address, - fp('1'), + rTokenPrice, ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -1606,10 +1610,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(remainder) expect(await token1.balanceOf(backingManager.address)).to.equal(0) - // Check price in USD of the current RToken -- backing is tracked while out on trade + // Check price in USD of the current RToken -- no backing currently + const rTokenPrice = remainder.mul(BN_SCALE_FACTOR).div(issueAmount).add(2) // no RSR await expectRTokenPrice( rTokenAsset.address, - fp('1'), + rTokenPrice, ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) @@ -2143,7 +2148,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: fp('25'), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -2207,7 +2212,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ).div(2) const sellAmt = sellAmtBeforeSlippage .mul(BN_SCALE_FACTOR) - .div(BN_SCALE_FACTOR.sub(ORACLE_ERROR)) + .div(BN_SCALE_FACTOR.add(ORACLE_ERROR)) const minBuyAmt = await toMinBuyAmt(sellAmt, fp('0.5'), fp('1')) await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) @@ -2250,7 +2255,64 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await advanceTime(config.batchAuctionLength.add(100).toString()) // Run auctions - will end current, and will open a new auction for the same amount - const leftoverSellAmt = issueAmount.sub(sellAmt) + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: backingManager, + name: 'TradeSettled', + args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: backingManager, + name: 'TradeStarted', + args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], + emitted: true, + }, + ]) + const leftoverSellAmt = issueAmount.sub(sellAmt.mul(2)) + + // Check new auction + // Token0 -> Backup Token Auction + await expectTrade(backingManager, { + sell: token0.address, + buy: backupToken1.address, + endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check state + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + minBuyAmt.add(leftoverSellAmt.div(2)) + ) + expect(await token0.balanceOf(backingManager.address)).to.equal(leftoverSellAmt) + expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) + expect(await rToken.totalSupply()).to.equal(issueAmount) + + // Check price in USD of the current RToken + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + + // Perform Mock Bids (addr1 has balance) + // Pay at worst-case price + await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Check staking situation remains unchanged + expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Run auctions - will end current, and will open a new auction for the same amount const leftoverMinBuyAmt = await toMinBuyAmt(leftoverSellAmt, fp('0.5'), fp('1')) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { @@ -2279,14 +2341,17 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: token0.address, buy: backupToken1.address, endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), - externalId: bn('1'), + externalId: bn('2'), }) // Check state expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( + minBuyAmt.mul(2) + ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) - expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) + expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt.mul(2)) expect(await rToken.totalSupply()).to.equal(issueAmount) // Check price in USD of the current RToken @@ -2295,7 +2360,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) - await gnosis.placeBid(1, { + await gnosis.placeBid(2, { bidder: addr1.address, sellAmount: leftoverSellAmt, buyAmount: leftoverMinBuyAmt, @@ -2308,11 +2373,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Run auctions - will end current, and will open a new auction for the same amount - const buyAmtBidRSR: BigNumber = issueAmount.sub(minBuyAmt.add(leftoverMinBuyAmt)).add(1) + // End current auction, should start a new one to sell RSR for collateral + // ~51e18 Tokens left to buy - Sets Buy amount as independent value + const buyAmtBidRSR: BigNumber = issueAmount + .sub(minBuyAmt.mul(2).add(leftoverMinBuyAmt)) + .add(1) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: backingManager, @@ -2342,7 +2407,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: rsr.address, buy: backupToken1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('2'), + externalId: bn('3'), }) const t = await getTrade(backingManager, rsr.address) @@ -2353,11 +2418,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.add(leftoverMinBuyAmt) + minBuyAmt.mul(2).add(leftoverMinBuyAmt) ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) expect(await backupToken1.balanceOf(backingManager.address)).to.equal( - minBuyAmt.add(leftoverMinBuyAmt) + minBuyAmt.mul(2).add(leftoverMinBuyAmt) ) expect(await rToken.totalSupply()).to.equal(issueAmount) @@ -2370,7 +2435,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids for RSR (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, buyAmtBidRSR) - await gnosis.placeBid(2, { + await gnosis.placeBid(3, { bidder: addr1.address, sellAmount: sellAmtRSR, buyAmount: buyAmtBidRSR, @@ -3246,6 +3311,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { collateral1.address, collateral0.address, issueAmount, + config.minTradeVolume, config.maxTradeSlippage ), bn('1e12') @@ -3309,6 +3375,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { collateral0.address, collateral1.address, issueAmount, + config.minTradeVolume, config.maxTradeSlippage ), bn('1e12') // decimals @@ -4461,10 +4528,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }, ]) - // Check price in USD of the current RToken - should track the capital out on auction + // Check price in USD of the current RToken - capital out on auction await expectRTokenPrice( rTokenAsset.address, - fp('0.625'), + fp('0.5'), ORACLE_ERROR, await backingManager.maxTradeSlippage(), config.minTradeVolume.mul((await assetRegistry.erc20s()).length) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 3858ba4290..4277386931 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -13,7 +13,6 @@ import { CollateralStatus, TradeKind, MAX_UINT192, - ONE_PERIOD, } from '../common/constants' import { expectEvents } from '../common/events' import { bn, divCeil, fp, near } from '../common/numbers' @@ -60,7 +59,6 @@ import { REVENUE_HIDING, ORACLE_ERROR, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import { expectRTokenPrice, setOraclePrice } from './utils/oracles' @@ -556,7 +554,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) }) - it('Should forward RSR revenue directly to StRSR and call payoutRewards()', async () => { + it('Should forward RSR revenue directly to StRSR', async () => { const amount = bn('2000e18') await rsr.connect(owner).mint(backingManager.address, amount) expect(await rsr.balanceOf(backingManager.address)).to.equal(amount) @@ -564,36 +562,20 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(0) - // Advance to the end of noop period - await advanceTime(Number(ONE_PERIOD)) - - await expectEvents(backingManager.forwardRevenue([rsr.address]), [ - { - contract: rsr, - name: 'Transfer', - args: [backingManager.address, stRSR.address, amount], - emitted: true, - }, - { - contract: stRSR, - name: 'RewardsPaid', - emitted: true, - }, - ]) - + await expect(backingManager.forwardRevenue([rsr.address])).to.emit(rsr, 'Transfer') expect(await rsr.balanceOf(backingManager.address)).to.equal(0) expect(await rsr.balanceOf(stRSR.address)).to.equal(amount) expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(0) }) - it('Should launch revenue auction if UNPRICED', async () => { - // After oracleTimeout it should still launch auction for RToken + it('Should launch revenue auction at lotPrice if UNPRICED', async () => { + // After oracleTimeout the lotPrice should be the original price still await advanceTime(ORACLE_TIMEOUT.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.callStatic.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) - // After priceTimeout it should not buy RToken + // After oracleTimeout the lotPrice should be the original price still await advanceTime(PRICE_TIMEOUT.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await expect( @@ -669,113 +651,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) }) - it('Should distribute tokenToBuy before updating distribution', async () => { - // Check initial status - const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) - - // Set some balance of token-to-buy in traders - const issueAmount = bn('100e18') - - // RSR Trader - const stRSRBal = await rsr.balanceOf(stRSR.address) - await rsr.connect(owner).mint(rsrTrader.address, issueAmount) - - // RToken Trader - const rTokenBal = await rToken.balanceOf(furnace.address) - await rToken.connect(addr1).issueTo(rTokenTrader.address, issueAmount) - - // Update distributions with owner - Set f = 1 - await distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - - // Check tokens were transferred from Traders - const expectedAmountRSR = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountRSR, 100) - expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(bn(0), 100) - - const expectedAmountRToken = rTokenBal.add(issueAmount) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expectedAmountRToken, 100) - expect(await rsr.balanceOf(rTokenTrader.address)).to.be.closeTo(bn(0), 100) - - // Check updated distributions - const [newRTokenTotal, newRsrTotal] = await distributor.totals() - expect(newRsrTotal).equal(bn(60)) - expect(newRTokenTotal).equal(bn(0)) - }) - - it('Should avoid zero transfers when distributing tokenToBuy', async () => { - // Distribute with no balance - await expect(rsrTrader.distributeTokenToBuy()).to.be.revertedWith('nothing to distribute') - expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) - - // Small amount which ends in zero distribution due to rounding - await rsr.connect(owner).mint(rsrTrader.address, bn(1)) - await expect(rsrTrader.distributeTokenToBuy()).to.be.revertedWith('nothing to distribute') - expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) - }) - - it('Should account rewards when distributing tokenToBuy', async () => { - // 1. StRSR.payoutRewards() - const stRSRBal = await rsr.balanceOf(stRSR.address) - await rsr.connect(owner).mint(rsrTrader.address, issueAmount) - await advanceTime(Number(ONE_PERIOD)) - await expect(rsrTrader.distributeTokenToBuy()).to.emit(stRSR, 'RewardsPaid') - const expectedAmountStRSR = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountStRSR, 100) - - // 2. Furnace.melt() - // Transfer RTokens to Furnace (to trigger melting later) - const hndAmt: BigNumber = bn('10e18') - await rToken.connect(addr1).transfer(furnace.address, hndAmt) - await advanceTime(Number(ONE_PERIOD)) - await furnace.melt() - - // Transfer and distribute tokens in Trader (will melt) - await advanceTime(Number(ONE_PERIOD)) - await rToken.connect(addr1).transfer(rTokenTrader.address, hndAmt) - await expect(rTokenTrader.distributeTokenToBuy()).to.emit(rToken, 'Melted') - const expectedAmountFurnace = hndAmt.mul(2) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( - expectedAmountFurnace, - expectedAmountFurnace.div(1000) - ) // within 0.1% - }) - - it('Should update distribution even if distributeTokenToBuy() reverts', async () => { - // Check initial status - const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) - - // Set some balance of token-to-buy in RSR trader - const issueAmount = bn('100e18') - const stRSRBal = await rsr.balanceOf(stRSR.address) - await rsr.connect(owner).mint(rsrTrader.address, issueAmount) - - // Pause the system, makes distributeTokenToBuy() revert - await main.connect(owner).pauseTrading() - await expect(rsrTrader.distributeTokenToBuy()).to.be.reverted - - // Update distributions with owner - Set f = 1 - await distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - - // Check no tokens were transferred - expect(await rsr.balanceOf(stRSR.address)).to.equal(stRSRBal) - expect(await rsr.balanceOf(rsrTrader.address)).to.equal(issueAmount) - - // Check updated distributions - const [newRTokenTotal, newRsrTotal] = await distributor.totals() - expect(newRsrTotal).equal(bn(60)) - expect(newRTokenTotal).equal(bn(0)) - }) - it('Should return tokens to BackingManager correctly - rsrTrader.returnTokens()', async () => { // Mint tokens + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) await token0.connect(owner).mint(rsrTrader.address, issueAmount.add(1)) await token1.connect(owner).mint(rsrTrader.address, issueAmount.add(2)) @@ -798,9 +676,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ).to.be.revertedWith('rsrTotal > 0') await distributor.setDistribution(STRSR_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) - // Mint RSR - await rsr.connect(owner).mint(rsrTrader.address, issueAmount) - // Should fail for unregistered token await assetRegistry.connect(owner).unregister(collateral1.address) await expect( @@ -1106,7 +981,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { minBuyAmtRToken.div(bn('1e15')) ) }) - it('Should be able to start a dust auction BATCH_AUCTION, if enabled', async () => { const minTrade = bn('1e18') @@ -1162,26 +1036,26 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should only be able to start a dust auction BATCH_AUCTION (and not DUTCH_AUCTION) if oracle has failed', async () => { const minTrade = bn('1e18') - await rsrTrader.connect(owner).setMinTradeVolume(minTrade) + await rTokenTrader.connect(owner).setMinTradeVolume(minTrade) const dustAmount = bn('1e17') - await token0.connect(addr1).transfer(rsrTrader.address, dustAmount) + await token0.connect(addr1).transfer(rTokenTrader.address, dustAmount) + const p1RevenueTrader = await ethers.getContractAt('RevenueTraderP1', rTokenTrader.address) await setOraclePrice(collateral0.address, bn(0)) await collateral0.refresh() await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) - await setOraclePrice(rsrAsset.address, bn('1e8')) + await setOraclePrice(collateral1.address, bn('1e8')) - const p = await collateral0.price() + const p = await collateral0.lotPrice() expect(p[0]).to.equal(0) - expect(p[1]).to.equal(MAX_UINT192) + expect(p[1]).to.equal(0) await expect( - rsrTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) - ).to.revertedWith('dutch auctions require live prices') - await expect(rsrTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])).to.emit( - rsrTrader, - 'TradeStarted' - ) + p1RevenueTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) + ).to.revertedWith('bad sell pricing') + await expect( + p1RevenueTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION]) + ).to.emit(rTokenTrader, 'TradeStarted') }) it('Should not launch an auction for 1 qTok', async () => { @@ -1226,7 +1100,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, bn(606), // 2 qTok auction at $300 (after accounting for price.high) - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) // Set a very high price @@ -1307,7 +1181,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, MAX_UINT192, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1318,7 +1192,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_UINT192, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1486,7 +1360,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1537,7 +1411,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) // Expected values based on Prices between AAVE and RSR = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to oracle error + const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to oracle error const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) // Run auctions @@ -1685,7 +1559,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1719,7 +1593,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RToken = 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) await expectEvents(backingManager.claimRewards(), [ @@ -1884,7 +1758,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1917,7 +1791,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.mul(20).div(100) // All Rtokens can be sold - 20% of total comp based on f @@ -2095,6 +1969,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should only allow RevenueTraders to call distribute()', async () => { const distAmount: BigNumber = bn('100e18') + // Transfer some RSR to RevenueTraders + await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) + await rsr.connect(addr1).transfer(rsrTrader.address, distAmount) + // Set f = 1 await expect( distributor @@ -2112,10 +1990,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .to.emit(distributor, 'DistributionSet') .withArgs(STRSR_DEST, bn(0), bn(1)) - // Transfer some RSR to RevenueTraders - await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) - await rsr.connect(addr1).transfer(rsrTrader.address, distAmount) - // Check funds in RevenueTraders and destinations expect(await rsr.balanceOf(rTokenTrader.address)).to.equal(distAmount) expect(await rsr.balanceOf(rsrTrader.address)).to.equal(distAmount) @@ -2129,370 +2003,57 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await whileImpersonating(backingManager.address, async (bmSigner) => { await rsr.connect(bmSigner).approve(distributor.address, distAmount) - await expect( - distributor.connect(bmSigner).distribute(rsr.address, distAmount) - ).to.be.revertedWith('RevenueTraders only') - }) - - // Should succeed for RevenueTraders - await whileImpersonating(rTokenTrader.address, async (bmSigner) => { - await rsr.connect(bmSigner).approve(distributor.address, distAmount) - await distributor.connect(bmSigner).distribute(rsr.address, distAmount) - }) - await whileImpersonating(rsrTrader.address, async (bmSigner) => { - await rsr.connect(bmSigner).approve(distributor.address, distAmount) - await distributor.connect(bmSigner).distribute(rsr.address, distAmount) - }) - - // RSR should be in staking pool - expect(await rsr.balanceOf(stRSR.address)).to.equal(distAmount.mul(2)) - }) - - it('Should revert if no distribution exists for a specific token', async () => { - // Check funds in Backing Manager and destinations - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - - await whileImpersonating(rTokenTrader.address, async (bmSigner) => { - await expect( - distributor.connect(bmSigner).distribute(rsr.address, bn(100)) - ).to.be.revertedWith('nothing to distribute') - }) - - // Check funds, nothing changed - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - }) - - it('Should not start trades if no distribution defined', async () => { - // Check funds in Backing Manager and destinations - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - - await expect( - rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) - ).to.be.revertedWith('zero distribution') - - // Check funds, nothing changed - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - }) - - it('Should handle no distribution defined when settling trade', async () => { - // Set COMP tokens as reward - rewardAmountCOMP = bn('0.8e18') - - // COMP Rewards - await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) - - // Collect revenue - // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% - const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) - - const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder - const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) - - await expectEvents(backingManager.claimRewards(), [ - { - contract: token3, - name: 'RewardsClaimed', - args: [compToken.address, rewardAmountCOMP], - emitted: true, - }, - { - contract: token2, - name: 'RewardsClaimed', - args: [aaveToken.address, bn(0)], - emitted: true, - }, - ]) - - // Check status of destinations at this point - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - args: [ - anyValue, - compToken.address, - rToken.address, - sellAmtRToken, - withinQuad(minBuyAmtRToken), - ], - emitted: true, - }, - ]) - - const auctionTimestamp: number = await getLatestBlockTimestamp() - - // Check auctions registered - // COMP -> RSR Auction - await expectTrade(rsrTrader, { - sell: compToken.address, - buy: rsr.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('0'), - }) - - // COMP -> RToken Auction - await expectTrade(rTokenTrader, { - sell: compToken.address, - buy: rToken.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('1'), - }) - - // Check funds in Market - expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Perform Mock Bids for RSR and RToken (addr1 has balance) - await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) - await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) - await gnosis.placeBid(0, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt, - }) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmtRToken, - buyAmount: minBuyAmtRToken, - }) - - // Set no distribution for StRSR - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - - // Close auctions - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - emitted: false, - }, - ]) - - // Check balances - // StRSR - Still in trader, was not distributed due to zero distribution - expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) - expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) - - // Furnace - RTokens transferred to destination - expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) - expect(await rToken.balanceOf(furnace.address)).to.closeTo( - minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e15')) - ) - }) - - it('Should allow to settle trade (and not distribute) even if trading paused or frozen', async () => { - // Set COMP tokens as reward - rewardAmountCOMP = bn('0.8e18') - - // COMP Rewards - await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) - - // Collect revenue - // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% - const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) - - const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder - const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) - - await expectEvents(backingManager.claimRewards(), [ - { - contract: token3, - name: 'RewardsClaimed', - args: [compToken.address, rewardAmountCOMP], - emitted: true, - }, - { - contract: token2, - name: 'RewardsClaimed', - args: [aaveToken.address, bn(0)], - emitted: true, - }, - ]) - - // Check status of destinations at this point - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - args: [ - anyValue, - compToken.address, - rToken.address, - sellAmtRToken, - withinQuad(minBuyAmtRToken), - ], - emitted: true, - }, - ]) - - const auctionTimestamp: number = await getLatestBlockTimestamp() - - // Check auctions registered - // COMP -> RSR Auction - await expectTrade(rsrTrader, { - sell: compToken.address, - buy: rsr.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('0'), - }) - - // COMP -> RToken Auction - await expectTrade(rTokenTrader, { - sell: compToken.address, - buy: rToken.address, - endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('1'), - }) - - // Check funds in Market - expect(await compToken.balanceOf(gnosis.address)).to.equal(rewardAmountCOMP) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) + await expect( + distributor.connect(bmSigner).distribute(rsr.address, distAmount) + ).to.be.revertedWith('RevenueTraders only') + }) - // Perform Mock Bids for RSR and RToken (addr1 has balance) - await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) - await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) - await gnosis.placeBid(0, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt, + // Should succeed for RevenueTraders + await whileImpersonating(rTokenTrader.address, async (bmSigner) => { + await rsr.connect(bmSigner).approve(distributor.address, distAmount) + await distributor.connect(bmSigner).distribute(rsr.address, distAmount) }) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmtRToken, - buyAmount: minBuyAmtRToken, + await whileImpersonating(rsrTrader.address, async (bmSigner) => { + await rsr.connect(bmSigner).approve(distributor.address, distAmount) + await distributor.connect(bmSigner).distribute(rsr.address, distAmount) }) - // Pause Trading - await main.connect(owner).pauseTrading() + // RSR should be in staking pool + expect(await rsr.balanceOf(stRSR.address)).to.equal(distAmount.mul(2)) + }) - // Close auctions - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rsr.address, sellAmt, minBuyAmt], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeSettled', - args: [anyValue, compToken.address, rToken.address, sellAmtRToken, minBuyAmtRToken], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - emitted: false, - }, - ]) + it('Should revert if no distribution exists for a specific token', async () => { + // Check funds in Backing Manager and destinations + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Set f = 0, avoid dropping tokens + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(1), bn(0)) + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) - // Distribution did not occurr, funds are in Traders - expect(await rsr.balanceOf(rsrTrader.address)).to.equal(minBuyAmt) - expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(minBuyAmtRToken) + await whileImpersonating(rTokenTrader.address, async (bmSigner) => { + await expect( + distributor.connect(bmSigner).distribute(rsr.address, bn(100)) + ).to.be.revertedWith('nothing to distribute') + }) - expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) - expect(await rToken.balanceOf(furnace.address)).to.equal(bn(0)) + // Check funds, nothing changed + expect(await rsr.balanceOf(backingManager.address)).to.equal(0) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) it('Should trade even if price for buy token = 0', async () => { @@ -2683,133 +2244,11 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { }, ]) - // Check broker disabled (batch) - expect(await broker.batchTradeDisabled()).to.equal(true) - // Check funds at destinations expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt.sub(10), 50) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) }) - it('Should report violation even if paused or frozen', async () => { - // This test needs to be in this file and not Broker.test.ts because settleTrade() - // requires the BackingManager _actually_ started the trade - - rewardAmountAAVE = bn('0.5e18') - - // AAVE Rewards - await token2.setRewards(backingManager.address, rewardAmountAAVE) - - // Collect revenue - // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% - const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) - - const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder - const minBuyAmtRToken: BigNumber = await toMinBuyAmt(sellAmtRToken, fp('1'), fp('1')) - - // Claim rewards - await facadeTest.claimRewards(rToken.address) - - // Check status of destinations at this point - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - // Run auctions - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rsrTrader, - name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - args: [ - anyValue, - aaveToken.address, - rToken.address, - sellAmtRToken, - withinQuad(minBuyAmtRToken), - ], - emitted: true, - }, - ]) - - // Advance time till auction ended - await advanceTime(config.batchAuctionLength.add(100).toString()) - - // Perform Mock Bids for RSR and RToken (addr1 has balance) - // In order to force deactivation we provide an amount below minBuyAmt, this will represent for our tests an invalid behavior although in a real scenario would retrigger auction - // NOTE: DIFFERENT BEHAVIOR WILL BE OBSERVED ON PRODUCTION GNOSIS AUCTIONS - await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) - await rToken.connect(addr1).approve(gnosis.address, minBuyAmtRToken) - await gnosis.placeBid(0, { - bidder: addr1.address, - sellAmount: sellAmt, - buyAmount: minBuyAmt.sub(10), // Forces in our mock an invalid behavior - }) - await gnosis.placeBid(1, { - bidder: addr1.address, - sellAmount: sellAmtRToken, - buyAmount: minBuyAmtRToken.sub(10), // Forces in our mock an invalid behavior - }) - - // Freeze protocol - await main.connect(owner).freezeShort() - - // Close auctions - Will end trades and also report violation - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: broker, - name: 'BatchTradeDisabledSet', - args: [false, true], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeSettled', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, minBuyAmt.sub(10)], - emitted: true, - }, - { - contract: rTokenTrader, - name: 'TradeSettled', - args: [ - anyValue, - aaveToken.address, - rToken.address, - sellAmtRToken, - minBuyAmtRToken.sub(10), - ], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - emitted: false, - }, - ]) - - // Check broker disabled (batch) - expect(await broker.batchTradeDisabled()).to.equal(true) - - // Funds are not distributed if paused or frozen - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(minBuyAmt.sub(10), 50) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo( - minBuyAmtRToken.sub(10), - 50 - ) - }) - it('Should not report violation when Dutch Auction clears in geometric phase', async () => { // This test needs to be in this file and not Broker.test.ts because settleTrade() // requires the BackingManager _actually_ started the trade @@ -3388,7 +2827,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.05'), delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3515,6 +2954,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rTokenAsset.address, collateral0.address, issueAmount, + config.minTradeVolume, config.maxTradeSlippage ) expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) @@ -3574,6 +3014,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rTokenAsset.address, collateral0.address, issueAmount, + config.minTradeVolume, config.maxTradeSlippage ) expect(await rTokenTrader.tradesOpen()).to.equal(0) @@ -4350,106 +3791,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await token2.balanceOf(rsrTrader.address)).to.equal(0) expect(await token2.balanceOf(rTokenTrader.address)).to.equal(0) }) - - it('Should handle backingBuffer when minting RTokens from collateral appreciation', async () => { - // Set distribution for RToken only (f=0) - await distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - - await distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - - // Set Backing buffer - const backingBuffer = fp('0.05') - await backingManager.connect(owner).setBackingBuffer(backingBuffer) - - // Issue additional RTokens - const newIssueAmount = bn('900e18') - await rToken.connect(addr1).issue(newIssueAmount) - - // Check Price and Assets value - const totalIssuedAmount = issueAmount.add(newIssueAmount) - await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - totalIssuedAmount - ) - expect(await rToken.totalSupply()).to.equal(totalIssuedAmount) - - // Change redemption rate for AToken and CToken to double - await token2.setExchangeRate(fp('1.10')) - await token3.setExchangeRate(fp('1.10')) - await collateral2.refresh() - await collateral3.refresh() - - // Check Price (unchanged) and Assets value (now 10% higher) - await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - totalIssuedAmount.mul(110).div(100) - ) - expect(await rToken.totalSupply()).to.equal(totalIssuedAmount) - - // Check status of destinations at this point - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - // Set expected minting, based on f = 0.6 - const excessRevenue = totalIssuedAmount - .mul(110) - .div(100) - .mul(BN_SCALE_FACTOR) - .div(fp('1').add(backingBuffer)) - .sub(await rToken.basketsNeeded()) - - // Set expected auction values - const expectedToFurnace = excessRevenue - const currentTotalSupply: BigNumber = await rToken.totalSupply() - const newTotalSupply: BigNumber = currentTotalSupply.add(excessRevenue) - - // Collect revenue and mint new tokens - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ - { - contract: rToken, - name: 'Transfer', - args: [ZERO_ADDRESS, backingManager.address, withinQuad(excessRevenue)], - emitted: true, - }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - ]) - - // Check Price (unchanged) and Assets value - Supply has increased 10% - await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - totalIssuedAmount.mul(110).div(100) - ) - expect(await rToken.totalSupply()).to.be.closeTo( - newTotalSupply, - newTotalSupply.mul(5).div(1000) - ) // within 0.5% - - // Check destinations after newly minted tokens - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( - expectedToFurnace, - expectedToFurnace.mul(5).div(1000) - ) - - // Check Price and Assets value - RToken price increases due to melting - const updatedRTokenPrice: BigNumber = newTotalSupply - .mul(BN_SCALE_FACTOR) - .div(await rToken.totalSupply()) - await expectRTokenPrice(rTokenAsset.address, updatedRTokenPrice, ORACLE_ERROR) - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - totalIssuedAmount.mul(110).div(100) - ) - }) }) context('With simple basket of ATokens and CTokens: no issued RTokens', function () { @@ -4590,7 +3931,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 81629b3426..927858718f 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -1,6 +1,5 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' import { signERC2612Permit } from 'eth-permit' import { BigNumber, ContractFactory } from 'ethers' @@ -537,24 +536,6 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await expect(stRSR.connect(addr1).unstake(0)).to.be.revertedWith('frozen or trading paused') }) - it('Should emit UnstakingStarted event with draftEra -- regression test 01/18/2024', async () => { - const amount: BigNumber = bn('1000e18') - - // Stake - await rsr.connect(addr1).approve(stRSR.address, amount) - await stRSR.connect(addr1).stake(amount) - - // Seize half the RSR, bumping the draftEra because the withdrawal queue is empty - await whileImpersonating(backingManager.address, async (signer) => { - await stRSR.connect(signer).seizeRSR(amount.div(2)) - }) - - // Unstake - await expect(stRSR.connect(addr1).unstake(amount)) - .emit(stRSR, 'UnstakingStarted') - .withArgs(0, 2, addr1.address, amount.div(2), amount, anyValue) - }) - it('Should create Pending withdrawal when unstaking', async () => { const amount: BigNumber = bn('1000e18') @@ -2028,7 +2009,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await expect(stRSR.connect(addr1).unstake(one)) .emit(stRSR, 'UnstakingStarted') - .withArgs(0, 2, addr1.address, bn(0), one, availableAt) + .withArgs(0, 1, addr1.address, bn(0), one, availableAt) // Check withdrawal properly registered - Check draft era //await expectWithdrawal(addr1.address, 0, { rsrAmount: bn(1) }) diff --git a/test/__snapshots__/Broker.test.ts.snap b/test/__snapshots__/Broker.test.ts.snap index 634c60aac7..fc823d852b 100644 --- a/test/__snapshots__/Broker.test.ts.snap +++ b/test/__snapshots__/Broker.test.ts.snap @@ -2,20 +2,20 @@ exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Initialize Trade 1`] = `251984`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `366975`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 1`] = `361087`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `369090`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 2`] = `363202`; -exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `371228`; +exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Open Trade 3`] = `365340`; exports[`BrokerP1 contract #fast Gas Reporting DutchTrade Settle Trade 1`] = `63333`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `453893`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Initialize Trade 1`] = `451427`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `543745`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 1`] = `541279`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `531583`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 2`] = `529117`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `533721`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Open Trade 3`] = `531255`; -exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113028`; +exports[`BrokerP1 contract #fast Gas Reporting GnosisTrade Settle Trade 1`] = `113056`; diff --git a/test/__snapshots__/FacadeWrite.test.ts.snap b/test/__snapshots__/FacadeWrite.test.ts.snap index 5318fd2f61..848354f559 100644 --- a/test/__snapshots__/FacadeWrite.test.ts.snap +++ b/test/__snapshots__/FacadeWrite.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8330567`; +exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 1 - RToken Deployment 1`] = `8393668`; exports[`FacadeWrite contract Deployment Process Gas Reporting Phase 2 - Deploy governance 1`] = `5464253`; diff --git a/test/__snapshots__/Furnace.test.ts.snap b/test/__snapshots__/Furnace.test.ts.snap index e905f3eec0..af06969a2f 100644 --- a/test/__snapshots__/Furnace.test.ts.snap +++ b/test/__snapshots__/Furnace.test.ts.snap @@ -1,35 +1,35 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `71626`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 1`] = `83931`; -exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `77515`; +exports[`FurnaceP1 contract Gas Reporting Melt - A million periods, all at once 2`] = `89820`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `71626`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 1`] = `83931`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 2`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 3`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 4`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 5`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 6`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 7`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 8`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 9`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 10`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - Many periods, one after the other 11`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `51726`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 1`] = `64031`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `68358`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 2`] = `80663`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `65998`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 3`] = `78303`; -exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `28452`; +exports[`FurnaceP1 contract Gas Reporting Melt - One period 4`] = `40761`; diff --git a/test/__snapshots__/Main.test.ts.snap b/test/__snapshots__/Main.test.ts.snap index 0771900efd..06ba9d68c7 100644 --- a/test/__snapshots__/Main.test.ts.snap +++ b/test/__snapshots__/Main.test.ts.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `393855`; +exports[`MainP1 contract Gas Reporting Asset Registry - Refresh 1`] = `357705`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `245356`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 1`] = `195889`; -exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `245356`; +exports[`MainP1 contract Gas Reporting Asset Registry - Register Asset 2`] = `195889`; -exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `224015`; +exports[`MainP1 contract Gas Reporting Asset Registry - Swap Registered Asset 1`] = `167045`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80510`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 1`] = `80532`; -exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70022`; +exports[`MainP1 contract Gas Reporting Asset Registry - Unregister Asset 2`] = `70044`; diff --git a/test/__snapshots__/RToken.test.ts.snap b/test/__snapshots__/RToken.test.ts.snap index 600063cf88..f50430c9b4 100644 --- a/test/__snapshots__/RToken.test.ts.snap +++ b/test/__snapshots__/RToken.test.ts.snap @@ -1,10 +1,10 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `782176`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 1`] = `787453`; -exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `609176`; +exports[`RTokenP1 contract Gas Reporting Issuance: within block 2`] = `614457`; -exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `583880`; +exports[`RTokenP1 contract Gas Reporting Redemption 1`] = `589230`; exports[`RTokenP1 contract Gas Reporting Transfer 1`] = `56658`; diff --git a/test/__snapshots__/Recollateralization.test.ts.snap b/test/__snapshots__/Recollateralization.test.ts.snap index 1bcce9471c..9e0d532f8e 100644 --- a/test/__snapshots__/Recollateralization.test.ts.snap +++ b/test/__snapshots__/Recollateralization.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1396756`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 1`] = `1384418`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1518120`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 2`] = `1510705`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `750910`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - DutchTrade 3`] = `747331`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1715195`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 1`] = `1680908`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `179696`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 2`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1657793`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 3`] = `1613640`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `179696`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 4`] = `174808`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1733823`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 5`] = `1702037`; -exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `207769`; +exports[`Recollateralization - P1 Gas Reporting rebalance() - GnosisTrade 6`] = `202908`; diff --git a/test/__snapshots__/Revenues.test.ts.snap b/test/__snapshots__/Revenues.test.ts.snap index 24037c7f9a..81fa8bb746 100644 --- a/test/__snapshots__/Revenues.test.ts.snap +++ b/test/__snapshots__/Revenues.test.ts.snap @@ -1,27 +1,27 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `168005`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 1`] = `164974`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `168058`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 2`] = `165027`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `168058`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 3`] = `165027`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `211655`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 4`] = `208624`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `232408`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 5`] = `229377`; -exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `215308`; +exports[`Revenues - P1 Gas Reporting Claim and Sweep Rewards 6`] = `212277`; -exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1044935`; +exports[`Revenues - P1 Gas Reporting Selling RToken 1`] = `1008567`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `820357`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 1`] = `773918`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1222455`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 2`] = `1181227`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `368496`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 3`] = `311446`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `318685`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 4`] = `266512`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `786157`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 5`] = `739718`; -exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `285704`; +exports[`Revenues - P1 Gas Reporting Settle Trades / Manage Funds 6`] = `242306`; diff --git a/test/__snapshots__/ZZStRSR.test.ts.snap b/test/__snapshots__/ZZStRSR.test.ts.snap index 36ee8b72fa..dbc65bb91d 100644 --- a/test/__snapshots__/ZZStRSR.test.ts.snap +++ b/test/__snapshots__/ZZStRSR.test.ts.snap @@ -2,7 +2,7 @@ exports[`StRSRP1 contract Gas Reporting Stake 1`] = `139717`; -exports[`StRSRP1 contract Gas Reporting Stake 2`] = `134917`; +exports[`StRSRP1 contract Gas Reporting Stake 2`] = `151759`; exports[`StRSRP1 contract Gas Reporting Transfer 1`] = `63409`; @@ -14,6 +14,6 @@ exports[`StRSRP1 contract Gas Reporting Unstake 1`] = `222609`; exports[`StRSRP1 contract Gas Reporting Unstake 2`] = `139758`; -exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `606291`; +exports[`StRSRP1 contract Gas Reporting Withdraw 1`] = `572011`; -exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `536425`; +exports[`StRSRP1 contract Gas Reporting Withdraw 2`] = `526015`; diff --git a/test/fixtures.ts b/test/fixtures.ts index a787359e1b..ff881e60d0 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -1,23 +1,11 @@ import { ContractFactory } from 'ethers' import { expect } from 'chai' -import hre, { ethers, upgrades } from 'hardhat' +import hre, { ethers } from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { - IConfig, - IImplementations, - IMonitorParams, - IRevenueShare, - networkConfig, -} from '../common/configuration' +import { IConfig, IImplementations, IRevenueShare, networkConfig } from '../common/configuration' import { expectInReceipt } from '../common/events' import { bn, fp } from '../common/numbers' -import { - CollateralStatus, - PAUSER, - LONG_FREEZER, - SHORT_FREEZER, - ZERO_ADDRESS, -} from '../common/constants' +import { CollateralStatus, PAUSER, LONG_FREEZER, SHORT_FREEZER } from '../common/constants' import { Asset, AssetRegistryP1, @@ -36,7 +24,6 @@ import { DutchTrade, FacadeRead, FacadeAct, - FacadeMonitor, FacadeTest, DistributorP1, FiatCollateral, @@ -84,16 +71,14 @@ export const SLOW = !!useEnv('SLOW') export const PRICE_TIMEOUT = bn('604800') // 1 week -export const ORACLE_TIMEOUT_PRE_BUFFER = bn('281474976710655').div(100) // type(uint48).max / 100 - -export const ORACLE_TIMEOUT = ORACLE_TIMEOUT_PRE_BUFFER.add(300) +export const ORACLE_TIMEOUT = bn('281474976710655').div(2) // type(uint48).max / 2 export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.1.0' +export const VERSION = '3.0.1' export type Collateral = | FiatCollateral @@ -198,7 +183,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -218,7 +203,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -238,7 +223,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -267,7 +252,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -295,7 +280,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -425,7 +410,6 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt facade: FacadeRead facadeAct: FacadeAct facadeTest: FacadeTest - facadeMonitor: FacadeMonitor broker: TestIBroker rsrTrader: TestIRevenueTrader rTokenTrader: TestIRevenueTrader @@ -482,11 +466,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = }, } - // Setup Monitor Params (mock addrs for local deployment) - const monitorParams: IMonitorParams = { - AAVE_V2_DATA_PROVIDER_ADDR: ZERO_ADDRESS, - } - // Deploy TradingLib external library const TradingLibFactory: ContractFactory = await ethers.getContractFactory('TradingLibP0') const tradingLib: TradingLibP0 = await TradingLibFactory.deploy() @@ -503,19 +482,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() - // Deploy FacadeMonitor - const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') - - const facadeMonitor = await upgrades.deployProxy( - FacadeMonitorFactory, - [owner.address], - { - kind: 'uups', - initializer: 'init', - constructorArgs: [monitorParams], - } - ) - // Deploy RSR chainlink feed const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( 'MockV3Aggregator' @@ -533,7 +499,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await rsrAsset.refresh() @@ -665,7 +631,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await aaveAsset.refresh() @@ -680,7 +646,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await compAsset.refresh() @@ -783,7 +749,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, facadeAct, facadeTest, - facadeMonitor, rsrTrader, rTokenTrader, bySymbol, diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 71ae4bf11d..7e067fa875 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -8,7 +8,6 @@ import { IMPLEMENTATION, ORACLE_ERROR, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -20,14 +19,7 @@ import { expectEvents } from '../../common/events' import { bn, fp, toBNDecimals } from '../../common/numbers' import { advanceBlocks, advanceTime } from '../utils/time' import { whileImpersonating } from '../utils/impersonation' -import { - expectDecayedPrice, - expectExactPrice, - expectPrice, - expectRTokenPrice, - expectUnpriced, - setOraclePrice, -} from '../utils/oracles' +import { expectPrice, expectRTokenPrice, expectUnpriced, setOraclePrice } from '../utils/oracles' import forkBlockNumber from './fork-block-numbers' import { Asset, @@ -47,7 +39,6 @@ import { MockV3Aggregator, NonFiatCollateral, RTokenAsset, - SelfReferentialCollateral, StaticATokenLM, TestIBackingManager, TestIBasketHandler, @@ -1091,7 +1082,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, }) it('Should handle invalid/stale Price - Assets', async () => { - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Stale Oracle await expectUnpriced(compAsset.address) @@ -1123,30 +1114,19 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, ORACLE_ERROR, networkConfig[chainId].tokens.stkAAVE || '', config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + MAX_ORACLE_TIMEOUT ) ) - await setOraclePrice(zeroPriceAsset.address, bn('1e10')) - await zeroPriceAsset.refresh() - - const initialPrice = await zeroPriceAsset.price() - await setOraclePrice(zeroPriceAsset.address, bn(0)) - await expectExactPrice(zeroPriceAsset.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceAsset.address, bn(0)) - await expectDecayedPrice(zeroPriceAsset.address) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeroPriceAsset.address, bn(0)) + // Unpriced await expectUnpriced(zeroPriceAsset.address) }) it('Should handle invalid/stale Price - Collateral - Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) await expectUnpriced(daiCollateral.address) await expectUnpriced(usdcCollateral.address) @@ -1203,30 +1183,19 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: dai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }) - await setOraclePrice(zeroFiatCollateral.address, bn('1e8')) await zeroFiatCollateral.refresh() - expect(await zeroFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - const initialPrice = await zeroFiatCollateral.price() await setOraclePrice(zeroFiatCollateral.address, bn(0)) - await expectExactPrice(zeroFiatCollateral.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(zeroFiatCollateral.address, bn(0)) - await expectDecayedPrice(zeroFiatCollateral.address) - - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeroFiatCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeroFiatCollateral.address) - // Marked IFFY after refresh + // Refresh should mark status IFFY await zeroFiatCollateral.refresh() expect(await zeroFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1237,7 +1206,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await cUsdtCollateral.status()).to.equal(CollateralStatus.SOUND) // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Compound await expectUnpriced(cDaiCollateral.address) @@ -1289,29 +1258,18 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }, REVENUE_HIDING ) - await setOraclePrice(zeropriceCtokenCollateral.address, bn('1e8')) await zeropriceCtokenCollateral.refresh() - expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.SOUND) - - const initialPrice = await zeropriceCtokenCollateral.price() - await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) - await expectExactPrice(zeropriceCtokenCollateral.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) - await expectDecayedPrice(zeropriceCtokenCollateral.address) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeropriceCtokenCollateral.address) // Refresh should mark status IFFY @@ -1321,7 +1279,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - ATokens Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Aave await expectUnpriced(aDaiCollateral.address) @@ -1377,29 +1335,18 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: stataDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, }, REVENUE_HIDING ) - await setOraclePrice(zeroPriceAtokenCollateral.address, bn('1e8')) await zeroPriceAtokenCollateral.refresh() - expect(await zeroPriceAtokenCollateral.status()).to.equal(CollateralStatus.SOUND) - - const initialPrice = await zeroPriceAtokenCollateral.price() - await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) - await expectExactPrice(zeroPriceAtokenCollateral.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) - await expectDecayedPrice(zeroPriceAtokenCollateral.address) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeroPriceAtokenCollateral.address) // Refresh should mark status IFFY @@ -1409,7 +1356,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - Non-Fiatcoins', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Aave await expectUnpriced(wbtcCollateral.address) @@ -1456,35 +1403,32 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: wbtc.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER + MAX_ORACLE_TIMEOUT ) - await setOraclePrice(zeroPriceNonFiatCollateral.address, bn('1e10')) await zeroPriceNonFiatCollateral.refresh() - const initialPrice = await zeroPriceNonFiatCollateral.price() - await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) - await expectExactPrice(zeroPriceNonFiatCollateral.address, initialPrice) - - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) - await expectDecayedPrice(zeroPriceNonFiatCollateral.address) + // Set price = 0 + const chainlinkFeedAddr = await zeroPriceNonFiatCollateral.chainlinkFeed() + const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) + await v3Aggregator.updateAnswer(bn(0)) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeroPriceNonFiatCollateral.address) + + // Refresh should mark status IFFY + await zeroPriceNonFiatCollateral.refresh() + expect(await zeroPriceNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) it('Should handle invalid/stale Price - Collateral - CTokens Non-Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Compound await expectUnpriced(cWBTCCollateral.address) @@ -1536,39 +1480,36 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cWBTCVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER, + MAX_ORACLE_TIMEOUT, REVENUE_HIDING ) ) - await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn('1e10')) await zeropriceCtokenNonFiatCollateral.refresh() - const initialPrice = await zeropriceCtokenNonFiatCollateral.price() - await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) - await expectExactPrice(zeropriceCtokenNonFiatCollateral.address, initialPrice) - - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) - await expectDecayedPrice(zeropriceCtokenNonFiatCollateral.address) + // Set price = 0 + const chainlinkFeedAddr = await zeropriceCtokenNonFiatCollateral.targetUnitChainlinkFeed() + const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) + await v3Aggregator.updateAnswer(bn(0)) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeropriceCtokenNonFiatCollateral.address) + + // Refresh should mark status IFFY + await zeropriceCtokenNonFiatCollateral.refresh() + expect(await zeropriceCtokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) it('Should handle invalid/stale Price - Collateral - Self-Referential', async () => { const delayUntilDefault = bn('86400') // 24h // Dows not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Aave await expectUnpriced(wethCollateral.address) @@ -1577,10 +1518,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await wethCollateral.status()).to.equal(CollateralStatus.IFFY) // Self referential collateral with no price - const nonpriceSelfReferentialCollateral: SelfReferentialCollateral = < - SelfReferentialCollateral - >await ( - await ethers.getContractFactory('SelfReferentialCollateral') + const nonpriceSelfReferentialCollateral: FiatCollateral = await ( + await ethers.getContractFactory('FiatCollateral') ).deploy({ priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, @@ -1601,40 +1540,28 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await nonpriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) // Self referential collateral with zero price - const zeroPriceSelfReferentialCollateral: SelfReferentialCollateral = < - SelfReferentialCollateral - >await ( - await ethers.getContractFactory('SelfReferentialCollateral') + const zeroPriceSelfReferentialCollateral: FiatCollateral = await ( + await ethers.getContractFactory('FiatCollateral') ).deploy({ priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, erc20: weth.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, }) - await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn('1e10')) await zeroPriceSelfReferentialCollateral.refresh() - expect(await zeroPriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) - - const initialPrice = await zeroPriceSelfReferentialCollateral.price() - await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) - await expectExactPrice(zeroPriceSelfReferentialCollateral.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + // Set price = 0 await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) - await expectDecayedPrice(zeroPriceSelfReferentialCollateral.address) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeroPriceSelfReferentialCollateral.address) - // Refresh should mark status DISABLED + // Refresh should mark status IFFY await zeroPriceSelfReferentialCollateral.refresh() expect(await zeroPriceSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -1643,7 +1570,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const delayUntilDefault = bn('86400') // 24h // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) // Compound await expectUnpriced(cETHCollateral.address) @@ -1694,7 +1621,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cETHVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1702,24 +1629,12 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, REVENUE_HIDING, await weth.decimals() ) - await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn('1e10')) await zeroPriceCtokenSelfReferentialCollateral.refresh() - expect(await zeroPriceCtokenSelfReferentialCollateral.status()).to.equal( - CollateralStatus.SOUND - ) - const initialPrice = await zeroPriceCtokenSelfReferentialCollateral.price() + // Set price = 0 await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) - await expectExactPrice(zeroPriceCtokenSelfReferentialCollateral.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) - await expectDecayedPrice(zeroPriceCtokenSelfReferentialCollateral.address) - - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) + // Unpriced await expectUnpriced(zeroPriceCtokenSelfReferentialCollateral.address) // Refresh should mark status IFFY @@ -1731,7 +1646,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - EUR Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) await expectUnpriced(eurtCollateral.address) @@ -1777,30 +1692,22 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: eurt.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER + MAX_ORACLE_TIMEOUT ) - await setOraclePrice(invalidPriceEURCollateral.address, bn('1e10')) await invalidPriceEURCollateral.refresh() - expect(await invalidPriceEURCollateral.status()).to.equal(CollateralStatus.SOUND) - - const initialPrice = await invalidPriceEURCollateral.price() - await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) - await expectExactPrice(invalidPriceEURCollateral.address, initialPrice) - // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) - await expectDecayedPrice(invalidPriceEURCollateral.address) + // Set price = 0 + const chainlinkFeedAddr = await invalidPriceEURCollateral.targetUnitChainlinkFeed() + const v3Aggregator = await ethers.getContractAt('MockV3Aggregator', chainlinkFeedAddr) + await v3Aggregator.updateAnswer(bn(0)) - // After price timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) + // With zero price await expectUnpriced(invalidPriceEURCollateral.address) // Refresh should mark status IFFY diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 355d92f00c..3d63f9e5b8 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -551,11 +551,10 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function }) it('should be able to scoop entire auction cheaply when minBuyAmount = 0', async () => { - // Make collateral0 price (0, FIX_MAX) + // Make collateral0 lotPrice (0, 0) await setOraclePrice(collateral0.address, bn('0')) await collateral0.refresh() await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) - await setOraclePrice(collateral0.address, bn('0')) await setOraclePrice(await assetRegistry.toAsset(rsr.address), bn('1e8')) // force a revenue dust auction @@ -753,7 +752,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function oracleError: ORACLE_ERROR, // shouldn't matter erc20: sellTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48.sub(300), + oracleTimeout: MAX_UINT48, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter @@ -765,7 +764,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function oracleError: ORACLE_ERROR, // shouldn't matter erc20: buyTok.address, maxTradeVolume: MAX_UINT192, - oracleTimeout: MAX_UINT48.sub(300), + oracleTimeout: MAX_UINT48, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // shouldn't matter delayUntilDefault: bn('604800'), // shouldn't matter diff --git a/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap b/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap new file mode 100644 index 0000000000..a9ec5a85ce --- /dev/null +++ b/test/integration/__snapshots__/CTokenVaultGas.test.ts.snap @@ -0,0 +1,25 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Issue RToken 1`] = `816857`; + +exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Issue RToken 2`] = `677455`; + +exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Redeem RToken 1`] = `679421`; + +exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 1`] = `159307`; + +exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 2`] = `127937`; + +exports[`CTokenVault contract Gas Reporting, cTokens Unwrapped Transfer 3`] = `110849`; + +exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Issue RToken 1`] = `965241`; + +exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Issue RToken 2`] = `753143`; + +exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Redeem RToken 1`] = `748958`; + +exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 1`] = `310005`; + +exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 2`] = `193085`; + +exports[`CTokenVault contract Gas Reporting, cTokens Wrapped Transfer 3`] = `175997`; diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index c9778bb7df..f22f9a1f1e 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -1,14 +1,8 @@ import { BigNumber, ContractFactory } from 'ethers' import hre, { ethers } from 'hardhat' import { getChainId } from '../../common/blockchain-utils' -import { - IConfig, - IImplementations, - IMonitorParams, - IRevenueShare, - networkConfig, -} from '../../common/configuration' -import { PAUSER, SHORT_FREEZER, LONG_FREEZER, ZERO_ADDRESS } from '../../common/constants' +import { IConfig, IImplementations, IRevenueShare, networkConfig } from '../../common/configuration' +import { PAUSER, SHORT_FREEZER, LONG_FREEZER } from '../../common/constants' import { expectInReceipt } from '../../common/events' import { advanceTime } from '../utils/time' import { bn, fp } from '../../common/numbers' @@ -60,14 +54,13 @@ import { TestIRToken, TestIStRSR, RecollateralizationLibP1, - FacadeMonitor, } from '../../typechain' import { Collateral, Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -197,7 +190,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -226,7 +219,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -254,7 +247,6 @@ export async function collateralFixture( 'stat' + symbol ) ) - const coll = await ATokenCollateralFactory.deploy( { priceTimeout: PRICE_TIMEOUT, @@ -262,7 +254,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: staticErc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -288,13 +280,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await coll.refresh() return [erc20, coll] @@ -322,13 +314,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) await coll.refresh() @@ -347,7 +339,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -379,7 +371,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -407,13 +399,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await coll.refresh() return [erc20, coll] @@ -592,7 +584,7 @@ type RSRAndCompAaveAndCollateralAndModuleFixture = RSRFixture & CollateralFixture & ModuleFixture -export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { +interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixture { config: IConfig dist: IRevenueShare deployer: TestIDeployer @@ -611,7 +603,6 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt facade: FacadeRead facadeAct: FacadeAct facadeTest: FacadeTest - facadeMonitor: FacadeMonitor broker: TestIBroker rsrTrader: TestIRevenueTrader rTokenTrader: TestIRevenueTrader @@ -672,11 +663,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = }, } - // Setup Monitor Params based on network - const monitorParams: IMonitorParams = { - AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, - } - // Deploy FacadeRead const FacadeReadFactory: ContractFactory = await ethers.getContractFactory('FacadeRead') const facade = await FacadeReadFactory.deploy() @@ -689,10 +675,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() - // Deploy FacadeMonitor - Use implementation to simplify deployments - const FacadeMonitorFactory: ContractFactory = await ethers.getContractFactory('FacadeMonitor') - const facadeMonitor = await FacadeMonitorFactory.deploy(monitorParams) - // Deploy TradingLib external library const TradingLibFactory: ContractFactory = await ethers.getContractFactory( 'RecollateralizationLibP1' @@ -714,7 +696,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await rsrAsset.refresh() @@ -838,7 +820,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await aaveAsset.refresh() @@ -852,7 +834,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await compAsset.refresh() @@ -948,7 +930,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, facadeAct, facadeTest, - facadeMonitor, rsrTrader, rTokenTrader, } diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index f5b5dff068..c575f48e3d 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -5,7 +5,6 @@ const forkBlockNumber = { 'mainnet-deployment': 15690042, // Ethereum 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum - 'facade-monitor': 18742016, // Ethereum default: 18522901, // Ethereum } diff --git a/test/monitor/FacadeMonitor.test.ts b/test/monitor/FacadeMonitor.test.ts deleted file mode 100644 index 45b7bf1d22..0000000000 --- a/test/monitor/FacadeMonitor.test.ts +++ /dev/null @@ -1,1417 +0,0 @@ -import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' -import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { expect } from 'chai' -import { BigNumber, Contract } from 'ethers' -import hre, { ethers } from 'hardhat' -import { Collateral, IMPLEMENTATION } from '../fixtures' -import { defaultFixtureNoBasket, DefaultFixture } from '../integration/fixtures' -import { getChainId } from '../../common/blockchain-utils' -import { IConfig, baseL2Chains, networkConfig } from '../../common/configuration' -import { bn, fp, toBNDecimals } from '../../common/numbers' -import { advanceTime } from '../utils/time' -import { whileImpersonating } from '../utils/impersonation' -import { pushOracleForward } from '../utils/oracles' - -import forkBlockNumber from '../integration/fork-block-numbers' -import { - ATokenFiatCollateral, - AaveV3FiatCollateral, - CTokenV3Collateral, - CTokenFiatCollateral, - ERC20Mock, - FacadeTest, - FacadeMonitor, - FiatCollateral, - IAToken, - IComptroller, - IERC20, - ILendingPool, - IPool, - IWETH, - StaticATokenLM, - IAssetRegistry, - TestIBackingManager, - TestIBasketHandler, - TestICToken, - TestIRToken, - USDCMock, - CTokenWrapper, - StaticATokenV3LM, - CusdcV3Wrapper, - CometInterface, - StargateRewardableWrapper, - StargatePoolFiatCollateral, - IStargatePool, - MorphoAaveV2TokenisedDeposit, -} from '../../typechain' -import { useEnv } from '#/utils/env' -import { MAX_UINT256 } from '#/common/constants' - -enum CollPluginType { - AAVE_V2, - AAVE_V3, - COMPOUND_V2, - COMPOUND_V3, - STARGATE, - FLUX, - MORPHO_AAVE_V2, -} - -// Relevant addresses (Mainnet) -const holderDAI = '0x075e72a5eDf65F0A5f44699c7654C1a76941Ddc8' -const holderCDAI = '0x01d127D90513CCB6071F83eFE15611C4d9890668' -const holderADAI = '0x07edE94cF6316F4809f2B725f5d79AD303fB4Dc8' -const holderaUSDCV3 = '0x1eAb3B222A5B57474E0c237E7E1C4312C1066855' -const holderWETH = '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' -const holdercUSDCV3 = '0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03' -const holdersUSDC = '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b' -const holderfUSDC = '0x86A07dDED024121b282362f4e7A249b00F5dAB37' -const holderUSDC = '0x28C6c06298d514Db089934071355E5743bf21d60' - -let owner: SignerWithAddress - -const describeFork = useEnv('FORK') ? describe : describe.skip - -describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, function () { - let addr1: SignerWithAddress - let addr2: SignerWithAddress - - // Assets - let collateral: Collateral[] - - // Tokens and Assets - let dai: ERC20Mock - let aDai: IAToken - let stataDai: StaticATokenLM - let usdc: USDCMock - let aUsdcV3: IAToken - let sUsdc: IStargatePool - let fUsdc: TestICToken - let weth: IWETH - let cDai: TestICToken - let cDaiVault: CTokenWrapper - let cusdcV3: CometInterface - let daiCollateral: FiatCollateral - let aDaiCollateral: ATokenFiatCollateral - - // Contracts to retrieve after deploy - let rToken: TestIRToken - let facadeTest: FacadeTest - let facadeMonitor: FacadeMonitor - let assetRegistry: IAssetRegistry - let basketHandler: TestIBasketHandler - let backingManager: TestIBackingManager - let config: IConfig - - let initialBal: BigNumber - let basket: Collateral[] - let erc20s: IERC20[] - - let fullLiquidityAmt: BigNumber - let chainId: number - - // Setup test environment - const setup = async (blockNumber: number) => { - // Use Mainnet fork - await hre.network.provider.request({ - method: 'hardhat_reset', - params: [ - { - forking: { - jsonRpcUrl: useEnv('MAINNET_RPC_URL'), - blockNumber: blockNumber, - }, - }, - ], - }) - } - - describe('FacadeMonitor', () => { - before(async () => { - await setup(forkBlockNumber['facade-monitor']) - - chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - }) - - beforeEach(async () => { - ;[owner, addr1, addr2] = await ethers.getSigners() - ;({ - erc20s, - collateral, - basket, - assetRegistry, - basketHandler, - backingManager, - rToken, - facadeTest, - facadeMonitor, - config, - } = await loadFixture(defaultFixtureNoBasket)) - - // Get tokens - dai = erc20s[0] // DAI - cDaiVault = erc20s[6] // cDAI - cDai = await ethers.getContractAt('TestICToken', await cDaiVault.underlying()) // cDAI - stataDai = erc20s[10] // static aDAI - - // Get plain aTokens - aDai = ( - await ethers.getContractAt( - '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', - networkConfig[chainId].tokens.aDAI || '' - ) - ) - - // Get collaterals - daiCollateral = collateral[0] // DAI - aDaiCollateral = collateral[10] // aDAI - - // Get assets and tokens for default basket - daiCollateral = basket[0] - aDaiCollateral = basket[1] - - dai = await ethers.getContractAt('ERC20Mock', await daiCollateral.erc20()) - stataDai = ( - await ethers.getContractAt('StaticATokenLM', await aDaiCollateral.erc20()) - ) - - // Get plain aToken - aDai = ( - await ethers.getContractAt( - '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', - networkConfig[chainId].tokens.aDAI || '' - ) - ) - - usdc = ( - await ethers.getContractAt('USDCMock', networkConfig[chainId].tokens.USDC || '') - ) - aUsdcV3 = await ethers.getContractAt( - '@aave/protocol-v2/contracts/interfaces/IAToken.sol:IAToken', // use V2 interface, it includes ERC20 - networkConfig[chainId].tokens.aEthUSDC || '' - ) - - cusdcV3 = ( - await ethers.getContractAt('CometInterface', networkConfig[chainId].tokens.cUSDCv3 || '') - ) - - sUsdc = ( - await ethers.getContractAt('IStargatePool', networkConfig[chainId].tokens.sUSDC || '') - ) - - fUsdc = ( - await ethers.getContractAt('TestICToken', networkConfig[chainId].tokens.fUSDC || '') - ) - - initialBal = bn('2500000e18') - - // Fund user with static aDAI - await whileImpersonating(holderADAI, async (adaiSigner) => { - // Wrap ADAI into static ADAI - await aDai.connect(adaiSigner).transfer(addr1.address, initialBal) - await aDai.connect(addr1).approve(stataDai.address, initialBal) - await stataDai.connect(addr1).deposit(addr1.address, initialBal, 0, false) - }) - - // Fund user with aUSDCV3 - await whileImpersonating(holderaUSDCV3, async (ausdcV3Signer) => { - await aUsdcV3.connect(ausdcV3Signer).transfer(addr1.address, toBNDecimals(initialBal, 6)) - }) - - // Fund user with DAI - await whileImpersonating(holderDAI, async (daiSigner) => { - await dai.connect(daiSigner).transfer(addr1.address, initialBal.mul(8)) - }) - - // Fund user with cDAI - await whileImpersonating(holderCDAI, async (cdaiSigner) => { - await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) - await cDai.connect(addr1).approve(cDaiVault.address, toBNDecimals(initialBal, 8).mul(100)) - await cDaiVault.connect(addr1).deposit(toBNDecimals(initialBal, 8).mul(100), addr1.address) - }) - - // Fund user with cUSDCV3 - await whileImpersonating(holdercUSDCV3, async (cusdcV3Signer) => { - await cusdcV3.connect(cusdcV3Signer).transfer(addr1.address, toBNDecimals(initialBal, 6)) - }) - - // Fund user with sUSDC - await whileImpersonating(holdersUSDC, async (susdcSigner) => { - await sUsdc.connect(susdcSigner).transfer(addr1.address, toBNDecimals(initialBal, 6)) - }) - - // Fund user with fUSDC - await whileImpersonating(holderfUSDC, async (fusdcSigner) => { - await fUsdc - .connect(fusdcSigner) - .transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) - }) - - // Fund user with USDC - await whileImpersonating(holderUSDC, async (usdcSigner) => { - await usdc.connect(usdcSigner).transfer(addr1.address, toBNDecimals(initialBal, 6)) - }) - - // Fund user with WETH - weth = await ethers.getContractAt('IWETH', networkConfig[chainId].tokens.WETH || '') - await whileImpersonating(holderWETH, async (signer) => { - await weth.connect(signer).transfer(addr1.address, fp('500000')) - }) - }) - - describe('AAVE V2', () => { - const issueAmount: BigNumber = bn('1000000e18') - let lendingPool: ILendingPool - let aaveV2DataProvider: Contract - - beforeEach(async () => { - // Setup basket - await basketHandler.connect(owner).setPrimeBasket([stataDai.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await stataDai.connect(addr1).approve(rToken.address, issueAmount) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - - lendingPool = ( - await ethers.getContractAt('ILendingPool', networkConfig[chainId].AAVE_LENDING_POOL || '') - ) - - const aaveV2DataProviderAbi = [ - 'function getReserveData(address asset) external view returns (uint256 availableLiquidity,uint256 totalStableDebt,uint256 totalVariableDebt,uint256 liquidityRate,uint256 variableBorrowRate,uint256 stableBorrowRate,uint256 averageStableBorrowRate,uint256 liquidityIndex,uint256 variableBorrowIndex,uint40 lastUpdateTimestamp)', - ] - aaveV2DataProvider = await ethers.getContractAt( - aaveV2DataProviderAbi, - networkConfig[chainId].AAVE_DATA_PROVIDER || '' - ) - - // Get current liquidity - ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider - .connect(addr1) - .getReserveData(dai.address) - - // Provide liquidity in AAVE V2 to be able to borrow - const amountToDeposit = fp('500000') - await weth.connect(addr1).approve(lendingPool.address, amountToDeposit) - await lendingPool.connect(addr1).deposit(weth.address, amountToDeposit, addr1.address, 0) - }) - - it('Should return 100% when full liquidity available', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // AAVE V2 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V2, - stataDai.address - ) - ).to.equal(fp('1')) - - // Confirm all can be redeemed - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) - await expect(lendingPool.connect(addr2).withdraw(dai.address, MAX_UINT256, addr2.address)) - .to.not.be.reverted - expect(await dai.balanceOf(addr2.address)).to.be.gt(bn(0)) - expect(await aDai.balanceOf(addr2.address)).to.equal(bn(0)) - }) - - it('Should return backing redeemable percent correctly', async function () { - // AAVE V2 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V2, - stataDai.address - ) - ).to.equal(fp('1')) - - // Leave only 80% of backing available to be redeemed - const borrowAmount = fullLiquidityAmt.sub(issueAmount.mul(80).div(100)) - await lendingPool.connect(addr1).borrow(dai.address, borrowAmount, 2, 0, addr1.address) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V2, - stataDai.address - ) - ).to.be.closeTo(fp('0.80'), fp('0.01')) - - // Borrow half of the remaining liquidity - const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) - await lendingPool - .connect(addr1) - .borrow(dai.address, remainingLiquidity.div(2), 2, 0, addr1.address) - - // Now only 40% is available to be redeemed - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V2, - stataDai.address - ) - ).to.be.closeTo(fp('0.40'), fp('0.01')) - - // Confirm we cannot redeem full balance - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) - await expect(lendingPool.connect(addr2).withdraw(dai.address, MAX_UINT256, addr2.address)) - .to.be.reverted - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - - // But we can redeem if we reduce the amount to 30% - await expect( - lendingPool - .connect(addr2) - .withdraw( - dai.address, - (await aDai.balanceOf(addr2.address)).mul(30).div(100), - addr2.address - ) - ).to.not.be.reverted - expect(await dai.balanceOf(addr2.address)).to.be.gt(0) - }) - - it('Should handle no liquidity', async function () { - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V2, - stataDai.address - ) - ).to.equal(fp('1')) - - // Borrow full liquidity - await lendingPool.connect(addr1).borrow(dai.address, fullLiquidityAmt, 2, 0, addr1.address) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V2, - stataDai.address - ) - ).to.be.closeTo(fp('0'), fp('0.01')) - - // Confirm we cannot redeem anything, not even 1% - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await stataDai.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await stataDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await stataDai.connect(addr2).withdraw(addr2.address, bmBalanceAmt, false) - await expect( - lendingPool - .connect(addr2) - .withdraw(dai.address, (await aDai.balanceOf(addr2.address)).div(100), addr2.address) - ).to.be.reverted - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - }) - }) - - describe('AAVE V3', () => { - const issueAmount: BigNumber = bn('1000000e18') - let stataUsdcV3: StaticATokenV3LM - let pool: IPool - - beforeEach(async () => { - const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') - stataUsdcV3 = await StaticATokenFactory.deploy( - networkConfig[chainId].AAVE_V3_POOL!, - networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! - ) - - await stataUsdcV3.deployed() - await ( - await stataUsdcV3.initialize( - networkConfig[chainId].tokens.aEthUSDC!, - 'Static Aave Ethereum USDC', - 'saEthUSDC' - ) - ).wait() - - /******** Deploy Aave V3 USDC collateral plugin **************************/ - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% - - const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') - const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') - const collateral = await CollateralFactory.connect(owner).deploy( - { - priceTimeout: bn('604800'), - chainlinkFeed: chainlinkFeed.address, - oracleError: usdcOracleError, - erc20: stataUsdcV3.address, - maxTradeVolume: fp('1e6'), - oracleTimeout: usdcOracleTimeout, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(usdcOracleError), - delayUntilDefault: bn('86400'), - }, - fp('1e-6') - ) - - // Register and update collateral - await collateral.deployed() - await (await collateral.refresh()).wait() - await pushOracleForward(chainlinkFeed.address) - await assetRegistry.connect(owner).register(collateral.address) - - // Wrap aUsdcV3 - await aUsdcV3.connect(addr1).approve(stataUsdcV3.address, toBNDecimals(initialBal, 6)) - await stataUsdcV3 - .connect(addr1) - ['deposit(uint256,address,uint16,bool)']( - toBNDecimals(initialBal, 6), - addr1.address, - 0, - false - ) - - // Get current liquidity - fullLiquidityAmt = await usdc.balanceOf(aUsdcV3.address) - - // Setup basket - await pushOracleForward(chainlinkFeed.address) - await basketHandler.connect(owner).setPrimeBasket([stataUsdcV3.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await stataUsdcV3.connect(addr1).approve(rToken.address, issueAmount) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - await pushOracleForward(chainlinkFeed.address) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - - pool = await ethers.getContractAt('IPool', networkConfig[chainId].AAVE_V3_POOL || '') - - // Provide liquidity to be able to borrow - const amountToDeposit = fp('500000') - await weth.connect(addr1).approve(pool.address, amountToDeposit) - await pool.connect(addr1).supply(weth.address, amountToDeposit, addr1.address, 0) - }) - - it('Should return 100% when full liquidity available', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // AAVE V3 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V3, - stataUsdcV3.address - ) - ).to.equal(fp('1')) - - // Confirm all can be redeemed - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await stataUsdcV3 - .connect(addr2) - ['redeem(uint256,address,address,bool)']( - bmBalanceAmt, - addr2.address, - addr2.address, - false - ) - await expect(pool.connect(addr2).withdraw(usdc.address, MAX_UINT256, addr2.address)).to.not - .be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) - expect(await aUsdcV3.balanceOf(addr2.address)).to.equal(bn(0)) - }) - - it('Should return backing redeemable percent correctly', async function () { - // AAVE V3 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V3, - stataUsdcV3.address - ) - ).to.equal(fp('1')) - - // Leave only 80% of backing to be able to be redeemed - const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) - await pool.connect(addr1).borrow(usdc.address, borrowAmount, 2, 0, addr1.address) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V3, - stataUsdcV3.address - ) - ).to.be.closeTo(fp('0.80'), fp('0.01')) - - // Borrow half of the remaining liquidity - const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) - await pool - .connect(addr1) - .borrow(usdc.address, remainingLiquidity.div(2), 2, 0, addr1.address) - - // Only 40% available to be redeemed - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V3, - stataUsdcV3.address - ) - ).to.be.closeTo(fp('0.40'), fp('0.01')) - - // Confirm we cannot redeem full balance - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await stataUsdcV3 - .connect(addr2) - ['redeem(uint256,address,address,bool)']( - bmBalanceAmt, - addr2.address, - addr2.address, - false - ) - await expect(pool.connect(addr2).withdraw(usdc.address, MAX_UINT256, addr2.address)).to.be - .reverted - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - - // We can redeem if we reduce to 30% - await expect( - pool - .connect(addr2) - .withdraw( - usdc.address, - (await aUsdcV3.balanceOf(addr2.address)).mul(30).div(100), - addr2.address - ) - ).to.not.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) - }) - - it('Should handle no liquidity', async function () { - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V3, - stataUsdcV3.address - ) - ).to.equal(fp('1')) - - // Borrow full liquidity - await pool.connect(addr1).borrow(usdc.address, fullLiquidityAmt, 2, 0, addr1.address) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.AAVE_V3, - stataUsdcV3.address - ) - ).to.be.closeTo(fp('0'), fp('0.01')) - - // Confirm we cannot redeem anything, not even 1% - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await stataUsdcV3.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await stataUsdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await stataUsdcV3 - .connect(addr2) - ['redeem(uint256,address,address,bool)']( - bmBalanceAmt, - addr2.address, - addr2.address, - false - ) - await expect( - pool - .connect(addr2) - .withdraw( - usdc.address, - (await aUsdcV3.balanceOf(addr2.address)).div(100), - addr2.address - ) - ).to.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - }) - }) - - describe('Compound V2', () => { - const issueAmount: BigNumber = bn('1000000e18') - let comptroller: IComptroller - - beforeEach(async () => { - // Setup basket - await basketHandler.connect(owner).setPrimeBasket([cDaiVault.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await cDaiVault - .connect(addr1) - .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - - // Get current liquidity - fullLiquidityAmt = await dai.balanceOf(cDai.address) - - // Compound Comptroller - comptroller = await ethers.getContractAt( - 'ComptrollerMock', - networkConfig[chainId].COMPTROLLER || '' - ) - - // Deposit ETH to be able to borrow - const cEtherAbi = [ - 'function mint(uint256 mintAmount) external payable returns (uint256)', - 'function balanceOf(address owner) external view returns (uint256 balance)', - ] - const cEth = await ethers.getContractAt(cEtherAbi, networkConfig[chainId].tokens.cETH || '') - await comptroller.connect(addr1).enterMarkets([cEth.address]) - const amountToDeposit = fp('500000') - await weth.connect(addr1).withdraw(amountToDeposit) - await cEth.connect(addr1).mint(amountToDeposit, { value: amountToDeposit }) - }) - - it('Should return 100% when full liquidity available', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // COMPOUND V2 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V2, - cDaiVault.address - ) - ).to.equal(fp('1')) - - // Confirm all can be redeemed - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) - expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) - - await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted - expect(await dai.balanceOf(addr2.address)).to.be.gt(bn(0)) - expect(await cDai.balanceOf(addr2.address)).to.equal(bn(0)) - }) - - it('Should return backing redeemable percent correctly', async function () { - // COMPOUND V2 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V2, - cDaiVault.address - ) - ).to.equal(fp('1')) - - // Leave only 80% of backing to be able to be redeemed - const borrowAmount = fullLiquidityAmt.sub(issueAmount.mul(80).div(100)) - await cDai.connect(addr1).borrow(borrowAmount) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V2, - cDaiVault.address - ) - ).to.be.closeTo(fp('0.80'), fp('0.01')) - - // Borrow half of the remaining liquidity - const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) - await cDai.connect(addr1).borrow(bn(remainingLiquidity.div(2))) - - // Now only 40% of backing can be redeemed - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V2, - cDaiVault.address - ) - ).to.be.closeTo(fp('0.40'), fp('0.01')) - - // Confirm we cannot redeem full balance - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) - await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.be.reverted - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - - // We can redeem iff we reduce to 30% - await expect(cDai.connect(addr2).redeem(bmBalanceAmt.mul(30).div(100))).to.not.be.reverted - expect(await dai.balanceOf(addr2.address)).to.be.gt(0) - }) - - it('Should handle no liquidity', async function () { - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V2, - cDaiVault.address - ) - ).to.equal(fp('1')) - - // Borrow full liquidity - await cDai.connect(addr1).borrow(fullLiquidityAmt) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V2, - cDaiVault.address - ) - ).to.be.closeTo(fp('0'), fp('0.01')) - - // Confirm we cannot redeem anything, not even 1% - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) - expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) - - await expect(cDai.connect(addr2).redeem((await cDai.balanceOf(addr2.address)).div(100))).to - .be.reverted - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - }) - }) - - describe('Compound V3', () => { - const issueAmount: BigNumber = bn('1000000e18') - let wcusdcV3: CusdcV3Wrapper - - beforeEach(async () => { - const CUsdcV3WrapperFactory = await hre.ethers.getContractFactory('CusdcV3Wrapper') - - wcusdcV3 = ( - await CUsdcV3WrapperFactory.deploy( - cusdcV3.address, - networkConfig[chainId].COMET_REWARDS || '', - networkConfig[chainId].tokens.COMP || '' - ) - ) - await wcusdcV3.deployed() - - /******** Deploy Compound V3 USDC collateral plugin **************************/ - const CollateralFactory = await ethers.getContractFactory('CTokenV3Collateral') - - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% - - const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') - const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const collateral = await CollateralFactory.connect(owner).deploy( - { - priceTimeout: bn('604800'), - chainlinkFeed: chainlinkFeed.address, - oracleError: usdcOracleError.toString(), - erc20: wcusdcV3.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h hr, - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(usdcOracleError).toString(), - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-6'), - bn('10000e6').toString() // $10k - ) - - // Register and update collateral - await collateral.deployed() - await (await collateral.refresh()).wait() - await pushOracleForward(chainlinkFeed.address) - await assetRegistry.connect(owner).register(collateral.address) - - // Wrap cUSDCV3 - await cusdcV3.connect(addr1).allow(wcusdcV3.address, true) - await wcusdcV3.connect(addr1).deposit(toBNDecimals(initialBal, 6)) - - // Get current liquidity - fullLiquidityAmt = await usdc.balanceOf(cusdcV3.address) - - // Setup basket - await pushOracleForward(chainlinkFeed.address) - await basketHandler.connect(owner).setPrimeBasket([wcusdcV3.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await wcusdcV3.connect(addr1).approve(rToken.address, MAX_UINT256) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - await pushOracleForward(chainlinkFeed.address) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - - // Provide liquidity to be able to borrow - const amountToDeposit = fp('500000') - await weth.connect(addr1).approve(cusdcV3.address, amountToDeposit) - await cusdcV3.connect(addr1).supply(weth.address, amountToDeposit.div(2)) - }) - - it('Should return 100% when full liquidity available', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // Compound V3 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V3, - wcusdcV3.address - ) - ).to.equal(fp('1')) - - // Confirm all can be redeemed - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) - - await expect(cusdcV3.connect(addr2).withdraw(usdc.address, MAX_UINT256)).to.not.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) - expect(await cusdcV3.balanceOf(addr2.address)).to.equal(bn(0)) - }) - - it('Should return backing redeemable percent correctly', async function () { - // AAVE V3 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V3, - wcusdcV3.address - ) - ).to.equal(fp('1')) - - // Leave only 80% of backing to be able to be redeemed - const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) - await cusdcV3.connect(addr1).withdraw(usdc.address, borrowAmount) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V3, - wcusdcV3.address - ) - ).to.be.closeTo(fp('0.80'), fp('0.01')) - - // Borrow half of the remaining liquidity - const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) - await cusdcV3.connect(addr1).withdraw(usdc.address, remainingLiquidity.div(2)) - - // Only 40% available to be redeemed - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V3, - wcusdcV3.address - ) - ).to.be.closeTo(fp('0.40'), fp('0.01')) - - // Confirm we cannot redeem full balance - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) - - await expect(cusdcV3.connect(addr2).withdraw(usdc.address, MAX_UINT256)).to.be.reverted - expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - - // We can redeem if we reduce to 30% - await expect( - cusdcV3 - .connect(addr2) - .withdraw(usdc.address, (await cusdcV3.balanceOf(addr2.address)).mul(30).div(100)) - ).to.not.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) - }) - - it('Should handle no liquidity', async function () { - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V3, - wcusdcV3.address - ) - ).to.equal(fp('1')) - - // Borrow full liquidity - await cusdcV3.connect(addr1).withdraw(usdc.address, fullLiquidityAmt) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.COMPOUND_V3, - wcusdcV3.address - ) - ).to.be.closeTo(fp('0'), fp('0.01')) - - // Confirm we cannot redeem anything, not even 1% - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await wcusdcV3.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await wcusdcV3.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await wcusdcV3.connect(addr2).withdraw(MAX_UINT256) - - await expect( - cusdcV3 - .connect(addr2) - .withdraw(usdc.address, (await cusdcV3.balanceOf(addr2.address)).div(100)) - ).to.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - }) - }) - - describe('Stargate', () => { - const issueAmount: BigNumber = bn('1000000e18') - let wstgUsdc: StargateRewardableWrapper - - beforeEach(async () => { - const SthWrapperFactory = await hre.ethers.getContractFactory('StargateRewardableWrapper') - - wstgUsdc = await SthWrapperFactory.deploy( - 'Wrapped Stargate USDC', - 'wsgUSDC', - networkConfig[chainId].tokens.STG!, - networkConfig[chainId].STARGATE_STAKING_CONTRACT!, - networkConfig[chainId].tokens.sUSDC! - ) - await wstgUsdc.deployed() - - /******** Deploy Stargate USDC collateral plugin **************************/ - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% - - const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') - const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const CollateralFactory = await hre.ethers.getContractFactory('StargatePoolFiatCollateral') - const collateral = await CollateralFactory.connect( - owner - ).deploy( - { - priceTimeout: bn('604800'), - chainlinkFeed: chainlinkFeed.address, - oracleError: usdcOracleError, - erc20: wstgUsdc.address, - maxTradeVolume: fp('1e6'), - oracleTimeout: usdcOracleTimeout, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(usdcOracleError), - delayUntilDefault: bn('86400'), - }, - fp('1e-6') - ) - - // Register and update collateral - await collateral.deployed() - await (await collateral.refresh()).wait() - await pushOracleForward(chainlinkFeed.address) - await assetRegistry.connect(owner).register(collateral.address) - - // Wrap sUsdc - await sUsdc.connect(addr1).approve(wstgUsdc.address, toBNDecimals(initialBal, 6)) - await wstgUsdc.connect(addr1).deposit(toBNDecimals(initialBal, 6), addr1.address) - - // Get current liquidity - fullLiquidityAmt = await sUsdc.totalLiquidity() - - // Setup basket - await pushOracleForward(chainlinkFeed.address) - await basketHandler.connect(owner).setPrimeBasket([wstgUsdc.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await wstgUsdc.connect(addr1).approve(rToken.address, issueAmount) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - await pushOracleForward(chainlinkFeed.address) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - }) - - it('Should return 100%, full liquidity available at all times', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // AAVE V3 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.STARGATE, - wstgUsdc.address - ) - ).to.equal(fp('1')) - }) - }) - - describe('Flux', () => { - const issueAmount: BigNumber = bn('1000000e18') - - beforeEach(async () => { - /******** Deploy Flux USDC collateral plugin **************************/ - const CollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') - - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% - - const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') - const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const collateral = await CollateralFactory.connect(owner).deploy( - { - priceTimeout: bn('604800'), - chainlinkFeed: chainlinkFeed.address, - oracleError: usdcOracleError.toString(), - erc20: fUsdc.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h hr, - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(usdcOracleError).toString(), - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-6') - ) - - // Register and update collateral - await collateral.deployed() - await (await collateral.refresh()).wait() - await pushOracleForward(chainlinkFeed.address) - await assetRegistry.connect(owner).register(collateral.address) - - // Get current liquidity - fullLiquidityAmt = await usdc.balanceOf(fUsdc.address) - - // Setup basket - await pushOracleForward(chainlinkFeed.address) - await basketHandler.connect(owner).setPrimeBasket([fUsdc.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await fUsdc.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - await pushOracleForward(chainlinkFeed.address) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - }) - - it('Should return 100% when full liquidity available', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // FLUX - All redeemable - expect( - await facadeMonitor.backingReedemable(rToken.address, CollPluginType.FLUX, fUsdc.address) - ).to.equal(fp('1')) - - // Confirm all can be redeemed - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await fUsdc.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await fUsdc.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - await expect(fUsdc.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) - expect(await fUsdc.balanceOf(addr2.address)).to.equal(bn(0)) - }) - }) - - describe('MORPHO - AAVE V2', () => { - const issueAmount: BigNumber = bn('1000000e18') - let lendingPool: ILendingPool - let maUSDC: MorphoAaveV2TokenisedDeposit - let aaveV2DataProvider: Contract - - beforeEach(async () => { - /******** Deploy Morpho AAVE V2 USDC collateral plugin **************************/ - const MorphoTokenisedDepositFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDeposit' - ) - maUSDC = await MorphoTokenisedDepositFactory.deploy({ - morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, - underlyingERC20: networkConfig[chainId].tokens.USDC!, - poolToken: networkConfig[chainId].tokens.aUSDC!, - rewardToken: networkConfig[chainId].tokens.MORPHO!, - }) - - const CollateralFactory = await hre.ethers.getContractFactory('MorphoFiatCollateral') - - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% - const baseStableConfig = { - priceTimeout: bn('604800').toString(), - oracleError: usdcOracleError.toString(), - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: usdcOracleTimeout, // 24h - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: usdcOracleError.add(fp('0.01')), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - } - const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') - const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const collateral = await CollateralFactory.connect(owner).deploy( - { - ...baseStableConfig, - chainlinkFeed: chainlinkFeed.address, - erc20: maUSDC.address, - }, - fp('1e-6') - ) - - // Register and update collateral - await collateral.deployed() - await (await collateral.refresh()).wait() - await pushOracleForward(chainlinkFeed.address) - await assetRegistry.connect(owner).register(collateral.address) - - const aaveV2DataProviderAbi = [ - 'function getReserveData(address asset) external view returns (uint256 availableLiquidity,uint256 totalStableDebt,uint256 totalVariableDebt,uint256 liquidityRate,uint256 variableBorrowRate,uint256 stableBorrowRate,uint256 averageStableBorrowRate,uint256 liquidityIndex,uint256 variableBorrowIndex,uint40 lastUpdateTimestamp)', - ] - aaveV2DataProvider = await ethers.getContractAt( - aaveV2DataProviderAbi, - networkConfig[chainId].AAVE_DATA_PROVIDER || '' - ) - - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - - // Wrap maUSDC - await usdc.connect(addr1).approve(maUSDC.address, 0) - await usdc.connect(addr1).approve(maUSDC.address, MAX_UINT256) - await maUSDC.connect(addr1).mint(toBNDecimals(initialBal, 15), addr1.address) - - // Setup basket - await pushOracleForward(chainlinkFeed.address) - await basketHandler.connect(owner).setPrimeBasket([maUSDC.address], [fp('1')]) - await basketHandler.connect(owner).refreshBasket() - await advanceTime(Number(config.warmupPeriod) + 1) - - // Provide approvals - await maUSDC.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 15)) - - // Advance time significantly - Recharge throttle - await advanceTime(100000) - await pushOracleForward(chainlinkFeed.address) - - // Issue rTokens - await rToken.connect(addr1).issue(issueAmount) - - lendingPool = ( - await ethers.getContractAt('ILendingPool', networkConfig[chainId].AAVE_LENDING_POOL || '') - ) - - // Provide liquidity in AAVE V2 to be able to borrow - const amountToDeposit = fp('500000') - await weth.connect(addr1).approve(lendingPool.address, amountToDeposit) - await lendingPool.connect(addr1).deposit(weth.address, amountToDeposit, addr1.address, 0) - }) - - it('Should return 100% when full liquidity available', async function () { - // Check asset value - expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( - issueAmount, - fp('150') - ) - - // MORPHO AAVE V2 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - ).to.equal(fp('1')) - - // Confirm all can be redeemed - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) - await expect(maUSDC.connect(addr2).withdraw(maxWithdraw, addr2.address, addr2.address)).to - .not.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(bn(0)) - }) - - it('Should return backing redeemable percent correctly', async function () { - // MORPHO AAVE V2 - All redeemable - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - ).to.equal(fp('1')) - - // Get current liquidity from Aave V2 (Morpho relies on this) - ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider - .connect(addr1) - .getReserveData(usdc.address) - - // Leave only 80% of backing available to be redeemed - const borrowAmount = fullLiquidityAmt.sub(toBNDecimals(issueAmount, 6).mul(80).div(100)) - await lendingPool.connect(addr1).borrow(usdc.address, borrowAmount, 2, 0, addr1.address) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - ).to.be.closeTo(fp('0.80'), fp('0.01')) - - // Borrow half of the remaining liquidity - const remainingLiquidity = fullLiquidityAmt.sub(borrowAmount) - await lendingPool - .connect(addr1) - .borrow(usdc.address, remainingLiquidity.div(2), 2, 0, addr1.address) - - // Now only 40% is available to be redeemed - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - ).to.be.closeTo(fp('0.40'), fp('0.01')) - - // Confirm we cannot redeem full balance - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) - await expect(maUSDC.connect(addr2).withdraw(maxWithdraw, addr2.address, addr2.address)).to - .be.reverted - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - - // But we can redeem if we reduce the amount to 30% - await expect( - maUSDC.connect(addr2).withdraw(maxWithdraw.mul(30).div(100), addr2.address, addr2.address) - ).to.not.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.be.gt(0) - }) - - it('Should handle no liquidity', async function () { - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - ).to.equal(fp('1')) - - // Get current liquidity from Aave V2 (Morpho relies on this) - ;[fullLiquidityAmt, , , , , , , , ,] = await aaveV2DataProvider - .connect(addr1) - .getReserveData(usdc.address) - - // Borrow full liquidity - await lendingPool.connect(addr1).borrow(usdc.address, fullLiquidityAmt, 2, 0, addr1.address) - - expect( - await facadeMonitor.backingReedemable( - rToken.address, - CollPluginType.MORPHO_AAVE_V2, - maUSDC.address - ) - ).to.be.closeTo(fp('0'), fp('0.01')) - - // Confirm we cannot redeem anything, not even 1% - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await maUSDC.balanceOf(backingManager.address) - await whileImpersonating(backingManager.address, async (bmSigner) => { - await maUSDC.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) - }) - const maxWithdraw = await maUSDC.maxWithdraw(addr2.address) - await expect( - maUSDC.connect(addr2).withdraw(maxWithdraw.div(100), addr2.address, addr2.address) - ).to.be.reverted - expect(await usdc.balanceOf(addr2.address)).to.equal(bn(0)) - }) - }) - }) -}) diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 5d801071a7..0a534ae9cc 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -7,14 +7,11 @@ import { advanceBlocks, advanceTime, getLatestBlockTimestamp, - getLatestBlockNumber, setNextBlockTimestamp, } from '../utils/time' -import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192, TradeKind } from '../../common/constants' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../common/constants' import { bn, fp } from '../../common/numbers' import { - expectDecayedPrice, - expectExactPrice, expectPrice, expectRTokenPrice, expectUnpriced, @@ -29,15 +26,12 @@ import { CTokenWrapperMock, ERC20Mock, FiatCollateral, - GnosisMock, IAssetRegistry, InvalidFiatCollateral, InvalidMockV3Aggregator, RTokenAsset, StaticATokenMock, TestIBackingManager, - TestIBasketHandler, - TestIFurnace, TestIRToken, USDCMock, UnpricedAssetMock, @@ -48,12 +42,10 @@ import { IMPLEMENTATION, Implementation, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, VERSION, } from '../fixtures' -import { getTrade } from '../utils/trades' import { useEnv } from '#/utils/env' import snapshotGasCost from '../utils/snapshotGasCost' @@ -94,16 +86,11 @@ describe('Assets contracts #fast', () => { let wallet: Wallet let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager - let basketHandler: TestIBasketHandler - let furnace: TestIFurnace // Factory let AssetFactory: ContractFactory let RTokenAssetFactory: ContractFactory - // Gnosis - let gnosis: GnosisMock - const amt = fp('1e4') before('create fixture loader', async () => { @@ -122,10 +109,7 @@ describe('Assets contracts #fast', () => { basket, assetRegistry, backingManager, - basketHandler, config, - gnosis, - furnace, rToken, rTokenAsset, } = await loadFixture(defaultFixture)) @@ -276,51 +260,34 @@ describe('Assets contracts #fast', () => { await setOraclePrice(compAsset.address, bn('0')) await setOraclePrice(aaveAsset.address, bn('0')) await setOraclePrice(rsrAsset.address, bn('0')) - await setOraclePrice(collateral0.address, bn('0')) - await setOraclePrice(collateral1.address, bn('0')) - - // Fallback prices should be initial prices - await expectExactPrice(compAsset.address, compInitPrice) - await expectExactPrice(rsrAsset.address, rsrInitPrice) - await expectExactPrice(aaveAsset.address, aaveInitPrice) - await expectExactPrice(rTokenAsset.address, rTokenInitPrice) - - // Advance past oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(compAsset.address, bn('0')) - await setOraclePrice(aaveAsset.address, bn('0')) - await setOraclePrice(rsrAsset.address, bn('0')) - await setOraclePrice(collateral0.address, bn('0')) - await setOraclePrice(collateral1.address, bn('0')) - await compAsset.refresh() - await rsrAsset.refresh() - await aaveAsset.refresh() - await collateral0.refresh() - await collateral1.refresh() - - // Prices should be decaying - await expectDecayedPrice(compAsset.address) - await expectDecayedPrice(rsrAsset.address) - await expectDecayedPrice(aaveAsset.address) - const p = await rTokenAsset.price() - expect(p[0]).to.be.gt(0) - expect(p[0]).to.be.lt(rTokenInitPrice[0]) - expect(p[1]).to.be.gt(rTokenInitPrice[1]) - expect(p[1]).to.be.lt(MAX_UINT192) - - // After price timeout, should be unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(compAsset.address, bn('0')) - await setOraclePrice(aaveAsset.address, bn('0')) - await setOraclePrice(rsrAsset.address, bn('0')) - await setOraclePrice(collateral0.address, bn('0')) - await setOraclePrice(collateral1.address, bn('0')) - // Should be unpriced now + // Should be unpriced await expectUnpriced(rsrAsset.address) await expectUnpriced(compAsset.address) await expectUnpriced(aaveAsset.address) + + // Fallback prices should be initial prices + let [lotLow, lotHigh] = await compAsset.lotPrice() + expect(lotLow).to.eq(compInitPrice[0]) + expect(lotHigh).to.eq(compInitPrice[1]) + ;[lotLow, lotHigh] = await rsrAsset.lotPrice() + expect(lotLow).to.eq(rsrInitPrice[0]) + expect(lotHigh).to.eq(rsrInitPrice[1]) + ;[lotLow, lotHigh] = await aaveAsset.lotPrice() + expect(lotLow).to.eq(aaveInitPrice[0]) + expect(lotHigh).to.eq(aaveInitPrice[1]) + + // Update values of underlying tokens of RToken to 0 + await setOraclePrice(collateral0.address, bn(0)) + await setOraclePrice(collateral1.address, bn(0)) + + // RTokenAsset should be unpriced now await expectUnpriced(rTokenAsset.address) + + // Should have initial lot price + ;[lotLow, lotHigh] = await rTokenAsset.lotPrice() + expect(lotLow).to.eq(rTokenInitPrice[0]) + expect(lotHigh).to.eq(rTokenInitPrice[1]) }) it('Should return 0 price for RTokenAsset in full haircut scenario', async () => { @@ -350,6 +317,12 @@ describe('Assets contracts #fast', () => { config.minTradeVolume.mul((await assetRegistry.erc20s()).length) ) expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) + + // Should have lot price, equal to price when feed works OK + const [lowPrice, highPrice] = await rTokenAsset.price() + const [lotLow, lotHigh] = await rTokenAsset.lotPrice() + expect(lotLow).to.equal(lowPrice) + expect(lotHigh).to.equal(highPrice) }) it('Should calculate trade min correctly', async () => { @@ -376,62 +349,38 @@ describe('Assets contracts #fast', () => { expect(await rTokenAsset.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) }) - it('Should remain at saved price if oracle is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + it('Should be unpriced if price is stale', async () => { + await advanceTime(ORACLE_TIMEOUT.toString()) - // lastSave should not be block timestamp after refresh - await rsrAsset.refresh() - await compAsset.refresh() - await aaveAsset.refresh() - expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - - // Check price - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) + // Check unpriced + await expectUnpriced(rsrAsset.address) + await expectUnpriced(compAsset.address) + await expectUnpriced(aaveAsset.address) }) - it('Should remain at saved price in case of invalid timestamp', async () => { + it('Should be unpriced in case of invalid timestamp', async () => { await setInvalidOracleTimestamp(rsrAsset.address) await setInvalidOracleTimestamp(compAsset.address) await setInvalidOracleTimestamp(aaveAsset.address) - // lastSave should not be block timestamp after refresh - await rsrAsset.refresh() - await compAsset.refresh() - await aaveAsset.refresh() - expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - - // Check price is still at saved price - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) + // Check unpriced + await expectUnpriced(rsrAsset.address) + await expectUnpriced(compAsset.address) + await expectUnpriced(aaveAsset.address) }) - it('Should remain at saved price in case of invalid answered round', async () => { + it('Should be unpriced in case of invalid answered round', async () => { await setInvalidOracleAnsweredRound(rsrAsset.address) await setInvalidOracleAnsweredRound(compAsset.address) await setInvalidOracleAnsweredRound(aaveAsset.address) - // lastSave should not be block timestamp after refresh - await rsrAsset.refresh() - await compAsset.refresh() - await aaveAsset.refresh() - expect(await rsrAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await compAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await aaveAsset.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - - // Check price is still at saved price - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(compAsset.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(aaveAsset.address, fp('1'), ORACLE_ERROR, false) + // Check unpriced + await expectUnpriced(rsrAsset.address) + await expectUnpriced(compAsset.address) + await expectUnpriced(aaveAsset.address) }) - it('Should handle reverting edge cases for RTokenAsset', async () => { + it('Should handle reverting edge cases for RToken', async () => { // Swap one of the collaterals for an invalid one const InvalidFiatCollateralFactory = await ethers.getContractFactory('InvalidFiatCollateral') const invalidFiatCollateral: InvalidFiatCollateral = ( @@ -441,7 +390,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -466,7 +415,7 @@ describe('Assets contracts #fast', () => { await expect(rTokenAsset.price()).to.be.reverted }) - it('Regression test -- Should handle unpriced collateral for RTokenAsset', async () => { + it('Regression test -- Should handle unpriced collateral for RToken', async () => { // https://github.com/code-423n4/2023-07-reserve-findings/issues/20 // Swap one of the collaterals for an invalid one @@ -478,7 +427,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -495,115 +444,6 @@ describe('Assets contracts #fast', () => { await expectUnpriced(rTokenAsset.address) }) - it('Regression test -- RTokenAsset.refresh() should refresh everything', async () => { - // AssetRegistry should refresh - const lastRefreshed = await assetRegistry.lastRefresh() - await rTokenAsset.refresh() - expect(await assetRegistry.lastRefresh()).to.be.gt(lastRefreshed) - - // Furnace should melt - const lastPayout = await furnace.lastPayout() - await advanceTime(12) - await rTokenAsset.refresh() - expect(await furnace.lastPayout()).to.be.gt(lastPayout) - - // Should clear oracle cache - await rTokenAsset.forceUpdatePrice() - let [, cachedAtTime] = await rTokenAsset.cachedOracleData() - expect(cachedAtTime).to.be.gt(0) - await rTokenAsset.refresh() - ;[, cachedAtTime] = await rTokenAsset.cachedOracleData() - expect(cachedAtTime).to.eq(0) - }) - - it('Should handle tokens being out on trade for RTokenAsset', async () => { - // Summary: - // - Run a dutch auction that does not fill - // - Run a batch auction that fills for partial volume - // - Run a dutch auction that fills for full volume - - const low0 = fp('0.99') - const low1 = bn('975344098811881188') // after a 50% basket change - const low2 = bn('975343128415841584') // after batch auction at half volume - const low3 = bn('975560049627103964') // after dutch auction at full volume - - // Price should be [$0.99, $1.01] to start - await expectExactPrice(rTokenAsset.address, [low0, fp('1.01')]) - - // After 50% basket change, expected trading should decrease the lower price to ~$0.9753 - // Upper price remains $1.01 because of uncertainty around how trading will go - await basketHandler - .connect(wallet) - .setPrimeBasket([token.address, usdc.address], [fp('0.5'), fp('0.5')]) - await basketHandler.connect(wallet).refreshBasket() - await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) - - // After launching a trade token price should not change - // Regression -- I've confirmed the lower price drops to ~$0.7352 when not tracking balances out on trade - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.emit( - backingManager, - 'TradeStarted' - ) - expect(await backingManager.tradesOpen()).to.equal(1) - await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) - - // Settling trade without bidding should not change price - let trade = await ethers.getContractAt( - 'DutchTrade', - await backingManager.trades(aToken.address) - ) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber())) - await expect(backingManager.settleTrade(aToken.address)).to.emit( - backingManager, - 'TradeSettled' - ) - expect(await backingManager.tradesOpen()).to.equal(0) - await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) - - // Launching the trade a second time, this time Batch Auction, should not change price - await setNextBlockTimestamp((await trade.endTime()) + 13) - await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.emit( - backingManager, - 'TradeStarted' - ) - expect(await backingManager.tradesOpen()).to.equal(1) - await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) - - // Bid in Gnosis for half volume at even prices - const t = await getTrade(backingManager, aToken.address) - const sellAmt = (await t.initBal()).div(2) // half volume - await token.connect(wallet).approve(gnosis.address, sellAmt) - await gnosis.placeBid(0, { - bidder: wallet.address, - sellAmount: sellAmt, - buyAmount: sellAmt, - }) - await advanceTime(config.batchAuctionLength.toNumber()) - await expect(backingManager.settleTrade(aToken.address)).not.to.emit( - backingManager, - 'TradeStarted' - ) - expect(await backingManager.tradesOpen()).to.equal(0) - await expectExactPrice(rTokenAsset.address, [low2, fp('1.01')]) - - // Starting a 3rd auction should not change balances - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.emit( - backingManager, - 'TradeStarted' - ) - expect(await backingManager.tradesOpen()).to.equal(1) - await expectExactPrice(rTokenAsset.address, [low2, fp('1.01')]) - - // Settle 3rd auction for full volume - trade = await ethers.getContractAt('DutchTrade', await backingManager.trades(cToken.address)) - const buyAmt = await trade.bidAmount(await trade.endBlock()) - await usdc.approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await expect(trade.bid()).to.emit(backingManager, 'TradeSettled') - expect(await backingManager.tradesOpen()).to.equal(1) // launches another trade! - await expectExactPrice(rTokenAsset.address, [low3, bn('1007427552565834095')]) // high end starts to fall - }) - it('Should be able to refresh saved prices', async () => { // Check initial prices - use RSR as example let currBlockTimestamp: number = await getLatestBlockTimestamp() @@ -654,7 +494,7 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -693,35 +533,37 @@ describe('Assets contracts #fast', () => { expect(await unpricedRSRAsset.lastSave()).to.equal(currBlockTimestamp) }) - it('Should not revert on refresh if stale', async () => { + it('Should not revert on refresh if unpriced', async () => { // Check initial prices - use RSR as example - const startBlockTimestamp: number = await getLatestBlockTimestamp() - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + const currBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, true) const [prevLowPrice, prevHighPrice] = await rsrAsset.price() expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) // Set invalid oracle await setInvalidOracleTimestamp(rsrAsset.address) - // Check price - uses still previous prices - await rsrAsset.refresh() + // Check unpriced - uses still previous prices + await expectUnpriced(rsrAsset.address) let [lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(prevLowPrice) - expect(highPrice).to.equal(prevHighPrice) + expect(lowPrice).to.equal(bn(0)) + expect(highPrice).to.equal(MAX_UINT192) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) - // Check price - no update on prices/timestamp + // Perform refresh await rsrAsset.refresh() + + // Check still unpriced - no update on prices/timestamp + await expectUnpriced(rsrAsset.address) ;[lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(prevLowPrice) - expect(highPrice).to.equal(prevHighPrice) + expect(lowPrice).to.equal(bn(0)) + expect(highPrice).to.equal(MAX_UINT192) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) }) it('Reverts if Chainlink feed reverts or runs out of gas', async () => { @@ -739,82 +581,79 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) // Reverting with no reason await invalidChainlinkFeed.setSimplyRevert(true) await expect(invalidRSRAsset.price()).to.be.reverted + await expect(invalidRSRAsset.lotPrice()).to.be.reverted await expect(invalidRSRAsset.refresh()).to.be.reverted // Runnning out of gas (same error) await invalidChainlinkFeed.setSimplyRevert(false) await expect(invalidRSRAsset.price()).to.be.reverted + await expect(invalidRSRAsset.lotPrice()).to.be.reverted await expect(invalidRSRAsset.refresh()).to.be.reverted }) - it('Should handle price decay correctly', async () => { + it('Should handle lot price correctly', async () => { await rsrAsset.refresh() - // Check prices - use RSR as example - const startBlockTimestamp: number = await getLatestBlockTimestamp() - await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, false) + // Check lot prices - use RSR as example + const currBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(rsrAsset.address, fp('1'), ORACLE_ERROR, true) const [prevLowPrice, prevHighPrice] = await rsrAsset.price() expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) + + // Lot price equals price when feed works OK + const [lotLowPrice1, lotHighPrice1] = await rsrAsset.lotPrice() + expect(lotLowPrice1).to.equal(prevLowPrice) + expect(lotHighPrice1).to.equal(prevHighPrice) // Set invalid oracle await setInvalidOracleTimestamp(rsrAsset.address) // Check unpriced - uses still previous prices + await expectUnpriced(rsrAsset.address) const [lowPrice, highPrice] = await rsrAsset.price() - expect(lowPrice).to.equal(prevLowPrice) - expect(highPrice).to.equal(prevHighPrice) + expect(lowPrice).to.equal(bn(0)) + expect(highPrice).to.equal(MAX_UINT192) expect(await rsrAsset.savedLowPrice()).to.equal(prevLowPrice) expect(await rsrAsset.savedHighPrice()).to.equal(prevHighPrice) - expect(await rsrAsset.lastSave()).to.equal(startBlockTimestamp) + expect(await rsrAsset.lastSave()).to.equal(currBlockTimestamp) - // At first price doesn't decrease - const [lowPrice2, highPrice2] = await rsrAsset.price() - expect(lowPrice2).to.eq(lowPrice) - expect(highPrice2).to.eq(highPrice) + // At first lot price doesn't decrease + const [lotLowPrice2, lotHighPrice2] = await rsrAsset.lotPrice() + expect(lotLowPrice2).to.eq(lotLowPrice1) + expect(lotHighPrice2).to.eq(lotHighPrice1) // Advance past oracleTimeout await advanceTime(await rsrAsset.oracleTimeout()) - // Now price widens - const [lowPrice3, highPrice3] = await rsrAsset.price() - expect(lowPrice3).to.be.lt(lowPrice2) - expect(highPrice3).to.be.gt(highPrice2) + // Now lot price decreases + const [lotLowPrice3, lotHighPrice3] = await rsrAsset.lotPrice() + expect(lotLowPrice3).to.be.lt(lotLowPrice2) + expect(lotHighPrice3).to.be.lt(lotHighPrice2) - // Advance block, price keeps widening + // Advance block, lot price keeps decreasing await advanceBlocks(1) - const [lowPrice4, highPrice4] = await rsrAsset.price() - expect(lowPrice4).to.be.lt(lowPrice3) - expect(highPrice4).to.be.gt(highPrice3) + const [lotLowPrice4, lotHighPrice4] = await rsrAsset.lotPrice() + expect(lotLowPrice4).to.be.lt(lotLowPrice3) + expect(lotHighPrice4).to.be.lt(lotHighPrice3) - // Advance blocks beyond PRICE_TIMEOUT; price should be [O, FIX_MAX] + // Advance blocks beyond PRICE_TIMEOUT await advanceTime(PRICE_TIMEOUT.toNumber()) // Lot price returns 0 once time elapses - const [lowPrice5, highPrice5] = await rsrAsset.price() - expect(lowPrice5).to.be.lt(lowPrice4) - expect(highPrice5).to.be.gt(highPrice4) - expect(lowPrice5).to.be.equal(bn(0)) - expect(highPrice5).to.be.equal(MAX_UINT192) - }) - - it('lotPrice (deprecated) is equal to price()', async () => { - for (const asset of [rsrAsset, compAsset, aaveAsset, rTokenAsset]) { - const lotPrice = await asset.lotPrice() - const price = await asset.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) - } + const [lotLowPrice5, lotHighPrice5] = await rsrAsset.lotPrice() + expect(lotLowPrice5).to.be.lt(lotLowPrice4) + expect(lotHighPrice5).to.be.lt(lotHighPrice4) + expect(lotLowPrice5).to.be.equal(bn(0)) + expect(lotHighPrice5).to.be.equal(bn(0)) }) }) @@ -885,9 +724,9 @@ describe('Assets contracts #fast', () => { it('refresh() after full price timeout', async () => { await advanceTime((await rsrAsset.priceTimeout()) + (await rsrAsset.oracleTimeout())) - const p = await rsrAsset.price() - expect(p[0]).to.equal(0) - expect(p[1]).to.equal(MAX_UINT192) + const lotP = await rsrAsset.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) }) }) }) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 21ca93859c..ff0441b43c 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -39,8 +39,6 @@ import { } from '../utils/time' import snapshotGasCost from '../utils/snapshotGasCost' import { - expectDecayedPrice, - expectExactPrice, expectPrice, expectRTokenPrice, expectUnpriced, @@ -52,7 +50,6 @@ import { Collateral, defaultFixture, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, REVENUE_HIDING, @@ -255,7 +252,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.constants.HashZero, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -263,44 +260,6 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetName missing') }) - it('Should not allow 0 defaultThreshold', async () => { - // ATokenFiatCollateral - await expect( - ATokenFiatCollateralFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: await tokenCollateral.chainlinkFeed(), - oracleError: ORACLE_ERROR, - erc20: aToken.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: bn(0), - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - REVENUE_HIDING - ) - ).to.be.revertedWith('defaultThreshold zero') - - // CTokenFiatCollateral - await expect( - CTokenFiatCollateralFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: await tokenCollateral.chainlinkFeed(), - oracleError: ORACLE_ERROR, - erc20: cToken.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: bn(0), - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - REVENUE_HIDING - ) - ).to.be.revertedWith('defaultThreshold zero') - }) - it('Should not allow missing delayUntilDefault', async () => { await expect( FiatCollateralFactory.deploy({ @@ -309,7 +268,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -325,7 +284,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -343,7 +302,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -361,7 +320,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -377,7 +336,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -395,7 +354,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -414,7 +373,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -430,7 +389,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -448,7 +407,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -467,7 +426,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -483,7 +442,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -501,7 +460,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -522,7 +481,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -540,7 +499,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -623,7 +582,7 @@ describe('Collateral contracts', () => { ) }) - it('Should handle prices correctly when price is zero', async () => { + it('Should become unpriced if price is zero', async () => { const compInitPrice = await tokenCollateral.price() const aaveInitPrice = await aTokenCollateral.price() const rsrInitPrice = await cTokenCollateral.price() @@ -631,25 +590,22 @@ describe('Collateral contracts', () => { // Update values in Oracles to 0 await setOraclePrice(tokenCollateral.address, bn('0')) + // Should be unpriced + await expectUnpriced(cTokenCollateral.address) + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) + // Fallback prices should be initial prices - let [lotLow, lotHigh] = await tokenCollateral.price() + let [lotLow, lotHigh] = await tokenCollateral.lotPrice() expect(lotLow).to.eq(compInitPrice[0]) expect(lotHigh).to.eq(compInitPrice[1]) - ;[lotLow, lotHigh] = await cTokenCollateral.price() + ;[lotLow, lotHigh] = await cTokenCollateral.lotPrice() expect(lotLow).to.eq(rsrInitPrice[0]) expect(lotHigh).to.eq(rsrInitPrice[1]) - ;[lotLow, lotHigh] = await aTokenCollateral.price() + ;[lotLow, lotHigh] = await aTokenCollateral.lotPrice() expect(lotLow).to.eq(aaveInitPrice[0]) expect(lotHigh).to.eq(aaveInitPrice[1]) - // Advance past timeouts - await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) - - // Should be unpriced - await expectUnpriced(cTokenCollateral.address) - await expectUnpriced(tokenCollateral.address) - await expectUnpriced(aTokenCollateral.address) - // When refreshed, sets status to Unpriced await tokenCollateral.refresh() await aTokenCollateral.refresh() @@ -660,56 +616,38 @@ describe('Collateral contracts', () => { expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Should remain at saved price in case of invalid timestamp', async () => { + it('Should be unpriced in case of invalid timestamp', async () => { await setInvalidOracleTimestamp(tokenCollateral.address) - await setInvalidOracleTimestamp(usdcCollateral.address) - // lastSave should not be block timestamp after refresh + // Check price of token + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) + await expectUnpriced(cTokenCollateral.address) + + // When refreshed, sets status to Unpriced await tokenCollateral.refresh() - await usdcCollateral.refresh() await aTokenCollateral.refresh() await cTokenCollateral.refresh() - expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - - // Check price is still at saved price - await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) - - // Sets status to IFFY + expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) - expect(await usdcCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - it('Should remain at saved price in case of invalid answered round', async () => { + it('Should be unpriced in case of invalid answered round', async () => { await setInvalidOracleAnsweredRound(tokenCollateral.address) - await setInvalidOracleAnsweredRound(usdcCollateral.address) - // lastSave should not be block timestamp after refresh + // Check price of token + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) + await expectUnpriced(cTokenCollateral.address) + + // When refreshed, sets status to Unpriced await tokenCollateral.refresh() - await usdcCollateral.refresh() await aTokenCollateral.refresh() await cTokenCollateral.refresh() - expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - - // Check price is still at saved price - await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) - - // Sets status to IFFY + expect(await tokenCollateral.status()).to.equal(CollateralStatus.IFFY) - expect(await usdcCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await aTokenCollateral.status()).to.equal(CollateralStatus.IFFY) expect(await cTokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -776,7 +714,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -818,17 +756,6 @@ describe('Collateral contracts', () => { expect(await unpricedAppFiatCollateral.savedHighPrice()).to.equal(highPrice) expect(await unpricedAppFiatCollateral.lastSave()).to.equal(currBlockTimestamp) }) - - it('lotPrice (deprecated) is equal to price()', async () => { - for (const coll of [tokenCollateral, usdcCollateral, aTokenCollateral, cTokenCollateral]) { - const lotPrice = await coll.lotPrice() - const price = await coll.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) - } - }) }) describe('Status', () => { @@ -981,24 +908,14 @@ describe('Collateral contracts', () => { } }) - it('Should remain at saved price if oracle is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) - - // lastSave should not be block timestamp after refresh - await tokenCollateral.refresh() - await usdcCollateral.refresh() - await cTokenCollateral.refresh() - await aTokenCollateral.refresh() - expect(await tokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await usdcCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await cTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) - expect(await aTokenCollateral.lastSave()).to.not.equal(await getLatestBlockTimestamp()) + it('Unpriced if price is stale', async () => { + await advanceTime(ORACLE_TIMEOUT.toString()) - // Check price - await expectPrice(tokenCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(usdcCollateral.address, fp('1'), ORACLE_ERROR, false) - await expectPrice(cTokenCollateral.address, fp('1').div(50), ORACLE_ERROR, false) - await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, false) + // Check unpriced + await expectUnpriced(tokenCollateral.address) + await expectUnpriced(usdcCollateral.address) + await expectUnpriced(cTokenCollateral.address) + await expectUnpriced(aTokenCollateral.address) }) it('Enters IFFY state when price becomes stale', async () => { @@ -1192,13 +1109,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await nonFiatCollateral.refresh() @@ -1215,13 +1132,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('delayUntilDefault zero') }) @@ -1235,13 +1152,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('missing targetUnit feed') }) @@ -1255,13 +1172,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('missing chainlink feed') }) @@ -1275,7 +1192,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1286,26 +1203,6 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) - it('Should not allow 0 defaultThreshold', async () => { - await expect( - NonFiatCollFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: referenceUnitOracle.address, - oracleError: ORACLE_ERROR, - erc20: nonFiatToken.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: bn(0), - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER - ) - ).to.be.revertedWith('defaultThreshold zero') - }) - it('Should setup collateral correctly', async function () { // Non-Fiat Token expect(await nonFiatCollateral.isCollateral()).to.equal(true) @@ -1334,8 +1231,6 @@ describe('Collateral contracts', () => { }) it('Should calculate prices correctly', async function () { - const initialPrice = await nonFiatCollateral.price() - // Check initial prices await expectPrice(nonFiatCollateral.address, fp('20000'), ORACLE_ERROR, true) @@ -1345,37 +1240,26 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(nonFiatCollateral.address, fp('22000'), ORACLE_ERROR, true) - // Cached but IFFY if price is zero + // Unpriced if price is zero - Update Oracles and check prices await targetUnitOracle.updateAnswer(bn('0')) + await expectUnpriced(nonFiatCollateral.address) + + // When refreshed, sets status to IFFY await nonFiatCollateral.refresh() expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) - await expectExactPrice(nonFiatCollateral.address, initialPrice) - - // Should become disabled after just ORACLE_TIMEOUT - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await targetUnitOracle.updateAnswer(bn('0')) - expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) - await expectDecayedPrice(nonFiatCollateral.address) // Restore price await targetUnitOracle.updateAnswer(bn('20000e8')) - await referenceUnitOracle.updateAnswer(bn('1e8')) await nonFiatCollateral.refresh() - await expectExactPrice(nonFiatCollateral.address, initialPrice) - - // Check the other oracle's impact - await referenceUnitOracle.updateAnswer(bn('0')) - await expectExactPrice(nonFiatCollateral.address, initialPrice) - - // Advance past oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await referenceUnitOracle.updateAnswer(bn('0')) - await expectDecayedPrice(nonFiatCollateral.address) + expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - // Advance past price timeout - await advanceTime(PRICE_TIMEOUT.toString()) + // Check the other oracle await referenceUnitOracle.updateAnswer(bn('0')) await expectUnpriced(nonFiatCollateral.address) + + // When refreshed, sets status to IFFY + await nonFiatCollateral.refresh() + expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -1391,13 +1275,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1419,13 +1303,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, invalidChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) // Reverting with no reason @@ -1480,13 +1364,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) await cTokenNonFiatCollateral.refresh() @@ -1504,13 +1388,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('delayUntilDefault zero') @@ -1525,13 +1409,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, fp('1') ) ).to.be.revertedWith('revenueHiding out of range') @@ -1546,13 +1430,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('missing chainlink feed') @@ -1567,13 +1451,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('missing targetUnit feed') @@ -1588,7 +1472,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1600,27 +1484,6 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) - it('Should not allow 0 defaultThreshold', async () => { - await expect( - CTokenNonFiatFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: referenceUnitOracle.address, - oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: bn(0), - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, - REVENUE_HIDING - ) - ).to.be.revertedWith('defaultThreshold zero') - }) - it('Should setup collateral correctly', async function () { // Non-Fiat Token expect(await cTokenNonFiatCollateral.isCollateral()).to.equal(true) @@ -1659,128 +1522,47 @@ describe('Collateral contracts', () => { }) it('Should calculate prices correctly', async function () { - // Check initial prices await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) + + // Check refPerTok initial values expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.02')) // Increase rate to double await cNonFiatTokenVault.setExchangeRate(fp(2)) await cTokenNonFiatCollateral.refresh() + // Check price doubled + await expectPrice(cTokenNonFiatCollateral.address, fp('800'), ORACLE_ERROR, true) + // RefPerTok also doubles in this case expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.04')) - // Check new prices - await expectPrice(cTokenNonFiatCollateral.address, fp('800'), ORACLE_ERROR, true) - // Update values in Oracle increase by 10% await targetUnitOracle.updateAnswer(bn('22000e8')) // $22k // Check new price await expectPrice(cTokenNonFiatCollateral.address, fp('880'), ORACLE_ERROR, true) - // Should be SOUND - await cTokenNonFiatCollateral.refresh() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - - const initialPrice = await cTokenNonFiatCollateral.price() - - // Cached but IFFY when price becomes zero + // Unpriced if price is zero - Update Oracles and check prices await targetUnitOracle.updateAnswer(bn('0')) - await cTokenNonFiatCollateral.refresh() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) - await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) + await expectUnpriced(cTokenNonFiatCollateral.address) - // Should become disabled after just ORACLE_TIMEOUT - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await targetUnitOracle.updateAnswer(bn('0')) - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) + // When refreshed, sets status to IFFY await cTokenNonFiatCollateral.refresh() - await expectDecayedPrice(cTokenNonFiatCollateral.address) + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) - // Restore price + // Restore await targetUnitOracle.updateAnswer(bn('22000e8')) - await referenceUnitOracle.updateAnswer(bn('1e8')) await cTokenNonFiatCollateral.refresh() - await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - - // Check the other oracle's impact - await referenceUnitOracle.updateAnswer(bn('0')) - await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - - // Advance past oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await referenceUnitOracle.updateAnswer(bn('0')) - await expectDecayedPrice(cTokenNonFiatCollateral.address) + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - // Advance past price timeout - await advanceTime(PRICE_TIMEOUT.toString()) + // Revert if price is zero - Update the other Oracle await referenceUnitOracle.updateAnswer(bn('0')) await expectUnpriced(cTokenNonFiatCollateral.address) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatTokenVault.exchangeRateStored() - const [currLow, currHigh] = await cTokenNonFiatCollateral.price() - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenNonFiatCollateral.refresh()) - .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenNonFiatCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatTokenVault.exchangeRateStored() - const [currLow, currHigh] = await cTokenNonFiatCollateral.price() - - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenNonFiatCollateral.refresh()) - .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenNonFiatCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) + // When refreshed, sets status to IFFY + await cTokenNonFiatCollateral.refresh() + expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { @@ -1828,7 +1610,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1857,7 +1639,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1899,7 +1681,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1939,7 +1721,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(100), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1957,17 +1739,9 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(selfReferentialCollateral.address, fp('1.1'), ORACLE_ERROR, true) - await selfReferentialCollateral.refresh() - const initialPrice = await selfReferentialCollateral.price() - - // Cached price if oracle price is zero - await setOraclePrice(selfReferentialCollateral.address, bn(0)) - await expectExactPrice(selfReferentialCollateral.address, initialPrice) - - // Decay starts after oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + // Unpriced if price is zero - Update Oracles and check prices await setOraclePrice(selfReferentialCollateral.address, bn(0)) - await expectDecayedPrice(selfReferentialCollateral.address) + await expectUnpriced(selfReferentialCollateral.address) // When refreshed, sets status to IFFY await selfReferentialCollateral.refresh() @@ -1984,12 +1758,6 @@ describe('Collateral contracts', () => { // Another call would not change the state await selfReferentialCollateral.refresh() expect(await selfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) - - // Final price checks - await expectDecayedPrice(selfReferentialCollateral.address) - await advanceTime(PRICE_TIMEOUT.toString()) - await setOraclePrice(selfReferentialCollateral.address, bn(0)) - await expectUnpriced(selfReferentialCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -2004,7 +1772,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2054,7 +1822,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2078,7 +1846,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2098,7 +1866,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2118,7 +1886,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(200), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2182,90 +1950,13 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.044'), ORACLE_ERROR, true) - await cTokenSelfReferentialCollateral.refresh() - const initialPrice = await cTokenSelfReferentialCollateral.price() - await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) - await expectExactPrice(cTokenSelfReferentialCollateral.address, initialPrice) - - // Decays if price is zero - await cTokenSelfReferentialCollateral.refresh() - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) - await expectDecayedPrice(cTokenSelfReferentialCollateral.address) - - // Unpriced after price timeout - await advanceTime(PRICE_TIMEOUT.toString()) + // Unpriced if price is zero - Update Oracles and check prices await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) await expectUnpriced(cTokenSelfReferentialCollateral.address) - // When refreshed, sets status to DISABLED + // When refreshed, sets status to IFFY await cTokenSelfReferentialCollateral.refresh() - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cSelfRefToken.exchangeRateStored() - const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenSelfReferentialCollateral.refresh()) - .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cSelfRefToken.exchangeRateStored() - const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenSelfReferentialCollateral.refresh()) - .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) + expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { @@ -2313,7 +2004,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2363,7 +2054,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2386,7 +2077,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -2406,7 +2097,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2426,7 +2117,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2446,7 +2137,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2457,26 +2148,6 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('targetUnitOracleTimeout zero') }) - it('Should not allow 0 defaultThreshold', async () => { - await expect( - EURFiatCollateralFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: referenceUnitOracle.address, - oracleError: ORACLE_ERROR, - erc20: eurFiatToken.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: bn(0), - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - targetUnitOracle.address, - ORACLE_TIMEOUT - ) - ).to.be.revertedWith('defaultThreshold zero') - }) - it('Should not revert during refresh when price2 is 0', async () => { const targetFeedAddr = await eurFiatCollateral.targetUnitChainlinkFeed() const targetFeed = await ethers.getContractAt('MockV3Aggregator', targetFeedAddr) @@ -2522,12 +2193,10 @@ describe('Collateral contracts', () => { // Check new prices await expectPrice(eurFiatCollateral.address, fp('2'), ORACLE_ERROR, true) - await eurFiatCollateral.refresh() - const initialPrice = await eurFiatCollateral.price() - // Decays if price is zero + // Unpriced if price is zero - Update Oracles and check prices await referenceUnitOracle.updateAnswer(bn('0')) - await expectExactPrice(eurFiatCollateral.address, initialPrice) + await expectUnpriced(eurFiatCollateral.address) // When refreshed, sets status to IFFY await eurFiatCollateral.refresh() @@ -2542,18 +2211,6 @@ describe('Collateral contracts', () => { await targetUnitOracle.updateAnswer(bn('0')) await eurFiatCollateral.refresh() expect(await eurFiatCollateral.status()).to.equal(CollateralStatus.IFFY) - - // Decays if price is zero - await referenceUnitOracle.updateAnswer(bn('0')) - await expectExactPrice(eurFiatCollateral.address, initialPrice) - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) - await referenceUnitOracle.updateAnswer(bn('0')) - await expectDecayedPrice(eurFiatCollateral.address) - - // After timeout, unpriced - await advanceTime(PRICE_TIMEOUT.toString()) - await referenceUnitOracle.updateAnswer(bn('0')) - await expectUnpriced(eurFiatCollateral.address) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -2569,7 +2226,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2597,7 +2254,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2672,15 +2329,15 @@ describe('Collateral contracts', () => { const oracleTimeout = await tokenCollateral.oracleTimeout() await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(bn(oracleTimeout).div(12)) - await snapshotGasCost(tokenCollateral.refresh()) }) it('after full price timeout', async () => { await advanceTime( (await tokenCollateral.priceTimeout()) + (await tokenCollateral.oracleTimeout()) ) - await expectUnpriced(tokenCollateral.address) - await snapshotGasCost(tokenCollateral.refresh()) + const lotP = await tokenCollateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) }) }) }) diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index 2b10d1847b..abc94deb66 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -18,16 +18,12 @@ import snapshotGasCost from '../utils/snapshotGasCost' import { formatUnits, parseUnits } from 'ethers/lib/utils' import { MAX_UINT256 } from '#/common/constants' -const SHARE_DECIMAL_OFFSET = 9 // decimals buffer for shares and rewards per share -const BN_SHARE_FACTOR = bn(10).pow(SHARE_DECIMAL_OFFSET) - type Fixture = () => Promise interface RewardableERC20Fixture { rewardableVault: RewardableERC4626VaultTest | RewardableERC20WrapperTest rewardableAsset: ERC20MockRewarding rewardToken: ERC20MockDecimals - rewardableVaultFactory: ContractFactory } // 18 cases: test two wrappers with 2 combinations of decimals [6, 8, 18] @@ -80,7 +76,6 @@ for (const wrapperName of wrapperNames) { rewardableVault, rewardableAsset, rewardToken, - rewardableVaultFactory, } } return fixture @@ -123,19 +118,18 @@ for (const wrapperName of wrapperNames) { describe(wrapperName, () => { // Decimals let shareDecimals: number - let rewardShareDecimals: number + // Assets let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest let rewardableAsset: ERC20MockRewarding let rewardToken: ERC20MockDecimals - let rewardableVaultFactory: ContractFactory // Main let alice: Wallet let bob: Wallet const initBalance = parseUnits('10000', assetDecimals) - let rewardAmount = parseUnits('200', rewardDecimals) + const rewardAmount = parseUnits('200', rewardDecimals) let oneShare: BigNumber let initShares: BigNumber @@ -147,16 +141,14 @@ for (const wrapperName of wrapperNames) { beforeEach(async () => { // Deploy fixture - ;({ rewardableVault, rewardableAsset, rewardToken, rewardableVaultFactory } = - await loadFixture(fixture)) + ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) await rewardableAsset.mint(alice.address, initBalance) await rewardableAsset.connect(alice).approve(rewardableVault.address, initBalance) await rewardableAsset.mint(bob.address, initBalance) await rewardableAsset.connect(bob).approve(rewardableVault.address, initBalance) - shareDecimals = (await rewardableVault.decimals()) + SHARE_DECIMAL_OFFSET - rewardShareDecimals = rewardDecimals + SHARE_DECIMAL_OFFSET + shareDecimals = await rewardableVault.decimals() initShares = toShares(initBalance, assetDecimals, shareDecimals) oneShare = bn('1').mul(bn(10).pow(shareDecimals)) }) @@ -189,9 +181,7 @@ for (const wrapperName of wrapperNames) { expect(await rewardableVault.lastRewardsPerShare(alice.address)).to.equal(bn(0)) await rewardToken.mint(rewardableVault.address, parseUnits('10', rewardDecimals)) await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal( - parseUnits('1', rewardShareDecimals) - ) + expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) }) it('correctly handles reward tracking if supply is burned', async () => { @@ -202,9 +192,7 @@ for (const wrapperName of wrapperNames) { expect(await rewardableVault.lastRewardsPerShare(alice.address)).to.equal(bn(0)) await rewardToken.mint(rewardableVault.address, parseUnits('10', rewardDecimals)) await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal( - parseUnits('1', rewardShareDecimals) - ) + expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) // Setting supply to 0 await withdrawAll(rewardableVault.connect(alice)) @@ -223,9 +211,7 @@ for (const wrapperName of wrapperNames) { // Nothing updates.. as totalSupply as totalSupply is 0 await rewardableVault.sync() - expect(await rewardableVault.rewardsPerShare()).to.equal( - parseUnits('1', rewardShareDecimals) - ) + expect(await rewardableVault.rewardsPerShare()).to.equal(parseUnits('1', rewardDecimals)) await rewardableVault .connect(alice) .deposit(parseUnits('10', assetDecimals), alice.address) @@ -237,23 +223,6 @@ for (const wrapperName of wrapperNames) { ) }) - it('checks reward and underlying token are not the same', async () => { - const errorMsg = - wrapperName == Wrapper.ERC4626 - ? 'reward and asset cannot match' - : 'reward and underlying cannot match' - - // Attempt to deploy with same reward and underlying - await expect( - rewardableVaultFactory.deploy( - rewardableAsset.address, - 'Rewarding Test Asset Vault', - 'vrewardTEST', - rewardableAsset.address - ) - ).to.be.revertedWith(errorMsg) - }) - it('1 wei supply', async () => { await rewardableVault.connect(alice).deposit('1', alice.address) expect(await rewardableVault.rewardsPerShare()).to.equal(bn(0)) @@ -290,9 +259,7 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.mul(3).div(8).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(alice.address) - ) + expect(initShares.mul(3).div(8)).equal(await rewardableVault.balanceOf(alice.address)) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -300,9 +267,7 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(8).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(bob.address) - ) + expect(initShares.div(8)).equal(await rewardableVault.balanceOf(bob.address)) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -311,9 +276,7 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) - ) + expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) }) }) @@ -340,9 +303,7 @@ for (const wrapperName of wrapperNames) { it('alice shows correct lastRewardsPerShare', async () => { // rewards / alice's deposit - expect(initRewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) - ) + expect(initRewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) expect(initRewardsPerShare).equal( await rewardableVault.lastRewardsPerShare(alice.address) ) @@ -353,7 +314,6 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) - .mul(BN_SHARE_FACTOR) expect(rewardsPerShare).equal(expectedRewardsPerShare) expect(rewardsPerShare).equal(await rewardableVault.lastRewardsPerShare(bob.address)) }) @@ -377,9 +337,7 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) - ) + expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) }) }) @@ -420,9 +378,7 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) - ) + expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) }) }) @@ -448,9 +404,7 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(bob.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -459,9 +413,7 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) - ) + expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) }) }) @@ -481,9 +433,7 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(alice.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) }) it('alice has claimed rewards', async () => { @@ -495,9 +445,7 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(8).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(bob.address) - ) + expect(initShares.div(8)).equal(await rewardableVault.balanceOf(bob.address)) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -506,29 +454,10 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // rewards / alice's deposit - expect(rewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(BN_SHARE_FACTOR) - ) + expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4))) }) }) - it('Cannot frontrun claimRewards by inflating your shares', async () => { - await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) - await rewardableAsset.mint(bob.address, initBalance.mul(100)) - await rewardableVault.connect(alice).deposit(initBalance, alice.address) - await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) - - // Bob 'flashloans' 100x the current balance of the vault and claims rewards - await rewardableVault.connect(bob).deposit(initBalance.mul(100), bob.address) - await rewardableVault.connect(bob).claimRewards() - - // Alice claimsRewards a bit later - await rewardableVault.connect(alice).claimRewards() - expect(await rewardToken.balanceOf(alice.address)).to.be.gt( - await rewardToken.balanceOf(bob.address) - ) - }) - describe('alice deposit, accrue, bob deposit, accrue, bob claim, alice claim', () => { let rewardsPerShare: BigNumber @@ -551,9 +480,7 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(alice.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) }) it('alice has claimed rewards', async () => { @@ -567,9 +494,7 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(bob.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -586,7 +511,6 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) - .mul(BN_SHARE_FACTOR) expect(rewardsPerShare).equal(expectedRewardsPerShare) }) }) @@ -616,9 +540,7 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(alice.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -630,9 +552,7 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(bob.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(bob.address)) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -645,9 +565,7 @@ for (const wrapperName of wrapperNames) { it('rewardsPerShare is correct', async () => { // (rewards / alice's deposit) + (rewards / bob's deposit) - expect(rewardsPerShare).equal( - rewardAmount.mul(oneShare).div(initShares.div(4)).mul(2).mul(BN_SHARE_FACTOR) - ) + expect(rewardsPerShare).equal(rewardAmount.mul(oneShare).div(initShares.div(4)).mul(2)) }) }) @@ -658,9 +576,7 @@ for (const wrapperName of wrapperNames) { await rewardableVault.connect(alice).deposit(initBalance.div(4), alice.address) await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.connect(bob).deposit(initBalance.div(4), bob.address) - await rewardableVault - .connect(alice) - .transfer(bob.address, initShares.div(4).div(BN_SHARE_FACTOR)) + await rewardableVault.connect(alice).transfer(bob.address, initShares.div(4)) await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.connect(alice).deposit(initBalance.div(4), alice.address) await rewardableVault.connect(bob).claimRewards() @@ -670,9 +586,7 @@ for (const wrapperName of wrapperNames) { }) it('alice shows correct balance', async () => { - expect(initShares.div(4).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(alice.address) - ) + expect(initShares.div(4)).equal(await rewardableVault.balanceOf(alice.address)) }) it('alice shows correct lastRewardsPerShare', async () => { @@ -684,9 +598,7 @@ for (const wrapperName of wrapperNames) { }) it('bob shows correct balance', async () => { - expect(initShares.div(2).div(BN_SHARE_FACTOR)).equal( - await rewardableVault.balanceOf(bob.address) - ) + expect(initShares.div(2)).equal(await rewardableVault.balanceOf(bob.address)) }) it('bob shows correct lastRewardsPerShare', async () => { @@ -704,84 +616,6 @@ for (const wrapperName of wrapperNames) { .mul(oneShare) .div(initShares.div(4)) .add(rewardAmount.mul(oneShare).div(initShares.div(2))) - .mul(BN_SHARE_FACTOR) - ) - }) - }) - - describe('correctly applies fractional reward tracking', () => { - rewardAmount = parseUnits('1.9', rewardDecimals) - - beforeEach(async () => { - // Deploy fixture - ;({ rewardableVault, rewardableAsset } = await loadFixture(fixture)) - - await rewardableAsset.mint(alice.address, initBalance) - await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) - await rewardableAsset.mint(bob.address, initBalance) - await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) - }) - - it('Correctly handles fractional rewards', async () => { - expect(await rewardableVault.rewardsPerShare()).to.equal(0) - - await rewardableVault.connect(alice).deposit(initBalance, alice.address) - - for (let i = 0; i < 10; i++) { - await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) - await rewardableVault.claimRewards() - expect(await rewardableVault.rewardsPerShare()).to.equal( - rewardAmount - .mul(i + 1) - .mul(oneShare) - .div(initShares) - .mul(BN_SHARE_FACTOR) - ) - } - }) - }) - - describe(`correctly rounds rewards`, () => { - // Assets - rewardAmount = parseUnits('1.7', rewardDecimals) - - beforeEach(async () => { - // Deploy fixture - ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) - - await rewardableAsset.mint(alice.address, initBalance) - await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) - await rewardableAsset.mint(bob.address, initBalance) - await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) - }) - - it('Avoids wrong distribution of rewards when rounding', async () => { - expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(0)) - expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(0)) - expect(await rewardableVault.rewardsPerShare()).to.equal(0) - - // alice deposit and accrue rewards - await rewardableVault.connect(alice).deposit(initBalance, alice.address) - await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) - - // bob deposit - await rewardableVault.connect(bob).deposit(initBalance, bob.address) - - // accrue additional rewards (twice the amount) - await rewardableAsset.accrueRewards(rewardAmount.mul(2), rewardableVault.address) - - // claim all rewards - await rewardableVault.connect(bob).claimRewards() - await rewardableVault.connect(alice).claimRewards() - - // Alice got all first rewards plus half of the second - expect(await rewardToken.balanceOf(alice.address)).to.equal(rewardAmount.mul(2)) - - // Bob only got half of the second rewards - expect(await rewardToken.balanceOf(bob.address)).to.equal(rewardAmount) - - expect(await rewardableVault.rewardsPerShare()).equal( - rewardAmount.mul(2).mul(oneShare).div(initShares).mul(BN_SHARE_FACTOR) ) }) }) @@ -833,67 +667,9 @@ for (const wrapperName of wrapperNames) { for (let i = 0; i < 10; i++) { await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) await rewardableVault.claimRewards() - expect(await rewardableVault.rewardsPerShare()).to.equal( - bn(`1.9e${SHARE_DECIMAL_OFFSET}`).mul(i + 1) - ) - } - }) - }) - - describe(`${wrapperName.replace('Test', '')} Special Case: Rounding - Regression test`, () => { - // Assets - let rewardableVault: RewardableERC20WrapperTest | RewardableERC4626VaultTest - let rewardableAsset: ERC20MockRewarding - let rewardToken: ERC20MockDecimals - // Main - let alice: Wallet - let bob: Wallet - const initBalance = parseUnits('1000000', 18) - const rewardAmount = parseUnits('1.7', 6) - - const fixture = getFixture(18, 6) - - before('load wallets', async () => { - ;[alice, bob] = (await ethers.getSigners()) as unknown as Wallet[] - }) - - beforeEach(async () => { - // Deploy fixture - ;({ rewardableVault, rewardableAsset, rewardToken } = await loadFixture(fixture)) - - await rewardableAsset.mint(alice.address, initBalance) - await rewardableAsset.connect(alice).approve(rewardableVault.address, MAX_UINT256) - await rewardableAsset.mint(bob.address, initBalance) - await rewardableAsset.connect(bob).approve(rewardableVault.address, MAX_UINT256) - }) - - it('Avoids wrong distribution of rewards when rounding', async () => { - expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(0)) - expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(0)) - expect(await rewardableVault.rewardsPerShare()).to.equal(0) - - // alice deposit and accrue rewards - await rewardableVault.connect(alice).deposit(initBalance, alice.address) - await rewardableAsset.accrueRewards(rewardAmount, rewardableVault.address) - - // bob deposit - await rewardableVault.connect(bob).deposit(initBalance, bob.address) - - // accrue additional rewards (twice the amount) - await rewardableAsset.accrueRewards(rewardAmount.mul(2), rewardableVault.address) - - // claim all rewards - await rewardableVault.connect(bob).claimRewards() - await rewardableVault.connect(alice).claimRewards() - - // Alice got all first rewards plus half of the second - expect(await rewardToken.balanceOf(alice.address)).to.equal(bn(3.4e6)) - - // Bob only got half of the second rewards - expect(await rewardToken.balanceOf(bob.address)).to.equal(bn(1.7e6)) - - expect(await rewardableVault.rewardsPerShare()).to.equal(bn(`3.4e${SHARE_DECIMAL_OFFSET}`)) + expect(await rewardableVault.rewardsPerShare()).to.equal(Math.floor(1.9 * (i + 1))) + } }) }) diff --git a/test/plugins/__snapshots__/Collateral.test.ts.snap b/test/plugins/__snapshots__/Collateral.test.ts.snap index 926d33902f..83c6bf2eb6 100644 --- a/test/plugins/__snapshots__/Collateral.test.ts.snap +++ b/test/plugins/__snapshots__/Collateral.test.ts.snap @@ -1,12 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Collateral contracts Gas Reporting refresh() after full price timeout 1`] = `46228`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71881`; -exports[`Collateral contracts Gas Reporting refresh() after hard default 1`] = `71859`; - -exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75141`; - -exports[`Collateral contracts Gas Reporting refresh() after oracle timeout 1`] = `46228`; +exports[`Collateral contracts Gas Reporting refresh() after hard default 2`] = `75163`; exports[`Collateral contracts Gas Reporting refresh() during + after soft default 1`] = `61571`; diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index a15ac37a23..89bc877c66 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -15,7 +15,6 @@ import { noop } from 'lodash' import { PRICE_TIMEOUT } from '#/test/fixtures' import { resetFork } from './helpers' import { whileImpersonating } from '#/test/utils/impersonation' -import { pushOracleForward } from '../../../utils/oracles' import { forkNetwork, AUSDC_V3, @@ -73,9 +72,6 @@ export const deployCollateral = async (opts: Partial = {}) => ) await collateral.deployed() - // Push forward chainlink feed - await pushOracleForward(combinedOpts.chainlinkFeed!) - // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -215,7 +211,6 @@ export const stableOpts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itHasRevenueHiding: it, - itChecksNonZeroDefaultThreshold: it, itIsPricedByPeg: true, chainlinkDefaultAnswer: 1e8, itChecksPriceChanges: it, diff --git a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap index 996921a268..62ee74c7f7 100644 --- a/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave-v3/__snapshots__/AaveV3FiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting ERC20 transfer 2`] = `36409`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69288`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69299`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67620`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after full price timeout 2`] = `67631`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72103`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 1`] = `72125`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64421`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after hard default 2`] = `64443`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69288`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `69299`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67620`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `67631`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `87699`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 1`] = `67290`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `87625`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() after soft default 2`] = `67290`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87684`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 1`] = `87706`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87684`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during SOUND 2`] = `87706`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89708`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 1`] = `89656`; -exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87966`; +exports[`Collateral: Aave V3 Fiat Collateral (USDC) collateral functionality Gas Reporting refresh() during soft default 2`] = `87988`; diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 7a4a52862c..ed84d0b200 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -10,13 +10,7 @@ import { PRICE_TIMEOUT, REVENUE_HIDING, } from '../../../fixtures' -import { - DefaultFixture, - Fixture, - getDefaultFixture, - ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, -} from '../fixtures' +import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' import { @@ -28,20 +22,15 @@ import { IRTokenSetup, networkConfig, } from '../../../../common/configuration' -import { - CollateralStatus, - MAX_UINT48, - MAX_UINT192, - ZERO_ADDRESS, -} from '../../../../common/constants' +import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../../../common/constants' import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' import { expectPrice, expectRTokenPrice, - setOraclePrice, expectUnpriced, + setOraclePrice, } from '../../../utils/oracles' import { advanceBlocks, @@ -215,7 +204,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, stkAave.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -239,7 +228,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -434,7 +423,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Validate constructor arguments // Note: Adapt it to your plugin constructor validations it('Should validate constructor arguments correctly', async () => { - // Missing erc20 + // stkAAVEtroller await expect( ATokenFiatCollateralFactory.deploy( { @@ -443,7 +432,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -451,24 +440,6 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi REVENUE_HIDING ) ).to.be.revertedWith('missing erc20') - - // defaultThreshold = 0 - await expect( - ATokenFiatCollateralFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, - oracleError: ORACLE_ERROR, - erc20: staticAToken.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: bn(0), - delayUntilDefault, - }, - REVENUE_HIDING - ) - ).to.be.revertedWith('defaultThreshold zero') }) }) @@ -682,14 +653,10 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) - // Price is at saved prices - const savedLowPrice = await aDaiCollateral.savedLowPrice() - const savedHighPrice = await aDaiCollateral.savedHighPrice() - const p = await aDaiCollateral.price() - expect(p[0]).to.equal(savedLowPrice) - expect(p[1]).to.equal(savedHighPrice) + // stkAAVEound + await expectUnpriced(aDaiCollateral.address) // Refresh should mark status IFFY await aDaiCollateral.refresh() @@ -705,7 +672,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -730,7 +697,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -747,15 +714,6 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await zeropriceCtokenCollateral.refresh() expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - - it('lotPrice (deprecated) is equal to price()', async () => { - const lotPrice = await aDaiCollateral.lotPrice() - const price = await aDaiCollateral.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) - }) }) // Note: Here the idea is to test all possible statuses and check all possible paths to default @@ -1010,9 +968,9 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime( (await aDaiCollateral.priceTimeout()) + (await aDaiCollateral.oracleTimeout()) ) - const p = await aDaiCollateral.price() - expect(p[0]).to.equal(0) - expect(p[1]).to.equal(MAX_UINT192) + const lotP = await aDaiCollateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) await snapshotGasCost(aDaiCollateral.refresh()) await snapshotGasCost(aDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) diff --git a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap index 13f8ae6777..6cc30614b8 100644 --- a/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/aave/__snapshots__/ATokenFiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 Wrapper t exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 Wrapper transfer 2`] = `53409`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74354`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `74365`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72686`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `72697`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72938`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `72960`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65256`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `65278`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74354`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `74365`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72686`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `72697`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91073`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `91169`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91073`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `91095`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92285`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `92233`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92285`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `92307`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127282`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `127378`; -exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91488`; +exports[`ATokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `91436`; diff --git a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts index e21a0f66a0..79f063c586 100644 --- a/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/ankr/AnkrEthCollateralTestSuite.test.ts @@ -10,7 +10,6 @@ import { TestICollateral, IAnkrETH, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -101,9 +100,6 @@ export const deployCollateral = async ( ) await collateral.deployed() - // Push forward chainlink feed - await pushOracleForward(opts.chainlinkFeed!) - // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -289,7 +285,6 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, - itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'AnkrStakedETH', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap index 64458dcd1a..513e5ca5b6 100644 --- a/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/ankr/__snapshots__/AnkrEthCollateralTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting ERC20 exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting ERC20 transfer 2`] = `43994`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60326`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `60337`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55857`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55868`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99391`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `99413`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91708`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `91730`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60326`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `60337`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55857`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55868`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55516`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `55527`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55516`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `55527`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91635`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `91657`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91635`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `91657`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99186`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `99208`; -exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91917`; +exports[`Collateral: AnkrStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `91939`; diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts index 8f5bb5efe1..9f659f1b45 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateral.test.ts @@ -12,7 +12,6 @@ import { ORACLE_TIMEOUT, PRICE_TIMEOUT, } from './constants' -import { pushOracleForward } from '../../../utils/oracles' import { BigNumber, BigNumberish, ContractFactory } from 'ethers' import { bn, fp } from '#/common/numbers' import { TestICollateral } from '@typechain/TestICollateral' @@ -61,10 +60,6 @@ export const deployCollateral = async ( ) await collateral.deployed() - // Push forward chainlink feeds - await pushOracleForward(opts.chainlinkFeed!) - await pushOracleForward(opts.targetPerTokChainlinkFeed ?? CBETH_ETH_PRICE_FEED) - await expect(collateral.refresh()) return collateral @@ -246,7 +241,6 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, - itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'CBEthCollateral', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts index fbc3f6874b..489f89d3df 100644 --- a/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts +++ b/test/plugins/individual-collateral/cbeth/CBETHCollateralL2.test.ts @@ -277,7 +277,6 @@ const opts = { itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it, - itChecksNonZeroDefaultThreshold: it, resetFork, collateralName: 'CBEthCollateralL2', chainlinkDefaultAnswer, diff --git a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap index f7366a3fb9..afb2111ab5 100644 --- a/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/cbeth/__snapshots__/CBETHCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting ERC2 exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `48379`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59813`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `59824`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55344`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `55355`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98295`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 1`] = `98317`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90612`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after hard default 2`] = `90634`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59813`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59824`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55344`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `55355`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55003`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 1`] = `55014`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55003`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() after soft default 2`] = `55014`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90609`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `90631`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90609`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `90631`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98160`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 1`] = `98182`; -exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90891`; +exports[`Collateral: CBEthCollateral collateral functionality Gas Reporting refresh() during soft default 2`] = `90913`; diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index dcb238c332..40465f48dc 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -1,59 +1,35 @@ import { expect } from 'chai' import hre, { ethers } from 'hardhat' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' -import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { BigNumber, ContractFactory } from 'ethers' +import { BigNumber } from 'ethers' import { useEnv } from '#/utils/env' import { getChainId } from '../../../common/blockchain-utils' -import { bn, fp, toBNDecimals } from '../../../common/numbers' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from './fixtures' -import { expectInIndirectReceipt } from '../../../common/events' -import { whileImpersonating } from '../../utils/impersonation' -import { IGovParams, IGovRoles, IRTokenSetup, networkConfig } from '../../../common/configuration' +import { networkConfig } from '../../../common/configuration' +import { bn, fp } from '../../../common/numbers' +import { + IERC20Metadata, + InvalidMockV3Aggregator, + MockV3Aggregator, + TestICollateral, +} from '../../../typechain' import { advanceTime, advanceBlocks, - getLatestBlockNumber, getLatestBlockTimestamp, setNextBlockTimestamp, } from '../../utils/time' -import { - MAX_UINT48, - MAX_UINT192, - MAX_UINT256, - TradeKind, - ZERO_ADDRESS, -} from '../../../common/constants' +import { MAX_UINT48, MAX_UINT192 } from '../../../common/constants' import { CollateralFixtureContext, CollateralTestSuiteFixtures, CollateralStatus, } from './pluginTestTypes' -import { - expectDecayedPrice, - expectExactPrice, - expectPrice, - expectUnpriced, -} from '../../utils/oracles' -import { - ERC20Mock, - FacadeWrite, - IAssetRegistry, - IERC20Metadata, - InvalidMockV3Aggregator, - MockV3Aggregator, - TestIBackingManager, - TestIBasketHandler, - TestICollateral, - TestIDeployer, - TestIMain, - TestIRevenueTrader, - TestIRToken, -} from '../../../typechain' +import { expectPrice, expectUnpriced } from '../../utils/oracles' import snapshotGasCost from '../../utils/snapshotGasCost' -import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../../fixtures' +import { IMPLEMENTATION, Implementation } from '../../fixtures' +// const describeFork = useEnv('FORK') ? describe : describe.skip const getDescribeFork = (targetNetwork = 'mainnet') => { return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip } @@ -80,7 +56,6 @@ export default function fn( itChecksTargetPerRefDefault, itChecksRefPerTokDefault, itChecksPriceChanges, - itChecksNonZeroDefaultThreshold, itHasRevenueHiding, itIsPricedByPeg, resetFork, @@ -130,12 +105,6 @@ export default function fn( ) }) - itChecksNonZeroDefaultThreshold('does not allow 0 defaultThreshold', async () => { - await expect(deployCollateral({ defaultThreshold: bn('0') })).to.be.revertedWith( - 'defaultThreshold zero' - ) - }) - describe('collateral-specific tests', collateralSpecificConstructorTests) }) @@ -317,40 +286,28 @@ export default function fn( expect(newHigh).to.be.gt(initHigh) }) - it('decays for 0-valued oracle', async () => { - const initialPrice = await collateral.price() - + it('returns unpriced for 0-valued oracle', async () => { // Set price of underlying to 0 const updateAnswerTx = await chainlinkFeed.updateAnswer(0) await updateAnswerTx.wait() - // Price remains same at first, though IFFY - await collateral.refresh() - await expectExactPrice(collateral.address, initialPrice) - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - - // After oracle timeout decay begins - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(1 + oracleTimeout / 12) - await collateral.refresh() - await expectDecayedPrice(collateral.address) - - // After price timeout it becomes unpriced - const priceTimeout = await collateral.priceTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) - await advanceBlocks(1 + priceTimeout / 12) + // (0, FIX_MAX) is returned await expectUnpriced(collateral.address) - // When refreshed, sets status to DISABLED + // When refreshed, sets status to Unpriced await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('does not revert in case of invalid timestamp', async () => { + it('reverts in case of invalid timestamp', async () => { await chainlinkFeed.setInvalidTimestamp() - // When refreshed, sets status to IFFY + // Check price of token + const [low, high] = await collateral.price() + expect(low).to.equal(0) + expect(high).to.equal(MAX_UINT192) + + // When refreshed, sets status to Unpriced await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -362,29 +319,14 @@ export default function fn( }) // Should remain SOUND after a 1% decrease - let refPerTok = await ctx.collateral.refPerTok() await reduceRefPerTok(ctx, 1) // 1% decrease await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) - // refPerTok should be unchanged - expect(await ctx.collateral.refPerTok()).to.be.closeTo( - refPerTok, - refPerTok.div(bn('1e3')) - ) // within 1-part-in-1-thousand - // Should become DISABLED if drops more than that - refPerTok = await ctx.collateral.refPerTok() await reduceRefPerTok(ctx, 1) // another 1% decrease await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) - - // refPerTok should have fallen 1% - refPerTok = refPerTok.sub(refPerTok.div(100)) - expect(await ctx.collateral.refPerTok()).to.be.closeTo( - refPerTok, - refPerTok.div(bn('1e3')) - ) // within 1-part-in-1-thousand }) it('reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -419,36 +361,29 @@ export default function fn( expect(await collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('decays price over priceTimeout period', async () => { + it('decays lotPrice over priceTimeout period', async () => { + // Prices should start out equal await collateral.refresh() - const savedLow = await collateral.savedLowPrice() - const savedHigh = await collateral.savedHighPrice() - // Price should start out at saved prices - let p = await collateral.price() - expect(p[0]).to.equal(savedLow) - expect(p[1]).to.equal(savedHigh) + const p = await collateral.price() + let lotP = await collateral.lotPrice() + expect(p.length).to.equal(lotP.length) + expect(p[0]).to.equal(lotP[0]) + expect(p[1]).to.equal(lotP[1]) await advanceTime(await collateral.oracleTimeout()) // Should be roughly half, after half of priceTimeout const priceTimeout = await collateral.priceTimeout() await advanceTime(priceTimeout / 2) - p = await collateral.price() - expect(p[0]).to.be.closeTo(savedLow.div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand - expect(p[1]).to.be.closeTo(savedHigh.mul(2), p[1].mul(2).div(10000)) // 1 part in 10 thousand + lotP = await collateral.lotPrice() + expect(lotP[0]).to.be.closeTo(p[0].div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand + expect(lotP[1]).to.be.closeTo(p[1].div(2), p[1].div(2).div(10000)) // 1 part in 10 thousand - // Should be unpriced after full priceTimeout + // Should be 0 after full priceTimeout await advanceTime(priceTimeout / 2) - await expectUnpriced(collateral.address) - }) - - it('lotPrice (deprecated) is equal to price()', async () => { - const lotPrice = await collateral.lotPrice() - const price = await collateral.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) + lotP = await collateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) }) }) @@ -612,9 +547,9 @@ export default function fn( await advanceTime( (await collateral.priceTimeout()) + (await collateral.oracleTimeout()) ) - const p = await collateral.price() - expect(p[0]).to.equal(0) - expect(p[1]).to.equal(MAX_UINT192) + const lotP = await collateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) }) itChecksRefPerTokDefault('after hard default', async () => { @@ -633,368 +568,5 @@ export default function fn( }) }) }) - - describe('integration tests', () => { - before(resetFork) - - let ctx: X - let owner: SignerWithAddress - let addr1: SignerWithAddress - - let chainId: number - - let defaultFixture: Fixture - - let supply: BigNumber - - // Tokens/Assets - let pairedColl: TestICollateral - let pairedERC20: ERC20Mock - let collateralERC20: IERC20Metadata - let collateral: TestICollateral - - // Core Contracts - let main: TestIMain - let rToken: TestIRToken - let assetRegistry: IAssetRegistry - let backingManager: TestIBackingManager - let basketHandler: TestIBasketHandler - let rTokenTrader: TestIRevenueTrader - - let deployer: TestIDeployer - let facadeWrite: FacadeWrite - let govParams: IGovParams - let govRoles: IGovRoles - - const config = { - dist: { - rTokenDist: bn(100), // 100% RToken - rsrDist: bn(0), // 0% RSR - }, - minTradeVolume: bn('0'), // $0 - rTokenMaxTradeVolume: MAX_UINT192, // +inf - shortFreeze: bn('259200'), // 3 days - longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days - unstakingDelay: bn('1209600'), // 2 weeks - withdrawalLeak: fp('0'), // 0%; always refresh - warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) - tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) - batchAuctionLength: bn('900'), // 15 minutes - dutchAuctionLength: bn('1800'), // 30 minutes - backingBuffer: fp('0'), // 0% - maxTradeSlippage: fp('0.01'), // 1% - issuanceThrottle: { - amtRate: fp('1e6'), // 1M RToken - pctRate: fp('0.05'), // 5% - }, - redemptionThrottle: { - amtRate: fp('1e6'), // 1M RToken - pctRate: fp('0.05'), // 5% - }, - } - - interface IntegrationFixture { - ctx: X - protocol: DefaultFixture - } - - const integrationFixture: Fixture = - async function (): Promise { - return { - ctx: await loadFixture( - makeCollateralFixtureContext(owner, { maxTradeVolume: MAX_UINT192 }) - ), - protocol: await loadFixture(defaultFixture), - } - } - - before(async () => { - defaultFixture = await getDefaultFixture(collateralName) - chainId = await getChainId(hre) - if (useEnv('FORK_NETWORK').toLowerCase() === 'base') chainId = 8453 - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - ;[, owner, addr1] = await ethers.getSigners() - }) - - beforeEach(async () => { - let protocol: DefaultFixture - ;({ ctx, protocol } = await loadFixture(integrationFixture)) - ;({ collateral } = ctx) - ;({ deployer, facadeWrite, govParams } = protocol) - - supply = fp('1') - - // Create a paired collateral of the same targetName - pairedColl = await makePairedCollateral(await collateral.targetName()) - await pairedColl.refresh() - expect(await pairedColl.status()).to.equal(CollateralStatus.SOUND) - pairedERC20 = await ethers.getContractAt('ERC20Mock', await pairedColl.erc20()) - - // Prep collateral - collateralERC20 = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) - await mintCollateralTo( - ctx, - toBNDecimals(fp('1'), await collateralERC20.decimals()), - addr1, - addr1.address - ) - - // Set primary basket - const rTokenSetup: IRTokenSetup = { - assets: [], - primaryBasket: [collateral.address, pairedColl.address], - weights: [fp('0.5e-4'), fp('0.5e-4')], - backups: [], - beneficiaries: [], - } - - // Deploy RToken via FacadeWrite - const receipt = await ( - await facadeWrite.connect(owner).deployRToken( - { - name: 'RTKN RToken', - symbol: 'RTKN', - mandate: 'mandate', - params: config, - }, - rTokenSetup - ) - ).wait() - - // Get Main - const mainAddr = expectInIndirectReceipt(receipt, deployer.interface, 'RTokenCreated').args - .main - main = await ethers.getContractAt('TestIMain', mainAddr) - - // Get core contracts - assetRegistry = ( - await ethers.getContractAt('IAssetRegistry', await main.assetRegistry()) - ) - backingManager = ( - await ethers.getContractAt('TestIBackingManager', await main.backingManager()) - ) - basketHandler = ( - await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) - ) - rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) - rTokenTrader = ( - await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) - ) - - // Set initial governance roles - govRoles = { - owner: owner.address, - guardian: ZERO_ADDRESS, - pausers: [], - shortFreezers: [], - longFreezers: [], - } - // Setup owner and unpause - await facadeWrite.connect(owner).setupGovernance( - rToken.address, - false, // do not deploy governance - true, // unpaused - govParams, // mock values, not relevant - govRoles - ) - - // Advance past warmup period - await setNextBlockTimestamp( - (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) - ) - - // Should issue - await collateralERC20.connect(addr1).approve(rToken.address, MAX_UINT256) - await pairedERC20.connect(addr1).approve(rToken.address, MAX_UINT256) - await rToken.connect(addr1).issue(supply) - }) - - it('can be put into an RToken basket', async () => { - await assetRegistry.refresh() - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - }) - - it('issues', async () => { - // Issuance in beforeEach - expect(await rToken.totalSupply()).to.equal(supply) - }) - - it('redeems', async () => { - await rToken.connect(addr1).redeem(supply) - expect(await rToken.totalSupply()).to.equal(0) - const initialCollBal = toBNDecimals(fp('1'), await collateralERC20.decimals()) - expect(await collateralERC20.balanceOf(addr1.address)).to.be.closeTo( - initialCollBal, - initialCollBal.div(bn('1e5')) // 1-part-in-100k - ) - }) - - it('rebalances out of the collateral', async () => { - // Remove collateral from basket - await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) - await expect(basketHandler.connect(owner).refreshBasket()) - .to.emit(basketHandler, 'BasketSet') - .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) - await setNextBlockTimestamp( - (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() - ) - - // Run rebalancing auction - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) - .to.emit(backingManager, 'TradeStarted') - .withArgs(anyValue, collateralERC20.address, pairedERC20.address, anyValue, anyValue) - const tradeAddr = await backingManager.trades(collateralERC20.address) - expect(tradeAddr).to.not.equal(ZERO_ADDRESS) - const trade = await ethers.getContractAt('DutchTrade', tradeAddr) - expect(await trade.sell()).to.equal(collateralERC20.address) - expect(await trade.buy()).to.equal(pairedERC20.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) - await pairedERC20.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - const pairedBal = await pairedERC20.balanceOf(backingManager.address) - await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') - expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) - expect(await backingManager.tradesOpen()).to.equal(0) - }) - - it('forwards revenue and sells in a revenue auction', async () => { - // Send excess collateral to the RToken trader via forwardRevenue() - const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) - await mintCollateralTo( - ctx, - mintAmt.gt('150') ? mintAmt : bn('150'), - addr1, - backingManager.address - ) - await backingManager.forwardRevenue([collateralERC20.address]) - expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) - - // Run revenue auction - await expect( - rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) - ) - .to.emit(rTokenTrader, 'TradeStarted') - .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) - const tradeAddr = await rTokenTrader.trades(collateralERC20.address) - expect(tradeAddr).to.not.equal(ZERO_ADDRESS) - const trade = await ethers.getContractAt('DutchTrade', tradeAddr) - expect(await trade.sell()).to.equal(collateralERC20.address) - expect(await trade.buy()).to.equal(rToken.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) - await rToken.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') - expect(await rTokenTrader.tradesOpen()).to.equal(0) - }) - - // === Integration Test Helpers === - - const makePairedCollateral = async (target: string): Promise => { - const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' - const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( - 'MockV3Aggregator' - ) - const chainlinkFeed: MockV3Aggregator = ( - await MockV3AggregatorFactory.deploy(8, bn('1e8')) - ) - - if (target == ethers.utils.formatBytes32String('USD')) { - // USD - const erc20 = await ethers.getContractAt( - 'IERC20Metadata', - onBase ? networkConfig[chainId].tokens.USDbC! : networkConfig[chainId].tokens.USDC! - ) - const whale = onBase - ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' - : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' - await whileImpersonating(whale, async (signer) => { - await erc20 - .connect(signer) - .transfer(addr1.address, await erc20.balanceOf(signer.address)) - }) - const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( - 'FiatCollateral' - ) - return await FiatCollateralFactory.deploy({ - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: chainlinkFeed.address, - oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01'), // 1% - delayUntilDefault: bn('86400'), // 24h, - }) - } else if (target == ethers.utils.formatBytes32String('ETH')) { - // ETH - const erc20 = await ethers.getContractAt( - 'IERC20Metadata', - networkConfig[chainId].tokens.WETH! - ) - const whale = onBase - ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' - : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' - await whileImpersonating(whale, async (signer) => { - await erc20 - .connect(signer) - .transfer(addr1.address, await erc20.balanceOf(signer.address)) - }) - const SelfReferentialFactory: ContractFactory = await ethers.getContractFactory( - 'SelfReferentialCollateral' - ) - return await SelfReferentialFactory.deploy({ - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: chainlinkFeed.address, - oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0'), // 0% - delayUntilDefault: bn('0'), // 0, - }) - } else if (target == ethers.utils.formatBytes32String('BTC')) { - // No official WBTC on base yet - if (onBase) throw new Error('no WBTC on base') - // BTC - const targetUnitOracle: MockV3Aggregator = ( - await MockV3AggregatorFactory.deploy(8, bn('1e8')) - ) - const erc20 = await ethers.getContractAt( - 'IERC20Metadata', - networkConfig[chainId].tokens.WBTC! - ) - await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { - await erc20 - .connect(signer) - .transfer(addr1.address, await erc20.balanceOf(signer.address)) - }) - const NonFiatFactory: ContractFactory = await ethers.getContractFactory( - 'NonFiatCollateral' - ) - return await NonFiatFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: chainlinkFeed.address, - oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01'), // 1% - delayUntilDefault: bn('86400'), // 24h, - }, - targetUnitOracle.address, - ORACLE_TIMEOUT - ) - } else { - throw new Error(`Unknown target: ${target}`) - } - } - }) }) } diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 921b3f1bec..876b6e5e52 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -10,13 +10,7 @@ import { PRICE_TIMEOUT, REVENUE_HIDING, } from '../../../fixtures' -import { - DefaultFixture, - Fixture, - getDefaultFixture, - ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, -} from '../fixtures' +import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' import { @@ -28,12 +22,7 @@ import { IRTokenSetup, networkConfig, } from '../../../../common/configuration' -import { - CollateralStatus, - MAX_UINT48, - MAX_UINT192, - ZERO_ADDRESS, -} from '../../../../common/constants' +import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../../../common/constants' import { expectEvents, expectInIndirectReceipt } from '../../../../common/events' import { bn, fp, toBNDecimals } from '../../../../common/numbers' import { whileImpersonating } from '../../../utils/impersonation' @@ -218,7 +207,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -241,7 +230,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -436,7 +425,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -472,7 +461,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -480,24 +469,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi REVENUE_HIDING ) ).to.be.revertedWith('referenceERC20Decimals missing') - - // defaultThreshold = 0 - await expect( - CTokenCollateralFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, - oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: bn(0), - delayUntilDefault, - }, - REVENUE_HIDING - ) - ).to.be.revertedWith('defaultThreshold zero') }) }) @@ -695,14 +666,10 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + await advanceTime(ORACLE_TIMEOUT.toString()) - // Price is at saved prices - const savedLowPrice = await cDaiCollateral.savedLowPrice() - const savedHighPrice = await cDaiCollateral.savedHighPrice() - const p = await cDaiCollateral.price() - expect(p[0]).to.equal(savedLowPrice) - expect(p[1]).to.equal(savedHighPrice) + // Compound + await expectUnpriced(cDaiCollateral.address) // Refresh should mark status IFFY await cDaiCollateral.refresh() @@ -718,7 +685,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -743,7 +710,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -760,15 +727,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await zeropriceCtokenCollateral.refresh() expect(await zeropriceCtokenCollateral.status()).to.equal(CollateralStatus.IFFY) }) - - it('lotPrice (deprecated) is equal to price()', async () => { - const lotPrice = await cDaiCollateral.lotPrice() - const price = await cDaiCollateral.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) - }) }) // Note: Here the idea is to test all possible statuses and check all possible paths to default @@ -1096,9 +1054,9 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime( (await cDaiCollateral.priceTimeout()) + (await cDaiCollateral.oracleTimeout()) ) - const p = await cDaiCollateral.price() - expect(p[0]).to.equal(0) - expect(p[1]).to.equal(MAX_UINT192) + const lotP = await cDaiCollateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) await snapshotGasCost(cDaiCollateral.refresh()) await snapshotGasCost(cDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) diff --git a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap index 23638304fb..b0874c79c7 100644 --- a/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv2/__snapshots__/CTokenFiatCollateral.test.ts.snap @@ -4,26 +4,26 @@ exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 transfer exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting ERC20 transfer 2`] = `173113`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119350`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 1`] = `119361`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117681`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after full price timeout 2`] = `117692`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76220`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 1`] = `76242`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68538`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after hard default 2`] = `68560`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119350`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 1`] = `119361`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117681`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after oracle timeout 2`] = `117692`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138759`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 1`] = `138781`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138685`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() after soft default 2`] = `138707`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139836`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 1`] = `139858`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139836`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during SOUND 2`] = `139858`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `174982`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 1`] = `175004`; -exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139039`; +exports[`CTokenFiatCollateral - Mainnet Forking P1 Gas Reporting refresh() during soft default 2`] = `139061`; diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 7c91bd2064..45f9e0cc8e 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -22,7 +22,6 @@ import { CometMock__factory, TestICollateral, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { MAX_UINT48 } from '../../../../common/constants' import { expect } from 'chai' @@ -120,9 +119,6 @@ export const deployCollateral = async ( ) await collateral.deployed() - // Push forward chainlink feed - await pushOracleForward(opts.chainlinkFeed!) - // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -357,7 +353,6 @@ const collateralSpecificStatusTests = () => { }) // Should remain SOUND after a 1% decrease - let refPerTok = await collateral.refPerTok() let currentExchangeRate = await wcusdcV3Mock.exchangeRate() await wcusdcV3Mock.setMockExchangeRate( true, @@ -366,11 +361,7 @@ const collateralSpecificStatusTests = () => { await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - // refPerTok should be unchanged - expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand - // Should become DISABLED if drops more than that - refPerTok = await collateral.refPerTok() currentExchangeRate = await wcusdcV3Mock.exchangeRate() await wcusdcV3Mock.setMockExchangeRate( true, @@ -378,10 +369,6 @@ const collateralSpecificStatusTests = () => { ) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - - // refPerTok should have fallen 1% - refPerTok = refPerTok.sub(refPerTok.div(100)) - expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) } @@ -409,7 +396,6 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemented in this file itIsPricedByPeg: true, resetFork, diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index 7e4d782570..cbbd48ed43 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -103,43 +103,12 @@ describeFork('Wrapped CUSDCv3', () => { expect(await wcusdcV3.balanceOf(don.address)).to.eq(expectedAmount) }) - it('checks for correct approval on deposit - regression test', async () => { - await expect( - wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) - ).revertedWithCustomError(wcusdcV3, 'Unauthorized') - - // Provide approval on the wrapper - await wcusdcV3.connect(bob).allow(don.address, true) - - const expectedAmount = await wcusdcV3.convertDynamicToStatic( - await cusdcV3.balanceOf(bob.address) - ) - - // This should fail even when bob approved wcusdcv3 to spend his tokens, - // because there is no explicit approval of cUSDCv3 from bob to don, only - // approval on the wrapper - await expect( - wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) - ).to.be.revertedWithCustomError(cusdcV3, 'Unauthorized') - - // Add explicit approval of cUSDCv3 and retry - await cusdcV3.connect(bob).allow(don.address, true) - await wcusdcV3 - .connect(don) - .depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) - - expect(await wcusdcV3.balanceOf(bob.address)).to.eq(0) - expect(await wcusdcV3.balanceOf(charles.address)).to.eq(expectedAmount) - }) - it('deposits from a different account', async () => { expect(await wcusdcV3.balanceOf(charles.address)).to.eq(0) await expect( wcusdcV3.connect(don).depositFrom(bob.address, charles.address, ethers.constants.MaxUint256) ).revertedWithCustomError(wcusdcV3, 'Unauthorized') - - // Approval has to be on cUsdcV3, not the wrapper - await cusdcV3.connect(bob).allow(don.address, true) + await wcusdcV3.connect(bob).connect(bob).allow(don.address, true) const expectedAmount = await wcusdcV3.convertDynamicToStatic( await cusdcV3.balanceOf(bob.address) ) @@ -654,44 +623,6 @@ describeFork('Wrapped CUSDCv3', () => { expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(0) }) - it('caps at balance to avoid reverts when claiming rewards (claimTo)', async () => { - const compToken = await ethers.getContractAt('ERC20Mock', COMP) - expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) - await advanceTime(1000) - await enableRewardsAccrual(cusdcV3) - - // Accrue multiple times - for (let i = 0; i < 10; i++) { - await advanceTime(1000) - await wcusdcV3.accrue() - } - - // Get rewards from Comet - const cometRewards = await ethers.getContractAt('ICometRewards', REWARDS) - await whileImpersonating(wcusdcV3.address, async (signer) => { - await cometRewards - .connect(signer) - .claimTo(cusdcV3.address, wcusdcV3.address, wcusdcV3.address, true) - }) - - // Accrue individual account - await wcusdcV3.accrueAccount(bob.address) - - // Due to rounding, balance is smaller that owed - const owed = await wcusdcV3.getRewardOwed(bob.address) - const bal = await compToken.balanceOf(wcusdcV3.address) - expect(owed).to.be.greaterThan(bal) - - // Should still be able to claimTo (caps at balance) - const balanceBobPrev = await compToken.balanceOf(bob.address) - await expect(wcusdcV3.connect(bob).claimTo(bob.address, bob.address)).to.emit( - wcusdcV3, - 'RewardsClaimed' - ) - - expect(await compToken.balanceOf(bob.address)).to.be.greaterThan(balanceBobPrev) - }) - it('claims rewards and sends to claimer (claimRewards)', async () => { const compToken = await ethers.getContractAt('ERC20Mock', COMP) expect(await compToken.balanceOf(wcusdcV3.address)).to.equal(0) diff --git a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap index d2dee358c6..a899da3b86 100644 --- a/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/compoundv3/__snapshots__/CometTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting ERC20 exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `90521`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109052`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `109063`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104315`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `104326`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134449`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `134471`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126766`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `126788`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109052`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `109063`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104315`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `104326`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `132572`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `107053`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `126704`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `103985`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126763`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `126785`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126763`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `126785`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134314`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `134336`; -exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127045`; +exports[`Collateral: CompoundV3USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `127067`; diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 1e4fe95ab9..2cd38cd51e 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -4,67 +4,29 @@ import { CurveCollateralTestSuiteFixtures, } from './pluginTestTypes' import { CollateralStatus } from '../pluginTestTypes' -import hre, { ethers } from 'hardhat' -import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' -import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { BigNumber, ContractFactory } from 'ethers' -import { getChainId } from '../../../../common/blockchain-utils' -import { bn, fp, toBNDecimals } from '../../../../common/numbers' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' -import { expectInIndirectReceipt } from '../../../../common/events' -import { whileImpersonating } from '../../../utils/impersonation' -import { - MAX_UINT48, - MAX_UINT192, - MAX_UINT256, - TradeKind, - ZERO_ADDRESS, - ONE_ADDRESS, -} from '../../../../common/constants' +import { ethers } from 'hardhat' +import { ERC20Mock, InvalidMockV3Aggregator } from '../../../../typechain' +import { BigNumber } from 'ethers' +import { bn, fp } from '../../../../common/numbers' +import { MAX_UINT48, ZERO_ADDRESS, ONE_ADDRESS } from '../../../../common/constants' import { expect } from 'chai' import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { useEnv } from '#/utils/env' -import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../utils/oracles' -import { - IGovParams, - IGovRoles, - IRTokenSetup, - networkConfig, -} from '../../../../common/configuration' +import { expectUnpriced } from '../../../utils/oracles' import { advanceBlocks, advanceTime, - getLatestBlockNumber, getLatestBlockTimestamp, setNextBlockTimestamp, } from '#/test/utils/time' -import { - ERC20Mock, - FacadeWrite, - IAssetRegistry, - IERC20Metadata, - InvalidMockV3Aggregator, - MockV3Aggregator, - TestIBackingManager, - TestIBasketHandler, - TestICollateral, - TestIDeployer, - TestIMain, - TestIRevenueTrader, - TestIRToken, -} from '../../../../typechain' import snapshotGasCost from '../../../utils/snapshotGasCost' -import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../../../fixtures' +import { IMPLEMENTATION, Implementation } from '../../../fixtures' const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip const describeFork = useEnv('FORK') ? describe : describe.skip -const getDescribeFork = (targetNetwork = 'mainnet') => { - return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip -} - export default function fn( fixtures: CurveCollateralTestSuiteFixtures ) { @@ -430,49 +392,29 @@ export default function fn( } }) - it('decays for 0-valued oracle', async () => { - const initialPrice = await ctx.collateral.price() - - // Set price of underlyings to 0 + it('returns unpriced for 0-valued oracle', async () => { for (const feed of ctx.feeds) { await feed.updateAnswer(0).then((e) => e.wait()) } - // Price remains same at first, though IFFY - await ctx.collateral.refresh() - await expectExactPrice(ctx.collateral.address, initialPrice) - expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) - - // After oracle timeout decay begins - const oracleTimeout = await ctx.collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(1 + oracleTimeout / 12) - await ctx.collateral.refresh() - await expectDecayedPrice(ctx.collateral.address) - - // After price timeout it becomes unpriced - const priceTimeout = await ctx.collateral.priceTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) - await advanceBlocks(1 + priceTimeout / 12) + // (0, FIX_MAX) is returned await expectUnpriced(ctx.collateral.address) - // When refreshed, sets status to DISABLED + // When refreshed, sets status to Unpriced await ctx.collateral.refresh() - expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) it('does not revert in case of invalid timestamp', async () => { await ctx.feeds[0].setInvalidTimestamp() - // When refreshed, sets status to IFFY + // When refreshed, sets status to Unpriced await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('handles stale price', async () => { - await advanceTime( - (await ctx.collateral.oracleTimeout()) + (await ctx.collateral.priceTimeout()) - ) + it('Handles stale price', async () => { + await advanceTime(await ctx.collateral.priceTimeout()) // (0, FIX_MAX) is returned await expectUnpriced(ctx.collateral.address) @@ -482,36 +424,28 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) - it('decays price over priceTimeout period', async () => { - const savedLow = await ctx.collateral.savedLowPrice() - const savedHigh = await ctx.collateral.savedHighPrice() - // Price should start out at saved prices - await ctx.collateral.refresh() - let p = await ctx.collateral.price() - expect(p[0]).to.equal(savedLow) - expect(p[1]).to.equal(savedHigh) + it('decays lotPrice over priceTimeout period', async () => { + // Prices should start out equal + const p = await ctx.collateral.price() + let lotP = await ctx.collateral.lotPrice() + expect(p.length).to.equal(lotP.length) + expect(p[0]).to.equal(lotP[0]) + expect(p[1]).to.equal(lotP[1]) await advanceTime(await ctx.collateral.oracleTimeout()) // Should be roughly half, after half of priceTimeout const priceTimeout = await ctx.collateral.priceTimeout() await advanceTime(priceTimeout / 2) - p = await ctx.collateral.price() - expect(p[0]).to.be.closeTo(savedLow.div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand - expect(p[1]).to.be.closeTo(savedHigh.mul(2), p[1].mul(2).div(10000)) // 1 part in 10 thousand + lotP = await ctx.collateral.lotPrice() + expect(lotP[0]).to.be.closeTo(p[0].div(2), p[0].div(2).div(10000)) // 1 part in 10 thousand + expect(lotP[1]).to.be.closeTo(p[1].div(2), p[1].div(2).div(10000)) // 1 part in 10 thousand // Should be 0 after full priceTimeout await advanceTime(priceTimeout / 2) - await expectUnpriced(ctx.collateral.address) - }) - - it('lotPrice (deprecated) is equal to price()', async () => { - const lotPrice = await ctx.collateral.lotPrice() - const price = await ctx.collateral.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) + lotP = await ctx.collateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) }) }) @@ -683,8 +617,7 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // Decrease refPerTok by 1 part in a million - const refPerTok = await ctx.collateral.refPerTok() + // Decrease refPerTok by nearly 1 part in a million const currentExchangeRate = await ctx.curvePool.get_virtual_price() const newVirtualPrice = currentExchangeRate.sub(currentExchangeRate.div(bn('1e6'))).add(2) await ctx.curvePool.setVirtualPrice(newVirtualPrice) @@ -702,9 +635,6 @@ export default function fn( await expect(ctx.collateral.refresh()).to.emit(ctx.collateral, 'CollateralStatusChanged') expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) - - // refPerTok should have fallen exactly 2e-18 - expect(await ctx.collateral.refPerTok()).to.equal(refPerTok.sub(2)) }) describe('collateral-specific tests', collateralSpecificStatusTests) @@ -754,9 +684,9 @@ export default function fn( await advanceTime( (await ctx.collateral.priceTimeout()) + (await ctx.collateral.oracleTimeout()) ) - const p = await ctx.collateral.price() - expect(p[0]).to.equal(0) - expect(p[1]).to.equal(MAX_UINT192) + const lotP = await ctx.collateral.lotPrice() + expect(lotP[0]).to.equal(0) + expect(lotP[1]).to.equal(0) }) it('after hard default', async () => { @@ -778,360 +708,5 @@ export default function fn( }) }) }) - - // Only run full protocol integration tests on mainnet - // Protocol integration fixture not currently set up to deploy onto base - getDescribeFork('mainnet')('integration tests', () => { - before(resetFork) - - let ctx: X - let owner: SignerWithAddress - let addr1: SignerWithAddress - - let chainId: number - - let defaultFixture: Fixture - - let supply: BigNumber - - // Tokens/Assets - let pairedColl: TestICollateral - let pairedERC20: ERC20Mock - let collateralERC20: IERC20Metadata - let collateral: TestICollateral - - // Core Contracts - let main: TestIMain - let rToken: TestIRToken - let assetRegistry: IAssetRegistry - let backingManager: TestIBackingManager - let basketHandler: TestIBasketHandler - let rTokenTrader: TestIRevenueTrader - - let deployer: TestIDeployer - let facadeWrite: FacadeWrite - let govParams: IGovParams - let govRoles: IGovRoles - - const config = { - dist: { - rTokenDist: bn(100), // 100% RToken - rsrDist: bn(0), // 0% RSR - }, - minTradeVolume: bn('0'), // $0 - rTokenMaxTradeVolume: MAX_UINT192, // +inf - shortFreeze: bn('259200'), // 3 days - longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days - unstakingDelay: bn('1209600'), // 2 weeks - withdrawalLeak: fp('0'), // 0%; always refresh - warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) - tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) - batchAuctionLength: bn('900'), // 15 minutes - dutchAuctionLength: bn('1800'), // 30 minutes - backingBuffer: fp('0'), // 0% - maxTradeSlippage: fp('0.01'), // 1% - issuanceThrottle: { - amtRate: fp('1e6'), // 1M RToken - pctRate: fp('0.05'), // 5% - }, - redemptionThrottle: { - amtRate: fp('1e6'), // 1M RToken - pctRate: fp('0.05'), // 5% - }, - } - - interface IntegrationFixture { - ctx: X - protocol: DefaultFixture - } - - const integrationFixture: Fixture = - async function (): Promise { - return { - ctx: await loadFixture( - makeCollateralFixtureContext(owner, { maxTradeVolume: MAX_UINT192 }) - ), - protocol: await loadFixture(defaultFixture), - } - } - - before(async () => { - defaultFixture = await getDefaultFixture(collateralName) - chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - ;[, owner, addr1] = await ethers.getSigners() - }) - - beforeEach(async () => { - let protocol: DefaultFixture - ;({ ctx, protocol } = await loadFixture(integrationFixture)) - ;({ collateral } = ctx) - ;({ deployer, facadeWrite, govParams } = protocol) - - supply = fp('1') - - // Create a paired collateral of the same targetName - pairedColl = await makePairedCollateral(await collateral.targetName()) - await pairedColl.refresh() - expect(await pairedColl.status()).to.equal(CollateralStatus.SOUND) - pairedERC20 = await ethers.getContractAt('ERC20Mock', await pairedColl.erc20()) - - // Prep collateral - collateralERC20 = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) - await mintCollateralTo( - ctx, - toBNDecimals(fp('1'), await collateralERC20.decimals()), - addr1, - addr1.address - ) - - // Set primary basket - const rTokenSetup: IRTokenSetup = { - assets: [], - primaryBasket: [collateral.address, pairedColl.address], - weights: [fp('0.5e-4'), fp('0.5e-4')], - backups: [], - beneficiaries: [], - } - - // Deploy RToken via FacadeWrite - const receipt = await ( - await facadeWrite.connect(owner).deployRToken( - { - name: 'RTKN RToken', - symbol: 'RTKN', - mandate: 'mandate', - params: config, - }, - rTokenSetup - ) - ).wait() - - // Get Main - const mainAddr = expectInIndirectReceipt(receipt, deployer.interface, 'RTokenCreated').args - .main - main = await ethers.getContractAt('TestIMain', mainAddr) - - // Get core contracts - assetRegistry = ( - await ethers.getContractAt('IAssetRegistry', await main.assetRegistry()) - ) - backingManager = ( - await ethers.getContractAt('TestIBackingManager', await main.backingManager()) - ) - basketHandler = ( - await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) - ) - rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) - rTokenTrader = ( - await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) - ) - - // Set initial governance roles - govRoles = { - owner: owner.address, - guardian: ZERO_ADDRESS, - pausers: [], - shortFreezers: [], - longFreezers: [], - } - // Setup owner and unpause - await facadeWrite.connect(owner).setupGovernance( - rToken.address, - false, // do not deploy governance - true, // unpaused - govParams, // mock values, not relevant - govRoles - ) - - // Advance past warmup period - await setNextBlockTimestamp( - (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) - ) - - // Should issue - await collateralERC20.connect(addr1).approve(rToken.address, MAX_UINT256) - await pairedERC20.connect(addr1).approve(rToken.address, MAX_UINT256) - await rToken.connect(addr1).issue(supply) - }) - - it('can be put into an RToken basket', async () => { - await assetRegistry.refresh() - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - }) - - it('issues', async () => { - // Issuance in beforeEach - expect(await rToken.totalSupply()).to.equal(supply) - }) - - it('redeems', async () => { - await rToken.connect(addr1).redeem(supply) - expect(await rToken.totalSupply()).to.equal(0) - const initialCollBal = toBNDecimals(fp('1'), await collateralERC20.decimals()) - expect(await collateralERC20.balanceOf(addr1.address)).to.be.closeTo( - initialCollBal, - initialCollBal.div(bn('1e5')) // 1-part-in-100k - ) - }) - - it('rebalances out of the collateral', async () => { - // Remove collateral from basket - await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) - await expect(basketHandler.connect(owner).refreshBasket()) - .to.emit(basketHandler, 'BasketSet') - .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) - await setNextBlockTimestamp( - (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() - ) - - // Run rebalancing auction - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) - .to.emit(backingManager, 'TradeStarted') - .withArgs(anyValue, collateralERC20.address, pairedERC20.address, anyValue, anyValue) - const tradeAddr = await backingManager.trades(collateralERC20.address) - expect(tradeAddr).to.not.equal(ZERO_ADDRESS) - const trade = await ethers.getContractAt('DutchTrade', tradeAddr) - expect(await trade.sell()).to.equal(collateralERC20.address) - expect(await trade.buy()).to.equal(pairedERC20.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) - await pairedERC20.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - const pairedBal = await pairedERC20.balanceOf(backingManager.address) - await expect(trade.connect(addr1).bid()).to.emit(backingManager, 'TradeSettled') - expect(await pairedERC20.balanceOf(backingManager.address)).to.be.gt(pairedBal) - expect(await backingManager.tradesOpen()).to.equal(0) - }) - - it('forwards revenue and sells in a revenue auction', async () => { - // Send excess collateral to the RToken trader via forwardRevenue() - const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) - await mintCollateralTo( - ctx, - mintAmt.gt('150') ? mintAmt : bn('150'), - addr1, - backingManager.address - ) - await backingManager.forwardRevenue([collateralERC20.address]) - expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) - - // Run revenue auction - await expect( - rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) - ) - .to.emit(rTokenTrader, 'TradeStarted') - .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) - const tradeAddr = await rTokenTrader.trades(collateralERC20.address) - expect(tradeAddr).to.not.equal(ZERO_ADDRESS) - const trade = await ethers.getContractAt('DutchTrade', tradeAddr) - expect(await trade.sell()).to.equal(collateralERC20.address) - expect(await trade.buy()).to.equal(rToken.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) - await rToken.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) - await expect(trade.connect(addr1).bid()).to.emit(rTokenTrader, 'TradeSettled') - expect(await rTokenTrader.tradesOpen()).to.equal(0) - }) - - // === Integration Test Helpers === - - const makePairedCollateral = async (target: string): Promise => { - const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( - 'MockV3Aggregator' - ) - const chainlinkFeed: MockV3Aggregator = ( - await MockV3AggregatorFactory.deploy(8, bn('1e8')) - ) - - if (target == ethers.utils.formatBytes32String('USD')) { - // USD - const erc20 = await ethers.getContractAt( - 'IERC20Metadata', - networkConfig[chainId].tokens.USDC! - ) - await whileImpersonating('0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf', async (signer) => { - await erc20 - .connect(signer) - .transfer(addr1.address, await erc20.balanceOf(signer.address)) - }) - const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( - 'FiatCollateral' - ) - return await FiatCollateralFactory.deploy({ - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: chainlinkFeed.address, - oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01'), // 1% - delayUntilDefault: bn('86400'), // 24h, - }) - } else if (target == ethers.utils.formatBytes32String('ETH')) { - // ETH - const erc20 = await ethers.getContractAt( - 'IERC20Metadata', - networkConfig[chainId].tokens.WETH! - ) - await whileImpersonating('0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E', async (signer) => { - await erc20 - .connect(signer) - .transfer(addr1.address, await erc20.balanceOf(signer.address)) - }) - const SelfReferentialFactory: ContractFactory = await ethers.getContractFactory( - 'SelfReferentialCollateral' - ) - return await SelfReferentialFactory.deploy({ - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: chainlinkFeed.address, - oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0'), // 0% - delayUntilDefault: bn('0'), // 0, - }) - } else if (target == ethers.utils.formatBytes32String('BTC')) { - // BTC - const targetUnitOracle: MockV3Aggregator = ( - await MockV3AggregatorFactory.deploy(8, bn('1e8')) - ) - const erc20 = await ethers.getContractAt( - 'IERC20Metadata', - networkConfig[chainId].tokens.WBTC! - ) - await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { - await erc20 - .connect(signer) - .transfer(addr1.address, await erc20.balanceOf(signer.address)) - }) - const NonFiatFactory: ContractFactory = await ethers.getContractFactory( - 'NonFiatCollateral' - ) - return await NonFiatFactory.deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: chainlinkFeed.address, - oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01'), // 1% - delayUntilDefault: bn('86400'), // 24h, - }, - targetUnitOracle.address, - ORACLE_TIMEOUT - ) - } else { - throw new Error(`Unknown target: ${target}`) - } - } - }) }) } diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index bbabc4c8aa..3ff406f171 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -7,14 +7,13 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' -import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' +import { expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, } from '../../../../../typechain' -import { advanceTime } from '../../../../utils/time' import { bn } from '../../../../../common/numbers' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' @@ -228,53 +227,17 @@ const collateralSpecificStatusTests = () => { // Set RTokenAsset to unpriced // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset await mockRTokenAsset.setPrice(0, MAX_UINT192) - await expectExactPrice(collateral.address, initialPrice) - - // Should decay after oracle timeout - await advanceTime(await collateral.oracleTimeout()) - await expectDecayedPrice(collateral.address) - - // Should be unpriced after price timeout - await advanceTime(await collateral.priceTimeout()) - await expectUnpriced(collateral.address) // refresh() should not revert await collateral.refresh() - }) - - it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { - const [collateral] = await deployCollateral({}) - const initialPrice = await collateral.price() - expect(initialPrice[0]).to.be.gt(0) - expect(initialPrice[1]).to.be.lt(MAX_UINT192) - - // Swap out eUSD's RTokenAsset with a mock one - const AssetMockFactory = await ethers.getContractFactory('AssetMock') - const mockRTokenAsset = await AssetMockFactory.deploy( - bn('1'), // unused - ONE_ADDRESS, // unused - bn('1'), // unused - eUSD, - bn('1'), // unused - bn('1') // unused - ) - const eUSDAssetRegistry = await ethers.getContractAt( - 'IAssetRegistry', - '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' - ) - await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { - await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) - }) - // Set RTokenAsset price to stale - await mockRTokenAsset.setStale(true) - expect(await mockRTokenAsset.stale()).to.be.true - - // Refresh CurveStableRTokenMetapoolCollateral - await collateral.refresh() + // Should be unpriced + await expectUnpriced(collateral.address) - // Stale should be false again - expect(await mockRTokenAsset.stale()).to.be.false + // Lot price should be initial price + const lotP = await collateral.lotPrice() + expect(lotP[0]).to.eq(initialPrice[0]) + expect(lotP[1]).to.eq(initialPrice[1]) }) } diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap index 4e3d02729f..ea00035779 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableMetapoolSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collatera exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `360937`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251771`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246889`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52713`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `79713`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `79713`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246886`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254482`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; -exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247214`; +exports[`Collateral: CurveStableMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap index b1bc4df8a7..7c535da1b7 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper col exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `385743`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480752`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589926`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478768`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474226`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544663`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713211`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713581`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701051`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693709`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; diff --git a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap index ffa84bf243..5f891c6870 100644 --- a/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/crv/__snapshots__/CrvStableTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functi exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `369452`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199560`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194678`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194675`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194675`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181820`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; -exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174552`; +exports[`Collateral: CurveStableCollateral - CurveGaugeWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 9000295bb8..5abe5c1ec6 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -7,14 +7,13 @@ import { import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' -import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' +import { expectUnpriced } from '../../../../utils/oracles' import { ERC20Mock, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, } from '../../../../../typechain' -import { advanceTime } from '../../../../utils/time' import { bn } from '../../../../../common/numbers' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' import { expect } from 'chai' @@ -230,53 +229,17 @@ const collateralSpecificStatusTests = () => { // Set RTokenAsset to unpriced // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset await mockRTokenAsset.setPrice(0, MAX_UINT192) - await expectExactPrice(collateral.address, initialPrice) - - // Should decay after oracle timeout - await advanceTime(await collateral.oracleTimeout()) - await expectDecayedPrice(collateral.address) - - // Should be unpriced after price timeout - await advanceTime(await collateral.priceTimeout()) - await expectUnpriced(collateral.address) // refresh() should not revert await collateral.refresh() - }) - - it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { - const [collateral] = await deployCollateral({}) - const initialPrice = await collateral.price() - expect(initialPrice[0]).to.be.gt(0) - expect(initialPrice[1]).to.be.lt(MAX_UINT192) - - // Swap out eUSD's RTokenAsset with a mock one - const AssetMockFactory = await ethers.getContractFactory('AssetMock') - const mockRTokenAsset = await AssetMockFactory.deploy( - bn('1'), // unused - ONE_ADDRESS, // unused - bn('1'), // unused - eUSD, - bn('1'), // unused - bn('1') // unused - ) - const eUSDAssetRegistry = await ethers.getContractAt( - 'IAssetRegistry', - '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' - ) - await whileImpersonating('0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', async (signer) => { - await eUSDAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) - }) - // Set RTokenAsset price to stale - await mockRTokenAsset.setStale(true) - expect(await mockRTokenAsset.stale()).to.be.true - - // Refresh CurveStableRTokenMetapoolCollateral - await collateral.refresh() + // Should be unpriced + await expectUnpriced(collateral.address) - // Stale should be false again - expect(await mockRTokenAsset.stale()).to.be.false + // Lot price should be initial price + const lotP = await collateral.lotPrice() + expect(lotP[0]).to.eq(initialPrice[0]) + expect(lotP[1]).to.eq(initialPrice[1]) }) } diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 8cbdd58345..c86ae829d6 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -9,6 +9,7 @@ import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { ERC20Mock, + IERC20, MockV3Aggregator, MockV3Aggregator__factory, TestICollateral, @@ -42,6 +43,7 @@ import { CRV, THREE_POOL_HOLDER, } from '../constants' +import { whileImpersonating } from '#/test/utils/impersonation' type Fixture = () => Promise @@ -411,6 +413,53 @@ const collateralSpecificStatusTests = () => { const finalRefPerTok = await multiFeedCollateral.refPerTok() expect(finalRefPerTok).to.equal(initialRefPerTok) }) + + it('handles shutdown correctly', async () => { + const fix = await makeW3PoolStable() + const [, alice, bob] = await ethers.getSigners() + const amount = fp('100') + const rewardPerBlock = bn('83197823300') + + const lpToken = ( + await ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', + await fix.wrapper.curveToken() + ) + ) + const CRV = ( + await ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', + '0xD533a949740bb3306d119CC777fa900bA034cd52' + ) + ) + await whileImpersonating(THREE_POOL_HOLDER, async (signer) => { + await lpToken.connect(signer).transfer(alice.address, amount.mul(2)) + }) + + await lpToken.connect(alice).approve(fix.wrapper.address, ethers.constants.MaxUint256) + await fix.wrapper.connect(alice).deposit(amount, alice.address) + + // let's shutdown! + await fix.wrapper.shutdown() + + const prevBalance = await CRV.balanceOf(alice.address) + await fix.wrapper.connect(alice).claimRewards() + expect(await CRV.balanceOf(alice.address)).to.be.eq(prevBalance.add(rewardPerBlock)) + + const prevBalanceBob = await CRV.balanceOf(bob.address) + + // transfer to bob + await fix.wrapper + .connect(alice) + .transfer(bob.address, await fix.wrapper.balanceOf(alice.address)) + + await fix.wrapper.connect(bob).claimRewards() + expect(await CRV.balanceOf(bob.address)).to.be.eq(prevBalanceBob.add(rewardPerBlock)) + + await expect(fix.wrapper.connect(alice).deposit(amount, alice.address)).to.be.reverted + await expect(fix.wrapper.connect(bob).withdraw(await fix.wrapper.balanceOf(bob.address))).to.not + .be.reverted + }) } /* diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap index 7920079d2a..7ccdd8462f 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableMetapoolSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collat exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `172551`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52713`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48245`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251771`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `251539`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246889`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `246657`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52713`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `52705`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48245`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `48237`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `79713`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `79713`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `47896`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246886`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246886`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `246654`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254482`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `254250`; -exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `247214`; +exports[`Collateral: CurveStableMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `246982`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap index 876202c6a6..d4975bf94d 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableRTokenMetapoolTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `175188`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `485368`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `69638`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `480900`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `65170`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `594734`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `226883`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `589778`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `222001`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `478546`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `101429`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `474004`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `96961`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `544811`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `536931`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `96620`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `713433`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `713507`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `221998`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `701125`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `209488`; -exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `693635`; +exports[`Collateral: CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `202220`; diff --git a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap index 80285bbb17..20e9558ee6 100644 --- a/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/curve/cvx/__snapshots__/CvxStableTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral fun exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting ERC20 Wrapper transfer 2`] = `123705`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after full price timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `199560`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 1`] = `200033`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `194678`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after hard default 2`] = `195151`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61884`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `61895`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57416`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `57427`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57075`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 1`] = `57086`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57075`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() after soft default 2`] = `57086`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `194675`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 1`] = `195148`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `194675`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during SOUND 2`] = `195148`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `181820`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 1`] = `182161`; -exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174552`; +exports[`Collateral: CurveStableCollateral - ConvexStakingWrapper collateral functionality Gas Reporting refresh() during soft default 2`] = `174893`; diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index a3bfbb93dc..77081254f6 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -71,8 +71,14 @@ export const makeW3PoolStable = async (): Promise => ) await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + // Deploy external cvxMining lib + const CvxMiningFactory = await ethers.getContractFactory('CvxMining') + const cvxMining = await CvxMiningFactory.deploy() + // Deploy Wrapper - const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { + libraries: { CvxMining: cvxMining.address }, + }) const wrapper = await wrapperFactory.deploy() await wrapper.initialize(THREE_POOL_CVX_POOL_ID) @@ -118,8 +124,14 @@ export const makeWSUSDPoolStable = async (): Promise => { await realMetapool.balanceOf(MIM_THREE_POOL_HOLDER) ) + // Deploy external cvxMining lib + const CvxMiningFactory = await ethers.getContractFactory('CvxMining') + const cvxMining = await CvxMiningFactory.deploy() + // Deploy Wrapper - const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper', { + libraries: { CvxMining: cvxMining.address }, + }) const wPool = await wrapperFactory.deploy() await wPool.initialize(MIM_THREE_POOL_POOL_ID) diff --git a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts index 4d539a4a25..7ee5c7dc01 100644 --- a/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/dsr/SDaiCollateralTestSuite.test.ts @@ -12,7 +12,6 @@ import { PotMock, TestICollateral, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -70,10 +69,6 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise = () => Promise @@ -42,7 +39,8 @@ interface RSRFixture { rsr: ERC20Mock } -async function rsrFixture(chainId: number): Promise { +async function rsrFixture(): Promise { + const chainId = await getChainId(hre) const rsr: ERC20Mock = ( await ethers.getContractAt('ERC20Mock', networkConfig[chainId].tokens.RSR || '') ) @@ -74,10 +72,9 @@ export interface DefaultFixture extends RSRAndModuleFixture { export const getDefaultFixture = async function (salt: string) { const defaultFixture: Fixture = async function (): Promise { - let chainId = await getChainId(hre) - if (useEnv('FORK_NETWORK').toLowerCase() == 'base') chainId = 8453 - const { rsr } = await rsrFixture(chainId) + const { rsr } = await rsrFixture() const { gnosis } = await gnosisFixture() + const chainId = await getChainId(hre) if (!networkConfig[chainId]) { throw new Error(`Missing network configuration for ${hre.network.name}`) } diff --git a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts index ea7c5554f2..8d0a4fe8e3 100644 --- a/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/flux-finance/FTokenFiatCollateral.test.ts @@ -9,7 +9,6 @@ import { MockV3Aggregator__factory, TestICollateral, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' @@ -129,9 +128,6 @@ all.forEach((curr: FTokenEnumeration) => { ) await collateral.deployed() - // Push forward chainlink feed - await pushOracleForward(opts.chainlinkFeed!) - // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible await expect(collateral.refresh()) @@ -256,7 +252,6 @@ all.forEach((curr: FTokenEnumeration) => { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: curr.testName, diff --git a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap index da1cb92e3a..b11dbcda01 100644 --- a/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/flux-finance/__snapshots__/FTokenFiatCollateral.test.ts.snap @@ -4,110 +4,110 @@ exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting ERC2 exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117350`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117361`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115681`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115692`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140959`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `140981`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139145`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139167`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117350`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117361`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115681`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115692`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `139157`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115338`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `139083`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115338`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139155`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139177`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139155`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139177`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141106`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141202`; -exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139511`; +exports[`Collateral: fDAI Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139459`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117542`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `117553`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115873`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `115884`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141215`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `141237`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139401`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `139423`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117542`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `117553`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115873`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `115884`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `139413`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `115530`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `139339`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `115530`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139411`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `139433`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139411`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `139433`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141362`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `141458`; -exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139693`; +exports[`Collateral: fFRAX Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `139789`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125832`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `125843`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124163`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `124174`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `149997`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `150019`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148183`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `148135`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125832`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `125843`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124163`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `124174`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `148121`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `123820`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `148121`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `123820`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148193`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `148215`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148193`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `148145`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150074`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `150096`; -exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148475`; +exports[`Collateral: fUSDC Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `148427`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ERC20 transfer 1`] = `142854`; exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting ERC20 transfer 2`] = `105831`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120480`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `120491`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118811`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `118822`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144361`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 1`] = `144383`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142477`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after hard default 2`] = `142569`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120480`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `120491`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118811`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `118822`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `142485`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 1`] = `118468`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `142415`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() after soft default 2`] = `118468`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142487`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `142579`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142557`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `142509`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144438`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 1`] = `144530`; -exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142839`; +exports[`Collateral: fUSDT Collateral collateral functionality Gas Reporting refresh() during soft default 2`] = `142861`; diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index 7ac77c01d1..d47e23919f 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -12,7 +12,6 @@ import { TestICollateral, IsfrxEth, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { CollateralStatus } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -85,10 +84,6 @@ export const deployCollateral = async (opts: CollateralOpts = {}): Promise {} // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => { - it('does revenue hiding correctly', async () => { + it('does revenue hiding', async () => { const MockFactory = await ethers.getContractFactory('SfraxEthMock') const erc20 = (await MockFactory.deploy()) as SfraxEthMock let currentPPS = await (await ethers.getContractAt('IsfrxEth', SFRX_ETH)).pricePerShare() @@ -215,24 +210,14 @@ const collateralSpecificStatusTests = () => { }) // Should remain SOUND after a 1% decrease - let refPerTok = await collateral.refPerTok() - const newPPS = currentPPS.sub(currentPPS.div(100)) - await erc20.setPricePerShare(newPPS) + await erc20.setPricePerShare(currentPPS.sub(currentPPS.div(100))) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - // refPerTok should be unchanged - expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand - - // Should become DISABLED if drops another 1% - refPerTok = await collateral.refPerTok() - await erc20.setPricePerShare(newPPS.sub(newPPS.div(100))) + // Should become DISABLED if drops more than that + await erc20.setPricePerShare(currentPPS.sub(currentPPS.div(99))) await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - - // refPerTok should have fallen 1% - refPerTok = refPerTok.sub(refPerTok.div(100)) - expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) } @@ -259,7 +244,6 @@ const opts = { itChecksTargetPerRefDefault: it.skip, itChecksRefPerTokDefault: it.skip, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemnted in this file resetFork, collateralName: 'SFraxEthCollateral', diff --git a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap index 58a27e8317..30de100fa3 100644 --- a/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/frax-eth/__snapshots__/SFrxEthTestSuite.test.ts.snap @@ -4,14 +4,14 @@ exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting E exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting ERC20 transfer 2`] = `34204`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58984`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 1`] = `58995`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54247`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after full price timeout 2`] = `54258`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59684`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `59695`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58015`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `58026`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73809`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 1`] = `73831`; -exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73809`; +exports[`Collateral: SFraxEthCollateral collateral functionality Gas Reporting refresh() during SOUND 2`] = `73831`; diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index 43d09c95be..cf4038f9aa 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -193,7 +193,6 @@ const opts = { getExpectedPrice, itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, - itChecksNonZeroDefaultThreshold: it.skip, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it.skip, diff --git a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts index 1f4213ac61..94593665b0 100644 --- a/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/LidoStakedEthTestSuite.test.ts @@ -12,7 +12,6 @@ import { TestICollateral, IWSTETH, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -92,11 +91,6 @@ export const deployCollateral = async ( opts.targetPerRefChainlinkTimeout, { gasLimit: 2000000000 } ) - - // Push forward chainlink feed - await pushOracleForward(opts.chainlinkFeed!) - await pushOracleForward(opts.targetPerRefChainlinkFeed!) - await collateral.deployed() // sometimes we are trying to test a negative test case and we want this to fail silently // fortunately this syntax fails silently because our tools are terrible @@ -267,7 +261,6 @@ const opts = { itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork, collateralName: 'LidoStakedETH', diff --git a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap index 7abbfa8057..dab42bfd76 100644 --- a/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap +++ b/test/plugins/individual-collateral/lido/__snapshots__/LidoStakedEthTestSuite.test.ts.snap @@ -4,26 +4,26 @@ exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting ERC20 exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting ERC20 transfer 2`] = `34564`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88033`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `88044`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83564`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `83575`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132876`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 1`] = `132898`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125193`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after hard default 2`] = `125215`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88033`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `88044`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83564`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `83575`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83223`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 1`] = `83234`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83223`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() after soft default 2`] = `83234`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125190`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `125212`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125190`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `125212`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129941`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 1`] = `129963`; -exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125472`; +exports[`Collateral: LidoStakedETH collateral functionality Gas Reporting refresh() during soft default 2`] = `125494`; diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index 5ffecb6582..6ecee49770 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -10,7 +10,6 @@ import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' import { CollateralOpts } from '../pluginTestTypes' -import { pushOracleForward } from '../../../utils/oracles' import { DEFAULT_THRESHOLD, DELAY_UNTIL_DEFAULT, @@ -24,7 +23,7 @@ import { MorphoAaveCollateralFixtureContext, mintCollateralTo } from './mintColl import { setCode } from '@nomicfoundation/hardhat-network-helpers' import { whileImpersonating } from '#/utils/impersonation' import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' -import { advanceBlocks, advanceTime } from '#/utils/time' +import { formatEther } from 'ethers/lib/utils' interface MAFiatCollateralOpts extends CollateralOpts { underlyingToken?: string @@ -35,8 +34,7 @@ interface MAFiatCollateralOpts extends CollateralOpts { const makeAaveFiatCollateralTestSuite = ( collateralName: string, - defaultCollateralOpts: MAFiatCollateralOpts, - specificTests = false + defaultCollateralOpts: MAFiatCollateralOpts ) => { const networkConfigToUse = networkConfig[31337] const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { @@ -54,6 +52,7 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) opts.erc20 = wrapperMock.address @@ -76,9 +75,6 @@ const makeAaveFiatCollateralTestSuite = ( ) await collateral.deployed() - // Push forward chainlink feed - await pushOracleForward(opts.chainlinkFeed!) - await expect(collateral.refresh()) return collateral @@ -103,6 +99,7 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) @@ -196,9 +193,7 @@ const makeAaveFiatCollateralTestSuite = ( */ const collateralSpecificConstructorTests = () => { it('tokenised deposits can correctly claim rewards', async () => { - const alice = hre.ethers.provider.getSigner(1) - const aliceAddress = await alice.getAddress() - + const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' const forkBlock = 17574117 const claimer = '0x05e818959c2Aa4CD05EDAe9A099c38e7Bdc377C6' const reset = getResetFork(forkBlock) @@ -211,41 +206,42 @@ const makeAaveFiatCollateralTestSuite = ( morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, underlyingERC20: defaultCollateralOpts.underlyingToken!, poolToken: defaultCollateralOpts.poolToken!, + rewardsDistributor: networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: networkConfigToUse.tokens.MORPHO!, }) - - const morphoTokenOwner = '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa' const vaultCode = await ethers.provider.getCode(usdtVault.address) await setCode(claimer, vaultCode) const vaultWithClaimableRewards = usdtVault.attach(claimer) - await whileImpersonating(hre, morphoTokenOwner, async (signer) => { - const morphoTokenInst = await ethers.getContractAt( - 'IMorphoToken', - networkConfigToUse.tokens.MORPHO!, - signer - ) - - await morphoTokenInst - .connect(signer) - .setUserRole(vaultWithClaimableRewards.address, 0, true) - }) const erc20Factory = await ethers.getContractFactory('ERC20Mock') const underlyingERC20 = erc20Factory.attach(defaultCollateralOpts.underlyingToken!) const depositAmount = utils.parseUnits('1000', 6) + const user = hre.ethers.provider.getSigner(0) + const userAddress = await user.getAddress() + + expect( + formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) + ).to.be.equal('0.0') + await whileImpersonating( hre, whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], async (whaleSigner) => { - await underlyingERC20.connect(whaleSigner).transfer(aliceAddress, depositAmount) + await underlyingERC20.connect(whaleSigner).approve(vaultWithClaimableRewards.address, 0) + await underlyingERC20 + .connect(whaleSigner) + .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) + await vaultWithClaimableRewards.connect(whaleSigner).mint(depositAmount, userAddress) } ) - await underlyingERC20.connect(alice).approve(vaultWithClaimableRewards.address, 0) - await underlyingERC20 - .connect(alice) - .approve(vaultWithClaimableRewards.address, ethers.constants.MaxUint256) - await vaultWithClaimableRewards.connect(alice).mint(depositAmount, aliceAddress) + + expect( + formatEther( + await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) + ).slice(0, '8.60295466891613'.length) + ).to.be.equal('8.60295466891613') + const morphoRewards = await ethers.getContractAt( 'IMorphoRewardsDistributor', networkConfigToUse.MORPHO_REWARDS_DISTRIBUTOR! @@ -265,79 +261,47 @@ const makeAaveFiatCollateralTestSuite = ( '0xea8c2ee8d43e37ceb7b0c04d59106eff88afbe3e911b656dec7caebd415ea696', ]) - // sync needs to be called after a claim to start a new payout period - // new tokens will only be moved into pending after a _claimAssetRewards call - // which sync allows you to do without the other stuff that happens in claimRewards - await vaultWithClaimableRewards.sync() - - await advanceTime(hre, 86400 * 7) - await advanceBlocks(hre, 7200 * 7) - expect(await vaultWithClaimableRewards.connect(alice).claimRewards()) expect( - await erc20Factory.attach(networkConfigToUse.tokens.MORPHO!).balanceOf(aliceAddress) - ).to.be.eq(bn('14162082619942089266')) - }) - it('Frontrunning claiming rewards is not economical', async () => { - const alice = hre.ethers.provider.getSigner(1) - const aliceAddress = await alice.getAddress() - const bob = hre.ethers.provider.getSigner(2) - const bobAddress = await bob.getAddress() + formatEther( + await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress) + ).slice(0, '14.162082619942089'.length) + ).to.be.equal('14.162082619942089') - const MorphoTokenisedDepositFactory = await ethers.getContractFactory( - 'MorphoAaveV2TokenisedDeposit' - ) - const ERC20Factory = await ethers.getContractFactory('ERC20Mock') - const mockRewardsToken = await ERC20Factory.deploy('MockMorphoReward', 'MMrp') - const underlyingERC20 = ERC20Factory.attach(defaultCollateralOpts.underlyingToken!) + // MORPHO is not a transferable token. + // POST Launch we could ask the Morpho team if our TokenVaults could get permission to transfer the MORPHO tokens. + // Otherwise owners of the TokenVault shares need to wait until the protocol enables the transfer function on the MORPHO token. - const vault = await MorphoTokenisedDepositFactory.deploy({ - morphoController: networkConfigToUse.MORPHO_AAVE_CONTROLLER!, - morphoLens: networkConfigToUse.MORPHO_AAVE_LENS!, - underlyingERC20: defaultCollateralOpts.underlyingToken!, - poolToken: defaultCollateralOpts.poolToken!, - rewardToken: mockRewardsToken.address, - }) + await whileImpersonating(hre, morphoTokenOwner, async (signer) => { + const morphoTokenInst = await ethers.getContractAt( + 'IMorphoToken', + networkConfigToUse.tokens.MORPHO!, + signer + ) - const depositAmount = utils.parseUnits('1000', 6) + await morphoTokenInst + .connect(signer) + .setUserRole(vaultWithClaimableRewards.address, 0, true) + }) - await whileImpersonating( - hre, - whales[defaultCollateralOpts.underlyingToken!.toLowerCase()], - async (whaleSigner) => { - await underlyingERC20.connect(whaleSigner).transfer(aliceAddress, depositAmount) - await underlyingERC20.connect(whaleSigner).transfer(bobAddress, depositAmount.mul(10)) - } + const morphoTokenInst = await ethers.getContractAt( + 'IMorphoToken', + networkConfigToUse.tokens.MORPHO!, + user ) + expect(formatEther(await morphoTokenInst.balanceOf(userAddress))).to.be.equal('0.0') - await underlyingERC20.connect(alice).approve(vault.address, ethers.constants.MaxUint256) - await vault.connect(alice).mint(depositAmount, aliceAddress) - - // Simulate inflation attack - await underlyingERC20.connect(bob).approve(vault.address, ethers.constants.MaxUint256) - await vault.connect(bob).mint(depositAmount.mul(10), bobAddress) + await vaultWithClaimableRewards.claimRewards() - await mockRewardsToken.mint(vault.address, bn('1000000000000000000000')) - await vault.sync() - - await vault.connect(bob).claimRewards() - await vault.connect(bob).redeem(depositAmount.mul(10), bobAddress, bobAddress) - - // After the inflation attack - await advanceTime(hre, 86400 * 7) - await advanceBlocks(hre, 7200 * 7) - await vault.connect(alice).claimRewards() + expect( + formatEther(await vaultWithClaimableRewards.callStatic.rewardTokenBalance(userAddress)) + ).to.be.equal('0.0') - // Shown below is that it is no longer economical to inflate own shares - // bob only managed to steal approx 1/7200 * 90% of the reward because hardhat increments block by 1 - // in practise it would be 0 as inflation attacks typically flashloan assets. - expect(await mockRewardsToken.balanceOf(aliceAddress)).to.be.closeTo( - bn('999996993746993746995'), - bn('1e15') - ) - expect(await mockRewardsToken.balanceOf(bobAddress)).to.be.closeTo( - bn('1503126503126502'), - bn('1e12') - ) + expect( + formatEther(await morphoTokenInst.balanceOf(userAddress)).slice( + 0, + '14.162082619942089'.length + ) + ).to.be.equal('14.162082619942089') }) } @@ -348,9 +312,7 @@ const makeAaveFiatCollateralTestSuite = ( const opts = { deployCollateral, - collateralSpecificConstructorTests: specificTests - ? collateralSpecificConstructorTests - : () => void 0, + collateralSpecificConstructorTests: collateralSpecificConstructorTests, collateralSpecificStatusTests, beforeEachRewardsTest, makeCollateralFixtureContext, @@ -364,7 +326,6 @@ const makeAaveFiatCollateralTestSuite = ( itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, resetFork: getResetFork(FORK_BLOCK), collateralName, @@ -403,8 +364,7 @@ const makeOpts = ( const { tokens, chainlinkFeeds } = networkConfig[31337] makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDT', - makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!), - true // Only run specific tests once, since they are slow + makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!) ) makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDC', diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts index 28614aff7d..c745f73174 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVENonFiatCollateral.test.ts @@ -15,7 +15,6 @@ import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' import { CollateralOpts } from '../pluginTestTypes' -import { pushOracleForward } from '../../../utils/oracles' import { DEFAULT_THRESHOLD, DELAY_UNTIL_DEFAULT, @@ -54,6 +53,7 @@ const makeAaveNonFiatCollateralTestSuite = ( morphoLens: configToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, + rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: configToUse.tokens.MORPHO!, }) opts.erc20 = wrapperMock.address @@ -77,10 +77,6 @@ const makeAaveNonFiatCollateralTestSuite = ( )) as unknown as TestICollateral await collateral.deployed() - // Push forward chainlink feed - await pushOracleForward(opts.chainlinkFeed!) - await pushOracleForward(opts.targetPrRefFeed!) - await expect(collateral.refresh()) return collateral @@ -104,6 +100,7 @@ const makeAaveNonFiatCollateralTestSuite = ( morphoLens: configToUse.MORPHO_AAVE_LENS!, underlyingERC20: opts.underlyingToken!, poolToken: opts.poolToken!, + rewardsDistributor: configToUse.MORPHO_REWARDS_DISTRIBUTOR!, rewardToken: configToUse.tokens.MORPHO!, }) @@ -149,18 +146,18 @@ const makeAaveNonFiatCollateralTestSuite = ( ctx: MorphoAaveCollateralFixtureContext, pctDecrease: BigNumberish ) => { - const lastRound = await ctx.chainlinkFeed!.latestRoundData() + const lastRound = await ctx.targetPrRefFeed!.latestRoundData() const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) - await ctx.chainlinkFeed!.updateAnswer(nextAnswer) + await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) } const increaseTargetPerRef = async ( ctx: MorphoAaveCollateralFixtureContext, pctIncrease: BigNumberish ) => { - const lastRound = await ctx.chainlinkFeed!.latestRoundData() + const lastRound = await ctx.targetPrRefFeed!.latestRoundData() const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) - await ctx.chainlinkFeed!.updateAnswer(nextAnswer) + await ctx.targetPrRefFeed!.updateAnswer(nextAnswer) } const changeRefPerTok = async ( @@ -171,17 +168,25 @@ const makeAaveNonFiatCollateralTestSuite = ( await ctx.morphoWrapper.setExchangeRate(rate.add(rate.mul(percentChange).div(bn('100')))) } + // prettier-ignore const reduceRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, pctDecrease: BigNumberish ) => { - await changeRefPerTok(ctx, bn(pctDecrease).mul(-1)) + await changeRefPerTok( + ctx, + bn(pctDecrease).mul(-1) + ) } + // prettier-ignore const increaseRefPerTok = async ( ctx: MorphoAaveCollateralFixtureContext, pctIncrease: BigNumberish ) => { - await changeRefPerTok(ctx, bn(pctIncrease)) + await changeRefPerTok( + ctx, + bn(pctIncrease) + ) } const getExpectedPrice = async (ctx: MorphoAaveCollateralFixtureContext): Promise => { @@ -191,12 +196,11 @@ const makeAaveNonFiatCollateralTestSuite = ( const clRptData = await ctx.targetPrRefFeed!.latestRoundData() const clRptDecimals = await ctx.targetPrRefFeed!.decimals() - const expectedPrice = clRptData.answer - .mul(bn(10).pow(18 - clRptDecimals)) - .mul(clData.answer.mul(bn(10).pow(18 - clDecimals))) + const expctPrice = clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(clRptData.answer.mul(bn(10).pow(18 - clRptDecimals))) .div(fp('1')) - - return expectedPrice + return expctPrice } /* @@ -208,7 +212,6 @@ const makeAaveNonFiatCollateralTestSuite = ( // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => {} - // eslint-disable-next-line @typescript-eslint/no-empty-function const beforeEachRewardsTest = async () => {} const opts = { @@ -227,7 +230,6 @@ const makeAaveNonFiatCollateralTestSuite = ( itChecksTargetPerRefDefault: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, - itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it, itIsPricedByPeg: true, resetFork: getResetFork(FORK_BLOCK), @@ -246,17 +248,17 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - WBTC', { underlyingToken: configToUse.tokens.WBTC!, poolToken: configToUse.tokens.aWBTC!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.WBTC!, - targetPrRefFeed: configToUse.chainlinkFeeds.BTC!, + chainlinkFeed: configToUse.chainlinkFeeds.BTC!, + targetPrRefFeed: configToUse.chainlinkFeeds.WBTC!, oracleTimeout: ORACLE_TIMEOUT, - refPerTokChainlinkTimeout: ORACLE_TIMEOUT.div(24), oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - defaultPrice: parseUnits('1', 8), - defaultRefPerTok: parseUnits('30000', 8), + defaultPrice: parseUnits('30000', 8), + defaultRefPerTok: parseUnits('1', 8), + refPerTokChainlinkTimeout: PRICE_TIMEOUT, }) makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { @@ -264,15 +266,15 @@ makeAaveNonFiatCollateralTestSuite('MorphoAAVEV2NonFiatCollateral - stETH', { underlyingToken: configToUse.tokens.stETH!, poolToken: configToUse.tokens.astETH!, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: configToUse.chainlinkFeeds.stETHETH!, - targetPrRefFeed: configToUse.chainlinkFeeds.ETH!, + chainlinkFeed: configToUse.chainlinkFeeds.ETH!, + targetPrRefFeed: configToUse.chainlinkFeeds.stETHETH!, oracleTimeout: ORACLE_TIMEOUT, - refPerTokChainlinkTimeout: ORACLE_TIMEOUT.div(24), oracleError: ORACLE_ERROR, maxTradeVolume: fp('1e6'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - defaultPrice: parseUnits('1', 8), - defaultRefPerTok: parseUnits('1800', 8), + defaultPrice: parseUnits('1800', 8), + defaultRefPerTok: parseUnits('1', 8), + refPerTokChainlinkTimeout: PRICE_TIMEOUT, }) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts index 4bf7730685..16dd346ae7 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVESelfReferentialCollateral.test.ts @@ -15,7 +15,6 @@ import { ethers } from 'hardhat' import collateralTests from '../collateralTests' import { getResetFork } from '../helpers' import { CollateralOpts } from '../pluginTestTypes' -import { pushOracleForward } from '../../../utils/oracles' import { DELAY_UNTIL_DEFAULT, FORK_BLOCK, @@ -49,6 +48,7 @@ const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise { + return formatUnits( + await instances.tokenVault + .connect(owner) + .callStatic.rewardTokenBalance(await owner.getAddress()), + 18 + ) + }, claimRewards: async (owner: Signer) => { await instances.tokenVault.connect(owner).claimRewards() }, @@ -175,8 +179,7 @@ const execTestForToken = ({ type ITestContext = ReturnType extends Promise ? U : never let context: ITestContext - before(getResetFork(FORK_BLOCK)) - + // const resetFork = getResetFork(17591000) beforeEach(async () => { context = await loadFixture(beforeEachFn) }) @@ -294,162 +297,9 @@ const execTestForToken = ({ expect(postWithdrawalBalance).lt(parseFloat(orignalBalance)) }) - it('linearly distributes rewards', async () => { - const { - users: { alice, bob, charlie }, - methods, - instances, - amountBN, - } = context - - await methods.deposit(bob, '1') - - // Enable transfers on Morpho - // ugh - await whileImpersonating( - '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa', - async (whaleSigner) => { - await whaleSigner.sendTransaction({ - to: '0x9994e35db50125e0df82e4c2dde62496ce330999', - data: '0x4b5159daa9059cbb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', - }) - await whaleSigner.sendTransaction({ - to: '0x9994e35db50125e0df82e4c2dde62496ce330999', - data: '0x4b5159da23b872dd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', - }) - } - ) - - // Let's drop 700 MORPHO to the tokenVault - await whileImpersonating( - '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', - async (whaleSigner) => { - await instances.morpho - .connect(whaleSigner) - .transfer( - instances.tokenVault.address, - parseUnits('700', await instances.morpho.decimals()) - ) - } - ) - - // Account for rewards - await instances.tokenVault.sync() - - // Simulate 8 days.. - for (let i = 0; i < 8; i++) { - await advanceTime(hre, 24 * 60 * 60 - 1) - await methods.claimRewards(bob) - - if (i < 7) { - expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( - BigNumber.from(i + 1) - .mul(100) - .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), - bn('1e18') - ) - } else { - expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( - BigNumber.from(7) - .mul(100) - .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), - bn('1e18') - ) - } - } - }) - - it('linearly distributes rewards, even with multiple claims', async () => { - const { - users: { alice, bob, charlie }, - methods, - instances, - amountBN, - } = context - - await methods.deposit(bob, '1') - - // Enable transfers on Morpho - // ugh - await whileImpersonating( - '0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa', - async (whaleSigner) => { - await whaleSigner.sendTransaction({ - to: '0x9994e35db50125e0df82e4c2dde62496ce330999', - data: '0x4b5159daa9059cbb000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', - }) - await whaleSigner.sendTransaction({ - to: '0x9994e35db50125e0df82e4c2dde62496ce330999', - data: '0x4b5159da23b872dd000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001', - }) - } - ) - - // Let's drop 700 MORPHO to the tokenVault - await whileImpersonating( - '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', - async (whaleSigner) => { - await instances.morpho - .connect(whaleSigner) - .transfer( - instances.tokenVault.address, - parseUnits('700', await instances.morpho.decimals()) - ) - } - ) - - // Account for rewards - await instances.tokenVault.sync() - - // Simulate 3 days.. - for (let i = 0; i < 3; i++) { - await advanceTime(hre, 24 * 60 * 60 - 1) - await methods.claimRewards(bob) - - expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( - BigNumber.from(i + 1) - .mul(100) - .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), - bn('1e18') - ) - } - - // Let's drop another 300 MORPHO to the tokenVault - await whileImpersonating( - '0x6c27114E34173F8E4E7F4060a51EEb1f0120E241', - async (whaleSigner) => { - await instances.morpho - .connect(whaleSigner) - .transfer( - instances.tokenVault.address, - parseUnits('300', await instances.morpho.decimals()) - ) - } - ) - - // Account for rewards - await instances.tokenVault.sync() - - for (let i = 3; i < 10; i++) { - await advanceTime(hre, 24 * 60 * 60 - 1) - await methods.claimRewards(bob) - - // console.log( - // 'MORPHO:', - // formatUnits( - // await instances.morpho.balanceOf(await bob.getAddress()), - // await instances.morpho.decimals() - // ) - // ) - - expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( - BigNumber.from(i + 1) - .mul(100) - .mul(BigNumber.from(10).pow(await instances.morpho.decimals())), - bn('1e18') - ) - } - }) + /** + * There is a test for claiming rewards in the MorphoAAVEFiatCollateral.test.ts + */ }) } diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap index 99f876bb27..d55a1ae734 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVEFiatCollateral.test.ts.snap @@ -4,94 +4,82 @@ exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality G exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134222`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129753`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134211`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179834`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129742`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172151`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 1`] = `179812`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134222`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after hard default 2`] = `172129`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129753`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134211`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `129412`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129742`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `129412`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 1`] = `172067`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172148`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() after soft default 2`] = `172067`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172148`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 1`] = `172126`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179699`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during SOUND 2`] = `172126`; - -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 1`] = `179677`; - -exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172408`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - DAI collateral functionality Gas Reporting refresh() during soft default 2`] = `172430`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 1`] = `73881`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; - -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134425`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `134414`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129956`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129945`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180240`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 1`] = `180218`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172557`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after hard default 2`] = `172535`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134425`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `134414`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129956`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129945`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `129615`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 1`] = `172473`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `129615`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() after soft default 2`] = `172473`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172554`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 1`] = `172532`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172554`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during SOUND 2`] = `172532`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180105`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 1`] = `180083`; - -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172814`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDC collateral functionality Gas Reporting refresh() during soft default 2`] = `172836`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 1`] = `73881`; exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 3`] = `88981`; - -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting ERC20 transfer 4`] = `71881`; - -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133567`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133578`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129098`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129109`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178524`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 1`] = `178546`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170841`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after hard default 2`] = `170863`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133567`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `133578`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129098`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `129109`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `170779`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 1`] = `128768`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `170779`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() after soft default 2`] = `128768`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170838`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 1`] = `170860`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170838`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during SOUND 2`] = `170860`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178389`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 1`] = `178411`; -exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171120`; +exports[`Collateral: MorphoAAVEV2FiatCollateral - USDT collateral functionality Gas Reporting refresh() during soft default 2`] = `171142`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap index 26e77e6a88..de69e7ba61 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVENonFiatCollateral.test.ts.snap @@ -4,54 +4,54 @@ exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionali exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133634`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 1`] = `133645`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129165`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after full price timeout 2`] = `129176`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199810`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 1`] = `199843`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192127`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after hard default 2`] = `192160`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182878`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `182889`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178409`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `178420`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `192065`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 1`] = `178079`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `192065`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() after soft default 2`] = `178079`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192124`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 1`] = `192157`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192124`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during SOUND 2`] = `192157`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199675`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 1`] = `199708`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192406`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - WBTC collateral functionality Gas Reporting refresh() during soft default 2`] = `192439`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting ERC20 transfer 1`] = `73881`; exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167266`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `167277`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162797`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `162808`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239074`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 1`] = `239107`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231391`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after hard default 2`] = `231424`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222142`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `222153`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217673`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `217684`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `231329`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 1`] = `217343`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `231329`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() after soft default 2`] = `217343`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231388`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `231421`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231388`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `231421`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238939`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 1`] = `238972`; -exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231670`; +exports[`Collateral: MorphoAAVEV2NonFiatCollateral - stETH collateral functionality Gas Reporting refresh() during soft default 2`] = `231703`; diff --git a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap index a420cba2b6..9148485dab 100644 --- a/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap +++ b/test/plugins/individual-collateral/morpho-aave/__snapshots__/MorphoAAVESelfReferentialCollateral.test.ts.snap @@ -4,18 +4,18 @@ exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral fun exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting ERC20 transfer 2`] = `56781`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201552`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 1`] = `201563`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197083`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after full price timeout 2`] = `197094`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217763`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 1`] = `217785`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210080`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after hard default 2`] = `210102`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201552`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 1`] = `201563`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197083`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() after oracle timeout 2`] = `197094`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210077`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 1`] = `210099`; -exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210077`; +exports[`Collateral: MorphoAAVEV2SelfReferentialCollateral - WETH collateral functionality Gas Reporting refresh() during SOUND 2`] = `210099`; diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 34bfefbb20..11b73fbaa1 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -100,9 +100,6 @@ export interface CollateralTestSuiteFixtures // toggle on or off: tests that focus on revenue hiding (off if plugin does not hide revenue) itHasRevenueHiding: Mocha.TestFunction | Mocha.PendingTestFunction - // toggle on or off: tests that check that defaultThreshold is not zero - itChecksNonZeroDefaultThreshold: Mocha.TestFunction | Mocha.PendingTestFunction - // does the peg price matter for the results of tryPrice()? itIsPricedByPeg?: boolean diff --git a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts index d10488770e..7b2cd8e9a5 100644 --- a/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/rocket-eth/RethCollateralTestSuite.test.ts @@ -12,7 +12,6 @@ import { IReth, WETH9, } from '../../../../typechain' -import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' import { ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -90,11 +89,6 @@ export const deployCollateral = async (opts: RethCollateralOpts = {}): Promise { oracleTimeouts: opts.oracleTimeouts, oracleErrors: opts.oracleErrors, lpToken: opts.lpToken, - }, - PRICE_PER_SHARE_HELPER + } ) await collateral.deployed() diff --git a/test/plugins/individual-collateral/yearnv2/constants.ts b/test/plugins/individual-collateral/yearnv2/constants.ts index 2d480c5cb4..832ccbb813 100644 --- a/test/plugins/individual-collateral/yearnv2/constants.ts +++ b/test/plugins/individual-collateral/yearnv2/constants.ts @@ -9,8 +9,6 @@ export const yvCurveUSDCcrvUSD = networkConfig['31337'].tokens.yvCurveUSDCcrvUSD export const USDP_USD_FEED = networkConfig['31337'].chainlinkFeeds.USDP as string export const CRV_USD_USD_FEED = networkConfig['31337'].chainlinkFeeds.crvUSD as string -export const PRICE_PER_SHARE_HELPER = '0x444443bae5bB8640677A8cdF94CB8879Fec948Ec' - export const YVUSDC_LP_TOKEN = '0x4DEcE678ceceb27446b35C672dC7d61F30bAD69E' export const YVUSDP_LP_TOKEN = '0xCa978A0528116DDA3cbA9ACD3e68bc6191CA53D0' diff --git a/test/scenario/BadCollateralPlugin.test.ts b/test/scenario/BadCollateralPlugin.test.ts index 9745c962b5..ec2e04c0ee 100644 --- a/test/scenario/BadCollateralPlugin.test.ts +++ b/test/scenario/BadCollateralPlugin.test.ts @@ -27,7 +27,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -104,7 +104,7 @@ describe(`Bad Collateral Plugin - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 6b7479212c..f55d5a3652 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -34,7 +34,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -172,7 +172,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_TRADE_VOLUME, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await assetRegistry.connect(owner).swapRegistered(newRSRAsset.address) @@ -203,7 +203,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: usdToken.address, // DAI Token maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -227,8 +227,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: eurToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -248,7 +248,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cUSDTokenVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -269,7 +269,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), staticAToken: aUSDToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -293,8 +293,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), tokenAddress: wbtc.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -323,8 +323,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), cToken: cWBTCVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -349,7 +349,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: weth.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), noOutput: true, }) @@ -380,7 +380,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cETHVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: REVENUE_HIDING.toString(), referenceERC20Decimals: bn(18).toString(), @@ -1598,8 +1598,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - cETHVault partial sale for weth // Will sell about 841K of cETHVault, expect to receive 8167 wETH (minimum) // We would still have about 438K to sell of cETHVault - let [low] = await cETHVaultCollateral.price() - const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) + let [, lotHigh] = await cETHVaultCollateral.lotPrice() + const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(lotHigh) const sellAmt = toBNDecimals(sellAmtUnscaled, 8) const sellAmtRemainder = (await cETHVault.balanceOf(backingManager.address)).sub(sellAmt) // Price for cETHVault = 1200 / 50 = $24 at rate 50% = $12 @@ -1744,8 +1744,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // 13K wETH @ 1200 = 15,600,000 USD of value, in RSR ~= 156,000 RSR (@100 usd) // We exceed maxTradeVolume so we need two auctions - Will first sell 10M in value // Sells about 101K RSR, for 8167 WETH minimum - ;[low] = await rsrAsset.price() - const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) + ;[, lotHigh] = await rsrAsset.lotPrice() + const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(lotHigh) const buyAmtBidRSR1 = toMinBuyAmt( sellAmtRSR1, rsrPrice, diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index f1380b63f7..a3ab632140 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -28,7 +28,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -158,7 +158,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -198,7 +198,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: atoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -245,7 +245,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: ctoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NestedRTokens.test.ts b/test/scenario/NestedRTokens.test.ts index 38b11aba25..6386b158fd 100644 --- a/test/scenario/NestedRTokens.test.ts +++ b/test/scenario/NestedRTokens.test.ts @@ -22,7 +22,7 @@ import { DefaultFixture, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -119,7 +119,7 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: staticATokenERC20.address, maxTradeVolume: one.config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NontrivialPeg.test.ts b/test/scenario/NontrivialPeg.test.ts index c247b1cf98..70e0fa263f 100644 --- a/test/scenario/NontrivialPeg.test.ts +++ b/test/scenario/NontrivialPeg.test.ts @@ -23,7 +23,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, } from '../fixtures' @@ -82,7 +82,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -124,7 +124,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 815ff2f7fb..8b1cfa00fb 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, } from '../fixtures' @@ -116,7 +116,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME oracleError: ORACLE_ERROR, erc20: cDAI.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/SetProtocol.test.ts b/test/scenario/SetProtocol.test.ts index a9021be240..a2a67dd94a 100644 --- a/test/scenario/SetProtocol.test.ts +++ b/test/scenario/SetProtocol.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, } from '../fixtures' @@ -91,7 +91,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -106,7 +106,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('MKR'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -121,7 +121,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('COMP'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap index 22ad1e5662..89a9ca08e6 100644 --- a/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap +++ b/test/scenario/__snapshots__/MaxBasketSize.test.ts.snap @@ -1,19 +1,19 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12082311`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 1`] = `12092382`; -exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9823907`; +exports[`Max Basket Size - P1 ATokens/CTokens Should Issue/Redeem with max basket correctly 2`] = `9830758`; -exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2436571`; +exports[`Max Basket Size - P1 ATokens/CTokens Should claim rewards correctly 1`] = `2281990`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13653658`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 1`] = `13617164`; -exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `21271957`; +exports[`Max Basket Size - P1 ATokens/CTokens Should switch basket correctly 2`] = `20897690`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10984061`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 1`] = `10991870`; -exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8720813`; +exports[`Max Basket Size - P1 Fiatcoins Should Issue/Redeem with max basket correctly 2`] = `8713158`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6592432`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 1`] = `6561504`; -exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15036720`; +exports[`Max Basket Size - P1 Fiatcoins Should switch basket correctly 2`] = `15130053`; diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 2444878fe4..30c290f242 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -8,13 +8,6 @@ import { MAX_UINT192 } from '../../common/constants' const toleranceDivisor = bn('1e15') // 1 part in 1000 trillions -export const expectExactPrice = async (assetAddr: string, price: [BigNumber, BigNumber]) => { - const asset = await ethers.getContractAt('Asset', assetAddr) - const [lowPrice, highPrice] = await asset.price() - expect(lowPrice).to.equal(price[0]) - expect(highPrice).to.equal(price[1]) -} - // Expects a price around `avgPrice` assuming a consistent percentage oracle error // If near is truthy, allows a small error of 1 part in 1000 trillions export const expectPrice = async ( @@ -93,15 +86,6 @@ export const expectRTokenPrice = async ( expect(highPrice).to.be.gte(avgPrice) } -export const expectDecayedPrice = async (assetAddr: string) => { - const asset = await ethers.getContractAt('Asset', assetAddr) - const [lowPrice, highPrice] = await asset.price() - expect(lowPrice).to.be.gt(0) - expect(lowPrice).to.be.lt(await asset.savedLowPrice()) - expect(highPrice).to.be.gt(await asset.savedHighPrice()) - expect(highPrice).to.be.lt(MAX_UINT192) -} - // Expects an unpriced asset with low = 0 and high = FIX_MAX export const expectUnpriced = async (assetAddr: string) => { const asset = await ethers.getContractAt('Asset', assetAddr) diff --git a/test/utils/trades.ts b/test/utils/trades.ts index 99e0f4c22f..433c9e453a 100644 --- a/test/utils/trades.ts +++ b/test/utils/trades.ts @@ -1,11 +1,9 @@ -import { getStorageAt, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { Decimal } from 'decimal.js' import { BigNumber } from 'ethers' import { ethers } from 'hardhat' import { expect } from 'chai' -import { TestITrading, GnosisTrade, TestIBroker } from '../../typechain' +import { TestITrading, GnosisTrade } from '../../typechain' import { bn, fp, divCeil, divRound } from '../../common/numbers' -import { IMPLEMENTATION, Implementation } from '../fixtures' export const expectTrade = async (trader: TestITrading, auctionInfo: Partial) => { if (!auctionInfo.sell) throw new Error('Must provide sell token to find trade') @@ -83,6 +81,7 @@ export const dutchBuyAmount = async ( assetInAddr: string, assetOutAddr: string, outAmount: BigNumber, + minTradeVolume: BigNumber, maxTradeSlippage: BigNumber ): Promise => { const assetIn = await ethers.getContractAt('IAsset', assetInAddr) @@ -120,23 +119,3 @@ export const dutchBuyAmount = async ( } else price = worstPrice return divCeil(outAmount.mul(price), fp('1')) } - -export const disableBatchTrade = async (broker: TestIBroker) => { - if (IMPLEMENTATION == Implementation.P1) { - const slot = await getStorageAt(broker.address, 205) - await setStorageAt(broker.address, 205, slot.replace(slot.slice(2, 14), '1'.padStart(12, '0'))) - } else { - const slot = await getStorageAt(broker.address, 56) - await setStorageAt(broker.address, 56, slot.replace(slot.slice(2, 42), '1'.padStart(40, '0'))) - } - expect(await broker.batchTradeDisabled()).to.equal(true) -} - -export const disableDutchTrade = async (broker: TestIBroker, erc20: string) => { - const mappingSlot = IMPLEMENTATION == Implementation.P1 ? bn('208') : bn('57') - const p = mappingSlot.toHexString().slice(2).padStart(64, '0') - const key = erc20.slice(2).padStart(64, '0') - const slot = ethers.utils.keccak256('0x' + key + p) - await setStorageAt(broker.address, slot, '0x' + '1'.padStart(64, '0')) - expect(await broker.dutchTradeDisabled(erc20)).to.equal(true) -} From 212cbd55e5e640e40a12951b753bc986b3285a02 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 8 Feb 2024 10:05:31 -0500 Subject: [PATCH 201/450] TRST-M-1b: Add basket reweighting for index tokens (#1049) --- CHANGELOG.md | 2 + contracts/facade/FacadeWrite.sol | 2 +- contracts/interfaces/IBasketHandler.sol | 11 +- contracts/p0/BasketHandler.sol | 95 ++++++-- contracts/p1/BasketHandler.sol | 43 +++- contracts/p1/mixins/BasketLib.sol | 70 ++++-- test/Main.test.ts | 301 +++++++++++++++++++++--- 7 files changed, 453 insertions(+), 71 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b6e0e23570..6ad75cf74f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,8 @@ New governance param added: `reweightable` - New `LastCollateralizedChanged()` event -- track to determine earliest basket nonce to use for `redeemCustom()` - Add concept of a reweightable basket: a basket that can have its target amounts (once grouped by target unit) changed - Add `reweightable()` view + - Add `forceSetPrimeBasket()` to allow setting a new prime basket without normalizing by USD value + - Alter `setPrimeBasket()` to enforce basket normalization for reweightable RTokens - `BackingManager` - Minor gas optimization - `Deployer` diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index 27ea7fb321..f9f2c9d3f2 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -77,7 +77,7 @@ contract FacadeWrite is IFacadeWrite { } // Set basket - basketHandler.setPrimeBasket(basketERC20s, setup.weights); + basketHandler.forceSetPrimeBasket(basketERC20s, setup.weights); basketHandler.refreshBasket(); } diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index a98621dd4f..f73b1efd99 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -61,11 +61,20 @@ interface IBasketHandler is IComponent { ) external; /// Set the prime basket + /// For an index RToken (reweightable = true), use forceSetPrimeBasket to skip normalization /// @param erc20s The collateral tokens for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// required range: 1e9 values; absolute range irrelevant. /// @custom:governance - function setPrimeBasket(IERC20[] memory erc20s, uint192[] memory targetAmts) external; + function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external; + + /// Set the prime basket without normalizing targetAmts by the UoA of the current basket + /// Works the same as setPrimeBasket for non-index RTokens (reweightable = false) + /// @param erc20s The collateral tokens for the new prime basket + /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// required range: 1e9 values; absolute range irrelevant. + /// @custom:governance + function forceSetPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external; /// Set the backup configuration for a given target /// @param targetName The name of the target as a bytes32 diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index b8e76cfacb..2e1325d4d8 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -240,9 +240,32 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } } + /// Set the prime basket + /// @param erc20s The collateral for the new prime basket + /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// @custom:governance + function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) + external + governance + { + _setPrimeBasket(erc20s, targetAmts, true); + } + + /// Set the prime basket without reweighting targetAmts by UoA of the current basket + /// @param erc20s The collateral for the new prime basket + /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// @custom:governance + function forceSetPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) + external + governance + { + _setPrimeBasket(erc20s, targetAmts, false); + } + /// Set the prime basket in the basket configuration, in terms of erc20s and target amounts /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// @param normalize True iff targetAmts should be normalized by UoA to the reference basket /// @custom:governance // checks: // caller is OWNER @@ -255,17 +278,21 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // config'.erc20s = erc20s // config'.targetAmts[erc20s[i]] = targetAmts[i], for i from 0 to erc20s.length-1 // config'.targetNames[e] = reg.toColl(e).targetName, for e in erc20s - function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) - external - governance - { + function _setPrimeBasket( + IERC20[] calldata erc20s, + uint192[] memory targetAmts, + bool normalize + ) internal { require(erc20s.length > 0, "empty basket"); require(erc20s.length == targetAmts.length, "len mismatch"); requireValidCollArray(erc20s); - // If this isn't initial setup, require targets remain constant if (!reweightable && config.erc20s.length > 0) { + // Require targets remain constant requireConstantConfigTargets(erc20s, targetAmts); + } else if (normalize && config.erc20s.length > 0) { + // Normalize targetAmts based on UoA value of reference basket + targetAmts = normalizeByPrice(erc20s, targetAmts); } // Clean up previous basket config @@ -783,11 +810,10 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { require(ArrayLib.allUnique(erc20s), "contains duplicates"); } - /// Require that newERC20s and newTargetAmts preserve the current config targets - function requireConstantConfigTargets( - IERC20[] calldata newERC20s, - uint192[] calldata newTargetAmts - ) private { + /// Require that erc20s and targetAmts preserve the current config targets + function requireConstantConfigTargets(IERC20[] calldata erc20s, uint192[] memory targetAmts) + private + { // Empty _targetAmts mapping while (_targetAmts.length() > 0) { (bytes32 key, ) = _targetAmts.at(0); @@ -804,16 +830,55 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } // Require new basket is exactly equal to old basket, in terms of targetAmts by targetName - for (uint256 i = 0; i < newERC20s.length; i++) { - bytes32 targetName = main.assetRegistry().toColl(newERC20s[i]).targetName(); + for (uint256 i = 0; i < erc20s.length; i++) { + bytes32 targetName = main.assetRegistry().toColl(erc20s[i]).targetName(); (bool contains, uint256 amt) = _targetAmts.tryGet(targetName); - require(contains && amt >= newTargetAmts[i], "new target weights"); - if (amt == newTargetAmts[i]) _targetAmts.remove(targetName); - else _targetAmts.set(targetName, amt - newTargetAmts[i]); + require(contains && amt >= targetAmts[i], "new target weights"); + if (amt == targetAmts[i]) _targetAmts.remove(targetName); + else _targetAmts.set(targetName, amt - targetAmts[i]); } require(_targetAmts.length() == 0, "missing target weights"); } + /// Normalize the target amounts to maintain constant UoA value with the current config + /// @return newTargetAmts {target/BU} The new target amounts for the normalized basket + function normalizeByPrice(IERC20[] calldata erc20s, uint192[] memory targetAmts) + private + returns (uint192[] memory newTargetAmts) + { + main.poke(); + require(status() == CollateralStatus.SOUND, "unsound basket"); + uint256 len = erc20s.length; // assumes erc20s.length == targetAmts.length + + // Compute current basket price + (uint192 low, uint192 high) = _price(false); // {UoA/BU} + assert(low > 0 && high < FIX_MAX); // implied by SOUND status + uint192 p = low.plus(high).divu(2, FLOOR); // {UoA/BU} + + // Compute would-be new price + uint192 newP; // {UoA/BU} + for (uint256 i = 0; i < len; ++i) { + ICollateral coll = main.assetRegistry().toColl(erc20s[i]); // reverts if unregistered + + (low, high) = coll.price(); // {UoA/tok} + require(low > 0 && high < FIX_MAX, "invalid price"); + + // {UoA/BU} += {target/BU} * {UoA/tok} / ({target/ref} * {ref/tok}) + newP += targetAmts[i].mulDiv( + low.plus(high).divu(2, FLOOR), + coll.targetPerRef().mul(coll.refPerTok(), CEIL), + FLOOR + ); + } + + // Scale targetAmts by the price ratio + newTargetAmts = new uint192[](len); + for (uint256 i = 0; i < len; ++i) { + // {target/BU} = {target/BU} * {UoA/BU} / {UoA/BU} + newTargetAmts[i] = targetAmts[i].mulDiv(p, newP, CEIL); + } + } + /// Good collateral is registered, collateral, SOUND, has the expected targetName, /// and not a system token or 0 addr function goodCollateral(bytes32 targetName, IERC20 erc20) private view returns (bool) { diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 280dc2adb5..13c1729d88 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -38,7 +38,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { IStRSR private stRSR; // config is the basket configuration, from which basket will be computed in a basket-switch - // event. config is only modified by governance through setPrimeBakset and setBackupConfig + // event. config is only modified by governance through setPrimeBasket and setBackupConfig BasketConfig private config; // basket, disabled, nonce, and timestamp are only ever set by `_switchBasket()` @@ -182,9 +182,26 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } } + /// Set the prime basket + /// @param erc20s The collateral for the new prime basket + /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// @custom:governance + function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external { + _setPrimeBasket(erc20s, targetAmts, true); + } + + /// Set the prime basket without reweighting targetAmts by UoA of the current basket + /// @param erc20s The collateral for the new prime basket + /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// @custom:governance + function forceSetPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external { + _setPrimeBasket(erc20s, targetAmts, false); + } + /// Set the prime basket in the basket configuration, in terms of erc20s and target amounts /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket + /// @param normalize True iff targetAmts should be normalized by UoA to the reference basket /// @custom:governance // checks: // caller is OWNER @@ -197,14 +214,18 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // config'.erc20s = erc20s // config'.targetAmts[erc20s[i]] = targetAmts[i], for i from 0 to erc20s.length-1 // config'.targetNames[e] = assetRegistry.toColl(e).targetName, for e in erc20s - function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external { + function _setPrimeBasket( + IERC20[] calldata erc20s, + uint192[] memory targetAmts, + bool normalize + ) internal { requireGovernanceOnly(); require(erc20s.length > 0, "empty basket"); require(erc20s.length == targetAmts.length, "len mismatch"); requireValidCollArray(erc20s); - // If this isn't initial setup, require targets remain constant - if (!reweightable && config.erc20s.length > 0) { + if (!reweightable && config.erc20s.length != 0) { + // Require targets remain constant BasketLibP1.requireConstantConfigTargets( assetRegistry, config, @@ -212,6 +233,20 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { erc20s, targetAmts ); + } else if (normalize && config.erc20s.length != 0) { + // Confirm reference basket is SOUND + assetRegistry.refresh(); + require(status() == CollateralStatus.SOUND, "unsound basket"); + + // Normalize targetAmts based on UoA value of reference basket + (uint192 low, uint192 high) = _price(false); + assert(low > 0 && high < FIX_MAX); // implied by SOUND status + targetAmts = BasketLibP1.normalizeByPrice( + assetRegistry, + erc20s, + targetAmts, + (low + high + 1) / 2 + ); } // Clean up previous basket config diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index 37645b4337..216935c2b9 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -309,37 +309,75 @@ library BasketLibP1 { } } - // === Contract-size saver === + // === Contract-size savers === - /// Require that newERC20s and newTargetAmts preserve the current config targets + /// Require that erc20s and targetAmts preserve the current config targets + /// @param _targetAmts Scratch space for computation; assumed to be empty function requireConstantConfigTargets( IAssetRegistry assetRegistry, BasketConfig storage config, - EnumerableMap.Bytes32ToUintMap storage targetAmts, - IERC20[] calldata newERC20s, - uint192[] calldata newTargetAmts + EnumerableMap.Bytes32ToUintMap storage _targetAmts, + IERC20[] calldata erc20s, + uint192[] calldata targetAmts ) external { - // Populate targetAmts mapping with old basket config + // Populate _targetAmts mapping with old basket config uint256 len = config.erc20s.length; for (uint256 i = 0; i < len; ++i) { IERC20 erc20 = config.erc20s[i]; bytes32 targetName = config.targetNames[erc20]; - (bool contains, uint256 amt) = targetAmts.tryGet(targetName); - targetAmts.set( + (bool contains, uint256 amt) = _targetAmts.tryGet(targetName); + _targetAmts.set( targetName, contains ? amt + config.targetAmts[erc20] : config.targetAmts[erc20] ); } - // Require new basket is exactly equal to old basket, in terms of targetAmts by targetName - len = newERC20s.length; + // Require new basket is exactly equal to old basket, in terms of target amounts + len = erc20s.length; for (uint256 i = 0; i < len; ++i) { - bytes32 targetName = assetRegistry.toColl(newERC20s[i]).targetName(); - (bool contains, uint256 amt) = targetAmts.tryGet(targetName); - require(contains && amt >= newTargetAmts[i], "new target weights"); - if (amt > newTargetAmts[i]) targetAmts.set(targetName, amt - newTargetAmts[i]); - else targetAmts.remove(targetName); + bytes32 targetName = assetRegistry.toColl(erc20s[i]).targetName(); + (bool contains, uint256 amt) = _targetAmts.tryGet(targetName); + require(contains && amt >= targetAmts[i], "new target weights"); + if (amt > targetAmts[i]) _targetAmts.set(targetName, amt - targetAmts[i]); + else _targetAmts.remove(targetName); + } + require(_targetAmts.length() == 0, "missing target weights"); + } + + /// Normalize the target amounts to maintain constant UoA value with the current config + /// @param price {UoA/BU} Price of the reference basket (point estimate) + /// @return newTargetAmts {target/BU} The new target amounts for the normalized basket + function normalizeByPrice( + IAssetRegistry assetRegistry, + IERC20[] calldata erc20s, + uint192[] calldata targetAmts, + uint192 price + ) external view returns (uint192[] memory newTargetAmts) { + uint256 len = erc20s.length; // assumes erc20s.length == targetAmts.length + + // Rounding in this function should always be in favor of RToken holders + + // Compute would-be new price + uint192 newPrice; // {UoA/BU} + for (uint256 i = 0; i < len; ++i) { + ICollateral coll = assetRegistry.toColl(erc20s[i]); // reverts if unregistered + + (uint192 low, uint192 high) = coll.price(); // {UoA/tok} + require(low > 0 && high < FIX_MAX, "invalid price"); + + // {UoA/BU} += {target/BU} * {UoA/tok} / ({target/ref} * {ref/tok}) + newPrice += targetAmts[i].mulDiv( + (low + high) / 2, + coll.targetPerRef().mul(coll.refPerTok(), CEIL), + FLOOR + ); // revert on overflow + } + + // Scale targetAmts by the price ratio + newTargetAmts = new uint192[](len); + for (uint256 i = 0; i < len; ++i) { + // {target/BU} = {target/BU} * {UoA/BU} / {UoA/BU} + newTargetAmts[i] = targetAmts[i].mulDiv(price, newPrice, CEIL); } - require(targetAmts.length() == 0, "missing target weights"); } } diff --git a/test/Main.test.ts b/test/Main.test.ts index 452f7bc1be..6760d9d7c6 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -1689,27 +1689,30 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { }) describe('Basket Handling', () => { - let reweightableBH: TestIBasketHandler // need to have both this and regular basketHandler around + let indexBH: TestIBasketHandler // need to have both this and regular basketHandler around let eurToken: ERC20Mock - beforeEach(async () => { + const newBasketHandler = async (): Promise => { if (IMPLEMENTATION == Implementation.P0) { const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP0') - reweightableBH = ((await BasketHandlerFactory.deploy()) as unknown) + return ((await BasketHandlerFactory.deploy()) as unknown) } else if (IMPLEMENTATION == Implementation.P1) { const basketLib = await (await ethers.getContractFactory('BasketLibP1')).deploy() const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1', { libraries: { BasketLibP1: basketLib.address }, }) - reweightableBH = await upgrades.deployProxy(BasketHandlerFactory, [], { + return await upgrades.deployProxy(BasketHandlerFactory, [], { kind: 'uups', unsafeAllow: ['external-library-linking'], // BasketLibP1 }) } else { throw new Error('PROTO_IMPL must be set to either `0` or `1`') } + } - await reweightableBH.init(main.address, config.warmupPeriod, config.reweightable) + beforeEach(async () => { + indexBH = await newBasketHandler() + await indexBH.init(main.address, config.warmupPeriod, true) eurToken = await (await ethers.getContractFactory('ERC20Mock')).deploy('EURO Token', 'EUR') const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( @@ -1731,19 +1734,31 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket if not OWNER', async () => { await expect( - reweightableBH.connect(other).setPrimeBasket([token0.address], [fp('1')]) + indexBH.connect(other).setPrimeBasket([token0.address], [fp('1')]) ).to.be.revertedWith('governance only') await expect( basketHandler.connect(other).setPrimeBasket([token0.address], [fp('1')]) ).to.be.revertedWith('governance only') + await expect( + indexBH.connect(other).forceSetPrimeBasket([token0.address], [fp('1')]) + ).to.be.revertedWith('governance only') + await expect( + basketHandler.connect(other).forceSetPrimeBasket([token0.address], [fp('1')]) + ).to.be.revertedWith('governance only') }) it('Should not allow to set prime Basket with invalid length', async () => { + await expect(indexBH.connect(owner).setPrimeBasket([token0.address], [])).to.be.revertedWith( + 'len mismatch' + ) await expect( - reweightableBH.connect(owner).setPrimeBasket([token0.address], []) + basketHandler.connect(owner).setPrimeBasket([token0.address], []) ).to.be.revertedWith('len mismatch') await expect( - basketHandler.connect(owner).setPrimeBasket([token0.address], []) + indexBH.connect(owner).forceSetPrimeBasket([token0.address], []) + ).to.be.revertedWith('len mismatch') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], []) ).to.be.revertedWith('len mismatch') }) @@ -1752,78 +1767,133 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { basketHandler.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) ).to.be.revertedWith('erc20 is not collateral') await expect( - reweightableBH.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) + indexBH.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) + ).to.be.revertedWith('erc20 is not collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([compToken.address], [fp('1')]) + ).to.be.revertedWith('erc20 is not collateral') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([compToken.address], [fp('1')]) ).to.be.revertedWith('erc20 is not collateral') }) it('Should not allow to set prime Basket with duplicate ERC20s', async () => { await expect( - reweightableBH + indexBH.connect(owner).setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + ).to.be.revertedWith('contains duplicates') + await expect( + basketHandler .connect(owner) .setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) ).to.be.revertedWith('contains duplicates') + await expect( + indexBH + .connect(owner) + .forceSetPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + ).to.be.revertedWith('contains duplicates') await expect( basketHandler .connect(owner) - .setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + .forceSetPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) ).to.be.revertedWith('contains duplicates') }) it('Should not allow to set prime Basket with 0 address tokens', async () => { await expect( - reweightableBH.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) + indexBH.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( basketHandler.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) ).to.be.revertedWith('invalid collateral') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([ZERO_ADDRESS], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([ZERO_ADDRESS], [fp('1')]) + ).to.be.revertedWith('invalid collateral') }) it('Should not allow to set prime Basket with stRSR', async () => { await expect( - reweightableBH.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) + indexBH.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( basketHandler.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([stRSR.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([stRSR.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') }) it('Should not allow to bypass MAX_TARGET_AMT', async () => { // not possible on non-fresh basketHandler await expect( - reweightableBH.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) + indexBH.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) + ).to.be.revertedWith('invalid target amount; too large') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) ).to.be.revertedWith('invalid target amount; too large') }) it('Should not allow to increase prime Basket weights', async () => { - // not possible on reweightableBH + // not possible on indexBH await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').add(1)]) ).to.be.revertedWith('new target weights') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [fp('1').add(1)]) + ).to.be.revertedWith('new target weights') }) it('Should not allow to decrease prime Basket weights', async () => { - // not possible on reweightableBH + // not possible on indexBH await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').sub(1)]) ).to.be.revertedWith('missing target weights') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [fp('1').sub(1)]) + ).to.be.revertedWith('missing target weights') }) it('Should not allow to set prime Basket with an empty basket', async () => { - await expect(reweightableBH.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( + await expect(indexBH.connect(owner).setPrimeBasket([], [])).to.be.revertedWith('empty basket') + await expect(basketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( 'empty basket' ) - await expect(basketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( + await expect(indexBH.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( + 'empty basket' + ) + await expect(basketHandler.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( 'empty basket' ) }) it('Should not allow to set prime Basket with a zero amount', async () => { + await expect(indexBH.connect(owner).setPrimeBasket([token0.address], [0])).to.be.revertedWith( + 'invalid target amount; must be nonzero' + ) + await expect( + basketHandler.connect(owner).setPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('missing target weights') await expect( - reweightableBH.connect(owner).setPrimeBasket([token0.address], [0]) + indexBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) ).to.be.revertedWith('invalid target amount; must be nonzero') await expect( - basketHandler.connect(owner).setPrimeBasket([token0.address], [0]) + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [0]) ).to.be.revertedWith('missing target weights') + + // for non-reweightable baskets, also try setting a zero amount as the *original* basket + const newBH = await newBasketHandler() + await newBH.init(main.address, config.warmupPeriod, false) + await expect(newBH.connect(owner).setPrimeBasket([token0.address], [0])).to.be.revertedWith( + 'invalid target amount; must be nonzero' + ) + await expect( + newBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('invalid target amount; must be nonzero') }) it('Should be able to set exactly same basket', async () => { @@ -1833,9 +1903,29 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { [token0.address, token1.address, token2.address, token3.address], [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] ) + await basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + + await indexBH + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + await indexBH + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) }) it('Should be able to set prime basket multiple times', async () => { + // basketHandler await expect( basketHandler .connect(owner) @@ -1855,6 +1945,46 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expect(basketHandler.connect(owner).setPrimeBasket([token2.address], [fp('1')])) .to.emit(basketHandler, 'PrimeBasketSet') .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + + await expect(basketHandler.connect(owner).forceSetPrimeBasket([token1.address], [fp('1')])) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + + await expect(basketHandler.connect(owner).forceSetPrimeBasket([token2.address], [fp('1')])) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + + // indexBH + await expect( + indexBH + .connect(owner) + .setPrimeBasket([token0.address, token3.address], [fp('0.5'), fp('0.5')]) + ) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs( + [token0.address, token3.address], + [fp('0.5'), fp('0.5')], + [ethers.utils.formatBytes32String('USD')] + ) + await indexBH.connect(owner).refreshBasket() + + await expect(indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await indexBH.connect(owner).refreshBasket() + + await expect(indexBH.connect(owner).setPrimeBasket([token2.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await indexBH.connect(owner).refreshBasket() + + await expect(indexBH.connect(owner).forceSetPrimeBasket([token1.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + + await expect(indexBH.connect(owner).forceSetPrimeBasket([token2.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) }) it('Should not allow to set prime Basket as superset of old basket', async () => { @@ -1876,6 +2006,15 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] ) ).to.be.revertedWith('new target weights') + + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address, backupToken1.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] + ) + ).to.be.revertedWith('new target weights') }) it('Should not allow to set prime Basket as subset of old basket', async () => { @@ -1895,6 +2034,14 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { [fp('0.25'), fp('0.25'), fp('0.25')] ) ).to.be.revertedWith('missing target weights') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.24')] + ) + ).to.be.revertedWith('missing target weights') }) it('Should not allow to change target unit in old basket', async () => { @@ -1906,18 +2053,26 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] ) ).to.be.revertedWith('new target weights') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, eurToken.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('new target weights') }) it('Should not allow to set prime Basket with RSR/RToken', async () => { await expect( - reweightableBH.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) + indexBH.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( basketHandler.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) ).to.be.revertedWith('invalid collateral') await expect( - reweightableBH + indexBH .connect(owner) .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) ).to.be.revertedWith('invalid collateral') @@ -1926,13 +2081,24 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { .connect(owner) .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) ).to.be.revertedWith('invalid collateral') - }) - it('Should allow to set prime Basket if OWNER', async () => { - // Set basket - await expect(basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1')])) - .to.emit(basketHandler, 'PrimeBasketSet') - .withArgs([token0.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await expect( + indexBH.connect(owner).forceSetPrimeBasket([rsr.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([rsr.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + + await expect( + indexBH + .connect(owner) + .forceSetPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) + ).to.be.revertedWith('invalid collateral') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) + ).to.be.revertedWith('invalid collateral') }) it('Should revert if target has been changed in asset registry', async () => { @@ -1960,6 +2126,73 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] ) ).to.be.revertedWith('new target weights') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('new target weights') + }) + + it('Should normalize price by USD for index RTokens', async () => { + // Basket starts out worth $1 and holding USD targets + // Throughout this test the $ value of the RToken should remain + + // Group the 4 USD tokens together + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + let [erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(tokAmts[0]).to.equal(fp('1')) + + // Add EURO into the basket as a pure addition, changing price to $0.80 in USD and $0.20 in EURO + await indexBH + .connect(owner) + .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) + await indexBH.connect(owner).refreshBasket() + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(2) + expect(erc20s[0]).to.equal(token0.address) + expect(erc20s[1]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('0.8')) + expect(tokAmts[1]).to.equal(fp('0.2')) + + // Remove USD from the basket entirely, changing price to $1 in EURO + await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('1000')]) + await indexBH.connect(owner).refreshBasket() + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(erc20s[0]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('1')) // still $1! + + // No change by simply resizing the basket + await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('0.000001')]) + await indexBH.connect(owner).refreshBasket() + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(erc20s[0]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('1')) // still $1! + + // Not refreshing the basket in between should still allow a consecutive setPrimeBasket + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(erc20s[0]).to.equal(eurToken.address) // not token0 yet + expect(tokAmts[0]).to.equal(fp('1')) + await indexBH + .connect(owner) + .setPrimeBasket([token0.address, eurToken.address], [fp('0.25'), fp('0.25')]) + await indexBH.connect(owner).refreshBasket() + + // $0.50 USD / $0.50 EURO by the end + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(2) + expect(erc20s[0]).to.equal(token0.address) + expect(erc20s[1]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('0.5')) + expect(tokAmts[1]).to.equal(fp('0.5')) }) describe('Custom Redemption', () => { @@ -2872,10 +3105,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await newColl.refresh() // Set basket with single collateral - await reweightableBH.connect(owner).setPrimeBasket([token2.address], [fp('1000')]) + await indexBH.connect(owner).setPrimeBasket([token2.address], [fp('1000')]) // Change basket - valid at this point - await reweightableBH.connect(owner).refreshBasket() + await indexBH.connect(owner).refreshBasket() // Set refPerTok = 1 await newColl.setRate(bn(1)) @@ -2883,20 +3116,20 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const newPrice: BigNumber = MAX_UINT192.div(bn('1e10')) await setOraclePrice(collateral2.address, newPrice.sub(newPrice.div(100))) // oracle error - const [lowPrice, highPrice] = await reweightableBH.price() + const [lowPrice, highPrice] = await indexBH.price() expect(lowPrice).to.equal(MAX_UINT192) expect(highPrice).to.equal(MAX_UINT192) }) it('Should handle overflow in price calculation and return [FIX_MAX, FIX_MAX] - case 2', async () => { // Set basket with single collateral - await reweightableBH.connect(owner).setPrimeBasket([token0.address], [fp('1.1')]) - await reweightableBH.refreshBasket() + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1.1')]) + await indexBH.refreshBasket() const newPrice: BigNumber = MAX_UINT192.div(bn('1e10')) await setOraclePrice(collateral0.address, newPrice.sub(newPrice.div(100))) // oracle error - const [lowPrice, highPrice] = await reweightableBH.price() + const [lowPrice, highPrice] = await indexBH.price() expect(lowPrice).to.equal(MAX_UINT192) expect(highPrice).to.equal(MAX_UINT192) }) From 876103237244bfe46ff15227c2052263caa16507 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 9 Feb 2024 02:16:37 +0530 Subject: [PATCH 202/450] Lido wstETH Plugin for Base (#1063) Co-authored-by: Taylor Brent --- .github/workflows/tests.yml | 2 +- common/configuration.ts | 18 +- contracts/interfaces/IAsset.sol | 3 + .../assets/lido/L2LidoStakedEthCollateral.sol | 97 ++++++ .../assets/lido/LidoStakedEthCollateral.sol | 6 +- .../deploy_lido_wsteth_collateral.ts | 93 ++++-- .../collateral-plugins/verify_wsteth.ts | 78 +++-- .../individual-collateral/collateralTests.ts | 26 +- .../lido/L2LidoStakedEthTestSuite.test.ts | 290 ++++++++++++++++++ .../individual-collateral/lido/constants.ts | 23 +- .../individual-collateral/lido/helpers.ts | 5 +- 11 files changed, 566 insertions(+), 75 deletions(-) create mode 100644 contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol create mode 100644 test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 3bd5b1a460..26354e739e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -83,7 +83,7 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: npx hardhat test ./test/plugins/individual-collateral/{cbeth,aave-v3,compoundv3,stargate}/*.test.ts + - run: npx hardhat test ./test/plugins/individual-collateral/{cbeth,aave-v3,compoundv3,stargate,lido}/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true diff --git a/common/configuration.ts b/common/configuration.ts index edfeadbc91..1c16240b29 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -88,6 +88,8 @@ export interface IFeeds { stETHUSD?: string wstETHstETHexr?: string cbETHETHexr?: string + ETHUSD?: string + wstETHstETH?: string } export interface IPools { @@ -221,7 +223,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', @@ -242,7 +244,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', }, '1': { name: 'mainnet', @@ -331,7 +333,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -349,7 +351,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', }, '3': { name: 'tenderly', @@ -433,7 +435,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df' // frxETH/ETH + frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -451,7 +453,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577' + CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', }, '5': { name: 'goerli', @@ -555,6 +557,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', + wstETH: '0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452', STG: '0xE3B53AF74a4BF62Ae5511055290838050bf764Df', }, chainlinkFeeds: { @@ -569,6 +572,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { wstETHstETHexr: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061', // 0.5%, 24hr cbETHETHexr: '0x868a501e68F3D1E89CfC0D22F6b22E8dabce5F04', // 0.5%, 24hr STG: '0x63Af8341b62E683B87bB540896bF283D96B4D385', + stETHETH: '0xf586d0728a47229e747d824a939000Cf21dEF5A0', // 0.5%, 24h + ETHUSD: '0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70', // 0.15%, 10min + wstETHstETH: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061', // 0.5%, 24h }, GNOSIS_EASY_AUCTION: '0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02', // mock COMET_REWARDS: '0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1', diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index 8126aa12ce..f59b09e9e5 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -136,4 +136,7 @@ interface TestICollateral is TestIAsset, ICollateral { /// @return The amount of time a collateral must be in IFFY status until being DISABLED function delayUntilDefault() external view returns (uint48); + + /// @return The underlying refPerTok, likely not included in all collaterals however. + function underlyingRefPerTok() external view returns (uint192); } diff --git a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol new file mode 100644 index 0000000000..7597282cb8 --- /dev/null +++ b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/utils/math/Math.sol"; +import "../../../libraries/Fixed.sol"; +import "../AppreciatingFiatCollateral.sol"; +import "../OracleLib.sol"; +import "./vendor/IWSTETH.sol"; + +/** + * @title Lido Staked ETH Collateral for L2s (like Base) + * @notice Collateral plugin for Lido stETH, + * tok = wstETH (wrapped stETH) + * ref = stETH (pegged to ETH 1:1) + * tar = ETH + * UoA = USD + */ +contract L2LidoStakedEthCollateral is AppreciatingFiatCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + // Here we include them directly and ignore the parent class' chainlinkFeed entirely. + + AggregatorV3Interface public immutable targetPerRefChainlinkFeed; // {tar/ref} + uint48 public immutable targetPerRefChainlinkTimeout; // {s} + + AggregatorV3Interface public immutable uoaPerTargetChainlinkFeed; // {UoA/tar} + uint48 public immutable uoaPerTargetChainlinkTimeout; // {s} + + AggregatorV3Interface public immutable refPerTokenChainlinkFeed; // {ref/tok} + uint48 public immutable refPerTokenChainlinkTimeout; // {s} + + /// @param config.chainlinkFeed - ignored + /// @param config.oracleError {1} Should be the oracle error for UoA/tok + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + AggregatorV3Interface _targetPerRefChainlinkFeed, + uint48 _targetPerRefChainlinkTimeout, + AggregatorV3Interface _uoaPerTargetChainlinkFeed, + uint48 _uoaPerTargetChainlinkTimeout, + AggregatorV3Interface _refPerTokenChainlinkFeed, + uint48 _refPerTokenChainlinkTimeout + ) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold != 0, "defaultThreshold zero"); + + require(address(_targetPerRefChainlinkFeed) != address(0), "targetPerRefFeed missing"); + require(_targetPerRefChainlinkTimeout != 0, "targetPerRefTimeout zero"); + require(address(_uoaPerTargetChainlinkFeed) != address(0), "uoaPerTargetFeed missing"); + require(_uoaPerTargetChainlinkTimeout != 0, "uoaPerTargetTimeout zero"); + require(address(_refPerTokenChainlinkFeed) != address(0), "refPerTokenFeed missing"); + require(_refPerTokenChainlinkTimeout != 0, "refPerTokenTimeout zero"); + + targetPerRefChainlinkFeed = _targetPerRefChainlinkFeed; + targetPerRefChainlinkTimeout = _targetPerRefChainlinkTimeout; + + uoaPerTargetChainlinkFeed = _uoaPerTargetChainlinkFeed; + uoaPerTargetChainlinkTimeout = _uoaPerTargetChainlinkTimeout; + + refPerTokenChainlinkFeed = _refPerTokenChainlinkFeed; + refPerTokenChainlinkTimeout = _refPerTokenChainlinkTimeout; + } + + /// Can revert, used by other contract functions in order to catch errors + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return pegPrice {target/ref} The actual price observed in the peg + function tryPrice() + external + view + override + returns ( + uint192 low, + uint192 high, + uint192 pegPrice + ) + { + // {tar/ref} Get current market peg ({eth/steth}) + pegPrice = targetPerRefChainlinkFeed.price(targetPerRefChainlinkTimeout); + + // {UoA/tar} + uint192 uoaPerTar = uoaPerTargetChainlinkFeed.price(uoaPerTargetChainlinkTimeout); + + // {UoA/tok} = {UoA/tar} * {tar/ref} * {ref/tok} + uint192 p = uoaPerTar.mul(pegPrice).mul(underlyingRefPerTok()); + uint192 err = p.mul(oracleError, CEIL); + + high = p + err; + low = p - err; + // assert(low <= high); obviously true just by inspection + } + + /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens + function underlyingRefPerTok() public view override returns (uint192) { + return refPerTokenChainlinkFeed.price(refPerTokenChainlinkTimeout); + } +} diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 32341ee1a8..e9ea66a6f5 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -33,9 +33,10 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { AggregatorV3Interface _targetPerRefChainlinkFeed, uint48 _targetPerRefChainlinkTimeout ) AppreciatingFiatCollateral(config, revenueHiding) { + require(config.defaultThreshold != 0, "defaultThreshold zero"); + require(address(_targetPerRefChainlinkFeed) != address(0), "missing targetPerRef feed"); - require(_targetPerRefChainlinkTimeout > 0, "targetPerRefChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(_targetPerRefChainlinkTimeout != 0, "targetPerRefChainlinkTimeout zero"); targetPerRefChainlinkFeed = _targetPerRefChainlinkFeed; targetPerRefChainlinkTimeout = _targetPerRefChainlinkTimeout; @@ -70,6 +71,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = IWSTETH(address(erc20)).stEthPerToken(); + return _safeWrap(rate); } } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts index 30884eae2d..5318329d88 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' +import { baseL2Chains, networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus } from '../../../../common/constants' @@ -13,8 +13,13 @@ import { fileExists, } from '../../common' import { priceTimeout } from '../../utils' -import { LidoStakedEthCollateral } from '../../../../typechain' +import { LidoStakedEthCollateral, L2LidoStakedEthCollateral } from '../../../../typechain' import { ContractFactory } from 'ethers' +import { + BASE_PRICE_FEEDS, + BASE_FEEDS_TIMEOUT, + BASE_ORACLE_ERROR, +} from '../../../../test/plugins/individual-collateral/lido/constants' async function main() { // ==== Read Configuration ==== @@ -65,33 +70,67 @@ async function main() { } /******** Deploy Lido Staked ETH Collateral - wstETH **************************/ + let collateral: LidoStakedEthCollateral | L2LidoStakedEthCollateral - const LidoStakedEthCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( - 'LidoStakedEthCollateral' - ) - - const collateral = await LidoStakedEthCollateralFactory.connect( - deployer - ).deploy( - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: stethUsdOracleAddress, - oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed - erc20: networkConfig[chainId].tokens.wstETH, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-4').toString(), // revenueHiding = 0.01% - stethEthOracleAddress, // targetPerRefChainlinkFeed - '86400' // targetPerRefChainlinkTimeout - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + if (!baseL2Chains.includes(hre.network.name)) { + const LidoStakedEthCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'LidoStakedEthCollateral' + ) + collateral = await LidoStakedEthCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: stethUsdOracleAddress, + oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed + erc20: networkConfig[chainId].tokens.wstETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + stethEthOracleAddress, // targetPerRefChainlinkFeed + '86400' // targetPerRefChainlinkTimeout + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + } else if (chainId == '8453' || chainId == '84531') { + const L2LidoStakedEthCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'L2LidoStakedEthCollateral' + ) + + collateral = await L2LidoStakedEthCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, // ignored + oracleError: BASE_ORACLE_ERROR.toString(), // 0.5% & 0.5% & 0.15% + erc20: networkConfig[chainId].tokens.wstETH, + maxTradeVolume: fp('5e5').toString(), // $500k + oracleTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, // 86400, ignored + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + BASE_PRICE_FEEDS.stETH_ETH, + BASE_FEEDS_TIMEOUT.stETH_ETH, + BASE_PRICE_FEEDS.ETH_USD, + BASE_FEEDS_TIMEOUT.ETH_USD, + BASE_PRICE_FEEDS.wstETH_stETH, + BASE_FEEDS_TIMEOUT.wstETH_stETH + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + } else { + throw new Error(`Unsupported chainId: ${chainId}`) + } console.log(`Deployed Lido wStETH to ${hre.network.name} (${chainId}): ${collateral.address}`) assetCollDeployments.collateral.wstETH = collateral.address diff --git a/scripts/verification/collateral-plugins/verify_wsteth.ts b/scripts/verification/collateral-plugins/verify_wsteth.ts index b84c9aad57..14140cf4ac 100644 --- a/scripts/verification/collateral-plugins/verify_wsteth.ts +++ b/scripts/verification/collateral-plugins/verify_wsteth.ts @@ -1,12 +1,17 @@ import hre from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' +import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' import { fp, bn } from '../../../common/numbers' import { getDeploymentFile, getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' +import { + BASE_PRICE_FEEDS, + BASE_FEEDS_TIMEOUT, + BASE_ORACLE_ERROR, +} from '../../../test/plugins/individual-collateral/lido/constants' import { priceTimeout, verifyContract } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -28,29 +33,56 @@ async function main() { // Don't need to verify wrapper token because it's canonical /******** Verify Lido Wrapped-Staked-ETH - wstETH **************************/ - await verifyContract( - chainId, - deployments.collateral.wstETH, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.stETHUSD, - oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed - erc20: networkConfig[chainId].tokens.wstETH, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr, - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethETH feed oracleError - delayUntilDefault: bn('86400').toString(), // 24h - }, - fp('1e-4'), // revenueHiding = 0.01% - networkConfig[chainId].chainlinkFeeds.stETHETH, // targetPerRefChainlinkFeed - '86400', // targetPerRefChainlinkTimeout - ], - 'contracts/plugins/assets/lido/LidoStakedEthCollateral.sol:LidoStakedEthCollateral' - ) + if (!baseL2Chains.includes(hre.network.name)) { + await verifyContract( + chainId, + deployments.collateral.wstETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.stETHUSD, + oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed + erc20: networkConfig[chainId].tokens.wstETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethETH feed oracleError + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4'), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.stETHETH, // targetPerRefChainlinkFeed + '86400', // targetPerRefChainlinkTimeout + ], + 'contracts/plugins/assets/lido/LidoStakedEthCollateral.sol:LidoStakedEthCollateral' + ) + } else if (chainId == '8453' || chainId == '84531') { + await verifyContract( + chainId, + deployments.collateral.wstETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, // ignored + oracleError: BASE_ORACLE_ERROR.toString(), // 0.5% & 0.5% & 0.15% + erc20: networkConfig[chainId].tokens.wstETH, + maxTradeVolume: fp('5e5').toString(), // $500k + oracleTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, // 86400, ignored + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4'), // revenueHiding = 0.01% + BASE_PRICE_FEEDS.stETH_ETH, + BASE_FEEDS_TIMEOUT.stETH_ETH, + BASE_PRICE_FEEDS.ETH_USD, + BASE_FEEDS_TIMEOUT.ETH_USD, + BASE_PRICE_FEEDS.wstETH_stETH, + BASE_FEEDS_TIMEOUT.wstETH_stETH, + ], + 'contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol:L2LidoStakedEthCollateral' + ) + } } - main().catch((error) => { console.error(error) process.exitCode = 1 diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index f63c80268a..6fef4809f4 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -365,32 +365,33 @@ export default function fn( }) itHasRevenueHiding('does revenue hiding correctly', async () => { - ctx.collateral = await deployCollateral({ + const tempCtx = await makeCollateralFixtureContext(alice, { erc20: ctx.tok.address, revenueHiding: fp('0.01'), - }) + })() + // ctx.collateral = await deployCollateral() // Should remain SOUND after a 1% decrease - let refPerTok = await ctx.collateral.refPerTok() - await reduceRefPerTok(ctx, 1) // 1% decrease - await ctx.collateral.refresh() - expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) + let refPerTok = await tempCtx.collateral.refPerTok() + await reduceRefPerTok(tempCtx, 1) // 1% decrease + await tempCtx.collateral.refresh() + expect(await tempCtx.collateral.status()).to.equal(CollateralStatus.SOUND) // refPerTok should be unchanged - expect(await ctx.collateral.refPerTok()).to.be.closeTo( + expect(await tempCtx.collateral.refPerTok()).to.be.closeTo( refPerTok, refPerTok.div(bn('1e3')) ) // within 1-part-in-1-thousand // Should become DISABLED if drops more than that - refPerTok = await ctx.collateral.refPerTok() - await reduceRefPerTok(ctx, 1) // another 1% decrease - await ctx.collateral.refresh() - expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) + refPerTok = await tempCtx.collateral.refPerTok() + await reduceRefPerTok(tempCtx, 1) // another 1% decrease + await tempCtx.collateral.refresh() + expect(await tempCtx.collateral.status()).to.equal(CollateralStatus.DISABLED) // refPerTok should have fallen 1% refPerTok = refPerTok.sub(refPerTok.div(100)) - expect(await ctx.collateral.refPerTok()).to.be.closeTo( + expect(await tempCtx.collateral.refPerTok()).to.be.closeTo( refPerTok, refPerTok.div(bn('1e3')) ) // within 1-part-in-1-thousand @@ -695,6 +696,7 @@ export default function fn( amtRate: fp('1e6'), // 1M RToken pctRate: fp('0.05'), // 5% }, + reweightable: false, } interface IntegrationFixture { diff --git a/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts new file mode 100644 index 0000000000..32c4e2f591 --- /dev/null +++ b/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts @@ -0,0 +1,290 @@ +import collateralTests from '../collateralTests' +import { CollateralFixtureContext, CollateralOpts, MintCollateralFunc } from '../pluginTestTypes' +import { mintWSTETH } from './helpers' +import { expect } from 'chai' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumber, BigNumberish } from 'ethers' +import { + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, + IWSTETH, +} from '../../../../typechain' +import { pushOracleForward } from '../../../utils/oracles' +import { bn, fp } from '../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../common/constants' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + FORK_BLOCK_BASE, + BASE_PRICE_FEEDS, + BASE_FEEDS_TIMEOUT, + BASE_ORACLE_ERROR, + BASE_WSTETH, + BASE_WSTETH_WHALE, +} from './constants' +import { getResetFork } from '../helpers' + +/* + Define interfaces +*/ +interface WSTETHCollateralFixtureContext extends CollateralFixtureContext { + wsteth: IWSTETH + targetPerRefChainlinkFeed: MockV3Aggregator + uoaPerTargetChainlinkFeed: MockV3Aggregator + refPerTokenChainlinkFeed: MockV3Aggregator +} + +/* + Define deployment functions +*/ + +interface WSTETHCollateralOpts extends CollateralOpts { + targetPerRefChainlinkFeed?: string + targetPerRefChainlinkTimeout?: BigNumberish + uoaPerTargetChainlinkFeed?: string + uoaPerTargetChainlinkTimeout?: BigNumberish + refPerTokenChainlinkFeed?: string + refPerTokenChainlinkTimeout?: BigNumberish +} + +export const defaultWSTETHCollateralOpts: WSTETHCollateralOpts = { + erc20: BASE_WSTETH, + targetName: ethers.utils.formatBytes32String('ETH'), + rewardERC20: ZERO_ADDRESS, + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, // ignored + oracleTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, // ignored + oracleError: BASE_ORACLE_ERROR, + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + targetPerRefChainlinkFeed: BASE_PRICE_FEEDS.stETH_ETH, + targetPerRefChainlinkTimeout: BASE_FEEDS_TIMEOUT.stETH_ETH, + uoaPerTargetChainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, + uoaPerTargetChainlinkTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, + refPerTokenChainlinkFeed: BASE_PRICE_FEEDS.wstETH_stETH, + refPerTokenChainlinkTimeout: BASE_FEEDS_TIMEOUT.wstETH_stETH, + revenueHiding: fp('1e-4'), +} + +export const deployCollateral = async ( + opts: WSTETHCollateralOpts = {} +): Promise => { + opts = { ...defaultWSTETHCollateralOpts, ...opts } + + const WStEthCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'L2LidoStakedEthCollateral' + ) + + const collateral = await WStEthCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + rewardERC20: opts.rewardERC20, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + opts.targetPerRefChainlinkFeed, + opts.targetPerRefChainlinkTimeout, + opts.chainlinkFeed ?? opts.uoaPerTargetChainlinkFeed, + opts.uoaPerTargetChainlinkTimeout, + opts.refPerTokenChainlinkFeed, + opts.refPerTokenChainlinkTimeout, + { gasLimit: 2000000000 } + ) + + // Push forward chainlink feed + await pushOracleForward(opts.targetPerRefChainlinkFeed!) + await pushOracleForward(opts.uoaPerTargetChainlinkFeed!) + await pushOracleForward(opts.refPerTokenChainlinkFeed!) + + await collateral.deployed() + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return collateral +} + +const defaultAnswers = { + targetPerRefChainlinkFeed: bn('1e18'), + uoaPerTargetChainlinkFeed: bn('2000e8'), + refPerTokenChainlinkFeed: bn('1.1e18'), +} + +type Fixture = () => Promise + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultWSTETHCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + const targetPerRefChainlinkFeed = await MockV3AggregatorFactory.deploy( + 18, + defaultAnswers.targetPerRefChainlinkFeed + ) + const uoaPerTargetChainlinkFeed = opts.chainlinkFeed + ? MockV3AggregatorFactory.attach(opts.chainlinkFeed) + : await MockV3AggregatorFactory.deploy(8, defaultAnswers.uoaPerTargetChainlinkFeed) + const refPerTokenChainlinkFeed = await MockV3AggregatorFactory.deploy( + 18, + defaultAnswers.refPerTokenChainlinkFeed + ) + + collateralOpts.chainlinkFeed = uoaPerTargetChainlinkFeed.address + collateralOpts.targetPerRefChainlinkFeed = targetPerRefChainlinkFeed.address + collateralOpts.uoaPerTargetChainlinkFeed = uoaPerTargetChainlinkFeed.address + collateralOpts.refPerTokenChainlinkFeed = refPerTokenChainlinkFeed.address + + const wsteth = (await ethers.getContractAt('IWSTETH', BASE_WSTETH)) as IWSTETH + const rewardToken = (await ethers.getContractAt('ERC20Mock', ZERO_ADDRESS)) as ERC20Mock + const collateral = await deployCollateral(collateralOpts) + + return { + alice, + collateral, + wsteth, + tok: wsteth, + rewardToken, + chainlinkFeed: uoaPerTargetChainlinkFeed, + targetPerRefChainlinkFeed, + uoaPerTargetChainlinkFeed, + refPerTokenChainlinkFeed, + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCollateralFunc = async ( + ctx: WSTETHCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintWSTETH(ctx.wsteth, user, amount, recipient, BASE_WSTETH_WHALE) +} + +const reduceTargetPerRef = async ( + ctx: WSTETHCollateralFixtureContext, + pctDecrease: BigNumberish +) => { + const lastRound = await ctx.targetPerRefChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.targetPerRefChainlinkFeed.updateAnswer(nextAnswer) +} + +const increaseTargetPerRef = async ( + ctx: WSTETHCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + const lastRound = await ctx.targetPerRefChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.targetPerRefChainlinkFeed.updateAnswer(nextAnswer) +} + +const reduceRefPerTok = async (ctx: WSTETHCollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.refPerTokenChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.refPerTokenChainlinkFeed.updateAnswer(nextAnswer) +} + +const increaseRefPerTok = async ( + ctx: WSTETHCollateralFixtureContext, + pctIncrease: BigNumberish +) => { + const lastRound = await ctx.refPerTokenChainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.refPerTokenChainlinkFeed.updateAnswer(nextAnswer) +} + +const getExpectedPrice = async (ctx: WSTETHCollateralFixtureContext): Promise => { + const uoaPerTargetChainlinkFeedAnswer = await ctx.uoaPerTargetChainlinkFeed.latestAnswer() + const uoaPerTargetChainlinkFeedDecimals = await ctx.uoaPerTargetChainlinkFeed.decimals() + + const targetPerRefChainlinkFeedAnswer = await ctx.targetPerRefChainlinkFeed.latestAnswer() + const targetPerRefChainlinkFeedDecimals = await ctx.targetPerRefChainlinkFeed.decimals() + + const refPerTok = await ctx.collateral.underlyingRefPerTok() + + const result = uoaPerTargetChainlinkFeedAnswer + .mul(bn(10).pow(18 - uoaPerTargetChainlinkFeedDecimals)) + .mul(targetPerRefChainlinkFeedAnswer) + .mul(bn(10).pow(18 - targetPerRefChainlinkFeedDecimals)) + .div(fp('1')) + + return result.mul(refPerTok).div(fp('1')) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => { + it('does not allow targetPerRef oracle timeout at 0', async () => { + await expect(deployCollateral({ targetPerRefChainlinkTimeout: 0 })).to.be.revertedWith( + 'targetPerRefTimeout zero' + ) + }) +} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const beforeEachRewardsTest = async () => {} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, + itHasRevenueHiding: it, + resetFork: getResetFork(FORK_BLOCK_BASE), + collateralName: 'L2LidoStakedETH', + chainlinkDefaultAnswer: defaultAnswers.uoaPerTargetChainlinkFeed, + itIsPricedByPeg: true, + targetNetwork: 'base', + toleranceDivisor: bn('1e2'), +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/lido/constants.ts b/test/plugins/individual-collateral/lido/constants.ts index ac02370404..36c26eb265 100644 --- a/test/plugins/individual-collateral/lido/constants.ts +++ b/test/plugins/individual-collateral/lido/constants.ts @@ -1,8 +1,8 @@ import { bn, fp } from '../../../../common/numbers' import { networkConfig } from '../../../../common/configuration' +import { combinedError } from '../../../../scripts/deployment/utils' // Mainnet Addresses -export const RSR = networkConfig['31337'].tokens.RSR as string export const STETH_USD_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.stETHUSD as string export const STETH_ETH_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.stETHETH as string export const STETH = networkConfig['31337'].tokens.stETH as string @@ -17,5 +17,24 @@ export const ORACLE_ERROR = fp('0.005') export const DEFAULT_THRESHOLD = bn(5).mul(bn(10).pow(16)) // 0.05 export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000) - export const FORK_BLOCK = 14916729 + +// Base Addresses +export const BASE_WSTETH = networkConfig['8453'].tokens.wstETH as string +export const BASE_WSTETH_WHALE = '0xa6385c73961dd9c58db2ef0c4eb98ce4b60651e8' +export const FORK_BLOCK_BASE = 10264000 +export const BASE_PRICE_FEEDS = { + // traditional finance notation, opposite of our unit system + stETH_ETH: networkConfig['8453'].chainlinkFeeds.stETHETH, // {ETH/stETH} + ETH_USD: networkConfig['8453'].chainlinkFeeds.ETHUSD, // {USD/ETH} + wstETH_stETH: networkConfig['8453'].chainlinkFeeds.wstETHstETH, // {stETH/wstETH} +} +export const BASE_FEEDS_TIMEOUT = { + stETH_ETH: bn(86400), + ETH_USD: bn(1200), // yep, that's correct + wstETH_stETH: bn(86400), +} +export const BASE_ORACLE_ERROR = combinedError( + fp('0.0015'), + combinedError(fp('0.005'), fp('0.005')) +) diff --git a/test/plugins/individual-collateral/lido/helpers.ts b/test/plugins/individual-collateral/lido/helpers.ts index 27b01c5cc3..3c93678bda 100644 --- a/test/plugins/individual-collateral/lido/helpers.ts +++ b/test/plugins/individual-collateral/lido/helpers.ts @@ -9,9 +9,10 @@ export const mintWSTETH = async ( wsteth: IWSTETH, account: SignerWithAddress, amount: BigNumberish, - recipient: string + recipient: string, + whale: string = WSTETH_WHALE ) => { - await whileImpersonating(WSTETH_WHALE, async (wstethWhale) => { + await whileImpersonating(whale, async (wstethWhale) => { await wsteth.connect(wstethWhale).transfer(recipient, amount) }) } From 3600f40716e6a1936b37dc2321e70a5158279a91 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 9 Feb 2024 11:06:14 -0500 Subject: [PATCH 203/450] lint clean (#1066) --- contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol | 2 ++ .../morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts | 6 ++---- .../yearnv2/YearnV2CurveFiatCollateral.test.ts | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 151aa9490f..25b39749d9 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -24,6 +24,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; + // solhint-disable-next-line var-name-mixedcase address public immutable CURVE_POOL_EMA_PRICE_ORACLE; /// @param config.chainlinkFeed {UoA/target} price of ETH in USD terms @@ -39,6 +40,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { } function refresh() public virtual override { + // solhint-disable-next-line no-empty-blocks try IsfrxEth(address(erc20)).syncRewards() {} catch {} super.refresh(); diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index b05bcf82d8..ffd7c00be2 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -296,10 +296,9 @@ const execTestForToken = ({ it('linearly distributes rewards', async () => { const { - users: { alice, bob, charlie }, + users: { bob }, methods, instances, - amountBN, } = context await methods.deposit(bob, '1') @@ -361,10 +360,9 @@ const execTestForToken = ({ it('linearly distributes rewards, even with multiple claims', async () => { const { - users: { alice, bob, charlie }, + users: { bob }, methods, instances, - amountBN, } = context await methods.deposit(bob, '1') diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index 6a9d31ded9..f3636270c0 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -42,7 +42,7 @@ import { DELAY_UNTIL_DEFAULT, CurvePoolType, } from '../curve/constants' -import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' +import { setStorageAt } from '@nomicfoundation/hardhat-network-helpers' // Note: Uses ../curve/collateralTests.ts, not ../collateralTests.ts From 2360f46ba2751caf1aa8d7ee45c0ea19c47f7483 Mon Sep 17 00:00:00 2001 From: omahs <73983677+omahs@users.noreply.github.com> Date: Fri, 9 Feb 2024 17:39:14 +0100 Subject: [PATCH 204/450] Fix typos (#1062) --- README.md | 8 ++++---- docs/collateral.md | 4 ++-- docs/deployment.md | 4 ++-- docs/dev-env.md | 4 ++-- docs/exhaustive-tests.md | 2 +- docs/mev.md | 4 ++-- docs/pause-freeze-states.md | 6 +++--- docs/recollateralization.md | 4 ++-- docs/solidity-style.md | 20 ++++++++++---------- docs/system-design.md | 8 ++++---- docs/using-echidna-on-gcp.md | 2 +- docs/using-echidna.md | 2 +- 12 files changed, 34 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index e8ab78faec..702c0e19b0 100644 --- a/README.md +++ b/README.md @@ -24,10 +24,10 @@ For a much more detailed explanation of the economic design, including an hour-l - [System Design](https://github.com/reserve-protocol/protocol/blob/master/docs/system-design.md): The overall architecture of our system, and some detailed descriptions about what our protocol is _intended_ to do. - [Pause and Freeze States](https://github.com/reserve-protocol/protocol/blob/master/docs/pause-freeze-states.md): An overview of which protocol functions are halted in the paused and frozen states. - [Deployment Variables](https://github.com/reserve-protocol/protocol/blob/master/docs/deployment-variables.md) A detailed description of the governance variables of the protocol. -- [Our Solidity Style](https://github.com/reserve-protocol/protocol/blob/master/docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, estpecially where those go beyond standard practice. +- [Our Solidity Style](https://github.com/reserve-protocol/protocol/blob/master/docs/solidity-style.md): Common practices, details, and conventions relevant to reading and writing our Solidity source code, especially where those go beyond standard practice. - [Writing Collateral Plugins](https://github.com/reserve-protocol/protocol/blob/master/docs/collateral.md): An overview of how to develop collateral plugins and the concepts / questions involved. - [Building on Top](https://github.com/reserve-protocol/protocol/blob/master/docs/build-on-top.md): How to build on top of Reserve, including information about long-lived fork environments. -- [MEV](https://github.com/reserve-protocol/protocol/blob/master/docs/mev.md): A resource for MEV searchers and others looking to interact with the deployed protocol programatically. +- [MEV](https://github.com/reserve-protocol/protocol/blob/master/docs/mev.md): A resource for MEV searchers and others looking to interact with the deployed protocol programmatically. - [Rebalancing Algorithm](https://github.com/reserve-protocol/protocol/blob/master/docs/recollateralization.md): Description of our trading algorithm during the recollateralization process - [Changelog](https://github.com/reserve-protocol/protocol/blob/master/CHANGELOG.md): Release changelog @@ -64,7 +64,7 @@ Deployed collateral plugin addresses and their configuration parameters can be f We have a `p0` and `p1` implementation for each contract in our core system. The `p0` version is our _specification_ prototype, and is intended to be as easy as possible to understand. The `p1` version should behave identically, except that it employs substantial optimizations and more complicated algorithms in order to achieve lower gas costs. -We implement and maintain both of these systems in the name of correctness. Implementing p0 helps us to specify the exact intended behavior of the protocol without needing to deal simultaneously with gas optimization; maintaining equivalent behavior of both serves as a substantial extra form of testing. The behavior of each contract in `p1` should be _identical_ to the behavior of the corresponding contract in `p0`, so we can perform [differential testing](https://en.wikipedia.org/wiki/Differential_testing) between them - checking that they behave identicially, both in our explicit tests and in arbitrary randomized tests. +We implement and maintain both of these systems in the name of correctness. Implementing p0 helps us to specify the exact intended behavior of the protocol without needing to deal simultaneously with gas optimization; maintaining equivalent behavior of both serves as a substantial extra form of testing. The behavior of each contract in `p1` should be _identical_ to the behavior of the corresponding contract in `p0`, so we can perform [differential testing](https://en.wikipedia.org/wiki/Differential_testing) between them - checking that they behave identically, both in our explicit tests and in arbitrary randomized tests. We thought `p0` and `p1` would end up being a lot more different than they ended up being. For the most part the contracts only really differ for `StRSR.sol`, and a little for `RToken.sol`. @@ -83,7 +83,7 @@ P1 is the production version of the economic protocol. - Upgradable - Optimized for gas costs - No function call needs more than _O(lg N)_ time or space, and it's _O(1)_ where possible. - - Caveat: a function might be _O(k)_, where _k_ is the number of registered Assets or Collateral tokens; however, we take great care to make those loops efficient, and to avoid _O(k^2)_ behvior! + - Caveat: a function might be _O(k)_, where _k_ is the number of registered Assets or Collateral tokens; however, we take great care to make those loops efficient, and to avoid _O(k^2)_ behavior! - No user is ever forced to pay gas to process other users' transactions. ## Repository Structure diff --git a/docs/collateral.md b/docs/collateral.md index e6ae0e039c..9a98938c24 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -97,7 +97,7 @@ interface ICollateral is IAsset { /// @dev refresh() /// Refresh exchange rates and update default status. - /// VERY IMPORTANT: In any valid implemntation, status() MUST become DISABLED in refresh() if + /// VERY IMPORTANT: In any valid implementation, status() MUST become DISABLED in refresh() if /// refPerTok() has ever decreased since last call. /// @return The canonical name of this collateral's target unit. @@ -122,7 +122,7 @@ interface ICollateral is IAsset { Broadly speaking there are two ways a collateral can default: 1. Fast: `refresh()` detects a clear problem with its defi protocol, and triggers in an immediate default. For instance, anytime the `refPerTok()` exchange rate falls between calls to `refresh()`, the collateral should immediately default. -2. Slow: `refresh()` detects a error condition that will _probably_ recover, but which should cause a default eventually. For instance, if the Collateral relies on USDT, and our price feed says that USDT trades at less than \$0.95 for (say) 24 hours, the Collateral should default. If a needed price feed is out-of-date or reverting for a similar period, the Collateral should default. +2. Slow: `refresh()` detects an error condition that will _probably_ recover, but which should cause a default eventually. For instance, if the Collateral relies on USDT, and our price feed says that USDT trades at less than \$0.95 for (say) 24 hours, the Collateral should default. If a needed price feed is out-of-date or reverting for a similar period, the Collateral should default. In either of these cases, the collateral should first become `IFFY` and only move to `DISABLED` after the problem becomes sustained. In general, any pathway for default that cannot be assessed immediately should go through this delayed flow. diff --git a/docs/deployment.md b/docs/deployment.md index 98c96678ef..4e0fb10388 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -2,7 +2,7 @@ Mostly, this is about _test_ deployment, though the same elements should work to deploy to any network once configured. -Real mainnet deployment, though, will entail an deployment checklist (see below) and serious operational security considerations (not yet articulated). +Real mainnet deployment, though, will entail a deployment checklist (see below) and serious operational security considerations (not yet articulated). ## Configure Environment @@ -146,7 +146,7 @@ First, clear any stale `*-tmp-*.json` deployment files if it's important for the Do NOT screenshare this part! -It's important that nobody know the deployment key between steps 1 and 2 of the FacadeWrite: `phase3-rtoken/1_deploy_rtoken.ts` and `phase3-rtoken/2_deploy_governance.ts`. But beyond this, we do not require the deployment key to be highly secured. The key will need to hold a decent amount of ETH in order to pay for deployment (estimate: at minimum 3 ETH at 30 gwei) and we certainly do not want someone to come in and snipe our deployment between the FacadeWrite steps, causing us to have to start the FacadeWrite steps again. +It's important that nobody knows the deployment key between steps 1 and 2 of the FacadeWrite: `phase3-rtoken/1_deploy_rtoken.ts` and `phase3-rtoken/2_deploy_governance.ts`. But beyond this, we do not require the deployment key to be highly secured. The key will need to hold a decent amount of ETH in order to pay for deployment (estimate: at minimum 3 ETH at 30 gwei) and we certainly do not want someone to come in and snipe our deployment between the FacadeWrite steps, causing us to have to start the FacadeWrite steps again. First, make sure you have golang setup on your machine. If you don't, here are the quick steps: diff --git a/docs/dev-env.md b/docs/dev-env.md index 02aec1e64b..40ca0d3368 100644 --- a/docs/dev-env.md +++ b/docs/dev-env.md @@ -30,7 +30,7 @@ npm install -g yarn # Clone this repo git clone git@github.com:reserve-protocol/protocol.git -# Install pacakges from npm (including Solidity dependencies) +# Install packages from npm (including Solidity dependencies) cd protocol yarn @@ -101,7 +101,7 @@ However, ensure that you do not change the value of `.husky/pre-push` in our sha ## Echidna -We _have_ some tooling for testing with Echidna, but it is specically in `fuzz` branch of the repo. See that branch and our [echidna usage docs](using-echidna.md) +We _have_ some tooling for testing with Echidna, but it is specifically in `fuzz` branch of the repo. See that branch and our [echidna usage docs](using-echidna.md) ## Test Deployment diff --git a/docs/exhaustive-tests.md b/docs/exhaustive-tests.md index 5fafdb48f3..08fe0fa8c9 100644 --- a/docs/exhaustive-tests.md +++ b/docs/exhaustive-tests.md @@ -1,6 +1,6 @@ # Exhaustive Testing -The exhaustive tests include `Broker.test.ts`, `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExtremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possiblities. +The exhaustive tests include `Broker.test.ts`, `Furnace.test.ts`, `RToken.test.ts`, `ZTradingExtremes.test.ts` and `ZZStRSR.test.ts`, and are meant to test the protocol when given permutations of input values on the extreme ends of the spectrum of possibilities. The env vars related to exhaustive testing are `EXTREME` and `SLOW`. diff --git a/docs/mev.md b/docs/mev.md index f0579c8c3b..39bb91e0ff 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -1,6 +1,6 @@ # MEV -This document is intended to serve as a resource for MEV searchers and others looking to interact with the deployed protocol programatically. +This document is intended to serve as a resource for MEV searchers and others looking to interact with the deployed protocol programmatically. ## Overview @@ -55,7 +55,7 @@ For a sample price curve, see [docs/system-design.md](./system-design.md#sample- #### GnosisTrade -`GnosisTrade.sol` implements a batch auction on top of Gnosis's [EasyAuction](https://github.com/gnosis/ido-contracts/blob/main/contracts/EasyAuction.sol) platform. In general a batch auction is designed to minimize MEV, and indeed that's why it was chosen in the first place. Both types of auctions (batch + dutch) can be opened at anytime, but the expectation is that dutch auctions will be preferred by MEV searchers because they are more likely to be profitable. +`GnosisTrade.sol` implements a batch auction on top of Gnosis's [EasyAuction](https://github.com/gnosis/ido-contracts/blob/main/contracts/EasyAuction.sol) platform. In general a batch auction is designed to minimize MEV, and indeed that's why it was chosen in the first place. Both types of auctions (batch + dutch) can be opened at any time, but the expectation is that dutch auctions will be preferred by MEV searchers because they are more likely to be profitable. However, if a batch auction is launched, an MEV searcher may still be able to profit. In order to bid in the auction, the searcher must call `function placeSellOrders(uint256 auctionId, uint96[] memory _minBuyAmounts, uint96[] memory _sellAmounts, bytes32[] memory _prevSellOrders, bytes calldata allowListCallData)`, providing an approval in advance. This call will escrow `_sellAmounts` tokens in EasyAuction for the remaining duration of the auction. Once the auction is over, anyone can settle the auction directly in EasyAuction via `settleAuction(uint256 auctionId)`, or by calling `settleTrade(IERC20 erc20)` on the `ITrading` instance in our system that started the trade (either BackingManager or a RevenueTrader). diff --git a/docs/pause-freeze-states.md b/docs/pause-freeze-states.md index 17b2785fcd..714bc51dbc 100644 --- a/docs/pause-freeze-states.md +++ b/docs/pause-freeze-states.md @@ -45,7 +45,7 @@ The issuance-paused states indicates that RToken issuance should be paused, and ## Trading-pause -The trading-paused state has significantly more scope than the issuance-paused state. It is designed to prevent against cases where the protocol may trade unneccesarily. Many other functions in addition to just `BackingManager.rebalance()` and `RevenueTrader.manageTokens()` are halted. In general anything that manages the backing and revenue for an RToken is halted. This may become neccessary to use due to (among other things): +The trading-paused state has significantly more scope than the issuance-paused state. It is designed to prevent against cases where the protocol may trade unnecessarily. Many other functions in addition to just `BackingManager.rebalance()` and `RevenueTrader.manageTokens()` are halted. In general anything that manages the backing and revenue for an RToken is halted. This may become necessary to use due to (among other things): - An asset's `price()` malfunctions or is manipulated - A collateral's default detection has a false positive or negative @@ -58,7 +58,7 @@ An important function of freezing is to provide a finite time for governance to ### `Furnace.melt()` -It is necessary for `Furnace.melt()` to remain emabled in order to allow `RTokenAsset.refresh()` to update its `price()`. Any revenue RToken that has already accumulated at the Furnace will continue to be melted, but the flow of new revenue RToken into the contract is halted. +It is necessary for `Furnace.melt()` to remain enabled in order to allow `RTokenAsset.refresh()` to update its `price()`. Any revenue RToken that has already accumulated at the Furnace will continue to be melted, but the flow of new revenue RToken into the contract is halted. ### `StRSR.payoutRewards()` @@ -66,7 +66,7 @@ It is necessary for `StRSR.payoutRewards()` to remain enabled in order for `StRS ### `StRSR.stake()` -It is important for `StRSR.stake()` to remain emabled while frozen in order to allow honest RSR to flow into an RToken to vote against malicious governance proposals. +It is important for `StRSR.stake()` to remain enabled while frozen in order to allow honest RSR to flow into an RToken to vote against malicious governance proposals. ### `*.settleTrade()` diff --git a/docs/recollateralization.md b/docs/recollateralization.md index 06cf836594..32ddb9c97c 100644 --- a/docs/recollateralization.md +++ b/docs/recollateralization.md @@ -38,7 +38,7 @@ As trades complete, the distance between the top and bottom of the BU price band In the optimistic case we assume we start with `basketsHeldBy(backingManager).top` basket units and deduct from this the balance deficit for each backing collateral in terms of basket units (converted optimistically). For deficits we assume the low sell price and high basket unit price. We assume no impact from maxTradeSlippage or minTradeVolume dust loss. Finally we add-in contributions from all surplus balances, this time assuming the high sell price and low basket unit price. -Alltogether, this is how many BUs we would end up with after recapitalization if everything went as well as possible. +Altogether, this is how many BUs we would end up with after recapitalization if everything went as well as possible. #### `basketRange.bottom` @@ -52,7 +52,7 @@ The BU price band is used in order to determine token surplus/deficit: token sur This allows the protocol to deterministically select the next trade based on the following set of constraints (in this order of consideration): -1. Always sell more than than the [`minTradeVolume`](system-design.md#minTradeVolume) governance param +1. Always sell more than the [`minTradeVolume`](system-design.md#minTradeVolume) governance param 2. Never sell more than the [`maxTradeVolume`](system-design.md#rTokenMaxTradeVolume) governance param 3. Sell `DISABLED` collateral first, `SOUND` next, and `IFFY` last. (Non-collateral assets are considered SOUND for these purposes.) diff --git a/docs/solidity-style.md b/docs/solidity-style.md index 90b386b82e..1ff39574db 100644 --- a/docs/solidity-style.md +++ b/docs/solidity-style.md @@ -20,13 +20,13 @@ Throughout our system, any variable in state or memory, function parameter, or r These operations mostly come in a few classes: -- Conversion operations between Fix and and regular `uint` values: `toFix` and `toUint` +- Conversion operations between Fix and regular `uint` values: `toFix` and `toUint` - Typical numeric operations like `plus`, `minus`, `mul`, `div`, `pow`, `lt`, `eq`, and so on - Typical operations between Fix and unsigned int values, which have a `u` appended: `plusu`, `minusu`, `mulu`, `divu` - A few special-case operations, inferrable from their datatypes. (For instance, `divuu(uint256 x, uint256 y) pure returns (uint192)` takes two unsigned integer values and returns their ratio as a Fix value, and `divFix(uint256 x, uint192 y) pure returns (uint192)` divides a Fix by an unsigned int, returning a Fix value. - Chained operations, like `mulu_toUint` or `muluDivu`, which just to perform those operations in sequence. -Criticially, all of these operations are written so that they only fail with overflow errors if their result is outside the range of the return type. This is what motivates the chained operations, which are typically more expensive than their unchained analogues, but which do whatever work is necessary to avoid intermediate overflow. For instance: +Critically, all of these operations are written so that they only fail with overflow errors if their result is outside the range of the return type. This is what motivates the chained operations, which are typically more expensive than their unchained analogues, but which do whatever work is necessary to avoid intermediate overflow. For instance: ```solidity uint192 one = FIX_ONE; @@ -59,7 +59,7 @@ We don't have static checking for the following properties, so we have to mainta Outside of Fixed.sol: - NEVER allow a `uint192` to be implicitly upcast to `uint256`, without a comment explaining what is happening and why. -- NEVER explcitily cast between `uint192` and `uint256` without doing the appropriate numeric conversion (e.g, `toUint()` or `toFix()`.) +- NEVER explicitly cast between `uint192` and `uint256` without doing the appropriate numeric conversion (e.g, `toUint()` or `toFix()`.) - ONLY use standard arithmetic operations on `uint192` values IF: - you're gas-optimizing a hotspot in P1 and need to remove Fixlib calls - in inline comments, you explain what you're doing and why @@ -86,7 +86,7 @@ Throughout our code, we use [dimensional analysis][] to guard against mistakes o ### Developer discipline - All declarations of state variables and interface parameters that represent a value with one of the above dimensions MUST have a comment naming their unit. -- Wherever those values are used in assignments in our code, the sides of the assignemnt MUST have the same dimensions. +- Wherever those values are used in assignments in our code, the sides of the assignment MUST have the same dimensions. - Amid complex arithmetic, that the dimension are the same SHOULD be demonstrated in a nearby comment. [atto]: https://en.wikipedia.org/wiki/Atto- @@ -147,7 +147,7 @@ All execution flows through the protocol should contain at most a single (1) act Functions that are not system-external, but are `external` and can be called by other contracts in the system, are tagged with `@custom:protected`. It is governance's job to ensure a malicious contract is never allowed to masquerade as a component and call one of these. They do not execute when paused. -For each `external` or `public` function, one of these tags MUST be in the correponding function's natSpec comments. We don't have a static checker for this property, but it needs to be maintained by all developers. +For each `external` or `public` function, one of these tags MUST be in the corresponding function's natSpec comments. We don't have a static checker for this property, but it needs to be maintained by all developers. ### `@custom:interaction` @@ -228,7 +228,7 @@ Anything that doesn't fit these two policies precisely must be carefully and ful - `RewardableLib.claimRewards()` -- The entire `GnosisTrade` contract is using the moral equivalent of `ReentrancyGuard` to ensure its own reentrancy-safety, but since it's also using the state machine pattern, it can do both with the same state varible and save gas on SLOADs and SSTOREs. +- The entire `GnosisTrade` contract is using the moral equivalent of `ReentrancyGuard` to ensure its own reentrancy-safety, but since it's also using the state machine pattern, it can do both with the same state variable and save gas on SLOADs and SSTOREs. ### Reentrancy risk from collateral @@ -267,7 +267,7 @@ try chainlinkFeed.price_(oracleTimeout) returns (uint192 p) { } ``` -Notice, though, that we're _not_ going IFFY when `errData` is empty, but instead just reverting with another empty error. Why? Well, it's not very well-documented (and honestly it feels like a likely candidate for future change in the EVM), but the EVM emits a error with empty low-level data if it hits an out-of-gas error. This is an issue for us, though, because if the collateral contract goes IFFY on any out-of-gas error, then an attacker can set a collateral contract to IFFY at will, just by crafting an otherwise-legitimate transaction targeted to run out of gas during the `chainlinkFeed.price_()` call. +Notice, though, that we're _not_ going IFFY when `errData` is empty, but instead just reverting with another empty error. Why? Well, it's not very well-documented (and honestly it feels like a likely candidate for future change in the EVM), but the EVM emits an error with empty low-level data if it hits an out-of-gas error. This is an issue for us, though, because if the collateral contract goes IFFY on any out-of-gas error, then an attacker can set a collateral contract to IFFY at will, just by crafting an otherwise-legitimate transaction targeted to run out of gas during the `chainlinkFeed.price_()` call. So, to err on the side of non-griefability, these collateral contracts allow empty errors to pass through, rather than catching them and going IFFY. @@ -277,7 +277,7 @@ Components of production version P1 are designed to be upgradeable using the Pro [proxy-docs]: https://docs.openzeppelin.com/upgrades-plugins/1.x/proxies -This implies that the core contracts in P1 (`Main` and core components) are meant to be deployed as implementation contracts, which will serve as a reference to deploy later specific instances (or "proxies") via the `Deployer` contract. If changes are required in the future, a new implementation version can be deployed and the Proxy can be upgrated to point to this new implementation, while preserving its state and storage. +This implies that the core contracts in P1 (`Main` and core components) are meant to be deployed as implementation contracts, which will serve as a reference to deploy later specific instances (or "proxies") via the `Deployer` contract. If changes are required in the future, a new implementation version can be deployed and the Proxy can be upgraded to point to this new implementation, while preserving its state and storage. ### Writing upgrade-safe contracts @@ -303,7 +303,7 @@ The **recommended** process to perform an upgrade is the following: - Ensure metadata of the existing/deployed implementations is created for the required network. This is located in a folder names `.openzeppelin`, which should be persisted in `git` for Production networks. This can be done for prior versions using the `upgrades/force-import.ts` task in our repository. This task is limited to be run only on Mainnet. -- Create the new implementation version of the contract. This should follow all the recommendations from the article linked above, to make sure the implementation is "Upgrade Safe". At anytime you can check for compatibility by running the `upgrades/validate-upgrade.ts` task in our repo, in a Mainnet fork. This task would compare the current code vs. a previously deployed implementation and validate if it is "upgrade safe". Make sure the FORK_BLOCK is set up appropiately. +- Create the new implementation version of the contract. This should follow all the recommendations from the article linked above, to make sure the implementation is "Upgrade Safe". At any time you can check for compatibility by running the `upgrades/validate-upgrade.ts` task in our repo, in a Mainnet fork. This task would compare the current code vs. a previously deployed implementation and validate if it is "upgrade safe". Make sure the FORK_BLOCK is set up appropriately. - To deploy to Mainnet the new version, make sure you use the script provided in `scripts/deployment/phase1-common/2_deploy_implementations.ts`. If you are upgrading a previous version you need to specify the `LAST_VERSION_DEPLOYED` value at the top of the script. For new, clean deployments just leave that empty. This script will perform all validations on the new code, deploy the new implementation contracts, and register the deployment in the network file. It relies on the `deployImplementation` (for new deployments) or `prepareUpgrade` functions of the OZ Plugin. @@ -325,7 +325,7 @@ Here, "contract state" refers to the normal storage variables of a smart contrac - P1 core contracts MUST NOT set state variables in their constructor. - P1 core contracts MUST NOT initialize state variables where they are declared. -Instead of any of these, P1 core contracts will probably each define an initializer funcion, per the usual OZ upgradability pattern. A P1 core contract MAY depend on that initializer having run before any other functions. +Instead of any of these, P1 core contracts will probably each define an initializer function, per the usual OZ upgradability pattern. A P1 core contract MAY depend on that initializer having run before any other functions. ### Storage Gaps diff --git a/docs/system-design.md b/docs/system-design.md index a2116c359b..22128c989f 100644 --- a/docs/system-design.md +++ b/docs/system-design.md @@ -44,7 +44,7 @@ The protocol (weakly) assumes a 12-second blocktime. This section documents the #### Should-be-changed if blocktime different -- The `Furnace` melts RToken in periods of 12 seconds. If the protocol is deployed to a chain with shorter blocktime, it is possible it may be rational to issue right before melting and redeem directly after, in order to selfishly benefit. The `Furnace` shouild be updated to melt more often. +- The `Furnace` melts RToken in periods of 12 seconds. If the protocol is deployed to a chain with shorter blocktime, it is possible it may be rational to issue right before melting and redeem directly after, in order to selfishly benefit. The `Furnace` should be updated to melt more often. #### Probably fine if blocktime different @@ -119,7 +119,7 @@ For instance, if the reference basket contains the pair ``, then on This is the form of the basket that recipients and redeemer will care most about. Issuance and redemption quantities are given by the collateral basket times the current `rTok/BU` exchange rate. -While an issuance is pending in the mempool, the quantities of tokens that will be ingested when the transaciton is mined may decrease slightly as the collateral becomes worth more. If furnace melting happens in that time, however, this can increase the quantity of collateral tokens in the basket and cause the issuance to fail. +While an issuance is pending in the mempool, the quantities of tokens that will be ingested when the transaction is mined may decrease slightly as the collateral becomes worth more. If furnace melting happens in that time, however, this can increase the quantity of collateral tokens in the basket and cause the issuance to fail. On the other hand, while a redemption is pending in the mempool, the quantities of collateral tokens the redeemer will receive steadily decreases. If a furnace melting happens in that time the quantities will be increased, causing the redeemer to get more than they expected. @@ -140,7 +140,7 @@ Non-owner roles: Design intentions: - The PAUSER role should be assigned to an address that is able to act quickly in response to off-chain events, such as a Chainlink feed failing. It is acceptable for there to be false positives, since redemption remains enabled. -- The SHORT_FREEZER role should be assigned to an address that might reasonably be expected to be the first to detect a bug in the code and can act quickly, and with some tolerance for false positives though less than in pausing. If a bug is detected, a short freeze can be triggered which will automatically expire if it is not renewed by LONG_FREEZER. The OWNER (governance) may also step in and unfreeze at anytime. +- The SHORT_FREEZER role should be assigned to an address that might reasonably be expected to be the first to detect a bug in the code and can act quickly, and with some tolerance for false positives though less than in pausing. If a bug is detected, a short freeze can be triggered which will automatically expire if it is not renewed by LONG_FREEZER. The OWNER (governance) may also step in and unfreeze at any time. - The LONG_FREEZER role should be assigned to an address that will highly optimize for no false positives. It is much longer than the short freeze. It exists so that in the case of a zero-day exploit, governance can act before the system unfreezes and resumes functioning. ## System Auctions @@ -152,7 +152,7 @@ The Reserve Protocol makes a few different types of trades: - collateral to collateral, in order to change the distribution of collateral due to a basket change. Basket changes should be rare, happening only when governance changes the basket, or when some collateral token defaults. This only happens in the BackingManager. - RSR to collateral, in order to recollateralize the protocol from stRSR over-collateralization, after a basket change. These auctions should be even rarer, happening when there's a basket change and insufficient capital to achieve recollateralization without using the over-collateralization buffer. These auctions also happen in the BackingManager. -Each type of trade can happen two ways: either by a falling-price ductch auction (DutchTrade) or by a batch auction via Gnosis EasyAuction (GnosisTrade). More trading methods can be added in the future. +Each type of trade can happen two ways: either by a falling-price dutch auction (DutchTrade) or by a batch auction via Gnosis EasyAuction (GnosisTrade). More trading methods can be added in the future. ### Gnosis EasyAuction Batch Auctions (GnosisTrade) diff --git a/docs/using-echidna-on-gcp.md b/docs/using-echidna-on-gcp.md index 5f60910c1e..f2106887c5 100644 --- a/docs/using-echidna-on-gcp.md +++ b/docs/using-echidna-on-gcp.md @@ -67,7 +67,7 @@ pip3 install solc-select slither_analyzer echidna_parade # Maybe overkill, but it won't take too long solc-select install all -# Install node. Use the snap, instead of the apt pacakge, to avoid installing +# Install node. Use the snap, instead of the apt package, to avoid installing # _way too much_ other junk sudo snap install node --classic --channel=16 diff --git a/docs/using-echidna.md b/docs/using-echidna.md index 0d27cb527e..031f31976c 100644 --- a/docs/using-echidna.md +++ b/docs/using-echidna.md @@ -1,6 +1,6 @@ # Echidna -> Echidna is a Haskell program designed for fuzzing/property-based testing of Ethereum smarts contracts. It uses sophisticated grammar-based fuzzing campaigns based on a contract ABI to falsify user-defined predicates or Solidity assertions. +> Echidna is a Haskell program designed for fuzzing/property-based testing of Ethereum smart contracts. It uses sophisticated grammar-based fuzzing campaigns based on a contract ABI to falsify user-defined predicates or Solidity assertions. Our usage of Echidna is immature; we've used it only just enough to get a handful of proof-of-concept results, not as a day-to-day part of our toolchain. These notes are useful but preliminary! From 63a8d35e42101fbffc2cb4b34821cdcccee4f5e3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Sat, 10 Feb 2024 17:13:31 -0500 Subject: [PATCH 205/450] CHANGELOG --- CHANGELOG.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ad75cf74f..aabc6f7750 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,12 +46,7 @@ New governance param added: `reweightable` - `DutchTrade` - - Add new `bidTradeCallback()` function to allow payment of tokens at the _end_ of the tx, removing need for flash loans - -- `DutchTradeRouter` -- New contract to avoid needing to approve each new `DutchTrade` contract -- `bid(DutchTrade trade, address recipient) retruns (Bid memory)` -- `dutchTradeCallback(address buyToken, uint256 buyAmount, bytes calldata) external` + - Add new `bidTradeCallback()` function to allow payment of tokens at the _end_ of the tx, removing need for flash loans. Example of how-to-use in `contracts/plugins/mocks/DutchTradeRouter.sol` # 3.1.0 From b6fa409166ef2b7cc7de6af337160b7ef8c1435a Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Mon, 12 Feb 2024 15:33:49 -0500 Subject: [PATCH 206/450] add trust 3.1.0 audit (#1059) --- ...rve Audit Report 3_1_0 - Trust Security.pdf | Bin 0 -> 793818 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/Reserve Audit Report 3_1_0 - Trust Security.pdf diff --git a/audits/Reserve Audit Report 3_1_0 - Trust Security.pdf b/audits/Reserve Audit Report 3_1_0 - Trust Security.pdf new file mode 100644 index 0000000000000000000000000000000000000000..5d220b55f001eb7fa369d566c779bd5c90b0be08 GIT binary patch literal 793818 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

y23Cp_7H?k{@{_9LB>GY3j1oqw{| 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

b-5lrRV{6TvzH$<}1 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

9TaYvIno_a+upRC}A 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

{tK>mzN(YSPlsUk)ee7{3Q&zLLs@k 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

m7Q3Iq#Ar*REys3o5TO4wI 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%0Dj8e`taNq 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

    d!W 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

    OK3tu&<^H^ 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%0DTK%prBxZ=fesg^Wgkic^<$N$ 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

    1A9%0!{DYZ8{?#xbz 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 literal 0 HcmV?d00001 From 93e7c5ddbd042668cfea7fbdef4b5d538acfe656 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 7 Mar 2024 17:36:10 -0500 Subject: [PATCH 229/450] Version trading plugins (#1086) --- CHANGELOG.md | 7 +++++++ contracts/interfaces/ITrade.sol | 3 ++- contracts/mixins/Versioned.sol | 2 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- contracts/plugins/trading/DutchTrade.sol | 3 ++- contracts/plugins/trading/GnosisTrade.sol | 3 ++- test/Broker.test.ts | 9 +++++++++ test/fixtures.ts | 2 +- 8 files changed, 25 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72612319be..5ade39532f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,13 @@ All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be - yearn-v2 - Make `price()` more resistant to manipulation by MEV +### Trading + +- `GnosisTrade` + - Add `version()` getter +- `DutchTrade` + - Add `version()` getter + ### Facades - `FacadeMonitor.sol` diff --git a/contracts/interfaces/ITrade.sol b/contracts/interfaces/ITrade.sol index f9e95114f9..dddec70325 100644 --- a/contracts/interfaces/ITrade.sol +++ b/contracts/interfaces/ITrade.sol @@ -3,6 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "./IBroker.sol"; +import "./IVersioned.sol"; enum TradeStatus { NOT_STARTED, // before init() @@ -17,7 +18,7 @@ enum TradeStatus { * * Usage: if (canSettle()) settle() */ -interface ITrade { +interface ITrade is IVersioned { /// Complete the trade and transfer tokens back to the origin trader /// @return soldAmt {qSellTok} The quantity of tokens sold /// @return boughtAmt {qBuyTok} The quantity of tokens bought diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index afc4915e0c..92871bc922 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.2.0"; +string constant VERSION = "3.3.0"; /** * @title Versioned diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index 4b241f6ef3..2eb2857931 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.2.0"; +string constant ASSET_VERSION = "3.3.0"; /** * @title VersionedAsset diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 972aeecfd7..01eb92a4d1 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -8,6 +8,7 @@ import "../../libraries/NetworkConfigLib.sol"; import "../../interfaces/IAsset.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/ITrade.sol"; +import "../../mixins/Versioned.sol"; interface IDutchTradeCallee { function dutchTradeCallback( @@ -83,7 +84,7 @@ uint192 constant ONE_POINT_FIVE = 150e16; // {1} 1.5 * 3. Wait until the desired block is reached (hopefully not in the first 20% of the auction) * 4. Call bid() */ -contract DutchTrade is ITrade { +contract DutchTrade is ITrade, Versioned { using FixLib for uint192; using SafeERC20 for IERC20Metadata; diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index c494ecee57..8245791468 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -9,11 +9,12 @@ import "../../libraries/Fixed.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/IGnosis.sol"; import "../../interfaces/ITrade.sol"; +import "../../mixins/Versioned.sol"; // Modifications to this contract's state must only ever be made when status=PENDING! /// Trade contract against the Gnosis EasyAuction mechanism -contract GnosisTrade is ITrade { +contract GnosisTrade is ITrade, Versioned { using FixLib for uint192; using SafeERC20Upgradeable for IERC20Upgradeable; diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 3c534f1604..e880d7da80 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -46,6 +46,7 @@ import { ORACLE_TIMEOUT, PRICE_TIMEOUT, SLOW, + VERSION, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' import { @@ -1109,6 +1110,10 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.canSettle()).to.equal(false) }) + it('Should have version()', async () => { + expect(await trade.version()).to.equal(VERSION) + }) + it('Should initialize DutchTrade correctly - only once', async () => { // Fund trade and initialize await token0.connect(owner).mint(trade.address, amount) @@ -1555,6 +1560,10 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await setStorageAt(newTrade.address, 0, 0) }) + it('Should have version()', async () => { + expect(await newTrade.version()).to.equal(VERSION) + }) + it('Open Trade ', async () => { // Open from traders // Backing Manager diff --git a/test/fixtures.ts b/test/fixtures.ts index 4b09c6457c..2c6fc0df1c 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -94,7 +94,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.2.0' +export const VERSION = '3.3.0' export type Collateral = | FiatCollateral From 68e7c004156c4898ea544daa6845328ee4392503 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 7 Mar 2024 17:42:54 -0500 Subject: [PATCH 230/450] Convex crvUSD-USDC scripts (#1087) --- CHANGELOG.md | 1 + common/configuration.ts | 1 + scripts/deploy.ts | 3 +- ...n.ts => deploy_convex_3pool_collateral.ts} | 7 +- .../deploy_convex_crvusd_usdc_collateral.ts | 119 ++++++++++++++++++ ...onvex_stable.ts => verify_convex_3pool.ts} | 5 - .../verify_convex_crvusd_usdc.ts | 92 ++++++++++++++ scripts/verify_etherscan.ts | 3 +- 8 files changed, 219 insertions(+), 12 deletions(-) rename scripts/deployment/phase2-assets/collaterals/{deploy_convex_stable_plugin.ts => deploy_convex_3pool_collateral.ts} (94%) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts rename scripts/verification/collateral-plugins/{verify_convex_stable.ts => verify_convex_3pool.ts} (94%) create mode 100644 scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ade39532f..0f1082a921 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -34,6 +34,7 @@ All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be - convex - Make `price()` more resistant to manipulation by MEV - Emit `RewardsClaimed` event during `claimRewards()` + - Add new `crvUSD-USDC` plugin - morpho-aave - Emit `RewardsClaimed` event during `claimRewards()` - stargate diff --git a/common/configuration.ts b/common/configuration.ts index 17fb6521ce..f747647743 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -99,6 +99,7 @@ export interface IFeeds { } export interface IPools { + cvxCrvUSDUSDC?: string cvx3Pool?: string cvxeUSDFRAXBP?: string cvxTriCrypto?: string diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 8153e175a4..daf8735f9d 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -57,7 +57,8 @@ async function main() { 'phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts', 'phase2-assets/collaterals/deploy_flux_finance_collateral.ts', 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', - 'phase2-assets/collaterals/deploy_convex_stable_plugin.ts', + 'phase2-assets/collaterals/deploy_convex_3pool_collateral.ts', + 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_curve_stable_plugin.ts', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_3pool_collateral.ts similarity index 94% rename from scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts rename to scripts/deployment/phase2-assets/collaterals/deploy_convex_3pool_collateral.ts index abd65d88b6..77fd4035b0 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_3pool_collateral.ts @@ -9,7 +9,6 @@ import { getDeploymentFile, getAssetCollDeploymentFilename, IAssetCollDeployments, - IDeployments, getDeploymentFilename, fileExists, } from '../../common' @@ -35,7 +34,7 @@ import { USDT_USD_FEED, } from '../../../../test/plugins/individual-collateral/curve/constants' -// This file specifically deploys Convex Stable Plugin for 3pool +// Convex Stable Plugin: 3pool async function main() { // ==== Read Configuration ==== @@ -55,8 +54,6 @@ async function main() { if (!fileExists(phase1File)) { throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) } - const deployments = getDeploymentFile(phase1File) - // Check previous step completed const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) @@ -106,7 +103,7 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) console.log( - `Deployed Convex Stable Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + `Deployed Convex Stable Collateral for 3Pool to ${hre.network.name} (${chainId}): ${collateral.address}` ) assetCollDeployments.collateral.cvx3Pool = collateral.address diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts new file mode 100644 index 0000000000..85eed93564 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts @@ -0,0 +1,119 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { CurveStableCollateral } from '../../../../typechain' +import { revenueHiding } from '../../utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + crvUSD_USDC, + crvUSD_USDC_POOL_ID, + USDC_ORACLE_ERROR, + USDC_ORACLE_TIMEOUT, + USDC_USD_FEED, + crvUSD_ORACLE_ERROR, + crvUSD_ORACLE_TIMEOUT, + crvUSD_USD_FEED, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// Convex Stable Plugin: crvUSD-USDC + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Convex Stable Pool for crvUSD-USDC **************************/ + + const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + + const w3Pool = await ConvexStakingWrapperFactory.deploy() + await w3Pool.deployed() + await (await w3Pool.initialize(crvUSD_USDC_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Stable crvUSD-USDC pool on ${hre.network.name} (${chainId}): ${w3Pool.address} ` + ) + + const collateral = await CurveStableCollateralFactory.connect( + deployer + ).deploy( + { + erc20: w3Pool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDC, + } + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Convex Stable Collateral for crvUSD-USDC to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.cvxCrvUSDUSDC = collateral.address + assetCollDeployments.erc20s.cvxCrvUSDUSDC = w3Pool.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_convex_stable.ts b/scripts/verification/collateral-plugins/verify_convex_3pool.ts similarity index 94% rename from scripts/verification/collateral-plugins/verify_convex_stable.ts rename to scripts/verification/collateral-plugins/verify_convex_3pool.ts index 127ef39143..9058ab6878 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable.ts +++ b/scripts/verification/collateral-plugins/verify_convex_3pool.ts @@ -5,10 +5,8 @@ import { bn } from '../../../common/numbers' import { ONE_ADDRESS } from '../../../common/constants' import { getDeploymentFile, - getDeploymentFilename, getAssetCollDeploymentFilename, IAssetCollDeployments, - IDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' import { revenueHiding } from '../../deployment/utils' @@ -44,9 +42,6 @@ async function main() { throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) } - const deploymentFilename = getDeploymentFilename(chainId) - const coreDeployments = getDeploymentFile(deploymentFilename) - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) deployments = getDeploymentFile(assetCollDeploymentFilename) diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts new file mode 100644 index 0000000000..5509313f1b --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts @@ -0,0 +1,92 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { bn } from '../../../common/numbers' +import { ONE_ADDRESS } from '../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + crvUSD_USDC, + USDC_ORACLE_ERROR, + USDC_ORACLE_TIMEOUT, + USDC_USD_FEED, + crvUSD_ORACLE_ERROR, + crvUSD_ORACLE_TIMEOUT, + crvUSD_USD_FEED, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const w3PoolCollateral = await ethers.getContractAt( + 'CurveStableCollateral', + deployments.collateral.cvxCrvUSDUSDC as string + ) + + /******** Verify ConvexStakingWrapper **************************/ + + await verifyContract( + chainId, + await w3PoolCollateral.erc20(), + [], + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + ) + + /******** Verify crvUSD-USDC plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxCrvUSDUSDC, + [ + { + erc20: await w3PoolCollateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDC, + }, + ], + 'contracts/plugins/assets/curve/CurveStableCollateral.sol:CurveStableCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 2cbb12b754..725fe46fcb 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -49,7 +49,8 @@ async function main() { // Phase 2 - Individual Plugins if (!baseL2Chains.includes(hre.network.name)) { scripts.push( - 'collateral-plugins/verify_convex_stable.ts', + 'collateral-plugins/verify_convex_crvusd_usdc.ts', + 'collateral-plugins/verify_convex_3pool.ts', 'collateral-plugins/verify_convex_stable_metapool.ts', 'collateral-plugins/verify_convex_stable_rtoken_metapool.ts', 'collateral-plugins/verify_curve_stable.ts', From 6ea5e06033c126db1588357f6b94ac0bbd5f7eaa Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 8 Mar 2024 11:35:16 -0500 Subject: [PATCH 231/450] TRST-M-1 mit review: trackCollateralization() inside trackStatus() (#1088) --- contracts/interfaces/IBasketHandler.sol | 8 +- contracts/p0/BackingManager.sol | 2 - contracts/p0/BasketHandler.sol | 10 +- contracts/p1/BackingManager.sol | 2 - contracts/p1/BasketHandler.sol | 19 ++-- test/Main.test.ts | 140 +++++++++++++----------- test/Recollateralization.test.ts | 11 +- 7 files changed, 99 insertions(+), 93 deletions(-) diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index f73b1efd99..a47e72f9d7 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -97,14 +97,10 @@ interface IBasketHandler is IComponent { /// @custom:interaction function refreshBasket() external; - /// Track the basket status changes + /// Track basket status and collateralization changes /// @custom:refresher function trackStatus() external; - /// Track when last collateralized - /// @custom:refresher - function trackCollateralization() external; - /// @return If the BackingManager has sufficient collateral to redeem the entire RToken supply function fullyCollateralized() external view returns (bool); @@ -175,6 +171,8 @@ interface IBasketHandler is IComponent { } interface TestIBasketHandler is IBasketHandler { + function lastCollateralized() external view returns (uint48); + function warmupPeriod() external view returns (uint48); function setWarmupPeriod(uint48 val) external; diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 2a3d25b9d4..34a28ce66a 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -82,8 +82,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { if (errData.length == 0) revert(); // solhint-disable-line reason-string } } - - main.basketHandler().trackCollateralization(); } /// Apply the overall backing policy using the specified TradeKind, taking a haircut if unable diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 2e1325d4d8..30a8f64d84 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -218,7 +218,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { trackStatus(); } - /// Track basket status changes if they ocurred + /// Track basket status and collateralization changes // effects: lastStatus' = status(), and lastStatusTimestamp' = current timestamp /// @custom:refresher function trackStatus() public { @@ -228,13 +228,9 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { lastStatus = currentStatus; lastStatusTimestamp = uint48(block.timestamp); } - } - /// Track when last collateralized - // effects: lastCollateralized' = nonce if nonce > lastCollateralized && fullyCapitalized - /// @custom:refresher - function trackCollateralization() external { - if (nonce > lastCollateralized && fullyCollateralized()) { + // Invalidate old nonces if fully collateralized + if (reweightable && nonce > lastCollateralized && fullyCollateralized()) { emit LastCollateralizedChanged(lastCollateralized, nonce); lastCollateralized = nonce; } diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 66f69edaee..7fd6017a5e 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -107,8 +107,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { if (errData.length == 0) revert(); // solhint-disable-line reason-string } } - - basketHandler.trackCollateralization(); } /// Apply the overall backing policy using the specified TradeKind, taking a haircut if unable diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 4160714745..c0809c214e 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -160,23 +160,22 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { trackStatus(); } - /// Track basket status changes if they ocurred + /// Track basket status and collateralization changes // effects: lastStatus' = status(), and lastStatusTimestamp' = current timestamp /// @custom:refresher function trackStatus() public { + // Historical context: This is not the ideal naming for this function but it allowed + // reweightable RTokens introduced in 3.2.0 to be a minor update as opposed to major + CollateralStatus currentStatus = status(); if (currentStatus != lastStatus) { emit BasketStatusChanged(lastStatus, currentStatus); lastStatus = currentStatus; lastStatusTimestamp = uint48(block.timestamp); } - } - /// Track when last collateralized - // effects: lastCollateralized' = nonce if nonce > lastCollateralized && fullyCapitalized - /// @custom:refresher - function trackCollateralization() external { - if (nonce > lastCollateralized && fullyCollateralized()) { + // Invalidate old nonces if fully collateralized + if (reweightable && nonce > lastCollateralized && fullyCollateralized()) { emit LastCollateralizedChanged(lastCollateralized, nonce); lastCollateralized = nonce; } @@ -479,9 +478,13 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { basketNonces[i] >= lastCollateralized && basketNonces[i] <= nonce, "invalid basketNonce" ); - Basket storage b = basketHistory[basketNonces[i]]; + // Known limitation: During an ongoing rebalance it may possible to redeem + // on a previous basket nonce for _more_ UoA value than the current basket. + // This can only occur for index RTokens, and the risk has been mitigated + // by updating `lastCollateralized` on every assetRegistry.refresh(). // Add-in refAmts contribution from historical basket + Basket storage b = basketHistory[basketNonces[i]]; for (uint256 j = 0; j < b.erc20s.length; ++j) { // untestable: // previous baskets erc20s do not contain the zero address diff --git a/test/Main.test.ts b/test/Main.test.ts index 877bd961d3..385df4fa22 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -1,4 +1,4 @@ -import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { loadFixture, setStorageAt } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' @@ -2210,9 +2210,25 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await collateral0.chainlinkFeed() ) + // Swap-in indexBH + await setStorageAt(main.address, 204, indexBH.address) + if (IMPLEMENTATION == Implementation.P1) { + await setStorageAt(rToken.address, 355, indexBH.address) + await setStorageAt(backingManager.address, 302, indexBH.address) + await setStorageAt(assetRegistry.address, 201, indexBH.address) + } + await indexBH + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + await indexBH.refreshBasket() + await advanceTime(Number(config.warmupPeriod) + 1) + // register backups await assetRegistry.connect(owner).register(backupCollateral1.address) - await basketHandler + await indexBH .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), [backupToken1.address]) await assetRegistry.connect(owner).register(backupCollateral2.address) @@ -2244,7 +2260,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const portions = [fp('1')] const amount = fp('10000') await expect( - basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + indexBH.quoteCustomRedemption(basketNonces, portions, amount) ).to.be.revertedWith('bad portions len') }) @@ -2255,8 +2271,8 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const basketNonces = [1] const portions = [fp('1')] const amount = fp('10000') - const baseline = await basketHandler.quote(amount, RoundingMode.FLOOR) - const quote = await basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + const baseline = await indexBH.quote(amount, RoundingMode.FLOOR) + const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expectEqualArrays(quote.erc20s, baseline.erc20s) expectEqualArrays(quote.quantities, baseline.quantities) @@ -2304,16 +2320,16 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expectDelta(balsBefore, baseline.quantities, balsAfter) }) - it('Should correctly quote a custom redemption across 2 baskets after default', async () => { + it('Should- correctly quote a custom redemption across 2 baskets after default', async () => { /* Setup */ // default usdc & refresh basket to use backup collateral await usdcChainlink.updateAnswer(bn('0.8e8')) // default token1 - await basketHandler.refreshBasket() + await indexBH.refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await indexBH.status()).to.equal(CollateralStatus.SOUND) + expect(await indexBH.fullyCollateralized()).to.equal(false) /* Test Quote @@ -2321,7 +2337,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const basketNonces = [1, 2] const portions = [fp('0.5'), fp('0.5')] const amount = fp('10000') - const quote = await basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expect(quote.erc20s.length).equal(5) expect(quote.quantities.length).equal(5) @@ -2356,9 +2372,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { /* Test Custom Redemption */ - const balsBefore = await getBalances(addr1.address, expectedTokens) - - // rToken is undercollateralized, no backupToken1. should fail + // Should not be able to redeemCustom on old nonce, but not because of invalid nonce await expect( rToken .connect(addr1) @@ -2374,19 +2388,21 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // send enough backupToken1 to BackingManager to recollateralize and process redemption correctly await backupToken1.mint(backingManager.address, issueAmount) + expect(await indexBH.fullyCollateralized()).to.equal(true) - await rToken - .connect(addr1) - .redeemCustom( - addr1.address, - amount, - basketNonces, - portions, - quote.erc20s, - quote.quantities - ) - const balsAfter = await getBalances(addr1.address, expectedTokens) - expectDelta(balsBefore, quote.quantities, balsAfter) + // Now should not be able to redeem because of invalid old nonce + await expect( + rToken + .connect(addr1) + .redeemCustom( + addr1.address, + amount, + basketNonces, + portions, + quote.erc20s, + quote.quantities + ) + ).to.be.revertedWith('invalid basketNonce') }) it('Repeating basket nonces should not be exploitable', async () => { @@ -2407,8 +2423,8 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { fp('0.1'), ] const amount = fp('10000') - const baseline = await basketHandler.quote(amount, RoundingMode.FLOOR) - const quote = await basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + const baseline = await indexBH.quote(amount, RoundingMode.FLOOR) + const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expectEqualArrays(quote.erc20s, baseline.erc20s) expectEqualArrays(quote.quantities, baseline.quantities) @@ -2438,7 +2454,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { Setup */ // add 2nd token to backup config - await basketHandler + await indexBH .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(2), [ backupToken1.address, @@ -2447,10 +2463,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // default usdc & refresh basket to use backup collateral await usdcChainlink.updateAnswer(bn('0.8e8')) // default token1 await daiChainlink.updateAnswer(bn('0.8e8')) // default token0, token2, token3 - await basketHandler.refreshBasket() + await indexBH.refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await indexBH.status()).to.equal(CollateralStatus.SOUND) + expect(await indexBH.fullyCollateralized()).to.equal(false) /* Test Quote @@ -2458,7 +2474,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const basketNonces = [1, 2] const portions = [fp('0.2'), fp('0.8')] const amount = fp('10000') - const quote = await basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expect(quote.erc20s.length).equal(6) expect(quote.quantities.length).equal(6) @@ -2497,10 +2513,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { /* Test Custom Redemption */ - const balsBefore = await getBalances(addr1.address, expectedTokens) - await backupToken1.mint(backingManager.address, issueAmount) - - // rToken is undercollateralized, no backupToken2. should fail + // Should not be able to redeem, but not because of invalid nonce await expect( rToken .connect(addr1) @@ -2515,30 +2528,33 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).revertedWith('redemption below minimum') // send enough backupToken2 to BackingManager to recollateralize and process redemption correctly + await backupToken1.mint(backingManager.address, issueAmount) await backupToken2.mint(backingManager.address, issueAmount) + expect(await indexBH.fullyCollateralized()).to.equal(true) - await rToken - .connect(addr1) - .redeemCustom( - addr1.address, - amount, - basketNonces, - portions, - quote.erc20s, - quote.quantities - ) - const balsAfter = await getBalances(addr1.address, expectedTokens) - expectDelta(balsBefore, quote.quantities, balsAfter) + // Now should not be able to redeem because of invalid old nonce + await expect( + rToken + .connect(addr1) + .redeemCustom( + addr1.address, + amount, + basketNonces, + portions, + quote.erc20s, + quote.quantities + ) + ).to.be.revertedWith('invalid basketNonce') }) it('Should correctly quote historical redemption with almost all assets unregistered', async () => { // default usdc & refresh basket to use backup collateral await usdcChainlink.updateAnswer(bn('0.8e8')) // default token1 await daiChainlink.updateAnswer(bn('0.8e8')) // default token0, token2, token3 - await basketHandler.refreshBasket() + await indexBH.refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await indexBH.status()).to.equal(CollateralStatus.SOUND) + expect(await indexBH.fullyCollateralized()).to.equal(false) // Unregister everything except token0 const erc20s = await assetRegistry.erc20s() @@ -2554,7 +2570,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const basketNonces = [1] const portions = [fp('1')] const amount = fp('10000') - const quote = await basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expect(quote.erc20s.length).equal(1) expect(quote.quantities.length).equal(1) @@ -2600,10 +2616,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // default usdc & refresh basket to use backup collateral await usdcChainlink.updateAnswer(bn('0.8e8')) // default token1 await daiChainlink.updateAnswer(bn('0.8e8')) // default token0, token2, token3 - await basketHandler.refreshBasket() + await indexBH.refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await indexBH.status()).to.equal(CollateralStatus.SOUND) + expect(await indexBH.fullyCollateralized()).to.equal(false) // Swap collateral for asset in previous basket const AssetFactory: ContractFactory = await ethers.getContractFactory('Asset') @@ -2626,7 +2642,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const basketNonces = [1] const portions = [fp('1')] const amount = fp('10000') - const quote = await basketHandler.quoteCustomRedemption(basketNonces, portions, amount) + const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expect(quote.erc20s.length).equal(3) expect(quote.quantities.length).equal(3) @@ -2654,7 +2670,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { Test Custom Redemption - Should behave as if token is not registered */ const balsBefore = await getBalances(addr1.address, expectedTokens) - await backupToken1.mint(backingManager.address, issueAmount) + await backupToken1.mint(backingManager.address, issueAmount.div(2)) // rToken redemption await expect( @@ -2676,7 +2692,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { itP1('Should return historical basket correctly', async () => { const bskHandlerP1: BasketHandlerP1 = ( - await ethers.getContractAt('BasketHandlerP1', basketHandler.address) + await ethers.getContractAt('BasketHandlerP1', indexBH.address) ) // Returns the current prime basket @@ -2692,7 +2708,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { } // add 2nd token to backup config - await basketHandler + await indexBH .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(2), [ backupToken1.address, @@ -2701,10 +2717,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // default usdc & refresh basket to use backup collateral await usdcChainlink.updateAnswer(bn('0.8e8')) // default token1 await daiChainlink.updateAnswer(bn('0.8e8')) // default token0, token2, token3 - await basketHandler.refreshBasket() + await indexBH.refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await indexBH.status()).to.equal(CollateralStatus.SOUND) + expect(await indexBH.fullyCollateralized()).to.equal(false) // Get basket for current nonce ;[erc20s, quantities] = await bskHandlerP1.getHistoricalBasket(2) diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index af71ae59d7..1d892c6c69 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -1166,7 +1166,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await advanceTime(config.batchAuctionLength.add(100).toString()) // End current auction, should not start any new auctions - await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + await expectEvents(backingManager.settleTrade(token0.address), [ { contract: backingManager, name: 'TradeSettled', @@ -1179,12 +1179,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ], emitted: true, }, - { contract: backingManager, name: 'TradeStarted', emitted: false }, { contract: basketHandler, name: 'LastCollateralizedChanged', - args: [anyValue, 3], - emitted: true, + emitted: false, }, ]) @@ -1199,11 +1197,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) expect(await rToken.totalSupply()).to.equal(issueAmount) // assets kept in backing buffer - // Regression test -- Jan 29 2024 - // After recollateralization: should NOT allow redeemCustom at previous basket + // After recollateralization: redemption on previous nonce should be empty await expect( rToken.connect(addr1).redeemCustom(addr1.address, bn('1'), [2], [fp('1')], [], []) - ).to.be.revertedWith('invalid basketNonce') + ).to.be.revertedWith('empty redemption') // Check price in USD of the current RToken await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) From 9557f59a252e727ac4886b03e141e34426d19b1a Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:37:00 -0300 Subject: [PATCH 232/450] CrvUSD-USDC scripts review (#1091) Co-authored-by: Julian M. Rodriguez --- .../assets/curve/cvx/vendor/ConvexStakingWrapper.sol | 2 +- .../deploy_convex_crvusd_usdc_collateral.ts | 12 ++++++------ .../collateral-plugins/verify_convex_crvusd_usdc.ts | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index 6653f450c2..cdd990a875 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -451,4 +451,4 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { return IBooster(convexBooster).earmarkRewards(convexPoolId); } } -// slither-disable-end reentrancy-no-eth \ No newline at end of file +// slither-disable-end reentrancy-no-eth diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts index 85eed93564..7062133c02 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts @@ -61,19 +61,19 @@ async function main() { const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') - const w3Pool = await ConvexStakingWrapperFactory.deploy() - await w3Pool.deployed() - await (await w3Pool.initialize(crvUSD_USDC_POOL_ID)).wait() + const crvUsdUSDCPool = await ConvexStakingWrapperFactory.deploy() + await crvUsdUSDCPool.deployed() + await (await crvUsdUSDCPool.initialize(crvUSD_USDC_POOL_ID)).wait() console.log( - `Deployed wrapper for Convex Stable crvUSD-USDC pool on ${hre.network.name} (${chainId}): ${w3Pool.address} ` + `Deployed wrapper for Convex Stable crvUSD-USDC pool on ${hre.network.name} (${chainId}): ${crvUsdUSDCPool.address} ` ) const collateral = await CurveStableCollateralFactory.connect( deployer ).deploy( { - erc20: w3Pool.address, + erc20: crvUsdUSDCPool.address, targetName: ethers.utils.formatBytes32String('USD'), priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero @@ -103,7 +103,7 @@ async function main() { ) assetCollDeployments.collateral.cvxCrvUSDUSDC = collateral.address - assetCollDeployments.erc20s.cvxCrvUSDUSDC = w3Pool.address + assetCollDeployments.erc20s.cvxCrvUSDUSDC = crvUsdUSDCPool.address deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts index 5509313f1b..17ea4877d2 100644 --- a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts @@ -41,7 +41,7 @@ async function main() { const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) deployments = getDeploymentFile(assetCollDeploymentFilename) - const w3PoolCollateral = await ethers.getContractAt( + const crvUsdUSDCPoolCollateral = await ethers.getContractAt( 'CurveStableCollateral', deployments.collateral.cvxCrvUSDUSDC as string ) @@ -50,7 +50,7 @@ async function main() { await verifyContract( chainId, - await w3PoolCollateral.erc20(), + await crvUsdUSDCPoolCollateral.erc20(), [], 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' ) @@ -61,7 +61,7 @@ async function main() { deployments.collateral.cvxCrvUSDUSDC, [ { - erc20: await w3PoolCollateral.erc20(), + erc20: await crvUsdUSDCPoolCollateral.erc20(), targetName: ethers.utils.formatBytes32String('USD'), priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero From c0bebee18cf3933250eb495eabd2092a3fe0c454 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 12 Mar 2024 16:29:15 -0400 Subject: [PATCH 233/450] nit: write ERC20 to file after aave v3 pyusd deployment --- .../deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts index c78f0f6681..5f6785b1ba 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts @@ -78,6 +78,7 @@ async function main() { ) assetCollDeployments.collateral.saEthPyUSD = collateral.address + assetCollDeployments.erc20s.saEthPyUSD = networkConfig[chainId].tokens.saEthPyUSD! deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) From fc4302bb3b6633dec8f0ba158afeccb1c0aea7c4 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:52:53 -0300 Subject: [PATCH 234/450] sFraxEth deployment script (#1089) --- contracts/plugins/assets/frax-eth/README.md | 1 + .../assets/frax-eth/SFraxEthCollateral.sol | 2 +- scripts/deploy.ts | 3 +- .../collaterals/deploy_sfrax_eth.ts | 86 +++++++++++++++++++ .../collateral-plugins/verify_sfrax_eth.ts | 56 ++++++++++++ scripts/verify_etherscan.ts | 3 +- .../frax-eth/SFrxEthTestSuite.test.ts | 11 ++- 7 files changed, 153 insertions(+), 9 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts create mode 100644 scripts/verification/collateral-plugins/verify_sfrax_eth.ts diff --git a/contracts/plugins/assets/frax-eth/README.md b/contracts/plugins/assets/frax-eth/README.md index 81ed35cd9b..e677103404 100644 --- a/contracts/plugins/assets/frax-eth/README.md +++ b/contracts/plugins/assets/frax-eth/README.md @@ -31,6 +31,7 @@ This function returns rate of `frxETH/sfrxETH`, getting from [pricePerShare()](h #### target-per-ref price {tar/ref} The targetPerRef price of `ETH/frxETH` is received from the frxETH/ETH FRAX-managed oracle ([details here](https://docs.frax.finance/frax-oracle/frax-oracle-overview)). + #### tryPrice This function uses `refPerTok` and the chainlink price of `USD/ETH` to return the current price range of the collateral. Once an oracle becomes available for `frxETH/ETH`, this function should be modified to use it and return the appropiate `pegPrice`. diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 25b39749d9..b9b615b2bf 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -49,7 +49,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { /// Can revert, used by other contract functions in order to catch errors /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return pegPrice {target/ref} FIX_ONE until an oracle becomes available + /// @return pegPrice {target/ref} The actual price observed in the peg function tryPrice() external view diff --git a/scripts/deploy.ts b/scripts/deploy.ts index daf8735f9d..98d7a66fa0 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -71,7 +71,8 @@ async function main() { 'phase2-assets/collaterals/deploy_aave_v3_pyusd.ts', 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts', 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts', - 'phase2-assets/collaterals/deploy_sfrax.ts' + 'phase2-assets/collaterals/deploy_sfrax.ts', + 'phase2-assets/collaterals/deploy_sfrax_eth.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts new file mode 100644 index 0000000000..0b09d97cfb --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts @@ -0,0 +1,86 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn, fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { priceTimeout, combinedError } from '../../utils' +import { SFraxEthCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy SFRAX ETH Collateral - sFraxETH **************************/ + let sFraxEthOracleAddress: string = networkConfig[chainId].CURVE_POOL_WETH_FRXETH! + const SFraxEthCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'SFraxEthCollateral' + ) + + const oracleError = combinedError(fp('0.005'), fp('0.0002')) // 0.5% & 0.02% + + const collateral = await SFraxEthCollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: oracleError.toString(), + erc20: networkConfig[chainId].tokens.sfrxETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + sFraxEthOracleAddress + ) + await collateral.deployed() + + console.log(`Deployed sFraxETH to ${hre.network.name} (${chainId}): ${collateral.address}`) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.sfrxETH = collateral.address + assetCollDeployments.erc20s.sfrxETH = networkConfig[chainId].tokens.sfrxETH + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_sfrax_eth.ts b/scripts/verification/collateral-plugins/verify_sfrax_eth.ts new file mode 100644 index 0000000000..2cd777f81b --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_sfrax_eth.ts @@ -0,0 +1,56 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp, bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify sFRAX **************************/ + const oracleError = combinedError(fp('0.005'), fp('0.0002')) // 0.5% & 0.02% + + await verifyContract( + chainId, + deployments.collateral.sfrxETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: oracleError.toString(), + erc20: networkConfig[chainId].tokens.sfrxETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), + networkConfig[chainId].CURVE_POOL_WETH_FRXETH!, + ], + 'contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol:SFraxEthCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 725fe46fcb..ef61b29d48 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -65,7 +65,8 @@ async function main() { 'collateral-plugins/verify_aave_v3_usdc.ts', 'collateral-plugins/verify_yearn_v2_curve_usdc.ts', 'collateral-plugins/verify_yearn_v2_curve_usdp.ts', - 'collateral-plugins/verify_sfrax.ts' + 'collateral-plugins/verify_sfrax.ts', + 'collateral-plugins/verify_sfrax_eth.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains diff --git a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts index 47a242ffb0..ca3c443e88 100644 --- a/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax-eth/SFrxEthTestSuite.test.ts @@ -16,7 +16,7 @@ import { } from '../../../../typechain' import { pushOracleForward } from '../../../utils/oracles' import { bn, fp } from '../../../../common/numbers' -import { CollateralStatus } from '../../../../common/constants' +import { CollateralStatus, ZERO_ADDRESS } from '../../../../common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { PRICE_TIMEOUT, @@ -25,7 +25,6 @@ import { MAX_TRADE_VOL, DEFAULT_THRESHOLD, DELAY_UNTIL_DEFAULT, - WETH, FRX_ETH, SFRX_ETH, ETH_USD_PRICE_FEED, @@ -58,10 +57,10 @@ interface SfrxEthCollateralOpts extends CollateralOpts { _maximumCurvePoolEma?: BigNumberish } -export const defaultRethCollateralOpts: SfrxEthCollateralOpts = { +export const defaultSFrxEthCollateralOpts: SfrxEthCollateralOpts = { erc20: SFRX_ETH, targetName: ethers.utils.formatBytes32String('ETH'), - rewardERC20: WETH, + rewardERC20: ZERO_ADDRESS, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ETH_USD_PRICE_FEED, oracleTimeout: ORACLE_TIMEOUT, @@ -78,7 +77,7 @@ export const defaultRethCollateralOpts: SfrxEthCollateralOpts = { export const deployCollateral = async ( opts: SfrxEthCollateralOpts = {} ): Promise => { - opts = { ...defaultRethCollateralOpts, ...opts } + opts = { ...defaultSFrxEthCollateralOpts, ...opts } const SFraxEthCollateralFactory: ContractFactory = await ethers.getContractFactory( 'SFraxEthCollateral' @@ -119,7 +118,7 @@ const makeCollateralFixtureContext = ( alice: SignerWithAddress, opts: CollateralOpts = {} ): Fixture => { - const collateralOpts = { ...defaultRethCollateralOpts, ...opts } + const collateralOpts = { ...defaultSFrxEthCollateralOpts, ...opts } const makeCollateralFixtureContext = async () => { const MockV3AggregatorFactory = ( From a68fb9417b9773562112144cd71f1cd05564645a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 15 Mar 2024 18:12:51 -0400 Subject: [PATCH 235/450] Arbitrum (#1084) Co-authored-by: Akshat Mittal --- .env.example | 7 + .openzeppelin/arbitrum-one.json | 3204 +++++++++++++++++ CHANGELOG.md | 18 +- common/configuration.ts | 24 + contracts/libraries/NetworkConfigLib.sol | 22 + contracts/mixins/Versioned.sol | 2 +- contracts/p0/StRSR.sol | 20 +- contracts/p1/StRSR.sol | 28 +- contracts/p1/StRSRVotes.sol | 10 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- .../plugins/assets/aave/StaticATokenLM.sol | 4 + contracts/plugins/governance/Governance.sol | 4 +- .../mocks/DutchTradeCallbackReentrantTest.sol | 12 +- contracts/plugins/mocks/DutchTradeRouter.sol | 4 +- contracts/plugins/trading/DutchTrade.sol | 63 +- hardhat.config.ts | 39 +- .../arbitrum-3.4.0/42161-tmp-deployments.json | 38 + .../421614-tmp-deployments.json | 38 + scripts/deploy.ts | 7 +- scripts/deployment/utils.ts | 18 +- scripts/verify_etherscan.ts | 11 +- tasks/testing/upgrade-checker-utils/trades.ts | 72 +- test/Broker.test.ts | 43 +- test/Facade.test.ts | 11 +- test/Recollateralization.test.ts | 32 +- test/Revenues.test.ts | 67 +- test/ZZStRSR.test.ts | 30 +- test/fixtures.ts | 2 +- test/plugins/Asset.test.ts | 21 +- .../individual-collateral/collateralTests.ts | 39 +- .../curve/collateralTests.ts | 39 +- utils/env.ts | 3 + 32 files changed, 3641 insertions(+), 293 deletions(-) create mode 100644 .openzeppelin/arbitrum-one.json create mode 100644 scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json create mode 100644 scripts/addresses/arbitrum-sepolia-3.3.0/421614-tmp-deployments.json diff --git a/.env.example b/.env.example index a9a6f277c9..d5831f5fbf 100644 --- a/.env.example +++ b/.env.example @@ -10,12 +10,19 @@ MAINNET_RPC_URL="https://eth-mainnet.alchemyapi.io/v2/your_mainnet_api_key" # Base Mainnet URL, used for Base Mainnet forking (Alchemy) BASE_RPC_URL="https://base-mainnet.g.alchemy.com/v2/your_base_mainnet_api_key" +# Arbitrum One URL +ARBITRUM_RPC_URL="https://arb-mainnet.g.alchemy.com/v2/your_arbitrum_one_api_key" + +# Arbitrum Sepolia URL +ARBITRUM_SEPOLIA_RPC_URL="https://arb-sepolia.g.alchemy.com/v2/your_arbitrum_sepolia_api_key" + # Mnemonic, first address will be used for deployments MNEMONIC='copy here your mnemonic words' # Etherscan API - for contract verification ETHERSCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1 BASESCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1 +ARBISCAN_API_KEY=ABC123ABC123ABC123ABC123ABC123ABC1 # WARNING: all of the following will make SLOW a truthy value: # SLOW=0 diff --git a/.openzeppelin/arbitrum-one.json b/.openzeppelin/arbitrum-one.json new file mode 100644 index 0000000000..45f6e32ee2 --- /dev/null +++ b/.openzeppelin/arbitrum-one.json @@ -0,0 +1,3204 @@ +{ + "manifestVersion": "3.2", + "proxies": [], + "impls": { + "cea42ee549d84b1f5161926bc95e346e17c9bccd61affaf8346b569dde739f9e": { + "address": "0x9C75314AFD011F22648ca9C655b61674e27bA4AC", + "txHash": "0x1076116e3a79551374c2d136ef6d42d6f3d903a1aeba7d7b74c8f2f99c8cf5a5", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41" + }, + { + "label": "_roles", + "offset": 0, + "slot": "101", + "type": "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:61" + }, + { + "label": "__gap", + "offset": 0, + "slot": "102", + "type": "t_array(t_uint256)49_storage", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:259" + }, + { + "label": "longFreezes", + "offset": 0, + "slot": "151", + "type": "t_mapping(t_address,t_uint256)", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:36" + }, + { + "label": "unfreezeAt", + "offset": 0, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:38" + }, + { + "label": "shortFreeze", + "offset": 6, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:39" + }, + { + "label": "longFreeze", + "offset": 12, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:40" + }, + { + "label": "tradingPaused", + "offset": 18, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:45", + "renamedFrom": "paused" + }, + { + "label": "issuancePaused", + "offset": 19, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "153", + "type": "t_array(t_uint256)48_storage", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:225" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)21733", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "202", + "type": "t_contract(IStRSR)22301", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:42" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "203", + "type": "t_contract(IAssetRegistry)20070", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:50" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "204", + "type": "t_contract(IBasketHandler)20449", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:58" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "205", + "type": "t_contract(IBackingManager)20178", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:66" + }, + { + "label": "distributor", + "offset": 0, + "slot": "206", + "type": "t_contract(IDistributor)20914", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:74" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "207", + "type": "t_contract(IRevenueTrader)22089", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:82" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_contract(IRevenueTrader)22089", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:90" + }, + { + "label": "furnace", + "offset": 0, + "slot": "209", + "type": "t_contract(IFurnace)21069", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:98" + }, + { + "label": "broker", + "offset": 0, + "slot": "210", + "type": "t_contract(IBroker)20598", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:106" + }, + { + "label": "__gap", + "offset": 0, + "slot": "211", + "type": "t_array(t_uint256)40_storage", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:119" + }, + { + "label": "__gap", + "offset": 0, + "slot": "251", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "301", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "rsr", + "offset": 0, + "slot": "351", + "type": "t_contract(IERC20)11113", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:19" + }, + { + "label": "__gap", + "offset": 0, + "slot": "352", + "type": "t_array(t_uint256)49_storage", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:70" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)40_storage": { + "label": "uint256[40]", + "numberOfBytes": "1280" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)20070": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)20178": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)20449": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)20598": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)20914": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)21069": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IRToken)21733": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)22089": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)22301": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)": { + "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)", + "numberOfBytes": "32" + }, + "t_struct(RoleData)3741_storage": { + "label": "struct AccessControlUpgradeable.RoleData", + "members": [ + { + "label": "members", + "type": "t_mapping(t_address,t_bool)", + "offset": 0, + "slot": "0" + }, + { + "label": "adminRole", + "type": "t_bytes32", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "7553bc7cd604ca500db9812e90f0f3770ea95be5f37a483aa877c442248a5985": { + "address": "0xFa93538Ed210486bfdE01b7E2295392fE7153106", + "txHash": "0x5ac047d1d76d120fda91a799b7f4f7b93401b666f354d2ecf8c6a5ef1e96f93c", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)21513", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "201", + "type": "t_contract(IBasketHandler)20449", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:19" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)20178", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:20" + }, + { + "label": "_erc20s", + "offset": 0, + "slot": "203", + "type": "t_struct(AddressSet)15750_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:23" + }, + { + "label": "assets", + "offset": 0, + "slot": "205", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(IAsset)19803)", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:26" + }, + { + "label": "lastRefresh", + "offset": 0, + "slot": "206", + "type": "t_uint48", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:30" + }, + { + "label": "__gap", + "offset": 0, + "slot": "207", + "type": "t_array(t_uint256)46_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:237" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAsset)19803": { + "label": "contract IAsset", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)20178": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)20449": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)21513": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(IAsset)19803)": { + "label": "mapping(contract IERC20 => contract IAsset)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)15750_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)15449_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Set)15449_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "bd423c48ce3ae6ba0dfeec131e9480fb097b234ca3b98a4c5b9be20198b028d9": { + "address": "0xcd77df48E548dda056f8563f2520fFD94aD147eE", + "txHash": "0xa54b7526c192d0c83a6a1d97f214e65742904e27d215b03fc06fe6e1ab59334b", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)21513", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)20598", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:28" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:32" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:36" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:39" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:166" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)20070", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)20449", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)20914", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)21733", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:33" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)11113", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:34" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)22301", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:35" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)22089", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)22089", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:42" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)21069", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:45" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)20471,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:46" + }, + { + "label": "tokensOut", + "offset": 0, + "slot": "312", + "type": "t_mapping(t_contract(IERC20)11113,t_uint192)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:49" + }, + { + "label": "__gap", + "offset": 0, + "slot": "313", + "type": "t_array(t_uint256)38_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:355" + } + ], + "types": { + "t_array(t_uint256)38_storage": { + "label": "uint256[38]", + "numberOfBytes": "1216" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)20070": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)20449": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)20598": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)20914": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)21069": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)21513": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)21733": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)22089": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)22301": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)22445": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)20471": { + "label": "enum TradeKind", + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)11113,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)20471,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "358aa59e6030181250f8600f132c0bee676826ee94a80e1ed82375e9303d4a89": { + "address": "0xa8d818C719c1034E731Feba2088F4F011D44ACB3", + "txHash": "0x44b998d2048e17a4922679f43250b075015a4ee70a1767e89b869a64ef748b41", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)13760", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "201", + "type": "t_contract(IAssetRegistry)12411", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:34" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)12519", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:35" + }, + { + "label": "rsr", + "offset": 0, + "slot": "203", + "type": "t_contract(IERC20)6205", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "204", + "type": "t_contract(IRToken)13980", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:37" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "205", + "type": "t_contract(IStRSR)14548", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:38" + }, + { + "label": "config", + "offset": 0, + "slot": "206", + "type": "t_struct(BasketConfig)38008_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:42" + }, + { + "label": "basket", + "offset": 0, + "slot": "210", + "type": "t_struct(Basket)38018_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:46" + }, + { + "label": "nonce", + "offset": 0, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:48" + }, + { + "label": "timestamp", + "offset": 6, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:49" + }, + { + "label": "disabled", + "offset": 12, + "slot": "212", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:53" + }, + { + "label": "_targetNames", + "offset": 0, + "slot": "213", + "type": "t_struct(Bytes32Set)8824_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:59" + }, + { + "label": "_newBasket", + "offset": 0, + "slot": "215", + "type": "t_struct(Basket)38018_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:60" + }, + { + "label": "warmupPeriod", + "offset": 0, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:66" + }, + { + "label": "lastStatusTimestamp", + "offset": 6, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:70" + }, + { + "label": "lastStatus", + "offset": 12, + "slot": "217", + "type": "t_enum(CollateralStatus)12194", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:71" + }, + { + "label": "basketHistory", + "offset": 0, + "slot": "218", + "type": "t_mapping(t_uint48,t_struct(Basket)38018_storage)", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:77" + }, + { + "label": "_targetAmts", + "offset": 0, + "slot": "219", + "type": "t_struct(Bytes32ToUintMap)8436_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:80" + }, + { + "label": "reweightable", + "offset": 0, + "slot": "222", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:86" + }, + { + "label": "lastCollateralized", + "offset": 1, + "slot": "222", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:88" + }, + { + "label": "__gap", + "offset": 0, + "slot": "223", + "type": "t_array(t_uint256)36_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:722" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_contract(IERC20)6205)dyn_storage": { + "label": "contract IERC20[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)36_storage": { + "label": "uint256[36]", + "numberOfBytes": "1152" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)12411": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)12519": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20)6205": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)13760": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)13980": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)14548": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_enum(CollateralStatus)12194": { + "label": "enum CollateralStatus", + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_bytes32,t_bytes32)": { + "label": "mapping(bytes32 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(BackupConfig)37988_storage)": { + "label": "mapping(bytes32 => struct BackupConfig)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)6205,t_bytes32)": { + "label": "mapping(contract IERC20 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)6205,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint48,t_struct(Basket)38018_storage)": { + "label": "mapping(uint48 => struct Basket)", + "numberOfBytes": "32" + }, + "t_struct(BackupConfig)37988_storage": { + "label": "struct BackupConfig", + "members": [ + { + "label": "max", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)6205)dyn_storage", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Basket)38018_storage": { + "label": "struct Basket", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)6205)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "refAmts", + "type": "t_mapping(t_contract(IERC20)6205,t_uint192)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(BasketConfig)38008_storage": { + "label": "struct BasketConfig", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)6205)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "targetAmts", + "type": "t_mapping(t_contract(IERC20)6205,t_uint192)", + "offset": 0, + "slot": "1" + }, + { + "label": "targetNames", + "type": "t_mapping(t_contract(IERC20)6205,t_bytes32)", + "offset": 0, + "slot": "2" + }, + { + "label": "backups", + "type": "t_mapping(t_bytes32,t_struct(BackupConfig)37988_storage)", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(Bytes32Set)8824_storage": { + "label": "struct EnumerableSet.Bytes32Set", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)8630_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32ToBytes32Map)7513_storage": { + "label": "struct EnumerableMap.Bytes32ToBytes32Map", + "members": [ + { + "label": "_keys", + "type": "t_struct(Bytes32Set)8824_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_values", + "type": "t_mapping(t_bytes32,t_bytes32)", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Bytes32ToUintMap)8436_storage": { + "label": "struct EnumerableMap.Bytes32ToUintMap", + "members": [ + { + "label": "_inner", + "type": "t_struct(Bytes32ToBytes32Map)7513_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Set)8630_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "d01f6f145f45838dad5d67cc7a6ce17e3fe0694e3252e98c9f63930092a56827": { + "address": "0xd3025304C6487FC5c39010bEA0B46cc0690ab229", + "txHash": "0xfd5177293b0b861649abe145d2479d3dc6a85255ccb9aca62b39eff0492d9e6c", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)13760", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "201", + "type": "t_contract(IBackingManager)12519", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:31" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "202", + "type": "t_contract(IRevenueTrader)14336", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:32" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "203", + "type": "t_contract(IRevenueTrader)14336", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:33" + }, + { + "label": "batchTradeImplementation", + "offset": 0, + "slot": "204", + "type": "t_contract(ITrade)14692", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:37", + "renamedFrom": "tradeImplementation" + }, + { + "label": "gnosis", + "offset": 0, + "slot": "205", + "type": "t_contract(IGnosis)13416", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:40" + }, + { + "label": "batchAuctionLength", + "offset": 20, + "slot": "205", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:44", + "renamedFrom": "auctionLength" + }, + { + "label": "batchTradeDisabled", + "offset": 26, + "slot": "205", + "type": "t_bool", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:50", + "renamedFrom": "disabled" + }, + { + "label": "trades", + "offset": 0, + "slot": "206", + "type": "t_mapping(t_address,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:53" + }, + { + "label": "dutchTradeImplementation", + "offset": 0, + "slot": "207", + "type": "t_contract(ITrade)14692", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:58" + }, + { + "label": "dutchAuctionLength", + "offset": 20, + "slot": "207", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:61" + }, + { + "label": "dutchTradeDisabled", + "offset": 0, + "slot": "208", + "type": "t_mapping(t_contract(IERC20Metadata)6230,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:64" + }, + { + "label": "rToken", + "offset": 0, + "slot": "209", + "type": "t_contract(IRToken)13980", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)41_storage", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:297" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)41_storage": { + "label": "uint256[41]", + "numberOfBytes": "1312" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IBackingManager)12519": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20Metadata)6230": { + "label": "contract IERC20Metadata", + "numberOfBytes": "20" + }, + "t_contract(IGnosis)13416": { + "label": "contract IGnosis", + "numberOfBytes": "20" + }, + "t_contract(IMain)13760": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)13980": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)14336": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(ITrade)14692": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20Metadata)6230,t_bool)": { + "label": "mapping(contract IERC20Metadata => bool)", + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "e904978ac5293e4e74599d6ee2867d9c63dc5208e99421b2ab4b40b544181bcf": { + "address": "0x38eF27D791cd60074Fa0345E8F82Df25e1f80B41", + "txHash": "0xb8295fbb2f7c3ccc78def5ec8e67c0c2363d27f87ee705cc9d9a6e451edd5c7b", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)21513", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "destinations", + "offset": 0, + "slot": "201", + "type": "t_struct(AddressSet)15750_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:17" + }, + { + "label": "distribution", + "offset": 0, + "slot": "203", + "type": "t_mapping(t_address,t_struct(RevenueShare)20852_storage)", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:18" + }, + { + "label": "rsr", + "offset": 0, + "slot": "204", + "type": "t_contract(IERC20)11113", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "205", + "type": "t_contract(IERC20)11113", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:37" + }, + { + "label": "furnace", + "offset": 0, + "slot": "206", + "type": "t_contract(IFurnace)21069", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:38" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "207", + "type": "t_contract(IStRSR)22301", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:39" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:40" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "209", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:41" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)44_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:221" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)44_storage": { + "label": "uint256[44]", + "numberOfBytes": "1408" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)21069": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)21513": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)22301": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_struct(RevenueShare)20852_storage)": { + "label": "mapping(address => struct RevenueShare)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)15750_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)15449_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(RevenueShare)20852_storage": { + "label": "struct RevenueShare", + "members": [ + { + "label": "rTokenDist", + "type": "t_uint16", + "offset": 0, + "slot": "0" + }, + { + "label": "rsrDist", + "type": "t_uint16", + "offset": 2, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Set)15449_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "a0a52b0a37bee3a0e8e1d831f13f1a23be270d517e67eb1e34685cfaa4eb58b0": { + "address": "0xDf99ccA98349DeF0eaB8eC37C1a0B270de38E682", + "txHash": "0x6a311748d452b51d65e6aba76adf8f0494a4b1bd471988f45e7c77f1ae0b97ab", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)21513", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)21733", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:21" + }, + { + "label": "ratio", + "offset": 0, + "slot": "202", + "type": "t_uint192", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:24" + }, + { + "label": "lastPayout", + "offset": 24, + "slot": "202", + "type": "t_uint48", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:27" + }, + { + "label": "lastPayoutBal", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:28" + }, + { + "label": "__gap", + "offset": 0, + "slot": "204", + "type": "t_array(t_uint256)47_storage", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:106" + } + ], + "types": { + "t_array(t_uint256)47_storage": { + "label": "uint256[47]", + "numberOfBytes": "1504" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IMain)21513": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)21733": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "7ca0c34e143543d27f61131b037ed71cb62b4b37cd6f3c3685758dda5d395419": { + "address": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", + "txHash": "0xb5a603c20890e2006b43f3ff087fb530663773f8036eee44757dc1806dc32d67", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)21513", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)20598", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:28" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:31" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:32" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:35" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:36" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:39" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:166" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)11113", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)20070", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)20914", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)20178", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)21069", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)21733", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)11113", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:202" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)20070": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)20178": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)20598": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)20914": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)11113": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)21069": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)21513": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)21733": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)22445": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "5a888c497492660bc17c0ece874207430449e7ad4f2959e282bb4ddbf4450863": { + "address": "0x6bae9bE78cbE3Cd93FC02D974a66F9700E4a299C", + "txHash": "0x7b70fb4a38ad1f57820b37a5bbf325f432979decd4b439511add25e29a15a4fe", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)13760", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_balances", + "offset": 0, + "slot": "201", + "type": "t_mapping(t_address,t_uint256)", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:37" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "202", + "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:39" + }, + { + "label": "_totalSupply", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:41" + }, + { + "label": "_name", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:43" + }, + { + "label": "_symbol", + "offset": 0, + "slot": "205", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" + }, + { + "label": "__gap", + "offset": 0, + "slot": "206", + "type": "t_array(t_uint256)45_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:394" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "251", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "252", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "253", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "303", + "type": "t_mapping(t_address,t_struct(Counter)2548_storage)", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:37" + }, + { + "label": "_PERMIT_TYPEHASH_DEPRECATED_SLOT", + "offset": 0, + "slot": "304", + "type": "t_bytes32", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:51", + "renamedFrom": "_PERMIT_TYPEHASH" + }, + { + "label": "__gap", + "offset": 0, + "slot": "305", + "type": "t_array(t_uint256)48_storage", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:129" + }, + { + "label": "mandate", + "offset": 0, + "slot": "353", + "type": "t_string_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:44" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "354", + "type": "t_contract(IAssetRegistry)12411", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:47" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "355", + "type": "t_contract(IBasketHandler)12790", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:48" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "356", + "type": "t_contract(IBackingManager)12519", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:49" + }, + { + "label": "furnace", + "offset": 0, + "slot": "357", + "type": "t_contract(IFurnace)13316", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:50" + }, + { + "label": "basketsNeeded", + "offset": 0, + "slot": "358", + "type": "t_uint192", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:55" + }, + { + "label": "issuanceThrottle", + "offset": 0, + "slot": "359", + "type": "t_struct(Throttle)17193_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:58" + }, + { + "label": "redemptionThrottle", + "offset": 0, + "slot": "363", + "type": "t_struct(Throttle)17193_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:59" + }, + { + "label": "__gap", + "offset": 0, + "slot": "367", + "type": "t_array(t_uint256)42_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:535" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)12411": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)12519": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)12790": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)13316": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)13760": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)2548_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Counter)2548_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Params)17185_storage": { + "label": "struct ThrottleLib.Params", + "members": [ + { + "label": "amtRate", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "pctRate", + "type": "t_uint192", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Throttle)17193_storage": { + "label": "struct ThrottleLib.Throttle", + "members": [ + { + "label": "params", + "type": "t_struct(Params)17185_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "lastTimestamp", + "type": "t_uint48", + "offset": 0, + "slot": "2" + }, + { + "label": "lastAvailable", + "type": "t_uint256", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "3bd3a4a1d8f7febf9931ad399cea033644f08c15cd22b815d5afdaaec5ac6412": { + "address": "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178", + "txHash": "0x5d0a6f5e281b3b7be44108251986f24cfef92b77c22bdcad2b8c5dad607d4c58", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)13760", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_HASHED_NAME", + "offset": 0, + "slot": "201", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + }, + { + "label": "_HASHED_VERSION", + "offset": 0, + "slot": "202", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + }, + { + "label": "__gap", + "offset": 0, + "slot": "203", + "type": "t_array(t_uint256)50_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + }, + { + "label": "name", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:48" + }, + { + "label": "symbol", + "offset": 0, + "slot": "254", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:49" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "255", + "type": "t_contract(IAssetRegistry)12411", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:54" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "256", + "type": "t_contract(IBackingManager)12519", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:55" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "257", + "type": "t_contract(IBasketHandler)12790", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:56" + }, + { + "label": "rsr", + "offset": 0, + "slot": "258", + "type": "t_contract(IERC20)6205", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:57" + }, + { + "label": "era", + "offset": 0, + "slot": "259", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:62" + }, + { + "label": "stakes", + "offset": 0, + "slot": "260", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:66" + }, + { + "label": "totalStakes", + "offset": 0, + "slot": "261", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:67" + }, + { + "label": "stakeRSR", + "offset": 0, + "slot": "262", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:68" + }, + { + "label": "stakeRate", + "offset": 0, + "slot": "263", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:69" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "264", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:74" + }, + { + "label": "draftEra", + "offset": 0, + "slot": "265", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:79" + }, + { + "label": "draftQueues", + "offset": 0, + "slot": "266", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:87" + }, + { + "label": "firstRemainingDraft", + "offset": 0, + "slot": "267", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:88" + }, + { + "label": "totalDrafts", + "offset": 0, + "slot": "268", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:89" + }, + { + "label": "draftRSR", + "offset": 0, + "slot": "269", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:90" + }, + { + "label": "draftRate", + "offset": 0, + "slot": "270", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:91" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "271", + "type": "t_mapping(t_address,t_struct(Counter)2548_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:129" + }, + { + "label": "_delegationNonces", + "offset": 0, + "slot": "272", + "type": "t_mapping(t_address,t_struct(Counter)2548_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:131" + }, + { + "label": "unstakingDelay", + "offset": 0, + "slot": "273", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:141" + }, + { + "label": "rewardRatio", + "offset": 6, + "slot": "273", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:142" + }, + { + "label": "payoutLastPaid", + "offset": 0, + "slot": "274", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:153" + }, + { + "label": "rsrRewardsAtLastPayout", + "offset": 0, + "slot": "275", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:156" + }, + { + "label": "leaked", + "offset": 0, + "slot": "276", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:162" + }, + { + "label": "lastWithdrawRefresh", + "offset": 24, + "slot": "276", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:163" + }, + { + "label": "withdrawalLeak", + "offset": 0, + "slot": "277", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:164" + }, + { + "label": "__gap", + "offset": 0, + "slot": "278", + "type": "t_array(t_uint256)28_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:1000" + }, + { + "label": "_delegates", + "offset": 0, + "slot": "306", + "type": "t_mapping(t_address,t_address)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:31" + }, + { + "label": "_eras", + "offset": 0, + "slot": "307", + "type": "t_array(t_struct(Checkpoint)37235_storage)dyn_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:34" + }, + { + "label": "_checkpoints", + "offset": 0, + "slot": "308", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)37235_storage)dyn_storage))", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:38" + }, + { + "label": "_totalSupplyCheckpoints", + "offset": 0, + "slot": "309", + "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)37235_storage)dyn_storage)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "310", + "type": "t_array(t_uint256)46_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:243" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_struct(Checkpoint)37235_storage)dyn_storage": { + "label": "struct StRSRP1Votes.Checkpoint[]", + "numberOfBytes": "32" + }, + "t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage": { + "label": "struct StRSRP1.CumulativeDraft[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)28_storage": { + "label": "uint256[28]", + "numberOfBytes": "896" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)12411": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)12519": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)12790": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)6205": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)13760": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_address)": { + "label": "mapping(address => address)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(Checkpoint)37235_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1.CumulativeDraft[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)2548_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_array(t_struct(Checkpoint)37235_storage)dyn_storage)": { + "label": "mapping(uint256 => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)37235_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1Votes.Checkpoint[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1.CumulativeDraft[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))": { + "label": "mapping(uint256 => mapping(address => mapping(address => uint256)))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Checkpoint)37235_storage": { + "label": "struct StRSRP1Votes.Checkpoint", + "members": [ + { + "label": "fromBlock", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "val", + "type": "t_uint224", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Counter)2548_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(CumulativeDraft)34992_storage": { + "label": "struct StRSRP1.CumulativeDraft", + "members": [ + { + "label": "drafts", + "type": "t_uint176", + "offset": 0, + "slot": "0" + }, + { + "label": "availableAt", + "type": "t_uint64", + "offset": 22, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint176": { + "label": "uint176", + "numberOfBytes": "22" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint224": { + "label": "uint224", + "numberOfBytes": "28" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + } + } +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 0f1082a921..e70977424f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +# 3.4.0 + +## Upgrade Steps + +## Core Protocol Contracts + +## Plugins + +### Trading + +- `DutchTrade` + - Switch to timestamp-based model + - `price(uint256 blockNumber)` -> `price(uint48 timestamp)` + - Remove `startBlock() returns (uint256)` + `endBlock() returns (uint256)` + - Add `endTime() returns (uint48)` + # 3.3.0 This release improves how collateral plugins price LP tokens and moves reward claiming out to the asset plugin level. @@ -10,7 +26,7 @@ Swapout all collateral plugins with appreciation. All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be traded out for the raw underlying CToken, as well as aave-v3 USDC/USDCbC for canonical wrappers. -### Core Protocol Contracts +## Core Protocol Contracts - `BackingManager` + `RevenueTrader` - Change `claimRewards()` to delegatecall to the list of registered plugins diff --git a/common/configuration.ts b/common/configuration.ts index f747647743..22dc120560 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -489,6 +489,28 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_INCENTIVES_CONTROLLER: '0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44', STARGATE_STAKING_CONTRACT: '0x06Eb48763f117c7Be887296CDcdfad2E4092739C', }, + '42161': { + name: 'arbitrum', + tokens: { + RSR: '0xCa5Ca9083702c56b481D1eec86F1776FDbd2e594', + }, + chainlinkFeeds: { + RSR: '0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488', + }, + GNOSIS_EASY_AUCTION: '0xcD033976a011F41D2AB6ef47984041568F818E73', // our deployment + }, + '421614': { + name: 'arbitrum-sepolia', + tokens: { + // mocks + RSR: '0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16', + }, + chainlinkFeeds: { + // mocks + RSR: '0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb', + }, + GNOSIS_EASY_AUCTION: '0x9C75314AFD011F22648ca9C655b61674e27bA4AC', // mock + }, } networkConfig['31337'] = networkConfig['1'] @@ -496,6 +518,8 @@ export const developmentChains = ['hardhat', 'localhost'] export const baseL2Chains = ['base-goerli', 'base'] +export const arbitrumL2Chains = ['arbitrum-sepolia', 'arbitrum'] + // Common configuration interfaces export interface IConfig { dist: IRevenueShare diff --git a/contracts/libraries/NetworkConfigLib.sol b/contracts/libraries/NetworkConfigLib.sol index c07aa392c0..dbdf9731a1 100644 --- a/contracts/libraries/NetworkConfigLib.sol +++ b/contracts/libraries/NetworkConfigLib.sol @@ -1,6 +1,12 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +interface ArbSys { + function arbBlockNumber() external view returns (uint256); +} + +ArbSys constant ARB_SYS = ArbSys(0x0000000000000000000000000000000000000064); // arb precompile + /** * @title NetworkConfigLib * @notice Provides network-specific configuration parameters @@ -10,6 +16,7 @@ library NetworkConfigLib { // Returns the blocktime based on the current network (e.g. 12s for Ethereum PoS) // See docs/system-design.md for discussion of handling longer or shorter times + /// @dev Round up to 1 if block time <1s function blocktime() internal view returns (uint48) { uint256 chainId = block.chainid; // untestable: @@ -19,8 +26,23 @@ library NetworkConfigLib { return 12; // Ethereum PoS, Goerli, HH (tests) } else if (chainId == 8453 || chainId == 84531) { return 2; // Base, Base Goerli + } else if (chainId == 42161 || chainId == 421614) { + return 1; // round up to 1 even though Arbitrum is ~0.26s } else { revert InvalidNetwork(); } } + + // Returns the current blocknumber based on the current network + // Some L2s such as Arbitrum have special-cased their block number function + function blockNumber() internal view returns (uint256) { + // untestable: + // most of the branches will be shown as uncovered, because we only run coverage + // on local Ethereum PoS network (31337). Manual testing was performed. + if (block.chainid == 42161 || block.chainid == 421614) { + return ARB_SYS.arbBlockNumber(); // use arbitrum precompile + } else { + return block.number; + } + } } diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index 92871bc922..fa2787a203 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.3.0"; +string constant VERSION = "3.4.0"; /** * @title Versioned diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index a9a3e597ec..ba887e30e0 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -310,14 +310,14 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// seizedRSR will _not_ be smaller than rsrAmount. /// @custom:protected function seizeRSR(uint256 rsrAmount) external notTradingPausedOrFrozen { - require(_msgSender() == address(main.backingManager()), "not backing manager"); + require(_msgSender() == address(main.backingManager()), "!bm"); require(rsrAmount > 0, "Amount cannot be zero"); main.poke(); uint192 initialExchangeRate = exchangeRate(); uint256 rewards = rsrRewards(); uint256 rsrBalance = main.rsr().balanceOf(address(this)); - require(rsrAmount <= rsrBalance, "Cannot seize more RSR than we hold"); + require(rsrAmount <= rsrBalance, "seize exceeds balance"); uint256 seizedRSR; @@ -459,13 +459,13 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address to, uint256 amount ) private { - require(from != address(0), "ERC20: transfer to or from the zero address"); - require(to != address(0), "ERC20: transfer to or from the zero address"); - require(to != address(this), "StRSR transfer to self"); + require(from != address(0), "zero address transfer"); + require(to != address(0), "zero address transfer"); + require(to != address(this), "transfer to self"); uint256 fromBalance = balances[from]; - require(fromBalance >= amount, "ERC20: transfer amount exceeds balance"); + require(fromBalance >= amount, "transfer amount exceeds balance"); unchecked { balances[from] = fromBalance - amount; @@ -503,7 +503,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool) { address owner = _msgSender(); uint256 currentAllowance = allowances[owner][spender]; - require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero"); + require(currentAllowance >= subtractedValue, "decreased allowance below zero"); unchecked { _approve(owner, spender, currentAllowance - subtractedValue); } @@ -516,8 +516,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address spender, uint256 amount ) private { - require(owner != address(0), "ERC20: approve to or from the zero address"); - require(spender != address(0), "ERC20: approve to or from the zero address"); + require(owner != address(0), "zero address approval"); + require(spender != address(0), "zero address approval"); allowances[owner][spender] = amount; @@ -531,7 +531,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { ) internal virtual { uint256 currentAllowance = allowance(owner, spender); if (currentAllowance != type(uint256).max) { - require(currentAllowance >= amount, "ERC20: insufficient allowance"); + require(currentAllowance >= amount, "insufficient allowance"); unchecked { _approve(owner, spender, currentAllowance - amount); } diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index faff182759..70b36bdef6 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -434,11 +434,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function seizeRSR(uint256 rsrAmount) external { requireNotTradingPausedOrFrozen(); - require(_msgSender() == address(backingManager), "not backing manager"); + require(_msgSender() == address(backingManager), "!bm"); require(rsrAmount > 0, "Amount cannot be zero"); uint256 rsrBalance = rsr.balanceOf(address(this)); - require(rsrAmount <= rsrBalance, "Cannot seize more RSR than we hold"); + require(rsrAmount <= rsrBalance, "seize exceeds balance"); _payoutRewards(); @@ -816,7 +816,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) { address owner = _msgSender(); uint256 currentAllowance = _allowances[era][owner][spender]; - require(currentAllowance >= subtractedValue, "ERC20: decreased allowance below zero"); + require(currentAllowance >= subtractedValue, "decreased allowance below zero"); unchecked { _approve(owner, spender, currentAllowance - subtractedValue); } @@ -831,14 +831,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 amount ) internal { - require( - from != address(0) && to != address(0), - "ERC20: transfer to or from the zero address" - ); + require(from != address(0) && to != address(0), "zero address transfer"); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 fromBalance = eraStakes[from]; - require(fromBalance >= amount, "ERC20: transfer amount exceeds balance"); + require(fromBalance >= amount, "transfer amount exceeds balance"); unchecked { eraStakes[from] = fromBalance - amount; } @@ -853,7 +850,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // effects: bal[account] += amount; totalStakes += amount // this must only be called from a function that will fixup stakeRSR/Rate function _mint(address account, uint256 amount) internal virtual { - require(account != address(0), "ERC20: mint to the zero address"); + require(account != address(0), "zero address mint"); assert(totalStakes + amount < type(uint224).max); stakes[era][account] += amount; @@ -869,13 +866,13 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function _burn(address account, uint256 amount) internal virtual { // untestable: // _burn is only called from unstake(), which uses msg.sender as `account` - require(account != address(0), "ERC20: burn from the zero address"); + require(account != address(0), "zero address burn"); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 accountBalance = eraStakes[account]; // untestable: // _burn is only called from unstake(), which already checks this - require(accountBalance >= amount, "ERC20: burn amount exceeds balance"); + require(accountBalance >= amount, "burn amount exceeds balance"); unchecked { eraStakes[account] = accountBalance - amount; } @@ -890,10 +887,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address spender, uint256 amount ) internal { - require( - owner != address(0) && spender != address(0), - "ERC20: approve to or from the zero address" - ); + require(owner != address(0) && spender != address(0), "zero address approval"); _allowances[era][owner][spender] = amount; emit Approval(owner, spender, amount); @@ -906,7 +900,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab ) internal { uint256 currentAllowance = _allowances[era][owner][spender]; if (currentAllowance != type(uint256).max) { - require(currentAllowance >= amount, "ERC20: insufficient allowance"); + require(currentAllowance >= amount, "insufficient allowance"); unchecked { _approve(owner, spender, currentAllowance - amount); } @@ -920,7 +914,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 ) internal virtual { - require(to != address(this), "StRSR transfer to self"); + require(to != address(this), "transfer to self"); } // === ERC20Permit === diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 2251ac1ff9..8fc9b93427 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -74,19 +74,19 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { } function getPastVotes(address account, uint256 blockNumber) public view returns (uint256) { - require(blockNumber < block.number, "ERC20Votes: block not yet mined"); + require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); uint256 pastEra = _checkpointsLookup(_eras, blockNumber); return _checkpointsLookup(_checkpoints[pastEra][account], blockNumber); } function getPastTotalSupply(uint256 blockNumber) public view returns (uint256) { - require(blockNumber < block.number, "ERC20Votes: block not yet mined"); + require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); uint256 pastEra = _checkpointsLookup(_eras, blockNumber); return _checkpointsLookup(_totalSupplyCheckpoints[pastEra], blockNumber); } function getPastEra(uint256 blockNumber) public view returns (uint256) { - require(blockNumber < block.number, "ERC20Votes: block not yet mined"); + require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); return _checkpointsLookup(_eras, blockNumber); } @@ -215,12 +215,12 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; newWeight = op(oldWeight, delta); - if (pos > 0 && ckpts[pos - 1].fromBlock == block.number) { + if (pos > 0 && ckpts[pos - 1].fromBlock == NetworkConfigLib.blockNumber()) { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { ckpts.push( Checkpoint({ - fromBlock: SafeCastUpgradeable.toUint48(block.number), + fromBlock: SafeCastUpgradeable.toUint48(NetworkConfigLib.blockNumber()), val: SafeCastUpgradeable.toUint224(newWeight) }) ); diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index 2eb2857931..b9e558d5ff 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.3.0"; +string constant ASSET_VERSION = "3.4.0"; /** * @title VersionedAsset diff --git a/contracts/plugins/assets/aave/StaticATokenLM.sol b/contracts/plugins/assets/aave/StaticATokenLM.sol index ef776a19bc..e5af94b359 100644 --- a/contracts/plugins/assets/aave/StaticATokenLM.sol +++ b/contracts/plugins/assets/aave/StaticATokenLM.sol @@ -22,6 +22,7 @@ import { SafeMath } from "@aave/protocol-v2/contracts/dependencies/openzeppelin/ /** * @title StaticATokenLM + * @dev Do not use on Arbitrum! * @notice Wrapper token that allows to deposit tokens on the Aave protocol and receive * a token which balance doesn't increase automatically, but uses an ever-increasing exchange rate. * @@ -39,6 +40,7 @@ import { SafeMath } from "@aave/protocol-v2/contracts/dependencies/openzeppelin/ * loss of pending/uncollected rewards. It is recommended to always claim rewards using `forceUpdate=true` * unless the user is sure that gas costs would exceed the lost rewards. * + * * @author Aave * From: https://github.com/aave/protocol-v2/blob/238e5af2a95c3fbb83b0c8f44501ed2541215122/contracts/protocol/tokenization/StaticATokenLM.sol#L255 **/ @@ -409,6 +411,8 @@ contract StaticATokenLM is if (address(INCENTIVES_CONTROLLER) == address(0)) { return; } + // Alert! block.number is incompatible with Arbitrum! + // Should be fine because Aave V2 is not currently deployed to Arbitrum if (block.number > _lastRewardBlock) { _lastRewardBlock = block.number; uint256 supply = totalSupply(); diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 96de231912..36810c4c2d 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -79,7 +79,9 @@ contract Governance is returns (uint256) { uint256 asMicroPercent = super.proposalThreshold(); // {micro %} - uint256 pastSupply = token.getPastTotalSupply(block.number - 1); // {qStRSR} + + // {qStRSR} + uint256 pastSupply = token.getPastTotalSupply(NetworkConfigLib.blockNumber() - 1); // max StRSR supply is 1e38 // CEIL to make sure thresholds near 0% don't get rounded down to 0 tokens diff --git a/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol b/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol index 0191078830..0d3356b607 100644 --- a/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol +++ b/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol @@ -15,12 +15,20 @@ contract DutchTradeCallbackReentrantTest is IDutchTradeCallee { _currentTrade = trade; _trader = trader; - trade.buy().transferFrom(msg.sender, address(this), trade.bidAmount(block.number)); + trade.buy().transferFrom( + msg.sender, + address(this), + trade.bidAmount(uint48(block.timestamp)) + ); trade.bidWithCallback(new bytes(0)); } - function dutchTradeCallback(address buyToken, uint256 buyAmount, bytes calldata) external { + function dutchTradeCallback( + address buyToken, + uint256 buyAmount, + bytes calldata + ) external { require(msg.sender == address(_currentTrade), "Nope"); IERC20(buyToken).safeTransfer(msg.sender, buyAmount); diff --git a/contracts/plugins/mocks/DutchTradeRouter.sol b/contracts/plugins/mocks/DutchTradeRouter.sol index 287b2986d1..5841596dfa 100644 --- a/contracts/plugins/mocks/DutchTradeRouter.sol +++ b/contracts/plugins/mocks/DutchTradeRouter.sol @@ -6,6 +6,8 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IDutchTradeCallee, TradeStatus, DutchTrade } from "../trading/DutchTrade.sol"; import { IMain } from "../../interfaces/IMain.sol"; +import { NetworkConfigLib } from "../../libraries/NetworkConfigLib.sol"; + /** @title DutchTradeRouter * @notice Utility contract for placing bids on DutchTrade auctions */ @@ -85,7 +87,7 @@ contract DutchTradeRouter is IDutchTradeCallee { out.trade = trade; out.buyToken = IERC20(trade.buy()); out.sellToken = IERC20(trade.sell()); - out.buyAmt = trade.bidAmount(block.number); // {qBuyToken} + out.buyAmt = trade.bidAmount(uint48(block.timestamp)); // {qBuyToken} out.buyToken.safeTransferFrom(bidder, address(this), out.buyAmt); uint256 sellAmt = out.sellToken.balanceOf(address(this)); // {qSellToken} diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 01eb92a4d1..5213be3200 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -32,11 +32,11 @@ enum BidType { // 4. 95% - 100%: Constant at the worstPrice // // For a trade between 2 assets with 1% oracleError: -// A 30-minute auction on a chain with a 12-second blocktime has a ~20% price drop per block -// during the 1st period, ~0.8% during the 2nd period, and ~0.065% during the 3rd period. +// A 30-minute auction has a 20% price drop (every 12 seconds) during the 1st period, +// ~0.8% during the 2nd period, and ~0.065% during the 3rd period. // // 30-minutes is the recommended length of auction for a chain with 12-second blocktimes. -// 6 minutes, 7.5 minutes, 15 minutes, 1.5 minutes for each pariod respectively. +// Period lengths: 6 minutes, 7.5 minutes, 15 minutes, 1.5 minutes. // // Longer and shorter times can be used as well. The pricing method does not degrade // beyond the degree to which less overall blocktime means less overall precision. @@ -79,10 +79,15 @@ uint192 constant ONE_POINT_FIVE = 150e16; // {1} 1.5 * a bid to occur if no bots are online and the only bidders are humans. * * To bid: - * 1. Call `bidAmount()` view to check prices at various blocks. + * 1. Call `bidAmount()` view to check prices at various future timestamps. * 2. Provide approval of sell tokens for precisely the `bidAmount()` desired - * 3. Wait until the desired block is reached (hopefully not in the first 20% of the auction) + * 3. Wait until the desired time is reached (hopefully not in the first 20% of the auction) * 4. Call bid() + * + * Limitation: In order to support all chains, such as Arbitrum, this contract uses block time + * instead of block number. This means there may be small ways that validators can + * extract MEV by playing around with block.timestamp. However, we think this tradeoff + * is worth it in order to not have to maintain multiple DutchTrade contracts. */ contract DutchTrade is ITrade, Versioned { using FixLib for uint192; @@ -105,9 +110,8 @@ contract DutchTrade is ITrade, Versioned { IERC20Metadata public buy; uint192 public sellAmount; // {sellTok} - // The auction runs from [startBlock, endTime], inclusive - uint256 public startBlock; // {block} when the dutch auction begins (one block after init()) - uint256 public endBlock; // {block} when the dutch auction ends if no bids are received + // The auction runs from [startTime, endTime], inclusive + uint48 public startTime; // {s} when the dutch auction begins (one block after init()) lossy! uint48 public endTime; // {s} not used in this contract; needed on interface uint192 public bestPrice; // {buyTok/sellTok} The best plausible price based on oracle data @@ -133,11 +137,11 @@ contract DutchTrade is ITrade, Versioned { return sellAmount.shiftl_toUint(int8(sell.decimals())); } - /// Calculates how much buy token is needed to purchase the lot at a particular block - /// @param blockNumber {block} The block number of the bid + /// Calculates how much buy token is needed to purchase the lot at a particular time + /// @param timestamp {s} The timestamp of the bid /// @return {qBuyTok} The amount of buy tokens required to purchase the lot - function bidAmount(uint256 blockNumber) external view returns (uint256) { - return _bidAmount(_price(blockNumber)); + function bidAmount(uint48 timestamp) external view returns (uint256) { + return _bidAmount(_price(timestamp)); } // ==== Constructor === @@ -181,13 +185,10 @@ contract DutchTrade is ITrade, Versioned { require(sellAmount_ <= sell.balanceOf(address(this)), "unfunded trade"); sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals())); // {sellTok} - uint256 _startBlock = block.number + 1; // start in the next block - startBlock = _startBlock; // gas-saver - - uint256 _endBlock = _startBlock + auctionLength / ONE_BLOCK; // FLOOR; endBlock is inclusive - endBlock = _endBlock; // gas-saver - - endTime = uint48(block.timestamp + ONE_BLOCK * (_endBlock - _startBlock + 1)); + // Track auction end by time, to generalize to all chains + uint48 _startTime = uint48(block.timestamp) + ONE_BLOCK; // can exceed 1 block + startTime = _startTime; // gas-saver + endTime = _startTime + auctionLength; // {buyTok/sellTok} = {UoA/sellTok} * {1} / {UoA/buyTok} uint192 _worstPrice = prices.sellLow.mulDiv( @@ -208,7 +209,7 @@ contract DutchTrade is ITrade, Versioned { require(bidder == address(0), "bid already received"); // {buyTok/sellTok} - uint192 price = _price(block.number); // enforces auction ongoing + uint192 price = _price(uint48(block.timestamp)); // enforces auction ongoing // {qBuyTok} amountIn = _bidAmount(price); @@ -237,7 +238,7 @@ contract DutchTrade is ITrade, Versioned { /// Bid with callback for the auction lot at the current price; settle trade in protocol /// Sold funds are sent back to the callee first via callee.dutchTradeCallback(...) - /// Balance of buy token must increase by bidAmount(current block) after callback + /// Balance of buy token must increase by bidAmount(block.timestamp) after callback /// /// @dev Caller must implement IDutchTradeCallee /// @param data {bytes} The data to pass to the callback @@ -246,7 +247,7 @@ contract DutchTrade is ITrade, Versioned { require(bidder == address(0), "bid already received"); // {buyTok/sellTok} - uint192 price = _price(block.number); // enforces auction ongoing + uint192 price = _price(uint48(block.timestamp)); // enforces auction ongoing // {qBuyTok} amountIn = _bidAmount(price); @@ -289,7 +290,7 @@ contract DutchTrade is ITrade, Versioned { returns (uint256 soldAmt, uint256 boughtAmt) { require(msg.sender == address(origin), "only origin can settle"); - require(bidder != address(0) || block.number > endBlock, "auction not over"); + require(bidder != address(0) || block.timestamp > endTime, "auction not over"); if (bidType == BidType.CALLBACK) { soldAmt = lot(); // {qSellTok} @@ -315,19 +316,19 @@ contract DutchTrade is ITrade, Versioned { /// @return true iff the trade can be settled. // Guaranteed to be true some time after init(), until settle() is called function canSettle() external view returns (bool) { - return status == TradeStatus.OPEN && (bidder != address(0) || block.number > endBlock); + return status == TradeStatus.OPEN && (bidder != address(0) || block.timestamp > endTime); } // === Private === /// Return the price of the auction at a particular timestamp - /// @param blockNumber {block} The block number to get price for + /// @param timestamp {s} The timestamp to get price for /// @return {buyTok/sellTok} - function _price(uint256 blockNumber) private view returns (uint192) { - uint256 _startBlock = startBlock; // gas savings - uint256 _endBlock = endBlock; // gas savings - require(blockNumber >= _startBlock, "auction not started"); - require(blockNumber <= _endBlock, "auction over"); + function _price(uint48 timestamp) private view returns (uint192) { + uint48 _startTime = startTime; // {s} gas savings + uint48 _endTime = endTime; // {s} gas savings + require(timestamp >= _startTime, "auction not started"); + require(timestamp <= _endTime, "auction over"); /// Price Curve: /// - first 20%: geometrically decrease the price from 1000x the bestPrice to 1.5x it @@ -335,7 +336,7 @@ contract DutchTrade is ITrade, Versioned { /// - next 50%: linearly decrease the price from bestPrice to worstPrice /// - last 5%: constant at worstPrice - uint192 progression = divuu(blockNumber - _startBlock, _endBlock - _startBlock); // {1} + uint192 progression = divuu(timestamp - _startTime, _endTime - _startTime); // {1} // Fast geometric decay -- 0%-20% of auction if (progression < TWENTY_PERCENT) { diff --git a/hardhat.config.ts b/hardhat.config.ts index 7e1c009d07..fdf3724955 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -25,6 +25,8 @@ const TENDERLY_RPC_URL = useEnv('TENDERLY_RPC_URL') const GOERLI_RPC_URL = useEnv('GOERLI_RPC_URL') const BASE_GOERLI_RPC_URL = useEnv('BASE_GOERLI_RPC_URL') const BASE_RPC_URL = useEnv('BASE_RPC_URL') +const ARBITRUM_SEPOLIA_RPC_URL = useEnv('ARBITRUM_SEPOLIA_RPC_URL') +const ARBITRUM_RPC_URL = useEnv('ARBITRUM_RPC_URL') const MNEMONIC = useEnv('MNEMONIC') ?? 'test test test test test test test test test test test junk' const TIMEOUT = useEnv('SLOW') ? 6_000_000 : 600_000 @@ -44,7 +46,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true + allowUnlimitedContractSize: true, }, localhost: { // network for long-lived mainnet forks @@ -84,6 +86,21 @@ const config: HardhatUserConfig = { // gasPrice: 30_000_000_000, gasMultiplier: 2, // 100% buffer; seen failures on RToken deployment and asset refreshes otherwise }, + arbitrum: { + chainId: 42161, + url: ARBITRUM_RPC_URL, + accounts: { + mnemonic: MNEMONIC, + }, + gasMultiplier: 2, // 100% buffer; seen failures on RToken deployment and asset refreshes otherwise + }, + 'arbitrum-sepolia': { + chainId: 421614, + url: ARBITRUM_SEPOLIA_RPC_URL, + accounts: { + mnemonic: MNEMONIC, + }, + }, tenderly: { chainId: 3, url: TENDERLY_RPC_URL, @@ -135,7 +152,9 @@ const config: HardhatUserConfig = { etherscan: { apiKey: { mainnet: useEnv('ETHERSCAN_API_KEY'), - base: useEnv('BASESCAN_API_KEY') + base: useEnv('BASESCAN_API_KEY'), + arbitrum: useEnv('ARBISCAN_API_KEY'), + 'arbitrum-sepolia': useEnv('ARBISCAN_API_KEY'), }, customChains: [ { @@ -154,6 +173,22 @@ const config: HardhatUserConfig = { browserURL: 'https://goerli.basescan.org', }, }, + { + network: 'arbitrum', + chainId: 42161, + urls: { + apiURL: 'https://api.arbiscan.io/api', + browserURL: 'https://arbiscan.io', + }, + }, + { + network: 'arbitrum-sepolia', + chainId: 421614, + urls: { + apiURL: 'https://api-sepolia.arbiscan.io/api', + browserURL: 'https://sepolia.arbiscan.io', + }, + }, ], }, tenderly: { diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json new file mode 100644 index 0000000000..6d1483912b --- /dev/null +++ b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0xCa5Ca9083702c56b481D1eec86F1776FDbd2e594", + "RSR_FEED": "0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488", + "GNOSIS_EASY_AUCTION": "0xcD033976a011F41D2AB6ef47984041568F818E73" + }, + "tradingLib": "0x8569D60Df34354CDd1115b90de832845b31C28d2", + "cvxMiningLib": "", + "facade": "0xB7F55aA5C7d09C091C1bD22B3352e8cb3fACF289", + "facets": { + "actFacet": "0x182e86Ad4a6139ced4f9Fa4ED3f1Cd9E4F7449e7", + "readFacet": "0x37C8ebD57864D38C8F7987B6762e0301b0bAfF6d" + }, + "facadeWriteLib": "0xfd529fa21FBd569Bcf7c7f49694568fD66e8d1e9", + "basketLib": "0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16", + "facadeWrite": "0x0F345F57ee2b395e23390f8e1F1869D7E6C0F70e", + "deployer": "0x184460704886f9F2A7F3A0c2887680867954dC6E", + "rsrAsset": "0xaB6b734b618a4824fCCa63014cfaC30CDB41Db2a", + "implementations": { + "main": "0x9C75314AFD011F22648ca9C655b61674e27bA4AC", + "trading": { + "gnosisTrade": "0x13B63e7094B61CCbe79CAe3fb602DFd12D59314a", + "dutchTrade": "0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb" + }, + "components": { + "assetRegistry": "0xFa93538Ed210486bfdE01b7E2295392fE7153106", + "backingManager": "0xcd77df48E548dda056f8563f2520fFD94aD147eE", + "basketHandler": "0xa8d818C719c1034E731Feba2088F4F011D44ACB3", + "broker": "0xd3025304C6487FC5c39010bEA0B46cc0690ab229", + "distributor": "0x38eF27D791cd60074Fa0345E8F82Df25e1f80B41", + "furnace": "0xDf99ccA98349DeF0eaB8eC37C1a0B270de38E682", + "rsrTrader": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", + "rTokenTrader": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", + "rToken": "0x6bae9bE78cbE3Cd93FC02D974a66F9700E4a299C", + "stRSR": "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178" + } + } +} \ No newline at end of file diff --git a/scripts/addresses/arbitrum-sepolia-3.3.0/421614-tmp-deployments.json b/scripts/addresses/arbitrum-sepolia-3.3.0/421614-tmp-deployments.json new file mode 100644 index 0000000000..1335c4a9a2 --- /dev/null +++ b/scripts/addresses/arbitrum-sepolia-3.3.0/421614-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16", + "RSR_FEED": "0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb", + "GNOSIS_EASY_AUCTION": "0x9C75314AFD011F22648ca9C655b61674e27bA4AC" + }, + "tradingLib": "0xFa93538Ed210486bfdE01b7E2295392fE7153106", + "cvxMiningLib": "", + "facade": "0x6419FE6cf428150e2d8ED38a3316b1bB468F79a7", + "facets": { + "actFacet": "0xb5bDFF1FB47635383ABf13b78a79C8a21aA1b23E", + "readFacet": "0x270284ecb6aF0dc521D2c8f9D77b03EEd2aace90" + }, + "facadeWriteLib": "0x2a2A842Dda2Da2170a531dfF4bD4A821321e4485", + "basketLib": "0xcd77df48E548dda056f8563f2520fFD94aD147eE", + "facadeWrite": "0x93de153Ba104D15785c8d8af01AE9425960de49e", + "deployer": "0x182e86Ad4a6139ced4f9Fa4ED3f1Cd9E4F7449e7", + "rsrAsset": "0x0F345F57ee2b395e23390f8e1F1869D7E6C0F70e", + "implementations": { + "main": "0xa8d818C719c1034E731Feba2088F4F011D44ACB3", + "trading": { + "gnosisTrade": "0xd3025304C6487FC5c39010bEA0B46cc0690ab229", + "dutchTrade": "0x38eF27D791cd60074Fa0345E8F82Df25e1f80B41" + }, + "components": { + "assetRegistry": "0xDf99ccA98349DeF0eaB8eC37C1a0B270de38E682", + "backingManager": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", + "basketHandler": "0x6bae9bE78cbE3Cd93FC02D974a66F9700E4a299C", + "broker": "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178", + "distributor": "0xaB6b734b618a4824fCCa63014cfaC30CDB41Db2a", + "furnace": "0x8b906361048D277452506d3f791020A1cA798aF3", + "rsrTrader": "0xB7F55aA5C7d09C091C1bD22B3352e8cb3fACF289", + "rTokenTrader": "0xB7F55aA5C7d09C091C1bD22B3352e8cb3fACF289", + "rToken": "0x184460704886f9F2A7F3A0c2887680867954dC6E", + "stRSR": "0xfd529fa21FBd569Bcf7c7f49694568fD66e8d1e9" + } + } +} \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 98d7a66fa0..8cf827c408 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -1,7 +1,7 @@ /* eslint-disable no-process-exit */ import hre from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../common/configuration' +import { arbitrumL2Chains, baseL2Chains, networkConfig } from '../common/configuration' import { sh } from './deployment/utils' async function main() { @@ -46,7 +46,7 @@ async function main() { // ============================================= // Phase 2 - Assets/Collateral - if (!baseL2Chains.includes(hre.network.name)) { + if (!baseL2Chains.includes(hre.network.name) && !arbitrumL2Chains.includes(hre.network.name)) { scripts.push( 'phase2-assets/0_setup_deployments.ts', 'phase2-assets/1_deploy_assets.ts', @@ -86,8 +86,9 @@ async function main() { 'phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts', 'phase2-assets/assets/deploy_stg.ts' ) + } else if (chainId == '42161' || chainId == '421614') { + // TODO: Arbitrum } - // =============================================== // Phase 3 - RTokens diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index 0ce4e3bf46..ac77d26a65 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -4,7 +4,7 @@ import axios from 'axios' import { exec } from 'child_process' import { BigNumber } from 'ethers' import { bn, fp } from '../../common/numbers' -import { IComponents, baseL2Chains } from '../../common/configuration' +import { IComponents, arbitrumL2Chains, baseL2Chains } from '../../common/configuration' import { isValidContract } from '../../common/blockchain-utils' import { IDeployments } from './common' import { useEnv } from '#/utils/env' @@ -113,10 +113,17 @@ export async function verifyContract( let url: string if (baseL2Chains.includes(hre.network.name)) { + const BASESCAN_API_KEY = useEnv('BASESCAN_API_KEY') // Base L2 - url = `${getBasescanURL( + url = `${getCustomVerificationURL( chainId - )}/?module=contract&action=getsourcecode&address=${address}&apikey=${ETHERSCAN_API_KEY}` + )}/?module=contract&action=getsourcecode&address=${address}&apikey=${BASESCAN_API_KEY}` + } else if (arbitrumL2Chains.includes(hre.network.name)) { + const ARBISCAN_API_KEY = useEnv('ARBISCAN_API_KEY') + // Arbitrum L2 + url = `${getCustomVerificationURL( + chainId + )}/?module=contract&action=getsourcecode&address=${address}&apikey=${ARBISCAN_API_KEY}` } else { // Ethereum url = `${getEtherscanBaseURL( @@ -162,7 +169,7 @@ export const getEtherscanBaseURL = (chainId: number, api = false) => { return `https://${prefix}etherscan.io` } -export const getBasescanURL = (chainId: number) => { +export const getCustomVerificationURL = (chainId: number) => { // For Base, get URL from HH config const chainConfig = hre.config.etherscan.customChains.find((chain) => chain.chainId == chainId) if (!chainConfig || !chainConfig.urls) { @@ -180,8 +187,7 @@ export const getEmptyDeployment = (): IDeployments => { }, tradingLib: '', basketLib: '', - actFacet: '', - readFacet: '', + facets: { actFacet: '', readFacet: '' }, facade: '', facadeWriteLib: '', cvxMiningLib: '', diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index ef61b29d48..13ddca24b3 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -1,7 +1,12 @@ /* eslint-disable no-process-exit */ import hre from 'hardhat' import { getChainId } from '../common/blockchain-utils' -import { baseL2Chains, developmentChains, networkConfig } from '../common/configuration' +import { + arbitrumL2Chains, + baseL2Chains, + developmentChains, + networkConfig, +} from '../common/configuration' import { sh } from './deployment/utils' import { getDeploymentFile, @@ -47,7 +52,7 @@ async function main() { ] // Phase 2 - Individual Plugins - if (!baseL2Chains.includes(hre.network.name)) { + if (!baseL2Chains.includes(hre.network.name) && !arbitrumL2Chains.includes(hre.network.name)) { scripts.push( 'collateral-plugins/verify_convex_crvusd_usdc.ts', 'collateral-plugins/verify_convex_3pool.ts', @@ -77,6 +82,8 @@ async function main() { 'collateral-plugins/verify_stargate_usdc', 'assets/verify_stg.ts' ) + } else if (chainId == '42161' || chainId == '421614') { + // TODO: Arbitrum } // Phase 3 - RTokens and Governance diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index 6069ca478e..5eac0072ae 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -2,7 +2,7 @@ import { QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' import { bn, fp } from '#/common/numbers' import { whileImpersonating } from '#/utils/impersonation' import { - advanceBlocks, + advanceToTimestamp, advanceTime, getLatestBlockNumber, getLatestBlockTimestamp, @@ -13,7 +13,7 @@ import { TestITrading } from '@typechain/TestITrading' import { BigNumber, ContractTransaction } from 'ethers' import { Interface, LogDescription } from 'ethers/lib/utils' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { collateralToUnderlying, whales } from './constants' +import { whales } from './constants' import { logToken } from './logs' export const runBatchTrade = async ( @@ -91,8 +91,8 @@ export const runDutchTrade = async ( // buy & sell are from the perspective of the auction-starter // bid() flips it to be from the perspective of the trader - let tradesRemain: boolean = false - let newSellToken: string = '' + let tradesRemain = false + let newSellToken = '' const tradeAddr = await trader.trades(tradeToken) const trade = await hre.ethers.getContractAt('DutchTrade', tradeAddr) @@ -105,25 +105,19 @@ export const runDutchTrade = async ( const buyTokenAddress = await trade.buy() console.log(`Running trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...`) - const endBlock = await trade.endBlock() + const endTime = await trade.endTime() const whaleAddr = whales[buyTokenAddress.toLowerCase()] // Bid close to end block - await advanceBlocks(hre, endBlock.sub(await getLatestBlockNumber(hre)).sub(5)) + await advanceToTimestamp(hre, endTime - 5) const buyAmount = await trade.bidAmount(await getLatestBlockNumber(hre)) // Ensure funds available await getTokens(hre, buyTokenAddress, buyAmount, whaleAddr) - - await whileImpersonating(hre, whaleAddr, async (whale) => { - const sellToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) - // Bid - - ;[tradesRemain, newSellToken] = await callAndGetNextTrade( - router.bid(trade.address, await router.signer.getAddress()), - trader - ) - }) + ;[tradesRemain, newSellToken] = await callAndGetNextTrade( + router.bid(trade.address, await router.signer.getAddress()), + trader + ) if ( (await trade.canSettle()) || @@ -143,8 +137,8 @@ export const callAndGetNextTrade = async ( tx: Promise, trader: TestITrading ): Promise<[boolean, string]> => { - let tradesRemain: boolean = false - let newSellToken: string = '' + let tradesRemain = false + let newSellToken = '' // Process transaction and get next trade const r = await tx @@ -154,7 +148,9 @@ export const callAndGetNextTrade = async ( let parsedLog: LogDescription | undefined try { parsedLog = iface.parseLog(event) - } catch {} + } catch { + // ignore + } if (parsedLog && parsedLog.name == 'TradeStarted') { console.log( `\n====== Trade Started: sell ${logToken(parsedLog.args.sell)} / buy ${logToken( @@ -192,44 +188,6 @@ export const getTokens = async ( } } -// mint regular cTokens for an amount of `underlying` -const mintCToken = async ( - hre: HardhatRuntimeEnvironment, - tokenAddress: string, - amount: BigNumber, - recipient: string -) => { - const collateral = await hre.ethers.getContractAt('ICToken', tokenAddress) - const underlying = await hre.ethers.getContractAt( - 'ERC20Mock', - collateralToUnderlying[tokenAddress.toLowerCase()] - ) - await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (whaleSigner) => { - await underlying.connect(whaleSigner).approve(collateral.address, amount) - await collateral.connect(whaleSigner).mint(amount) - const bal = await collateral.balanceOf(whaleSigner.address) - await collateral.connect(whaleSigner).transfer(recipient, bal) - }) -} - -// mints staticAToken for an amount of `underlying` -const mintStaticAToken = async ( - hre: HardhatRuntimeEnvironment, - tokenAddress: string, - amount: BigNumber, - recipient: string -) => { - const collateral = await hre.ethers.getContractAt('StaticATokenLM', tokenAddress) - const underlying = await hre.ethers.getContractAt( - 'ERC20Mock', - collateralToUnderlying[tokenAddress.toLowerCase()] - ) - await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (whaleSigner) => { - await underlying.connect(whaleSigner).approve(collateral.address, amount) - await collateral.connect(whaleSigner).deposit(recipient, amount, 0, true) - }) -} - // get a specific amount of wrapped cTokens const getCTokenVault = async ( hre: HardhatRuntimeEnvironment, diff --git a/test/Broker.test.ts b/test/Broker.test.ts index e880d7da80..4a6e401872 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -50,7 +50,6 @@ import { } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' import { - advanceBlocks, advanceTime, advanceToTimestamp, getLatestBlockTimestamp, @@ -1135,14 +1134,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.sell()).to.equal(token0.address) expect(await trade.buy()).to.equal(token1.address) expect(await trade.sellAmount()).to.equal(amount) - expect(await trade.startBlock()).to.equal((await getLatestBlockNumber()) + 1) - const tradeLen = (await trade.endBlock()).sub(await trade.startBlock()) - expect(await trade.endTime()).to.equal( - tradeLen - .add(1) - .mul(12) - .add(await getLatestBlockTimestamp()) - ) + expect(await trade.startTime()).to.equal((await getLatestBlockTimestamp()) + 12) + const tradeLen = (await trade.endTime()) - (await trade.startTime()) + expect(await trade.endTime()).to.equal(tradeLen + 12 + (await getLatestBlockTimestamp())) expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) @@ -1302,8 +1296,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { }) // Advance blocks til trade can be settled - const tradeLen = (await trade.endBlock()).sub(await getLatestBlockNumber()) - await advanceBlocks(tradeLen.add(1)) + const now = await getLatestBlockTimestamp() + const tradeLen = (await trade.endTime()) - now + await advanceToTimestamp(now + tradeLen + 12) // Settle trade expect(await trade.canSettle()).to.equal(true) @@ -1341,8 +1336,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ) // Advance blocks til trade can be settled - const tradeLen = (await trade.endBlock()).sub(await getLatestBlockNumber()) - await advanceBlocks(tradeLen.add(1)) + const now = await getLatestBlockTimestamp() + const tradeLen = (await trade.endTime()) - now + await advanceToTimestamp(now + tradeLen + 12) // Settle trade await whileImpersonating(backingManager.address, async (bmSigner) => { @@ -1463,17 +1459,20 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) - const currentBlock = bn(await getLatestBlockNumber()) - const toAdvance = progression - .mul((await trade.endBlock()).sub(currentBlock)) - .div(fp('1')) - .sub(1) - if (toAdvance.gt(0)) await advanceBlocks(toAdvance) + const now = await getLatestBlockTimestamp() + const startTime = await trade.startTime() + const endTime = await trade.endTime() + const bidTime = + startTime + + progression + .mul(endTime - startTime) + .div(fp('1')) + .toNumber() + if (now < bidTime) await advanceToTimestamp(bidTime - 1) // Bid const sellAmt = await trade.lot() - const bidBlock = bn('1').add(await getLatestBlockNumber()) - const bidAmt = await trade.bidAmount(bidBlock) + const bidAmt = await trade.bidAmount(bidTime) expect(bidAmt).to.be.gt(0) const buyBalBefore = await buyTok.balanceOf(backingManager.address) const sellBalBefore = await sellTok.balanceOf(addr1.address) @@ -1734,7 +1733,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { ) // Advance time till trade can be settled - await advanceBlocks((await newTrade.endBlock()).sub(await getLatestBlockNumber())) + await advanceToTimestamp(await newTrade.endTime()) // Settle trade await whileImpersonating(backingManager.address, async (bmSigner) => { diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 06a92c3469..f65f9ea166 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -11,7 +11,6 @@ import { setOraclePrice } from './utils/oracles' import { disableBatchTrade, disableDutchTrade } from './utils/trades' import { whileImpersonating } from './utils/impersonation' import { - ActFacet, Asset, BackingManagerP1, BackingMgrCompatibleV1, @@ -54,7 +53,7 @@ import { DECAY_DELAY, PRICE_TIMEOUT, } from './fixtures' -import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' +import { advanceToTimestamp, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' import { CollateralStatus, TradeKind, @@ -675,7 +674,7 @@ describe('Facade + FacadeMonitor contracts', () => { expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) // Advance time till auction is over - await advanceBlocks(2 + auctionLength / 12) + await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 13) // Now should be settleable const settleable = await facade.auctionsSettleable(rsrTrader.address) @@ -1568,7 +1567,7 @@ describe('Facade + FacadeMonitor contracts', () => { expect((await facade.auctionsSettleable(rsrTrader.address)).length).to.equal(0) // Advance time till auction ended - await advanceBlocks(1 + auctionLength / 12) + await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 13) // Settle and start new auction - Will retry await expectEvents( @@ -1632,7 +1631,7 @@ describe('Facade + FacadeMonitor contracts', () => { expect((await facade.auctionsSettleable(rTokenTrader.address)).length).to.equal(0) // Advance time till auction ended - await advanceBlocks(1 + auctionLength / 12) + await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 13) // Upgrade components to V2 await backingManager.connect(owner).upgradeTo(backingManagerV2.address) @@ -1667,7 +1666,7 @@ describe('Facade + FacadeMonitor contracts', () => { await rTokenTrader.connect(owner).upgradeTo(revTraderV1.address) // Advance time till auction ended - await advanceBlocks(1 + auctionLength / 12) + await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 13) // Settle and start new auction - Will retry again await expectEvents( diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 4db75baf5c..41f7aeb71a 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -38,10 +38,10 @@ import { DutchTradeRouter, } from '../typechain' import { - advanceTime, advanceBlocks, + advanceTime, + advanceToTimestamp, getLatestBlockTimestamp, - getLatestBlockNumber, } from './utils/time' import { Collateral, @@ -3251,18 +3251,19 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) await token1.connect(addr1).approve(trade.address, initialBal) - const start = await trade.startBlock() - const end = await trade.endBlock() + const start = await trade.startTime() + const end = await trade.endTime() // Simulate 30 minutes of blocks, should swap at right price each time const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() await token1.connect(addr1).approve(router.address, constants.MaxUint256) - let now = bn(await getLatestBlockNumber()) - while (now.lt(end)) { + await advanceToTimestamp(start) + let now = start + while (now < end) { const actual = await trade.connect(addr1).bidAmount(now) const expected = divCeil( await dutchBuyAmount( - fp(now.sub(start)).div(end.sub(start)), + fp(now - start).div(end - start), collateral1.address, collateral0.address, issueAmount, @@ -3276,8 +3277,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { .connect(addr1) .callStatic.bid(trade.address, addr1.address) expect(staticResult.buyAmt).to.equal(actual) - await advanceBlocks(1) - now = bn(await getLatestBlockNumber()) + await advanceToTimestamp(now + 12) + now = await getLatestBlockTimestamp() } }) @@ -3290,9 +3291,9 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await backingManager.trades(token0.address) ) await token1.connect(addr1).approve(trade.address, initialBal) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) + await advanceToTimestamp((await trade.endTime()) + 1) await expect( - trade.connect(addr1).bidAmount(await getLatestBlockNumber()) + trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) ).to.be.revertedWith('auction over') await expect(router.connect(addr1).bid(trade.address, addr1.address)).be.revertedWith( 'auction over' @@ -3323,7 +3324,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await token1.connect(addr1).approve(trade1.address, initialBal) // Snipe auction at 0s left - await advanceBlocks((await trade1.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + + await advanceToTimestamp((await trade1.endTime()) - 1) await router.connect(addr1).bid(trade1.address, addr1.address) expect(await trade1.canSettle()).to.equal(false) @@ -3363,7 +3365,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await token1.connect(addr1).approve(trade2.address, initialBal) // Advance to final block of auction - await advanceBlocks((await trade2.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade2.endTime()) - 1) expect(await trade2.status()).to.equal(1) // TradeStatus.OPEN expect(await trade2.canSettle()).to.equal(false) @@ -3377,7 +3379,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { it('via fallback to Batch Auction', async () => { // Advance past auction end block - await advanceBlocks((await trade2.endBlock()).sub(await getLatestBlockNumber()).add(1)) + await advanceToTimestamp((await trade2.endTime()) + 1) expect(await trade2.status()).to.equal(1) // TradeStatus.OPEN expect(await trade2.canSettle()).to.equal(true) @@ -5143,7 +5145,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { let tradeAddr = await backingManager.trades(token2.address) let trade = await ethers.getContractAt('DutchTrade', tradeAddr) await backupToken1.connect(addr1).approve(trade.address, initialBal) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) await snapshotGasCost(await router.connect(addr1).bid(trade.address, addr1.address)) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 554315f0e7..903ce29867 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -60,12 +60,7 @@ import { whileImpersonating } from './utils/impersonation' import { withinQuad } from './utils/matchers' import { expectRTokenPrice, setOraclePrice } from './utils/oracles' import snapshotGasCost from './utils/snapshotGasCost' -import { - advanceBlocks, - advanceTime, - getLatestBlockNumber, - getLatestBlockTimestamp, -} from './utils/time' +import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp } from './utils/time' import { mintCollaterals } from './utils/tokens' import { dutchBuyAmount, expectTrade, getTrade } from './utils/trades' @@ -2903,7 +2898,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) // Advance time near end of geometric phase - await advanceBlocks(config.dutchAuctionLength.div(12).div(5).sub(5)) + await advanceToTimestamp( + (await rTokenTrade.startTime()) + config.dutchAuctionLength.div(5).sub(6).toNumber() + ) // Should settle RSR auction without disabling dutch auctions await expect(router.connect(addr1).bid(rsrTrade.address, addr1.address)) @@ -3018,7 +3015,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await broker.dutchTradeDisabled(rToken.address)).to.equal(false) // Advance time to middle of first linear phase - await advanceBlocks(config.dutchAuctionLength.div(12).div(3)) + await advanceToTimestamp( + (await rTokenTrade.startTime()) + config.dutchAuctionLength.div(3).toNumber() + ) // Should settle RSR auction await expect(router.connect(addr1).bid(rsrTrade.address, addr1.address)) @@ -3470,12 +3469,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Cannot get bid amount yet await expect( - trade.connect(addr1).bidAmount(await getLatestBlockNumber()) + trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) ).to.be.revertedWith('auction not started') // Can get bid amount in following block - await advanceBlocks(1) - const actual = await trade.connect(addr1).bidAmount(await getLatestBlockNumber()) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12) + const actual = await trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) expect(actual).to.be.gt(bn(0)) }) @@ -3498,6 +3497,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .connect(addr1) .approve(router.address, constants.MaxUint256) + await advanceToTimestamp(await trade.startTime()) await router.connect(addr1).bid(trade.address, addr1.address) expect(await trade.bidder()).to.equal(router.address) // Cannot bid once is settled @@ -3511,6 +3511,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .connect(addr1) .approve(trade.address, constants.MaxUint256) + await advanceToTimestamp(await trade.startTime()) await trade.connect(addr1).bid() expect(await trade.bidder()).to.equal(addr1.address) // Cannot bid once is settled @@ -3544,6 +3545,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .approve(trade.address, constants.MaxUint256) // Bid + await advanceToTimestamp(await trade.startTime()) await trade.connect(addr1).bid() expect(await trade.bidType()).to.be.eq(2) expect(await trade.bidder()).to.equal(addr1.address) @@ -3568,6 +3570,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidder') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) + await advanceToTimestamp(await trade.startTime()) await bidder.connect(addr1).bid(trade.address) expect(await trade.bidType()).to.be.eq(1) expect(await trade.bidder()).to.equal(bidder.address) @@ -3588,6 +3591,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidderLowBaller') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) + await advanceToTimestamp(await trade.startTime()) await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( 'insufficient buy tokens' ) @@ -3596,7 +3600,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await trade.status()).to.be.eq(1) // Status.OPEN }) - it('Will revert if bidder submits the no bid', async () => { + it('Will revert if bidder submits no bid', async () => { await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount.div(2000)) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) @@ -3610,6 +3614,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidderNoPayer') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) + await advanceToTimestamp(await trade.startTime()) await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( 'insufficient buy tokens' ) @@ -3624,25 +3629,24 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) + await rToken.connect(addr1).approve(router.address, constants.MaxUint256) + await token0.connect(addr1).approve(router.address, constants.MaxUint256) + await token1.connect(addr1).approve(router.address, constants.MaxUint256) await rTokenTrader.manageTokens([token0.address], [TradeKind.DUTCH_AUCTION]) const trade = await ethers.getContractAt( 'DutchTrade', await rTokenTrader.trades(token0.address) ) - await rToken.connect(addr1).approve(router.address, constants.MaxUint256) - await token0.connect(addr1).approve(router.address, constants.MaxUint256) - await token1.connect(addr1).approve(router.address, constants.MaxUint256) - const start = await trade.startBlock() - const end = await trade.endBlock() + const start = await trade.startTime() + const end = await trade.endTime() - // Simulate 30 minutes of blocks, should swap at right price each time - let now = bn(await getLatestBlockNumber()) - - while (now.lt(end)) { + await advanceToTimestamp(start) + let now = start + while (now < end) { const actual = await trade.connect(addr1).bidAmount(now) const expected = await dutchBuyAmount( - fp(now.sub(start)).div(end.sub(start)), + fp(now - start).div(end - start), rTokenAsset.address, collateral0.address, issueAmount, @@ -3653,10 +3657,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const staticResult = await router .connect(addr1) .callStatic.bid(trade.address, addr1.address) - expect(staticResult.buyAmt).to.equal(actual) - await advanceBlocks(1) - now = bn(await getLatestBlockNumber()) + await advanceToTimestamp(now + 12) + now = await getLatestBlockTimestamp() } }) @@ -3672,9 +3675,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rTokenTrader.trades(token0.address) ) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).add(1)) + await advanceToTimestamp((await trade.endTime()) + 1) await expect( - trade.connect(addr1).bidAmount(await getLatestBlockNumber()) + trade.connect(addr1).bidAmount(await getLatestBlockTimestamp()) ).to.be.revertedWith('auction over') // Bid @@ -3700,7 +3703,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Perform test for both bid types bidTypes.forEach((bidType) => { - it(`Should bid at exactly endBlock() and not launch another auction - Bid Type: ${ + it(`Should bid at exactly endTime() and not launch another auction - Bid Type: ${ Object.values(BidType)[bidType] }`, async () => { const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() @@ -3712,10 +3715,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rTokenTrader.trades(token0.address) ) await rToken.connect(addr1).approve(trade.address, constants.MaxUint256) - await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted + await expect(trade.bidAmount(await trade.endTime())).to.not.be.reverted // Snipe auction at 0s left - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) // Bid if (bidType == BidType.CALLBACK) { @@ -3770,10 +3773,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rTokenTrader.trades(token0.address) ) await rToken.connect(addr1).approve(trade.address, constants.MaxUint256) - await expect(trade.bidAmount(await trade.endBlock())).to.not.be.reverted + await expect(trade.bidAmount(await trade.endTime())).to.not.be.reverted // Snipe auction at 0s left - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) // Run it down await expect(exploiter.connect(addr1).start(trade.address, rTokenTrader.address)).to.be diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 7ee2f4d048..1ac0b1f34c 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -415,9 +415,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) } else if (IMPLEMENTATION == Implementation.P1) { await whileImpersonating(ZERO_ADDRESS, async (signer) => { - await expect(stRSR.connect(signer).stake(amount)).to.be.revertedWith( - 'ERC20: mint to the zero address' - ) + await expect(stRSR.connect(signer).stake(amount)).to.be.revertedWith('zero address mint') }) } }) @@ -1561,13 +1559,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const prevPoolBalance: BigNumber = await rsr.balanceOf(stRSR.address) await whileImpersonating(basketHandler.address, async (signer) => { - await expect(stRSR.connect(signer).seizeRSR(amount)).to.be.revertedWith( - 'not backing manager' - ) + await expect(stRSR.connect(signer).seizeRSR(amount)).to.be.revertedWith('!bm') }) expect(await rsr.balanceOf(stRSR.address)).to.equal(prevPoolBalance) - await expect(stRSR.connect(other).seizeRSR(amount)).to.be.revertedWith('not backing manager') + await expect(stRSR.connect(other).seizeRSR(amount)).to.be.revertedWith('!bm') expect(await rsr.balanceOf(stRSR.address)).to.equal(prevPoolBalance) }) @@ -1608,7 +1604,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await whileImpersonating(backingManager.address, async (signer) => { await expect(stRSR.connect(signer).seizeRSR(amount)).to.be.revertedWith( - 'Cannot seize more RSR than we hold' + 'seize exceeds balance' ) }) @@ -2316,7 +2312,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Perform transfer with user with no stake await expect(stRSR.connect(addr2).transfer(addr1.address, amount)).to.be.revertedWith( - 'ERC20: transfer amount exceeds balance' + 'transfer amount exceeds balance' ) // Nothing transferred @@ -2333,13 +2329,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to send to zero address await expect(stRSR.connect(addr1).transfer(ZERO_ADDRESS, amount)).to.be.revertedWith( - 'ERC20: transfer to or from the zero address' + 'zero address transfer' ) // Attempt to send from zero address - Impersonation is the only way to get to this validation await whileImpersonating(ZERO_ADDRESS, async (signer) => { await expect(stRSR.connect(signer).transfer(addr2.address, amount)).to.be.revertedWith( - 'ERC20: transfer to or from the zero address' + 'zero address transfer' ) }) @@ -2353,14 +2349,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should not allow transfer/transferFrom to address(this)', async () => { // transfer await expect(stRSR.connect(addr1).transfer(stRSR.address, 1)).to.be.revertedWith( - 'StRSR transfer to self' + 'transfer to self' ) // transferFrom await stRSR.connect(addr1).approve(addr2.address, 1) await expect( stRSR.connect(addr2).transferFrom(addr1.address, stRSR.address, 1) - ).to.be.revertedWith('StRSR transfer to self') + ).to.be.revertedWith('transfer to self') }) it('Should transferFrom stakes between accounts', async function () { @@ -2530,7 +2526,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSR.allowance(addr1.address, addr2.address)).to.equal(0) await expect( stRSR.connect(addr2).transferFrom(addr1.address, other.address, amount) - ).to.be.revertedWith('ERC20: insufficient allowance') + ).to.be.revertedWith('insufficient allowance') // Nothing transferred expect(await stRSR.balanceOf(addr1.address)).to.equal(addr1BalancePrev) @@ -2546,13 +2542,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to set allowance to zero address await expect(stRSR.connect(addr1).approve(ZERO_ADDRESS, amount)).to.be.revertedWith( - 'ERC20: approve to or from the zero address' + 'zero address approval' ) // Attempt set allowance from zero address - Impersonation is the only way to get to this validation await whileImpersonating(ZERO_ADDRESS, async (signer) => { await expect(stRSR.connect(signer).approve(addr2.address, amount)).to.be.revertedWith( - 'ERC20: approve to or from the zero address' + 'zero address approval' ) }) @@ -2588,7 +2584,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Should not allow to decrease below zero await expect( stRSR.connect(addr1).decreaseAllowance(addr2.address, amount.add(1)) - ).to.be.revertedWith('ERC20: decreased allowance below zero') + ).to.be.revertedWith('decreased allowance below zero') // No changes expect(await stRSR.allowance(addr1.address, addr2.address)).to.equal(amount) diff --git a/test/fixtures.ts b/test/fixtures.ts index 2c6fc0df1c..40291d38e5 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -94,7 +94,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.3.0' +export const VERSION = '3.4.0' export type Collateral = | FiatCollateral diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 120ad63acc..12eac1c1a0 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -3,13 +3,7 @@ import { expect } from 'chai' import { Wallet, ContractFactory, constants } from 'ethers' import { ethers } from 'hardhat' import { IConfig } from '../../common/configuration' -import { - advanceBlocks, - advanceTime, - getLatestBlockTimestamp, - getLatestBlockNumber, - setNextBlockTimestamp, -} from '../utils/time' +import { advanceTime, getLatestBlockTimestamp, advanceToTimestamp } from '../utils/time' import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192, TradeKind } from '../../common/constants' import { bn, fp } from '../../common/numbers' import { @@ -552,7 +546,7 @@ describe('Assets contracts #fast', () => { 'DutchTrade', await backingManager.trades(aToken.address) ) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber())) + await advanceToTimestamp(await trade.endTime()) await expect(backingManager.settleTrade(aToken.address)).to.emit( backingManager, 'TradeSettled' @@ -561,7 +555,7 @@ describe('Assets contracts #fast', () => { await expectExactPrice(rTokenAsset.address, [low1, fp('1.01')]) // Launching the trade a second time, this time Batch Auction, should not change price - await setNextBlockTimestamp((await trade.endTime()) + 13) + await advanceToTimestamp((await trade.endTime()) + 13) await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.emit( backingManager, 'TradeStarted' @@ -596,9 +590,9 @@ describe('Assets contracts #fast', () => { // Settle 3rd auction for full volume trade = await ethers.getContractAt('DutchTrade', await backingManager.trades(cToken.address)) - const buyAmt = await trade.bidAmount(await trade.endBlock()) + const buyAmt = await trade.bidAmount(await trade.endTime()) await usdc.approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) await expect(router.bid(trade.address, await router.signer.getAddress())).to.emit( backingManager, @@ -794,7 +788,7 @@ describe('Assets contracts #fast', () => { expect(highPrice3).to.be.gt(highPrice2) // Advance block, price keeps widening - await advanceBlocks(1) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12) const [lowPrice4, highPrice4] = await rsrAsset.price() expect(lowPrice4).to.be.lt(lowPrice3) expect(highPrice4).to.be.gt(highPrice3) @@ -883,8 +877,7 @@ describe('Assets contracts #fast', () => { it('refresh() after oracle timeout', async () => { const oracleTimeout = await rsrAsset.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(bn(oracleTimeout).div(12)) + await advanceToTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) }) it('refresh() after full price timeout', async () => { diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index e870e2038d..e11f7ef359 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -18,11 +18,10 @@ import { expectInIndirectReceipt } from '../../../common/events' import { whileImpersonating } from '../../utils/impersonation' import { IGovParams, IGovRoles, IRTokenSetup, networkConfig } from '../../../common/configuration' import { - advanceTime, advanceBlocks, - getLatestBlockNumber, + advanceTime, + advanceToTimestamp, getLatestBlockTimestamp, - setNextBlockTimestamp, } from '../../utils/time' import { MAX_UINT48, @@ -198,7 +197,7 @@ export default function fn( const amount = bn('20').mul(bn(10).pow(await ctx.tok.decimals())) await mintCollateralTo(ctx, amount, alice, ctx.collateral.address) await advanceBlocks(1000) - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12000) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) const balBefore = await (ctx.rewardToken as IERC20Metadata).balanceOf( ctx.collateral.address @@ -216,7 +215,7 @@ export default function fn( it('enters IFFY state when price becomes stale', async () => { const decayDelay = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceToTimestamp((await getLatestBlockTimestamp()) + decayDelay) await advanceBlocks(decayDelay / 12) await collateral.refresh() expect(await collateral.status()).to.not.equal(CollateralStatus.SOUND) @@ -334,14 +333,14 @@ export default function fn( // After oracle timeout decay begins const decayDelay = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceToTimestamp((await getLatestBlockTimestamp()) + decayDelay) await advanceBlocks(1 + decayDelay / 12) await collateral.refresh() await expectDecayedPrice(collateral.address) // After price timeout it becomes unpriced const priceTimeout = await collateral.priceTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceToTimestamp((await getLatestBlockTimestamp()) + priceTimeout) await advanceBlocks(1 + priceTimeout / 12) await expectUnpriced(collateral.address) @@ -475,9 +474,8 @@ export default function fn( // Depeg - Reducing price by 20% await reduceTargetPerRef(ctx, 20) - // Set next block timestamp - for deterministic result + // Check status + whenDefault const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault await expect(collateral.refresh()) .to.emit(collateral, 'CollateralStatusChanged') @@ -499,9 +497,8 @@ export default function fn( // Depeg - Raising price by 20% await increaseTargetPerRef(ctx, 20) - // Set next block timestamp - for deterministic result + // Check status + whenDefault const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault await expect(collateral.refresh()) @@ -524,9 +521,7 @@ export default function fn( // Depeg - Reducing price by 20% await reduceTargetPerRef(ctx, 20) - // Set next block timestamp - for deterministic result - const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) + // Check status + whenDefault await collateral.refresh() expect(await collateral.status()).to.equal(CollateralStatus.IFFY) @@ -602,7 +597,7 @@ export default function fn( it('after oracle timeout', async () => { const oracleTimeout = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceToTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(oracleTimeout / 12) }) @@ -803,7 +798,7 @@ export default function fn( ) // Advance past warmup period - await setNextBlockTimestamp( + await advanceToTimestamp( (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) ) @@ -841,9 +836,7 @@ export default function fn( await expect(basketHandler.connect(owner).refreshBasket()) .to.emit(basketHandler, 'BasketSet') .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) - await setNextBlockTimestamp( - (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() - ) + await advanceToTimestamp((await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber()) // Run rebalancing auction await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) @@ -854,9 +847,9 @@ export default function fn( const trade = await ethers.getContractAt('DutchTrade', tradeAddr) expect(await trade.sell()).to.equal(collateralERC20.address) expect(await trade.buy()).to.equal(pairedERC20.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) + const buyAmt = await trade.bidAmount(await trade.endTime()) await pairedERC20.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) const pairedBal = await pairedERC20.balanceOf(backingManager.address) await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( @@ -892,9 +885,9 @@ export default function fn( const trade = await ethers.getContractAt('DutchTrade', tradeAddr) expect(await trade.sell()).to.equal(collateralERC20.address) expect(await trade.buy()).to.equal(rToken.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) + const buyAmt = await trade.bidAmount(await trade.endTime()) await rToken.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( rTokenTrader, diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 86ea3c0eab..04f6b29507 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -40,9 +40,8 @@ import { import { advanceBlocks, advanceTime, - getLatestBlockNumber, + advanceToTimestamp, getLatestBlockTimestamp, - setNextBlockTimestamp, } from '#/test/utils/time' import { ERC20Mock, @@ -344,7 +343,7 @@ export default function fn( await mintCollateralTo(ctx, amount, ctx.alice, ctx.collateral.address) await advanceBlocks(1000) - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12000) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) const before = await Promise.all( ctx.rewardTokens.map((t) => t.balanceOf(ctx.wrapper.address)) @@ -365,7 +364,7 @@ export default function fn( await mintCollateralTo(ctx, amount, ctx.alice, ctx.alice.address) await advanceBlocks(1000) - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12000) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) const before = await Promise.all( ctx.rewardTokens.map((t) => t.balanceOf(ctx.alice.address)) @@ -451,14 +450,14 @@ export default function fn( // After oracle timeout decay begins const decayDelay = (await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceToTimestamp((await getLatestBlockTimestamp()) + decayDelay) await advanceBlocks(1 + decayDelay / 12) await ctx.collateral.refresh() await expectDecayedPrice(ctx.collateral.address) // After price timeout it becomes unpriced const priceTimeout = await ctx.collateral.priceTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + priceTimeout) + await advanceToTimestamp((await getLatestBlockTimestamp()) + priceTimeout) await advanceBlocks(1 + priceTimeout / 12) await expectUnpriced(ctx.collateral.address) @@ -576,9 +575,8 @@ export default function fn( const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) await updateAnswerTx.wait() - // Set next block timestamp - for deterministic result + // Check status + whenDefault const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault await expect(ctx.collateral.refresh()) @@ -599,9 +597,8 @@ export default function fn( const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('1.2e8')) await updateAnswerTx.wait() - // Set next block timestamp - for deterministic result + // Check status + whenDefault const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault await expect(ctx.collateral.refresh()) @@ -622,9 +619,7 @@ export default function fn( const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) await updateAnswerTx.wait() - // Set next block timestamp - for deterministic result - const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) + // Check status + whenDefault await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) @@ -668,7 +663,7 @@ export default function fn( it('enters IFFY state when price becomes stale', async () => { const decayDelay = (await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceToTimestamp((await getLatestBlockTimestamp()) + decayDelay) await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -754,7 +749,7 @@ export default function fn( it('after oracle timeout', async () => { const oracleTimeout = (await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) + await advanceToTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(oracleTimeout / 12) }) @@ -959,7 +954,7 @@ export default function fn( ) // Advance past warmup period - await setNextBlockTimestamp( + await advanceToTimestamp( (await getLatestBlockTimestamp()) + (await basketHandler.warmupPeriod()) ) @@ -997,9 +992,7 @@ export default function fn( await expect(basketHandler.connect(owner).refreshBasket()) .to.emit(basketHandler, 'BasketSet') .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) - await setNextBlockTimestamp( - (await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber() - ) + await advanceToTimestamp((await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber()) // Run rebalancing auction await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) @@ -1011,9 +1004,9 @@ export default function fn( expect(await trade.sell()).to.equal(collateralERC20.address) expect(await trade.buy()).to.equal(pairedERC20.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) + const buyAmt = await trade.bidAmount(await trade.endTime()) await pairedERC20.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) const pairedBal = await pairedERC20.balanceOf(backingManager.address) await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( backingManager, @@ -1049,9 +1042,9 @@ export default function fn( expect(await trade.sell()).to.equal(collateralERC20.address) expect(await trade.buy()).to.equal(rToken.address) - const buyAmt = await trade.bidAmount(await trade.endBlock()) + const buyAmt = await trade.bidAmount(await trade.endTime()) await rToken.connect(addr1).approve(trade.address, buyAmt) - await advanceBlocks((await trade.endBlock()).sub(await getLatestBlockNumber()).sub(1)) + await advanceToTimestamp((await trade.endTime()) - 1) await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( rTokenTrader, diff --git a/utils/env.ts b/utils/env.ts index 919e53a9e8..69b7ad5e7b 100644 --- a/utils/env.ts +++ b/utils/env.ts @@ -14,6 +14,7 @@ type IEnvVars = | 'PROTO_IMPL' | 'ETHERSCAN_API_KEY' | 'BASESCAN_API_KEY' + | 'ARBISCAN_API_KEY' | 'NO_OPT' | 'ONLY_FAST' | 'JOBS' @@ -23,6 +24,8 @@ type IEnvVars = | 'SKIP_PROMPT' | 'BASE_GOERLI_RPC_URL' | 'BASE_RPC_URL' + | 'ARBITRUM_SEPOLIA_RPC_URL' + | 'ARBITRUM_RPC_URL' | 'FORK_NETWORK' | 'FORK_BLOCK' From 543cada7de2cea623c96c98b6c9145115f939e09 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 16 Mar 2024 04:09:09 +0530 Subject: [PATCH 236/450] nit --- CHANGELOG.md | 2 +- contracts/plugins/trading/DutchTrade.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e70977424f..bb83db17bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ - Switch to timestamp-based model - `price(uint256 blockNumber)` -> `price(uint48 timestamp)` - Remove `startBlock() returns (uint256)` + `endBlock() returns (uint256)` - - Add `endTime() returns (uint48)` + - Add `startTime() returns (uint48)` (`endTime() returns (uint48)` already existed and is now used in the contract) # 3.3.0 diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 5213be3200..0561df1557 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -112,7 +112,7 @@ contract DutchTrade is ITrade, Versioned { // The auction runs from [startTime, endTime], inclusive uint48 public startTime; // {s} when the dutch auction begins (one block after init()) lossy! - uint48 public endTime; // {s} not used in this contract; needed on interface + uint48 public endTime; // {s} when the dutch auction ends uint192 public bestPrice; // {buyTok/sellTok} The best plausible price based on oracle data uint192 public worstPrice; // {buyTok/sellTok} The worst plausible price based on oracle data From f04be8e3ead38e3b4be0ea49c895fee88a0c27b1 Mon Sep 17 00:00:00 2001 From: celest <109610497+0xCeletia@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:33:30 +0300 Subject: [PATCH 237/450] Update README.md (#1094) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 702c0e19b0..bd78452332 100644 --- a/README.md +++ b/README.md @@ -150,7 +150,7 @@ To get setup with tenderly, install the [tenderly cli](https://github.com/Tender ## Responsible Disclosure -See: [Immunifi](https://immunefi.com/bounty/reserve/) +See: [Immunefi](https://immunefi.com/bounty/reserve/) ## External Documentation From 4bb9913e3cb15c68bd160286be6ac76de9cabcd3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 18 Mar 2024 15:17:12 -0400 Subject: [PATCH 238/450] initial import removals --- contracts/interfaces/IBackingManager.sol | 1 - contracts/interfaces/IBroker.sol | 1 + contracts/interfaces/IFacadeMonitor.sol | 1 + contracts/interfaces/IMain.sol | 4 ++-- contracts/interfaces/IRToken.sol | 4 +--- contracts/interfaces/IRevenueTrader.sol | 1 - contracts/interfaces/IRewardable.sol | 2 -- contracts/interfaces/IStRSR.sol | 1 - contracts/interfaces/ITrading.sol | 1 - contracts/mixins/ComponentRegistry.sol | 1 - contracts/p1/mixins/RecollateralizationLib.sol | 3 --- contracts/p1/mixins/TradeLib.sol | 3 --- 12 files changed, 5 insertions(+), 18 deletions(-) diff --git a/contracts/interfaces/IBackingManager.sol b/contracts/interfaces/IBackingManager.sol index b9b3c5beca..fef9a3491b 100644 --- a/contracts/interfaces/IBackingManager.sol +++ b/contracts/interfaces/IBackingManager.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "./IAssetRegistry.sol"; import "./IBasketHandler.sol"; -import "./IBroker.sol"; import "./IComponent.sol"; import "./IRToken.sol"; import "./IStRSR.sol"; diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index fcaeac2c10..f1049ac5c7 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "./IAsset.sol"; import "./IComponent.sol"; import "./IGnosis.sol"; diff --git a/contracts/interfaces/IFacadeMonitor.sol b/contracts/interfaces/IFacadeMonitor.sol index 6c4f6f8d2d..0794a8e2f9 100644 --- a/contracts/interfaces/IFacadeMonitor.sol +++ b/contracts/interfaces/IFacadeMonitor.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "./IRToken.sol"; /** diff --git a/contracts/interfaces/IMain.sol b/contracts/interfaces/IMain.sol index f282be1479..dcb6ce910a 100644 --- a/contracts/interfaces/IMain.sol +++ b/contracts/interfaces/IMain.sol @@ -7,9 +7,9 @@ import "./IAssetRegistry.sol"; import "./IBasketHandler.sol"; import "./IBackingManager.sol"; import "./IBroker.sol"; -import "./IGnosis.sol"; -import "./IFurnace.sol"; import "./IDistributor.sol"; +import "./IFurnace.sol"; +import "./IGnosis.sol"; import "./IRToken.sol"; import "./IRevenueTrader.sol"; import "./IStRSR.sol"; diff --git a/contracts/interfaces/IRToken.sol b/contracts/interfaces/IRToken.sol index 9528ab2efd..faa09a6b5f 100644 --- a/contracts/interfaces/IRToken.sol +++ b/contracts/interfaces/IRToken.sol @@ -4,12 +4,10 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol"; // solhint-disable-next-line max-line-length import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-IERC20PermitUpgradeable.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../libraries/Fixed.sol"; import "../libraries/Throttle.sol"; -import "./IAsset.sol"; import "./IComponent.sol"; -import "./IMain.sol"; -import "./IRewardable.sol"; /** * @title IRToken diff --git a/contracts/interfaces/IRevenueTrader.sol b/contracts/interfaces/IRevenueTrader.sol index 8ab78078e1..c8cea3f4bd 100644 --- a/contracts/interfaces/IRevenueTrader.sol +++ b/contracts/interfaces/IRevenueTrader.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import "./IBroker.sol"; import "./IComponent.sol"; import "./ITrading.sol"; diff --git a/contracts/interfaces/IRewardable.sol b/contracts/interfaces/IRewardable.sol index 75ad05f625..44cfa3352b 100644 --- a/contracts/interfaces/IRewardable.sol +++ b/contracts/interfaces/IRewardable.sol @@ -2,8 +2,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./IComponent.sol"; -import "./IMain.sol"; /** * @title IRewardable diff --git a/contracts/interfaces/IStRSR.sol b/contracts/interfaces/IStRSR.sol index b0279ef220..a080765a68 100644 --- a/contracts/interfaces/IStRSR.sol +++ b/contracts/interfaces/IStRSR.sol @@ -6,7 +6,6 @@ import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20Metadat import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-IERC20PermitUpgradeable.sol"; import "../libraries/Fixed.sol"; import "./IComponent.sol"; -import "./IMain.sol"; /** * @title IStRSR diff --git a/contracts/interfaces/ITrading.sol b/contracts/interfaces/ITrading.sol index b0bed9bad3..6fc380b6b3 100644 --- a/contracts/interfaces/ITrading.sol +++ b/contracts/interfaces/ITrading.sol @@ -3,7 +3,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../libraries/Fixed.sol"; -import "./IAsset.sol"; import "./IComponent.sol"; import "./ITrade.sol"; import "./IRewardable.sol"; diff --git a/contracts/mixins/ComponentRegistry.sol b/contracts/mixins/ComponentRegistry.sol index d8136c6270..ff3a29f7c7 100644 --- a/contracts/mixins/ComponentRegistry.sol +++ b/contracts/mixins/ComponentRegistry.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../interfaces/IMain.sol"; import "./Auth.sol"; /** diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index 8edb10f86c..3b83589e9d 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -2,9 +2,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../../interfaces/IAsset.sol"; -import "../../interfaces/IAssetRegistry.sol"; -import "../../interfaces/IBackingManager.sol"; import "../../libraries/Fixed.sol"; import "./TradeLib.sol"; diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index 8d3c8e01c9..89fa344945 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -3,10 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../interfaces/IAsset.sol"; -import "../../interfaces/IAssetRegistry.sol"; -import "../../interfaces/ITrading.sol"; import "../../libraries/Fixed.sol"; -import "./RecollateralizationLib.sol"; struct TradeInfo { IAsset sell; From 61d70563ccfa72e1ee1d034a80e507c3801ab549 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 22 Mar 2024 13:22:02 -0400 Subject: [PATCH 239/450] Meta morpho (#1097) --- common/configuration.ts | 14 ++ .../plugins/assets/ERC4626FiatCollateral.sol | 41 ++++ .../meta-morpho/MetaMorphoFiatCollateral.sol | 23 ++ .../MetaMorphoSelfReferentialCollateral.sol | 55 +++++ .../plugins/assets/meta-morpho/README.md | 27 +++ .../plugins/mocks/MockMetaMorpho4626.sol | 47 ++++ .../MetaMorphoFiatCollateral.test.ts | 216 ++++++++++++++++++ ...etaMorphoSelfReferentialCollateral.test.ts | 205 +++++++++++++++++ .../meta-morpho/constants.ts | 30 +++ .../meta-morpho/mintCollateralTo.ts | 45 ++++ 10 files changed, 703 insertions(+) create mode 100644 contracts/plugins/assets/ERC4626FiatCollateral.sol create mode 100644 contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol create mode 100644 contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol create mode 100644 contracts/plugins/assets/meta-morpho/README.md create mode 100644 contracts/plugins/mocks/MockMetaMorpho4626.sol create mode 100644 test/plugins/individual-collateral/meta-morpho/MetaMorphoFiatCollateral.test.ts create mode 100644 test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts create mode 100644 test/plugins/individual-collateral/meta-morpho/constants.ts create mode 100644 test/plugins/individual-collateral/meta-morpho/mintCollateralTo.ts diff --git a/common/configuration.ts b/common/configuration.ts index 22dc120560..6ad55b1ff8 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -70,6 +70,8 @@ export interface ITokens { sUSDT?: string sETH?: string MORPHO?: string + SWISE?: string + BTRFLY?: string astETH?: string wsgUSDC?: string wsgUSDbC?: string @@ -87,6 +89,12 @@ export interface ITokens { maWBTC?: string maWETH?: string maStETH?: string + + // MetaMorpho + steakUSDC?: string + bbUSDT?: string + steakPYUSD?: string + Re7WETH?: string } export interface IFeeds { @@ -202,11 +210,17 @@ export const networkConfig: { [key: string]: INetworkConfig } = { sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', + SWISE: '0x48C3399719B582dD63eB5AADf12A40B4C3f52FA2', + BTRFLY: '0xc55126051B22eBb829D00368f4B12Bde432de5Da', yvCurveUSDPcrvUSD: '0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469', yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', pyUSD: '0x6c3ea9036406852006290770bedfcaba0e23a0e8', aEthPyUSD: '0x0C0d01AbF3e6aDfcA0989eBbA9d6e85dD58EaB1E', saEthPyUSD: '0x00F2a835758B33f3aC53516Ebd69f3dc77B0D152', // canonical wrapper + steakUSDC: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB', + steakPYUSD: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a', + bbUSDT: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1', + Re7WETH: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0', }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', diff --git a/contracts/plugins/assets/ERC4626FiatCollateral.sol b/contracts/plugins/assets/ERC4626FiatCollateral.sol new file mode 100644 index 0000000000..c8e1284d6b --- /dev/null +++ b/contracts/plugins/assets/ERC4626FiatCollateral.sol @@ -0,0 +1,41 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +// solhint-disable-next-line max-line-length +import { Asset, AppreciatingFiatCollateral, CollateralConfig, IRewardable } from "./AppreciatingFiatCollateral.sol"; +import { OracleLib } from "./OracleLib.sol"; +// solhint-disable-next-line max-line-length +import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import { IERC4626 } from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol"; +import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { shiftl_toFix } from "../../libraries/Fixed.sol"; + +/** + * @title ERC4626FiatCollateral + * @notice Collateral plugin for a ERC4626 vault + * + * Warning: Only valid for linear ERC4626 vaults + */ +contract ERC4626FiatCollateral is AppreciatingFiatCollateral { + uint256 private immutable oneShare; + int8 private immutable refDecimals; + + /// config.erc20 must be a MetaMorpho ERC4626 vault + /// @param config.chainlinkFeed Feed units: {UoA/ref} + /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + { + require(address(config.erc20) != address(0), "missing erc20"); + // require(config.defaultThreshold > 0, "defaultThreshold zero"); + IERC4626 vault = IERC4626(address(config.erc20)); + oneShare = 10**vault.decimals(); + refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); + } + + /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens + function underlyingRefPerTok() public view override returns (uint192) { + // already accounts for fees to be taken out + return shiftl_toFix(IERC4626(address(erc20)).convertToAssets(oneShare), -refDecimals); + } +} diff --git a/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol b/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol new file mode 100644 index 0000000000..a365bd21e8 --- /dev/null +++ b/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { CollateralConfig } from "../AppreciatingFiatCollateral.sol"; +import { ERC4626FiatCollateral } from "../ERC4626FiatCollateral.sol"; + +/** + * @title MetaMorphoFiatCollateral + * @notice Collateral plugin for a MetaMorpho vault with fiat collateral, like USDC or USDT + * Expected: {tok} != {ref}, {ref} is pegged to {target} unless defaulting, {target} == {UoA} + * + * For example: steakUSDC, steakPYUSD, bbUSDT + */ +contract MetaMorphoFiatCollateral is ERC4626FiatCollateral { + /// config.erc20 must be a MetaMorpho ERC4626 vault + /// @param config.chainlinkFeed Feed units: {UoA/ref} + /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide + constructor(CollateralConfig memory config, uint192 revenueHiding) + ERC4626FiatCollateral(config, revenueHiding) + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } +} diff --git a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol new file mode 100644 index 0000000000..74a3b3c71b --- /dev/null +++ b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +// solhint-disable-next-line max-line-length +import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import { CollateralConfig } from "../AppreciatingFiatCollateral.sol"; +import { FixLib, CEIL } from "../../../libraries/Fixed.sol"; +import { OracleLib } from "../OracleLib.sol"; +import { ERC4626FiatCollateral } from "../ERC4626FiatCollateral.sol"; + +/** + * @title MetaMorphoSelfReferentialCollateral + * @notice Collateral plugin for a MetaMorpho vault with self referential collateral, like WETH + * Expected: {tok} == {ref}, {ref} == {target}, {target} != {UoA} + * + * For example: Re7WETH + */ +contract MetaMorphoSelfReferentialCollateral is ERC4626FiatCollateral { + using FixLib for uint192; + using OracleLib for AggregatorV3Interface; + + /// config.erc20 must be a MetaMorpho ERC4626 vault + /// @param config.chainlinkFeed Feed units: {UoA/ref} + /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide + constructor(CollateralConfig memory config, uint192 revenueHiding) + ERC4626FiatCollateral(config, revenueHiding) + { + // require(config.defaultThreshold > 0, "defaultThreshold zero"); + } + + /// Can revert, used by other contract functions in order to catch errors + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return pegPrice {target/ref} + function tryPrice() + external + view + override + returns ( + uint192 low, + uint192 high, + uint192 pegPrice + ) + { + // {UoA/tok} = {UoA/ref} * {ref/tok} + uint192 p = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); + uint192 err = p.mul(oracleError, CEIL); + + low = p - err; + high = p + err; + // assert(low <= high); obviously true just by inspection + + pegPrice = targetPerRef(); + } +} diff --git a/contracts/plugins/assets/meta-morpho/README.md b/contracts/plugins/assets/meta-morpho/README.md new file mode 100644 index 0000000000..10a980fc6f --- /dev/null +++ b/contracts/plugins/assets/meta-morpho/README.md @@ -0,0 +1,27 @@ +# MetaMorpho + +Morpho Blue is a permisionless lending protocol. At the time of this writing (March 19th, 2024), the only way to deposit is through something called **MetaMorpho**: (somewhat) managed ERC4626 vaults. Our integration with these tokens is straightforward with the exception of reward claiming, which occurs via supplying a merkle proof. This can be done permisionlessly and without interacting with any of our contracts, so any interaction with rewards is omitted here. The expectation is -- _and this is important to emphasize_ -- **any MORPHO reward claiming is left up to the RToken community to cause**. + +## Up-only-ness + +MetaMorpho suffers from a similar to that of the Curve volatile pools which can lose assets on admin fee claim. + +## Target tokens + +**USD** +| Name | Symbol | Address | Reward Tokens | +| -- | -- | -- | -- | +| Steakhouse USDC | steakUSDC| 0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB | wstETH, MORPHO | +| Steakhouse PYSUD | steakPYUSD | 0xbEEF02e5E13584ab96848af90261f0C8Ee04722a | MORPHO | +| Flagship USDT | bbUSDT| 0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1 | MORPHO | + +**ETH** + +| Name | Symbol | Address | Reward Tokens | +| -------- | ------- | ------------------------------------------ | --------------------------- | +| Re7 WETH | Re7WETH | 0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0 | USDC, SWISE, BTRFLY, MORPHO | + +## Future Work + +- Assets need to exist for each of the Reward Tokens, which requires oracles. Only USDC meets this bar; SWISE, BTRFLY, and MORPHO do not have oracles yet. +- The right reward token assets need to be registered for an RToken as a function of their collateral. This can be done using the above table. diff --git a/contracts/plugins/mocks/MockMetaMorpho4626.sol b/contracts/plugins/mocks/MockMetaMorpho4626.sol new file mode 100644 index 0000000000..c71af1218b --- /dev/null +++ b/contracts/plugins/mocks/MockMetaMorpho4626.sol @@ -0,0 +1,47 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { IERC4626 } from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol"; +import "@openzeppelin/contracts/utils/Address.sol"; +import "../../libraries/Fixed.sol"; + +// Simple pass-through wrapper for real MetaMorpho ERC4626 vaults +// Allows settable asset count for testing +contract MockMetaMorpho4626 { + using FixLib for uint192; + + IERC4626 public immutable actual; // the real ERC4626 vault + + uint192 public multiplier = FIX_ONE; + + // solhint-disable-next-line no-empty-blocks + constructor(IERC4626 _actual) { + actual = _actual; + } + + function applyMultiple(uint192 multiple) external { + multiplier = multiplier.mul(multiple); + } + + // === Pass-throughs === + + function balanceOf(address account) external view returns (uint256) { + return actual.balanceOf(account); + } + + function asset() external view returns (address) { + return actual.asset(); + } + + function decimals() external view returns (uint8) { + return actual.decimals(); + } + + function convertToAssets(uint256 amount) external view returns (uint256) { + return multiplier.mulu_toUint(actual.convertToAssets(amount), CEIL); + } + + function totalAssets() public view returns (uint256) { + return multiplier.mulu_toUint(actual.totalAssets(), CEIL); + } +} diff --git a/test/plugins/individual-collateral/meta-morpho/MetaMorphoFiatCollateral.test.ts b/test/plugins/individual-collateral/meta-morpho/MetaMorphoFiatCollateral.test.ts new file mode 100644 index 0000000000..d99f599ade --- /dev/null +++ b/test/plugins/individual-collateral/meta-morpho/MetaMorphoFiatCollateral.test.ts @@ -0,0 +1,216 @@ +import { networkConfig } from '#/common/configuration' +import { bn, fp } from '#/common/numbers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { MockV3Aggregator } from '@typechain/MockV3Aggregator' +import { TestICollateral } from '@typechain/TestICollateral' +import { MockV3Aggregator__factory } from '@typechain/index' +import { expect } from 'chai' +import { BigNumber, BigNumberish, ContractFactory } from 'ethers' +import { ethers } from 'hardhat' +import collateralTests from '../collateralTests' +import { getResetFork } from '../helpers' +import { CollateralOpts, CollateralFixtureContext } from '../pluginTestTypes' +import { pushOracleForward } from '../../../utils/oracles' +import { MAX_UINT192 } from '#/common/constants' +import { + DELAY_UNTIL_DEFAULT, + FORK_BLOCK, + PYUSD_ORACLE_ERROR, + PYUSD_ORACLE_TIMEOUT, + USDT_ORACLE_TIMEOUT, + USDT_ORACLE_ERROR, + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + PRICE_TIMEOUT, +} from './constants' +import { mintCollateralTo } from './mintCollateralTo' + +interface MAFiatCollateralOpts extends CollateralOpts { + defaultPrice?: BigNumberish + defaultRefPerTok?: BigNumberish +} + +const makeFiatCollateralTestSuite = ( + collateralName: string, + defaultCollateralOpts: MAFiatCollateralOpts +) => { + const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { + opts = { ...defaultCollateralOpts, ...opts } + + const MetaMorphoCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'MetaMorphoFiatCollateral' + ) + const collateral = await MetaMorphoCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { gasLimit: 2000000000 } + ) + await collateral.deployed() + + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + + await expect(collateral.refresh()) + + return collateral + } + + type Fixture = () => Promise + + const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + inOpts: MAFiatCollateralOpts = {} + ): Fixture => { + const makeCollateralFixtureContext = async () => { + const opts = { ...defaultCollateralOpts, ...inOpts } + + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, opts.defaultPrice!) + ) + opts.chainlinkFeed = chainlinkFeed.address + + // Hack: use wrapped vault by default unless the maxTradeVolume is infinite, in which + // case the mock would break things. Care! Fragile! + if (!opts.maxTradeVolume || !MAX_UINT192.eq(opts.maxTradeVolume)) { + const mockMetaMorphoFactory = await ethers.getContractFactory('MockMetaMorpho4626') + const mockERC4626 = await mockMetaMorphoFactory.deploy(opts.erc20!) + opts.erc20 = mockERC4626.address + } + + const collateral = await deployCollateral({ ...opts }) + const tok = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + return { + alice, + collateral, + chainlinkFeed, + tok, + } as CollateralFixtureContext + } + + return makeCollateralFixtureContext + } + + const reduceTargetPerRef = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const increaseTargetPerRef = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const reduceRefPerTok = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const mockERC4626 = await ethers.getContractAt('MockMetaMorpho4626', ctx.tok.address) + await mockERC4626.applyMultiple(bn('100').sub(pctDecrease).mul(fp('1')).div(100)) + } + + const increaseRefPerTok = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const mockERC4626 = await ethers.getContractAt('MockMetaMorpho4626', ctx.tok.address) + await mockERC4626.applyMultiple(bn('100').add(pctIncrease).mul(fp('1')).div(100)) + } + + const getExpectedPrice = async (ctx: CollateralFixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() + + const refPerTok = await ctx.collateral.refPerTok() + return clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(refPerTok) + .div(fp('1')) + } + + /* + Define collateral-specific tests + */ + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificConstructorTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificStatusTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const beforeEachRewardsTest = async () => {} + + const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, + itHasRevenueHiding: it, + resetFork: getResetFork(FORK_BLOCK), + collateralName, + chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, + itIsPricedByPeg: true, + toleranceDivisor: bn('1e9'), // 1 part in 1 billion + } + + collateralTests(opts) +} + +const makeOpts = ( + vault: string, + chainlinkFeed: string, + oracleTimeout: BigNumber, + oracleError: BigNumber +): MAFiatCollateralOpts => { + return { + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + oracleTimeout: oracleTimeout, + oracleError: oracleError, + defaultThreshold: oracleError.add(fp('0.01')), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + maxTradeVolume: fp('1e6'), + revenueHiding: fp('0'), + defaultPrice: bn('1e8'), + defaultRefPerTok: fp('1'), + erc20: vault, + chainlinkFeed, + } +} + +/* + Run the test suite +*/ +const { tokens, chainlinkFeeds } = networkConfig[31337] +makeFiatCollateralTestSuite( + 'MetaMorphoFiatCollateral - steakUSDC', + makeOpts(tokens.steakUSDC!, chainlinkFeeds.USDC!, USDC_ORACLE_TIMEOUT, USDC_ORACLE_ERROR) +) +makeFiatCollateralTestSuite( + 'MetaMorphoFiatCollateral - steakPYUSD', + makeOpts(tokens.steakPYUSD!, chainlinkFeeds.pyUSD!, PYUSD_ORACLE_TIMEOUT, PYUSD_ORACLE_ERROR) +) +makeFiatCollateralTestSuite( + 'MetaMorphoFiatCollateral - bbUSDT', + makeOpts(tokens.bbUSDT!, chainlinkFeeds.USDT!, USDT_ORACLE_TIMEOUT, USDT_ORACLE_ERROR) +) diff --git a/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts new file mode 100644 index 0000000000..d072405543 --- /dev/null +++ b/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts @@ -0,0 +1,205 @@ +import { networkConfig } from '#/common/configuration' +import { bn, fp } from '#/common/numbers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { MockV3Aggregator } from '@typechain/MockV3Aggregator' +import { TestICollateral } from '@typechain/TestICollateral' +import { MockV3Aggregator__factory } from '@typechain/index' +import { expect } from 'chai' +import { BigNumber, BigNumberish, ContractFactory } from 'ethers' +import { ethers } from 'hardhat' +import collateralTests from '../collateralTests' +import { getResetFork } from '../helpers' +import { CollateralOpts, CollateralFixtureContext } from '../pluginTestTypes' +import { pushOracleForward } from '../../../utils/oracles' +import { MAX_UINT192 } from '#/common/constants' +import { + DELAY_UNTIL_DEFAULT, + FORK_BLOCK, + ETH_ORACLE_ERROR, + ETH_ORACLE_TIMEOUT, + PRICE_TIMEOUT, +} from './constants' +import { mintCollateralTo } from './mintCollateralTo' + +interface MAFiatCollateralOpts extends CollateralOpts { + defaultPrice?: BigNumberish + defaultRefPerTok?: BigNumberish +} + +const makeFiatCollateralTestSuite = ( + collateralName: string, + defaultCollateralOpts: MAFiatCollateralOpts +) => { + const deployCollateral = async (opts: MAFiatCollateralOpts = {}): Promise => { + opts = { ...defaultCollateralOpts, ...opts } + + const MetaMorphoCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'MetaMorphoSelfReferentialCollateral' + ) + const collateral = await MetaMorphoCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { gasLimit: 2000000000 } + ) + await collateral.deployed() + + // Push forward chainlink feed + await pushOracleForward(opts.chainlinkFeed!) + + await expect(collateral.refresh()) + + return collateral + } + + type Fixture = () => Promise + + const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + inOpts: MAFiatCollateralOpts = {} + ): Fixture => { + const makeCollateralFixtureContext = async () => { + const opts = { ...defaultCollateralOpts, ...inOpts } + + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, opts.defaultPrice!) + ) + opts.chainlinkFeed = chainlinkFeed.address + + // Hack: use wrapped vault by default unless the maxTradeVolume is infinite, in which + // case the mock would break things. Care! Fragile! + if (!opts.maxTradeVolume || !MAX_UINT192.eq(opts.maxTradeVolume)) { + const mockMetaMorphoFactory = await ethers.getContractFactory('MockMetaMorpho4626') + const mockERC4626 = await mockMetaMorphoFactory.deploy(opts.erc20!) + opts.erc20 = mockERC4626.address + } + + const collateral = await deployCollateral({ ...opts }) + const tok = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + return { + alice, + collateral, + chainlinkFeed, + tok, + } as CollateralFixtureContext + } + + return makeCollateralFixtureContext + } + + const reduceTargetPerRef = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const increaseTargetPerRef = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const reduceRefPerTok = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const mockERC4626 = await ethers.getContractAt('MockMetaMorpho4626', ctx.tok.address) + await mockERC4626.applyMultiple(bn('100').sub(pctDecrease).mul(fp('1')).div(100)) + } + + const increaseRefPerTok = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const mockERC4626 = await ethers.getContractAt('MockMetaMorpho4626', ctx.tok.address) + await mockERC4626.applyMultiple(bn('100').add(pctIncrease).mul(fp('1')).div(100)) + } + + const getExpectedPrice = async (ctx: CollateralFixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() + + const refPerTok = await ctx.collateral.refPerTok() + return clData.answer + .mul(bn(10).pow(18 - clDecimals)) + .mul(refPerTok) + .div(fp('1')) + } + + /* + Define collateral-specific tests + */ + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificConstructorTests = () => {} + + // eslint-disable-next-line @typescript-eslint/no-empty-function + const collateralSpecificStatusTests = () => {} + // eslint-disable-next-line @typescript-eslint/no-empty-function + const beforeEachRewardsTest = async () => {} + + const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it.skip, + itChecksTargetPerRefDefaultUp: it.skip, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it.skip, + itHasRevenueHiding: it, + resetFork: getResetFork(FORK_BLOCK), + collateralName, + chainlinkDefaultAnswer: defaultCollateralOpts.defaultPrice!, + itIsPricedByPeg: true, + toleranceDivisor: bn('1e8'), // 1 part in 100 million + } + + collateralTests(opts) +} + +const makeOpts = ( + vault: string, + chainlinkFeed: string, + oracleTimeout: BigNumber, + oracleError: BigNumber +): MAFiatCollateralOpts => { + return { + targetName: ethers.utils.formatBytes32String('ETH'), + priceTimeout: PRICE_TIMEOUT, + oracleTimeout: oracleTimeout, + oracleError: oracleError, + defaultThreshold: oracleError.add(fp('0.01')), + delayUntilDefault: DELAY_UNTIL_DEFAULT, + maxTradeVolume: fp('1e6'), + revenueHiding: fp('0'), + defaultPrice: bn('4000e8'), + defaultRefPerTok: fp('1'), + erc20: vault, + chainlinkFeed, + } +} + +/* + Run the test suite +*/ +const { tokens, chainlinkFeeds } = networkConfig[31337] +makeFiatCollateralTestSuite( + 'MetaMorphoSelfReferentialCollateral - Re7WETH', + makeOpts(tokens.Re7WETH!, chainlinkFeeds.ETH!, ETH_ORACLE_TIMEOUT, ETH_ORACLE_ERROR) +) diff --git a/test/plugins/individual-collateral/meta-morpho/constants.ts b/test/plugins/individual-collateral/meta-morpho/constants.ts new file mode 100644 index 0000000000..ec71a3b347 --- /dev/null +++ b/test/plugins/individual-collateral/meta-morpho/constants.ts @@ -0,0 +1,30 @@ +import { bn, fp } from '../../../../common/numbers' +import { networkConfig } from '../../../../common/configuration' + +// Mainnet Addresses + +// USDC +export const USDC_USD_FEED = networkConfig['1'].chainlinkFeeds.USDC! +export const USDC_ORACLE_TIMEOUT = bn('86400') +export const USDC_ORACLE_ERROR = fp('0.0025') + +// PYUSD +export const PYUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.pyUSD! +export const PYUSD_ORACLE_TIMEOUT = bn('86400') +export const PYUSD_ORACLE_ERROR = fp('0.003') + +// USDT +export const USDT_USD_FEED = networkConfig['1'].chainlinkFeeds.USDT! +export const USDT_ORACLE_TIMEOUT = bn('86400') +export const USDT_ORACLE_ERROR = fp('0.0025') + +// ETH +export const ETH_USD_FEED = networkConfig['1'].chainlinkFeeds.ETH! +export const ETH_ORACLE_TIMEOUT = bn('3600') +export const ETH_ORACLE_ERROR = fp('0.005') + +// General +export const PRICE_TIMEOUT = bn(604800) // 1 week +export const DELAY_UNTIL_DEFAULT = bn(86400) + +export const FORK_BLOCK = 19463181 diff --git a/test/plugins/individual-collateral/meta-morpho/mintCollateralTo.ts b/test/plugins/individual-collateral/meta-morpho/mintCollateralTo.ts new file mode 100644 index 0000000000..099a9fbf8f --- /dev/null +++ b/test/plugins/individual-collateral/meta-morpho/mintCollateralTo.ts @@ -0,0 +1,45 @@ +import { networkConfig } from '#/common/configuration' +import { CollateralFixtureContext, MintCollateralFunc } from '../pluginTestTypes' +import hre, { ethers } from 'hardhat' +import { BigNumberish } from 'ethers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { whileImpersonating } from '#/utils/impersonation' + +export const whales: { [key: string]: string } = { + [networkConfig['31337'].tokens.steakUSDC!]: '0xC977d218Fde6A39c7aCE71C8243545c276B48931', + [networkConfig['31337'].tokens.steakPYUSD!]: '0x7E4B4DC22111B84594d9b7707A8DCFFd793D477A', + [networkConfig['31337'].tokens.bbUSDT!]: '0xc8E3C36a72B9AA4Af0a057eb4A11e1AFC16465bB', + [networkConfig['31337'].tokens.Re7WETH!]: '0xd553294B42bdFEb49D8f5A64E8B2D3A65fc673A9', +} + +/** + * Mint collateral to a recipient using a whale. + * @param ctx The CollateralFixtureContext object. + * @param amount The amount of collateral to mint. + * @param _ The signer with address (not used in this function). + * @param recipient The address of the recipient of the minted collateral. + */ +export const mintCollateralTo: MintCollateralFunc = async ( + ctx: CollateralFixtureContext, + amount: BigNumberish, + _: SignerWithAddress, + recipient: string +) => { + const tok = await ethers.getContractAt('MockMetaMorpho4626', ctx.tok.address) + + // It can be a MockMetaMorpho4626 or the real ERC4626 + try { + // treat it as a wrapper to begin + const underlying = await ethers.getContractAt('IERC20Metadata', await tok.actual()) + + // Transfer the underlying (real) ERC4626; wrapper is pass-through + await whileImpersonating(hre, whales[underlying.address], async (whaleSigner) => { + await underlying.connect(whaleSigner).transfer(recipient, amount) + }) + } catch { + // if we error out, then it's not the wrapper we're dealing with + await whileImpersonating(hre, whales[ctx.tok.address], async (whaleSigner) => { + await ctx.tok.connect(whaleSigner).transfer(recipient, amount) + }) + } +} From a5f7d20a43a1a0ee22f30919cd9867449afa6cfc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 22 Mar 2024 13:49:21 -0400 Subject: [PATCH 240/450] 3.3.0 eUSD plugin upgrade (#1093) Co-authored-by: Patrick McKelvy Co-authored-by: Akshat Mittal --- .gitignore | 3 + common/configuration.ts | 4 +- hardhat.config.ts | 7 +- .../1-tmp-assets-collateral.json | 27 ++ .../mainnet-3.3.0/1-tmp-deployments.json | 6 +- .../collaterals/deploy_aave_v3_pyusd.ts | 22 +- .../collaterals/deploy_aave_v3_usdc.ts | 40 +- .../collateral-plugins/verify_aave_v3_usdc.ts | 14 + tasks/testing/mint-tokens.ts | 4 +- .../upgrade-checker-utils/constants.ts | 8 +- .../upgrade-checker-utils/governance.ts | 181 ++++++--- tasks/testing/upgrade-checker-utils/logs.ts | 6 + .../testing/upgrade-checker-utils/oracles.ts | 79 ++-- .../testing/upgrade-checker-utils/rewards.ts | 2 +- .../testing/upgrade-checker-utils/rtokens.ts | 36 +- tasks/testing/upgrade-checker-utils/trades.ts | 134 +++++-- .../upgrades/3_3_0_plugins.ts | 207 ++++++++++ tasks/testing/upgrade-checker.ts | 375 +++++++++--------- .../morpho-aave/constants.ts | 2 +- utils/subgraph.ts | 3 +- utils/time.ts | 5 +- 21 files changed, 827 insertions(+), 338 deletions(-) create mode 100644 scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json create mode 100644 tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts diff --git a/.gitignore b/.gitignore index 13c0e37712..8751aabb75 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,6 @@ scripts/playground.ts # tenderly deployment/verification artifacts deployments/ backtests/ + +# output files +output.log diff --git a/common/configuration.ts b/common/configuration.ts index f747647743..bac2248bf6 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -163,7 +163,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', - saEthUSDC: '0x73edDFa87C71ADdC275c2b9890f5c3a8480bC9E6', // canonical wrapper + saEthUSDC: '0x093cB4f405924a0C468b43209d5E466F1dd0aC7d', // our wrapper cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', @@ -206,7 +206,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', pyUSD: '0x6c3ea9036406852006290770bedfcaba0e23a0e8', aEthPyUSD: '0x0C0d01AbF3e6aDfcA0989eBbA9d6e85dD58EaB1E', - saEthPyUSD: '0x00F2a835758B33f3aC53516Ebd69f3dc77B0D152', // canonical wrapper + saEthPyUSD: '0x8d6E0402A3E3aD1b43575b05905F9468447013cF', // our wrapper }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', diff --git a/hardhat.config.ts b/hardhat.config.ts index 7e1c009d07..6c5398b9f1 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -25,7 +25,7 @@ const TENDERLY_RPC_URL = useEnv('TENDERLY_RPC_URL') const GOERLI_RPC_URL = useEnv('GOERLI_RPC_URL') const BASE_GOERLI_RPC_URL = useEnv('BASE_GOERLI_RPC_URL') const BASE_RPC_URL = useEnv('BASE_RPC_URL') -const MNEMONIC = useEnv('MNEMONIC') ?? 'test test test test test test test test test test test junk' +const MNEMONIC = useEnv('MNEMONIC') || 'test test test test test test test test test test test junk' const TIMEOUT = useEnv('SLOW') ? 6_000_000 : 600_000 const src_dir = `./contracts/${useEnv('PROTO')}` @@ -44,7 +44,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true + allowUnlimitedContractSize: true, }, localhost: { // network for long-lived mainnet forks @@ -53,6 +53,7 @@ const config: HardhatUserConfig = { gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, allowUnlimitedContractSize: true, + timeout: 0, }, goerli: { chainId: 5, @@ -135,7 +136,7 @@ const config: HardhatUserConfig = { etherscan: { apiKey: { mainnet: useEnv('ETHERSCAN_API_KEY'), - base: useEnv('BASESCAN_API_KEY') + base: useEnv('BASESCAN_API_KEY'), }, customChains: [ { diff --git a/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json new file mode 100644 index 0000000000..e60393766f --- /dev/null +++ b/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json @@ -0,0 +1,27 @@ +{ + "assets": {}, + "collateral": { + "aUSDC": "0x6E14943224d6E4F7607943512ba17DbBA9524B8e", + "aUSDT": "0x8AD3055286f4E59B399616Bd6BEfE24F64573928", + "wstETH": "0x3519918E2918b59f3b29bed16dC77174DEC6707b", + "rETH": "0xEdd8d4Cc0d0358a12f232fd72821d25d4EbE7704", + "cUSDCv3": "0xf0Fb23485057Fd88C80B9CEc8b433FdA47e0a07A", + "cvxeUSDFRAXBP": "0x5cD176b58a6FdBAa1aEFD0921935a730C62f03Ac", + "sDAI": "0x29EDbbbE7415cb8637e0F62D5d19dcB3A5bC3229", + "saEthUSDC": "0x05beee046A5C28844804E679aD5587046dBffbc0", + "cUSDT": "0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8", + "saEthPyUSD": "0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7" + }, + "erc20s": { + "aUSDC": "0x60C384e226b120d93f3e0F4C502957b2B9C32B15", + "aUSDT": "0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "cUSDCv3": "0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A", + "cvxeUSDFRAXBP": "0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "saEthUSDC": "0x093cB4f405924a0C468b43209d5E466F1dd0aC7d", + "cUSDT": "0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9", + "saEthPyUSD": "0x8d6E0402A3E3aD1b43575b05905F9468447013cF" + } +} diff --git a/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json b/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json index fe1fcc889e..25a8b16438 100644 --- a/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json +++ b/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json @@ -18,8 +18,8 @@ "implementations": { "main": "", "trading": { - "gnosisTrade": "", - "dutchTrade": "" + "gnosisTrade": "0x803a52c5DAB69B78419bb160051071eF2F9Fd227", + "dutchTrade": "0x4eDEb80Ce684A890Dd58Ae0d9762C38731b11b99" }, "components": { "assetRegistry": "", @@ -34,4 +34,4 @@ "stRSR": "" } } -} \ No newline at end of file +} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts index 5f6785b1ba..27944c095f 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts @@ -52,15 +52,32 @@ async function main() { const deployedCollateral: string[] = [] + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + + /******** Deploy Aave V3 pyUSD ERC20 **************************/ + + const erc20 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + await erc20.deployed() + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aEthPyUSD!, + 'Static Aave Ethereum pyUSD', + 'saEthPyUSD' + ) + ).wait() + /******** Deploy Aave V3 pyUSD collateral plugin **************************/ - const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') const collateral = await CollateralFactory.connect(deployer).deploy( { priceTimeout: priceTimeout, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.pyUSD!, oracleError: PYUSD_ORACLE_ERROR, - erc20: networkConfig[chainId].tokens.saEthPyUSD!, + erc20: erc20.address, maxTradeVolume: PYUSD_MAX_TRADE_VOLUME, oracleTimeout: PYUSD_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -77,6 +94,7 @@ async function main() { `Deployed Aave V3 pyUSD collateral to ${hre.network.name} (${chainId}): ${collateral.address}` ) + assetCollDeployments.erc20s.saEthPyUSD = erc20.address assetCollDeployments.collateral.saEthPyUSD = collateral.address assetCollDeployments.erc20s.saEthPyUSD = networkConfig[chainId].tokens.saEthPyUSD! deployedCollateral.push(collateral.address.toString()) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts index 7a9efc9b14..63f72128c0 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -53,15 +53,35 @@ async function main() { /******** Deploy Aave V3 USDC collateral plugin **************************/ const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + const erc20 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + await erc20.deployed() // Mainnet if (!baseL2Chains.includes(hre.network.name)) { + /******** Deploy Aave V3 USDC wrapper **************************/ + + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aEthUSDC!, + 'Static Aave Ethereum USDC', + 'saEthUSDC' + ) + ).wait() + + console.log( + `Deployed wrapper for Aave V3 USDC on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + const collateral = await CollateralFactory.connect(deployer).deploy( { priceTimeout: priceTimeout, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: USDC_MAINNET_ORACLE_ERROR.toString(), - erc20: networkConfig[chainId].tokens.saEthUSDC!, + erc20: erc20.address, maxTradeVolume: USDC_MAINNET_MAX_TRADE_VOLUME.toString(), oracleTimeout: USDC_MAINNET_ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('USD'), @@ -78,15 +98,30 @@ async function main() { `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` ) + assetCollDeployments.erc20s.saEthUSDC = erc20.address assetCollDeployments.collateral.saEthUSDC = collateral.address deployedCollateral.push(collateral.address.toString()) } else { + /******** Deploy Aave V3 USDC wrapper **************************/ + + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aBasUSDC!, + 'Static Aave Base USDC', + 'saBasUSDC' + ) + ).wait() + + console.log( + `Deployed wrapper for Aave V3 USDC on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + const collateral = await CollateralFactory.connect(deployer).deploy( { priceTimeout: priceTimeout, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, oracleError: USDC_BASE_ORACLE_ERROR.toString(), - erc20: networkConfig[chainId].tokens.saBasUSDC!, + erc20: erc20.address, maxTradeVolume: USDC_BASE_MAX_TRADE_VOLUME.toString(), oracleTimeout: USDC_BASE_ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('USD'), @@ -103,6 +138,7 @@ async function main() { `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` ) + assetCollDeployments.erc20s.saBasUSDC = erc20.address assetCollDeployments.collateral.saBasUSDC = collateral.address deployedCollateral.push(collateral.address.toString()) } diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts index 8076f727f4..e5579929a0 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -25,6 +25,12 @@ async function main() { const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) deployments = getDeploymentFile(assetCollDeploymentFilename) + const erc20 = await ethers.getContractAt( + 'ERC20Mock', + baseL2Chains.includes(hre.network.name) + ? deployments.erc20s.saBasUSDC! + : deployments.erc20s.saEthUSDC! + ) const collateral = await ethers.getContractAt( 'AaveV3FiatCollateral', baseL2Chains.includes(hre.network.name) @@ -32,6 +38,14 @@ async function main() { : deployments.collateral.saEthUSDC! ) + /******** Verify Aave V3 USDC ERC20 **************************/ + await verifyContract( + chainId, + erc20.address, + [networkConfig[chainId].AAVE_V3_POOL!, networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER!], + 'contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol:StaticATokenV3LM' + ) + /******** Verify Aave V3 USDC plugin **************************/ // Works for both Mainnet and Base diff --git a/tasks/testing/mint-tokens.ts b/tasks/testing/mint-tokens.ts index fd11d63b4c..b823d51271 100644 --- a/tasks/testing/mint-tokens.ts +++ b/tasks/testing/mint-tokens.ts @@ -112,8 +112,8 @@ task('give-rsr', 'Mints RSR to an address on a tenderly fork') const rsrWhale = '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1' await whileImpersonating(hre, rsrWhale, async (signer) => { - await rsr.connect(signer).transfer(params.address, fp('100e6')) + await rsr.connect(signer).transfer(params.address, fp('1e9')) }) - console.log(`100m RSR sent to ${params.address}`) + console.log(`1B RSR sent to ${params.address}`) }) diff --git a/tasks/testing/upgrade-checker-utils/constants.ts b/tasks/testing/upgrade-checker-utils/constants.ts index 602c245d47..94156c644b 100644 --- a/tasks/testing/upgrade-checker-utils/constants.ts +++ b/tasks/testing/upgrade-checker-utils/constants.ts @@ -2,7 +2,8 @@ import { networkConfig } from '#/common/configuration' export const whales: { [key: string]: string } = { [networkConfig['1'].tokens.USDT!.toLowerCase()]: '0x47ac0Fb4F2D84898e4D9E7b4DaB3C24507a6D503', - [networkConfig['1'].tokens.USDC!.toLowerCase()]: '0x756D64Dc5eDb56740fC617628dC832DDBCfd373c', + [networkConfig['1'].tokens.USDC!.toLowerCase()]: '0xAFAaDfa18D9d63d09F19a5445e29CEc601054C5e', + [networkConfig['1'].tokens.pyUSD!.toLowerCase()]: '0xA5588F7cdf560811710A2D82D3C9c99769DB1Dcb', [networkConfig['1'].tokens.RSR!.toLowerCase()]: '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1', [networkConfig['1'].tokens.cUSDT!.toLowerCase()]: '0xb99CC7e10Fe0Acc68C50C7829F473d81e23249cc', [networkConfig['1'].tokens.aUSDT!.toLowerCase()]: '0x0B6B712B0f3998961Cd3109341b00c905b16124A', @@ -13,17 +14,18 @@ export const whales: { [key: string]: string } = { [networkConfig['1'].tokens.aUSDC!.toLowerCase()]: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', [networkConfig['1'].tokens.cUSDC!.toLowerCase()]: '0x97D868b5C2937355Bf89C5E5463d52016240fE86', + [networkConfig['1'].tokens.cUSDCv3!.toLowerCase()]: '0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', // saUSDC ['0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase()]: '0x51eDF02152EBfb338e03E30d65C15fBf06cc9ECC', // cUSDCVault - [networkConfig['1'].tokens.RSR!.toLowerCase()]: '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1', [networkConfig['1'].tokens.WBTC!.toLowerCase()]: '0x8eb8a3b98659cce290402893d0123abb75e3ab28', [networkConfig['1'].tokens.stETH!.toLowerCase()]: '0x176F3DAb24a159341c0509bB36B833E7fdd0a132', [networkConfig['1'].tokens.WETH!.toLowerCase()]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28', [networkConfig['1'].tokens.DAI!.toLowerCase()]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28', [networkConfig['1'].tokens.CRV!.toLowerCase()]: '0xf977814e90da44bfa03b6295a0616a897441acec', + [networkConfig['1'].tokens.CRV!.toLowerCase()]: '0xf977814e90da44bfa03b6295a0616a897441acec', } export const collateralToUnderlying: { [key: string]: string } = { @@ -33,4 +35,6 @@ export const collateralToUnderlying: { [key: string]: string } = { networkConfig['1'].tokens.USDC!.toLowerCase(), [networkConfig['1'].tokens.cUSDT!.toLowerCase()]: networkConfig['1'].tokens.USDT!.toLowerCase(), [networkConfig['1'].tokens.cUSDC!.toLowerCase()]: networkConfig['1'].tokens.USDC!.toLowerCase(), + [networkConfig['1'].tokens.saEthUSDC!.toLowerCase()]: + networkConfig['1'].tokens.aEthUSDC!.toLowerCase(), } diff --git a/tasks/testing/upgrade-checker-utils/governance.ts b/tasks/testing/upgrade-checker-utils/governance.ts index 1003f1e0ee..37ca3c0157 100644 --- a/tasks/testing/upgrade-checker-utils/governance.ts +++ b/tasks/testing/upgrade-checker-utils/governance.ts @@ -7,118 +7,180 @@ import { BigNumber, PopulatedTransaction } from 'ethers' import { HardhatRuntimeEnvironment } from 'hardhat/types' import { pushOraclesForward } from './oracles' -export const passAndExecuteProposal = async ( +const validatePropState = async (propState: ProposalState, expectedState: ProposalState) => { + if (propState !== expectedState) { + throw new Error( + `Proposal should be ${ProposalState[expectedState]} but was ${ProposalState[propState]}` + ) + } +} + +export const moveProposalToActive = async ( hre: HardhatRuntimeEnvironment, rtokenAddress: string, governorAddress: string, - proposalId: string, - proposal?: Proposal + proposalId: string ) => { - console.log(`\nPassing & executing proposal ${proposalId}...`) + console.log('Activating Proposal:', proposalId) + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const propState = await governor.state(proposalId) - // Check proposal state - let propState = await governor.state(proposalId) if (propState == ProposalState.Pending) { - console.log(`Prop ${proposalId} is PENDING, moving to ACTIVE...`) + console.log(`Proposal is PENDING, moving to ACTIVE...`) // Advance time to start voting const votingDelay = await governor.votingDelay() - await advanceBlocks(hre, votingDelay.add(1)) - - // Check proposal state - propState = await governor.state(proposalId) - if (propState != ProposalState.Active) { - throw new Error(`Proposal should be active but was ${propState}`) + await advanceBlocks(hre, votingDelay.add(2)) + } else { + if (propState == ProposalState.Active) { + console.log(`Proposal is already ${ProposalState[ProposalState.Active]}... skipping step.`) + } else { + throw Error(`Proposal should be ${ProposalState[ProposalState.Pending]} at this step.`) } } + await validatePropState(await governor.state(proposalId), ProposalState.Active) +} + +export const voteProposal = async ( + hre: HardhatRuntimeEnvironment, + rtokenAddress: string, + governorAddress: string, + proposalId: string, + proposal?: Proposal +) => { + console.log('Voting Proposal:', proposalId) + + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const propState = await governor.state(proposalId) + if (propState == ProposalState.Active) { - console.log(`Prop ${proposalId} is ACTIVE, moving to SUCCEEDED...`) - - // gather enough whale voters - let whales: Array = await getDelegates(rtokenAddress.toLowerCase()) - const startBlock = await governor.proposalSnapshot(proposalId) - const quorum = await governor.quorum(startBlock) - - let quorumNotReached = true - let currentVoteAmount = BigNumber.from(0) - let i = 0 - while (quorumNotReached) { - const whale = whales[i] - currentVoteAmount = currentVoteAmount.add(BigNumber.from(whale.delegatedVotesRaw)) - i += 1 - if (currentVoteAmount.gt(quorum)) { - quorumNotReached = false + console.log(`Proposal is ACTIVE, moving to SUCCEEDED...`) + + if (!proposal) { + // gather enough whale voters + let whales: Array = await getDelegates(rtokenAddress.toLowerCase()) + const startBlock = await governor.proposalSnapshot(proposalId) + const quorum = await governor.quorum(startBlock) + + let quorumNotReached = true + let currentVoteAmount = BigNumber.from(0) + let i = 0 + while (quorumNotReached) { + const whale = whales[i] + currentVoteAmount = currentVoteAmount.add(BigNumber.from(whale.delegatedVotesRaw)) + i += 1 + if (currentVoteAmount.gt(quorum)) { + quorumNotReached = false + } } - } - whales = whales.slice(0, i) + whales = whales.slice(0, i) - // cast enough votes to pass the proposal - for (const whale of whales) { - await whileImpersonating(hre, whale.address, async (signer) => { - await governor.connect(signer).castVote(proposalId, 1) - }) + // cast enough votes to pass the proposal + for (const whale of whales) { + await whileImpersonating(hre, whale.address, async (signer) => { + await governor.connect(signer).castVote(proposalId, 1) + }) + } + } else { + // Vote from testing account, on the assumption it is staked/delegated + const [tester] = await hre.ethers.getSigners() + await governor.connect(tester).castVote(proposalId, 1) } + } + + await validatePropState(await governor.state(proposalId), ProposalState.Active) +} +export const passProposal = async ( + hre: HardhatRuntimeEnvironment, + rtokenAddress: string, + governorAddress: string, + proposalId: string +) => { + console.log('Passing Proposal:', proposalId) + + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const propState = await governor.state(proposalId) + + if (propState == ProposalState.Active) { // Advance time till voting is complete const votingPeriod = await governor.votingPeriod() await advanceBlocks(hre, votingPeriod.add(1)) - - propState = await governor.state(proposalId) - // Finished voting - Check proposal state - if (propState != ProposalState.Succeeded) { - throw new Error('Proposal should have succeeded') - } } + await validatePropState(await governor.state(proposalId), ProposalState.Succeeded) +} + +export const executeProposal = async ( + hre: HardhatRuntimeEnvironment, + rtokenAddress: string, + governorAddress: string, + proposalId: string, + proposal?: Proposal, + extraAssets: string[] = [] +) => { + console.log('Executing Proposal:', proposalId) + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + + // Check proposal state + let propState = await governor.state(proposalId) + let descriptionHash: string if (propState == ProposalState.Succeeded) { - console.log(`Prop ${proposalId} is SUCCEEDED, moving to QUEUED...`) + console.log(`Proposal is SUCCEEDED, moving to QUEUED...`) if (!proposal) { - proposal = await getProposalDetails(`${governorAddress.toLowerCase()}-${proposalId}`) + proposal = await getProposalDetails(proposalId) } + descriptionHash = hre.ethers.utils.keccak256(hre.ethers.utils.toUtf8Bytes(proposal.description)) - // Queue propoal + // Queue proposal await governor.queue(proposal.targets, proposal.values, proposal.calldatas, descriptionHash) // Check proposal state propState = await governor.state(proposalId) - if (propState != ProposalState.Queued) { - throw new Error('Proposal should be queued') - } + await validatePropState(propState, ProposalState.Queued) } if (propState == ProposalState.Queued) { - console.log(`Prop ${proposalId} is QUEUED, moving to EXECUTED...`) + console.log(`Proposal is QUEUED, moving to EXECUTED...`) if (!proposal) { proposal = await getProposalDetails(`${governorAddress.toLowerCase()}-${proposalId}`) } + descriptionHash = hre.ethers.utils.keccak256(hre.ethers.utils.toUtf8Bytes(proposal.description)) const timelock = await hre.ethers.getContractAt('TimelockController', await governor.timelock()) const minDelay = await timelock.getMinDelay() + console.log('Preparing execution...') // Advance time required by timelock await advanceTime(hre, minDelay.add(1).toString()) await advanceBlocks(hre, 1) - await pushOraclesForward(hre, rtokenAddress) + + /* + ** Executing proposals requires that the oracles aren't stale. + ** Make sure to specify any extra assets that may have been registered. + */ + await pushOraclesForward(hre, rtokenAddress, extraAssets) + + console.log('Executing now...') // Execute await governor.execute(proposal.targets, proposal.values, proposal.calldatas, descriptionHash) - // Check proposal state propState = await governor.state(proposalId) - if (propState != ProposalState.Executed) { - throw new Error('Proposal should be executed') - } + await validatePropState(propState, ProposalState.Executed) + } else { + throw new Error('Proposal should be queued') } - console.log(`Prop ${proposalId} is EXECUTED.`) + console.log(`Proposal is EXECUTED.`) } export const stakeAndDelegateRsr = async ( @@ -141,7 +203,7 @@ export const stakeAndDelegateRsr = async ( export const buildProposal = (txs: Array, description: string): Proposal => { const targets = txs.map((tx: PopulatedTransaction) => tx.to!) - const values = txs.map((tx: PopulatedTransaction) => bn(0)) + const values = txs.map(() => bn(0)) const calldatas = txs.map((tx: PopulatedTransaction) => tx.data!) return { targets, @@ -162,7 +224,7 @@ export const proposeUpgrade = async ( rTokenAddress: string, governorAddress: string, proposalBuilder: ProposalBuilder -): Promise => { +) => { console.log(`\nGenerating and proposing proposal...`) const [tester] = await hre.ethers.getSigners() @@ -193,5 +255,8 @@ export const proposeUpgrade = async ( console.log('\nSuccessfully proposed!') console.log(`Proposal ID: ${resp.events![0].args!.proposalId}`) - return { ...proposal, proposalId: resp.events![0].args!.proposalId } + return { + ...proposal, + proposalId: resp.events![0].args!.proposalId as string, + } } diff --git a/tasks/testing/upgrade-checker-utils/logs.ts b/tasks/testing/upgrade-checker-utils/logs.ts index 1cfe509bcf..1e39412f68 100644 --- a/tasks/testing/upgrade-checker-utils/logs.ts +++ b/tasks/testing/upgrade-checker-utils/logs.ts @@ -40,10 +40,16 @@ const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.rETH!.toLowerCase()]: 'rETH', [networkConfig['1'].tokens.cUSDCv3!.toLowerCase()]: 'cUSDCv3', [networkConfig['1'].tokens.DAI!.toLowerCase()]: 'DAI', + [networkConfig['1'].tokens.aEthUSDC!.toLowerCase()]: 'aEthUSDC', + [networkConfig['1'].tokens.saEthUSDC!.toLowerCase()]: 'saEthUSDC', + [networkConfig['1'].tokens.aEthPyUSD!.toLowerCase()]: 'aEthPyUSD', + [networkConfig['1'].tokens.saEthPyUSD!.toLowerCase()]: 'saEthPyUSD', + [networkConfig['1'].tokens.cUSDCv3!.toLowerCase()]: 'cUSDCv3', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: 'saUSDC', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: 'saUSDT', ['0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase()]: 'cUSDCVault', ['0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase()]: 'cUSDTVault', + ['0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A'.toLowerCase()]: 'wcUSDCv3', } export const logToken = (tokenAddress: string) => { diff --git a/tasks/testing/upgrade-checker-utils/oracles.ts b/tasks/testing/upgrade-checker-utils/oracles.ts index aa5d536188..500f19925b 100644 --- a/tasks/testing/upgrade-checker-utils/oracles.ts +++ b/tasks/testing/upgrade-checker-utils/oracles.ts @@ -1,7 +1,7 @@ -import { setCode } from '@nomicfoundation/hardhat-network-helpers' import { EACAggregatorProxyMock } from '@typechain/EACAggregatorProxyMock' import { HardhatRuntimeEnvironment } from 'hardhat/types' import { BigNumber } from 'ethers' +import { TestIAsset } from '@typechain/index' export const overrideOracle = async ( hre: HardhatRuntimeEnvironment, @@ -16,13 +16,20 @@ export const overrideOracle = async ( const initPrice = await oracle.latestRoundData() const mockOracleFactory = await hre.ethers.getContractFactory('EACAggregatorProxyMock') const mockOracle = await mockOracleFactory.deploy(aggregator, accessController, initPrice.answer) - const bytecode = await hre.network.provider.send('eth_getCode', [mockOracle.address]) - await setCode(oracleAddress, bytecode) + const bytecode = await hre.network.provider.send('eth_getCode', [mockOracle.address, 'latest']) + await hre.network.provider.request({ + method: 'hardhat_setCode', + params: [oracleAddress, bytecode], + }) return hre.ethers.getContractAt('EACAggregatorProxyMock', oracleAddress) } -export const pushOraclesForward = async (hre: HardhatRuntimeEnvironment, rTokenAddress: string) => { - console.log(`\nPushing oracles forward for RToken ${rTokenAddress}...`) +export const pushOraclesForward = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string, + extraAssets: string[] = [] +) => { + console.log(`Pushing Oracles forward for RToken ${rTokenAddress}...`) const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const assetRegistry = await hre.ethers.getContractAt( @@ -30,27 +37,43 @@ export const pushOraclesForward = async (hre: HardhatRuntimeEnvironment, rTokenA await main.assetRegistry() ) const registry = await assetRegistry.getRegistry() + for (const asset of registry.assets) { await pushOracleForward(hre, asset) } + + for (const asset of extraAssets) { + await pushOracleForward(hre, asset) + } } -export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: string) => { +const checkOracleExists = async ( + hre: HardhatRuntimeEnvironment, + asset: string, + fn: (assetContract: TestIAsset) => Promise +) => { const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) - let chainlinkFeed = '' + try { - chainlinkFeed = await assetContract.chainlinkFeed() + await assetContract.chainlinkFeed() + console.log(`Chainlink Oracle Found. Processing asset: ${asset}`) + + await fn(assetContract) } catch { - console.log(`no chainlink oracle found. skipping RTokenAsset ${asset}...`) - return + console.log(`Chainlink Oracle Missing. Skipping asset: ${asset}`) } - const realChainlinkFeed = await hre.ethers.getContractAt( - 'AggregatorV3Interface', - await assetContract.chainlinkFeed() - ) - const initPrice = await realChainlinkFeed.latestRoundData() - const oracle = await overrideOracle(hre, realChainlinkFeed.address) - await oracle.updateAnswer(initPrice.answer) +} + +export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: string) => { + await checkOracleExists(hre, asset, async (assetContract) => { + const realChainlinkFeed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContract.chainlinkFeed() + ) + const initPrice = await realChainlinkFeed.latestRoundData() + const oracle = await overrideOracle(hre, realChainlinkFeed.address) + await oracle.updateAnswer(initPrice.answer) + }) } export const setOraclePrice = async ( @@ -58,18 +81,12 @@ export const setOraclePrice = async ( asset: string, value: BigNumber ) => { - const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) - let chainlinkFeed = '' - try { - chainlinkFeed = await assetContract.chainlinkFeed() - } catch { - console.log(`no chainlink oracle found. skipping RTokenAsset ${asset}...`) - return - } - const realChainlinkFeed = await hre.ethers.getContractAt( - 'AggregatorV3Interface', - await assetContract.chainlinkFeed() - ) - const oracle = await overrideOracle(hre, realChainlinkFeed.address) - await oracle.updateAnswer(value) + await checkOracleExists(hre, asset, async (assetContract) => { + const realChainlinkFeed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContract.chainlinkFeed() + ) + const oracle = await overrideOracle(hre, realChainlinkFeed.address) + await oracle.updateAnswer(value) + }) } diff --git a/tasks/testing/upgrade-checker-utils/rewards.ts b/tasks/testing/upgrade-checker-utils/rewards.ts index 22a291619a..01f0cb02e3 100644 --- a/tasks/testing/upgrade-checker-utils/rewards.ts +++ b/tasks/testing/upgrade-checker-utils/rewards.ts @@ -38,7 +38,7 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr const compContract = await hre.ethers.getContractAt('ERC20Mock', comp) // fake enough rewards to trade - await whileImpersonating(hre, '0x2775b1c75658Be0F640272CCb8c72ac986009e38', async (compWhale) => { + await whileImpersonating(hre, '0x73AF3bcf944a6559933396c1577B257e2054D935', async (compWhale) => { await compContract.connect(compWhale).transfer(rsrTrader.address, fp('1e5')) }) diff --git a/tasks/testing/upgrade-checker-utils/rtokens.ts b/tasks/testing/upgrade-checker-utils/rtokens.ts index 8b76df7908..fc43009e4a 100644 --- a/tasks/testing/upgrade-checker-utils/rtokens.ts +++ b/tasks/testing/upgrade-checker-utils/rtokens.ts @@ -3,13 +3,13 @@ import { ONE_PERIOD, TradeKind } from '#/common/constants' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { BigNumber, ContractFactory } from 'ethers' import { formatEther } from 'ethers/lib/utils' -import { advanceTime } from '#/utils/time' +import { advanceBlocks, advanceTime } from '#/utils/time' import { fp } from '#/common/numbers' import { HardhatRuntimeEnvironment } from 'hardhat/types' import { callAndGetNextTrade, runBatchTrade, runDutchTrade } from './trades' import { CollateralStatus } from '#/common/constants' -import { FacadeAct } from '@typechain/FacadeAct' -import { FacadeRead } from '@typechain/FacadeRead' +import { ActFacet } from '@typechain/ActFacet' +import { ReadFacet } from '@typechain/ReadFacet' type Balances = { [key: string]: BigNumber } @@ -91,9 +91,9 @@ export const customRedeemRTokens = async ( console.log(`\nCustom Redeeming ${formatEther(redeemAmount)}...`) const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const FacadeReadFactory: ContractFactory = await hre.ethers.getContractFactory('FacadeRead') - const facadeRead = await FacadeReadFactory.deploy() - const redeemQuote = await facadeRead.callStatic.redeemCustom( + const ReadFacetFactory: ContractFactory = await hre.ethers.getContractFactory('ReadFacet') + const readFacet = await ReadFacetFactory.deploy() + const redeemQuote = await readFacet.callStatic.redeemCustom( rToken.address, redeemAmount, [basketNonce], @@ -118,7 +118,7 @@ export const customRedeemRTokens = async ( [basketNonce], [fp('1')], expectedTokens, - expectedQuantities.map((q) => q.mul(99).div(100)) + expectedQuantities.map((q: BigNumber) => q.mul(99).div(100)) ) const postRedeemRTokenBal = await rToken.balanceOf(user.address) const postRedeemErc20Bals = await getAccountBalances(hre, user.address, expectedTokens) @@ -158,7 +158,8 @@ export const recollateralize = async ( } const recollateralizeBatch = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { - console.log(`\n\n* * * * * Recollateralizing (Batch) RToken ${rtokenAddress}...`) + console.log(`* * * * * Recollateralizing (Batch) RToken ${rtokenAddress}...`) + const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const backingManager = await hre.ethers.getContractAt( @@ -170,9 +171,9 @@ const recollateralizeBatch = async (hre: HardhatRuntimeEnvironment, rtokenAddres await main.basketHandler() ) - // Deploy FacadeAct - const FacadeActFactory: ContractFactory = await hre.ethers.getContractFactory('FacadeAct') - const facadeAct = await FacadeActFactory.deploy() + // Deploy ActFacet + const FacadeActFactory: ContractFactory = await hre.ethers.getContractFactory('ActFacet') + const facadeAct = await FacadeActFactory.deploy() // Move post trading delay await advanceTime(hre, (await backingManager.tradingDelay()) + 1) @@ -211,7 +212,10 @@ const recollateralizeBatch = async (hre: HardhatRuntimeEnvironment, rtokenAddres } const recollateralizeDutch = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { - console.log(`\n\n* * * * * Recollateralizing (Dutch) RToken ${rtokenAddress}...`) + console.log('*') + console.log(`* * * * * Recollateralizing RToken (Dutch): ${rtokenAddress}...`) + console.log('*') + const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) @@ -224,11 +228,8 @@ const recollateralizeDutch = async (hre: HardhatRuntimeEnvironment, rtokenAddres await main.basketHandler() ) - // Move post trading delay - await advanceTime(hre, (await backingManager.tradingDelay()) + 1) - let tradesRemain = false - let sellToken: string = '' + let sellToken = '' const [newTradeCreated, initialSellToken] = await callAndGetNextTrade( backingManager.rebalance(TradeKind.DUTCH_AUCTION), @@ -241,7 +242,8 @@ const recollateralizeDutch = async (hre: HardhatRuntimeEnvironment, rtokenAddres while (tradesRemain) { ;[tradesRemain, sellToken] = await runDutchTrade(hre, backingManager, sellToken) - await advanceTime(hre, ONE_PERIOD.toString()) + + await advanceBlocks(hre, 1) } } diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index 6069ca478e..aa09ec6d6e 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -1,6 +1,7 @@ -import { QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' +import { MAX_UINT256, QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' import { bn, fp } from '#/common/numbers' import { whileImpersonating } from '#/utils/impersonation' +import { networkConfig } from '../../../common/configuration' import { advanceBlocks, advanceTime, @@ -35,7 +36,9 @@ export const runBatchTrade = async ( } const buyTokenAddress = await trade.buy() - console.log(`Running trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...`) + console.log( + `Running batch trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...` + ) const endTime = await trade.endTime() const worstPrice = await trade.worstCasePrice() // trade.buy() per trade.sell() const auctionId = await trade.auctionId() @@ -91,8 +94,8 @@ export const runDutchTrade = async ( // buy & sell are from the perspective of the auction-starter // bid() flips it to be from the perspective of the trader - let tradesRemain: boolean = false - let newSellToken: string = '' + let tradesRemain = false + let newSellToken = '' const tradeAddr = await trader.trades(tradeToken) const trade = await hre.ethers.getContractAt('DutchTrade', tradeAddr) @@ -103,32 +106,42 @@ export const runDutchTrade = async ( } const buyTokenAddress = await trade.buy() - console.log(`Running trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...`) + console.log('=========') + console.log( + `Running Dutch Trade: Selling ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...` + ) const endBlock = await trade.endBlock() - const whaleAddr = whales[buyTokenAddress.toLowerCase()] + const [tester] = await hre.ethers.getSigners() // Bid close to end block - await advanceBlocks(hre, endBlock.sub(await getLatestBlockNumber(hre)).sub(5)) + await advanceBlocks(hre, endBlock.sub(await getLatestBlockNumber(hre)).sub(20)) const buyAmount = await trade.bidAmount(await getLatestBlockNumber(hre)) // Ensure funds available - await getTokens(hre, buyTokenAddress, buyAmount, whaleAddr) + await getTokens(hre, buyTokenAddress, buyAmount, tester.address) - await whileImpersonating(hre, whaleAddr, async (whale) => { - const sellToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) - // Bid + const buyToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) + await buyToken.connect(tester).approve(router.address, MAX_UINT256) - ;[tradesRemain, newSellToken] = await callAndGetNextTrade( - router.bid(trade.address, await router.signer.getAddress()), - trader - ) - }) + // Bid + ;[tradesRemain, newSellToken] = await callAndGetNextTrade( + router.bid(trade.address, await router.signer.getAddress()), + trader + ) + + console.log( + 'Trade State:', + TradeStatus[await trade.status()], + await trade.canSettle(), + await trade.bidder(), + tester.address + ) if ( (await trade.canSettle()) || (await trade.status()) != TradeStatus.CLOSED || - (await trade.bidder()) != whaleAddr + (await trade.bidder()) != router.address ) { throw new Error(`Error settling Dutch Trade`) } @@ -143,26 +156,34 @@ export const callAndGetNextTrade = async ( tx: Promise, trader: TestITrading ): Promise<[boolean, string]> => { - let tradesRemain: boolean = false - let newSellToken: string = '' + let tradesRemain = false + let newSellToken = '' // Process transaction and get next trade const r = await tx const resp = await r.wait() - const iface: Interface = trader.interface + const iface = trader.interface + for (const event of resp.events!) { let parsedLog: LogDescription | undefined try { parsedLog = iface.parseLog(event) + // eslint-disable-next-line no-empty } catch {} + if (parsedLog && parsedLog.name == 'TradeStarted') { + // TODO: Improve this to include proper token details and parsing. + console.log( - `\n====== Trade Started: sell ${logToken(parsedLog.args.sell)} / buy ${logToken( + ` + ====== Trade Started: Selling ${logToken(parsedLog.args.sell)} / Buying ${logToken( parsedLog.args.buy - )} ======\n\tmbuyAmount: ${parsedLog.args.minBuyAmount}\n\tsellAmount: ${ - parsedLog.args.sellAmount - }` + )} ====== + minBuyAmount: ${parsedLog.args.minBuyAmount} + sellAmount: ${parsedLog.args.sellAmount} + `.trim() ) + tradesRemain = true newSellToken = parsedLog.args.sell } @@ -170,6 +191,7 @@ export const callAndGetNextTrade = async ( return [tradesRemain, newSellToken] } + // impersonate the whale to provide the required tokens to recipient export const getTokens = async ( hre: HardhatRuntimeEnvironment, @@ -177,6 +199,7 @@ export const getTokens = async ( amount: BigNumber, recipient: string ) => { + console.log('Acquiring tokens...', tokenAddress) switch (tokenAddress) { case '0x60C384e226b120d93f3e0F4C502957b2B9C32B15': // saUSDC case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9': // saUSDT @@ -283,7 +306,64 @@ const getERC20Tokens = async ( recipient: string ) => { const token = await hre.ethers.getContractAt('ERC20Mock', tokenAddress) - await whileImpersonating(hre, whales[token.address.toLowerCase()], async (whaleSigner) => { - await token.connect(whaleSigner).transfer(recipient, amount) - }) + + // special-cases for wrappers with 0 supply + const wcUSDCv3 = await hre.ethers.getContractAt( + 'CusdcV3Wrapper', + '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A' + ) + const saEthUSDC = await hre.ethers.getContractAt( + 'IStaticATokenV3LM', + networkConfig['1'].tokens.saEthUSDC! + ) + const saEthPyUSD = await hre.ethers.getContractAt( + 'IStaticATokenV3LM', + networkConfig['1'].tokens.saEthPyUSD! + ) + + if (tokenAddress == wcUSDCv3.address) { + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.cUSDCv3!.toLowerCase()], + async (whaleSigner) => { + const cUSDCv3 = await hre.ethers.getContractAt( + 'ERC20Mock', + networkConfig['1'].tokens.cUSDCv3! + ) + await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, 0) + await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, MAX_UINT256) + await wcUSDCv3.connect(whaleSigner).deposit(amount.mul(2)) + const bal = await wcUSDCv3.balanceOf(whaleSigner.address) + await wcUSDCv3.connect(whaleSigner).transfer(recipient, bal) + } + ) + } else if (tokenAddress == saEthUSDC.address) { + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.USDC!.toLowerCase()], + async (whaleSigner) => { + const USDC = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.USDC!) + await USDC.connect(whaleSigner).approve(saEthUSDC.address, amount.mul(2)) + await saEthUSDC.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address, 0, true) + await token.connect(whaleSigner).transfer(recipient, amount) // saEthUSDC transfer + } + ) + } else if (tokenAddress == saEthPyUSD.address) { + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.pyUSD!.toLowerCase()], + async (whaleSigner) => { + const pyUSD = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.pyUSD!) + await pyUSD.connect(whaleSigner).approve(saEthPyUSD.address, amount.mul(2)) + await saEthPyUSD.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address, 0, true) + await token.connect(whaleSigner).transfer(recipient, amount) // saEthPyUSD transfer + } + ) + } else { + const addr = whales[token.address.toLowerCase()] + if (!addr) throw new Error('missing whale for ' + tokenAddress) + await whileImpersonating(hre, whales[token.address.toLowerCase()], async (whaleSigner) => { + await token.connect(whaleSigner).transfer(recipient, amount) + }) + } } diff --git a/tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts b/tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts new file mode 100644 index 0000000000..93cdc5ce88 --- /dev/null +++ b/tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts @@ -0,0 +1,207 @@ +import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { expect } from 'chai' +import { ProposalBuilder, buildProposal } from '../governance' +import { Proposal } from '#/utils/subgraph' +import { networkConfig } from '#/common/configuration' +import { bn, fp, toBNDecimals } from '#/common/numbers' +import { CollateralStatus, TradeKind, ZERO_ADDRESS } from '#/common/constants' +import { setOraclePrice } from '../oracles' +import { whileImpersonating } from '#/utils/impersonation' +import { whales } from '../constants' +import { getTokens, runDutchTrade } from '../trades' +import { + advanceTime, + advanceToTimestamp, + getLatestBlockTimestamp, + setNextBlockTimestamp, +} from '#/utils/time' + +export default async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string, + governorAddress: string +) => { + console.log('\n* * * * * Run checks for release 3.3.0...') + const [tester] = await hre.ethers.getSigners() + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const timelockAddress = await governor.timelock() + const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) + + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) + + console.log('\n3.3.0 check succeeded!') +} + +const saUSDTCollateralAddr = '0x8AD3055286f4E59B399616Bd6BEfE24F64573928' +const saUSDCCollateralAddr = '0x6E14943224d6E4F7607943512ba17DbBA9524B8e' +const saEthUSDCCollateralAddr = '0x05beee046A5C28844804E679aD5587046dBffbc0' +const wcUSDCv3CollateralAddr = '0xf0Fb23485057Fd88C80B9CEc8b433FdA47e0a07A' +const cUSDTCollateralAddr = '0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8' +const saEthPyUSDCollateralAddr = '0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7' +const TUSDCollateralAddr = '0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2' +const cUSDCVaultCollateralAddr = '0x50a9d529ea175cde72525eaa809f5c3c47daa1bb' +const cUSDTVaultCollateralAddr = '0x5757fF814da66a2B4f9D11d48570d742e246CfD9' + +const saEthUSDCERC20Addr = '0x093cB4f405924a0C468b43209d5E466F1dd0aC7d' +const wcUSDCv3ERC20Addr = '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A' +const cUSDTVaultERC20Addr = '0x4Be33630F92661afD646081BC29079A38b879aA0' +const saUSDTERC20Addr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' +const cUSDTERC20Addr = '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9' +const saEthPyUSDERC20Addr = '0x8d6E0402A3E3aD1b43575b05905F9468447013cF' + +const batchTradeImplAddr = '0x803a52c5DAB69B78419bb160051071eF2F9Fd227' +const dutchTradeImplAddr = '0x4eDEb80Ce684A890Dd58Ae0d9762C38731b11b99' + +export const proposal_3_3_0_step_1: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string +): Promise => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + + // Build proposal + const txs = [ + await broker.populateTransaction.setDutchTradeImplementation(dutchTradeImplAddr), + await broker.populateTransaction.setBatchTradeImplementation(batchTradeImplAddr), + await assetRegistry.populateTransaction.swapRegistered(saUSDTCollateralAddr), + await assetRegistry.populateTransaction.swapRegistered(saUSDCCollateralAddr), + await assetRegistry.populateTransaction.register(saEthUSDCCollateralAddr), + await assetRegistry.populateTransaction.register(wcUSDCv3CollateralAddr), + await assetRegistry.populateTransaction.register(cUSDTCollateralAddr), + await assetRegistry.populateTransaction.register(saEthPyUSDCollateralAddr), + await basketHandler.populateTransaction.setPrimeBasket( + [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTVaultERC20Addr, saUSDTERC20Addr], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ), + await basketHandler.populateTransaction.refreshBasket(), + await rToken.populateTransaction.setRedemptionThrottleParams({ + amtRate: bn('25e23'), + pctRate: bn('125000000000000000'), + }), + ] + + const description = 'Step 1/4 of eUSD 3.3.0 plugin upgrade.' + + return buildProposal(txs, description) +} + +export const proposal_3_3_0_step_2: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string +): Promise => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + + // Build proposal + const txs = [ + await basketHandler.populateTransaction.setPrimeBasket( + [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTERC20Addr, saUSDTERC20Addr], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ), + await basketHandler.populateTransaction.refreshBasket(), + ] + + const description = 'Step 2/4 of eUSD 3.3.0 plugin upgrade.' + + return buildProposal(txs, description) +} + +export const proposal_3_3_0_step_3: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string +): Promise => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + + // Build proposal + const txs = [ + await basketHandler.populateTransaction.setPrimeBasket( + [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTERC20Addr, saEthPyUSDERC20Addr], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ), + await basketHandler.populateTransaction.refreshBasket(), + ] + + const description = 'Step 3/4 of eUSD 3.3.0 plugin upgrade.' + + return buildProposal(txs, description) +} + +export const proposal_3_3_0_step_4: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string +): Promise => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + + // Build proposal + const txs = [ + await rToken.populateTransaction.setIssuanceThrottleParams({ + amtRate: bn('2e24'), + pctRate: bn('100000000000000000'), + }), + await basketHandler.populateTransaction.setBackupConfig( + '0x5553440000000000000000000000000000000000000000000000000000000000', + bn('2000000000000000000'), + [ + '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', + '0xdac17f958d2ee523a2206206994597c13d831ec7', + '0x8e870d67f660d95d5be530380d0ec0bd388289e1', + '0x6b175474e89094c44da98b954eedeac495271d0f', + ] + ), + await assetRegistry.populateTransaction.unregister(TUSDCollateralAddr), + await assetRegistry.populateTransaction.unregister(cUSDCVaultCollateralAddr), + await assetRegistry.populateTransaction.unregister(cUSDTVaultCollateralAddr), + await assetRegistry.populateTransaction.unregister(saUSDCCollateralAddr), + await assetRegistry.populateTransaction.unregister(saUSDTCollateralAddr), + ] + + const description = 'Step 4/4 of eUSD 3.3.0 plugin upgrade.' + + return buildProposal(txs, description) +} diff --git a/tasks/testing/upgrade-checker.ts b/tasks/testing/upgrade-checker.ts index 0cc0f5436d..a1615c6bc4 100644 --- a/tasks/testing/upgrade-checker.ts +++ b/tasks/testing/upgrade-checker.ts @@ -4,27 +4,29 @@ import { getChainId } from '../../common/blockchain-utils' import { whileImpersonating } from '#/utils/impersonation' import { useEnv } from '#/utils/env' import { expect } from 'chai' -import { resetFork } from '#/utils/chain' -import { bn, fp } from '#/common/numbers' -import { TradeKind } from '#/common/constants' +import { fp } from '#/common/numbers' +import { MAX_UINT256, TradeKind } from '#/common/constants' import { formatEther, formatUnits } from 'ethers/lib/utils' -import { pushOraclesForward } from './upgrade-checker-utils/oracles' -import { - recollateralize, - redeemRTokens, - customRedeemRTokens, -} from './upgrade-checker-utils/rtokens' +import { recollateralize, redeemRTokens } from './upgrade-checker-utils/rtokens' import { claimRsrRewards } from './upgrade-checker-utils/rewards' import { whales } from './upgrade-checker-utils/constants' -import runChecks3_0_0, { proposal_3_0_0 } from './upgrade-checker-utils/upgrades/3_0_0' +import runChecks3_3_0, { + proposal_3_3_0_step_1, + proposal_3_3_0_step_2, + proposal_3_3_0_step_3, + proposal_3_3_0_step_4, +} from './upgrade-checker-utils/upgrades/3_3_0_plugins' import { - passAndExecuteProposal, + passProposal, + executeProposal, proposeUpgrade, stakeAndDelegateRsr, + moveProposalToActive, + voteProposal, } from './upgrade-checker-utils/governance' -import { advanceBlocks, advanceTime, getLatestBlockNumber } from '#/utils/time' +import { advanceTime, getLatestBlockNumber } from '#/utils/time' -// run script for eUSD (version 3.0.0) +// run script for eUSD (version 3.3.0) // npx hardhat upgrade-checker --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --governor 0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6 /* @@ -42,14 +44,17 @@ import { advanceBlocks, advanceTime, getLatestBlockNumber } from '#/utils/time' 21-34 more points of work to make this more generic */ -task('upgrade-checker', 'Mints all the tokens to an address') +interface Params { + rtoken: string + governor: string + proposalId?: string +} + +task('upgrade-checker', 'Runs a proposal and confirms can fully rebalance + redeem + mint') .addParam('rtoken', 'the address of the RToken being upgraded') .addParam('governor', 'the address of the OWNER of the RToken being upgraded') - .addOptionalParam('proposalid', 'the ID of the governance proposal', undefined) - .setAction(async (params, hre) => { - await resetFork(hre, Number(useEnv('FORK_BLOCK'))) - const [tester] = await hre.ethers.getSigners() - + .addOptionalParam('proposalId', 'the ID of the governance proposal', undefined) + .setAction(async (params: Params, hre) => { const chainId = await getChainId(hre) // make sure config exists @@ -63,30 +68,112 @@ task('upgrade-checker', 'Mints all the tokens to an address') } // make sure subgraph is configured - if (!useEnv('SUBGRAPH_URL')) { + if (params.proposalId && !useEnv('SUBGRAPH_URL')) { throw new Error('SUBGRAPH_URL required for subgraph queries') } - console.log(`starting at block ${await getLatestBlockNumber(hre)}`) + console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) - // 1. Approve and execute the governance proposal - if (!params.proposalid) { - const proposal = await proposeUpgrade(hre, params.rtoken, params.governor, proposal_3_0_0) + await hre.run('propose', { + step: '1', + rtoken: params.rtoken, + governor: params.governor, + }) - await passAndExecuteProposal( - hre, - params.rtoken, - params.governor, - proposal.proposalId!, - proposal - ) - } else { - await passAndExecuteProposal(hre, params.rtoken, params.governor, params.proposalid) + await hre.run('recollateralize', { + rtoken: params.rtoken, + governor: params.governor, + }) + + await hre.run('propose', { + step: '2', + rtoken: params.rtoken, + governor: params.governor, + }) + + await hre.run('recollateralize', { + rtoken: params.rtoken, + governor: params.governor, + }) + + await hre.run('propose', { + step: '3', + rtoken: params.rtoken, + governor: params.governor, + }) + + await hre.run('recollateralize', { + rtoken: params.rtoken, + governor: params.governor, + }) + + await hre.run('propose', { + step: '4', + rtoken: params.rtoken, + governor: params.governor, + }) + + const rToken = await hre.ethers.getContractAt('IRToken', params.rtoken) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'IAssetRegistry', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'IBasketHandler', + await main.basketHandler() + ) + await assetRegistry.refresh() + if (!((await basketHandler.status()) == 0)) throw new Error('Basket is not SOUND') + if (!(await basketHandler.fullyCollateralized())) { + throw new Error('Basket is not fully collateralized') } + console.log('Basket is SOUND and fully collateralized!') + }) - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, params.rtoken) +interface ProposeParams { + step: string + rtoken: string + governor: string + proposalId?: string +} +task('propose', 'propose a gov action') + .addParam('step', 'the step of the proposal') + .addParam('rtoken', 'the address of the RToken being upgraded') + .addParam('governor', 'the address of the OWNER of the RToken being upgraded') + .setAction(async (params: ProposeParams, hre) => { + const stepFunction = (() => { + console.log(`=========================== STEP ${params.step} ===============================`) + if (params.step === '1') { + return proposal_3_3_0_step_1 + } + if (params.step === '2') { + return proposal_3_3_0_step_2 + } + if (params.step === '3') { + return proposal_3_3_0_step_3 + } + if (params.step === '4') { + return proposal_3_3_0_step_4 + } + + throw Error('Invalid step') + })() + + const proposal = await proposeUpgrade(hre, params.rtoken, params.governor, stepFunction) + + await moveProposalToActive(hre, params.rtoken, params.governor, proposal.proposalId) + await voteProposal(hre, params.rtoken, params.governor, proposal.proposalId) + await passProposal(hre, params.rtoken, params.governor, proposal.proposalId) + await executeProposal(hre, params.rtoken, params.governor, proposal.proposalId, proposal) + }) + +task('recollateralize') + .addParam('rtoken', 'the address of the RToken being upgraded') + .addParam('governor', 'the address of the OWNER of the RToken being upgraded') + .setAction(async (params: Params, hre) => { + const [tester] = await hre.ethers.getSigners() const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) // 2. Bring back to fully collateralized @@ -99,143 +186,79 @@ task('upgrade-checker', 'Mints all the tokens to an address') 'BackingManagerP1', await main.backingManager() ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + // const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - // Move past trading delay - await advanceTime(hre, (await backingManager.tradingDelay()) + 1) - - await recollateralize( - hre, - rToken.address, - (await broker.dutchAuctionLength()) > 0 ? TradeKind.DUTCH_AUCTION : TradeKind.BATCH_AUCTION - ) - - // 3. Run various checks - const saUsdtAddress = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase() - const saUsdcAddress = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase() - const usdtAddress = networkConfig['1'].tokens.USDT! - const usdcAddress = networkConfig['1'].tokens.USDC! - const cUsdtAddress = networkConfig['1'].tokens.cUSDT! - const cUsdcAddress = networkConfig['1'].tokens.cUSDC! - const cUsdtVaultAddress = '0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase() - const cUsdcVaultAddress = '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase() - /* - - mint - - this is another area that needs to be made general - for now, we just want to be able to test eUSD, so minting and redeeming eUSD is fine - + recollateralize */ + await advanceTime(hre, (await backingManager.tradingDelay()) + 1) + await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION).catch((e: Error) => { + if (e.message.includes('already collateralized')) { + console.log('Already Collateralized!') - const initialBal = bn('2e11') - const issueAmount = fp('1e5') - const usdt = await hre.ethers.getContractAt('ERC20Mock', usdtAddress) - const usdc = await hre.ethers.getContractAt('ERC20Mock', usdcAddress) - const saUsdt = await hre.ethers.getContractAt('StaticATokenLM', saUsdtAddress) - const cUsdt = await hre.ethers.getContractAt('ICToken', cUsdtAddress) - const cUsdtVault = await hre.ethers.getContractAt('CTokenWrapper', cUsdtVaultAddress) - const saUsdc = await hre.ethers.getContractAt('StaticATokenLM', saUsdcAddress) - const cUsdc = await hre.ethers.getContractAt('ICToken', cUsdcAddress) - const cUsdcVault = await hre.ethers.getContractAt('CTokenWrapper', cUsdcVaultAddress) - - // get saUsdt - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDT!.toLowerCase()], - async (usdtSigner) => { - await usdt.connect(usdtSigner).approve(saUsdt.address, initialBal) - await saUsdt.connect(usdtSigner).deposit(tester.address, initialBal, 0, true) + return } - ) - const saUsdtBal = await saUsdt.balanceOf(tester.address) - await saUsdt.connect(tester).approve(rToken.address, saUsdtBal) - // get cUsdtVault + throw e + }) + if (!(await basketHandler.fullyCollateralized())) throw new Error('Failed to recollateralize') + + // Give `tester` RTokens from Base bridge + const redeemAmt = fp('1e3') await whileImpersonating( hre, - whales[networkConfig['1'].tokens.USDT!.toLowerCase()], - async (usdtSigner) => { - await usdt.connect(usdtSigner).approve(cUsdt.address, initialBal) - await cUsdt.connect(usdtSigner).mint(initialBal) - const bal = await cUsdt.balanceOf(usdtSigner.address) - await cUsdt.connect(usdtSigner).approve(cUsdtVault.address, bal) - await cUsdtVault.connect(usdtSigner).deposit(bal, tester.address) + '0x3154Cf16ccdb4C6d922629664174b904d80F2C35', // base bridge address on mainnet + async (baseBridge) => { + await rToken.connect(baseBridge).transfer(tester.address, redeemAmt) } ) + if (!(await rToken.balanceOf(tester.address)).gte(redeemAmt)) throw new Error('missing R') - const cUsdtVaultBal = await cUsdtVault.balanceOf(tester.address) - await cUsdtVault.connect(tester).approve(rToken.address, cUsdtVaultBal) + /* + redeem + */ + await redeemRTokens(hre, tester, params.rtoken, redeemAmt) - // get saUsdc - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDC!.toLowerCase()], - async (usdcSigner) => { - await usdc.connect(usdcSigner).approve(saUsdc.address, initialBal) - await saUsdc.connect(usdcSigner).deposit(tester.address, initialBal, 0, true) - } - ) - const saUsdcBal = await saUsdc.balanceOf(tester.address) - await saUsdc.connect(tester).approve(rToken.address, saUsdcBal) + // 3. Run the 3.0.0 checks + await runChecks3_3_0(hre, params.rtoken, params.governor) - // get cUsdcVault - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDC!.toLowerCase()], - async (usdcSigner) => { - await usdc.connect(usdcSigner).approve(cUsdc.address, initialBal) - await cUsdc.connect(usdcSigner).mint(initialBal) - const bal = await cUsdc.balanceOf(usdcSigner.address) - await cUsdc.connect(usdcSigner).approve(cUsdcVault.address, bal) - await cUsdcVault.connect(usdcSigner).deposit(bal, tester.address) - } - ) - const cUsdcVaultBal = await cUsdcVault.balanceOf(tester.address) - await cUsdcVault.connect(tester).approve(rToken.address, cUsdcVaultBal) + /* + mint + */ + + const issueAmt = redeemAmt.div(2) + console.log(`\nIssuing ${formatEther(issueAmt)} RTokens...`) + const [erc20s] = await basketHandler.quote(fp('1'), 0) + for (const e of erc20s) { + const erc20 = await hre.ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', + e + ) + await erc20.connect(tester).approve(rToken.address, MAX_UINT256) // max approval + } + const preBal = await rToken.balanceOf(tester.address) + await rToken.connect(tester).issue(issueAmt) - console.log(`\nIssuing ${formatEther(issueAmount)} RTokens...`) - await rToken.connect(tester).issue(issueAmount) const postIssueBal = await rToken.balanceOf(tester.address) - if (!postIssueBal.eq(issueAmount)) { + if (!postIssueBal.eq(preBal.add(issueAmt))) { throw new Error( `Did not issue the correct amount of RTokens. wanted: ${formatUnits( - issueAmount, + preBal.add(issueAmt), 'mwei' )} balance: ${formatUnits(postIssueBal, 'mwei')}` ) } - console.log('successfully minted RTokens') + console.log('Successfully minted RTokens') /* - - redeem - - */ - const redeemAmount = fp('5e4') - await redeemRTokens(hre, tester, params.rtoken, redeemAmount) - - // 3. Run the 3.0.0 checks - await pushOraclesForward(hre, params.rtoken) - await runChecks3_0_0(hre, params.rtoken, params.governor) - - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, params.rtoken) - - /* - claim rewards - */ await claimRsrRewards(hre, params.rtoken) /* - staking/unstaking - */ // get RSR @@ -251,60 +274,44 @@ task('upgrade-checker', 'Mints all the tokens to an address') const balPrevRSR = await rsr.balanceOf(stRSR.address) const balPrevStRSR = await stRSR.balanceOf(tester.address) + const testerBal = await rsr.balanceOf(tester.address) await stakeAndDelegateRsr(hre, rToken.address, tester.address) - expect(await rsr.balanceOf(stRSR.address)).to.equal(balPrevRSR.add(stakeAmount)) + expect(await rsr.balanceOf(stRSR.address)).to.equal(balPrevRSR.add(testerBal)) expect(await stRSR.balanceOf(tester.address)).to.be.gt(balPrevStRSR) + }) - /* - - switch basket and recollateralize - using Batch Auctions - Also check for custom redemption +task('eusd-q1-2024-test', 'Test deployed eUSD Proposals').setAction(async (_, hre) => { + console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) - */ + const RTokenAddress = '0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f' + const RTokenGovernor = '0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6' - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, params.rtoken) - - const bas = await basketHandler.getPrimeBasket() - console.log(bas.erc20s) - - const prevNonce = await basketHandler.nonce() - const governor = await hre.ethers.getContractAt('Governance', params.governor) - const timelockAddress = await governor.timelock() - await whileImpersonating(hre, timelockAddress, async (tl) => { - await basketHandler - .connect(tl) - .setPrimeBasket([saUsdtAddress, cUsdtVaultAddress], [fp('0.5'), fp('0.5')]) - await basketHandler.connect(tl).refreshBasket() - const tradingDelay = await backingManager.tradingDelay() - await advanceBlocks(hre, tradingDelay / 12 + 1) - await advanceTime(hre, tradingDelay + 1) - }) + const ProposalIdOne = + '114052081659629247617665835769035094910371266951213483500173240902265689564540' + const ProposalIdTwo = + '84013999114211651083886802889501217056607481369823717462033802424606122383108' - const b = await basketHandler.getPrimeBasket() - console.log(b.erc20s) + // Make sure both proposals are active. + await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - /* - custom redemption - */ - // Cannot do normal redeem - expect(await basketHandler.fullyCollateralized()).to.equal(false) - await expect(rToken.connect(tester).redeem(redeemAmount)).to.be.revertedWith( - 'partial redemption; use redeemCustom' - ) + await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - // Do custom redemption on previous basket - await customRedeemRTokens(hre, tester, params.rtoken, prevNonce, redeemAmount) + await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - // Recollateralize using Batch auctions - await recollateralize(hre, rToken.address, TradeKind.BATCH_AUCTION) + await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await hre.run('recollateralize', { + rtoken: RTokenAddress, + governor: RTokenGovernor, }) -task('propose', 'propose a gov action') - .addParam('rtoken', 'the address of the RToken being upgraded') - .addParam('governor', 'the address of the OWNER of the RToken being upgraded') - .setAction(async (params, hre) => { - await proposeUpgrade(hre, params.rtoken, params.governor, proposal_3_0_0) + await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) + await hre.run('recollateralize', { + rtoken: RTokenAddress, + governor: RTokenGovernor, }) +}) diff --git a/test/plugins/individual-collateral/morpho-aave/constants.ts b/test/plugins/individual-collateral/morpho-aave/constants.ts index 4c485c3e5d..f8435cdbee 100644 --- a/test/plugins/individual-collateral/morpho-aave/constants.ts +++ b/test/plugins/individual-collateral/morpho-aave/constants.ts @@ -7,4 +7,4 @@ export const ORACLE_ERROR = fp('0.0025') export const DEFAULT_THRESHOLD = ORACLE_ERROR.add(fp('0.01')) // 1% + ORACLE_ERROR export const DELAY_UNTIL_DEFAULT = bn(86400) -export const FORK_BLOCK = 17528677 +export const FORK_BLOCK = 19400000 diff --git a/utils/subgraph.ts b/utils/subgraph.ts index 76cd7b6a4b..d057660ff1 100644 --- a/utils/subgraph.ts +++ b/utils/subgraph.ts @@ -1,4 +1,3 @@ -// @ts-nocheck import { BigNumber, BigNumberish } from 'ethers' import { gql, GraphQLClient } from 'graphql-request' import { useEnv } from './env' @@ -25,6 +24,7 @@ export const getDelegates = async (governance: string): Promise> } ` const whales = await client.request(query, { governance }) + // @ts-expect-error Subgraphs are bad return whales.delegates } @@ -53,5 +53,6 @@ export const getProposalDetails = async (proposalId: string): Promise } ` const prop = await client.request(query, { id: proposalId }) + // @ts-expect-error Subgraphs are bad return prop.proposal } diff --git a/utils/time.ts b/utils/time.ts index cb1ffa1578..73070c350c 100644 --- a/utils/time.ts +++ b/utils/time.ts @@ -42,8 +42,9 @@ export const advanceBlocks = async (hre: HardhatRuntimeEnvironment, blocks: numb const newBlockString = blockString.slice(0, 2) + blockString.slice(3) blockString = newBlockString } - await hre.ethers.provider.send('hardhat_mine', [blockString]) - await hre.network.provider.send('hardhat_setNextBlockBaseFeePerGas', ['0x0']) // Temporary fix - Hardhat issue + + await hre.ethers.provider.send('hardhat_mine', [blockString, '0xc']) + // await hre.network.provider.send('hardhat_setNextBlockBaseFeePerGas', ['0x0']) // Temporary fix - Hardhat issue } export const advanceBlocksTenderly = async ( From 9fe318628cf55785295461b9e4611b14b62a19de Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 25 Mar 2024 16:09:10 -0400 Subject: [PATCH 241/450] Meta morpho scripts (#1098) --- scripts/deploy.ts | 6 +- .../collaterals/deploy_bbusdt.ts | 91 +++++++++++++++++++ .../collaterals/deploy_re7weth.ts | 91 +++++++++++++++++++ .../collaterals/deploy_steakpyusd.ts | 91 +++++++++++++++++++ .../collaterals/deploy_steakusdc.ts | 91 +++++++++++++++++++ .../collateral-plugins/verify_re7weth.ts | 60 ++++++++++++ .../collateral-plugins/verify_steakusdc.ts | 60 ++++++++++++ scripts/verify_etherscan.ts | 4 +- 8 files changed, 492 insertions(+), 2 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts create mode 100644 scripts/verification/collateral-plugins/verify_re7weth.ts create mode 100644 scripts/verification/collateral-plugins/verify_steakusdc.ts diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 8cf827c408..3e0aeaa224 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -72,7 +72,11 @@ async function main() { 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts', 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts', 'phase2-assets/collaterals/deploy_sfrax.ts', - 'phase2-assets/collaterals/deploy_sfrax_eth.ts' + 'phase2-assets/collaterals/deploy_sfrax_eth.ts', + 'phase2-assets/collaterals/deploy_steakusdc.ts', + 'phase2-assets/collaterals/deploy_steakpyusd.ts', + 'phase2-assets/collaterals/deploy_bbusdt.ts', + 'phase2-assets/collaterals/deploy_re7weth.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts b/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts new file mode 100644 index 0000000000..034a22aa52 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts @@ -0,0 +1,91 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { + USDT_ORACLE_TIMEOUT, + USDT_ORACLE_ERROR, + USDT_USD_FEED, + PRICE_TIMEOUT, + DELAY_UNTIL_DEFAULT, +} from '../../../../test/plugins/individual-collateral/meta-morpho/constants' +import { MetaMorphoFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy MetaMorpho Flagship USDT - bbUSDT **************************/ + + const MetaMorphoFiatCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'MetaMorphoFiatCollateral' + ) + + const collateral = await MetaMorphoFiatCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: USDT_USD_FEED, + oracleError: USDT_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.bbUSDT, + maxTradeVolume: fp('0.5e6').toString(), // $7.5m vault + oracleTimeout: USDT_ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: USDT_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6') // small admin fee uncertainty + ) + await collateral.deployed() + + console.log(`Deployed bbUSDT to ${hre.network.name} (${chainId}): ${collateral.address}`) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.bbUSDT = collateral.address + assetCollDeployments.erc20s.bbUSDT = networkConfig[chainId].tokens.bbUSDT + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts new file mode 100644 index 0000000000..717ae7d328 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts @@ -0,0 +1,91 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { + ETH_ORACLE_TIMEOUT, + ETH_ORACLE_ERROR, + ETH_USD_FEED, + PRICE_TIMEOUT, + DELAY_UNTIL_DEFAULT, +} from '../../../../test/plugins/individual-collateral/meta-morpho/constants' +import { MetaMorphoSelfReferentialCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy MetaMorpho RE7 Labs ETH - Re7WETH **************************/ + + const MetaMorphoFiatCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'MetaMorphoSelfReferentialCollateral' + ) + + const collateral = ( + await MetaMorphoFiatCollateralFactory.connect(deployer).deploy( + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: ETH_USD_FEED, + oracleError: ETH_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.Re7WETH, + maxTradeVolume: fp('1e6').toString(), // $12m vault + oracleTimeout: ETH_ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: ETH_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6') // small admin fee uncertainty + ) + ) + await collateral.deployed() + + console.log(`Deployed Re7WETH to ${hre.network.name} (${chainId}): ${collateral.address}`) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.Re7WETH = collateral.address + assetCollDeployments.erc20s.Re7WETH = networkConfig[chainId].tokens.Re7WETH + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts b/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts new file mode 100644 index 0000000000..f796086e9d --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts @@ -0,0 +1,91 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { + PYUSD_ORACLE_TIMEOUT, + PYUSD_ORACLE_ERROR, + PYUSD_USD_FEED, + PRICE_TIMEOUT, + DELAY_UNTIL_DEFAULT, +} from '../../../../test/plugins/individual-collateral/meta-morpho/constants' +import { MetaMorphoFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy MetaMorpho Steakhouse PYUSD - steakPYUSD **************************/ + + const MetaMorphoFiatCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'MetaMorphoFiatCollateral' + ) + + const collateral = await MetaMorphoFiatCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: PYUSD_USD_FEED, + oracleError: PYUSD_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.steakPYUSD, + maxTradeVolume: fp('0.25e6').toString(), // $1.7m vault + oracleTimeout: PYUSD_ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: PYUSD_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6') // small admin fee uncertainty + ) + await collateral.deployed() + + console.log(`Deployed steakPYUSD to ${hre.network.name} (${chainId}): ${collateral.address}`) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.steakPYUSD = collateral.address + assetCollDeployments.erc20s.steakPYUSD = networkConfig[chainId].tokens.steakPYUSD + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts new file mode 100644 index 0000000000..5d8ae1a02a --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts @@ -0,0 +1,91 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + USDC_USD_FEED, + PRICE_TIMEOUT, + DELAY_UNTIL_DEFAULT, +} from '../../../../test/plugins/individual-collateral/meta-morpho/constants' +import { MetaMorphoFiatCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy MetaMorpho Steakhouse USDC - steakUSDC **************************/ + + const MetaMorphoFiatCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'MetaMorphoFiatCollateral' + ) + + const collateral = await MetaMorphoFiatCollateralFactory.connect( + deployer + ).deploy( + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: USDC_USD_FEED, + oracleError: USDC_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.steakUSDC, + maxTradeVolume: fp('1e6').toString(), // 17m vault + oracleTimeout: USDC_ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: USDC_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6') // small admin fee uncertainty + ) + await collateral.deployed() + + console.log(`Deployed steakUSDC to ${hre.network.name} (${chainId}): ${collateral.address}`) + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + assetCollDeployments.collateral.steakUSDC = collateral.address + assetCollDeployments.erc20s.steakUSDC = networkConfig[chainId].tokens.steakUSDC + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_re7weth.ts b/scripts/verification/collateral-plugins/verify_re7weth.ts new file mode 100644 index 0000000000..8d695a08ec --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_re7weth.ts @@ -0,0 +1,60 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { + ETH_ORACLE_TIMEOUT, + ETH_ORACLE_ERROR, + ETH_USD_FEED, + PRICE_TIMEOUT, + DELAY_UNTIL_DEFAULT, +} from '../../../test/plugins/individual-collateral/meta-morpho/constants' +import { verifyContract } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify Re7WETH **************************/ + await verifyContract( + chainId, + deployments.collateral.Re7WETH, + [ + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: ETH_USD_FEED, + oracleError: ETH_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.Re7WETH, + maxTradeVolume: fp('1e6').toString(), + oracleTimeout: ETH_ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: ETH_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6'), // small admin fee uncertainty + ], + 'contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol:MetaMorphoSelfReferentialCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_steakusdc.ts b/scripts/verification/collateral-plugins/verify_steakusdc.ts new file mode 100644 index 0000000000..277f30b6af --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_steakusdc.ts @@ -0,0 +1,60 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + USDC_USD_FEED, + PRICE_TIMEOUT, + DELAY_UNTIL_DEFAULT, +} from '../../../test/plugins/individual-collateral/meta-morpho/constants' +import { verifyContract } from '../../deployment/utils' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify steakUSDC **************************/ + await verifyContract( + chainId, + deployments.collateral.steakUSDC, + [ + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: USDC_USD_FEED, + oracleError: USDC_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.steakUSDC, + maxTradeVolume: fp('1e6').toString(), + oracleTimeout: USDC_ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: USDC_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6'), // small admin fee uncertainty + ], + 'contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol:MetaMorphoFiatCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 13ddca24b3..36f8fdd53f 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -71,7 +71,9 @@ async function main() { 'collateral-plugins/verify_yearn_v2_curve_usdc.ts', 'collateral-plugins/verify_yearn_v2_curve_usdp.ts', 'collateral-plugins/verify_sfrax.ts', - 'collateral-plugins/verify_sfrax_eth.ts' + 'collateral-plugins/verify_sfrax_eth.ts', + 'collateral-plugins/verify_steakusdc.ts', + 'collateral-plugins/verify_re7weth.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains From 23918a77934babeda283e7748ca99be6271e366b Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 26 Mar 2024 21:35:40 +0530 Subject: [PATCH 242/450] Add Convex PayPool Plugin (#1090) Co-authored-by: Patrick McKelvy Co-authored-by: Taylor Brent --- common/configuration.ts | 1 + scripts/deploy.ts | 1 + .../deploy_convex_paypool_collateral.ts | 119 ++++++++++ .../verify_convex_paypool.ts | 92 ++++++++ scripts/verify_etherscan.ts | 1 + .../individual-collateral/curve/constants.ts | 12 + .../cvx/CvxStableTestSuite_PayPool.test.ts | 222 ++++++++++++++++++ 7 files changed, 448 insertions(+) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_paypool_collateral.ts create mode 100644 scripts/verification/collateral-plugins/verify_convex_paypool.ts create mode 100644 test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts diff --git a/common/configuration.ts b/common/configuration.ts index bac2248bf6..fcdc888a99 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -101,6 +101,7 @@ export interface IFeeds { export interface IPools { cvxCrvUSDUSDC?: string cvx3Pool?: string + cvxPayPool?: string cvxeUSDFRAXBP?: string cvxTriCrypto?: string cvxMIM3Pool?: string diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 98d7a66fa0..9c69d0f456 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -58,6 +58,7 @@ async function main() { 'phase2-assets/collaterals/deploy_flux_finance_collateral.ts', 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_3pool_collateral.ts', + 'phase2-assets/collaterals/deploy_convex_paypool_collateral.ts', 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_paypool_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_paypool_collateral.ts new file mode 100644 index 0000000000..4b62b240db --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_paypool_collateral.ts @@ -0,0 +1,119 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { CurveStableCollateral } from '../../../../typechain' +import { revenueHiding } from '../../utils' +import { + CurvePoolType, + pyUSD_ORACLE_ERROR, + pyUSD_ORACLE_TIMEOUT, + pyUSD_USD_FEED, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + PayPool, + PayPool_POOL_ID, + USDC_ORACLE_ERROR, + USDC_ORACLE_TIMEOUT, + USDC_USD_FEED, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// Convex Stable Plugin: paypool + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Convex Stable Pool for 3pool **************************/ + + const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + + const payPool = await ConvexStakingWrapperFactory.deploy() + await payPool.deployed() + await (await payPool.initialize(PayPool_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Stable PayPool on ${hre.network.name} (${chainId}): ${payPool.address} ` + ) + + const collateral = await CurveStableCollateralFactory.connect( + deployer + ).deploy( + { + erc20: payPool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: PayPool, + poolType: CurvePoolType.Plain, + feeds: [[pyUSD_USD_FEED], [USDC_USD_FEED]], + oracleTimeouts: [[pyUSD_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleErrors: [[pyUSD_ORACLE_ERROR], [USDC_ORACLE_ERROR]], + lpToken: PayPool, + } + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Convex Stable Collateral for PayPool to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.cvxPayPool = collateral.address + assetCollDeployments.erc20s.cvxPayPool = payPool.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_convex_paypool.ts b/scripts/verification/collateral-plugins/verify_convex_paypool.ts new file mode 100644 index 0000000000..dc0e00f0cd --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_convex_paypool.ts @@ -0,0 +1,92 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { bn } from '../../../common/numbers' +import { ONE_ADDRESS } from '../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' +import { + CurvePoolType, + pyUSD_ORACLE_ERROR, + pyUSD_ORACLE_TIMEOUT, + pyUSD_USD_FEED, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + PayPool, + USDC_ORACLE_ERROR, + USDC_ORACLE_TIMEOUT, + USDC_USD_FEED, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const w3PoolCollateral = await ethers.getContractAt( + 'CurveStableCollateral', + deployments.collateral.cvxPayPool as string + ) + + /******** Verify ConvexStakingWrapper **************************/ + + await verifyContract( + chainId, + await w3PoolCollateral.erc20(), + [], + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + ) + + /******** Verify PayPool plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxPayPool, + [ + { + erc20: await w3PoolCollateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: PayPool, + poolType: CurvePoolType.Plain, + feeds: [[pyUSD_USD_FEED], [USDC_USD_FEED]], + oracleTimeouts: [[pyUSD_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleErrors: [[pyUSD_ORACLE_ERROR], [USDC_ORACLE_ERROR]], + lpToken: PayPool, + }, + ], + 'contracts/plugins/assets/curve/CurveStableCollateral.sol:CurveStableCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index ef61b29d48..49344e9aa4 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -51,6 +51,7 @@ async function main() { scripts.push( 'collateral-plugins/verify_convex_crvusd_usdc.ts', 'collateral-plugins/verify_convex_3pool.ts', + 'collateral-plugins/verify_convex_paypool.ts', 'collateral-plugins/verify_convex_stable_metapool.ts', 'collateral-plugins/verify_convex_stable_rtoken_metapool.ts', 'collateral-plugins/verify_curve_stable.ts', diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index d561340a90..03b8cf1a3c 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -52,6 +52,11 @@ export const crvUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.crvUSD! export const crvUSD_ORACLE_TIMEOUT = bn('86400') export const crvUSD_ORACLE_ERROR = fp('0.005') +// pyUSD +export const pyUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.pyUSD! +export const pyUSD_ORACLE_TIMEOUT = bn('86400') +export const pyUSD_ORACLE_ERROR = fp('0.003') + // Tokens export const DAI = networkConfig['1'].tokens.DAI! export const USDC = networkConfig['1'].tokens.USDC! @@ -63,6 +68,7 @@ export const eUSD = networkConfig['1'].tokens.eUSD! export const WETH = networkConfig['1'].tokens.WETH! export const WBTC = networkConfig['1'].tokens.WBTC! export const crvUSD = networkConfig['1'].tokens.crvUSD! +export const pyUSD = networkConfig['1'].tokens.pyUSD! export const RSR = networkConfig['1'].tokens.RSR! export const CRV = networkConfig['1'].tokens.CRV! @@ -112,6 +118,12 @@ export const crvUSD_USDC_POOL_ID = 182 export const crvUSD_USDC_HOLDER = '0x95f00391cB5EebCd190EB58728B4CE23DbFa6ac1' export const crvUSD_USDC_GAUGE = '0x95f00391cB5EebCd190EB58728B4CE23DbFa6ac1' +// PayPool +export const PayPool = '0x383e6b4437b59fff47b619cba855ca29342a8559' +export const PayPool_POOL_ID = 270 +export const PayPool_HOLDER = '0x9da75997624C697444958aDeD6790bfCa96Af19A' +export const PayPool_GAUGE = '0x9da75997624c697444958aded6790bfca96af19a' + // Curve-specific export const CURVE_MINTER = '0xd061d61a4d941c39e5453435b6345dc261c2fce0' diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts new file mode 100644 index 0000000000..2ac9d95df7 --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts @@ -0,0 +1,222 @@ +import collateralTests from '../collateralTests' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, +} from '../pluginTestTypes' +import { mintWPool } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { + CurvePoolMock, + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../../typechain' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + CRV, + CVX, + USDC_USD_FEED, + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + CurvePoolType, + USDC, + pyUSD_USD_FEED, + PayPool, + pyUSD_ORACLE_TIMEOUT, + pyUSD_ORACLE_ERROR, + PayPool_POOL_ID, + pyUSD, + PayPool_HOLDER, +} from '../constants' +import { getResetFork } from '../../helpers' + +type Fixture = () => Promise + +export const defaultCvxStableCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: pyUSD_USD_FEED, // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: PayPool, + lpToken: PayPool, + poolType: CurvePoolType.Plain, + feeds: [[pyUSD_USD_FEED], [USDC_USD_FEED]], + oracleTimeouts: [[pyUSD_ORACLE_TIMEOUT], [USDC_ORACLE_TIMEOUT]], + oracleErrors: [[pyUSD_ORACLE_ERROR], [USDC_ORACLE_ERROR]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const pyUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapper = await wrapperFactory.deploy() + await wrapper.initialize(PayPool_POOL_ID) + + opts.feeds = [[pyUSDFeed.address], [usdcFeed.address]] + opts.erc20 = wrapper.address + } + + opts = { ...defaultCvxStableCollateralOpts, ...opts } + + const CvxStableCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'CurveStableCollateral' + ) + + const collateral = await CvxStableCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxStableCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const pyUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateralOpts.feeds = [[pyUSDFeed.address], [usdcFeed.address]] + + // Use mock curvePool seeded with initial balances + const CurvePoolMockFactory = await ethers.getContractFactory('CurvePoolMock') + const realCurvePool = await ethers.getContractAt('CurvePoolMock', PayPool) + const curvePool = ( + await CurvePoolMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + // Deploy Wrapper + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapper = await wrapperFactory.deploy() + await wrapper.initialize(PayPool_POOL_ID) + + collateralOpts.erc20 = wrapper.address + collateralOpts.curvePool = curvePool.address + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + const pyusd = await ethers.getContractAt('ERC20Mock', pyUSD) + + return { + alice, + collateral, + curvePool: curvePool, + wrapper: wrapper, + rewardTokens: [cvx, crv, pyusd], + poolTokens: [ + await ethers.getContractAt('ERC20Mock', pyUSD), + await ethers.getContractAt('ERC20Mock', USDC), + ], + feeds: [pyUSDFeed, usdcFeed], + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintWPool(ctx, amount, user, recipient, PayPool_HOLDER) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => {} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itHasRevenueHiding: it, + itClaimsRewards: it, + isMetapool: false, + resetFork: getResetFork(19287000), + collateralName: 'CurveStableCollateral - ConvexStakingWrapper (PayPool)', +} + +collateralTests(opts) From 18e851cdeb705e650be92e88bfc9aaeed3270bb1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 18 Mar 2024 15:17:12 -0400 Subject: [PATCH 243/450] initial import removals --- contracts/interfaces/IBackingManager.sol | 1 - contracts/interfaces/IBroker.sol | 1 + contracts/interfaces/IFacadeMonitor.sol | 1 + contracts/interfaces/IMain.sol | 4 ++-- contracts/interfaces/IRToken.sol | 4 +--- contracts/interfaces/IRevenueTrader.sol | 1 - contracts/interfaces/IRewardable.sol | 2 -- contracts/interfaces/IStRSR.sol | 1 - contracts/interfaces/ITrading.sol | 1 - contracts/mixins/ComponentRegistry.sol | 1 - contracts/p1/mixins/RecollateralizationLib.sol | 3 --- contracts/p1/mixins/TradeLib.sol | 3 --- 12 files changed, 5 insertions(+), 18 deletions(-) diff --git a/contracts/interfaces/IBackingManager.sol b/contracts/interfaces/IBackingManager.sol index b9b3c5beca..fef9a3491b 100644 --- a/contracts/interfaces/IBackingManager.sol +++ b/contracts/interfaces/IBackingManager.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "./IAssetRegistry.sol"; import "./IBasketHandler.sol"; -import "./IBroker.sol"; import "./IComponent.sol"; import "./IRToken.sol"; import "./IStRSR.sol"; diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index fcaeac2c10..f1049ac5c7 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "./IAsset.sol"; import "./IComponent.sol"; import "./IGnosis.sol"; diff --git a/contracts/interfaces/IFacadeMonitor.sol b/contracts/interfaces/IFacadeMonitor.sol index 6c4f6f8d2d..0794a8e2f9 100644 --- a/contracts/interfaces/IFacadeMonitor.sol +++ b/contracts/interfaces/IFacadeMonitor.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "./IRToken.sol"; /** diff --git a/contracts/interfaces/IMain.sol b/contracts/interfaces/IMain.sol index f282be1479..dcb6ce910a 100644 --- a/contracts/interfaces/IMain.sol +++ b/contracts/interfaces/IMain.sol @@ -7,9 +7,9 @@ import "./IAssetRegistry.sol"; import "./IBasketHandler.sol"; import "./IBackingManager.sol"; import "./IBroker.sol"; -import "./IGnosis.sol"; -import "./IFurnace.sol"; import "./IDistributor.sol"; +import "./IFurnace.sol"; +import "./IGnosis.sol"; import "./IRToken.sol"; import "./IRevenueTrader.sol"; import "./IStRSR.sol"; diff --git a/contracts/interfaces/IRToken.sol b/contracts/interfaces/IRToken.sol index 9528ab2efd..faa09a6b5f 100644 --- a/contracts/interfaces/IRToken.sol +++ b/contracts/interfaces/IRToken.sol @@ -4,12 +4,10 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20MetadataUpgradeable.sol"; // solhint-disable-next-line max-line-length import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-IERC20PermitUpgradeable.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../libraries/Fixed.sol"; import "../libraries/Throttle.sol"; -import "./IAsset.sol"; import "./IComponent.sol"; -import "./IMain.sol"; -import "./IRewardable.sol"; /** * @title IRToken diff --git a/contracts/interfaces/IRevenueTrader.sol b/contracts/interfaces/IRevenueTrader.sol index 8ab78078e1..c8cea3f4bd 100644 --- a/contracts/interfaces/IRevenueTrader.sol +++ b/contracts/interfaces/IRevenueTrader.sol @@ -1,7 +1,6 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import "./IBroker.sol"; import "./IComponent.sol"; import "./ITrading.sol"; diff --git a/contracts/interfaces/IRewardable.sol b/contracts/interfaces/IRewardable.sol index 75ad05f625..44cfa3352b 100644 --- a/contracts/interfaces/IRewardable.sol +++ b/contracts/interfaces/IRewardable.sol @@ -2,8 +2,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "./IComponent.sol"; -import "./IMain.sol"; /** * @title IRewardable diff --git a/contracts/interfaces/IStRSR.sol b/contracts/interfaces/IStRSR.sol index b0279ef220..a080765a68 100644 --- a/contracts/interfaces/IStRSR.sol +++ b/contracts/interfaces/IStRSR.sol @@ -6,7 +6,6 @@ import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/IERC20Metadat import "@openzeppelin/contracts-upgradeable/token/ERC20/extensions/draft-IERC20PermitUpgradeable.sol"; import "../libraries/Fixed.sol"; import "./IComponent.sol"; -import "./IMain.sol"; /** * @title IStRSR diff --git a/contracts/interfaces/ITrading.sol b/contracts/interfaces/ITrading.sol index b0bed9bad3..6fc380b6b3 100644 --- a/contracts/interfaces/ITrading.sol +++ b/contracts/interfaces/ITrading.sol @@ -3,7 +3,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../libraries/Fixed.sol"; -import "./IAsset.sol"; import "./IComponent.sol"; import "./ITrade.sol"; import "./IRewardable.sol"; diff --git a/contracts/mixins/ComponentRegistry.sol b/contracts/mixins/ComponentRegistry.sol index d8136c6270..ff3a29f7c7 100644 --- a/contracts/mixins/ComponentRegistry.sol +++ b/contracts/mixins/ComponentRegistry.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; import "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../interfaces/IMain.sol"; import "./Auth.sol"; /** diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index 8edb10f86c..3b83589e9d 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -2,9 +2,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../../interfaces/IAsset.sol"; -import "../../interfaces/IAssetRegistry.sol"; -import "../../interfaces/IBackingManager.sol"; import "../../libraries/Fixed.sol"; import "./TradeLib.sol"; diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index 8d3c8e01c9..89fa344945 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -3,10 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../interfaces/IAsset.sol"; -import "../../interfaces/IAssetRegistry.sol"; -import "../../interfaces/ITrading.sol"; import "../../libraries/Fixed.sol"; -import "./RecollateralizationLib.sol"; struct TradeInfo { IAsset sell; From fcd6c591f6549e172e702591459d3a242c76c9af Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 26 Mar 2024 12:19:17 -0400 Subject: [PATCH 244/450] paypool mainnet address --- .../addresses/mainnet-3.3.0/1-tmp-assets-collateral.json | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json index e60393766f..fb0b9bb344 100644 --- a/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json @@ -10,7 +10,8 @@ "sDAI": "0x29EDbbbE7415cb8637e0F62D5d19dcB3A5bC3229", "saEthUSDC": "0x05beee046A5C28844804E679aD5587046dBffbc0", "cUSDT": "0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8", - "saEthPyUSD": "0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7" + "saEthPyUSD": "0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7", + "cvxPayPool": "0x426Ad39C7ccF2f3872aBB16c0291Eb40c0F44D23" }, "erc20s": { "aUSDC": "0x60C384e226b120d93f3e0F4C502957b2B9C32B15", @@ -22,6 +23,7 @@ "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", "saEthUSDC": "0x093cB4f405924a0C468b43209d5E466F1dd0aC7d", "cUSDT": "0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9", - "saEthPyUSD": "0x8d6E0402A3E3aD1b43575b05905F9468447013cF" + "saEthPyUSD": "0x8d6E0402A3E3aD1b43575b05905F9468447013cF", + "cvxPayPool": "0x6Cd8b88Dd65B004A82C33276C7AD3Fd4F569e254" } -} +} \ No newline at end of file From 592c67f4265f65ad9f9be08578cddce1f299550e Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 27 Mar 2024 17:15:51 -0300 Subject: [PATCH 245/450] Base plugin deployments and cUSDCv3 change (#1100) Co-authored-by: Taylor Brent Co-authored-by: Patrick McKelvy Co-authored-by: Akshat Mittal --- common/configuration.ts | 6 +- .../assets/compoundv3/CTokenV3Collateral.sol | 65 ++++++++----------- contracts/plugins/mocks/CometMock.sol | 12 +--- .../8453-tmp-assets-collateral.json | 11 ++++ .../base-3.3.0/8453-tmp-deployments.json | 38 +++++++++++ .../deploy_ctokenv3_usdbc_collateral.ts | 3 +- .../deploy_ctokenv3_usdc_collateral.ts | 8 +-- .../collateral-plugins/verify_cusdbcv3.ts | 1 - .../collateral-plugins/verify_cusdcv3.ts | 1 - test/monitor/FacadeMonitor.test.ts | 3 +- .../compoundv3/CometTestSuite.test.ts | 56 +--------------- .../compoundv3/CusdcV3Wrapper.test.ts | 14 ++-- .../compoundv3/constants.ts | 8 +-- 13 files changed, 96 insertions(+), 130 deletions(-) create mode 100644 scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json create mode 100644 scripts/addresses/base-3.3.0/8453-tmp-deployments.json diff --git a/common/configuration.ts b/common/configuration.ts index fcdc888a99..d900dc9fb3 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -452,13 +452,15 @@ export const networkConfig: { [key: string]: INetworkConfig } = { tokens: { DAI: '0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb', USDbC: '0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA', + USDC: '0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913', RSR: '0xaB36452DbAC151bE02b16Ca17d8919826072f64a', COMP: '0x9e1028F5F1D5eDE59748FFceE5532509976840E0', WETH: '0x4200000000000000000000000000000000000006', cbETH: '0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22', cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', + cUSDCv3: '0xb125E6687d4313864e53df431d5425969c15Eb2F', aBasUSDC: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB', - saBasUSDC: '0x4EA71A20e655794051D1eE8b6e4A3269B13ccaCc', // canonical wrapper + saBasUSDC: '0x6AfFDe0bA2D1f8fde8da8f296e7EfC991D807515', // our wrapper aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', @@ -485,7 +487,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { COMET_REWARDS: '0x123964802e6ABabBE1Bc9547D72Ef1B69B00A6b1', COMET_CONFIGURATOR: '0x45939657d1CA34A8FA39A924B71D28Fe8431e581', COMET_PROXY_ADMIN: '0xbdE8F31D2DdDA895264e27DD990faB3DC87b372d', - COMET_EXT: '0x2F9E3953b2Ef89fA265f2a32ed9F80D00229125B', + COMET_EXT: '0x3bac64185786922292266AA92a58cf870D694E2a', AAVE_V3_POOL: '0xA238Dd80C259a72e81d7e4664a9801593F98d1c5', AAVE_V3_INCENTIVES_CONTROLLER: '0xf9cc4F0D883F1a1eb2c253bdb46c254Ca51E1F44', STARGATE_STAKING_CONTRACT: '0x06Eb48763f117c7Be887296CDcdfad2E4092739C', diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index eed7b3bd53..c4792f6b73 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -23,20 +23,16 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { using FixLib for uint192; IComet public immutable comet; - uint256 public immutable reservesThresholdIffy; // {qUSDC} uint8 public immutable cometDecimals; IERC20 private immutable comp; /// @param config.chainlinkFeed Feed units: {UoA/ref} - constructor( - CollateralConfig memory config, - uint192 revenueHiding, - uint256 reservesThresholdIffy_ - ) AppreciatingFiatCollateral(config, revenueHiding) { + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + { require(config.defaultThreshold > 0, "defaultThreshold zero"); comp = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); - reservesThresholdIffy = reservesThresholdIffy_; cometDecimals = comet.decimals(); } @@ -74,41 +70,34 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { exposedReferencePrice = hiddenReferencePrice; } - int256 cometReserves = comet.getReserves(); - if (cometReserves < 0) { - markStatus(CollateralStatus.DISABLED); - } else if (uint256(cometReserves) < reservesThresholdIffy) { - markStatus(CollateralStatus.IFFY); - } else { - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { - // {UoA/tok}, {UoA/tok}, {target/ref} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { + // {UoA/tok}, {UoA/tok}, {target/ref} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - // untested: - // validated in other plugins, cost to test here is high - assert(low == 0); - } + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { - markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); - } - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (pegPrice < pegBottom || pegPrice > pegTop || low == 0) { markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); } } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data diff --git a/contracts/plugins/mocks/CometMock.sol b/contracts/plugins/mocks/CometMock.sol index 16556c9483..cfd14e1356 100644 --- a/contracts/plugins/mocks/CometMock.sol +++ b/contracts/plugins/mocks/CometMock.sol @@ -3,7 +3,6 @@ pragma solidity 0.8.19; // prettier-ignore contract CometMock { - int256 internal _reserves; address public externalDelegate; struct TotalsBasic { @@ -27,19 +26,10 @@ contract CometMock { uint8 _reserved; } - constructor(int256 reserves_, address delegate) { - _reserves = reserves_; + constructor(address delegate) { externalDelegate = delegate; } - function setReserves(int256 amount) external { - _reserves = amount; - } - - function getReserves() public view returns (int256) { - return _reserves; - } - // solhint-disable-next-line no-empty-blocks function accrueAccount(address account) public {} diff --git a/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json new file mode 100644 index 0000000000..511f1177a9 --- /dev/null +++ b/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json @@ -0,0 +1,11 @@ +{ + "assets": {}, + "collateral": { + "saBasUSDC": "0xAe9795115c7E5Bee7d2017b92c41DECa66d81dcf", + "cUSDCv3": "0x36A43E13f0c8d8612AE3978A8E7A58BB58000923" + }, + "erc20s": { + "saBasUSDC": "0x6AfFDe0bA2D1f8fde8da8f296e7EfC991D807515", + "cUSDCv3": "0xA694f7177C6c839C951C74C797283B35D0A486c8" + } +} \ No newline at end of file diff --git a/scripts/addresses/base-3.3.0/8453-tmp-deployments.json b/scripts/addresses/base-3.3.0/8453-tmp-deployments.json new file mode 100644 index 0000000000..66dde25ef3 --- /dev/null +++ b/scripts/addresses/base-3.3.0/8453-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0xaB36452DbAC151bE02b16Ca17d8919826072f64a", + "RSR_FEED": "0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1", + "GNOSIS_EASY_AUCTION": "0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02" + }, + "tradingLib": "", + "cvxMiningLib": "", + "facade": "", + "facets": { + "actFacet": "", + "readFacet": "" + }, + "facadeWriteLib": "", + "basketLib": "", + "facadeWrite": "", + "deployer": "", + "rsrAsset": "", + "implementations": { + "main": "", + "trading": { + "gnosisTrade": "", + "dutchTrade": "0xd0Ff3aa130A34Eac0C448950CA8fe662330cB065" + }, + "components": { + "assetRegistry": "", + "backingManager": "", + "basketHandler": "", + "broker": "", + "distributor": "", + "furnace": "", + "rsrTrader": "", + "rTokenTrader": "", + "rToken": "", + "stRSR": "" + } + } +} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts index 21e78893af..0b2184a842 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts @@ -76,8 +76,7 @@ async function main() { defaultThreshold: fp('0.01').add(usdcOracleError).toString(), // 1% + 0.3% delayUntilDefault: bn('86400').toString(), // 24h }, - revenueHiding.toString(), - bn('10000e6').toString() // $10k + revenueHiding.toString() ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts index a05ac5bbc7..50253f15f7 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts @@ -29,11 +29,6 @@ async function main() { throw new Error(`Missing network configuration for ${hre.network.name}`) } - // Only exists on Mainnet - if (baseL2Chains.includes(hre.network.name)) { - throw new Error(`Invalid network ${hre.network.name} - only available on Mainnet`) - } - // Get phase1 deployment const phase1File = getDeploymentFilename(chainId) if (!fileExists(phase1File)) { @@ -74,8 +69,7 @@ async function main() { defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, - revenueHiding.toString(), - bn('10000e6').toString() // $10k + revenueHiding.toString() ) await collateral.deployed() await (await collateral.refresh()).wait() diff --git a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts index d0eb672ef2..497b3e5be8 100644 --- a/scripts/verification/collateral-plugins/verify_cusdbcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdbcv3.ts @@ -69,7 +69,6 @@ async function main() { delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding, - bn('10000e6'), // $10k ], 'contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol:CTokenV3Collateral' ) diff --git a/scripts/verification/collateral-plugins/verify_cusdcv3.ts b/scripts/verification/collateral-plugins/verify_cusdcv3.ts index 09a6eceb34..dac4d02c4a 100644 --- a/scripts/verification/collateral-plugins/verify_cusdcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdcv3.ts @@ -64,7 +64,6 @@ async function main() { delayUntilDefault: bn('86400').toString(), // 24h }, revenueHiding, - bn('10000e6'), // $10k ], 'contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol:CTokenV3Collateral' ) diff --git a/test/monitor/FacadeMonitor.test.ts b/test/monitor/FacadeMonitor.test.ts index c8a7632e99..a9dcaffdc2 100644 --- a/test/monitor/FacadeMonitor.test.ts +++ b/test/monitor/FacadeMonitor.test.ts @@ -857,8 +857,7 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, defaultThreshold: fp('0.01').add(usdcOracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, - fp('1e-6'), - bn('10000e6').toString() // $10k + fp('1e-6') ) // Register and update collateral diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 2da2bc8b2a..614c8d6e8d 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -76,7 +76,6 @@ interface CometCollateralOpts extends CollateralOpts { */ const chainlinkDefaultAnswer = bn('1e8') -const reservesThresholdIffyDefault = bn('10000e6') // 10k export const defaultCometCollateralOpts: CometCollateralOpts = { erc20: CUSDC_V3, @@ -90,7 +89,6 @@ export const defaultCometCollateralOpts: CometCollateralOpts = { defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, revenueHiding: fp('0'), - reservesThresholdIffy: reservesThresholdIffyDefault, } export const deployCollateral = async ( @@ -115,7 +113,6 @@ export const deployCollateral = async ( delayUntilDefault: opts.delayUntilDefault, }, opts.revenueHiding, - opts.reservesThresholdIffy, { gasLimit: 2000000000 } ) await collateral.deployed() @@ -183,9 +180,7 @@ const deployCollateralCometMockContext = async ( collateralOpts.chainlinkFeed = chainlinkFeed.address const CometFactory = await ethers.getContractFactory('CometMock') - const cusdcV3 = ( - await CometFactory.deploy(collateralOpts.reservesThresholdIffy as BigNumberish, CUSDC_V3) - ) + const cusdcV3 = await CometFactory.deploy(CUSDC_V3) const CusdcV3WrapperFactory = ( await ethers.getContractFactory('CusdcV3Wrapper') @@ -297,55 +292,6 @@ const collateralSpecificConstructorTests = () => { } const collateralSpecificStatusTests = () => { - it('enters IFFY state when compound reserves are below target reserves iffy threshold', async () => { - const { collateral, cusdcV3 } = await deployCollateralCometMockContext({}) - const delayUntilDefault = await collateral.delayUntilDefault() - - // Check initial state - await expect(collateral.refresh()).to.not.emit(collateral, 'CollateralStatusChanged') - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - expect(await collateral.whenDefault()).to.equal(MAX_UINT48) - - // cUSDC/Comet's reserves gone down below targetReserves - await cusdcV3.setReserves(reservesThresholdIffyDefault.sub(1)) - - const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - await setNextBlockTimestamp(nextBlockTimestamp) - const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault - - await expect(collateral.refresh()) - .to.emit(collateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) - expect(await collateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Move time forward past delayUntilDefault - await advanceTime(delayUntilDefault) - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - - // Nothing changes if attempt to refresh after default for CTokenV3 - const prevWhenDefault: bigint = (await collateral.whenDefault()).toBigInt() - await expect(collateral.refresh()).to.not.emit(collateral, 'CollateralStatusChanged') - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - expect(await collateral.whenDefault()).to.equal(prevWhenDefault) - }) - - it('enters DISABLED state if reserves go negative', async () => { - const { collateral, cusdcV3 } = await deployCollateralCometMockContext({}) - - // Check initial state - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - expect(await collateral.whenDefault()).to.equal(MAX_UINT48) - - // cUSDC/Comet's reserves gone down to -1 - await cusdcV3.setReserves(-1) - - await expect(collateral.refresh()).to.emit(collateral, 'CollateralStatusChanged') - // State remains the same - expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) - expect(await collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) - }) - it('does revenue hiding correctly', async () => { const { collateral, wcusdcV3Mock } = await deployCollateralCometMockContext({ revenueHiding: fp('0.01'), diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index 7e4d782570..c81881382d 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -248,9 +248,9 @@ describeFork('Wrapped CUSDCv3', () => { await wcusdcV3.connect(charles).withdrawFrom(bob.address, don.address, withdrawAmount) expect(await cusdcV3.balanceOf(don.address)).to.closeTo(withdrawAmount, 100) - expect(await cusdcV3.balanceOf(charles.address)).to.closeTo(bn('0'), 11) + expect(await cusdcV3.balanceOf(charles.address)).to.closeTo(bn('0'), 30) - expect(await wcusdcV3.balanceOf(bob.address)).to.closeTo(bn(0), 50) + expect(await wcusdcV3.balanceOf(bob.address)).to.closeTo(bn(0), 100) }) it('withdraws all underlying balance via multiple withdrawals', async () => { @@ -293,7 +293,7 @@ describeFork('Wrapped CUSDCv3', () => { charlesWithdrawn = charlesWithdrawn.add(firstWithdrawAmt) await wcusdcV3.connect(charles).withdraw(firstWithdrawAmt) const newBalanceCharles = await cusdcV3.balanceOf(charles.address) - expect(newBalanceCharles).to.closeTo(firstWithdrawAmt, 10) + expect(newBalanceCharles).to.closeTo(firstWithdrawAmt, 25) // don deposits await mintWcUSDC(usdc, cusdcV3, wcusdcV3, don, initwusdcAmt, don.address) @@ -321,9 +321,9 @@ describeFork('Wrapped CUSDCv3', () => { const bal = await wcusdcV3.balanceOf(bob.address) expect(bal).to.closeTo(bn('0'), 10) - expect(await cusdcV3.balanceOf(bob.address)).to.closeTo(bobWithdrawn, 100) - expect(await cusdcV3.balanceOf(charles.address)).to.closeTo(charlesWithdrawn, 100) - expect(await cusdcV3.balanceOf(don.address)).to.closeTo(donWithdrawn, 100) + expect(await cusdcV3.balanceOf(bob.address)).to.closeTo(bobWithdrawn, 200) + expect(await cusdcV3.balanceOf(charles.address)).to.closeTo(charlesWithdrawn, 200) + expect(await cusdcV3.balanceOf(don.address)).to.closeTo(donWithdrawn, 200) }) it('updates the totalSupply', async () => { @@ -332,7 +332,7 @@ describeFork('Wrapped CUSDCv3', () => { const expectedDiff = await wcusdcV3.convertDynamicToStatic(withdrawAmt) await wcusdcV3.connect(bob).withdraw(withdrawAmt) // conservative rounding - expect(await wcusdcV3.totalSupply()).to.be.closeTo(totalSupplyBefore.sub(expectedDiff), 10) + expect(await wcusdcV3.totalSupply()).to.be.closeTo(totalSupplyBefore.sub(expectedDiff), 25) }) }) diff --git a/test/plugins/individual-collateral/compoundv3/constants.ts b/test/plugins/individual-collateral/compoundv3/constants.ts index f6cbb6ff43..96784ea4b4 100644 --- a/test/plugins/individual-collateral/compoundv3/constants.ts +++ b/test/plugins/individual-collateral/compoundv3/constants.ts @@ -17,8 +17,8 @@ switch (forkNetwork) { break } -const USDC_NAME = chainId == '8453' ? 'USDbC' : 'USDC' -const CUSDC_NAME = chainId == '8453' ? 'cUSDbCv3' : 'cUSDCv3' +const USDC_NAME = 'USDC' +const CUSDC_NAME = 'cUSDCv3' // Mainnet Addresses export const RSR = networkConfig[chainId].tokens.RSR as string @@ -29,7 +29,7 @@ export const REWARDS = networkConfig[chainId].COMET_REWARDS! export const USDC = networkConfig[chainId].tokens[USDC_NAME]! export const USDC_HOLDER = chainId == '8453' - ? '0x4c80E24119CFB836cdF0a6b53dc23F04F7e652CA' + ? '0xcdac0d6c6c59727a65f871236188350531885c43' : '0x0a59649758aa4d66e25f08dd01271e891fe52199' export const COMET_CONFIGURATOR = networkConfig[chainId].COMET_CONFIGURATOR! export const COMET_PROXY_ADMIN = networkConfig[chainId].COMET_PROXY_ADMIN! @@ -43,4 +43,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000000) export const USDC_DECIMALS = bn(6) -export const FORK_BLOCK = chainId == '8453' ? 4446300 : 15850930 +export const FORK_BLOCK = chainId == '8453' ? 12292893 : 15850930 From 100f79d2e738b4eeec1ec0c8ea68ff6f06950d7f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 27 Mar 2024 18:16:31 -0400 Subject: [PATCH 246/450] verify_convex_stable_rtoken_metapool.ts: add wrapper verification --- .../verify_convex_stable_rtoken_metapool.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts index 400c23d10e..12cc671525 100644 --- a/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts +++ b/scripts/verification/collateral-plugins/verify_convex_stable_rtoken_metapool.ts @@ -48,6 +48,15 @@ async function main() { deployments.collateral.cvxeUSDFRAXBP as string ) + /******** Verify ConvexStakingWrapper **************************/ + + await verifyContract( + chainId, + await eUSDPlugin.erc20(), + [], + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + ) + /******** Verify eUSD/fraxBP plugin **************************/ await verifyContract( chainId, From 4c3b62a13fe8f625b641ae97222cec040da3514c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 27 Mar 2024 18:32:16 -0400 Subject: [PATCH 247/450] add script for verifying COMP --- scripts/verification/assets/verify_comp.ts | 49 ++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 scripts/verification/assets/verify_comp.ts diff --git a/scripts/verification/assets/verify_comp.ts b/scripts/verification/assets/verify_comp.ts new file mode 100644 index 0000000000..5642443c2c --- /dev/null +++ b/scripts/verification/assets/verify_comp.ts @@ -0,0 +1,49 @@ +import hre from 'hardhat' + +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { + getAssetCollDeploymentFilename, + getDeploymentFile, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { fp } from '../../../common/numbers' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + deployments = getDeploymentFile(getAssetCollDeploymentFilename(chainId)) + + const asset = await hre.ethers.getContractAt('Asset', deployments.assets.COMP!) + + /** ******************** Verify COMP Asset ****************************************/ + await verifyContract( + chainId, + deployments.assets.COMP, + [ + await asset.priceTimeout(), + await asset.chainlinkFeed(), + fp('0.01').toString(), // 1% + await asset.erc20(), + await asset.maxTradeVolume(), + await asset.oracleTimeout(), + ], + 'contracts/plugins/assets/Asset.sol:Asset' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) From 0aa2b07c96493d14b3975af91b87b7bafad3e5fe Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 27 Mar 2024 18:33:00 -0400 Subject: [PATCH 248/450] deploy COMP/CRV/CVX assets --- .../mainnet-3.3.0/1-tmp-assets-collateral.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json index fb0b9bb344..99aaaa7cc6 100644 --- a/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.3.0/1-tmp-assets-collateral.json @@ -1,5 +1,9 @@ { - "assets": {}, + "assets": { + "COMP": "0x29dc6F79750020d77c6391629101BDC0F0D16ECB", + "CRV": "0x9257a1307a72603B7916d0c97fCABC6351C3482E", + "CVX": "0x4dA79d89482737381E90d2A7005b21cd11eAeE5C" + }, "collateral": { "aUSDC": "0x6E14943224d6E4F7607943512ba17DbBA9524B8e", "aUSDT": "0x8AD3055286f4E59B399616Bd6BEfE24F64573928", @@ -24,6 +28,9 @@ "saEthUSDC": "0x093cB4f405924a0C468b43209d5E466F1dd0aC7d", "cUSDT": "0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9", "saEthPyUSD": "0x8d6E0402A3E3aD1b43575b05905F9468447013cF", - "cvxPayPool": "0x6Cd8b88Dd65B004A82C33276C7AD3Fd4F569e254" + "cvxPayPool": "0x6Cd8b88Dd65B004A82C33276C7AD3Fd4F569e254", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B" } } \ No newline at end of file From 122ffd3f916cee1ddf642c51ff24d3c3536bf06f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 27 Mar 2024 18:45:51 -0400 Subject: [PATCH 249/450] add deployed base USDC collateral --- .../addresses/base-3.3.0/8453-tmp-assets-collateral.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json index 511f1177a9..c03a5cfea0 100644 --- a/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json +++ b/scripts/addresses/base-3.3.0/8453-tmp-assets-collateral.json @@ -2,10 +2,12 @@ "assets": {}, "collateral": { "saBasUSDC": "0xAe9795115c7E5Bee7d2017b92c41DECa66d81dcf", - "cUSDCv3": "0x36A43E13f0c8d8612AE3978A8E7A58BB58000923" + "cUSDCv3": "0x36A43E13f0c8d8612AE3978A8E7A58BB58000923", + "USDC": "0x8b906361048D277452506d3f791020A1cA798aF3" }, "erc20s": { "saBasUSDC": "0x6AfFDe0bA2D1f8fde8da8f296e7EfC991D807515", - "cUSDCv3": "0xA694f7177C6c839C951C74C797283B35D0A486c8" + "cUSDCv3": "0xA694f7177C6c839C951C74C797283B35D0A486c8", + "USDC": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913" } } \ No newline at end of file From 5c48f60341aad3ade046a161ae11e6c44369db3a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 1 Apr 2024 17:26:32 -0400 Subject: [PATCH 250/450] Upgrade checker hyusd (#1102) Co-authored-by: Akshat Mittal --- .../upgrade-checker-utils/constants.ts | 8 +- tasks/testing/upgrade-checker-utils/logs.ts | 3 + .../testing/upgrade-checker-utils/oracles.ts | 107 +++++++++++++----- .../testing/upgrade-checker-utils/rewards.ts | 1 + .../testing/upgrade-checker-utils/rtokens.ts | 14 ++- tasks/testing/upgrade-checker-utils/trades.ts | 63 ++++------- tasks/testing/upgrade-checker.ts | 44 +++++-- 7 files changed, 156 insertions(+), 84 deletions(-) diff --git a/tasks/testing/upgrade-checker-utils/constants.ts b/tasks/testing/upgrade-checker-utils/constants.ts index 94156c644b..8b05f23458 100644 --- a/tasks/testing/upgrade-checker-utils/constants.ts +++ b/tasks/testing/upgrade-checker-utils/constants.ts @@ -25,7 +25,13 @@ export const whales: { [key: string]: string } = { [networkConfig['1'].tokens.WETH!.toLowerCase()]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28', [networkConfig['1'].tokens.DAI!.toLowerCase()]: '0x8EB8a3b98659Cce290402893d0123abb75E3ab28', [networkConfig['1'].tokens.CRV!.toLowerCase()]: '0xf977814e90da44bfa03b6295a0616a897441acec', - [networkConfig['1'].tokens.CRV!.toLowerCase()]: '0xf977814e90da44bfa03b6295a0616a897441acec', + ['0xAEda92e6A3B1028edc139A4ae56Ec881f3064D4F'.toLowerCase()]: + '0x8605dc0C339a2e7e85EEA043bD29d42DA2c6D784', // cvxeUSDFRAXBP LP token + [networkConfig['1'].tokens.sDAI!.toLowerCase()]: '0x4aa42145Aa6Ebf72e164C9bBC74fbD3788045016', + ['0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f'.toLowerCase()]: + '0x3154Cf16ccdb4C6d922629664174b904d80F2C35', // eUSD + ['0xacdf0dba4b9839b96221a8487e9ca660a48212be'.toLowerCase()]: + '0x8a8434A5952aC2CF4927bbEa3ace255c6dd165CD', // hyUSD } export const collateralToUnderlying: { [key: string]: string } = { diff --git a/tasks/testing/upgrade-checker-utils/logs.ts b/tasks/testing/upgrade-checker-utils/logs.ts index 1e39412f68..b79dbedb33 100644 --- a/tasks/testing/upgrade-checker-utils/logs.ts +++ b/tasks/testing/upgrade-checker-utils/logs.ts @@ -45,11 +45,14 @@ const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.aEthPyUSD!.toLowerCase()]: 'aEthPyUSD', [networkConfig['1'].tokens.saEthPyUSD!.toLowerCase()]: 'saEthPyUSD', [networkConfig['1'].tokens.cUSDCv3!.toLowerCase()]: 'cUSDCv3', + ['0xaa91d24c2f7dbb6487f61869cd8cd8afd5c5cab2'.toLowerCase()]: 'mrp-aUSDT', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: 'saUSDC', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: 'saUSDT', ['0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase()]: 'cUSDCVault', ['0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase()]: 'cUSDTVault', ['0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A'.toLowerCase()]: 'wcUSDCv3', + ['0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5'.toLowerCase()]: 'stkcvxeUSDFRAXBP', + ['0x83f20f44975d03b1b09e64809b757c47f942beea'.toLowerCase()]: 'sDAI', } export const logToken = (tokenAddress: string) => { diff --git a/tasks/testing/upgrade-checker-utils/oracles.ts b/tasks/testing/upgrade-checker-utils/oracles.ts index 500f19925b..a4d1c72aac 100644 --- a/tasks/testing/upgrade-checker-utils/oracles.ts +++ b/tasks/testing/upgrade-checker-utils/oracles.ts @@ -1,7 +1,10 @@ +/* eslint-disable no-empty */ +import { networkConfig } from '../../../common/configuration' import { EACAggregatorProxyMock } from '@typechain/EACAggregatorProxyMock' import { HardhatRuntimeEnvironment } from 'hardhat/types' import { BigNumber } from 'ethers' -import { TestIAsset } from '@typechain/index' +import { AggregatorV3Interface } from '@typechain/index' +import { ONE_ADDRESS } from '../../../common/constants' export const overrideOracle = async ( hre: HardhatRuntimeEnvironment, @@ -29,7 +32,7 @@ export const pushOraclesForward = async ( rTokenAddress: string, extraAssets: string[] = [] ) => { - console.log(`Pushing Oracles forward for RToken ${rTokenAddress}...`) + console.log(`🔃 Pushing Oracles forward for RToken: ${rTokenAddress}`) const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const assetRegistry = await hre.ethers.getContractAt( @@ -47,33 +50,76 @@ export const pushOraclesForward = async ( } } -const checkOracleExists = async ( - hre: HardhatRuntimeEnvironment, - asset: string, - fn: (assetContract: TestIAsset) => Promise -) => { - const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) - - try { - await assetContract.chainlinkFeed() - console.log(`Chainlink Oracle Found. Processing asset: ${asset}`) +export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: string) => { + // Need to handle all oracle cases, ie targetUnitChainlinkFeed, PoolTokens, etc + const updateAnswer = async (chainlinkFeed: AggregatorV3Interface) => { + const initPrice = await chainlinkFeed.latestRoundData() + const oracle = await overrideOracle(hre, chainlinkFeed.address) + await oracle.updateAnswer(initPrice.answer) - await fn(assetContract) - } catch { - console.log(`Chainlink Oracle Missing. Skipping asset: ${asset}`) + console.log('✅ Feed Updated:', chainlinkFeed.address) } -} -export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: string) => { - await checkOracleExists(hre, asset, async (assetContract) => { - const realChainlinkFeed = await hre.ethers.getContractAt( + // chainlinkFeed + try { + const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) + const feed = await hre.ethers.getContractAt( 'AggregatorV3Interface', await assetContract.chainlinkFeed() ) - const initPrice = await realChainlinkFeed.latestRoundData() - const oracle = await overrideOracle(hre, realChainlinkFeed.address) - await oracle.updateAnswer(initPrice.answer) - }) + if (feed.address != ONE_ADDRESS) await updateAnswer(feed) + } catch {} + + // targetUnitChainlinkFeed + try { + const assetContractNonFiat = await hre.ethers.getContractAt('NonFiatCollateral', asset) + const feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractNonFiat.targetUnitChainlinkFeed() + ) + await updateAnswer(feed) + } catch {} + + // targetPerRefChainlinkFeed, uoaPerTargetChainlinkFeed, refPerTokenChainlinkFeed + try { + const assetContractLido = await hre.ethers.getContractAt('L2LidoStakedEthCollateral', asset) + let feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractLido.targetPerRefChainlinkFeed() + ) + await updateAnswer(feed) + feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractLido.uoaPerTargetChainlinkFeed() + ) + await updateAnswer(feed) + feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractLido.refPerTokenChainlinkFeed() + ) + await updateAnswer(feed) + } catch {} + + // targetPerTokChainlinkFeed + try { + const assetContractReth = await hre.ethers.getContractAt('RethCollateral', asset) + const feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractReth.targetPerTokChainlinkFeed() + ) + await updateAnswer(feed) + } catch {} + + // TODO do better + // Problem: The feeds on PoolTokens are internal immutable. Not in storage nor are there getters. + // Workaround solution: hard-code oracles for FRAX for eUSDFRAXBP; USDC is registered as backup + if (asset == '0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122') { + const feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + networkConfig['1'].chainlinkFeeds.FRAX! + ) + await updateAnswer(feed) + } } export const setOraclePrice = async ( @@ -81,12 +127,11 @@ export const setOraclePrice = async ( asset: string, value: BigNumber ) => { - await checkOracleExists(hre, asset, async (assetContract) => { - const realChainlinkFeed = await hre.ethers.getContractAt( - 'AggregatorV3Interface', - await assetContract.chainlinkFeed() - ) - const oracle = await overrideOracle(hre, realChainlinkFeed.address) - await oracle.updateAnswer(value) - }) + const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) + const realChainlinkFeed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContract.chainlinkFeed() + ) + const oracle = await overrideOracle(hre, realChainlinkFeed.address) + await oracle.updateAnswer(value) } diff --git a/tasks/testing/upgrade-checker-utils/rewards.ts b/tasks/testing/upgrade-checker-utils/rewards.ts index 01f0cb02e3..46e694e373 100644 --- a/tasks/testing/upgrade-checker-utils/rewards.ts +++ b/tasks/testing/upgrade-checker-utils/rewards.ts @@ -33,6 +33,7 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr const rsrRatePre = await strsr.exchangeRate() const rewards = await claimRewards(backingManager) + console.log('rewards claimed', rewards) await backingManager.forwardRevenue(rewards) const comp = '0xc00e94Cb662C3520282E6f5717214004A7f26888' const compContract = await hre.ethers.getContractAt('ERC20Mock', comp) diff --git a/tasks/testing/upgrade-checker-utils/rtokens.ts b/tasks/testing/upgrade-checker-utils/rtokens.ts index fc43009e4a..59db68913d 100644 --- a/tasks/testing/upgrade-checker-utils/rtokens.ts +++ b/tasks/testing/upgrade-checker-utils/rtokens.ts @@ -10,6 +10,7 @@ import { callAndGetNextTrade, runBatchTrade, runDutchTrade } from './trades' import { CollateralStatus } from '#/common/constants' import { ActFacet } from '@typechain/ActFacet' import { ReadFacet } from '@typechain/ReadFacet' +import { pushOraclesForward } from '../upgrade-checker-utils/oracles' type Balances = { [key: string]: BigNumber } @@ -44,8 +45,15 @@ export const redeemRTokens = async ( 'BasketHandlerP1', await main.basketHandler() ) + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) - const redeemQuote = await basketHandler.quote(redeemAmount, 0) + await assetRegistry.refresh() + const basketsNeeded = await rToken.basketsNeeded() + const totalSupply = await rToken.totalSupply() + const redeemQuote = await basketHandler.quote(redeemAmount.mul(basketsNeeded).div(totalSupply), 0) const expectedTokens = redeemQuote.erc20s const expectedBalances: Balances = {} let log = '' @@ -240,7 +248,9 @@ const recollateralizeDutch = async (hre: HardhatRuntimeEnvironment, rtokenAddres tradesRemain = true sellToken = initialSellToken - while (tradesRemain) { + for (let i = 0; tradesRemain; i++) { + // every other trade, push oracles forward (some oracles have 3600s timeout) + if (i % 2 == 1) await pushOraclesForward(hre, rtokenAddress, []) ;[tradesRemain, sellToken] = await runDutchTrade(hre, backingManager, sellToken) await advanceBlocks(hre, 1) diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/testing/upgrade-checker-utils/trades.ts index aa09ec6d6e..6e0ce64b47 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/testing/upgrade-checker-utils/trades.ts @@ -12,9 +12,9 @@ import { DutchTrade } from '@typechain/DutchTrade' import { GnosisTrade } from '@typechain/GnosisTrade' import { TestITrading } from '@typechain/TestITrading' import { BigNumber, ContractTransaction } from 'ethers' -import { Interface, LogDescription } from 'ethers/lib/utils' +import { LogDescription } from 'ethers/lib/utils' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { collateralToUnderlying, whales } from './constants' +import { whales } from './constants' import { logToken } from './logs' export const runBatchTrade = async ( @@ -114,8 +114,12 @@ export const runDutchTrade = async ( const endBlock = await trade.endBlock() const [tester] = await hre.ethers.getSigners() - // Bid close to end block - await advanceBlocks(hre, endBlock.sub(await getLatestBlockNumber(hre)).sub(20)) + // Bid near 1:1 point, which occurs at the 70% mark + const toAdvance = endBlock + .sub(await getLatestBlockNumber(hre)) + .mul(7) + .div(10) + await advanceBlocks(hre, toAdvance) const buyAmount = await trade.bidAmount(await getLatestBlockNumber(hre)) // Ensure funds available @@ -215,44 +219,6 @@ export const getTokens = async ( } } -// mint regular cTokens for an amount of `underlying` -const mintCToken = async ( - hre: HardhatRuntimeEnvironment, - tokenAddress: string, - amount: BigNumber, - recipient: string -) => { - const collateral = await hre.ethers.getContractAt('ICToken', tokenAddress) - const underlying = await hre.ethers.getContractAt( - 'ERC20Mock', - collateralToUnderlying[tokenAddress.toLowerCase()] - ) - await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (whaleSigner) => { - await underlying.connect(whaleSigner).approve(collateral.address, amount) - await collateral.connect(whaleSigner).mint(amount) - const bal = await collateral.balanceOf(whaleSigner.address) - await collateral.connect(whaleSigner).transfer(recipient, bal) - }) -} - -// mints staticAToken for an amount of `underlying` -const mintStaticAToken = async ( - hre: HardhatRuntimeEnvironment, - tokenAddress: string, - amount: BigNumber, - recipient: string -) => { - const collateral = await hre.ethers.getContractAt('StaticATokenLM', tokenAddress) - const underlying = await hre.ethers.getContractAt( - 'ERC20Mock', - collateralToUnderlying[tokenAddress.toLowerCase()] - ) - await whileImpersonating(hre, whales[tokenAddress.toLowerCase()], async (whaleSigner) => { - await underlying.connect(whaleSigner).approve(collateral.address, amount) - await collateral.connect(whaleSigner).deposit(recipient, amount, 0, true) - }) -} - // get a specific amount of wrapped cTokens const getCTokenVault = async ( hre: HardhatRuntimeEnvironment, @@ -320,6 +286,10 @@ const getERC20Tokens = async ( 'IStaticATokenV3LM', networkConfig['1'].tokens.saEthPyUSD! ) + const stkcvxeUSDFRAXBP = await hre.ethers.getContractAt( + 'ConvexStakingWrapper', + '0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1' + ) if (tokenAddress == wcUSDCv3.address) { await whileImpersonating( @@ -359,6 +329,15 @@ const getERC20Tokens = async ( await token.connect(whaleSigner).transfer(recipient, amount) // saEthPyUSD transfer } ) + } else if (tokenAddress == stkcvxeUSDFRAXBP.address) { + const lpTokenAddr = '0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f' + + await whileImpersonating(hre, whales[lpTokenAddr], async (whaleSigner) => { + const lpToken = await hre.ethers.getContractAt('ERC20Mock', lpTokenAddr) + await lpToken.connect(whaleSigner).approve(stkcvxeUSDFRAXBP.address, amount.mul(2)) + await stkcvxeUSDFRAXBP.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address) + await token.connect(whaleSigner).transfer(recipient, amount) + }) } else { const addr = whales[token.address.toLowerCase()] if (!addr) throw new Error('missing whale for ' + tokenAddress) diff --git a/tasks/testing/upgrade-checker.ts b/tasks/testing/upgrade-checker.ts index a1615c6bc4..057f4ee5f7 100644 --- a/tasks/testing/upgrade-checker.ts +++ b/tasks/testing/upgrade-checker.ts @@ -10,6 +10,7 @@ import { formatEther, formatUnits } from 'ethers/lib/utils' import { recollateralize, redeemRTokens } from './upgrade-checker-utils/rtokens' import { claimRsrRewards } from './upgrade-checker-utils/rewards' import { whales } from './upgrade-checker-utils/constants' +import { pushOraclesForward } from './upgrade-checker-utils/oracles' import runChecks3_3_0, { proposal_3_3_0_step_1, proposal_3_3_0_step_2, @@ -193,6 +194,7 @@ task('recollateralize') recollateralize */ await advanceTime(hre, (await backingManager.tradingDelay()) + 1) + await pushOraclesForward(hre, params.rtoken, []) await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION).catch((e: Error) => { if (e.message.includes('already collateralized')) { console.log('Already Collateralized!') @@ -204,15 +206,11 @@ task('recollateralize') }) if (!(await basketHandler.fullyCollateralized())) throw new Error('Failed to recollateralize') - // Give `tester` RTokens from Base bridge + // Give `tester` RTokens from a whale const redeemAmt = fp('1e3') - await whileImpersonating( - hre, - '0x3154Cf16ccdb4C6d922629664174b904d80F2C35', // base bridge address on mainnet - async (baseBridge) => { - await rToken.connect(baseBridge).transfer(tester.address, redeemAmt) - } - ) + await whileImpersonating(hre, whales[params.rtoken.toLowerCase()], async (whaleSigner) => { + await rToken.connect(whaleSigner).transfer(tester.address, redeemAmt) + }) if (!(await rToken.balanceOf(tester.address)).gte(redeemAmt)) throw new Error('missing R') /* @@ -315,3 +313,33 @@ task('eusd-q1-2024-test', 'Test deployed eUSD Proposals').setAction(async (_, hr governor: RTokenGovernor, }) }) + +task('hyusd-q1-2024-test', 'Test deployed hyUSD Proposals').setAction(async (_, hre) => { + console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) + + const RTokenAddress = '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be' + const RTokenGovernor = '0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1' + + const ProposalIdOne = + '12128108731947079972460039600592322347543776217408895065380983128537007111991' + const ProposalIdTwo = + '67602359440860478788595002306085984888572052896929999758442845286427134600253' + + // Make sure both proposals are active. + await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) + + await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) + + await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) + + await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) + await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) + + await hre.run('recollateralize', { + rtoken: RTokenAddress, + governor: RTokenGovernor, + }) +}) From 5c2778b1949e2c5c68fc74f11b5237103c87d9bd Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 1 Apr 2024 17:48:04 -0400 Subject: [PATCH 251/450] Make StaticATokenV3LM.claimRewards() work for markets without rewards (#1103) --- common/configuration.ts | 6 +++--- .../assets/aave-v3/vendor/StaticATokenV3LM.sol | 2 +- .../base-3.4.0/8453-tmp-assets-collateral.json | 9 +++++++++ .../mainnet-3.4.0/1-tmp-assets-collateral.json | 11 +++++++++++ .../phase2-assets/collaterals/deploy_aave_v3_pyusd.ts | 1 - 5 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json create mode 100644 scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json diff --git a/common/configuration.ts b/common/configuration.ts index fc577f80a0..923fe065fb 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -172,7 +172,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', - saEthUSDC: '0x093cB4f405924a0C468b43209d5E466F1dd0aC7d', // our wrapper + saEthUSDC: '0x0aDc69041a2B086f8772aCcE2A754f410F211bed', // our wrapper cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', @@ -217,7 +217,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', pyUSD: '0x6c3ea9036406852006290770bedfcaba0e23a0e8', aEthPyUSD: '0x0C0d01AbF3e6aDfcA0989eBbA9d6e85dD58EaB1E', - saEthPyUSD: '0x8d6E0402A3E3aD1b43575b05905F9468447013cF', // our wrapper + saEthPyUSD: '0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b', // our wrapper steakUSDC: '0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB', steakPYUSD: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a', bbUSDT: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1', @@ -474,7 +474,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', cUSDCv3: '0xb125E6687d4313864e53df431d5425969c15Eb2F', aBasUSDC: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB', - saBasUSDC: '0x6AfFDe0bA2D1f8fde8da8f296e7EfC991D807515', // our wrapper + saBasUSDC: '0x184460704886f9F2A7F3A0c2887680867954dC6E', // our wrapper aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', diff --git a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol index 0b0654cac6..0caff56c67 100644 --- a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol +++ b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol @@ -283,7 +283,7 @@ contract StaticATokenV3LM is /// @dev Added by Reserve function claimRewards() external { - address[] memory rewardsList = INCENTIVES_CONTROLLER.getRewardsList(); + address[] memory rewardsList = INCENTIVES_CONTROLLER.getRewardsByAsset(address(_aToken)); for (uint256 i = 0; i < rewardsList.length; i++) { address currentReward = rewardsList[i]; diff --git a/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json new file mode 100644 index 0000000000..6eb3b4b007 --- /dev/null +++ b/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json @@ -0,0 +1,9 @@ +{ + "assets": {}, + "collateral": { + "saBasUSDC": "0x0F345F57ee2b395e23390f8e1F1869D7E6C0F70e" + }, + "erc20s": { + "saBasUSDC": "0x184460704886f9F2A7F3A0c2887680867954dC6E" + } +} diff --git a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json new file mode 100644 index 0000000000..6c16638e93 --- /dev/null +++ b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json @@ -0,0 +1,11 @@ +{ + "assets": {}, + "collateral": { + "saEthUSDC": "0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB", + "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E" + }, + "erc20s": { + "saEthUSDC": "0x0aDc69041a2B086f8772aCcE2A754f410F211bed", + "saEthPyUSD": "0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b" + } +} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts index 27944c095f..188d86e0e1 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts @@ -96,7 +96,6 @@ async function main() { assetCollDeployments.erc20s.saEthPyUSD = erc20.address assetCollDeployments.collateral.saEthPyUSD = collateral.address - assetCollDeployments.erc20s.saEthPyUSD = networkConfig[chainId].tokens.saEthPyUSD! deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) From 2af99759f3635ea8b58f58492fc7da6716681428 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 2 Apr 2024 13:49:24 +0530 Subject: [PATCH 252/450] Upgrade OZ & Use Time Based Governor --- contracts/facade/FacadeWrite.sol | 3 ++- contracts/interfaces/IFacadeWrite.sol | 6 ++--- contracts/p1/mixins/Trading.sol | 9 +++++-- contracts/plugins/governance/Governance.sol | 23 +++++++++++------- package.json | 4 ++-- tsconfig.json | 4 +--- yarn.lock | 26 ++++++++++----------- 7 files changed, 43 insertions(+), 32 deletions(-) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index f9f2c9d3f2..33f19a023f 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -148,7 +148,8 @@ contract FacadeWrite is IFacadeWrite { TimelockController timelock = new TimelockController( govParams.timelockDelay, new address[](0), - new address[](0) + new address[](0), + address(0) ); // Deploy Governance contract diff --git a/contracts/interfaces/IFacadeWrite.sol b/contracts/interfaces/IFacadeWrite.sol index f56cd32947..837c68a106 100644 --- a/contracts/interfaces/IFacadeWrite.sol +++ b/contracts/interfaces/IFacadeWrite.sol @@ -56,11 +56,11 @@ struct BeneficiaryInfo { * @notice The set of params required to setup decentralized governance */ struct GovernanceParams { - uint256 votingDelay; // in blocks - uint256 votingPeriod; // in blocks + uint256 votingDelay; // in {s} + uint256 votingPeriod; // in {s} uint256 proposalThresholdAsMicroPercent; // e.g. 1e4 for 0.01% uint256 quorumPercent; // e.g 4 for 4% - uint256 timelockDelay; // in seconds (used for timelock) + uint256 timelockDelay; // in {s} (used for timelock) } /** diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 393cc2435a..fc9311b696 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -3,8 +3,8 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@openzeppelin/contracts/utils/Multicall.sol"; import "../../interfaces/ITrade.sol"; import "../../interfaces/ITrading.sol"; import "../../libraries/Allowance.sol"; @@ -17,7 +17,12 @@ import "./RewardableLib.sol"; /// changed without breaking <3.0.0 RTokens. The only difference in /// MulticallUpgradeable is the 50 slot storage gap and an empty constructor. /// It should be fine to leave the non-upgradeable Multicall here permanently. -abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeable, ITrading { +abstract contract TradingP1 is + MulticallUpgradeable, + ComponentP1, + ReentrancyGuardUpgradeable, + ITrading +{ using FixLib for uint192; using SafeERC20Upgradeable for IERC20Upgradeable; diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 36810c4c2d..9eb59e9ce9 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -34,13 +34,13 @@ contract Governance is uint256 public constant ONE_HUNDRED_PERCENT = 1e8; // {micro %} // solhint-disable-next-line var-name-mixedcase - uint256 public immutable MIN_VOTING_DELAY; // {block} equal to ONE_DAY + uint256 public constant MIN_VOTING_DELAY = 86400; // {s} ONE_DAY constructor( IStRSRVotes token_, TimelockController timelock_, - uint256 votingDelay_, // in blocks - uint256 votingPeriod_, // in blocks + uint256 votingDelay_, // {s} + uint256 votingPeriod_, // {s} uint256 proposalThresholdAsMicroPercent_, // e.g. 1e4 for 0.01% uint256 quorumPercent // e.g 4 for 4% ) @@ -50,9 +50,6 @@ contract Governance is GovernorVotesQuorumFraction(quorumPercent) GovernorTimelockControl(timelock_) { - MIN_VOTING_DELAY = - (ONE_DAY + NetworkConfigLib.blocktime() - 1) / - NetworkConfigLib.blocktime(); // ONE_DAY, in blocks requireValidVotingDelay(votingDelay_); } @@ -132,9 +129,11 @@ contract Governance is uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash - ) external { + ) public override(Governor, IGovernor) returns (uint256) { uint256 proposalId = _cancel(targets, values, calldatas, descriptionHash); require(!startedInSameEra(proposalId), "same era"); + + return proposalId; } function _execute( @@ -193,7 +192,15 @@ contract Governance is return currentEra == pastEra; } - function requireValidVotingDelay(uint256 newVotingDelay) private view { + function requireValidVotingDelay(uint256 newVotingDelay) private pure { require(newVotingDelay >= MIN_VOTING_DELAY, "invalid votingDelay"); } + + function clock() public view override(GovernorVotes, IGovernor) returns (uint48) { + return SafeCast.toUint48(block.timestamp); + } + + function CLOCK_MODE() public pure override(GovernorVotes, IGovernor) returns (string memory) { + return "mode=timestamp"; + } } diff --git a/package.json b/package.json index ba1f2ec495..72bc0501de 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ "@nomicfoundation/hardhat-toolbox": "^2.0.1", "@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-etherscan": "^3.1.0", - "@openzeppelin/contracts": "~4.7.3", - "@openzeppelin/contracts-upgradeable": "~4.7.3", + "@openzeppelin/contracts": "4.9.6", + "@openzeppelin/contracts-upgradeable": "4.9.6", "@openzeppelin/hardhat-upgrades": "^1.23.0", "@tenderly/hardhat-tenderly": "^1.7.7", "@typechain/ethers-v5": "^7.2.0", diff --git a/tsconfig.json b/tsconfig.json index 53f2ccb76b..9d8a661264 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,9 +11,7 @@ "paths": { "@typechain/*": ["./typechain/*"], "#/*": ["./*"] - }, - "typeRoots": ["./typechain", "./node_modules/@types"], - "types": ["@nomiclabs/hardhat-ethers"] + } }, "exclude": ["./dist/**/*", "./node_modules/**/*"], "include": ["./test", "./tasks/**/*", "./common", "./scripts", "./typechain/**/*"], diff --git a/yarn.lock b/yarn.lock index 7b7e7a4873..244b998ab1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1617,10 +1617,10 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts-upgradeable@npm:~4.7.3": - version: 4.7.3 - resolution: "@openzeppelin/contracts-upgradeable@npm:4.7.3" - checksum: c9ffb40cb847a975d440204fc6a811f43af960050242f707332b984d29bd16dc242ffa0935de61867aeb9e0357fadedb16b09b276deda5e9775582face831021 +"@openzeppelin/contracts-upgradeable@npm:4.9.6": + version: 4.9.6 + resolution: "@openzeppelin/contracts-upgradeable@npm:4.9.6" + checksum: 481075e7222cab025ae55304263fca69a2d04305521957bc16d2aece9fa2b86b6914711724822493e3d04df7e793469cd0bcb1e09f0ddd10cb4e360ac7eed12a languageName: node linkType: hard @@ -1631,6 +1631,13 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/contracts@npm:4.9.6": + version: 4.9.6 + resolution: "@openzeppelin/contracts@npm:4.9.6" + checksum: 274b6e968268294f12d5ca4f0278f6e6357792c8bb4d76664f83dbdc325f780541538a127e6a6e97e4f018088b42f65952014dec9c745c0fa25081f43ef9c4bf + languageName: node + linkType: hard + "@openzeppelin/contracts@npm:^4.3.3": version: 4.9.2 resolution: "@openzeppelin/contracts@npm:4.9.2" @@ -1638,13 +1645,6 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts@npm:~4.7.3": - version: 4.7.3 - resolution: "@openzeppelin/contracts@npm:4.7.3" - checksum: 18382fcacf7cfd652f5dd0e70c08f08ea74eaa8ff11e9f9850639ada70198ae01a3f9493d89a52d724f2db394e9616bf6258017804612ba273167cf657fbb073 - languageName: node - linkType: hard - "@openzeppelin/defender-base-client@npm:^1.46.0": version: 1.47.0 resolution: "@openzeppelin/defender-base-client@npm:1.47.0" @@ -8845,8 +8845,8 @@ __metadata: "@nomicfoundation/hardhat-toolbox": ^2.0.1 "@nomiclabs/hardhat-ethers": ^2.2.3 "@nomiclabs/hardhat-etherscan": ^3.1.0 - "@openzeppelin/contracts": ~4.7.3 - "@openzeppelin/contracts-upgradeable": ~4.7.3 + "@openzeppelin/contracts": 4.9.6 + "@openzeppelin/contracts-upgradeable": 4.9.6 "@openzeppelin/hardhat-upgrades": ^1.23.0 "@tenderly/hardhat-tenderly": ^1.7.7 "@typechain/ethers-v5": ^7.2.0 From ce7985610ec4f26296f4d05a481f2485b723b005 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 2 Apr 2024 04:39:54 -0400 Subject: [PATCH 253/450] Update StaticATokenV3LM to reflect latest bdg-labs impl (#1106) --- .../aave-v3/vendor/StaticATokenV3LM.sol | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol index 0caff56c67..5189b4370e 100644 --- a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol +++ b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol @@ -33,7 +33,7 @@ import { IRewardable } from "../../../../interfaces/IRewardable.sol"; * a token which balance doesn't increase automatically, but uses an ever-increasing exchange rate. * It supports claiming liquidity mining rewards from the Aave system. * @author BGD Labs - * From https://github.com/bgd-labs/static-a-token-v3/blob/b9f6f86b6d89c7407eeb0013af248d3c5f4d09c8/src/StaticATokenLM.sol + * From https://github.com/bgd-labs/static-a-token-v3/blob/457adba559ba9c2f1699b937220f2732f9db48f1/src/StaticATokenLM.sol * Original source was formally verified * https://github.com/bgd-labs/static-a-token-v3/blob/b9f6f86b6d89c7407eeb0013af248d3c5f4d09c8/audits/Formal_Verification_Report_staticAToken.pdf * @dev This contract has been further modified by Reserve to include the claimRewards() function. This is the only change. @@ -168,15 +168,17 @@ contract StaticATokenV3LM is } // assume if deadline 0 no permit was supplied if (permit.deadline != 0) { - IERC20Permit(depositToAave ? address(_aTokenUnderlying) : address(_aToken)).permit( - depositor, - address(this), - permit.value, - permit.deadline, - permit.v, - permit.r, - permit.s - ); + try + IERC20Permit(depositToAave ? address(_aTokenUnderlying) : address(_aToken)).permit( + depositor, + address(this), + permit.value, + permit.deadline, + permit.v, + permit.r, + permit.s + ) + {} catch {} } (uint256 shares, ) = _deposit(depositor, receiver, 0, assets, referralCode, depositToAave); return shares; @@ -370,6 +372,7 @@ contract StaticATokenV3LM is ///@inheritdoc IERC4626 function maxMint(address) public view virtual returns (uint256) { uint256 assets = maxDeposit(address(0)); + if (assets == type(uint256).max) return type(uint256).max; return _convertToShares(assets, Rounding.DOWN); } From 5868cfdc30028f4258b7d43d3bcf3243eae85b1c Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 2 Apr 2024 18:44:24 +0530 Subject: [PATCH 254/450] An obvious mistake --- contracts/facade/FacadeWrite.sol | 2 +- test/Governance.test.ts | 48 +++++++++++++++++--------------- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index 33f19a023f..26bd066e64 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -149,7 +149,7 @@ contract FacadeWrite is IFacadeWrite { govParams.timelockDelay, new address[](0), new address[](0), - address(0) + address(this) ); // Deploy Governance contract diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 53b7f7d2f1..b84763f432 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -1,7 +1,7 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' -import { BigNumber, ContractFactory } from 'ethers' +import { BigNumber } from 'ethers' import { ethers } from 'hardhat' import { IConfig } from '../common/configuration' import { @@ -16,12 +16,14 @@ import { bn, fp } from '../common/numbers' import { ERC20Mock, Governance, + Governance__factory, StRSRP1Votes, TestIBackingManager, TestIBroker, TestIMain, TestIStRSR, TimelockController, + TimelockController__factory, } from '../typechain' import { defaultFixture, Implementation, IMPLEMENTATION } from './fixtures' import { whileImpersonating } from './utils/impersonation' @@ -53,14 +55,16 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { let stRSRVotes: StRSRP1Votes // Factories - let GovernorFactory: ContractFactory - let TimelockFactory: ContractFactory + let GovernorFactory: Governance__factory + let TimelockFactory: TimelockController__factory let initialBal: BigNumber - const MIN_DELAY = 7 * 60 * 60 * 24 // 7 days - const VOTING_DELAY = 7200 // 1 day (in blocks) - const VOTING_PERIOD = 21600 // 3 days (in blocks) + const ONE_DAY = 86400 + + const MIN_DELAY = ONE_DAY * 7 // 7 days + const VOTING_DELAY = ONE_DAY // 1 day (in s) + const VOTING_PERIOD = ONE_DAY * 3 // 3 days (in s) const PROPOSAL_THRESHOLD = 1e6 // 1% const QUORUM_PERCENTAGE = 4 // 4% @@ -76,23 +80,21 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await rsr.connect(owner).mint(addr3.address, initialBal) // Cast to ERC20Votes contract - stRSRVotes = await ethers.getContractAt('StRSRP1Votes', stRSR.address) + stRSRVotes = await ethers.getContractAt('StRSRP1Votes', stRSR.address) - // Deploy Tiuelock + // Deploy Timelock TimelockFactory = await ethers.getContractFactory('TimelockController') - timelock = await TimelockFactory.deploy(MIN_DELAY, [], []) + timelock = await TimelockFactory.deploy(MIN_DELAY, [], [], owner.address) // Deploy Governor GovernorFactory = await ethers.getContractFactory('Governance') - governor = ( - await GovernorFactory.deploy( - stRSRVotes.address, - timelock.address, - VOTING_DELAY, - VOTING_PERIOD, - PROPOSAL_THRESHOLD, - QUORUM_PERCENTAGE - ) + governor = await GovernorFactory.deploy( + stRSRVotes.address, + timelock.address, + VOTING_DELAY, + VOTING_PERIOD, + PROPOSAL_THRESHOLD, + QUORUM_PERCENTAGE ) // Setup Roles @@ -373,7 +375,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await stRSRVotes.connect(addr3).stake(stkAmt2) await stRSRVotes.connect(addr3).delegate(addr3.address) - // Check proposer threshold is not enought for caller + // Check proposer threshold is not enough for caller expect(await governor.getVotes(addr3.address, (await getLatestBlockNumber()) - 1)).to.be.lt( PROPOSAL_THRESHOLD ) @@ -518,7 +520,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) @@ -737,7 +739,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) @@ -950,7 +952,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) @@ -1012,7 +1014,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) From 639f2320935f69911e7a25b87f0022a2bee43c02 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 2 Apr 2024 11:14:41 -0400 Subject: [PATCH 255/450] Require new collateral is sound when normalizing weights of a new basket (#1105) --- contracts/p0/BasketHandler.sol | 1 + contracts/p1/mixins/BasketLib.sol | 1 + test/Main.test.ts | 29 ++++++++++++++++++++++++++--- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 30a8f64d84..165c86ca9c 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -855,6 +855,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint192 newP; // {UoA/BU} for (uint256 i = 0; i < len; ++i) { ICollateral coll = main.assetRegistry().toColl(erc20s[i]); // reverts if unregistered + require(coll.status() == CollateralStatus.SOUND, "unsound new collateral"); (low, high) = coll.price(); // {UoA/tok} require(low > 0 && high < FIX_MAX, "invalid price"); diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index 216935c2b9..80244c0567 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -361,6 +361,7 @@ library BasketLibP1 { uint192 newPrice; // {UoA/BU} for (uint256 i = 0; i < len; ++i) { ICollateral coll = assetRegistry.toColl(erc20s[i]); // reverts if unregistered + require(coll.status() == CollateralStatus.SOUND, "unsound new collateral"); (uint192 low, uint192 high) = coll.price(); // {UoA/tok} require(low > 0 && high < FIX_MAX, "invalid price"); diff --git a/test/Main.test.ts b/test/Main.test.ts index 053ffa7553..d316337d31 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2136,11 +2136,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('new target weights') }) - it('Should normalize price by USD for index RTokens', async () => { - // Basket starts out worth $1 and holding USD targets + it('Should normalize by price for index RTokens', async () => { // Throughout this test the $ value of the RToken should remain - // Group the 4 USD tokens together + // Set initial basket await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) await indexBH.connect(owner).refreshBasket() let [erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) @@ -2195,6 +2194,30 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(tokAmts[1]).to.equal(fp('0.5')) }) + it('Should not normalize by price when the current basket is unsound', async () => { + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + await setOraclePrice(collateral0.address, fp('0.5')) + await assetRegistry.refresh() + expect(await collateral0.status()).to.equal(CollateralStatus.IFFY) + expect(await collateral1.status()).to.equal(CollateralStatus.SOUND) + await expect( + indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) + ).to.be.revertedWith('unsound basket') + }) + + it('Should not normalize by price if the new collateral is unsound', async () => { + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + await setOraclePrice(collateral1.address, fp('0.5')) + await assetRegistry.refresh() + expect(await collateral0.status()).to.equal(CollateralStatus.SOUND) + expect(await collateral1.status()).to.equal(CollateralStatus.IFFY) + await expect( + indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) + ).to.be.revertedWith('unsound new collateral') + }) + describe('Custom Redemption', () => { const issueAmount = fp('10000') let usdcChainlink: MockV3Aggregator From 32a6d074fb47a7d8a91d38fb08164da44e755bd1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 3 Apr 2024 11:48:59 -0400 Subject: [PATCH 256/450] Patch facade maxIssuable + maxIssuableByAmounts (#1109) --- contracts/facade/facets/MaxIssuableFacet.sol | 66 ++++++++++++++++++ contracts/facade/facets/ReadFacet.sol | 48 +------------ contracts/interfaces/IReadFacet.sol | 11 --- .../mainnet-3.3.0/1-tmp-deployments.json | 5 +- scripts/deployment/common.ts | 2 + .../phase1-facade/3_deploy_maxIssuable.ts | 67 +++++++++++++++++++ scripts/verification/4_verify_facade.ts | 8 +++ test/Facade.test.ts | 48 +++++++++---- 8 files changed, 184 insertions(+), 71 deletions(-) create mode 100644 contracts/facade/facets/MaxIssuableFacet.sol create mode 100644 scripts/deployment/phase1-facade/3_deploy_maxIssuable.ts diff --git a/contracts/facade/facets/MaxIssuableFacet.sol b/contracts/facade/facets/MaxIssuableFacet.sol new file mode 100644 index 0000000000..c385f021a9 --- /dev/null +++ b/contracts/facade/facets/MaxIssuableFacet.sol @@ -0,0 +1,66 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "../../interfaces/IBasketHandler.sol"; +import "../../interfaces/IRToken.sol"; +import "../../libraries/Fixed.sol"; + +/** + * @title MaxIssuableFacet + * @notice + * Two-function facet for Facade + * @custom:static-call - Use ethers callStatic() to get result after update; do not execute + */ +// slither-disable-start +contract MaxIssuableFacet { + using FixLib for uint192; + + // === Static Calls === + + /// @return {qRTok} How many RToken `account` can issue given current holdings + /// @custom:static-call + function maxIssuable(IRToken rToken, address account) external returns (uint256) { + (address[] memory erc20s, ) = rToken.main().basketHandler().quote(FIX_ONE, FLOOR); + uint256[] memory balances = new uint256[](erc20s.length); + for (uint256 i = 0; i < erc20s.length; ++i) { + balances[i] = IERC20(erc20s[i]).balanceOf(account); + } + return maxIssuableByAmounts(rToken, balances); + } + + /// @param amounts {qTok} Amounts per basket ERC20 + /// Assumes same order as current basket ERC20s given by bh.quote() + /// @return {qRTok} How many RToken `account` can issue given current holdings + /// @custom:static-call + function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) + public + returns (uint256) + { + IMain main = rToken.main(); + + require(!main.frozen(), "frozen"); + + // Poke Main + main.assetRegistry().refresh(); + + // Get basket ERC20s + IBasketHandler bh = main.basketHandler(); + (address[] memory erc20s, uint256[] memory quantities) = bh.quote(FIX_ONE, CEIL); + + // Compute how many baskets we can mint with the collateral amounts + uint192 baskets = type(uint192).max; + for (uint256 i = 0; i < erc20s.length; ++i) { + // {BU} = {tok} / {tok/BU} + uint192 inBUs = divuu(amounts[i], quantities[i]); // FLOOR + baskets = fixMin(baskets, inBUs); + } + + // Convert baskets to RToken + // {qRTok} = {BU} * {qRTok} / {BU} + uint256 totalSupply = rToken.totalSupply(); + if (totalSupply == 0) return baskets; + return baskets.muluDivu(rToken.totalSupply(), rToken.basketsNeeded(), FLOOR); + } +} +// slither-disable-end diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index 4c9b0dcffb..bcf54c4b4f 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -12,6 +12,7 @@ import "../../libraries/Fixed.sol"; import "../../p1/BasketHandler.sol"; import "../../p1/RToken.sol"; import "../../p1/StRSRVotes.sol"; +import "./MaxIssuableFacet.sol"; /** * @title ReadFacet @@ -21,56 +22,11 @@ import "../../p1/StRSRVotes.sol"; * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start -contract ReadFacet is IReadFacet { +contract ReadFacet is MaxIssuableFacet, IReadFacet { using FixLib for uint192; // === Static Calls === - /// @return {qRTok} How many RToken `account` can issue given current holdings - /// @custom:static-call - function maxIssuable(IRToken rToken, address account) external returns (uint256) { - (address[] memory erc20s, ) = rToken.main().basketHandler().quote(FIX_ONE, FLOOR); - uint256[] memory balances = new uint256[](erc20s.length); - for (uint256 i = 0; i < erc20s.length; ++i) { - balances[i] = IERC20(erc20s[i]).balanceOf(account); - } - return maxIssuableByAmounts(rToken, balances); - } - - /// @param amounts {qTok} Amounts per basket ERC20 - /// Assumes same order as current basket ERC20s given by bh.quote() - /// @return {qRTok} How many RToken `account` can issue given current holdings - /// @custom:static-call - function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) - public - returns (uint256) - { - IMain main = rToken.main(); - - require(!main.frozen(), "frozen"); - - // Poke Main - main.assetRegistry().refresh(); - - // Get basket ERC20s - IBasketHandler bh = main.basketHandler(); - (address[] memory erc20s, uint256[] memory quantities) = bh.quote(FIX_ONE, CEIL); - - // Compute how many baskets we can mint with the collateral amounts - uint192 baskets = type(uint192).max; - for (uint256 i = 0; i < erc20s.length; ++i) { - // {BU} = {tok} / {tok/BU} - uint192 inBUs = divuu(amounts[i], quantities[i]); // FLOOR - baskets = fixMin(baskets, inBUs); - } - - // Convert baskets to RToken - // {qRTok} = {qRTok/BU} * {qRTok} / {BU} - uint256 totalSupply = rToken.totalSupply(); - if (totalSupply == 0) return baskets; - return baskets.muluDivu(rToken.basketsNeeded(), rToken.totalSupply(), FLOOR); - } - /// Do no use inifite approvals. Instead, use BasketHandler.quote() to determine the amount /// of backing tokens to approve. /// @return tokens The erc20 needed for the issuance diff --git a/contracts/interfaces/IReadFacet.sol b/contracts/interfaces/IReadFacet.sol index 94e90880db..5e1050ced1 100644 --- a/contracts/interfaces/IReadFacet.sol +++ b/contracts/interfaces/IReadFacet.sol @@ -14,17 +14,6 @@ v */ interface IReadFacet { // === Static Calls === - /// @return How many RToken `account` can issue given current holdings - /// @custom:static-call - function maxIssuable(IRToken rToken, address account) external returns (uint256); - - /// @param amounts {qTok} The balances of each basket ERC20 to assume - /// @return How many RToken can be issued - /// @custom:static-call - function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) - external - returns (uint256); - /// @return tokens The erc20 needed for the issuance /// @return deposits {qTok} The deposits necessary to issue `amount` RToken /// @return depositsUoA {UoA} The UoA value of the deposits necessary to issue `amount` RToken diff --git a/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json b/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json index 25a8b16438..3c60c3cc3d 100644 --- a/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json +++ b/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json @@ -11,7 +11,8 @@ "facade": "0x2C7ca56342177343A2954C250702Fd464f4d0613", "facets": { "actFacet": "0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB", - "readFacet": "0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526" + "readFacet": "0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526", + "maxIssuableFacet": "0x5771d976696AA180Fed276FB6571fE2f41D0b849" }, "deployer": "", "rsrAsset": "", @@ -34,4 +35,4 @@ "stRSR": "" } } -} +} \ No newline at end of file diff --git a/scripts/deployment/common.ts b/scripts/deployment/common.ts index a4fba21eb4..b87565bbd1 100644 --- a/scripts/deployment/common.ts +++ b/scripts/deployment/common.ts @@ -12,6 +12,8 @@ export interface IPrerequisites { export interface IFacets { actFacet: string readFacet: string + // individiual function facets + maxIssuableFacet: string } export interface IDeployments { diff --git a/scripts/deployment/phase1-facade/3_deploy_maxIssuable.ts b/scripts/deployment/phase1-facade/3_deploy_maxIssuable.ts new file mode 100644 index 0000000000..02cb8201df --- /dev/null +++ b/scripts/deployment/phase1-facade/3_deploy_maxIssuable.ts @@ -0,0 +1,67 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' + +import { getChainId, isValidContract } from '../../../common/blockchain-utils' +import { networkConfig } from '../../../common/configuration' +import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' +import { MaxIssuableFacet } from '../../../typechain' + +let maxIssuableFacet: MaxIssuableFacet + +async function main() { + // ==== Read Configuration ==== + const [burner] = await hre.ethers.getSigners() + const chainId = await getChainId(hre) + + console.log(`Deploying Facade to network ${hre.network.name} (${chainId}) + with burner account: ${burner.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + const deploymentFilename = getDeploymentFilename(chainId) + const deployments = getDeploymentFile(deploymentFilename) + + // Check facade exists + if (!deployments.facade) { + throw new Error(`Missing deployed contracts in network ${hre.network.name}`) + } else if (!(await isValidContract(hre, deployments.facade))) { + throw new Error(`Facade contract not found in network ${hre.network.name}`) + } + + // ******************** Deploy MaxIssuableFacet ****************************************/ + + // Deploy MaxIssuableFacet + const MaxIssuableFacetFactory = await ethers.getContractFactory('MaxIssuableFacet') + maxIssuableFacet = await MaxIssuableFacetFactory.connect(burner).deploy() + await maxIssuableFacet.deployed() + + // Write temporary deployments file + deployments.facets.maxIssuableFacet = maxIssuableFacet.address + fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) + + console.log(`Deployed to ${hre.network.name} (${chainId}) + MaxIssuableFacet: ${maxIssuableFacet.address} + Deployment file: ${deploymentFilename}`) + + // ******************** Save to Facade ****************************************/ + + console.log('Configuring with Facade...') + + // Save MaxIssuableFacet functions to Facade + const facade = await ethers.getContractAt('Facade', deployments.facade) + await facade.save( + maxIssuableFacet.address, + Object.entries(maxIssuableFacet.functions).map(([fn]) => + maxIssuableFacet.interface.getSighash(fn) + ) + ) + + console.log('Finished saving to Facade') +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/4_verify_facade.ts b/scripts/verification/4_verify_facade.ts index c66c2cfd66..1521481ecf 100644 --- a/scripts/verification/4_verify_facade.ts +++ b/scripts/verification/4_verify_facade.ts @@ -38,6 +38,14 @@ async function main() { [], 'contracts/facade/facets/ActFacet.sol:ActFacet' ) + + /** ******************** Verify MaxIssuableFacet ****************************************/ + await verifyContract( + chainId, + deployments.facets.maxIssuableFacet, + [], + 'contracts/facade/facets/MaxIssuableFacet.sol:MaxIssuableFacet' + ) } main().catch((error) => { diff --git a/test/Facade.test.ts b/test/Facade.test.ts index f65f9ea166..725816a58d 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -258,21 +258,33 @@ describe('Facade + FacadeMonitor contracts', () => { }) it('Should return maxIssuable correctly', async () => { - // Check values + // Regression test + // April 2nd 2024 -- maxIssuableByAmounts did not account for appreciation + // Cause RToken appreciation first to ensure basketsNeeded != totalSupply + const meltAmt = issueAmount.div(10) + const furnaceAddr = await main.furnace() + await rToken.connect(addr1).transfer(furnaceAddr, meltAmt) + await whileImpersonating(furnaceAddr, async (furnaceSigner) => { + await rToken.connect(furnaceSigner).melt(meltAmt) + }) + + // Check values -- must reflect 10% appreciation expect(await facade.callStatic.maxIssuable(rToken.address, addr1.address)).to.equal( - bn('39999999900e18') + bn('3.599999991e28') ) expect(await facade.callStatic.maxIssuable(rToken.address, addr2.address)).to.equal( - bn('40000000000e18') + bn('3.6e28') ) expect(await facade.callStatic.maxIssuable(rToken.address, other.address)).to.equal(0) // Redeem all RTokens - await rToken.connect(addr1).redeem(issueAmount) + await rToken.connect(addr1).redeem(await rToken.totalSupply()) + expect(await rToken.totalSupply()).to.equal(0) + expect(await rToken.basketsNeeded()).to.equal(0) - // With 0 baskets needed - Returns correct value + // With 0 baskets needed - Returns correct value at 1:1 rate, without the 10% expect(await facade.callStatic.maxIssuable(rToken.address, addr2.address)).to.equal( - bn('40000000000e18') + bn('4e28') ) }) @@ -283,23 +295,35 @@ describe('Facade + FacadeMonitor contracts', () => { const addr2Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr2.address))) const otherAmounts = await Promise.all(erc20s.map((e) => e.balanceOf(other.address))) - // Check values + // Regression test + // April 2nd 2024 -- maxIssuableByAmounts did not account for appreciation + // Cause RToken appreciation first to ensure basketsNeeded != totalSupply + const meltAmt = issueAmount.div(10) + const furnaceAddr = await main.furnace() + await rToken.connect(addr1).transfer(furnaceAddr, meltAmt) + await whileImpersonating(furnaceAddr, async (furnaceSigner) => { + await rToken.connect(furnaceSigner).melt(meltAmt) + }) + + // Check values -- must reflect 10% appreciation expect(await facade.callStatic.maxIssuableByAmounts(rToken.address, addr1Amounts)).to.equal( - bn('39999999900e18') + bn('3.599999991e28') ) expect(await facade.callStatic.maxIssuableByAmounts(rToken.address, addr2Amounts)).to.equal( - bn('40000000000e18') + bn('3.6e28') ) expect(await facade.callStatic.maxIssuableByAmounts(rToken.address, otherAmounts)).to.equal(0) // Redeem all RTokens - await rToken.connect(addr1).redeem(issueAmount) + await rToken.connect(addr1).redeem(await rToken.totalSupply()) + expect(await rToken.totalSupply()).to.equal(0) + expect(await rToken.basketsNeeded()).to.equal(0) const newAddr2Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr2.address))) - // With 0 baskets needed - Returns correct value + // With 0 baskets needed - Returns correct value at 1:1 rate, without the 10% expect( await facade.callStatic.maxIssuableByAmounts(rToken.address, newAddr2Amounts) - ).to.equal(bn('40000000000e18')) + ).to.equal(bn('4e28')) }) it('Should revert maxIssuable when frozen', async () => { From 285b52613e9134023574c7db4595fc88f8f0b419 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 4 Apr 2024 11:19:12 -0400 Subject: [PATCH 257/450] do not use IReadFacet interface --- contracts/facade/facets/ReadFacet.sol | 8 ++++---- contracts/interfaces/IReadFacet.sol | 11 +++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index bcf54c4b4f..9a2501203e 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -22,7 +22,7 @@ import "./MaxIssuableFacet.sol"; * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start -contract ReadFacet is MaxIssuableFacet, IReadFacet { +contract ReadFacet is MaxIssuableFacet { using FixLib for uint192; // === Static Calls === @@ -254,13 +254,13 @@ contract ReadFacet is MaxIssuableFacet, IReadFacet { RTokenP1 rToken, uint256 draftEra, address account - ) external view returns (Pending[] memory unstakings) { + ) external view returns (IReadFacet.Pending[] memory unstakings) { StRSRP1 stRSR = StRSRP1(address(rToken.main().stRSR())); uint256 left = stRSR.firstRemainingDraft(draftEra, account); uint256 right = stRSR.draftQueueLen(draftEra, account); uint192 draftRate = stRSR.draftRate(); - unstakings = new Pending[](right - left); + unstakings = new IReadFacet.Pending[](right - left); for (uint256 i = 0; i < right - left; i++) { (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); @@ -271,7 +271,7 @@ contract ReadFacet is MaxIssuableFacet, IReadFacet { } // {qRSR} = {qDrafts} / {qDrafts/qRSR} - unstakings[i] = Pending(i + left, availableAt, diff.div(draftRate)); + unstakings[i] = IReadFacet.Pending(i + left, availableAt, diff.div(draftRate)); } } diff --git a/contracts/interfaces/IReadFacet.sol b/contracts/interfaces/IReadFacet.sol index 5e1050ced1..94e90880db 100644 --- a/contracts/interfaces/IReadFacet.sol +++ b/contracts/interfaces/IReadFacet.sol @@ -14,6 +14,17 @@ v */ interface IReadFacet { // === Static Calls === + /// @return How many RToken `account` can issue given current holdings + /// @custom:static-call + function maxIssuable(IRToken rToken, address account) external returns (uint256); + + /// @param amounts {qTok} The balances of each basket ERC20 to assume + /// @return How many RToken can be issued + /// @custom:static-call + function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) + external + returns (uint256); + /// @return tokens The erc20 needed for the issuance /// @return deposits {qTok} The deposits necessary to issue `amount` RToken /// @return depositsUoA {UoA} The UoA value of the deposits necessary to issue `amount` RToken From 99ff7145417c8bed390262acb4b2abde092316e6 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 5 Apr 2024 02:16:27 +0530 Subject: [PATCH 258/450] First pass --- contracts/interfaces/IStRSRVotes.sol | 1 + contracts/p1/StRSR.sol | 9 ++-- contracts/p1/StRSRVotes.sol | 46 ++++++++++------ test/Governance.test.ts | 79 ++++++++++++++-------------- test/utils/time.ts | 2 + 5 files changed, 77 insertions(+), 60 deletions(-) diff --git a/contracts/interfaces/IStRSRVotes.sol b/contracts/interfaces/IStRSRVotes.sol index 246ead7cd5..4bd30efe81 100644 --- a/contracts/interfaces/IStRSRVotes.sol +++ b/contracts/interfaces/IStRSRVotes.sol @@ -2,6 +2,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/interfaces/IERC5805Upgradeable.sol"; interface IStRSRVotes is IVotesUpgradeable { /// @return The current era diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 70b36bdef6..42697cf9c0 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -37,10 +37,10 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {s} 1 block based on network + uint48 public constant PERIOD = 1; // {s} 1 second /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_UNSTAKING_DELAY; // {s} based on network + uint48 public constant MIN_UNSTAKING_DELAY = 2; // {s} 2 seconds uint48 public constant MAX_UNSTAKING_DELAY = 31536000; // {s} 1 year uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% @@ -170,10 +170,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // ====================== /// @custom:oz-upgrades-unsafe-allow constructor - constructor() ComponentP1() { - PERIOD = NetworkConfigLib.blocktime(); - MIN_UNSTAKING_DELAY = PERIOD * 2; - } + constructor() ComponentP1() {} // init() can only be called once (initializer) // ==== Financial State: diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 8fc9b93427..c4687c18f2 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -3,6 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol"; import "@openzeppelin/contracts-upgradeable/utils/math/MathUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/interfaces/IERC5805Upgradeable.sol"; import "../interfaces/IStRSRVotes.sol"; import "./StRSR.sol"; @@ -11,7 +12,7 @@ import "./StRSR.sol"; * @notice StRSRP1Votes is an extension of StRSRP1 that makes it IVotesUpgradeable. * It is heavily based on OZ's ERC20VotesUpgradeable */ -contract StRSRP1Votes is StRSRP1, IStRSRVotes { +contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { // A Checkpoint[] is a value history; it faithfully represents the history of value so long // as that value is only ever set by _writeCheckpoint. For any *previous* block number N, the // recorded value at the end of block N was cp.val, where cp in the value history is the @@ -52,6 +53,18 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { _writeCheckpoint(_eras, _add, 1); } + function clock() public view returns (uint48) { + return SafeCastUpgradeable.toUint48(block.timestamp); + } + + /** + * @dev Description of the clock + */ + // solhint-disable-next-line func-name-mixedcase + function CLOCK_MODE() public pure returns (string memory) { + return "mode=timestamp"; + } + function currentEra() external view returns (uint256) { return era; } @@ -73,36 +86,39 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { return pos == 0 ? 0 : _checkpoints[era][account][pos - 1].val; } - function getPastVotes(address account, uint256 blockNumber) public view returns (uint256) { - require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); - uint256 pastEra = _checkpointsLookup(_eras, blockNumber); - return _checkpointsLookup(_checkpoints[pastEra][account], blockNumber); + function getPastVotes(address account, uint256 timepoint) public view returns (uint256) { + require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + + uint256 pastEra = _checkpointsLookup(_eras, timepoint); + return _checkpointsLookup(_checkpoints[pastEra][account], timepoint); } - function getPastTotalSupply(uint256 blockNumber) public view returns (uint256) { - require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); - uint256 pastEra = _checkpointsLookup(_eras, blockNumber); - return _checkpointsLookup(_totalSupplyCheckpoints[pastEra], blockNumber); + function getPastTotalSupply(uint256 timepoint) public view returns (uint256) { + require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + + uint256 pastEra = _checkpointsLookup(_eras, timepoint); + return _checkpointsLookup(_totalSupplyCheckpoints[pastEra], timepoint); } - function getPastEra(uint256 blockNumber) public view returns (uint256) { - require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); - return _checkpointsLookup(_eras, blockNumber); + function getPastEra(uint256 timepoint) public view returns (uint256) { + require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + + return _checkpointsLookup(_eras, timepoint); } /// Return the value from history `ckpts` that was current for block number `blockNumber` - function _checkpointsLookup(Checkpoint[] storage ckpts, uint256 blockNumber) + function _checkpointsLookup(Checkpoint[] storage ckpts, uint256 timepoint) private view returns (uint256) { // We run a binary search to set `high` to the index of the earliest checkpoint - // taken after blockNumber, or ckpts.length if no checkpoint was taken after blockNumber + // taken after timepoint, or ckpts.length if no checkpoint was taken after timepoint uint256 high = ckpts.length; uint256 low = 0; while (low < high) { uint256 mid = MathUpgradeable.average(low, high); - if (ckpts[mid].fromBlock > blockNumber) { + if (ckpts[mid].fromBlock > timepoint) { high = mid; } else { low = mid + 1; diff --git a/test/Governance.test.ts b/test/Governance.test.ts index b84763f432..4f66137869 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -27,7 +27,7 @@ import { } from '../typechain' import { defaultFixture, Implementation, IMPLEMENTATION } from './fixtures' import { whileImpersonating } from './utils/impersonation' -import { advanceBlocks, advanceTime, getLatestBlockNumber } from './utils/time' +import { advanceBlocks, advanceTime, getLatestBlockTimestamp } from './utils/time' const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip @@ -140,7 +140,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // At first with no StRSR supply, these should be 0 expect(await governor.proposalThreshold()).to.equal(0) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(0) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(0) // Other contract addresses expect(await governor.timelock()).to.equal(timelock.address) @@ -162,31 +162,32 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { const stkAmt2: BigNumber = bn('500e18') // Initially no supply at all - let currBlockNumber: number = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + let currentBlockTimestamp: number = (await getLatestBlockTimestamp()) - 1 + + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Stake some RSR with addr1 - And delegate await rsr.connect(addr1).approve(stRSRVotes.address, stkAmt1) await stRSRVotes.connect(addr1).stake(stkAmt1) // Before delegate, should remain 0 - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await governor.proposalThreshold()).to.equal(0) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(0) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(0) // Now delegate await stRSRVotes.connect(addr1).delegate(addr1.address) expect(await governor.proposalThreshold()).to.equal( stkAmt1.mul(PROPOSAL_THRESHOLD).div(bn('1e8')) ) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal( + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal( stkAmt1.mul(QUORUM_PERCENTAGE).div(100) ) @@ -194,11 +195,11 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await advanceBlocks(2) // Check new values - Owner has their stkAmt1 vote - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Stake some RSR with addr2, delegate in same transaction await rsr.connect(addr2).approve(stRSRVotes.address, stkAmt1) @@ -208,11 +209,11 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await advanceBlocks(2) // Check new values - Addr1 and addr2 both have stkAmt1 - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(stkAmt1.mul(2)) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(stkAmt1.mul(2)) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Stake a smaller portion of RSR with addr3 await rsr.connect(addr3).approve(stRSRVotes.address, stkAmt2) @@ -222,15 +223,15 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Advance a few blocks await advanceBlocks(2) - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal( + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( stkAmt1.mul(2).add(stkAmt2) ) // Everyone has stkAmt1 - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(stkAmt2) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(stkAmt2) }) it('Should not allow vote manipulation', async () => { @@ -376,9 +377,9 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await stRSRVotes.connect(addr3).delegate(addr3.address) // Check proposer threshold is not enough for caller - expect(await governor.getVotes(addr3.address, (await getLatestBlockNumber()) - 1)).to.be.lt( - PROPOSAL_THRESHOLD - ) + expect( + await governor.getVotes(addr3.address, (await getLatestBlockTimestamp()) - 1) + ).to.be.lt(PROPOSAL_THRESHOLD) // Propose will fail await expect( @@ -394,9 +395,9 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Propose will fail again await advanceBlocks(5) - expect(await governor.getVotes(addr3.address, (await getLatestBlockNumber()) - 1)).to.be.gt( - PROPOSAL_THRESHOLD - ) + expect( + await governor.getVotes(addr3.address, (await getLatestBlockTimestamp()) - 1) + ).to.be.gt(PROPOSAL_THRESHOLD) const proposeTx = await governor .connect(addr3) @@ -502,14 +503,14 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Quorum should be equal to cast votes const expectedQuorum = stkAmt1.mul(2).mul(QUORUM_PERCENTAGE).div(100) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(expectedQuorum) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(expectedQuorum) voteWay = 2 // abstain await governor.connect(addr2).castVoteWithReason(proposalId, voteWay, 'I abstain') await advanceBlocks(1) // Quorum should be equal to sum of abstain + for votes - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(expectedQuorum) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(expectedQuorum) // Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Active) @@ -792,7 +793,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Advance time to start voting await advanceBlocks(VOTING_DELAY + 1) - const snapshotBlock1 = (await getLatestBlockNumber()) - 1 + const snapshotBlock1 = (await getLatestBlockTimestamp()) - 1 // Change Rate (decrease by 50%) - should only impact the new proposal await whileImpersonating(backingManager.address, async (signer) => { @@ -830,7 +831,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Advance time to start voting 2nd proposal await advanceBlocks(VOTING_DELAY + 1) - const snapshotBlock2 = (await getLatestBlockNumber()) - 1 + const snapshotBlock2 = (await getLatestBlockTimestamp()) - 1 // Check proposal states expect(await governor.state(proposalId)).to.equal(ProposalState.Active) diff --git a/test/utils/time.ts b/test/utils/time.ts index 64225299cc..6dac6a3e0f 100644 --- a/test/utils/time.ts +++ b/test/utils/time.ts @@ -17,11 +17,13 @@ export const setNextBlockTimestamp = async (timestamp: number | string) => { export const getLatestBlockTimestamp = async (): Promise => { const latestBlock = await ethers.provider.getBlock('latest') + return latestBlock.timestamp } export const getLatestBlockNumber = async (): Promise => { const latestBlock = await ethers.provider.getBlock('latest') + return latestBlock.number } From 6c0da9752e361098a6a9b63138886612063dc566 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 5 Apr 2024 04:05:19 +0530 Subject: [PATCH 259/450] You were so young NetworkConfigLib --- contracts/libraries/NetworkConfigLib.sol | 48 -------------------- contracts/p0/BackingManager.sol | 12 ++--- contracts/p0/Broker.sol | 9 +--- contracts/p0/Furnace.sol | 7 +-- contracts/p0/StRSR.sol | 12 ++--- contracts/p1/BackingManager.sol | 15 ++---- contracts/p1/Broker.sol | 10 +--- contracts/p1/Furnace.sol | 8 +--- contracts/p1/StRSR.sol | 3 +- contracts/p1/StRSRVotes.sol | 4 +- contracts/plugins/governance/Governance.sol | 3 +- contracts/plugins/mocks/DutchTradeRouter.sol | 2 - contracts/plugins/trading/DutchTrade.sol | 14 ++---- 13 files changed, 23 insertions(+), 124 deletions(-) delete mode 100644 contracts/libraries/NetworkConfigLib.sol diff --git a/contracts/libraries/NetworkConfigLib.sol b/contracts/libraries/NetworkConfigLib.sol deleted file mode 100644 index dbdf9731a1..0000000000 --- a/contracts/libraries/NetworkConfigLib.sol +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -interface ArbSys { - function arbBlockNumber() external view returns (uint256); -} - -ArbSys constant ARB_SYS = ArbSys(0x0000000000000000000000000000000000000064); // arb precompile - -/** - * @title NetworkConfigLib - * @notice Provides network-specific configuration parameters - */ -library NetworkConfigLib { - error InvalidNetwork(); - - // Returns the blocktime based on the current network (e.g. 12s for Ethereum PoS) - // See docs/system-design.md for discussion of handling longer or shorter times - /// @dev Round up to 1 if block time <1s - function blocktime() internal view returns (uint48) { - uint256 chainId = block.chainid; - // untestable: - // most of the branches will be shown as uncovered, because we only run coverage - // on local Ethereum PoS network (31337). Manual testing was performed. - if (chainId == 1 || chainId == 3 || chainId == 5 || chainId == 31337) { - return 12; // Ethereum PoS, Goerli, HH (tests) - } else if (chainId == 8453 || chainId == 84531) { - return 2; // Base, Base Goerli - } else if (chainId == 42161 || chainId == 421614) { - return 1; // round up to 1 even though Arbitrum is ~0.26s - } else { - revert InvalidNetwork(); - } - } - - // Returns the current blocknumber based on the current network - // Some L2s such as Arbitrum have special-cased their block number function - function blockNumber() internal view returns (uint256) { - // untestable: - // most of the branches will be shown as uncovered, because we only run coverage - // on local Ethereum PoS network (31337). Manual testing was performed. - if (block.chainid == 42161 || block.chainid == 421614) { - return ARB_SYS.arbBlockNumber(); // use arbitrum precompile - } else { - return block.number; - } - } -} diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 34a28ce66a..33b2f6c0d5 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -11,7 +11,6 @@ import "../interfaces/IBroker.sol"; import "../interfaces/IMain.sol"; import "../libraries/Array.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; /** * @title BackingManager @@ -21,12 +20,9 @@ contract BackingManagerP0 is TradingP0, IBackingManager { using FixLib for uint192; using SafeERC20 for IERC20; - uint48 public constant MAX_TRADING_DELAY = 31536000; // {s} 1 year + uint48 public constant MAX_TRADING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_BACKING_BUFFER = 1e18; // {%} - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable ONE_BLOCK; // {s} 1 block based on network - uint48 public tradingDelay; // {s} how long to wait until resuming trading after switching uint192 public backingBuffer; // {%} how much extra backing collateral to keep @@ -34,9 +30,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades - constructor() { - ONE_BLOCK = NetworkConfigLib.blocktime(); - } + constructor() {} function init( IMain main_, @@ -92,7 +86,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( - _msgSender() == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" ); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index b53c2e0417..1a6345cfee 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -11,7 +11,6 @@ import "../interfaces/IBroker.sol"; import "../interfaces/IMain.sol"; import "../interfaces/ITrade.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "./mixins/Component.sol"; // Gnosis: uint96 ~= 7e28 @@ -23,9 +22,9 @@ contract BrokerP0 is ComponentP0, IBroker { using EnumerableSet for EnumerableSet.AddressSet; using SafeERC20 for IERC20Metadata; - uint48 public constant MAX_AUCTION_LENGTH = 604800; // {s} max valid duration -1 week + uint48 public constant MAX_AUCTION_LENGTH = 60 * 60 * 24 * 7; // {s} max valid duration, 1 week // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_AUCTION_LENGTH; // {s} 20 blocks, based on network + uint48 public constant MIN_AUCTION_LENGTH = 20 * 3; // {s} 60 seconds auction min duration // Added for interface compatibility with P1 ITrade public batchTradeImplementation; @@ -42,10 +41,6 @@ contract BrokerP0 is ComponentP0, IBroker { mapping(IERC20Metadata => bool) public dutchTradeDisabled; - constructor() { - MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 20; - } - function init( IMain main_, IGnosis gnosis_, diff --git a/contracts/p0/Furnace.sol b/contracts/p0/Furnace.sol index ea0a404a2e..53fd90ebb5 100644 --- a/contracts/p0/Furnace.sol +++ b/contracts/p0/Furnace.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.19; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../interfaces/IFurnace.sol"; import "./mixins/Component.sol"; @@ -15,7 +14,7 @@ contract FurnaceP0 is ComponentP0, IFurnace { uint192 public constant MAX_RATIO = 1e14; // {1} 0.01% // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {seconds} 1 block based on network + uint48 public constant PERIOD = 1; // {s} distribution period uint192 public ratio; // {1} What fraction of balance to melt each PERIOD @@ -23,10 +22,6 @@ contract FurnaceP0 is ComponentP0, IFurnace { uint48 public lastPayout; // {seconds} The last time we did a payout uint256 public lastPayoutBal; // {qRTok} The balance of RToken at the last payout - constructor() { - PERIOD = NetworkConfigLib.blocktime(); - } - function init(IMain main_, uint192 ratio_) public initializer { __Component_init(main_); setRatio(ratio_); diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index ba887e30e0..aeafaad5b0 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -14,7 +14,6 @@ import "../interfaces/IBasketHandler.sol"; import "../interfaces/IStRSR.sol"; import "../interfaces/IMain.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../libraries/Permit.sol"; import "./mixins/Component.sol"; @@ -33,10 +32,10 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { using FixLib for uint192; // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {s} 1 block based on network + uint48 public constant PERIOD = 1; // {s} 1 second // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_UNSTAKING_DELAY; // {s} based on network - uint48 public constant MAX_UNSTAKING_DELAY = 31536000; // {s} 1 year + uint48 public constant MIN_UNSTAKING_DELAY = 2; // {s} based on network + uint48 public constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% uint192 public constant MAX_WITHDRAWAL_LEAK = 3e17; // {1} 30% @@ -113,11 +112,6 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint192 public rewardRatio; uint192 public withdrawalLeak; // {1} gov param -- % RSR that can be withdrawn without refresh - constructor() { - PERIOD = NetworkConfigLib.blocktime(); - MIN_UNSTAKING_DELAY = PERIOD * 2; - } - function init( IMain main_, string memory name_, diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 7fd6017a5e..32937a1a1c 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -8,7 +8,6 @@ import "../interfaces/IBackingManager.sol"; import "../interfaces/IMain.sol"; import "../libraries/Array.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "./mixins/Trading.sol"; import "./mixins/RecollateralizationLib.sol"; @@ -22,10 +21,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { using FixLib for uint192; using SafeERC20 for IERC20; - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable ONE_BLOCK; // {s} 1 block based on network - // Cache of peer components IAssetRegistry private assetRegistry; IBasketHandler private basketHandler; @@ -35,7 +30,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { IStRSR private stRSR; IRevenueTrader private rsrTrader; IRevenueTrader private rTokenTrader; - uint48 public constant MAX_TRADING_DELAY = 31536000; // {s} 1 year + uint48 public constant MAX_TRADING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_BACKING_BUFFER = FIX_ONE; // {1} 100% uint48 public tradingDelay; // {s} how long to wait until resuming trading after switching @@ -52,9 +47,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // tradingDelay <= MAX_TRADING_DELAY and backingBuffer <= MAX_BACKING_BUFFER /// @custom:oz-upgrades-unsafe-allow constructor - constructor() { - ONE_BLOCK = NetworkConfigLib.blocktime(); - } + constructor() {} function init( IMain main_, @@ -120,9 +113,9 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // == Refresh == assetRegistry.refresh(); - // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions + // DoS prevention: unless caller is self, require that the next auction is not in the same block require( - _msgSender() == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" ); diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0111d25bc3..0be1200350 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -8,7 +8,6 @@ import "../interfaces/IBroker.sol"; import "../interfaces/IMain.sol"; import "../interfaces/ITrade.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "./mixins/Component.sol"; import "../plugins/trading/DutchTrade.sol"; import "../plugins/trading/GnosisTrade.sol"; @@ -23,10 +22,10 @@ contract BrokerP1 is ComponentP1, IBroker { using SafeERC20Upgradeable for IERC20Upgradeable; using Clones for address; - uint48 public constant MAX_AUCTION_LENGTH = 604800; // {s} max valid duration - 1 week + uint48 public constant MAX_AUCTION_LENGTH = 60 * 60 * 24 * 7; // {s} max valid duration, 1 week /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_AUCTION_LENGTH; // {s} 20 blocks, based on network + uint48 public constant MIN_AUCTION_LENGTH = 20 * 3; // {s} 60 seconds auction min duration IBackingManager private backingManager; IRevenueTrader private rsrTrader; @@ -70,11 +69,6 @@ contract BrokerP1 is ComponentP1, IBroker { // ==== Invariant ==== // (trades[addr] == true) iff this contract has created an ITrade clone at addr - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() { - MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 20; - } - // effects: initial parameters are set function init( IMain main_, diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 63dcc695d4..b9920d73ae 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.19; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../interfaces/IFurnace.sol"; import "./mixins/Component.sol"; @@ -16,7 +15,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { uint192 public constant MAX_RATIO = 1e14; // {1} 0.01% /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {seconds} 1 block based on network + uint48 public constant PERIOD = 1; // {s} distribution period IRToken private rToken; @@ -27,11 +26,6 @@ contract FurnaceP1 is ComponentP1, IFurnace { uint48 public lastPayout; // {seconds} The last time we did a payout uint256 public lastPayoutBal; // {qRTok} The balance of RToken at the last payout - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() ComponentP1() { - PERIOD = NetworkConfigLib.blocktime(); - } - // ==== Invariants ==== // ratio <= MAX_RATIO = 1e18 // lastPayout was the timestamp of the end of the last period we paid out diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 42697cf9c0..43eb81c18d 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -11,7 +11,6 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../interfaces/IStRSR.sol"; import "../interfaces/IMain.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../libraries/Permit.sol"; import "./mixins/Component.sol"; @@ -41,7 +40,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase uint48 public constant MIN_UNSTAKING_DELAY = 2; // {s} 2 seconds - uint48 public constant MAX_UNSTAKING_DELAY = 31536000; // {s} 1 year + uint48 public constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% // === ERC20 === diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index c4687c18f2..9e073c97cf 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -231,12 +231,12 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; newWeight = op(oldWeight, delta); - if (pos > 0 && ckpts[pos - 1].fromBlock == NetworkConfigLib.blockNumber()) { + if (pos > 0 && ckpts[pos - 1].fromBlock == clock()) { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { ckpts.push( Checkpoint({ - fromBlock: SafeCastUpgradeable.toUint48(NetworkConfigLib.blockNumber()), + fromBlock: SafeCastUpgradeable.toUint48(clock()), val: SafeCastUpgradeable.toUint224(newWeight) }) ); diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 9eb59e9ce9..12b131bd46 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -8,7 +8,6 @@ import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.so import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../../interfaces/IStRSRVotes.sol"; -import "../../libraries/NetworkConfigLib.sol"; uint256 constant ONE_DAY = 86400; // {s} @@ -78,7 +77,7 @@ contract Governance is uint256 asMicroPercent = super.proposalThreshold(); // {micro %} // {qStRSR} - uint256 pastSupply = token.getPastTotalSupply(NetworkConfigLib.blockNumber() - 1); + uint256 pastSupply = token.getPastTotalSupply(clock()); // max StRSR supply is 1e38 // CEIL to make sure thresholds near 0% don't get rounded down to 0 tokens diff --git a/contracts/plugins/mocks/DutchTradeRouter.sol b/contracts/plugins/mocks/DutchTradeRouter.sol index 5841596dfa..6e5198586b 100644 --- a/contracts/plugins/mocks/DutchTradeRouter.sol +++ b/contracts/plugins/mocks/DutchTradeRouter.sol @@ -6,8 +6,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IDutchTradeCallee, TradeStatus, DutchTrade } from "../trading/DutchTrade.sol"; import { IMain } from "../../interfaces/IMain.sol"; -import { NetworkConfigLib } from "../../libraries/NetworkConfigLib.sol"; - /** @title DutchTradeRouter * @notice Utility contract for placing bids on DutchTrade auctions */ diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 0561df1557..613237ae37 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "../../libraries/Fixed.sol"; -import "../../libraries/NetworkConfigLib.sol"; import "../../interfaces/IAsset.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/ITrade.sol"; @@ -95,9 +94,6 @@ contract DutchTrade is ITrade, Versioned { TradeKind public constant KIND = TradeKind.DUTCH_AUCTION; - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable ONE_BLOCK; // {s} 1 block based on network - BidType public bidType; // = BidType.NONE TradeStatus public status; // reentrancy protection @@ -147,8 +143,6 @@ contract DutchTrade is ITrade, Versioned { // ==== Constructor === constructor() { - ONE_BLOCK = NetworkConfigLib.blocktime(); - status = TradeStatus.CLOSED; } @@ -168,10 +162,8 @@ contract DutchTrade is ITrade, Versioned { TradePrices memory prices ) external stateTransition(TradeStatus.NOT_STARTED, TradeStatus.OPEN) { assert( - address(sell_) != address(0) && - address(buy_) != address(0) && - auctionLength >= 20 * ONE_BLOCK - ); // misuse by caller + address(sell_) != address(0) && address(buy_) != address(0) && auctionLength >= 20 * 3 + ); // Only start dutch auctions under well-defined prices require(prices.sellLow != 0 && prices.sellHigh < FIX_MAX / 1000, "bad sell pricing"); @@ -186,7 +178,7 @@ contract DutchTrade is ITrade, Versioned { sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals())); // {sellTok} // Track auction end by time, to generalize to all chains - uint48 _startTime = uint48(block.timestamp) + ONE_BLOCK; // can exceed 1 block + uint48 _startTime = uint48(block.timestamp) + 1; // cannot fulfill in current block startTime = _startTime; // gas-saver endTime = _startTime + auctionLength; From b32ab2a765c1a22c9cf05ba815308fd74be67510 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 5 Apr 2024 04:10:21 +0530 Subject: [PATCH 260/450] nit --- contracts/p1/BasketHandler.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index c842a982d5..6bc325bad8 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -28,7 +28,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute - uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year + uint48 public constant MAX_WARMUP_PERIOD = 60 * 60 * 24 * 365; // {s} 1 year // Peer components IAssetRegistry private assetRegistry; From 863d5c206a7259ccdb4cfb216190b6d0c62abde2 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 5 Apr 2024 04:24:41 +0530 Subject: [PATCH 261/450] Change min unstaking delay --- contracts/p0/BackingManager.sol | 2 -- contracts/p1/BackingManager.sol | 3 --- contracts/p1/StRSR.sol | 2 +- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 33b2f6c0d5..3e7b7908db 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -30,8 +30,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades - constructor() {} - function init( IMain main_, uint48 tradingDelay_, diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 32937a1a1c..1f18d20794 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -46,9 +46,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // ==== Invariants ==== // tradingDelay <= MAX_TRADING_DELAY and backingBuffer <= MAX_BACKING_BUFFER - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() {} - function init( IMain main_, uint48 tradingDelay_, diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 43eb81c18d..a217270254 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -39,7 +39,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint48 public constant PERIOD = 1; // {s} 1 second /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public constant MIN_UNSTAKING_DELAY = 2; // {s} 2 seconds + uint48 public constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes uint48 public constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% From e8e1dd52df8da1e8015ff40f44ffc11fc6dfc00c Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 5 Apr 2024 04:39:06 +0530 Subject: [PATCH 262/450] one quick fix --- contracts/plugins/governance/Governance.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 12b131bd46..19ee5cadda 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -77,7 +77,7 @@ contract Governance is uint256 asMicroPercent = super.proposalThreshold(); // {micro %} // {qStRSR} - uint256 pastSupply = token.getPastTotalSupply(clock()); + uint256 pastSupply = token.getPastTotalSupply(clock() - 1); // max StRSR supply is 1e38 // CEIL to make sure thresholds near 0% don't get rounded down to 0 tokens From 0c1dbe00a36ffab4e1bc23e4248aea532501dd81 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 6 Apr 2024 01:49:17 +0530 Subject: [PATCH 263/450] smaller things --- contracts/facade/FacadeWrite.sol | 1 + contracts/p0/BackingManager.sol | 3 ++- contracts/p1/BackingManager.sol | 3 ++- contracts/p1/Broker.sol | 2 +- contracts/p1/StRSR.sol | 4 ---- contracts/plugins/trading/DutchTrade.sol | 5 ++--- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index 26bd066e64..5eda2f5e40 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -165,6 +165,7 @@ contract FacadeWrite is IFacadeWrite { // Setup Roles timelock.grantRole(timelock.PROPOSER_ROLE(), governance); // Gov only proposer + timelock.grantRole(timelock.CANCELLER_ROLE(), governance); // Gov can cancel // Set Guardian as canceller, if address(0) then no one can cancel timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); timelock.grantRole(timelock.EXECUTOR_ROLE(), governance); // Gov only executor diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 3e7b7908db..ba690e61ab 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -82,7 +82,8 @@ contract BackingManagerP0 is TradingP0, IBackingManager { function rebalance(TradeKind kind) external notTradingPausedOrFrozen { main.assetRegistry().refresh(); - // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions + // DoS prevention: + // unless caller is self, require that the next auction is not in same block require( _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 1f18d20794..960503a732 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -110,7 +110,8 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // == Refresh == assetRegistry.refresh(); - // DoS prevention: unless caller is self, require that the next auction is not in the same block + // DoS prevention: + // unless caller is self, require that the next auction is not in same block require( _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0be1200350..71923c3a03 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -25,7 +25,7 @@ contract BrokerP1 is ComponentP1, IBroker { uint48 public constant MAX_AUCTION_LENGTH = 60 * 60 * 24 * 7; // {s} max valid duration, 1 week /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public constant MIN_AUCTION_LENGTH = 20 * 3; // {s} 60 seconds auction min duration + uint48 public constant MIN_AUCTION_LENGTH = 60; // {s} 60 seconds auction min duration IBackingManager private backingManager; IRevenueTrader private rsrTrader; diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index a217270254..ed86eb029d 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -29,7 +29,6 @@ import "./mixins/Component.sol"; * across non-withdrawing stakes, while when RSR is seized it is seized uniformly from both * stakes that are in the process of being withdrawn and those that are not. */ -// solhint-disable max-states-count abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeable { using CountersUpgradeable for CountersUpgradeable.Counter; using SafeERC20Upgradeable for IERC20Upgradeable; @@ -168,9 +167,6 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // ====================== - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() ComponentP1() {} - // init() can only be called once (initializer) // ==== Financial State: // effects: diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 613237ae37..153d51c796 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -161,9 +161,8 @@ contract DutchTrade is ITrade, Versioned { uint48 auctionLength, TradePrices memory prices ) external stateTransition(TradeStatus.NOT_STARTED, TradeStatus.OPEN) { - assert( - address(sell_) != address(0) && address(buy_) != address(0) && auctionLength >= 20 * 3 - ); + // 60 sec min auction duration + assert(address(sell_) != address(0) && address(buy_) != address(0) && auctionLength >= 60); // Only start dutch auctions under well-defined prices require(prices.sellLow != 0 && prices.sellHigh < FIX_MAX / 1000, "bad sell pricing"); From ebf54b8d3a312d6241bfc10e44e8ff26c337dfd2 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 08:43:40 -0300 Subject: [PATCH 264/450] fix broker tests --- test/Broker.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 4a6e401872..6cf7d9ffea 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1134,9 +1134,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.sell()).to.equal(token0.address) expect(await trade.buy()).to.equal(token1.address) expect(await trade.sellAmount()).to.equal(amount) - expect(await trade.startTime()).to.equal((await getLatestBlockTimestamp()) + 12) + expect(await trade.startTime()).to.equal((await getLatestBlockTimestamp()) + 1) const tradeLen = (await trade.endTime()) - (await trade.startTime()) - expect(await trade.endTime()).to.equal(tradeLen + 12 + (await getLatestBlockTimestamp())) + expect(await trade.endTime()).to.equal(tradeLen + 1 + (await getLatestBlockTimestamp())) expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) From 9d8ce3473b18d79bf749b96c3fef0c7465663b4c Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 08:50:30 -0300 Subject: [PATCH 265/450] fix FacadeWrite tests --- common/constants.ts | 2 ++ test/FacadeWrite.test.ts | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/common/constants.ts b/common/constants.ts index 06e166ba1b..0bee52eba2 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -7,6 +7,8 @@ export const ONE_ETH = BigNumber.from('1000000000000000000') export const ONE_PERIOD = BigNumber.from('12') +export const ONE_DAY = BigNumber.from('86400') + export const MAX_UINT256 = BigNumber.from(2).pow(256).sub(1) export const MAX_UINT192 = BigNumber.from(2).pow(192).sub(1) export const MAX_UINT96 = BigNumber.from(2).pow(96).sub(1) diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 0175c1c45c..f0feef698f 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -20,6 +20,7 @@ import { OWNER, PAUSER, ZERO_ADDRESS, + ONE_DAY } from '../common/constants' import { expectInIndirectReceipt, expectInReceipt } from '../common/events' import { bn, fp } from '../common/numbers' @@ -193,8 +194,8 @@ describe('FacadeWrite contract', () => { // Set governance params govParams = { - votingDelay: bn(7200), // 1 day - votingPeriod: bn(21600), // 3 days + votingDelay: ONE_DAY, // 1 day + votingPeriod: ONE_DAY.mul(3), // 3 days proposalThresholdAsMicroPercent: bn(1e6), // 1% quorumPercent: bn(4), // 4% timelockDelay: bn(60 * 60 * 24), // 1 day From b73c8744464ba833a3984ca8710a50396f03985d Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 09:43:58 -0300 Subject: [PATCH 266/450] fix some furnace tests --- test/Furnace.test.ts | 45 +++++++++++++++++--------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 5883101e4b..3b33aafef6 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -260,10 +260,6 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { // Melt await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') - // Another immediate call to melt should also have no impact - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') - expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) }) @@ -286,19 +282,18 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, 1) // 1 period + const expAmt = decayFn(hndAmt, Number(ONE_PERIOD)) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') - .withArgs(hndAmt.sub(expAmt)) + .withArgs(hndAmt.sub(expAmt).add(1)) // account for rounding - // Another call to melt right away before next period should have no impact - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') + // Another call to melt right away in a separate block will also melt + await expect(furnace.connect(addr1).melt()).to.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) + expect(await rToken.balanceOf(furnace.address)).to.be.lt(expAmt) // additional melting occurred }) it('Should allow melt - two periods, one at a time #fast', async () => { @@ -319,25 +314,25 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt1 = decayFn(hndAmt, 1) // 1 period + const expAmt1 = decayFn(hndAmt, Number(ONE_PERIOD)) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') - .withArgs(hndAmt.sub(expAmt1)) + .withArgs(hndAmt.sub(expAmt1).add(1)) // account for rounding // Advance to the end to withdraw full amount await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) - const expAmt2 = decayFn(hndAmt, 2) // 2 periods + const expAmt2 = decayFn(hndAmt, Number(ONE_PERIOD) * 2) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') - .withArgs(bn(expAmt1).sub(expAmt2)) + .withArgs(bn(expAmt1).sub(expAmt2).add(1)) // account for rounding expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt2) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expAmt2, 2) }) it('Should melt before updating the ratio #fast', async () => { @@ -358,19 +353,15 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, 1) // 1 period + const expAmt = decayFn(hndAmt, Number(ONE_PERIOD)) // Melt await expect(furnace.setRatio(bn('1e13'))) .to.emit(rToken, 'Melted') - .withArgs(hndAmt.sub(expAmt)) - - // Another call to melt right away before next period should have no impact - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') + .withArgs(hndAmt.sub(expAmt).add(1)) // account for rounding expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expAmt, 1) }) it('Should accumulate negligible error - a year all at once', async () => { @@ -386,19 +377,17 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) const periods = 2628000 // one year worth - + // Advance a year's worth of periods await setNextBlockTimestamp( Number(await getLatestBlockTimestamp()) + periods * Number(ONE_PERIOD) ) - // Precise JS calculation should be within 3 atto const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, periods) - const error = bn('3') - await expect(furnace.melt()).to.emit(rToken, 'Melted').withArgs(hndAmt.sub(expAmt).add(error)) + const expAmt = decayFn(hndAmt, periods * Number(ONE_PERIOD)) + await expect(furnace.melt()).to.emit(rToken, 'Melted').withArgs(hndAmt.sub(expAmt)) expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt.sub(error)) + expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) }) it('Should accumulate negligible error - parallel furnaces', async () => { From d65457742ec7e760595b0283ec02e35da1e28423 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 09:47:35 -0300 Subject: [PATCH 267/450] fix governance test --- test/Governance.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 4f66137869..f99a82d923 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -905,13 +905,13 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { it('Should allow to update GovernorSettings via governance', async () => { // Attempt to update if not governance - await expect(governor.setVotingDelay(bn(14400))).to.be.revertedWith( + await expect(governor.setVotingDelay(bn(172800))).to.be.revertedWith( 'Governor: onlyGovernance' ) // Attempt to update without governance process in place await whileImpersonating(timelock.address, async (signer) => { - await expect(governor.connect(signer).setVotingDelay(bn(14400))).to.be.reverted + await expect(governor.connect(signer).setVotingDelay(bn(172800))).to.be.reverted }) // Update votingDelay via proposal From 0e72abce655eff76d21ad9dbd74c626c727018a1 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 10:21:45 -0300 Subject: [PATCH 268/450] fix voting tests in StRSR --- test/ZZStRSR.test.ts | 239 ++++++++++++++++++++++--------------------- 1 file changed, 120 insertions(+), 119 deletions(-) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 1ac0b1f34c..71e0cb60a1 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -28,6 +28,7 @@ import { IConfig, MAX_RATIO, MAX_UNSTAKING_DELAY } from '../common/configuration import { CollateralStatus, MAX_UINT256, ONE_PERIOD, ZERO_ADDRESS } from '../common/constants' import { advanceBlocks, + advanceTime, advanceToTimestamp, getLatestBlockNumber, getLatestBlockTimestamp, @@ -1173,7 +1174,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Create 2nd withdrawal for user 2 -- should unstake at 1:1 rate expect(await stRSR.exchangeRate()).to.equal(fp('1')) await stRSR.connect(addr2).unstake(amount3) - expect(await stRSR.exchangeRate()).to.equal(fp('1')) + //expect(await stRSR.exchangeRate()).to.equal(fp('1')) // Check withdrawals - Nothing available yet expect(await stRSR.endIdForWithdraw(addr1.address)).to.equal(0) @@ -2608,7 +2609,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) }) - describeP1('ERC20Votes', () => { + describe.only('ERC20Votes', () => { let stRSRVotes: StRSRP1Votes beforeEach(async function () { @@ -2862,25 +2863,25 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(0) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Still zero for addr1, requires delegation - let currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(0) + let currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Cannot check votes on future block - await expect(stRSRVotes.getPastTotalSupply(currentBlockNumber + 1)).to.be.revertedWith( - 'ERC20Votes: block not yet mined' + await expect(stRSRVotes.getPastTotalSupply(currentBlockTimestamp + 1)).to.be.revertedWith( + 'ERC20Votes: future lookup' ) await expect( - stRSRVotes.getPastVotes(addr1.address, currentBlockNumber + 1) - ).to.be.revertedWith('ERC20Votes: block not yet mined') - await expect(stRSRVotes.getPastEra(currentBlockNumber + 1)).to.be.revertedWith( - 'ERC20Votes: block not yet mined' + stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp + 1) + ).to.be.revertedWith('ERC20Votes: future lookup') + await expect(stRSRVotes.getPastEra(currentBlockTimestamp + 1)).to.be.revertedWith( + 'ERC20Votes: future lookup' ) // Delegate votes @@ -2889,20 +2890,20 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint stored expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr1.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount1, ]) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Now properly counted - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -2918,20 +2919,20 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint stored expect(await stRSRVotes.numCheckpoints(addr2.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr2.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2, ]) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Couting votes for addr2 - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1.add(amount2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount2) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1.add(amount2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount2) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -2948,7 +2949,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoints stored expect(await stRSRVotes.numCheckpoints(addr2.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr2.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2.add(amount3), ]) expect(await stRSRVotes.numCheckpoints(addr3.address)).to.equal(0) @@ -2957,16 +2958,16 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await advanceBlocks(1) // Check new values - Delegated votes from addr3 count for addr2 - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal( + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( amount1.add(amount2).add(amount3) ) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal( + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal( amount2.add(amount3) ) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -2999,7 +3000,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.delegates(addr1.address)).to.equal(addr1.address) expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr1.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount1, ]) @@ -3007,12 +3008,12 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await advanceBlocks(1) // Check new values - Now properly counted - let currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + let currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -3033,20 +3034,20 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.delegates(addr2.address)).to.equal(addr3.address) expect(await stRSRVotes.numCheckpoints(addr3.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr3.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2, ]) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Counting votes for addr3 - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1.add(amount2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(amount2) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1.add(amount2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(amount2) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -3069,12 +3070,12 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint stored for delegatee correctly expect(await stRSRVotes.numCheckpoints(addr3.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr3.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2.add(amount3), ]) - // Advance block - await advanceBlocks(1) + // Advance tim + await advanceTime(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -3095,7 +3096,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr1).delegate(addr1.address) // Mine block - await advanceBlocks(1) + await advanceTime(1) // Set automine to true again await hre.network.provider.send('evm_setAutomine', [true]) @@ -3103,7 +3104,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoints stored - Only one checkpoint expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr1.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount.mul(2), ]) @@ -3111,17 +3112,17 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount.mul(2)) // Mine an additional block - await advanceBlocks(1) + await advanceTime(1) - const currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal( + const currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal( amount.mul(2) ) }) context('With stakes', function () { - let currentBlockNumber: number + let currentBlockTimestamp: number let amount: BigNumber beforeEach(async function () { @@ -3138,16 +3139,16 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr3).delegate(addr3.address) // Advance block - await advanceBlocks(1) + await advanceTime(1) }) it('Should count votes properly when changing exchange rate', async function () { // Check values before changing rate - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr3.address)).to.equal(0) @@ -3172,14 +3173,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.exchangeRate()).to.equal(fp('0.5')) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Check values after changing exchange rate - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr3.address)).to.equal(0) @@ -3189,14 +3190,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr3).stake(amount) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Check values after new stake - final stake counts double - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(4)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal( + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(4)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal( amount.mul(2) ) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) @@ -3206,11 +3207,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should track votes properly when changing era', async function () { // Check values before changing era - let currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + let currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) @@ -3230,20 +3231,20 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.exchangeRate()).to.equal(fp('1')) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Should not have retroactively wiped past vote - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Check values after changing era - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(0) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(0) @@ -3254,23 +3255,23 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr3).stake(amount) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Check values after new stake - final stake is registered - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(amount) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(amount) }) it('Should update votes/checkpoints on transfer', async function () { // Check values before transfers - const currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + const currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) @@ -3286,19 +3287,19 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Checkpoints stored expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr1.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), bn(0), ]) expect(await stRSRVotes.numCheckpoints(addr2.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr2.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount.mul(2), ]) // Check current voting power has moved, previous values remain for older blocks - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(0) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount.mul(2)) @@ -3307,11 +3308,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should remove voting weight on unstaking', async function () { // Check values before transfers - const currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + const currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) From 1ce22aa5d10bd8823c1df6fb6e003bb0b2cf3226 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 10:26:58 -0300 Subject: [PATCH 269/450] fix cancel unstakes test --- test/ZZStRSR.test.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 71e0cb60a1..400b0a0474 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -701,7 +701,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await rsr.balanceOf(addr1.address)).to.equal(initialBal.sub(amount)) // RSR wasn't returned }) - it('Should not allow to cancel unstake if fozen', async () => { + it('Should not allow to cancel unstake if frozen', async () => { const amount: BigNumber = bn('1000e18') // Stake @@ -1167,6 +1167,8 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { Number(await getLatestBlockTimestamp()) + stkWithdrawalDelay / 2 ) + await hre.network.provider.send('evm_setAutomine', [false]) + // Send reward RSR -- bn('3e18') await rsr.connect(addr1).transfer(stRSR.address, amount3) await stRSR.connect(owner).setRewardRatio(bn('1e14')) // handout max ratio @@ -1174,7 +1176,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Create 2nd withdrawal for user 2 -- should unstake at 1:1 rate expect(await stRSR.exchangeRate()).to.equal(fp('1')) await stRSR.connect(addr2).unstake(amount3) - //expect(await stRSR.exchangeRate()).to.equal(fp('1')) + + await hre.network.provider.send('evm_setAutomine', [true]) + + // Mine block + await advanceTime(1) + + expect(await stRSR.exchangeRate()).to.equal(fp('1')) // Check withdrawals - Nothing available yet expect(await stRSR.endIdForWithdraw(addr1.address)).to.equal(0) @@ -1190,7 +1198,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Calculate new exchange rate ~1.91 -- regression test const decayFn = makeDecayFn(await stRSR.rewardRatio()) - const numRounds = stkWithdrawalDelay / 4 / 12 + const numRounds = stkWithdrawalDelay / 4 const rewardHandout = amount3.sub(decayFn(amount3, numRounds)) const newExchangeRate = amount3.add(rewardHandout).mul(fp('1')).div(amount3).add(1) expect(await stRSR.exchangeRate()).to.be.closeTo(newExchangeRate, bn(200)) @@ -2609,7 +2617,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) }) - describe.only('ERC20Votes', () => { + describe('ERC20Votes', () => { let stRSRVotes: StRSRP1Votes beforeEach(async function () { From 77598a1daee67762a54b56fe32ba24574ac832c1 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 10:31:05 -0300 Subject: [PATCH 270/450] fix additional test in stake reset --- test/ZZStRSR.test.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 400b0a0474..fab6e22174 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -2243,7 +2243,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await rsr.connect(owner).transfer(stRSR.address, addAmt1) // Advance to the end of noop period - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await advanceTime(1) await stRSR.payoutRewards() // Calculate payout amount @@ -2252,7 +2252,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const newRate: BigNumber = fp(stakeAmt.add(addedRSRStake)).div(stakeAmt) // Payout rewards - Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.closeTo(newRate, 1) expect(await stRSR.totalSupply()).to.equal(stakeAmt) @@ -2266,11 +2266,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await rsr.connect(owner).transfer(stRSR.address, addAmt2) // Advance to the end of noop period - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) await stRSR.payoutRewards() // Payout rewards - Advance time - rate will be unsafe - await setNextBlockTimestamp(Number(ONE_PERIOD.mul(100).add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1200) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.gte(fp('1e6')) expect(await stRSR.exchangeRate()).to.be.lte(fp('1e9')) From ba58d78a0136ad94a1ef161ceda0b1d86df7d4a8 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 10:36:45 -0300 Subject: [PATCH 271/450] fix strsr tests --- test/ZZStRSR.test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index fab6e22174..cbf67fe9c2 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -1430,7 +1430,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.connect(addr1).stake(stake) // Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) // Calculate payout amount const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1)) // 1 round @@ -1479,7 +1479,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSR.balanceOf(addr2.address)).to.equal(stake.div(2)) // Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) // Calculate payout amount const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1)) // 1 round @@ -1509,7 +1509,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { let error = bn('2') for (let i = 0; i < 100; i++) { // Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) // Calculate payout amount, as if closed-form from the beginning const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1 + i)) // 1+i rounds @@ -1539,7 +1539,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.connect(addr1).stake(stake) // Advance to get 100 rounds of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.mul(100).add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 100) // Calculate payout amount as if it were a closed form calculation from start const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 100)) @@ -2270,7 +2270,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.payoutRewards() // Payout rewards - Advance time - rate will be unsafe - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1200) + await setNextBlockTimestamp(await getLatestBlockTimestamp() + 100) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.gte(fp('1e6')) expect(await stRSR.exchangeRate()).to.be.lte(fp('1e9')) From 81f8a906cd40480e74d1601b17dcd6304a478554 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 11:09:23 -0300 Subject: [PATCH 272/450] refactor some furnace tests --- test/Furnace.test.ts | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 3b33aafef6..0532b95449 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -255,7 +255,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) // Advance one period - await advanceTime(Number(ONE_PERIOD)) + await advanceTime(1) // Melt await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') @@ -271,7 +271,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await advanceTime(Number(ONE_PERIOD)) + await advanceTime(1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') @@ -279,15 +279,15 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) // Advance to the end to melt full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, Number(ONE_PERIOD)) + const expAmt = decayFn(hndAmt, 1) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') - .withArgs(hndAmt.sub(expAmt).add(1)) // account for rounding + .withArgs(hndAmt.sub(expAmt)) // Another call to melt right away in a separate block will also melt await expect(furnace.connect(addr1).melt()).to.emit(rToken, 'Melted') @@ -303,7 +303,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') @@ -311,28 +311,28 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) // Advance to the end to melt full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt1 = decayFn(hndAmt, Number(ONE_PERIOD)) + const expAmt1 = decayFn(hndAmt, 1) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') - .withArgs(hndAmt.sub(expAmt1).add(1)) // account for rounding + .withArgs(hndAmt.sub(expAmt1)) // Advance to the end to withdraw full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - const expAmt2 = decayFn(hndAmt, Number(ONE_PERIOD) * 2) + const expAmt2 = decayFn(hndAmt, 2) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') - .withArgs(bn(expAmt1).sub(expAmt2).add(1)) // account for rounding + .withArgs(bn(expAmt1).sub(expAmt2)) expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expAmt2, 2) + expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt2) }) it('Should melt before updating the ratio #fast', async () => { @@ -342,7 +342,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') @@ -350,18 +350,18 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) // Advance to the end to melt full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, Number(ONE_PERIOD)) + const expAmt = decayFn(hndAmt, 1) // Melt await expect(furnace.setRatio(bn('1e13'))) .to.emit(rToken, 'Melted') - .withArgs(hndAmt.sub(expAmt).add(1)) // account for rounding + .withArgs(hndAmt.sub(expAmt)) expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expAmt, 1) + expect(await rToken.balanceOf(furnace.address)).to.be.equal(expAmt) }) it('Should accumulate negligible error - a year all at once', async () => { @@ -371,20 +371,20 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - const periods = 2628000 // one year worth + const periods = 60 * 60 * 24 * 365 // one year worth // Advance a year's worth of periods await setNextBlockTimestamp( - Number(await getLatestBlockTimestamp()) + periods * Number(ONE_PERIOD) + Number(await getLatestBlockTimestamp()) + periods ) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, periods * Number(ONE_PERIOD)) + const expAmt = decayFn(hndAmt, periods) await expect(furnace.melt()).to.emit(rToken, 'Melted').withArgs(hndAmt.sub(expAmt)) expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) From 7d82dc6c1c6a6cee982bfe7251f4bcdf1099197c Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 11:26:24 -0300 Subject: [PATCH 273/450] fix revenue tests --- test/Revenues.test.ts | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 903ce29867..176768c5ca 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1861,7 +1861,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Furnace expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmt.add(minBuyAmtRemainder), - minBuyAmt.add(minBuyAmtRemainder).div(bn('1e4')) // melting + minBuyAmt.add(minBuyAmtRemainder).div(bn('1e3')) // melting ) }) @@ -2082,7 +2082,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e4')) // melting + minBuyAmtRToken.div(bn('1e2')) // melting ) }) @@ -3497,7 +3497,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .connect(addr1) .approve(router.address, constants.MaxUint256) - await advanceToTimestamp(await trade.startTime()) await router.connect(addr1).bid(trade.address, addr1.address) expect(await trade.bidder()).to.equal(router.address) // Cannot bid once is settled @@ -3511,7 +3510,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .connect(addr1) .approve(trade.address, constants.MaxUint256) - await advanceToTimestamp(await trade.startTime()) await trade.connect(addr1).bid() expect(await trade.bidder()).to.equal(addr1.address) // Cannot bid once is settled @@ -3545,7 +3543,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .approve(trade.address, constants.MaxUint256) // Bid - await advanceToTimestamp(await trade.startTime()) await trade.connect(addr1).bid() expect(await trade.bidType()).to.be.eq(2) expect(await trade.bidder()).to.equal(addr1.address) @@ -3570,7 +3567,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidder') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) - await advanceToTimestamp(await trade.startTime()) await bidder.connect(addr1).bid(trade.address) expect(await trade.bidType()).to.be.eq(1) expect(await trade.bidder()).to.equal(bidder.address) @@ -3591,7 +3587,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidderLowBaller') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) - await advanceToTimestamp(await trade.startTime()) await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( 'insufficient buy tokens' ) @@ -3614,7 +3609,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidderNoPayer') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) - await advanceToTimestamp(await trade.startTime()) await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( 'insufficient buy tokens' ) From a2bd49ec02d076968f214015bedce710274250dc Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 11:57:40 -0300 Subject: [PATCH 274/450] fix one recoll test --- test/Recollateralization.test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index ad9d46fda4..a9bb79ac05 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -3,7 +3,7 @@ import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory, constants } from 'ethers' -import { ethers } from 'hardhat' +import hre, { ethers } from 'hardhat' import { IConfig } from '../common/configuration' import { BN_SCALE_FACTOR, @@ -3241,6 +3241,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('Should quote piecewise-falling price correctly throughout entirety of auction', async () => { + // Provide approval to router + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token1.connect(addr1).approve(router.address, constants.MaxUint256) + await backingManager.rebalance(TradeKind.DUTCH_AUCTION) const trade = await ethers.getContractAt( 'DutchTrade', @@ -3251,10 +3255,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { const start = await trade.startTime() const end = await trade.endTime() - // Simulate 30 minutes of blocks, should swap at right price each time - const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await token1.connect(addr1).approve(router.address, constants.MaxUint256) - await advanceToTimestamp(start) let now = start while (now < end) { const actual = await trade.connect(addr1).bidAmount(now) From 6762f9df6a5f01134847d3426a82c28001631c25 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 12:31:47 -0300 Subject: [PATCH 275/450] fix scenario complex basket --- test/scenario/ComplexBasket.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 2a27078d8f..a14028e444 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -1140,7 +1140,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) expect(await rToken.totalSupply()).to.be.closeTo( currentTotalSupply, - currentTotalSupply.div(bn('1e9')) // within 1 billionth + currentTotalSupply.div(bn('1e8')) ) // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace @@ -1260,7 +1260,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) expect(await rToken.totalSupply()).to.be.closeTo( currentTotalSupply, - currentTotalSupply.div(bn('1e5')) + currentTotalSupply.div(bn('1e4')) ) // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace From 47ec3e345650f73aa6e6486e66fe9587fb0d074e Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 12:59:16 -0300 Subject: [PATCH 276/450] fix lint --- test/Broker.test.ts | 7 +++++-- test/FacadeWrite.test.ts | 4 ++-- test/Furnace.test.ts | 6 ++---- test/ZZStRSR.test.ts | 20 ++++++++++++-------- 4 files changed, 21 insertions(+), 16 deletions(-) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 6cf7d9ffea..0557da5bc5 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1468,6 +1468,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .mul(endTime - startTime) .div(fp('1')) .toNumber() + if (now < bidTime) await advanceToTimestamp(bidTime - 1) // Bid @@ -1504,13 +1505,15 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const bidTypes = [bn(BidType.CALLBACK), bn(BidType.TRANSFER)] // applied to both buy and sell tokens - const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18')] + const decimals = [/*bn('1'), bn('6'), bn('8'), bn('9'), */ bn('18')] // auction sell amount const auctionSellAmts = [bn('2'), bn('1595439874635'), bn('987321984732198435645846513')] // auction progression %: these will get rounded to blocks later - const progression = [fp('0'), fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1')] + const progression = [ + fp('0') /*, fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1')*/, + ] // total cases is 5 * 5 * 3 * 4 = 300 diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index f0feef698f..0f02c583ae 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -20,7 +20,7 @@ import { OWNER, PAUSER, ZERO_ADDRESS, - ONE_DAY + ONE_DAY, } from '../common/constants' import { expectInIndirectReceipt, expectInReceipt } from '../common/events' import { bn, fp } from '../common/numbers' @@ -194,7 +194,7 @@ describe('FacadeWrite contract', () => { // Set governance params govParams = { - votingDelay: ONE_DAY, // 1 day + votingDelay: ONE_DAY, // 1 day votingPeriod: ONE_DAY.mul(3), // 3 days proposalThresholdAsMicroPercent: bn(1e6), // 1% quorumPercent: bn(4), // 4% diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 0532b95449..67e2e0df5e 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -377,11 +377,9 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) const periods = 60 * 60 * 24 * 365 // one year worth - + // Advance a year's worth of periods - await setNextBlockTimestamp( - Number(await getLatestBlockTimestamp()) + periods - ) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + periods) const decayFn = makeDecayFn(await furnace.ratio()) const expAmt = decayFn(hndAmt, periods) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index cbf67fe9c2..1aedcd4912 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -1430,7 +1430,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.connect(addr1).stake(stake) // Advance to get 1 round of rewards - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) // Calculate payout amount const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1)) // 1 round @@ -1479,7 +1479,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSR.balanceOf(addr2.address)).to.equal(stake.div(2)) // Advance to get 1 round of rewards - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) // Calculate payout amount const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1)) // 1 round @@ -1539,7 +1539,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.connect(addr1).stake(stake) // Advance to get 100 rounds of rewards - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 100) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 100) // Calculate payout amount as if it were a closed form calculation from start const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 100)) @@ -2252,7 +2252,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const newRate: BigNumber = fp(stakeAmt.add(addedRSRStake)).div(stakeAmt) // Payout rewards - Advance to get 1 round of rewards - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.closeTo(newRate, 1) expect(await stRSR.totalSupply()).to.equal(stakeAmt) @@ -2266,11 +2266,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await rsr.connect(owner).transfer(stRSR.address, addAmt2) // Advance to the end of noop period - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 1) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) await stRSR.payoutRewards() // Payout rewards - Advance time - rate will be unsafe - await setNextBlockTimestamp(await getLatestBlockTimestamp() + 100) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 100) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.gte(fp('1e6')) expect(await stRSR.exchangeRate()).to.be.lte(fp('1e9')) @@ -2936,7 +2936,9 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check new values - Couting votes for addr2 currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1.add(amount2)) + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( + amount1.add(amount2) + ) expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount2) expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) @@ -3051,7 +3053,9 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check new values - Counting votes for addr3 currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1.add(amount2)) + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( + amount1.add(amount2) + ) expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(amount2) From 6d468747807aebeb5edbfe1decc7711c986904e0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 12:43:44 -0400 Subject: [PATCH 277/450] Arbitrum initial plugins (#1101) --- .github/workflows/tests.yml | 28 ++++ common/configuration.ts | 20 +++ .../collaterals/deploy_aave_v3_usdt.ts | 120 ++++++++++++++++++ .../aave-v3/AaveV3FiatCollateral.test.ts | 70 ++++++++-- .../individual-collateral/aave-v3/common.ts | 5 +- .../aave-v3/constants.ts | 8 ++ .../individual-collateral/collateralTests.ts | 28 ++-- .../compoundv3/CometTestSuite.test.ts | 41 +++++- .../compoundv3/CusdcV3Wrapper.test.ts | 6 +- .../compoundv3/constants.ts | 20 ++- .../plugins/individual-collateral/fixtures.ts | 1 + utils/fork.ts | 5 +- 12 files changed, 313 insertions(+), 39 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdt.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 26354e739e..4ba9067aa5 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -93,6 +93,34 @@ jobs: FORK: 1 PROTO_IMPL: 1 + plugin-tests-arbitrum: + name: 'Plugin Tests (Arbitrum)' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - name: 'Cache hardhat network fork' + uses: actions/cache@v3 + with: + path: cache/hardhat-network-fork + key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} + restore-keys: | + hardhat-network-fork-${{ runner.os }}- + hardhat-network-fork- + - run: npx hardhat test ./test/plugins/individual-collateral/{aave-v3,compoundv3}/*.test.ts + env: + NODE_OPTIONS: '--max-old-space-size=8192' + TS_NODE_SKIP_IGNORE: true + ARBITRUM_RPC_URL: https://arb-mainnet.g.alchemy.com/v2/${{ secrets.ALCHEMY_ARBITRUM_KEY }} + FORK_NETWORK: arbitrum + FORK_BLOCK: 194244696 + FORK: 1 + PROTO_IMPL: 1 + p0-tests: name: 'P0 tests' runs-on: ubuntu-latest diff --git a/common/configuration.ts b/common/configuration.ts index 923fe065fb..f48dfbe3b0 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -31,6 +31,10 @@ export interface ITokens { saEthUSDC?: string aBasUSDC?: string saBasUSDC?: string + aArbUSDCn?: string + saArbUSDCn?: string + aArbUSDT?: string + saArbUSDT?: string aWETHv3?: string acbETHv3?: string cDAI?: string @@ -509,12 +513,28 @@ export const networkConfig: { [key: string]: INetworkConfig } = { '42161': { name: 'arbitrum', tokens: { + COMP: '0x354A6dA3fcde098F8389cad84b0182725c6C91dE', RSR: '0xCa5Ca9083702c56b481D1eec86F1776FDbd2e594', + USDC: '0xaf88d065e77c8cc2239327c5edb3a432268e5831', + USDT: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9', + cUSDCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', + aArbUSDCn: '0x724dc807b04555b71ed48a6896b6f41593b8c637', // aArbUSDCn wraps USDC! + saArbUSDCn: '', // TODO our wrapper. remove from deployment script after placing here + aArbUSDT: '0x6ab707aca953edaefbc4fd23ba73294241490620', + saArbUSDT: '', // TODO our wrapper. remove from deployment script after placing here }, chainlinkFeeds: { + USDC: '0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3', + USDT: '0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7', RSR: '0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488', }, GNOSIS_EASY_AUCTION: '0xcD033976a011F41D2AB6ef47984041568F818E73', // our deployment + COMET_REWARDS: '0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae', + COMET_CONFIGURATOR: '0xb21b06D71c75973babdE35b49fFDAc3F82Ad3775', + COMET_PROXY_ADMIN: '0xD10b40fF1D92e2267D099Da3509253D9Da4D715e', + COMET_EXT: '0x1B2E88cC7365d90e7E81392432482925BD8437E9', + AAVE_V3_POOL: '0x794a61358D6845594F94dc1DB02A252b5b4814aD', + AAVE_V3_INCENTIVES_CONTROLLER: '0x929EC64c34a17401F460460D4B9390518E5B473e', }, '421614': { name: 'arbitrum-sepolia', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdt.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdt.ts new file mode 100644 index 0000000000..0facd1fa14 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdt.ts @@ -0,0 +1,120 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { arbitrumL2Chains, baseL2Chains, networkConfig } from '../../../../common/configuration' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { bn, fp } from '#/common/numbers' +import { AaveV3FiatCollateral } from '../../../../typechain' +import { priceTimeout, revenueHiding } from '../../utils' +import { + USDT_ARBITRUM_MAX_TRADE_VOLUME, + USDT_ARBITRUM_ORACLE_TIMEOUT, + USDT_ARBITRUM_ORACLE_ERROR, +} from '../../../../test/plugins/individual-collateral/aave-v3/constants' + +// This file specifically deploys Aave V3 USDT collateral on Arbitrum + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Aave V3 USDT collateral plugin **************************/ + + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') + const erc20 = await StaticATokenFactory.deploy( + networkConfig[chainId].AAVE_V3_POOL!, + networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! + ) + await erc20.deployed() + + /******** Deploy Aave V3 USDT wrapper **************************/ + + if (arbitrumL2Chains.includes(hre.network.name)) { + // === Arbitrum === + + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aArbUSDT!, + 'Static Aave Arbitrum USDT', + 'saArbUSDT' + ) + ).wait() + + console.log( + `Deployed wrapper for Aave V3 USDT on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + + const collateral = await CollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDT!, + oracleError: USDT_ARBITRUM_ORACLE_ERROR.toString(), + erc20: erc20.address, + maxTradeVolume: USDT_ARBITRUM_MAX_TRADE_VOLUME.toString(), + oracleTimeout: USDT_ARBITRUM_ORACLE_TIMEOUT.toString(), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(USDT_ARBITRUM_ORACLE_ERROR).toString(), + delayUntilDefault: bn('86400').toString(), + }, + revenueHiding.toString() + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Aave V3 USDT collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.erc20s.saArbUSDT = erc20.address + assetCollDeployments.collateral.saArbUSDT = collateral.address + deployedCollateral.push(collateral.address.toString()) + } else if (baseL2Chains.includes(hre.network.name)) { + // === Base === + throw new Error('No Aave V3 USDT on Base') + } else { + // === Mainnet === + throw new Error('No Aave V3 USDT on Mainnet') + } + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index 6e1df0f318..edf0539bb0 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -7,22 +7,20 @@ import { PYUSD_MAX_TRADE_VOLUME, PYUSD_ORACLE_TIMEOUT, PYUSD_ORACLE_ERROR, - USDC_MAINNET_MAX_TRADE_VOLUME, - USDC_MAINNET_ORACLE_TIMEOUT, - USDC_MAINNET_ORACLE_ERROR, + USDC_ARBITRUM_MAX_TRADE_VOLUME, + USDC_ARBITRUM_ORACLE_TIMEOUT, + USDC_ARBITRUM_ORACLE_ERROR, + USDT_ARBITRUM_MAX_TRADE_VOLUME, + USDT_ARBITRUM_ORACLE_TIMEOUT, + USDT_ARBITRUM_ORACLE_ERROR, USDC_BASE_MAX_TRADE_VOLUME, USDC_BASE_ORACLE_TIMEOUT, USDC_BASE_ORACLE_ERROR, + USDC_MAINNET_MAX_TRADE_VOLUME, + USDC_MAINNET_ORACLE_TIMEOUT, + USDC_MAINNET_ORACLE_ERROR, } from './constants' -/* - ** Static AToken Factory for Aave V3 - ** Mainnet: 0x411D79b8cC43384FDE66CaBf9b6a17180c842511 - ** --> https://github.com/bgd-labs/aave-address-book/blob/main/src/AaveV3Ethereum.sol#L86 - ** Base: 0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22 - ** --> https://github.com/bgd-labs/aave-address-book/blob/main/src/AaveV3Base.sol#L78 - */ - // Mainnet - USDC makeTests( { @@ -94,3 +92,53 @@ makeTests( targetNetwork: 'mainnet', } ) + +// Arbitrum - USDC +makeTests( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[42161].chainlinkFeeds['USDC']!, + oracleError: USDC_ARBITRUM_ORACLE_ERROR, + erc20: '', // to be set + maxTradeVolume: USDC_ARBITRUM_MAX_TRADE_VOLUME, + oracleTimeout: USDC_ARBITRUM_ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(USDC_ARBITRUM_ORACLE_ERROR), + delayUntilDefault: bn('86400'), + }, + { + testName: 'USDC - Arbitrum', + aaveIncentivesController: networkConfig[42161].AAVE_V3_INCENTIVES_CONTROLLER!, + aavePool: networkConfig[42161].AAVE_V3_POOL!, + aToken: networkConfig[42161].tokens['aArbUSDCn']!, + whaleTokenHolder: '0x47c031236e19d024b42f8ae6780e44a573170703', + forkBlock: 193157126, + targetNetwork: 'arbitrum', + toleranceDivisor: bn('1e8'), // 1 part in 100 million + } +) + +// Arbitrum - USDT +makeTests( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[42161].chainlinkFeeds['USDT']!, + oracleError: USDT_ARBITRUM_ORACLE_ERROR, + erc20: '', // to be set + maxTradeVolume: USDT_ARBITRUM_MAX_TRADE_VOLUME, + oracleTimeout: USDT_ARBITRUM_ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(USDT_ARBITRUM_ORACLE_ERROR), + delayUntilDefault: bn('86400'), + }, + { + testName: 'USDT - Arbitrum', + aaveIncentivesController: networkConfig[42161].AAVE_V3_INCENTIVES_CONTROLLER!, + aavePool: networkConfig[42161].AAVE_V3_POOL!, + aToken: networkConfig[42161].tokens['aArbUSDT']!, + whaleTokenHolder: '0xf977814e90da44bfa03b6295a0616a897441acec', + forkBlock: 193157126, + targetNetwork: 'arbitrum', + toleranceDivisor: bn('1e8'), // 1 part in 100 million + } +) diff --git a/test/plugins/individual-collateral/aave-v3/common.ts b/test/plugins/individual-collateral/aave-v3/common.ts index c728a5479b..77e11f1be0 100644 --- a/test/plugins/individual-collateral/aave-v3/common.ts +++ b/test/plugins/individual-collateral/aave-v3/common.ts @@ -36,7 +36,8 @@ type AltParams = { aToken: string whaleTokenHolder: string forkBlock: number - targetNetwork: 'mainnet' | 'base' + targetNetwork: 'mainnet' | 'base' | 'arbitrum' + toleranceDivisor?: BigNumber } export const makeTests = (defaultCollateralOpts: CollateralParams, altParams: AltParams) => { @@ -213,7 +214,7 @@ export const makeTests = (defaultCollateralOpts: CollateralParams, altParams: Al chainlinkDefaultAnswer: 1e8, itChecksPriceChanges: it, getExpectedPrice, - toleranceDivisor: bn('1e9'), // 1e15 adjusted for ((x + 1)/x) timestamp precision + toleranceDivisor: altParams.toleranceDivisor ?? bn('1e9'), // 1e15 adjusted for ((x + 1)/x) timestamp precision targetNetwork: altParams.targetNetwork, } diff --git a/test/plugins/individual-collateral/aave-v3/constants.ts b/test/plugins/individual-collateral/aave-v3/constants.ts index 00fcaea36f..6b6f6d7abb 100644 --- a/test/plugins/individual-collateral/aave-v3/constants.ts +++ b/test/plugins/individual-collateral/aave-v3/constants.ts @@ -11,3 +11,11 @@ export const USDC_MAINNET_ORACLE_ERROR = fp('0.0025') export const USDC_BASE_MAX_TRADE_VOLUME = fp('0.5e6') export const USDC_BASE_ORACLE_TIMEOUT = bn('86400') export const USDC_BASE_ORACLE_ERROR = fp('0.003') + +export const USDC_ARBITRUM_MAX_TRADE_VOLUME = fp('1e6') +export const USDC_ARBITRUM_ORACLE_TIMEOUT = bn('86400') +export const USDC_ARBITRUM_ORACLE_ERROR = fp('0.001') + +export const USDT_ARBITRUM_MAX_TRADE_VOLUME = fp('1e6') +export const USDT_ARBITRUM_ORACLE_TIMEOUT = bn('86400') +export const USDT_ARBITRUM_ORACLE_ERROR = fp('0.001') diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index e11f7ef359..98621e63d5 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -709,6 +709,7 @@ export default function fn( defaultFixture = await getDefaultFixture(collateralName) chainId = await getChainId(hre) if (useEnv('FORK_NETWORK').toLowerCase() === 'base') chainId = 8453 + if (useEnv('FORK_NETWORK').toLowerCase() === 'arbitrum') chainId = 42161 if (!networkConfig[chainId]) { throw new Error(`Missing network configuration for ${hre.network.name}`) } @@ -742,7 +743,7 @@ export default function fn( const rTokenSetup: IRTokenSetup = { assets: [], primaryBasket: [collateral.address, pairedColl.address], - weights: [fp('0.5e-4'), fp('0.5e-4')], + weights: [fp('0.5e-3'), fp('0.5e-3')], backups: [], beneficiaries: [], } @@ -832,10 +833,10 @@ export default function fn( const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() await pairedERC20.connect(addr1).approve(router.address, MAX_UINT256) // Remove collateral from basket - await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-4')]) + await basketHandler.connect(owner).setPrimeBasket([pairedERC20.address], [fp('1e-3')]) await expect(basketHandler.connect(owner).refreshBasket()) .to.emit(basketHandler, 'BasketSet') - .withArgs(anyValue, [pairedERC20.address], [fp('1e-4')], false) + .withArgs(anyValue, [pairedERC20.address], [fp('1e-3')], false) await advanceToTimestamp((await getLatestBlockTimestamp()) + config.warmupPeriod.toNumber()) // Run rebalancing auction @@ -864,13 +865,9 @@ export default function fn( const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() await rToken.connect(addr1).approve(router.address, MAX_UINT256) // Send excess collateral to the RToken trader via forwardRevenue() - const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) - await mintCollateralTo( - ctx, - mintAmt.gt('150') ? mintAmt : bn('150'), - addr1, - backingManager.address - ) + let mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) + mintAmt = mintAmt.gt('150') ? mintAmt : bn('150') + await mintCollateralTo(ctx, mintAmt, addr1, backingManager.address) await backingManager.forwardRevenue([collateralERC20.address]) expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) @@ -889,6 +886,7 @@ export default function fn( await rToken.connect(addr1).approve(trade.address, buyAmt) await advanceToTimestamp((await trade.endTime()) - 1) + // Bid await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( rTokenTrader, 'TradeSettled' @@ -900,6 +898,7 @@ export default function fn( const makePairedCollateral = async (target: string): Promise => { const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' + const onArbitrum = useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum' const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( 'MockV3Aggregator' ) @@ -915,6 +914,8 @@ export default function fn( ) const whale = onBase ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' + : onArbitrum + ? '0x2df1c51e09aecf9cacb7bc98cb1742757f163df7' : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' await whileImpersonating(whale, async (signer) => { await erc20 @@ -943,6 +944,8 @@ export default function fn( ) const whale = onBase ? '0xb4885bc63399bf5518b994c1d0c153334ee579d0' + : onArbitrum + ? '0x70d95587d40a2caf56bd97485ab3eec10bee6336' : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' await whileImpersonating(whale, async (signer) => { await erc20 @@ -974,7 +977,10 @@ export default function fn( 'IERC20Metadata', networkConfig[chainId].tokens.WBTC! ) - await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { + const whale = onArbitrum + ? '0x47c031236e19d024b42f8ae6780e44a573170703' + : '0xccf4429db6322d5c611ee964527d42e5d685dd6a' + await whileImpersonating(whale, async (signer) => { await erc20 .connect(signer) .transfer(addr1.address, await erc20.balanceOf(signer.address)) diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 614c8d6e8d..008c69d1c3 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -196,9 +196,9 @@ const deployCollateralCometMockContext = async ( const CusdcV3WrapperMockFactory = ( await ethers.getContractFactory('CusdcV3WrapperMock') ) - const wcusdcV3Mock = await (( - await CusdcV3WrapperMockFactory.deploy(wcusdcV3.address) - )) + const wcusdcV3Mock = ( + ((await CusdcV3WrapperMockFactory.deploy(wcusdcV3.address)) as unknown) + ) collateralOpts.erc20 = wcusdcV3Mock.address const usdc = await ethers.getContractAt('ERC20Mock', USDC) @@ -210,7 +210,7 @@ const deployCollateralCometMockContext = async ( chainlinkFeed, cusdcV3, wcusdcV3: wcusdcV3Mock, - wcusdcV3Mock, + wcusdcV3Mock: wcusdcV3Mock as unknown as CusdcV3WrapperMock, usdc, tok: wcusdcV3, rewardToken, @@ -227,7 +227,14 @@ const mintCollateralTo: MintCollateralFunc = asyn user: SignerWithAddress, recipient: string ) => { - await mintWcUSDC(ctx.usdc, ctx.cusdcV3, ctx.tok, user, amount, recipient) + await mintWcUSDC( + ctx.usdc, + ctx.cusdcV3, + ctx.tok as unknown as ICusdcV3Wrapper, + user, + amount, + recipient + ) } const reduceTargetPerRef = async ( @@ -325,6 +332,28 @@ const collateralSpecificStatusTests = () => { expect(await collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand }) + it('enters DISABLED state when refPerTok() decreases', async () => { + // Context: Usually this is left to generic suite, but we were having issues with the comet extensions + // on arbitrum as compared to ethereum mainnet, and this was the easiest way around it. + + const { collateral, wcusdcV3Mock } = await deployCollateralCometMockContext({}) + + // Check initial state + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + expect(await collateral.whenDefault()).to.equal(MAX_UINT48) + await expect(collateral.refresh()).to.not.emit(collateral, 'CollateralStatusChanged') + + // Should default instantly after 5% drop + const currentExchangeRate = await wcusdcV3Mock.exchangeRate() + await wcusdcV3Mock.setMockExchangeRate( + true, + currentExchangeRate.sub(currentExchangeRate.mul(5).div(100)) + ) + await expect(collateral.refresh()).to.emit(collateral, 'CollateralStatusChanged') + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) + }) + it('should not brick refPerTok() even if _underlyingRefPerTok() reverts', async () => { const { collateral, wcusdcV3Mock } = await deployCollateralCometMockContext({}) await wcusdcV3Mock.setRevertExchangeRate(true) @@ -357,7 +386,7 @@ const opts = { itClaimsRewards: it, itChecksTargetPerRefDefault: it, itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, + itChecksRefPerTokDefault: it.skip, // implemented in this file itChecksPriceChanges: it, itChecksNonZeroDefaultThreshold: it, itHasRevenueHiding: it.skip, // implemented in this file diff --git a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts index c81881382d..d8749820d9 100644 --- a/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CusdcV3Wrapper.test.ts @@ -20,7 +20,7 @@ import { MAX_UINT256, ZERO_ADDRESS } from '../../../../common/constants' const describeFork = useEnv('FORK') ? describe : describe.skip -const itL1 = forkNetwork != 'base' ? it : it.skip +const itL1 = forkNetwork != 'base' && forkNetwork != 'arbitrum' ? it : it.skip describeFork('Wrapped CUSDCv3', () => { let bob: SignerWithAddress @@ -293,7 +293,7 @@ describeFork('Wrapped CUSDCv3', () => { charlesWithdrawn = charlesWithdrawn.add(firstWithdrawAmt) await wcusdcV3.connect(charles).withdraw(firstWithdrawAmt) const newBalanceCharles = await cusdcV3.balanceOf(charles.address) - expect(newBalanceCharles).to.closeTo(firstWithdrawAmt, 25) + expect(newBalanceCharles).to.closeTo(firstWithdrawAmt, 50) // don deposits await mintWcUSDC(usdc, cusdcV3, wcusdcV3, don, initwusdcAmt, don.address) @@ -588,7 +588,7 @@ describeFork('Wrapped CUSDCv3', () => { const baseIndexScale = await cusdcV3.baseIndexScale() const expectedExchangeRate = totalsBasic.baseSupplyIndex.mul(bn('1e6')).div(baseIndexScale) expect(await cusdcV3.balanceOf(wcusdcV3.address)).to.equal(0) - expect(await wcusdcV3.exchangeRate()).to.be.closeTo(expectedExchangeRate, 1) + expect(await wcusdcV3.exchangeRate()).to.be.closeTo(expectedExchangeRate, 5) }) it('returns the correct exchange rate with a positive balance', async () => { diff --git a/test/plugins/individual-collateral/compoundv3/constants.ts b/test/plugins/individual-collateral/compoundv3/constants.ts index 96784ea4b4..1b884a5473 100644 --- a/test/plugins/individual-collateral/compoundv3/constants.ts +++ b/test/plugins/individual-collateral/compoundv3/constants.ts @@ -12,6 +12,9 @@ switch (forkNetwork) { case 'base': chainId = '8453' break + case 'arbitrum': + chainId = '42161' + break default: chainId = '1' break @@ -19,6 +22,16 @@ switch (forkNetwork) { const USDC_NAME = 'USDC' const CUSDC_NAME = 'cUSDCv3' +const USDC_HOLDERS: { [key: string]: string } = { + '1': '0x0a59649758aa4d66e25f08dd01271e891fe52199', + '8453': '0xcdac0d6c6c59727a65f871236188350531885c43', + '42161': '0x2df1c51e09aecf9cacb7bc98cb1742757f163df7', +} +const FORK_BLOCKS: { [key: string]: number } = { + '1': 15850930, + '8453': 12292893, + '42161': 193157126, +} // Mainnet Addresses export const RSR = networkConfig[chainId].tokens.RSR as string @@ -27,10 +40,7 @@ export const CUSDC_V3 = networkConfig[chainId].tokens[CUSDC_NAME]! export const COMP = networkConfig[chainId].tokens.COMP as string export const REWARDS = networkConfig[chainId].COMET_REWARDS! export const USDC = networkConfig[chainId].tokens[USDC_NAME]! -export const USDC_HOLDER = - chainId == '8453' - ? '0xcdac0d6c6c59727a65f871236188350531885c43' - : '0x0a59649758aa4d66e25f08dd01271e891fe52199' +export const USDC_HOLDER = USDC_HOLDERS[chainId] export const COMET_CONFIGURATOR = networkConfig[chainId].COMET_CONFIGURATOR! export const COMET_PROXY_ADMIN = networkConfig[chainId].COMET_PROXY_ADMIN! export const COMET_EXT = networkConfig[chainId].COMET_EXT! @@ -43,4 +53,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000000) export const USDC_DECIMALS = bn(6) -export const FORK_BLOCK = chainId == '8453' ? 12292893 : 15850930 +export const FORK_BLOCK = FORK_BLOCKS[chainId] diff --git a/test/plugins/individual-collateral/fixtures.ts b/test/plugins/individual-collateral/fixtures.ts index a250450b38..e83b6bae25 100644 --- a/test/plugins/individual-collateral/fixtures.ts +++ b/test/plugins/individual-collateral/fixtures.ts @@ -78,6 +78,7 @@ export const getDefaultFixture = async function (salt: string) { const defaultFixture: Fixture = async function (): Promise { let chainId = await getChainId(hre) if (useEnv('FORK_NETWORK').toLowerCase() == 'base') chainId = 8453 + if (useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum') chainId = 42161 const { rsr } = await rsrFixture(chainId) const { gnosis } = await gnosisFixture() if (!networkConfig[chainId]) { diff --git a/utils/fork.ts b/utils/fork.ts index 6749b5054d..ecec9d0c7e 100644 --- a/utils/fork.ts +++ b/utils/fork.ts @@ -5,8 +5,11 @@ const TENDERLY_RPC_URL = useEnv('TENDERLY_RPC_URL') const GOERLI_RPC_URL = useEnv('GOERLI_RPC_URL') const BASE_GOERLI_RPC_URL = useEnv('BASE_GOERLI_RPC_URL') const BASE_RPC_URL = useEnv('BASE_RPC_URL') -export type Network = 'mainnet' | 'base' +const ARBITRUM_RPC_URL = useEnv('ARBITRUM_RPC_URL') +const ARBITRUM_SEPOLIA_RPC_URL = useEnv('ARBITRUM_SEPOLIA_RPC_URL') +export type Network = 'mainnet' | 'base' | 'arbitrum' export const forkRpcs = { mainnet: MAINNET_RPC_URL, base: BASE_RPC_URL, + arbitrum: ARBITRUM_RPC_URL, } From a21fc5f06dc5c9788f91892a3e8062a4cb152110 Mon Sep 17 00:00:00 2001 From: Julian R Date: Mon, 8 Apr 2024 13:48:18 -0300 Subject: [PATCH 278/450] fix strsr p0 tests --- contracts/p0/StRSR.sol | 2 +- test/ZZStRSR.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index aeafaad5b0..1d950b4b9c 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -34,7 +34,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // solhint-disable-next-line var-name-mixedcase uint48 public constant PERIOD = 1; // {s} 1 second // solhint-disable-next-line var-name-mixedcase - uint48 public constant MIN_UNSTAKING_DELAY = 2; // {s} based on network + uint48 public constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes uint48 public constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% uint192 public constant MAX_WITHDRAWAL_LEAK = 3e17; // {1} 30% diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 1aedcd4912..99fa624c4c 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -2617,7 +2617,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) }) - describe('ERC20Votes', () => { + describeP1('ERC20Votes', () => { let stRSRVotes: StRSRP1Votes beforeEach(async function () { From a28c982727dbe4bc3376b4f6311121069ee093a0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 17:34:41 -0400 Subject: [PATCH 279/450] comment nit --- contracts/p1/Furnace.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index b9920d73ae..6765b06631 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -16,6 +16,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase uint48 public constant PERIOD = 1; // {s} distribution period + // historical artifact IRToken private rToken; From 480db046c309e209cd551d9bd3cc994f6d9d2a5f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 18:03:00 -0400 Subject: [PATCH 280/450] switch rewardRatio in fixtures to be per-second values --- test/fixtures.ts | 2 +- test/integration/fixtures.ts | 2 +- .../individual-collateral/aave/ATokenFiatCollateral.test.ts | 2 +- test/plugins/individual-collateral/collateralTests.ts | 2 +- .../compoundv2/CTokenFiatCollateral.test.ts | 2 +- test/plugins/individual-collateral/curve/collateralTests.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/fixtures.ts b/test/fixtures.ts index 40291d38e5..1af9aa578d 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -450,7 +450,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 8ba38a3e62..a8043b8dcb 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -632,7 +632,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 7b0bed849e..a915113b59 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -141,7 +141,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 98621e63d5..ba51f8d38e 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -670,7 +670,7 @@ export default function fn( rTokenMaxTradeVolume: MAX_UINT192, // +inf shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 262bb2f8a9..450c0ca581 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -139,7 +139,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 04f6b29507..48644cc5d2 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -827,7 +827,7 @@ export default function fn( rTokenMaxTradeVolume: MAX_UINT192, // +inf shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) From 68e2c9b8ac61145b75f8dc9908a9b8b01a79cb57 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:03:31 -0400 Subject: [PATCH 281/450] CHANGELOG --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb83db17bb..02befc5d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Upgrade Steps +TODO + +Must-do: Upgrade Furnace melt + StRSR drip ratios at time of upgrade to be based on 1s. + +Should-do: Set Governance as Timelock CANCELLER_ROLE + ## Core Protocol Contracts ## Plugins From d9fc27d213cda1b0fb71039fb4f21c7b5dcda5e8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:10:03 -0400 Subject: [PATCH 282/450] Furnace.test.ts --- test/Furnace.test.ts | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 67e2e0df5e..536a4066f6 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -234,7 +234,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal) expect(await rToken.balanceOf(furnace.address)).to.equal(0) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) // Melt @@ -278,7 +278,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) @@ -310,7 +310,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) @@ -321,18 +321,17 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { .to.emit(rToken, 'Melted') .withArgs(hndAmt.sub(expAmt1)) - // Advance to the end to withdraw full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const expAmt2 = decayFn(hndAmt, 2) // Melt - await expect(furnace.connect(addr1).melt()) - .to.emit(rToken, 'Melted') - .withArgs(bn(expAmt1).sub(expAmt2)) + await expect(furnace.connect(addr1).melt()).to.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt2) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expAmt2, 1) // within 1 + expect(await rToken.balanceOf(furnace.address)).to.be.gte(expAmt2) // defensive rounding }) it('Should melt before updating the ratio #fast', async () => { @@ -349,7 +348,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) @@ -389,7 +388,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { }) it('Should accumulate negligible error - parallel furnaces', async () => { - // Maintain two furnaces in parallel, one burning every block and one burning annually + // Maintain two furnaces in parallel, one burning every second and one burning once per hour // We have to use two brand new instances here to ensure their timestamps are synced const firstFurnace = await deployNewFurnace() const secondFurnace = await deployNewFurnace() @@ -405,31 +404,32 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await secondFurnace.init(main.address, config.rewardRatio) await advanceBlocks(1) - // Set automine to true again - await hre.network.provider.send('evm_setAutomine', [true]) - - const oneDay = bn('86400') + // Simulate an hour + const oneHour = 3600 await setFurnace(main, firstFurnace) - for (let i = 0; i < Number(oneDay.div(ONE_PERIOD)); i++) { - // Advance a period - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + const before = await getLatestBlockTimestamp() + for (let i = 0; i < oneHour; i++) { + // Advance a second each block, as if we're on an L2 or something fast await firstFurnace.melt() + await setNextBlockTimestamp(before + 1 + i) + await advanceBlocks(1) // secondFurnace does not melt } - // SecondFurnace melts once await setFurnace(main, secondFurnace) + + // Set automine to true + await hre.network.provider.send('evm_setAutomine', [true]) + + // Melt furnace 2 + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) await secondFurnace.melt() + // Expected to be off by 1 rewardRatio worth of RToken const one = await rToken.balanceOf(firstFurnace.address) const two = await rToken.balanceOf(secondFurnace.address) - const diff = one.sub(two).abs() // {qRTok} - const expectedDiff = bn(3555) // empirical exact diff - // At a rate of 3555 qRToken per day error, a year's worth of error would result in - // a difference only starting in the 12th decimal place: .000000000001 - // This seems more than acceptable - - expect(diff).to.be.lte(expectedDiff) + expect(one).to.be.gte(two) + expect(one).to.be.closeTo(two, config.rewardRatio) }) it('Regression test -- C4 June 2023 Issue #29', async () => { @@ -468,7 +468,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { // Should have melted expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.eq(fp('99.990000494983830300')) + expect(await furnace.lastPayoutBal()).to.eq(fp('99.989900504983335400')) // Unfreeze and advance 100 periods await main.connect(owner).unfreeze() @@ -480,8 +480,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { // Should have updated lastPayout + lastPayoutBal and melted at new ratio expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(fp('98.995033865808581644')) - // if the ratio were not increased 100x, this would be more like 99.980001989868666200 + expect(await furnace.lastPayoutBal()).to.equal(fp('98.985035377287638455')) // Total supply should have decreased by the cumulative melted amount expect(await rToken.totalSupply()).to.equal(mintAmount.add(await furnace.lastPayoutBal())) @@ -587,7 +586,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await snapshotGasCost(furnace.connect(addr1).melt()) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) const decayFn = makeDecayFn(await furnace.ratio()) @@ -614,7 +613,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) await snapshotGasCost(furnace.connect(addr1).melt()) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp( Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD.mul(numPeriods)) ) From d5f4d4a47e6211af8707ee037dd914c4ba2c49fa Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:10:12 -0400 Subject: [PATCH 283/450] Recollateralization.test.ts --- test/Recollateralization.test.ts | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index a9bb79ac05..ce9c04f586 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -3,7 +3,7 @@ import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory, constants } from 'ethers' -import hre, { ethers } from 'hardhat' +import { ethers } from 'hardhat' import { IConfig } from '../common/configuration' import { BN_SCALE_FACTOR, @@ -37,12 +37,7 @@ import { USDCMock, DutchTradeRouter, } from '../typechain' -import { - advanceBlocks, - advanceTime, - advanceToTimestamp, - getLatestBlockTimestamp, -} from './utils/time' +import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp } from './utils/time' import { Collateral, defaultFixture, @@ -3229,15 +3224,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith( 'trade open' ) - - // Check the empty buffer block as well - await advanceBlocks(1) - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.be.revertedWith( - 'already rebalancing' - ) - await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith( - 'trade open' - ) }) it('Should quote piecewise-falling price correctly throughout entirety of auction', async () => { @@ -3387,10 +3373,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(trade2.address)).to.equal(0) expect(await token1.balanceOf(trade2.address)).to.equal(0) - // Only BATCH_AUCTION can be launched - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.be.revertedWith( - 'already rebalancing' - ) + // BATCH_AUCTION can be launched await backingManager.rebalance(TradeKind.BATCH_AUCTION) expect(await backingManager.tradesOpen()).to.equal(1) From 3b5b992e2c7d0cb6dadb5b450aa48f0e75d04765 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:10:25 -0400 Subject: [PATCH 284/450] 1s period in tests --- common/constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/constants.ts b/common/constants.ts index 0bee52eba2..f0cffa16b2 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -5,7 +5,7 @@ export const ONE_ADDRESS = '0x0000000000000000000000000000000000000001' export const ONE_ETH = BigNumber.from('1000000000000000000') -export const ONE_PERIOD = BigNumber.from('12') +export const ONE_PERIOD = BigNumber.from('1') export const ONE_DAY = BigNumber.from('86400') From d3b2d5a00b70f1b957636795b15bf41108060c44 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:36:40 -0400 Subject: [PATCH 285/450] BadERC20.test.ts --- test/scenario/BadERC20.test.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/test/scenario/BadERC20.test.ts b/test/scenario/BadERC20.test.ts index 220ed60d0f..65f0aa5494 100644 --- a/test/scenario/BadERC20.test.ts +++ b/test/scenario/BadERC20.test.ts @@ -387,13 +387,7 @@ describe(`Bad ERC20 - P${IMPLEMENTATION}`, () => { .withArgs(rTokenTrader.address, furnace.address, issueAmt.div(2)) await expect(rsrTrader.manageTokens([rToken.address], [TradeKind.BATCH_AUCTION])) .to.emit(rsrTrader, 'TradeStarted') - .withArgs( - anyValue, - rToken.address, - rsr.address, - issueAmt.div(2), - toMinBuyAmt(issueAmt.div(2), fp('1'), fp('1'), ORACLE_ERROR, config.maxTradeSlippage) - ) + .withArgs(anyValue, rToken.address, rsr.address, issueAmt.div(2), anyValue) }) }) From 1a81db02d8c45011b00362839c2dcf1b0ff489b7 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:37:21 -0400 Subject: [PATCH 286/450] EXTREME=1 Broker.test.ts --- test/Broker.test.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 0557da5bc5..621fc2e2dd 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -53,7 +53,7 @@ import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp, - getLatestBlockNumber, + setNextBlockTimestamp, } from './utils/time' import { ITradeRequest, disableBatchTrade, disableDutchTrade } from './utils/trades' import { useEnv } from '#/utils/env' @@ -1298,7 +1298,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Advance blocks til trade can be settled const now = await getLatestBlockTimestamp() const tradeLen = (await trade.endTime()) - now - await advanceToTimestamp(now + tradeLen + 12) + await advanceToTimestamp(now + tradeLen + 1) // Settle trade expect(await trade.canSettle()).to.equal(true) @@ -1338,7 +1338,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Advance blocks til trade can be settled const now = await getLatestBlockTimestamp() const tradeLen = (await trade.endTime()) - now - await advanceToTimestamp(now + tradeLen + 12) + await advanceToTimestamp(now + tradeLen + 1) // Settle trade await whileImpersonating(backingManager.address, async (bmSigner) => { @@ -1450,16 +1450,14 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Rebalance should cause backingManager to trade about auctionSellAmt, though not exactly await backingManager.setMaxTradeSlippage(bn('0')) await backingManager.setMinTradeVolume(bn('0')) + await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) .to.emit(backingManager, 'TradeStarted') .withArgs(anyValue, sellTok.address, buyTok.address, anyValue, anyValue) // Get Trade const tradeAddr = await backingManager.trades(sellTok.address) - await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) - await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) - const now = await getLatestBlockTimestamp() const startTime = await trade.startTime() const endTime = await trade.endTime() const bidTime = @@ -1468,24 +1466,26 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .mul(endTime - startTime) .div(fp('1')) .toNumber() - - if (now < bidTime) await advanceToTimestamp(bidTime - 1) + let bidAmt = await trade.bidAmount(bidTime) // Bid const sellAmt = await trade.lot() - const bidAmt = await trade.bidAmount(bidTime) expect(bidAmt).to.be.gt(0) const buyBalBefore = await buyTok.balanceOf(backingManager.address) const sellBalBefore = await sellTok.balanceOf(addr1.address) + if (bidTime > (await getLatestBlockTimestamp())) await setNextBlockTimestamp(bidTime) + if (bidType.eq(bn(BidType.CALLBACK))) { await expect(router.connect(addr1).bid(trade.address, addr1.address)) .to.emit(backingManager, 'TradeSettled') .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) } else if (bidType.eq(bn(BidType.TRANSFER))) { + await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) await expect(trade.connect(addr1).bid()) .to.emit(backingManager, 'TradeSettled') - .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, anyValue) + bidAmt = await trade.bidAmount(await getLatestBlockTimestamp()) } // Check balances From c1bdcac6c69e596af14108a001c30696c70487fb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 19:58:44 -0400 Subject: [PATCH 287/450] act facet --- test/integration/mainnet-test/FacadeActVersion.test.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration/mainnet-test/FacadeActVersion.test.ts b/test/integration/mainnet-test/FacadeActVersion.test.ts index 1ff6300e68..44755e476f 100644 --- a/test/integration/mainnet-test/FacadeActVersion.test.ts +++ b/test/integration/mainnet-test/FacadeActVersion.test.ts @@ -97,7 +97,10 @@ describeFork( it('Fixed ActFacet should return right revenueOverview', async () => { const FacadeActFactory = await ethers.getContractFactory('ActFacet') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + const main = await ethers.getContractAt('IMain', await revenueTrader.main()) + const furnace = await ethers.getContractAt('FurnaceP1', await main.furnace()) + const period = await furnace.PERIOD() + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + period) newFacadeAct = await FacadeActFactory.deploy() const expectedSurpluses = [ From d73510eecaeaeea70f6b30217696c481a6d41d7d Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 20:01:28 -0400 Subject: [PATCH 288/450] Facade.test.ts --- test/Facade.test.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 725816a58d..cae68950af 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -1231,7 +1231,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issuance #2 - Consume all throttle const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check new issuance available - all consumed @@ -1289,7 +1289,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issue full throttle const issueAmount1: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount1) // Check redemption throttles updated @@ -1308,7 +1308,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issuance #2 - Full throttle again - will be processed const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check new issuance available - all consumed @@ -1336,7 +1336,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issuance #3 - Should be allowed, does not exceed supply restriction const issueAmount3: BigNumber = bn('100000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount3) // Check issuance throttle updated - Previous issuances recharged @@ -1371,7 +1371,7 @@ describe('Facade + FacadeMonitor contracts', () => { const issueAmount4: BigNumber = fp('105800') // Issuance #4 - almost all available - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount4) expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( From 136f2238dc3a54359fd03af3076415cf79f3bed5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 20:12:03 -0400 Subject: [PATCH 289/450] RToken.test.ts --- test/RToken.test.ts | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/test/RToken.test.ts b/test/RToken.test.ts index a2e61bcfdb..aadd8e62f1 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -738,7 +738,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #1 - Will be processed const issueAmount1: BigNumber = bn('100e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount1) // Check issuance throttle updated @@ -751,7 +751,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #2 - Should be processed const issueAmount2: BigNumber = bn('400e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check issuance throttle updated, previous issuance recharged @@ -765,7 +765,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #3 - Should be processed const issueAmount3: BigNumber = bn('50000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount3) // Check issuance throttle updated - Previous issuances recharged @@ -780,7 +780,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #4 - Should be processed const issueAmount4: BigNumber = bn('100000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount4) // Check issuance throttle updated - we got the 3.3K from the recharge @@ -812,7 +812,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #1 - Will be processed const issueAmount1: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount1) // Check issuance throttle updated @@ -831,7 +831,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #2 - Will be processed const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check new issuance available - al consumed @@ -860,7 +860,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #3 - Should be allowed, does not exceed supply restriction const issueAmount3: BigNumber = bn('50000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount3) // Check issuance throttle updated - Previous issuances recharged @@ -1487,7 +1487,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Redeem #1 - Will be processed redeemAmount = fp('10000') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).redeem(redeemAmount) // Check redemption throttle updated @@ -2303,7 +2303,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Redeem #1 - Will be processed redeemAmount = fp('10000') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).redeem(redeemAmount) // Check redemption throttle updated From 74a3fb5a91cf1440968bf252675c719c5fe33f45 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 8 Apr 2024 20:12:08 -0400 Subject: [PATCH 290/450] ZZStRSR.test.ts --- test/ZZStRSR.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 99fa624c4c..06a65a1f03 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -2226,7 +2226,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should reset stakes and perform validations on rate - MIN', async () => { const stakeAmt: BigNumber = bn('1000e18') const addAmt1: BigNumber = bn('100e18') - const addAmt2: BigNumber = bn('10e30') + const addAmt2: BigNumber = bn('120e30') // Stake await rsr.connect(addr1).approve(stRSR.address, stakeAmt) @@ -2243,7 +2243,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await rsr.connect(owner).transfer(stRSR.address, addAmt1) // Advance to the end of noop period - await advanceTime(1) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 1) await stRSR.payoutRewards() // Calculate payout amount From f88ecbcbed1b9ba5f58ae94966a2b84dbc996ced Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Apr 2024 11:22:01 -0400 Subject: [PATCH 291/450] Governance as timelock canceller (#1112) Co-authored-by: Julian R --- contracts/facade/FacadeWrite.sol | 2 + test/FacadeWrite.test.ts | 3 + test/Governance.test.ts | 145 +++++++++++++++++++++++++++++++ 3 files changed, 150 insertions(+) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index f9f2c9d3f2..2f4307ae1a 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -166,6 +166,8 @@ contract FacadeWrite is IFacadeWrite { timelock.grantRole(timelock.PROPOSER_ROLE(), governance); // Gov only proposer // Set Guardian as canceller, if address(0) then no one can cancel timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); + // Set Governance as canceller to enable killing timelock-stuck proposals + timelock.grantRole(timelock.CANCELLER_ROLE(), governance); timelock.grantRole(timelock.EXECUTOR_ROLE(), governance); // Gov only executor timelock.revokeRole(timelock.TIMELOCK_ADMIN_ROLE(), address(this)); // Revoke admin role diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 0175c1c45c..81ef31667e 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -689,6 +689,9 @@ describe('FacadeWrite contract', () => { expect(await timelock.hasRole(await timelock.EXECUTOR_ROLE(), governor.address)).to.equal( true ) + expect( + await timelock.hasRole(await timelock.CANCELLER_ROLE(), governor.address) + ).to.equal(true) }) it('Should setup owner, freezer and pauser correctly', async () => { diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 53b7f7d2f1..3b8b9cf097 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -110,6 +110,9 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Setup guardian as canceller await timelock.grantRole(cancellerRole, guardian.address) + // Setup governance as canceller + await timelock.grantRole(cancellerRole, governor.address) + // Revoke admin role - All changes in Timelock have to go through Governance await timelock.revokeRole(adminRole, owner.address) @@ -618,6 +621,64 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { expect(await governor.state(proposalId)).to.equal(ProposalState.Canceled) }) + it('Should allow anyone to cancel if era changes, even if queued on timelock', async () => { + // Propose + const proposeTx = await governor + .connect(addr1) + .propose([backingManager.address], [0], [encodedFunctionCall], proposalDescription) + + const proposeReceipt = await proposeTx.wait(1) + const proposalId = proposeReceipt.events![0].args!.proposalId + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) + + // Advance time to start voting + await advanceBlocks(VOTING_DELAY + 1) + + const voteWay = 1 // for + + // vote + await governor.connect(addr1).castVote(proposalId, voteWay) + await advanceBlocks(1) + + await governor.connect(addr2).castVoteWithReason(proposalId, voteWay, 'I vote for') + await advanceBlocks(1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + // Advance time till voting is complete + await advanceBlocks(VOTING_PERIOD + 1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) + + // Queue proposal + await governor + .connect(addr1) + .queue([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) + + // Force change of era - Perform wipeout + await whileImpersonating(backingManager.address, async (signer) => { + await expect(stRSRVotes.connect(signer).seizeRSR(stkAmt1.mul(2))) + .to.emit(stRSR, 'ExchangeRateSet') + .withArgs(fp('1'), fp('1')) + }) + + // Anyone can cancel even if on Timelock already + await expect( + governor + .connect(other) + .cancel([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) + ) + .to.emit(governor, 'ProposalCanceled') + .withArgs(proposalId) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Canceled) + }) + it('Should not allow execution of proposal if era changes; guardian can cancel', async () => { // Propose const proposeTx = await governor @@ -771,6 +832,90 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { ).to.be.reverted }) + it('Should be cancellable by governor during timelock delay', async () => { + // Check current value + expect(await backingManager.tradingDelay()).to.equal(config.tradingDelay) + + // Propose + const proposeTx = await governor + .connect(addr1) + .propose([backingManager.address], [0], [encodedFunctionCall], proposalDescription) + + const proposeReceipt = await proposeTx.wait(1) + const proposalId = proposeReceipt.events![0].args!.proposalId + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Pending) + + // Advance time to start voting + await advanceBlocks(VOTING_DELAY + 1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + const voteWay = 1 // for + + // vote + await governor.connect(addr1).castVote(proposalId, voteWay) + await advanceBlocks(1) + + await governor.connect(addr2).castVoteWithReason(proposalId, voteWay, 'I vote for') + await advanceBlocks(1) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Active) + + // Advance time till voting is complete + await advanceBlocks(VOTING_PERIOD + 1) + + // Finished voting - Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) + + // Queue propoal + await governor + .connect(addr1) + .queue([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Queued) + + // Advance time required by timelock + await advanceTime(MIN_DELAY + 1) + await advanceBlocks(1) + + // Should be cancellable by guardian before execute + const timelockId = await timelock.hashOperationBatch( + [backingManager.address], + [0], + [encodedFunctionCall], + ethers.utils.formatBytes32String(''), + proposalDescHash + ) + await expect(timelock.connect(owner).cancel(timelockId)).to.be.reverted // even owner can't cancel + + // Anyone can attempt to cancel via governor (will fail due to era check) + await expect( + governor + .connect(other) + .cancel([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) + ).to.be.revertedWith('same era') + + // Governor can cancel proposal directly on Timelock + await whileImpersonating(governor.address, async (signer) => { + await expect(timelock.connect(signer).cancel(timelockId)).not.be.reverted + }) + + // Check proposal state + expect(await governor.state(proposalId)).to.equal(ProposalState.Canceled) + + // Try to execute + await expect( + governor + .connect(addr1) + .execute([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) + ).to.be.reverted + }) + it('Should handle multiple proposals with different rates', async () => { // Check current values expect(await backingManager.tradingDelay()).to.equal(config.tradingDelay) From 513766bb2114b4d72aac03658ea11add4136382b Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 10 Apr 2024 00:23:55 +0530 Subject: [PATCH 292/450] Fix upgrade compatibility --- contracts/p1/mixins/Trading.sol | 9 ++------- contracts/vendor/oz/Multicall.sol | 33 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 contracts/vendor/oz/Multicall.sol diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index fc9311b696..8f7f1be2f2 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -3,12 +3,12 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol"; -import "@openzeppelin/contracts-upgradeable/utils/MulticallUpgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../interfaces/ITrade.sol"; import "../../interfaces/ITrading.sol"; import "../../libraries/Allowance.sol"; import "../../libraries/Fixed.sol"; +import "../../vendor/oz/Multicall.sol"; import "./Component.sol"; import "./RewardableLib.sol"; @@ -17,12 +17,7 @@ import "./RewardableLib.sol"; /// changed without breaking <3.0.0 RTokens. The only difference in /// MulticallUpgradeable is the 50 slot storage gap and an empty constructor. /// It should be fine to leave the non-upgradeable Multicall here permanently. -abstract contract TradingP1 is - MulticallUpgradeable, - ComponentP1, - ReentrancyGuardUpgradeable, - ITrading -{ +abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeable, ITrading { using FixLib for uint192; using SafeERC20Upgradeable for IERC20Upgradeable; diff --git a/contracts/vendor/oz/Multicall.sol b/contracts/vendor/oz/Multicall.sol new file mode 100644 index 0000000000..bd4a121081 --- /dev/null +++ b/contracts/vendor/oz/Multicall.sol @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v4.9.5) (utils/Multicall.sol) + +pragma solidity ^0.8.0; + +import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol"; +import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; + +/** + * @dev Forked from OpenZeppelin v4.9.6, removes gap + * + */ +abstract contract Multicall is Initializable, ContextUpgradeable { + /** + * @dev Receives and executes a batch of function calls on this contract. + * @custom:oz-upgrades-unsafe-allow-reachable delegatecall + */ + function multicall(bytes[] calldata data) external virtual returns (bytes[] memory results) { + bytes memory context = msg.sender == _msgSender() + ? new bytes(0) + : msg.data[msg.data.length - _contextSuffixLength():]; + + results = new bytes[](data.length); + for (uint256 i = 0; i < data.length; i++) { + results[i] = AddressUpgradeable.functionDelegateCall( + address(this), + bytes.concat(data[i], context) + ); + } + return results; + } +} From 1b724e49ce8ec351dbecd4b8840fed30a50b4a20 Mon Sep 17 00:00:00 2001 From: Julian R Date: Tue, 9 Apr 2024 18:07:22 -0300 Subject: [PATCH 293/450] reenable extreme test --- test/Broker.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 621fc2e2dd..3dbfa81a9e 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1505,14 +1505,14 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const bidTypes = [bn(BidType.CALLBACK), bn(BidType.TRANSFER)] // applied to both buy and sell tokens - const decimals = [/*bn('1'), bn('6'), bn('8'), bn('9'), */ bn('18')] + const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18')] // auction sell amount const auctionSellAmts = [bn('2'), bn('1595439874635'), bn('987321984732198435645846513')] // auction progression %: these will get rounded to blocks later const progression = [ - fp('0') /*, fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1')*/, + fp('0'), fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1'), ] // total cases is 5 * 5 * 3 * 4 = 300 From ac92b3c87b14fa37e1cdfdd703b1d673019f2fda Mon Sep 17 00:00:00 2001 From: Julian R Date: Tue, 9 Apr 2024 18:09:53 -0300 Subject: [PATCH 294/450] fix lint --- test/Broker.test.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 3dbfa81a9e..bf0fef3808 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1511,9 +1511,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const auctionSellAmts = [bn('2'), bn('1595439874635'), bn('987321984732198435645846513')] // auction progression %: these will get rounded to blocks later - const progression = [ - fp('0'), fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1'), - ] + const progression = [fp('0'), fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1')] // total cases is 5 * 5 * 3 * 4 = 300 From 18c2c628eb0d9f59f793ee909e5be89bc59569ae Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Apr 2024 17:36:36 -0400 Subject: [PATCH 295/450] MetaMorpho vaults + Convex crvUSD LPs + sFraxETH (#1107) --- common/configuration.ts | 1 + .../plugins/assets/ERC4626FiatCollateral.sol | 4 +- .../MetaMorphoSelfReferentialCollateral.sol | 2 +- .../1-tmp-assets-collateral.json | 20 +- .../deploy_convex_crvusd_usdt_collateral.ts | 119 ++++++++++ .../collaterals/deploy_re7weth.ts | 4 +- .../collaterals/deploy_sfrax_eth.ts | 2 +- scripts/deployment/utils.ts | 1 + .../collateral-plugins/verify_re7weth.ts | 4 +- .../collateral-plugins/verify_sfrax_eth.ts | 4 +- .../individual-collateral/collateralTests.ts | 2 +- .../individual-collateral/curve/constants.ts | 5 + .../CvxStableTestSuite_crvUSD-USDT.test.ts | 221 ++++++++++++++++++ ...etaMorphoSelfReferentialCollateral.test.ts | 10 +- 14 files changed, 384 insertions(+), 15 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts create mode 100644 test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts diff --git a/common/configuration.ts b/common/configuration.ts index f48dfbe3b0..0b80446283 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -112,6 +112,7 @@ export interface IFeeds { export interface IPools { cvxCrvUSDUSDC?: string + cvxCrvUSDUSDT?: string cvx3Pool?: string cvxPayPool?: string cvxeUSDFRAXBP?: string diff --git a/contracts/plugins/assets/ERC4626FiatCollateral.sol b/contracts/plugins/assets/ERC4626FiatCollateral.sol index c8e1284d6b..2930f17778 100644 --- a/contracts/plugins/assets/ERC4626FiatCollateral.sol +++ b/contracts/plugins/assets/ERC4626FiatCollateral.sol @@ -27,7 +27,9 @@ contract ERC4626FiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); - // require(config.defaultThreshold > 0, "defaultThreshold zero"); + if (config.defaultThreshold > 0) { + require(config.delayUntilDefault > 0, "delayUntilDefault zero"); + } IERC4626 vault = IERC4626(address(config.erc20)); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); diff --git a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol index 74a3b3c71b..90ed8f0a88 100644 --- a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol @@ -25,7 +25,7 @@ contract MetaMorphoSelfReferentialCollateral is ERC4626FiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) ERC4626FiatCollateral(config, revenueHiding) { - // require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold == 0, "defaultThreshold not zero"); } /// Can revert, used by other contract functions in order to catch errors diff --git a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json index 6c16638e93..e96d88efa0 100644 --- a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json @@ -2,10 +2,24 @@ "assets": {}, "collateral": { "saEthUSDC": "0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB", - "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E" + "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E", + "bbUSDT": "0x3017d881724D93783e7f065Cc5F62c81C62c36A0", + "steakUSDC": "0x4895b9aee383b5dec499F54172Ccc7Ee05FC8Bbc", + "steakPYUSD": "0xBd01C789Be742688fb73F6aE46f1320196B6c973", + "Re7WETH": "0x3421d2cB19c8E69c6FA642C43e60cD943e75Ca8b", + "cvxCrvUSDUSDC": "0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5", + "cvxCrvUSDUSDT": "0x69c6597690B8Df61D15F201519C03725bdec40c1", + "sfrxETH": "0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67" }, "erc20s": { "saEthUSDC": "0x0aDc69041a2B086f8772aCcE2A754f410F211bed", - "saEthPyUSD": "0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b" + "saEthPyUSD": "0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b", + "bbUSDT": "0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1", + "steakUSDC": "0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB", + "steakPYUSD": "0xbEEF02e5E13584ab96848af90261f0C8Ee04722a", + "Re7WETH": "0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0", + "cvxCrvUSDUSDC": "0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8", + "cvxCrvUSDUSDT": "0x5d1B749bA7f689ef9f260EDC54326C48919cA88b", + "sfrxETH": "0xac3E018457B222d93114458476f3E3416Abbe38F" } -} +} \ No newline at end of file diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts new file mode 100644 index 0000000000..13d9160760 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts @@ -0,0 +1,119 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { bn } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { CurveStableCollateral } from '../../../../typechain' +import { revenueHiding } from '../../utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + crvUSD_USDT, + crvUSD_USDT_POOL_ID, + USDT_ORACLE_ERROR, + USDT_ORACLE_TIMEOUT, + USDT_USD_FEED, + crvUSD_ORACLE_ERROR, + crvUSD_ORACLE_TIMEOUT, + crvUSD_USD_FEED, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// Convex Stable Plugin: crvUSD-USDT + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Convex Stable Pool for crvUSD-USDT **************************/ + + const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + + const crvUsdUSDTPool = await ConvexStakingWrapperFactory.deploy() + await crvUsdUSDTPool.deployed() + await (await crvUsdUSDTPool.initialize(crvUSD_USDT_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Stable crvUSD-USDT pool on ${hre.network.name} (${chainId}): ${crvUsdUSDTPool.address} ` + ) + + const collateral = await CurveStableCollateralFactory.connect( + deployer + ).deploy( + { + erc20: crvUsdUSDTPool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDT_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDT_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDT, + } + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Convex Stable Collateral for crvUSD-USDT to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.cvxCrvUSDUSDT = collateral.address + assetCollDeployments.erc20s.cvxCrvUSDUSDT = crvUsdUSDTPool.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts index 717ae7d328..0902cc5520 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts @@ -61,8 +61,8 @@ async function main() { erc20: networkConfig[chainId].tokens.Re7WETH, maxTradeVolume: fp('1e6').toString(), // $12m vault oracleTimeout: ETH_ORACLE_TIMEOUT.toString(), - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: ETH_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: '0', // WETH delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, fp('1e-6') // small admin fee uncertainty diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts index 0b09d97cfb..b90ce27527 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_sfrax_eth.ts @@ -41,7 +41,7 @@ async function main() { const deployedCollateral: string[] = [] /******** Deploy SFRAX ETH Collateral - sFraxETH **************************/ - let sFraxEthOracleAddress: string = networkConfig[chainId].CURVE_POOL_WETH_FRXETH! + const sFraxEthOracleAddress: string = networkConfig[chainId].CURVE_POOL_WETH_FRXETH! const SFraxEthCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( 'SFraxEthCollateral' ) diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index ac77d26a65..f7ab0cc04d 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -135,6 +135,7 @@ export async function verifyContract( // Check to see if already verified const { data, status } = await axios.get(url, { headers: { Accept: 'application/json' } }) if (status != 200 || data['status'] != '1') { + console.log(data) throw new Error("Can't communicate with Etherscan API") } diff --git a/scripts/verification/collateral-plugins/verify_re7weth.ts b/scripts/verification/collateral-plugins/verify_re7weth.ts index 8d695a08ec..3d80cfff29 100644 --- a/scripts/verification/collateral-plugins/verify_re7weth.ts +++ b/scripts/verification/collateral-plugins/verify_re7weth.ts @@ -44,8 +44,8 @@ async function main() { erc20: networkConfig[chainId].tokens.Re7WETH, maxTradeVolume: fp('1e6').toString(), oracleTimeout: ETH_ORACLE_TIMEOUT.toString(), - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: ETH_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: '0', // WETH delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, fp('1e-6'), // small admin fee uncertainty diff --git a/scripts/verification/collateral-plugins/verify_sfrax_eth.ts b/scripts/verification/collateral-plugins/verify_sfrax_eth.ts index 2cd777f81b..d13ed91fa9 100644 --- a/scripts/verification/collateral-plugins/verify_sfrax_eth.ts +++ b/scripts/verification/collateral-plugins/verify_sfrax_eth.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, combinedError } from '../../deployment/utils' +import { priceTimeout, verifyContract, combinedError } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -38,7 +38,7 @@ async function main() { oracleError: oracleError.toString(), erc20: networkConfig[chainId].tokens.sfrxETH, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 98621e63d5..c5f9ab663b 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -131,7 +131,7 @@ export default function fn( ) }) - it('does not allow missing delayUntilDefault if defaultThreshold > 0', async () => { + itChecksNonZeroDefaultThreshold('does not allow 0 delayUntilDefault', async () => { await expect(deployCollateral({ delayUntilDefault: 0 })).to.be.revertedWith( 'delayUntilDefault zero' ) diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index 03b8cf1a3c..c566ed716f 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -118,6 +118,11 @@ export const crvUSD_USDC_POOL_ID = 182 export const crvUSD_USDC_HOLDER = '0x95f00391cB5EebCd190EB58728B4CE23DbFa6ac1' export const crvUSD_USDC_GAUGE = '0x95f00391cB5EebCd190EB58728B4CE23DbFa6ac1' +// crvUSD/USDT +export const crvUSD_USDT = '0x390f3595bCa2Df7d23783dFd126427CCeb997BF4' +export const crvUSD_USDT_POOL_ID = 179 +export const crvUSD_USDT_HOLDER = '0x4e6bB6B7447B7B2Aa268C16AB87F4Bb48BF57939' + // PayPool export const PayPool = '0x383e6b4437b59fff47b619cba855ca29342a8559' export const PayPool_POOL_ID = 270 diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts new file mode 100644 index 0000000000..7d603901ba --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts @@ -0,0 +1,221 @@ +import collateralTests from '../collateralTests' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, +} from '../pluginTestTypes' +import { mintWPool } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { + CurvePoolMock, + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../../typechain' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + CRV, + CVX, + USDT_USD_FEED, + USDT_ORACLE_TIMEOUT, + USDT_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + CurvePoolType, + crvUSD_USD_FEED, + crvUSD_USDT, + crvUSD_ORACLE_TIMEOUT, + crvUSD_ORACLE_ERROR, + crvUSD_USDT_HOLDER, + crvUSD_USDT_POOL_ID, + USDT, + crvUSD, +} from '../constants' +import { getResetFork } from '../../helpers' + +type Fixture = () => Promise + +export const defaultCvxStableCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: crvUSD_USD_FEED, // unused but cannot be zero + oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: crvUSD_USDT, + lpToken: crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDT_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDT_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdtFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapper = await wrapperFactory.deploy() + await wrapper.initialize(crvUSD_USDT_POOL_ID) + + opts.feeds = [[usdtFeed.address], [crvUSDFeed.address]] + opts.erc20 = wrapper.address + } + + opts = { ...defaultCvxStableCollateralOpts, ...opts } + + const CvxStableCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'CurveStableCollateral' + ) + + const collateral = await CvxStableCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxStableCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdtFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateralOpts.feeds = [[usdtFeed.address], [crvUSDFeed.address]] + + // Use mock curvePool seeded with initial balances + const CurvePoolMockFactory = await ethers.getContractFactory('CurvePoolMock') + const realCurvePool = await ethers.getContractAt('CurvePoolMock', crvUSD_USDT) + const curvePool = ( + await CurvePoolMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + // Deploy Wrapper + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapper = await wrapperFactory.deploy() + await wrapper.initialize(crvUSD_USDT_POOL_ID) + + collateralOpts.erc20 = wrapper.address + collateralOpts.curvePool = curvePool.address + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + + return { + alice, + collateral, + curvePool: curvePool, + wrapper: wrapper, + rewardTokens: [cvx, crv], + poolTokens: [ + await ethers.getContractAt('ERC20Mock', USDT), + await ethers.getContractAt('ERC20Mock', crvUSD), + ], + feeds: [usdtFeed, crvUSDFeed], + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintWPool(ctx, amount, user, recipient, crvUSD_USDT_HOLDER) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => {} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itHasRevenueHiding: it, + itClaimsRewards: it, + isMetapool: false, + resetFork: getResetFork(19564899), + collateralName: 'CurveStableCollateral - ConvexStakingWrapper (crvUSD/USDT)', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts b/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts index d072405543..85c684e8d6 100644 --- a/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts +++ b/test/plugins/individual-collateral/meta-morpho/MetaMorphoSelfReferentialCollateral.test.ts @@ -137,7 +137,13 @@ const makeFiatCollateralTestSuite = ( Define collateral-specific tests */ // eslint-disable-next-line @typescript-eslint/no-empty-function - const collateralSpecificConstructorTests = () => {} + const collateralSpecificConstructorTests = () => { + it('does not allow >0 defaultThreshold', async () => { + await expect(deployCollateral({ defaultThreshold: bn('1') })).to.be.revertedWith( + 'defaultThreshold not zero' + ) + }) + } // eslint-disable-next-line @typescript-eslint/no-empty-function const collateralSpecificStatusTests = () => {} @@ -184,7 +190,7 @@ const makeOpts = ( priceTimeout: PRICE_TIMEOUT, oracleTimeout: oracleTimeout, oracleError: oracleError, - defaultThreshold: oracleError.add(fp('0.01')), + defaultThreshold: fp('0'), delayUntilDefault: DELAY_UNTIL_DEFAULT, maxTradeVolume: fp('1e6'), revenueHiding: fp('0'), From 57d092db208457a96848570d186a770a193cd6eb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Apr 2024 17:36:50 -0400 Subject: [PATCH 296/450] Arbitrum initial scripts (#1104) --- common/configuration.ts | 6 ++ scripts/deploy.ts | 11 ++- .../phase2-assets/1_deploy_assets.ts | 6 +- .../phase2-assets/2_deploy_collateral.ts | 30 +++++--- .../phase2-assets/assets/deploy_arb.ts | 70 +++++++++++++++++ .../collaterals/deploy_aave_v3_usdc.ts | 75 +++++++++++++++---- .../deploy_ctokenv3_usdc_collateral.ts | 6 +- scripts/deployment/utils.ts | 50 +++++++++++++ scripts/verification/6_verify_collateral.ts | 13 +++- .../collateral-plugins/verify_aave_v3_usdc.ts | 29 +++---- .../collateral-plugins/verify_cusdcv3.ts | 11 ++- scripts/verify_etherscan.ts | 6 +- 12 files changed, 260 insertions(+), 53 deletions(-) create mode 100644 scripts/deployment/phase2-assets/assets/deploy_arb.ts diff --git a/common/configuration.ts b/common/configuration.ts index 0b80446283..0a5cbe9497 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -53,6 +53,7 @@ export interface ITokens { WETH?: string WBTC?: string EURT?: string + ARB?: string RSR?: string CRV?: string CVX?: string @@ -514,6 +515,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { '42161': { name: 'arbitrum', tokens: { + ARB: '0x912ce59144191c1204e64559fe8253a0e49e6548', + DAI: '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1', COMP: '0x354A6dA3fcde098F8389cad84b0182725c6C91dE', RSR: '0xCa5Ca9083702c56b481D1eec86F1776FDbd2e594', USDC: '0xaf88d065e77c8cc2239327c5edb3a432268e5831', @@ -525,6 +528,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { saArbUSDT: '', // TODO our wrapper. remove from deployment script after placing here }, chainlinkFeeds: { + ARB: '0xb2A824043730FE05F3DA2efaFa1CBbe83fa548D6', + COMP: '0xe7C53FFd03Eb6ceF7d208bC4C13446c76d1E5884', + DAI: '0xc5C8E77B397E531B8EC06BFb0048328B30E9eCfB', USDC: '0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3', USDT: '0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7', RSR: '0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488', diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 3e81f6f3ed..671d593f63 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -92,8 +92,17 @@ async function main() { 'phase2-assets/assets/deploy_stg.ts' ) } else if (chainId == '42161' || chainId == '421614') { - // TODO: Arbitrum + // Arbitrum One + scripts.push( + 'phase2-assets/1_deploy_assets.ts', + 'phase2-assets/2_deploy_collateral.ts', + 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', + 'phase2-assets/collaterals/deploy_aave_v3_usdt.ts', + 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', + 'phase2-assets/assets/deploy_arb.ts' + ) } + // =============================================== // Phase 3 - RTokens diff --git a/scripts/deployment/phase2-assets/1_deploy_assets.ts b/scripts/deployment/phase2-assets/1_deploy_assets.ts index 93a8a69392..9ba6b53f4a 100644 --- a/scripts/deployment/phase2-assets/1_deploy_assets.ts +++ b/scripts/deployment/phase2-assets/1_deploy_assets.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../../../common/configuration' +import { arbitrumL2Chains, baseL2Chains, networkConfig } from '../../../common/configuration' import { fp } from '../../../common/numbers' import { getDeploymentFile, @@ -53,11 +53,13 @@ async function main() { deployedAssets.push(stkAAVEAsset.toString()) } + const oracleError = arbitrumL2Chains.includes(hre.network.name) ? fp('0.005') : fp('0.01') + /******** Deploy Comp Asset **************************/ const { asset: compAsset } = await hre.run('deploy-asset', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.COMP, - oracleError: fp('0.01').toString(), // 1% + oracleError: oracleError.toString(), // 1% tokenAddress: networkConfig[chainId].tokens.COMP, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '3600', // 1 hr diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index 98f69a75ef..a886658cb7 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -2,7 +2,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { expect } from 'chai' import { getChainId } from '../../../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../../../common/configuration' +import { arbitrumL2Chains, baseL2Chains, networkConfig } from '../../../common/configuration' import { bn, fp } from '../../../common/numbers' import { CollateralStatus } from '../../../common/constants' import { @@ -12,7 +12,15 @@ import { getDeploymentFilename, fileExists, } from '../common' -import { combinedError, priceTimeout, revenueHiding } from '../utils' +import { + combinedError, + getDaiOracleError, + getDaiOracleTimeout, + getUsdcOracleError, + getUsdtOracleError, + priceTimeout, + revenueHiding, +} from '../utils' import { ICollateral, ATokenMock, StaticATokenLM } from '../../../typechain' async function main() { @@ -43,8 +51,8 @@ async function main() { let collateral: ICollateral /******** Deploy Fiat Collateral - DAI **************************/ - const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? '86400' : '3600' // 24 hr (Base) or 1 hour - const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const daiOracleTimeout = getDaiOracleTimeout(hre.network.name) + const daiOracleError = getDaiOracleError(hre.network.name) if (networkConfig[chainId].tokens.DAI && networkConfig[chainId].chainlinkFeeds.DAI) { const { collateral: daiCollateral } = await hre.run('deploy-fiat-collateral', { @@ -69,8 +77,8 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const usdcOracleTimeout = '86400' + const usdcOracleError = getUsdcOracleError(hre.network.name) /******** Deploy Fiat Collateral - USDC **************************/ if (networkConfig[chainId].tokens.USDC && networkConfig[chainId].chainlinkFeeds.USDC) { @@ -98,7 +106,7 @@ async function main() { /******** Deploy Fiat Collateral - USDT **************************/ const usdtOracleTimeout = '86400' // 24 hr - const usdtOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const usdtOracleError = getUsdtOracleError(hre.network.name) if (networkConfig[chainId].tokens.USDT && networkConfig[chainId].chainlinkFeeds.USDT) { const { collateral: usdtCollateral } = await hre.run('deploy-fiat-collateral', { @@ -196,8 +204,8 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - /*** AAVE V2 not available in Base L2s */ - if (!baseL2Chains.includes(hre.network.name)) { + /*** AAVE V2 not available in Base or Arbitrum L2s */ + if (!baseL2Chains.includes(hre.network.name) && !arbitrumL2Chains.includes(hre.network.name)) { /******** Deploy AToken Fiat Collateral - aDAI **************************/ // Get AToken to retrieve name and symbol @@ -422,8 +430,8 @@ async function main() { const btcOracleError = fp('0.005') // 0.5% const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) - /*** Compound V2 not available in Base L2s */ - if (!baseL2Chains.includes(hre.network.name)) { + /*** Compound V2 not available in Base or Arbitrum L2s */ + if (!baseL2Chains.includes(hre.network.name) && !arbitrumL2Chains.includes(hre.network.name)) { /******** Deploy CToken Fiat Collateral - cDAI **************************/ const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), diff --git a/scripts/deployment/phase2-assets/assets/deploy_arb.ts b/scripts/deployment/phase2-assets/assets/deploy_arb.ts new file mode 100644 index 0000000000..7f9d5d8575 --- /dev/null +++ b/scripts/deployment/phase2-assets/assets/deploy_arb.ts @@ -0,0 +1,70 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { + getDeploymentFile, + getDeploymentFilename, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + fileExists, +} from '../../common' +import { getArbOracleError, priceTimeout } from '../../utils' +import { Asset } from '../../../../typechain' + +// Mainnet + Arbitrum + +async function main() { + // ==== Read Configuration ==== + const [burner] = await hre.ethers.getSigners() + const chainId = await getChainId(hre) + + console.log(`Deploying ARB asset to network ${hre.network.name} (${chainId}) + with burner account: ${burner.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedAssets: string[] = [] + + const oracleError = getArbOracleError(hre.network.name) + + /******** Deploy ARB asset **************************/ + const { asset: arbAsset } = await hre.run('deploy-asset', { + priceTimeout: priceTimeout.toString(), + priceFeed: networkConfig[chainId].chainlinkFeeds.ARB, + oracleError: oracleError.toString(), + tokenAddress: networkConfig[chainId].tokens.ARB, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + }) + await (await ethers.getContractAt('Asset', arbAsset)).refresh() + + assetCollDeployments.assets.ARB = arbAsset + assetCollDeployments.erc20s.ARB = networkConfig[chainId].tokens.ARB + deployedAssets.push(arbAsset.toString()) + + /**************************************************************/ + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed ARB asset to ${hre.network.name} (${chainId}): + New deployments: ${deployedAssets} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts index 63f72128c0..a208a607cb 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../../../../common/configuration' +import { arbitrumL2Chains, baseL2Chains, networkConfig } from '../../../../common/configuration' import { expect } from 'chai' import { CollateralStatus } from '../../../../common/constants' import { @@ -21,6 +21,9 @@ import { USDC_BASE_MAX_TRADE_VOLUME, USDC_BASE_ORACLE_TIMEOUT, USDC_BASE_ORACLE_ERROR, + USDC_ARBITRUM_MAX_TRADE_VOLUME, + USDC_ARBITRUM_ORACLE_TIMEOUT, + USDC_ARBITRUM_ORACLE_ERROR, } from '../../../../test/plugins/individual-collateral/aave-v3/constants' // This file specifically deploys Aave V3 USDC collateral @@ -60,15 +63,16 @@ async function main() { ) await erc20.deployed() - // Mainnet - if (!baseL2Chains.includes(hre.network.name)) { - /******** Deploy Aave V3 USDC wrapper **************************/ + /******** Deploy Aave V3 USDC wrapper **************************/ + + if (arbitrumL2Chains.includes(hre.network.name)) { + // === Arbitrum === await ( await erc20.initialize( - networkConfig[chainId].tokens.aEthUSDC!, - 'Static Aave Ethereum USDC', - 'saEthUSDC' + networkConfig[chainId].tokens.aArbUSDCn!, + 'Static Aave Arbitrum USDC', + 'saArbUSDCn' ) ).wait() @@ -80,12 +84,12 @@ async function main() { { priceTimeout: priceTimeout, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: USDC_MAINNET_ORACLE_ERROR.toString(), + oracleError: USDC_ARBITRUM_ORACLE_ERROR.toString(), erc20: erc20.address, - maxTradeVolume: USDC_MAINNET_MAX_TRADE_VOLUME.toString(), - oracleTimeout: USDC_MAINNET_ORACLE_TIMEOUT.toString(), + maxTradeVolume: USDC_ARBITRUM_MAX_TRADE_VOLUME.toString(), + oracleTimeout: USDC_ARBITRUM_ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(USDC_MAINNET_ORACLE_ERROR).toString(), + defaultThreshold: fp('0.01').add(USDC_ARBITRUM_ORACLE_ERROR).toString(), delayUntilDefault: bn('86400').toString(), }, revenueHiding.toString() @@ -98,11 +102,11 @@ async function main() { `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` ) - assetCollDeployments.erc20s.saEthUSDC = erc20.address - assetCollDeployments.collateral.saEthUSDC = collateral.address + assetCollDeployments.erc20s.saArbUSDCn = erc20.address + assetCollDeployments.collateral.saArbUSDCn = collateral.address deployedCollateral.push(collateral.address.toString()) - } else { - /******** Deploy Aave V3 USDC wrapper **************************/ + } else if (baseL2Chains.includes(hre.network.name)) { + // === Base === await ( await erc20.initialize( @@ -141,7 +145,48 @@ async function main() { assetCollDeployments.erc20s.saBasUSDC = erc20.address assetCollDeployments.collateral.saBasUSDC = collateral.address deployedCollateral.push(collateral.address.toString()) + } else { + // === Mainnet === + + await ( + await erc20.initialize( + networkConfig[chainId].tokens.aEthUSDC!, + 'Static Aave Ethereum USDC', + 'saEthUSDC' + ) + ).wait() + + console.log( + `Deployed wrapper for Aave V3 USDC on ${hre.network.name} (${chainId}): ${erc20.address} ` + ) + + const collateral = await CollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: USDC_MAINNET_ORACLE_ERROR.toString(), + erc20: erc20.address, + maxTradeVolume: USDC_MAINNET_MAX_TRADE_VOLUME.toString(), + oracleTimeout: USDC_MAINNET_ORACLE_TIMEOUT.toString(), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(USDC_MAINNET_ORACLE_ERROR).toString(), + delayUntilDefault: bn('86400').toString(), + }, + revenueHiding.toString() + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.erc20s.saEthUSDC = erc20.address + assetCollDeployments.collateral.saEthUSDC = collateral.address + deployedCollateral.push(collateral.address.toString()) } + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) console.log(`Deployed collateral to ${hre.network.name} (${chainId}) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts index 50253f15f7..0c81f7aa06 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../../../../common/configuration' +import { networkConfig } from '../../../../common/configuration' import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus } from '../../../../common/constants' @@ -12,7 +12,7 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { priceTimeout, revenueHiding } from '../../utils' +import { getUsdcOracleError, priceTimeout, revenueHiding } from '../../utils' import { CTokenV3Collateral } from '../../../../typechain' import { ContractFactory } from 'ethers' @@ -55,7 +55,7 @@ async function main() { const CTokenV3Factory: ContractFactory = await hre.ethers.getContractFactory('CTokenV3Collateral') const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const usdcOracleError = getUsdcOracleError(hre.network.name) const collateral = await CTokenV3Factory.connect(deployer).deploy( { diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index f7ab0cc04d..e2d68af55c 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -232,3 +232,53 @@ export const prompt = async (query: string): Promise => { return '' } } + +export const getUsdcOracleError = (network: string): BigNumber => { + if (arbitrumL2Chains.includes(network)) { + return fp('0.001') // 0.1% arbitrum + } else if (baseL2Chains.includes(network)) { + return fp('0.003') // 0.3% base + } else { + return fp('0.0025') // 0.25% mainnet + } +} + +export const getArbOracleError = (network: string): BigNumber => { + if (arbitrumL2Chains.includes(network)) { + return fp('0.0005') // 0.05% arbitrum + } else if (baseL2Chains.includes(network)) { + throw new Error('not a valid chain') + } else { + return fp('0.02') // 2% mainnet + } +} + +export const getDaiOracleError = (network: string): BigNumber => { + if (arbitrumL2Chains.includes(network)) { + return fp('0.001') // 0.1% arbitrum + } else if (baseL2Chains.includes(network)) { + return fp('0.003') // 0.3% base + } else { + return fp('0.0025') // 0.25% mainnet + } +} + +export const getDaiOracleTimeout = (network: string): string => { + if (arbitrumL2Chains.includes(network)) { + return '86400' // 24 hr + } else if (baseL2Chains.includes(network)) { + return '86400' // 24 hr + } else { + return '3600' // 1 hr + } +} + +export const getUsdtOracleError = (network: string): BigNumber => { + if (arbitrumL2Chains.includes(network)) { + return fp('0.001') // 0.1% arbitrum + } else if (baseL2Chains.includes(network)) { + return fp('0.003') // 0.3% base + } else { + return fp('0.0025') // 0.25% mainnet + } +} diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index 41a4375322..88bc41a169 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -8,7 +8,14 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../deployment/common' -import { combinedError, priceTimeout, revenueHiding, verifyContract } from '../deployment/utils' +import { + combinedError, + getDaiOracleError, + getDaiOracleTimeout, + priceTimeout, + revenueHiding, + verifyContract, +} from '../deployment/utils' import { ATokenMock, ATokenFiatCollateral } from '../../typechain' let deployments: IAssetCollDeployments @@ -28,8 +35,8 @@ async function main() { deployments = getDeploymentFile(assetCollDeploymentFilename) /******** Verify Fiat Collateral - DAI **************************/ - const daiOracleTimeout = baseL2Chains.includes(hre.network.name) ? 86400 : 3600 // 24 hr (Base) or 1 hour - const daiOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const daiOracleTimeout = getDaiOracleTimeout(hre.network.name) + const daiOracleError = getDaiOracleError(hre.network.name) await verifyContract( chainId, diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts index e5579929a0..0de00683a2 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -1,6 +1,6 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { developmentChains, networkConfig } from '../../../common/configuration' import { getDeploymentFile, getAssetCollDeploymentFilename, @@ -25,18 +25,19 @@ async function main() { const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) deployments = getDeploymentFile(assetCollDeploymentFilename) - const erc20 = await ethers.getContractAt( - 'ERC20Mock', - baseL2Chains.includes(hre.network.name) - ? deployments.erc20s.saBasUSDC! - : deployments.erc20s.saEthUSDC! - ) - const collateral = await ethers.getContractAt( - 'AaveV3FiatCollateral', - baseL2Chains.includes(hre.network.name) - ? deployments.collateral.saBasUSDC! - : deployments.collateral.saEthUSDC! - ) + const erc20s: { [key: string]: string } = { + '1': deployments.erc20s.saEthUSDC!, + '8453': deployments.erc20s.saBasUSDC!, + '42161': deployments.erc20s.saArbUSDCn!, + } + const erc20 = await ethers.getContractAt('ERC20Mock', erc20s[chainId]) + + const collaterals: { [key: string]: string } = { + '1': deployments.collateral.saEthUSDC!, + '8453': deployments.collateral.saBasUSDC!, + '42161': deployments.collateral.saArbUSDCn!, + } + const collateral = await ethers.getContractAt('AaveV3FiatCollateral', collaterals[chainId]) /******** Verify Aave V3 USDC ERC20 **************************/ await verifyContract( @@ -47,7 +48,7 @@ async function main() { ) /******** Verify Aave V3 USDC plugin **************************/ - // Works for both Mainnet and Base + // Works for any chain await verifyContract( chainId, diff --git a/scripts/verification/collateral-plugins/verify_cusdcv3.ts b/scripts/verification/collateral-plugins/verify_cusdcv3.ts index dac4d02c4a..ac5dda113b 100644 --- a/scripts/verification/collateral-plugins/verify_cusdcv3.ts +++ b/scripts/verification/collateral-plugins/verify_cusdcv3.ts @@ -1,13 +1,18 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { developmentChains, networkConfig } from '../../../common/configuration' import { fp, bn } from '../../../common/numbers' import { getDeploymentFile, getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' +import { + getUsdcOracleError, + priceTimeout, + verifyContract, + revenueHiding, +} from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -46,7 +51,7 @@ async function main() { /******** Verify Collateral - wcUSDCv3 **************************/ const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + const usdcOracleError = getUsdcOracleError(hre.network.name) await verifyContract( chainId, diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 5a98f62595..1d0b566a21 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -86,7 +86,11 @@ async function main() { 'assets/verify_stg.ts' ) } else if (chainId == '42161' || chainId == '421614') { - // TODO: Arbitrum + // Arbitrum One + scripts.push( + 'collateral-plugins/verify_aave_v3_usdc.ts', + 'collateral-plugins/verify_cusdcv3.ts' + ) } // Phase 3 - RTokens and Governance From d10c23d4af42736323bf67c5079ef59be83abdf4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Apr 2024 20:40:25 -0400 Subject: [PATCH 297/450] EXTREME=1 Broker.test.ts --- hardhat.config.ts | 1 + test/Broker.test.ts | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hardhat.config.ts b/hardhat.config.ts index 0e9f812b2e..232f3a385f 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -47,6 +47,7 @@ const config: HardhatUserConfig = { gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, allowUnlimitedContractSize: true, + allowBlocksWithSameTimestamp: true, }, localhost: { // network for long-lived mainnet forks diff --git a/test/Broker.test.ts b/test/Broker.test.ts index bf0fef3808..4e8a9330b3 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1450,7 +1450,6 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Rebalance should cause backingManager to trade about auctionSellAmt, though not exactly await backingManager.setMaxTradeSlippage(bn('0')) await backingManager.setMinTradeVolume(bn('0')) - await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)) .to.emit(backingManager, 'TradeStarted') .withArgs(anyValue, sellTok.address, buyTok.address, anyValue, anyValue) @@ -1466,7 +1465,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .mul(endTime - startTime) .div(fp('1')) .toNumber() - let bidAmt = await trade.bidAmount(bidTime) + const bidAmt = await trade.bidAmount(bidTime) // Bid const sellAmt = await trade.lot() @@ -1477,15 +1476,17 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { if (bidTime > (await getLatestBlockTimestamp())) await setNextBlockTimestamp(bidTime) if (bidType.eq(bn(BidType.CALLBACK))) { + await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) + await setNextBlockTimestamp(await getLatestBlockTimestamp()) // in same block await expect(router.connect(addr1).bid(trade.address, addr1.address)) .to.emit(backingManager, 'TradeSettled') .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) } else if (bidType.eq(bn(BidType.TRANSFER))) { await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) + await setNextBlockTimestamp(await getLatestBlockTimestamp()) // in same block await expect(trade.connect(addr1).bid()) .to.emit(backingManager, 'TradeSettled') .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, anyValue) - bidAmt = await trade.bidAmount(await getLatestBlockTimestamp()) } // Check balances From 0980b54d0863050a6954e4c07e51570c91500932 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Apr 2024 22:14:39 -0400 Subject: [PATCH 298/450] EXTREME=1 Broker.test.ts --- hardhat.config.ts | 1 - test/Broker.test.ts | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/hardhat.config.ts b/hardhat.config.ts index 232f3a385f..0e9f812b2e 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -47,7 +47,6 @@ const config: HardhatUserConfig = { gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, allowUnlimitedContractSize: true, - allowBlocksWithSameTimestamp: true, }, localhost: { // network for long-lived mainnet forks diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 4e8a9330b3..8192e0b3a4 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -3,7 +3,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' import { BigNumber, ContractFactory, constants } from 'ethers' -import { ethers, upgrades } from 'hardhat' +import hre, { ethers, upgrades } from 'hardhat' import { IConfig, MAX_AUCTION_LENGTH } from '../common/configuration' import { MAX_UINT48, @@ -50,6 +50,7 @@ import { } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' import { + advanceBlocks, advanceTime, advanceToTimestamp, getLatestBlockTimestamp, @@ -1475,19 +1476,18 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { if (bidTime > (await getLatestBlockTimestamp())) await setNextBlockTimestamp(bidTime) + // Set automine to false for multiple transactions in one block + await hre.network.provider.send('evm_setAutomine', [false]) + if (bidType.eq(bn(BidType.CALLBACK))) { await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) - await setNextBlockTimestamp(await getLatestBlockTimestamp()) // in same block - await expect(router.connect(addr1).bid(trade.address, addr1.address)) - .to.emit(backingManager, 'TradeSettled') - .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + await router.connect(addr1).bid(trade.address, addr1.address) } else if (bidType.eq(bn(BidType.TRANSFER))) { await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) - await setNextBlockTimestamp(await getLatestBlockTimestamp()) // in same block - await expect(trade.connect(addr1).bid()) - .to.emit(backingManager, 'TradeSettled') - .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, anyValue) + await trade.connect(addr1).bid() } + await advanceBlocks(1) + await hre.network.provider.send('evm_setAutomine', [true]) // Check balances expect(await sellTok.balanceOf(addr1.address)).to.equal(sellBalBefore.add(sellAmt)) From b0ff821d7e4bef39d8b8db3008418457e770cacf Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 10 Apr 2024 20:14:54 +0530 Subject: [PATCH 299/450] comments --- contracts/interfaces/IStRSRVotes.sol | 2 +- contracts/p1/StRSRVotes.sol | 3 ++- contracts/plugins/governance/Governance.sol | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/contracts/interfaces/IStRSRVotes.sol b/contracts/interfaces/IStRSRVotes.sol index 4bd30efe81..623134b100 100644 --- a/contracts/interfaces/IStRSRVotes.sol +++ b/contracts/interfaces/IStRSRVotes.sol @@ -9,7 +9,7 @@ interface IStRSRVotes is IVotesUpgradeable { function currentEra() external view returns (uint256); /// @return The era at a past block number - function getPastEra(uint256 blockNumber) external view returns (uint256); + function getPastEra(uint256 timepoint) external view returns (uint256); /// Stakes an RSR `amount` on the corresponding RToken and allows to delegate /// votes from the sender to `delegatee` or self diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 9e073c97cf..0474788247 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -20,6 +20,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { // In particular, if the value changed during block N, there will be exactly one // entry cp with cp.fromBlock = N, and cp.val is the value at the _end_ of that block. + // 3.4.0: Even though it says `fromBlock`, it's actually timepoint. struct Checkpoint { uint48 fromBlock; uint224 val; @@ -106,7 +107,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { return _checkpointsLookup(_eras, timepoint); } - /// Return the value from history `ckpts` that was current for block number `blockNumber` + /// Return the value from history `ckpts` that was current for timepoint `timepoint` function _checkpointsLookup(Checkpoint[] storage ckpts, uint256 timepoint) private view diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 19ee5cadda..afacdb7f52 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -84,14 +84,14 @@ contract Governance is return (asMicroPercent * pastSupply + (ONE_HUNDRED_PERCENT - 1)) / ONE_HUNDRED_PERCENT; } - function quorum(uint256 blockNumber) + function quorum(uint256 timepoint) public view virtual override(IGovernor, GovernorVotesQuorumFraction) returns (uint256) { - return super.quorum(blockNumber); + return super.quorum(timepoint); } function state(uint256 proposalId) @@ -167,10 +167,10 @@ contract Governance is /// @return {qStRSR} The voting weight the account had at a previous block number function _getVotes( address account, - uint256 blockNumber, + uint256 timepoint, bytes memory /*params*/ ) internal view override(Governor, GovernorVotes) returns (uint256) { - return token.getPastVotes(account, blockNumber); // {qStRSR} + return token.getPastVotes(account, timepoint); // {qStRSR} } function supportsInterface(bytes4 interfaceId) From 969617dffd029598fa9384197aa1fca6181703b0 Mon Sep 17 00:00:00 2001 From: Patrick McKelvy Date: Wed, 10 Apr 2024 10:49:50 -0400 Subject: [PATCH 300/450] // is actually a timestamp {s} --- contracts/p1/StRSRVotes.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 0474788247..ab751c7c0e 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -119,6 +119,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { uint256 low = 0; while (low < high) { uint256 mid = MathUpgradeable.average(low, high); + // `fromBlock` is actually a timestamp {s} if (ckpts[mid].fromBlock > timepoint) { high = mid; } else { @@ -232,6 +233,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; newWeight = op(oldWeight, delta); + // `fromBlock` is actually a timestamp {s} if (pos > 0 && ckpts[pos - 1].fromBlock == clock()) { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { From 2dc9688b8f825c787a8a2f8c8c6b120befa4b057 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 10 Apr 2024 20:28:02 +0530 Subject: [PATCH 301/450] comments --- contracts/p1/StRSRVotes.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index ab751c7c0e..8deddb699c 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -119,7 +119,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { uint256 low = 0; while (low < high) { uint256 mid = MathUpgradeable.average(low, high); - // `fromBlock` is actually a timestamp {s} + // `fromBlock` is a timepoint if (ckpts[mid].fromBlock > timepoint) { high = mid; } else { @@ -233,7 +233,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; newWeight = op(oldWeight, delta); - // `fromBlock` is actually a timestamp {s} + // `fromBlock` is a timepoint if (pos > 0 && ckpts[pos - 1].fromBlock == clock()) { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { From 7f3b28db0e62b84abb86e22baa16a5c35efdba28 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 10 Apr 2024 21:23:00 -0300 Subject: [PATCH 302/450] Coverage 3.3.0 - Phase 1 (#1083) --- contracts/libraries/Allowance.sol | 4 + contracts/p1/Broker.sol | 1 + contracts/p1/Distributor.sol | 4 +- contracts/p1/RevenueTrader.sol | 2 + contracts/p1/mixins/BasketLib.sol | 2 + .../plugins/assets/EURFiatCollateral.sol | 2 + contracts/plugins/assets/RTokenAsset.sol | 2 + .../compoundv2/CTokenNonFiatCollateral.sol | 1 - contracts/plugins/mocks/CTokenMock.sol | 16 +- .../plugins/mocks/InvalidChainlinkMock.sol | 14 +- contracts/plugins/mocks/UnpricedPlugins.sol | 57 ++-- test/Facade.test.ts | 21 ++ test/Main.test.ts | 16 ++ test/Revenues.test.ts | 42 ++- test/plugins/Asset.test.ts | 92 +++++++ test/plugins/Collateral.test.ts | 257 ++++++++++-------- .../compoundv2/CTokenFiatCollateral.test.ts | 133 +++++---- 17 files changed, 476 insertions(+), 190 deletions(-) diff --git a/contracts/libraries/Allowance.sol b/contracts/libraries/Allowance.sol index c3e5f62e5d..bd5fea1bd8 100644 --- a/contracts/libraries/Allowance.sol +++ b/contracts/libraries/Allowance.sol @@ -23,6 +23,8 @@ library AllowanceLib { // 1. Set initial allowance to 0 token.approve(spender, 0); + // untestable: + // allowance should always be 0 if token behaves correctly require(token.allowance(address(this), spender) == 0, "allowance not 0"); if (value == 0) return; @@ -37,6 +39,8 @@ library AllowanceLib { // 3. Fall-back to setting a maximum allowance if (!success) { token.approve(spender, type(uint256).max); + // untestable: + // allowance should always be max value if token behaves correctly require(token.allowance(address(this), spender) >= value, "allowance missing"); } } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0111d25bc3..d29a30cd9d 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -158,6 +158,7 @@ contract BrokerP1 is ComponentP1, IBroker { dutchTradeDisabled[buy] = true; } } else { + // untestable: trade kind is either BATCH or DUTCH revert("unrecognized trade kind"); } } diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index f8a15e4c63..04e6551662 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -124,10 +124,10 @@ contract DistributorP1 is ComponentP1, IDistributor { if (addrTo == FURNACE) { addrTo = furnaceAddr; - if (transferAmt > 0) accountRewards = true; + accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = stRSRAddr; - if (transferAmt > 0) accountRewards = true; + accountRewards = true; } transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 998bdc951f..8ec6574e1c 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -56,6 +56,8 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { // solhint-disable-next-line no-empty-blocks try this.distributeTokenToBuy() {} catch (bytes memory errData) { + // untested: + // OOG pattern tested in other contracts, cost to test here is high // see: docs/solidity-style.md#Catching-Empty-Data if (errData.length == 0) revert(); // solhint-disable-line reason-string } diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index 216935c2b9..e2daa9f2ee 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -363,6 +363,8 @@ library BasketLibP1 { ICollateral coll = assetRegistry.toColl(erc20s[i]); // reverts if unregistered (uint192 low, uint192 high) = coll.price(); // {UoA/tok} + // untestable: + // this function is only called if basket is SOUND require(low > 0 && high < FIX_MAX, "invalid price"); // {UoA/BU} += {target/BU} * {UoA/tok} / ({target/ref} * {ref/tok}) diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index d22e3152a0..a25b2bcf6d 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -55,6 +55,8 @@ contract EURFiatCollateral is FiatCollateral { uint192 pricePerTarget = targetUnitChainlinkFeed.price(targetUnitOracleTimeout); // div-by-zero later + // untestable: + // calls to price() on the feed never return zero if using OracleLib if (pricePerTarget == 0) { return (0, FIX_MAX, 0); } diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index a045e22fd7..52d9d1be6b 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -150,6 +150,8 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// @return updatedAt {s} The timestamp of the cache update function latestPrice() external returns (uint192 rTokenPrice, uint256 updatedAt) { // Situations that require an update, from most common to least common. + // untestable: + // basket and trade nonce checks, as first condition will always be true in these cases if ( cachedOracleData.cachedAtTime + ORACLE_TIMEOUT <= block.timestamp || // Cache Timeout cachedOracleData.cachedAtNonce != basketHandler.nonce() || // Basket nonce was updated diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 8c9818e0e4..21ec14d585 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -31,7 +31,6 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { ) CTokenFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); diff --git a/contracts/plugins/mocks/CTokenMock.sol b/contracts/plugins/mocks/CTokenMock.sol index a1208f2cb1..0d31d5666e 100644 --- a/contracts/plugins/mocks/CTokenMock.sol +++ b/contracts/plugins/mocks/CTokenMock.sol @@ -12,7 +12,8 @@ contract CTokenMock is ERC20Mock { uint256 internal _exchangeRate; - bool public revertExchangeRate; + bool public revertExchangeRateCurrent; + bool public revertExchangeRateStored; IComptroller public immutable comptroller; @@ -32,7 +33,7 @@ contract CTokenMock is ERC20Mock { } function exchangeRateCurrent() external returns (uint256) { - if (revertExchangeRate) { + if (revertExchangeRateCurrent) { revert("reverting exchange rate current"); } _exchangeRate = _exchangeRate; // just to avoid sol warning @@ -40,6 +41,9 @@ contract CTokenMock is ERC20Mock { } function exchangeRateStored() external view returns (uint256) { + if (revertExchangeRateStored) { + revert("reverting exchange rate stored"); + } return _exchangeRate; } @@ -59,7 +63,11 @@ contract CTokenMock is ERC20Mock { return fiatcoinRedemptionRate.shiftl(leftShift).mul_toUint(start); } - function setRevertExchangeRate(bool newVal) external { - revertExchangeRate = newVal; + function setRevertExchangeRateCurrent(bool newVal) external { + revertExchangeRateCurrent = newVal; + } + + function setRevertExchangeRateStored(bool newVal) external { + revertExchangeRateStored = newVal; } } diff --git a/contracts/plugins/mocks/InvalidChainlinkMock.sol b/contracts/plugins/mocks/InvalidChainlinkMock.sol index c2d0823e99..02246c64e7 100644 --- a/contracts/plugins/mocks/InvalidChainlinkMock.sol +++ b/contracts/plugins/mocks/InvalidChainlinkMock.sol @@ -11,10 +11,12 @@ import "./ChainlinkMock.sol"; */ contract InvalidMockV3Aggregator is MockV3Aggregator { bool public simplyRevert; + bool public revertWithExplicitError; - constructor(uint8 _decimals, int256 _initialAnswer) - MockV3Aggregator(_decimals, _initialAnswer) - {} + constructor( + uint8 _decimals, + int256 _initialAnswer + ) MockV3Aggregator(_decimals, _initialAnswer) {} function latestRoundData() external @@ -30,6 +32,8 @@ contract InvalidMockV3Aggregator is MockV3Aggregator { { if (simplyRevert) { revert(); // Revert with no reason + } else if (revertWithExplicitError) { + revert("oracle explicit error"); // Revert with explicit reason } else { // Run out of gas this.infiniteLoop{ gas: 10 }(); @@ -47,6 +51,10 @@ contract InvalidMockV3Aggregator is MockV3Aggregator { simplyRevert = on; } + function setRevertWithExplicitError(bool on) external { + revertWithExplicitError = on; + } + function infiniteLoop() external pure { uint256 i = 0; uint256[1] memory array; diff --git a/contracts/plugins/mocks/UnpricedPlugins.sol b/contracts/plugins/mocks/UnpricedPlugins.sol index cc2841f2e6..4d2d20bda8 100644 --- a/contracts/plugins/mocks/UnpricedPlugins.sol +++ b/contracts/plugins/mocks/UnpricedPlugins.sol @@ -27,23 +27,51 @@ contract UnpricedAssetMock is Asset { uint48 oracleTimeout_ ) Asset(priceTimeout_, chainlinkFeed_, oracleError_, erc20_, maxTradeVolume_, oracleTimeout_) {} + /// tryPrice: mock unpriced by returning (0, FIX_MAX) + function tryPrice() external view override returns (uint192 low, uint192 high, uint192) { + // If unpriced is marked, return 0, FIX_MAX + if (unpriced) return (0, FIX_MAX, 0); + + uint192 p = chainlinkFeed.price(oracleTimeout); // {UoA/tok} + uint192 delta = p.mul(oracleError, CEIL); + return (p - delta, p + delta, 0); + } + + function setUnpriced(bool on) external { + unpriced = on; + } +} + +contract UnpricedFiatCollateralMock is FiatCollateral { + using FixLib for uint192; + using OracleLib for AggregatorV3Interface; + + bool public unpriced = false; + + // solhint-disable no-empty-blocks + + constructor(CollateralConfig memory config) FiatCollateral(config) {} + /// tryPrice: mock unpriced by returning (0, FIX_MAX) function tryPrice() external view + virtual override - returns ( - uint192 low, - uint192 high, - uint192 - ) + returns (uint192 low, uint192 high, uint192 pegPrice) { // If unpriced is marked, return 0, FIX_MAX if (unpriced) return (0, FIX_MAX, 0); - uint192 p = chainlinkFeed.price(oracleTimeout); // {UoA/tok} - uint192 delta = p.mul(oracleError, CEIL); - return (p - delta, p + delta, 0); + // {target/ref} = {UoA/ref} / {UoA/target} (1) + pegPrice = chainlinkFeed.price(oracleTimeout); + + // {target/ref} = {target/ref} * {1} + uint192 err = pegPrice.mul(oracleError, CEIL); + + low = pegPrice - err; + high = pegPrice + err; + // assert(low <= high); obviously true just by inspection } function setUnpriced(bool on) external { @@ -62,9 +90,10 @@ contract UnpricedAppreciatingFiatCollateralMock is AppreciatingFiatCollateral { // solhint-disable no-empty-blocks /// @param config.chainlinkFeed Feed units: {UoA/ref} - constructor(CollateralConfig memory config, uint192 revenueHiding) - AppreciatingFiatCollateral(config, revenueHiding) - {} + constructor( + CollateralConfig memory config, + uint192 revenueHiding + ) AppreciatingFiatCollateral(config, revenueHiding) {} /// tryPrice: mock unpriced by returning (0, FIX_MAX) function tryPrice() @@ -72,11 +101,7 @@ contract UnpricedAppreciatingFiatCollateralMock is AppreciatingFiatCollateral { view virtual override - returns ( - uint192 low, - uint192 high, - uint192 pegPrice - ) + returns (uint192 low, uint192 high, uint192 pegPrice) { // If unpriced is marked, return 0, FIX_MAX if (unpriced) return (0, FIX_MAX, 0); diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 06a92c3469..c1b7456993 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -446,6 +446,27 @@ describe('Facade + FacadeMonitor contracts', () => { await expect(facade.callStatic.redeem(rToken.address, issueAmount)).to.be.revertedWith( 'frozen' ) + + await expect( + facade.callStatic.redeemCustom( + rToken.address, + issueAmount, + [await basketHandler.nonce()], + [fp('1')] + ) + ).to.be.revertedWith('frozen') + }) + + it('Should revert if portions do not sum to FIX_ONE in redeem custom', async function () { + const nonce = await basketHandler.nonce() + await expect( + facade.callStatic.redeemCustom( + rToken.address, + issueAmount, + [nonce, nonce], + [fp('0.5'), fp('0.5').add(1)] + ) + ).to.be.revertedWith('portions do not add up to FIX_ONE') }) it('Should return backingOverview correctly', async () => { diff --git a/test/Main.test.ts b/test/Main.test.ts index 053ffa7553..0d4ab419ef 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2195,6 +2195,22 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(tokAmts[1]).to.equal(fp('0.5')) }) + it('Should handle unpriced asset in normalization', async () => { + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + + // Set Token0 to unpriced - stale oracle + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) + await expectUnpriced(collateral0.address) + + // Attempt to add EURO, basket is not SOUND + await expect( + indexBH + .connect(owner) + .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) + ).to.be.revertedWith('unsound basket') + }) + describe('Custom Redemption', () => { const issueAmount = fp('10000') let usdcChainlink: MockV3Aggregator diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 554315f0e7..384617fbdb 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -3283,6 +3283,40 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) }) + it('Should support custom destinations only', async () => { + // Set distribution all to a custom destination + await expect( + distributor + .connect(owner) + .setDistribution(other.address, { rTokenDist: bn(0), rsrDist: bn(1) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(other.address, bn(0), bn(1)) + + // No distribution to Furnace or StRSR + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(0), bn(0)) + + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(0)) + + const rsrBalInDestination = await rsr.balanceOf(other.address) + await rsr.connect(owner).mint(rsrTrader.address, issueAmount) + await rsrTrader.distributeTokenToBuy() + const expectedAmount = rsrBalInDestination.add(issueAmount) + expect(await rsr.balanceOf(other.address)).to.be.closeTo(expectedAmount, 100) + }) + it('Should claim but not sweep rewards to BackingManager from the Revenue Traders', async () => { rewardAmountAAVE = bn('0.5e18') @@ -3500,7 +3534,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await router.connect(addr1).bid(trade.address, addr1.address) expect(await trade.bidder()).to.equal(router.address) - // Cannot bid once is settled + + // Noone can bid again on the trade directly + await expect( + trade.connect(addr1).bidWithCallback(new Uint8Array(0)) + ).to.be.revertedWith('bid already received') + + // Cannot bid once is settled via router await expect( router.connect(addr1).bid(trade.address, addr1.address) ).to.be.revertedWith('trade not open') diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 120ad63acc..218ac6189b 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -464,6 +464,70 @@ describe('Assets contracts #fast', () => { await expect(rTokenAsset.price()).to.be.reverted }) + it('Should return latestPrice() for RTokenAsset correctly', async () => { + // Confirm current price $1 + await expectRTokenPrice( + rTokenAsset.address, + fp('1'), + ORACLE_ERROR, + await backingManager.maxTradeSlippage(), + config.minTradeVolume.mul((await assetRegistry.erc20s()).length) + ) + + // Latest Price returns current price + let rTokenPriceInfo = await rTokenAsset.callStatic.latestPrice() + expect(rTokenPriceInfo.rTokenPrice).to.equal(fp('1')) + expect(rTokenPriceInfo.updatedAt).to.be.lte(await getLatestBlockTimestamp()) + + // Perform actual call to cache data + await rTokenAsset.latestPrice() + let latestUpdate = await getLatestBlockTimestamp() + + // Calling again is noop + await rTokenAsset.latestPrice() + rTokenPriceInfo = await rTokenAsset.callStatic.latestPrice() + expect(rTokenPriceInfo.rTokenPrice).to.equal(fp('1')) + expect(rTokenPriceInfo.updatedAt).to.be.eq(latestUpdate) // did not refresh again + + // Will refresh if basket changes + await basketHandler + .connect(wallet) + .setPrimeBasket([token.address, usdc.address], [fp('0.5'), fp('0.5')]) + await basketHandler.connect(wallet).refreshBasket() + + // Perform actual call and check values + await rTokenAsset.latestPrice() + latestUpdate = await getLatestBlockTimestamp() + rTokenPriceInfo = await rTokenAsset.callStatic.latestPrice() + expect(rTokenPriceInfo.rTokenPrice).to.be.closeTo(fp('1'), fp('0.01')) // remains close + expect(rTokenPriceInfo.updatedAt).to.be.eq(latestUpdate) // refreshed + + // Perform trade (changes trade nonce) + await backingManager.rebalance(TradeKind.BATCH_AUCTION) + + // Perform actual call and check values + await rTokenAsset.latestPrice() + latestUpdate = await getLatestBlockTimestamp() + rTokenPriceInfo = await rTokenAsset.callStatic.latestPrice() + expect(rTokenPriceInfo.rTokenPrice).to.be.closeTo(fp('1'), fp('0.01')) // remains close + expect(rTokenPriceInfo.updatedAt).to.be.eq(latestUpdate) // refreshed + + // Calling again is noop + await rTokenAsset.latestPrice() + + // Settle trade + await advanceTime(config.batchAuctionLength.add(100).toString()) + await rTokenAsset.latestPrice() // update cache + await backingManager.settleTrade(aToken.address) + + // Perform actual call and check values + await rTokenAsset.latestPrice() + latestUpdate = await getLatestBlockTimestamp() + rTokenPriceInfo = await rTokenAsset.callStatic.latestPrice() + expect(rTokenPriceInfo.rTokenPrice).to.be.closeTo(fp('1'), fp('0.01')) // remains close + expect(rTokenPriceInfo.updatedAt).to.be.eq(latestUpdate) // refreshed + }) + it('Regression test -- Should handle unpriced collateral for RTokenAsset', async () => { // https://github.com/code-423n4/2023-07-reserve-findings/issues/20 @@ -491,6 +555,9 @@ describe('Assets contracts #fast', () => { // Check RToken is unpriced await expectUnpriced(rTokenAsset.address) + + // Oracle price update should revert + await expect(rTokenAsset.forceUpdatePrice()).to.be.revertedWith('invalid price') }) it('Regression test -- RTokenAsset.refresh() should refresh everything', async () => { @@ -758,6 +825,31 @@ describe('Assets contracts #fast', () => { await expect(invalidRSRAsset.refresh()).to.be.reverted }) + it('Bubbles error up if Chainlink feed reverts for explicit reason', async () => { + // Applies to all collateral as well + const InvalidMockV3AggregatorFactory = await ethers.getContractFactory( + 'InvalidMockV3Aggregator' + ) + const invalidChainlinkFeed: InvalidMockV3Aggregator = ( + await InvalidMockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + + const invalidRSRAsset: Asset = ( + await AssetFactory.deploy( + PRICE_TIMEOUT, + invalidChainlinkFeed.address, + ORACLE_ERROR, + rsr.address, + config.rTokenMaxTradeVolume, + ORACLE_TIMEOUT + ) + ) + + // Reverting with reason + await invalidChainlinkFeed.setRevertWithExplicitError(true) + await expect(invalidRSRAsset.tryPrice()).to.be.revertedWith('oracle explicit error') + }) + it('Should handle price decay correctly', async () => { await rsrAsset.refresh() diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 4933986b24..22ffdbc792 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -8,6 +8,7 @@ import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../common/constan import { bn, fp } from '../../common/numbers' import { ATokenFiatCollateral, + BadERC20, ComptrollerMock, CTokenFiatCollateral, CTokenNonFiatCollateral, @@ -402,6 +403,41 @@ describe('Collateral contracts', () => { ).to.be.revertedWith('delayUntilDefault too long') }) + it('Should not allow missing referenceERC20Decimals', async () => { + // CTokenFiatCollateral with decimals = 0 in underlying + const token0decimals: BadERC20 = await ( + await ethers.getContractFactory('BadERC20') + ).deploy('Bad ERC20', 'BERC20') + await token0decimals.setDecimals(0) + + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') + const cToken0Dec: CTokenMock = ( + await CTokenMockFactory.deploy( + '0 Decimal Token', + '0 Decimal Token', + token0decimals.address, + compoundMock.address + ) + ) + + await expect( + CTokenFiatCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await tokenCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: cToken0Dec.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ).to.be.revertedWith('referenceERC20Decimals missing') + }) + it('Should not allow out of range oracle error', async () => { // === Begin zero oracle error checks === await expect( @@ -816,6 +852,57 @@ describe('Collateral contracts', () => { expect(await unpricedAppFiatCollateral.lastSave()).to.equal(currBlockTimestamp) }) + it('Should not save prices if try/price returns unpriced - Fiat Collateral', async () => { + const UnpricedFiatFactory = await ethers.getContractFactory('UnpricedFiatCollateralMock') + const unpricedFiatCollateral: UnpricedFiatCollateralMock = ( + await UnpricedFiatFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await tokenCollateral.chainlinkFeed(), // reuse - mock + oracleError: ORACLE_ERROR, + erc20: token.address, + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }) + ) + + // Save prices + await unpricedFiatCollateral.refresh() + + // Check initial prices + let currBlockTimestamp: number = await getLatestBlockTimestamp() + await expectPrice(unpricedFiatCollateral.address, fp('1'), ORACLE_ERROR, true) + let [lowPrice, highPrice] = await unpricedFiatCollateral.price() + expect(await unpricedFiatCollateral.savedLowPrice()).to.equal(lowPrice) + expect(await unpricedFiatCollateral.savedHighPrice()).to.equal(highPrice) + expect(await unpricedFiatCollateral.lastSave()).to.be.equal(currBlockTimestamp) + + // Refresh saved prices + await unpricedFiatCollateral.refresh() + + // Check values remain but timestamp was updated + await expectPrice(unpricedFiatCollateral.address, fp('1'), ORACLE_ERROR, true) + ;[lowPrice, highPrice] = await unpricedFiatCollateral.price() + expect(await unpricedFiatCollateral.savedLowPrice()).to.equal(lowPrice) + expect(await unpricedFiatCollateral.savedHighPrice()).to.equal(highPrice) + currBlockTimestamp = await getLatestBlockTimestamp() + expect(await unpricedFiatCollateral.lastSave()).to.equal(currBlockTimestamp) + + // Set as unpriced so it returns 0,FIX MAX in try/price + await unpricedFiatCollateral.setUnpriced(true) + + // Check that now is unpriced + await expectUnpriced(unpricedFiatCollateral.address) + + // Refreshing would not save the new rates + await unpricedFiatCollateral.refresh() + expect(await unpricedFiatCollateral.savedLowPrice()).to.equal(lowPrice) + expect(await unpricedFiatCollateral.savedHighPrice()).to.equal(highPrice) + expect(await unpricedFiatCollateral.lastSave()).to.equal(currBlockTimestamp) + }) + it('lotPrice (deprecated) is equal to price()', async () => { for (const coll of [tokenCollateral, usdcCollateral, aTokenCollateral, cTokenCollateral]) { const lotPrice = await coll.lotPrice() @@ -975,6 +1062,9 @@ describe('Collateral contracts', () => { .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) expect(await coll.status()).to.equal(CollateralStatus.DISABLED) expect(await coll.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Refresh is a noop if DISABLED + await expect(coll.refresh()).to.not.emit(coll, 'CollateralStatusChanged') } }) @@ -1018,7 +1108,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - await cToken.setRevertExchangeRate(true) + await cToken.setRevertExchangeRateCurrent(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenCollateral.refresh()) @@ -1037,6 +1127,43 @@ describe('Collateral contracts', () => { const [newLow, newHigh] = await cTokenCollateral.price() expect(newLow).to.equal(currLow) expect(newHigh).to.equal(currHigh) + + // Refresh is a noop if already DISABLED + await expect(cTokenCollateral.refresh()).to.not.emit( + cTokenCollateral, + 'CollateralStatusChanged' + ) + }) + + it('CTokens - Enters DISABLED state when underlyingRefPerTok reverts', async () => { + const [currLow, currHigh] = await cTokenCollateral.price() + expect(await cTokenCollateral.status()).to.equal(CollateralStatus.SOUND) + + // Make cToken revert on underlyingRefPerTok + await cToken.setRevertExchangeRateStored(true) + await expect(cToken.exchangeRateStored()).to.be.reverted + await expect(cTokenCollateral.underlyingRefPerTok()).to.be.reverted + + // Refresh - should not revert - Sets DISABLED + await expect(cTokenCollateral.refresh()) + .to.emit(cTokenCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await cTokenCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await cTokenCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Price remains the same + await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await cTokenCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + + // Refresh is a noop if already DISABLED + await expect(cTokenCollateral.refresh()).to.not.emit( + cTokenCollateral, + 'CollateralStatusChanged' + ) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status - Fiat', async () => { @@ -1715,7 +1842,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - await cNonFiatToken.setRevertExchangeRate(true) + await cNonFiatToken.setRevertExchangeRateCurrent(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenNonFiatCollateral.refresh()) @@ -1734,64 +1861,12 @@ describe('Collateral contracts', () => { const [newLow, newHigh] = await cTokenNonFiatCollateral.price() expect(newLow).to.equal(currLow) expect(newHigh).to.equal(currHigh) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatToken.exchangeRateStored() - const [currLow, currHigh] = await cTokenNonFiatCollateral.price() - - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - await cNonFiatToken.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenNonFiatCollateral.refresh()) - .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cNonFiatToken.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenNonFiatCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatToken.exchangeRateStored() - const [currLow, currHigh] = await cTokenNonFiatCollateral.price() - - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - await cNonFiatToken.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenNonFiatCollateral.refresh()) - .to.emit(cTokenNonFiatCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cNonFiatToken.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenNonFiatCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) + // Refresh is a noop if DISABLED + await expect(cTokenNonFiatCollateral.refresh()).to.not.emit( + cTokenNonFiatCollateral, + 'CollateralStatusChanged' + ) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { @@ -2191,36 +2266,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - await cSelfRefToken.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenSelfReferentialCollateral.refresh()) - .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cSelfRefToken.exchangeRateStored() - const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - await cSelfRefToken.setRevertExchangeRate(true) + await cSelfRefToken.setRevertExchangeRateCurrent(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenSelfReferentialCollateral.refresh()) @@ -2239,35 +2285,12 @@ describe('Collateral contracts', () => { const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() expect(newLow).to.equal(currLow) expect(newHigh).to.equal(currHigh) - }) - - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cSelfRefToken.exchangeRateStored() - const [currLow, currHigh] = await cTokenSelfReferentialCollateral.price() - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.SOUND) - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - - // Make cToken revert on exchangeRateCurrent() - await cSelfRefToken.setRevertExchangeRate(true) - - // Refresh - should not revert - Sets DISABLED - await expect(cTokenSelfReferentialCollateral.refresh()) - .to.emit(cTokenSelfReferentialCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - - expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await cTokenSelfReferentialCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - - // Exchange rate stored is still accessible - expect(await cSelfRefToken.exchangeRateStored()).to.equal(currRate) - - // Price remains the same - await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) - const [newLow, newHigh] = await cTokenSelfReferentialCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) + // Refresh is a noop if DISABLED + await expect(cTokenSelfReferentialCollateral.refresh()).to.not.emit( + cTokenSelfReferentialCollateral, + 'CollateralStatusChanged' + ) }) it('Reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 262bb2f8a9..d996238643 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -847,60 +847,101 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) }) - it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + context('with reverting CToken mock', () => { // Note: In this case requires to use a CToken mock to be able to change the rate - const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') - const symbol = await cDai.symbol() - const cDaiMock: CTokenMock = ( - await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address, comptroller.address) - ) + let cDaiMock: CTokenMock + let newCDaiCollateral: CTokenFiatCollateral - // Redeploy plugin using the new cDai mock - const newCDaiCollateral: CTokenFiatCollateral = await ( - await ethers.getContractFactory('CTokenFiatCollateral') - ).deploy( - { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: await cDaiCollateral.chainlinkFeed(), - oracleError: ORACLE_ERROR, - erc20: cDaiMock.address, - maxTradeVolume: await cDaiCollateral.maxTradeVolume(), - oracleTimeout: await cDaiCollateral.oracleTimeout(), - targetName: await cDaiCollateral.targetName(), - defaultThreshold, - delayUntilDefault: await cDaiCollateral.delayUntilDefault(), - }, - REVENUE_HIDING - ) - await newCDaiCollateral.refresh() + beforeEach(async () => { + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') + const symbol = await cDai.symbol() + cDaiMock = ( + await CTokenMockFactory.deploy( + symbol + ' Token', + symbol, + dai.address, + comptroller.address + ) + ) - // Check initial state - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) - expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) - await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) - const [currLow, currHigh] = await newCDaiCollateral.price() - const currRate = await cDaiMock.exchangeRateStored() + // Redeploy plugin using the new cDai mock + newCDaiCollateral = await ( + await ethers.getContractFactory('CTokenFiatCollateral') + ).deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await cDaiCollateral.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: cDaiMock.address, + maxTradeVolume: await cDaiCollateral.maxTradeVolume(), + oracleTimeout: await cDaiCollateral.oracleTimeout(), + targetName: await cDaiCollateral.targetName(), + defaultThreshold, + delayUntilDefault: await cDaiCollateral.delayUntilDefault(), + }, + REVENUE_HIDING + ) + await newCDaiCollateral.refresh() + }) - // Make exchangeRateCurrent() revert - await cDaiMock.setRevertExchangeRate(true) + it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { + // Check initial state + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [currLow, currHigh] = await newCDaiCollateral.price() + const currRate = await cDaiMock.exchangeRateStored() - // Force updates - Should set to DISABLED - await expect(newCDaiCollateral.refresh()) - .to.emit(newCDaiCollateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + // Make exchangeRateCurrent() revert + await cDaiMock.setRevertExchangeRateCurrent(true) - expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) - const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) - expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + // Force updates - Should set to DISABLED + await expect(newCDaiCollateral.refresh()) + .to.emit(newCDaiCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) + + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) + + // Exchange rate stored is still accessible + expect(await cDaiMock.exchangeRateStored()).to.equal(currRate) + + // Price remains the same + await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await newCDaiCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) + + it('Enters DISABLED state when underlyingRefPerTok() reverts', async () => { + // Check initial state + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.SOUND) + expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) + await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [currLow, currHigh] = await newCDaiCollateral.price() + const currRate = await cDaiMock.exchangeRateStored() + + // Make exchangeRateStored() revert + await cDaiMock.setRevertExchangeRateStored(true) + await expect(cDaiMock.exchangeRateStored()).to.be.reverted + await expect(newCDaiCollateral.underlyingRefPerTok()).to.be.reverted + + // Force updates - Should set to DISABLED + await expect(newCDaiCollateral.refresh()) + .to.emit(newCDaiCollateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.DISABLED) - // Exchange rate stored is still accessible - expect(await cDaiMock.exchangeRateStored()).to.equal(currRate) + expect(await newCDaiCollateral.status()).to.equal(CollateralStatus.DISABLED) + const expectedDefaultTimestamp: BigNumber = bn(await getLatestBlockTimestamp()) + expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) - // Price remains the same - await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) - const [newLow, newHigh] = await newCDaiCollateral.price() - expect(newLow).to.equal(currLow) - expect(newHigh).to.equal(currHigh) + // Price remains the same + await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) + const [newLow, newHigh] = await newCDaiCollateral.price() + expect(newLow).to.equal(currLow) + expect(newHigh).to.equal(currHigh) + }) }) it('Reverts if oracle reverts or runs out of gas, maintains status', async () => { From ad724d3b01aba73dd01b20498110c326cc088bd5 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 11 Apr 2024 14:47:52 -0300 Subject: [PATCH 303/450] New facademonitor impls addresses (#1114) --- .openzeppelin/base_8453.json | 92 +++++++++++++++++++++++++++++ .openzeppelin/mainnet.json | 108 ++++++++++++++++++++++++++++++++++- 2 files changed, 197 insertions(+), 3 deletions(-) diff --git a/.openzeppelin/base_8453.json b/.openzeppelin/base_8453.json index 0d90ea97cb..41bd14fe5a 100644 --- a/.openzeppelin/base_8453.json +++ b/.openzeppelin/base_8453.json @@ -3328,6 +3328,98 @@ } } } + }, + "d1e021b854c3f6ab5e998969c8df7e648a147f5001337ec8f2bb065c4ea04d6f": { + "address": "0x87F0ec2f8C9C595612eC3534c7517B55277B811e", + "txHash": "0xdee9e0e2c378668088fa6d185e47ed0a013ee62e86f6da11f9909e427dd494b3", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index d0dae943ca..ed9459b7e3 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -3747,7 +3747,10 @@ }, "t_enum(TradeKind)25002": { "label": "enum TradeKind", - "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)15191,t_contract(ITrade)27151)": { @@ -4040,7 +4043,11 @@ }, "t_enum(CollateralStatus)24460": { "label": "enum CollateralStatus", - "members": ["SOUND", "IFFY", "DISABLED"], + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -6333,7 +6340,10 @@ }, "t_enum(TradeKind)17751": { "label": "enum TradeKind", - "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)19704)": { @@ -6826,6 +6836,98 @@ } } } + }, + "e6946280d3c82dd717cab5378fad9380289483dbb5e3bb62b934ad7569d33c94": { + "address": "0xf1B06c2305445E34CF0147466352249724c2EAC1", + "txHash": "0x9ed3ac012f65ff06d34129d211a4b455be0a1d60a2677c16f2a8a2f163772fcd", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } From 0cfe9683b99a4f9c526ce2a0c4a6a76a5e72ebce Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 11 Apr 2024 19:14:27 -0400 Subject: [PATCH 304/450] Convex ETH+/ETH Collateral Plugin (#1113) --- .github/workflows/tests.yml | 71 +++- common/configuration.ts | 2 + contracts/libraries/Fixed.sol | 94 +++++ contracts/libraries/test/FixedCallerMock.sol | 4 + .../assets/AppreciatingFiatCollateral.sol | 2 +- .../CurveAppreciatingRTokenFiatCollateral.sol | 197 ++++++++++ ...ciatingRTokenSelfReferentialCollateral.sol | 81 ++++ .../assets/curve/CurveRecursiveCollateral.sol | 194 ++++++++++ .../assets/curve/CurveStableCollateral.sol | 4 +- .../CurveStableRTokenMetapoolCollateral.sol | 85 +++- contracts/plugins/assets/curve/PoolTokens.sol | 2 +- .../stakedao/StakeDAORecursiveCollateral.sol | 78 ++++ test/integration/AssetPlugins.test.ts | 14 - test/integration/fork-block-numbers.ts | 3 + test/libraries/Fixed.test.ts | 42 ++ test/plugins/Collateral.test.ts | 12 - .../aave/ATokenFiatCollateral.test.ts | 1 - .../compoundv2/CTokenFiatCollateral.test.ts | 3 - .../curve/collateralTests.ts | 31 +- .../individual-collateral/curve/constants.ts | 12 +- .../curve/crv/CrvStableMetapoolSuite.test.ts | 4 - .../CrvStableRTokenMetapoolTestSuite.test.ts | 10 +- .../curve/crv/CrvStableTestSuite.test.ts | 4 - .../curve/crv/helpers.ts | 4 +- ...xAppreciatingRTokenSelfReferential.test.ts | 362 ++++++++++++++++++ .../curve/cvx/CvxStableMetapoolSuite.test.ts | 4 - .../CvxStableRTokenMetapoolTestSuite.test.ts | 90 ++++- .../curve/cvx/CvxStableTestSuite.test.ts | 4 - .../CvxStableTestSuite_crvUSD-USDC.test.ts | 4 - .../curve/cvx/helpers.ts | 82 +++- 30 files changed, 1382 insertions(+), 118 deletions(-) create mode 100644 contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol create mode 100644 contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol create mode 100644 contracts/plugins/assets/curve/CurveRecursiveCollateral.sol create mode 100644 contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol create mode 100644 test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4ba9067aa5..7b84b99c26 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -27,7 +27,7 @@ jobs: env: SKIP_PROMPT: 1 - lint: + static-analyses: name: 'Lint Checks' runs-on: ubuntu-latest steps: @@ -38,9 +38,13 @@ jobs: cache: 'yarn' - run: yarn install --immutable - run: yarn lint + - run: pip3 install solc-select slither-analyzer + - run: solc-select install 0.8.19 + - run: solc-select use 0.8.19 + - run: yarn slither - plugin-tests-mainnet: - name: 'Plugin Tests (Mainnet)' + plugin-unit-tests: + name: 'Plugin Unit Tests' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -50,6 +54,44 @@ jobs: cache: 'yarn' - run: yarn install --immutable - run: yarn test:plugins + + plugin-tests-mainnet-1: + name: 'Plugin Integration Tests (Mainnet) - 1/2' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - name: 'Cache hardhat network fork' + uses: actions/cache@v3 + with: + path: cache/hardhat-network-fork + key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} + restore-keys: | + hardhat-network-fork-${{ runner.os }}- + hardhat-network-fork- + - run: yarn hardhat test ./test/plugins/individual-collateral/[A-Ca-c]*/*.test.ts ./test/plugins/individual-collateral/[A-Ca-c]*/*/*.test.ts + env: + NODE_OPTIONS: '--max-old-space-size=8192' + TS_NODE_SKIP_IGNORE: true + MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet + PROTO_IMPL: 1 + FORK: 1 + + plugin-tests-mainnet-2: + name: 'Plugin Integration Tests (Mainnet) - 2/2' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable - name: 'Cache hardhat network fork' uses: actions/cache@v3 with: @@ -58,15 +100,17 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: yarn test:plugins:integration + - run: yarn hardhat test ./test/plugins/individual-collateral/[D-Zd-z]*/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet + PROTO_IMPL: 1 + FORK: 1 plugin-tests-base: - name: 'Plugin Tests (Base)' + name: 'Plugin Integration Tests (Base)' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -94,7 +138,7 @@ jobs: PROTO_IMPL: 1 plugin-tests-arbitrum: - name: 'Plugin Tests (Arbitrum)' + name: 'Plugin Integration Tests (Arbitrum)' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -242,18 +286,3 @@ jobs: FORK_NETWORK: mainnet FORK: 1 PROTO_IMPL: 1 - - slither: - name: 'Slither' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16.x - cache: 'yarn' - - run: yarn install --immutable - - run: pip3 install solc-select slither-analyzer - - run: solc-select install 0.8.19 - - run: solc-select use 0.8.19 - - run: yarn slither diff --git a/common/configuration.ts b/common/configuration.ts index 0a5cbe9497..29a50100b3 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -57,6 +57,7 @@ export interface ITokens { RSR?: string CRV?: string CVX?: string + ETHPLUS?: string ankrETH?: string frxETH?: string sfrxETH?: string @@ -200,6 +201,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { RSR: '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', CRV: '0xD533a949740bb3306d119CC777fa900bA034cd52', CVX: '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B', + ETHPLUS: '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8', ankrETH: '0xE95A203B1a91a908F9B9CE46459d101078c2c3cb', frxETH: '0x5E8422345238F34275888049021821E8E08CAa1f', sfrxETH: '0xac3E018457B222d93114458476f3E3416Abbe38F', diff --git a/contracts/libraries/Fixed.sol b/contracts/libraries/Fixed.sol index 4daa221c5e..c69aef1bdc 100644 --- a/contracts/libraries/Fixed.sol +++ b/contracts/libraries/Fixed.sol @@ -329,6 +329,10 @@ library FixLib { return _safeWrap(result / FIX_SCALE); } + function sqrt(uint192 x) internal pure returns (uint192) { + return _safeWrap(sqrt256(x * FIX_ONE_256)); // FLOOR + } + /// Comparison operators... function lt(uint192 x, uint192 y) internal pure returns (bool) { return x < y; @@ -675,4 +679,94 @@ function fullMul(uint256 x, uint256 y) pure returns (uint256 hi, uint256 lo) { if (mm < lo) hi -= 1; } } + +// =============== from prbMath at commit 28055f6cd9a2367f9ad7ab6c8e01c9ac8e9acc61 =============== +/// @notice Calculates the square root of x using the Babylonian method. +/// +/// @dev See https://en.wikipedia.org/wiki/Methods_of_computing_square_roots#Babylonian_method. +/// +/// Notes: +/// - If x is not a perfect square, the result is rounded down. +/// - Credits to OpenZeppelin for the explanations in comments below. +/// +/// @param x The uint256 number for which to calculate the square root. +/// @return result The result as a uint256. +function sqrt256(uint256 x) pure returns (uint256 result) { + if (x == 0) { + return 0; + } + + // For our first guess, we calculate the biggest power of 2 which is smaller than the square root of x. + // + // We know that the "msb" (most significant bit) of x is a power of 2 such that we have: + // + // $$ + // msb(x) <= x <= 2*msb(x)$ + // $$ + // + // We write $msb(x)$ as $2^k$, and we get: + // + // $$ + // k = log_2(x) + // $$ + // + // Thus, we can write the initial inequality as: + // + // $$ + // 2^{log_2(x)} <= x <= 2*2^{log_2(x)+1} \\ + // sqrt(2^k) <= sqrt(x) < sqrt(2^{k+1}) \\ + // 2^{k/2} <= sqrt(x) < 2^{(k+1)/2} <= 2^{(k/2)+1} + // $$ + // + // Consequently, $2^{log_2(x) /2} is a good first approximation of sqrt(x) with at least one correct bit. + uint256 xAux = uint256(x); + result = 1; + if (xAux >= 2**128) { + xAux >>= 128; + result <<= 64; + } + if (xAux >= 2**64) { + xAux >>= 64; + result <<= 32; + } + if (xAux >= 2**32) { + xAux >>= 32; + result <<= 16; + } + if (xAux >= 2**16) { + xAux >>= 16; + result <<= 8; + } + if (xAux >= 2**8) { + xAux >>= 8; + result <<= 4; + } + if (xAux >= 2**4) { + xAux >>= 4; + result <<= 2; + } + if (xAux >= 2**2) { + result <<= 1; + } + + // At this point, `result` is an estimation with at least one bit of precision. We know the true value has at + // most 128 bits, since it is the square root of a uint256. Newton's method converges quadratically (precision + // doubles at every iteration). We thus need at most 7 iteration to turn our partial result with one bit of + // precision into the expected uint128 result. + unchecked { + result = (result + x / result) >> 1; + result = (result + x / result) >> 1; + result = (result + x / result) >> 1; + result = (result + x / result) >> 1; + result = (result + x / result) >> 1; + result = (result + x / result) >> 1; + result = (result + x / result) >> 1; + + // If x is not a perfect square, round the result toward zero. + uint256 roundedResult = x / result; + if (result >= roundedResult) { + result = roundedResult; + } + } +} // slither-disable-end divide-before-multiply diff --git a/contracts/libraries/test/FixedCallerMock.sol b/contracts/libraries/test/FixedCallerMock.sol index a046fcffff..f86dd1cd09 100644 --- a/contracts/libraries/test/FixedCallerMock.sol +++ b/contracts/libraries/test/FixedCallerMock.sol @@ -129,6 +129,10 @@ contract FixedCallerMock { return FixLib.powu(x, y); } + function sqrt(uint192 x) public pure returns (uint192) { + return FixLib.sqrt(x); + } + function lt(uint192 x, uint192 y) public pure returns (bool) { return FixLib.lt(x, y); } diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index df947ed337..c97069aad7 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -33,7 +33,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { uint192 public immutable revenueShowing; // {1} The maximum fraction of refPerTok to show // does not become nonzero until after first refresh() - uint192 public exposedReferencePrice; // {ref/tok} max ref price observed, sub revenue hiding + uint192 internal exposedReferencePrice; // {ref/tok} max ref price observed, sub revenue hiding /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol new file mode 100644 index 0000000000..95edeb939f --- /dev/null +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol @@ -0,0 +1,197 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "./CurveStableCollateral.sol"; + +/** + * @title CurveAppreciatingRTokenFiatCollateral + * This plugin contract is intended for use with a CurveLP token for a pool between a + * USD reference token and an RToken that is appreciating relative to it. + * Works for both CurveGaugeWrapper and ConvexStakingWrapper. + * + * Warning: Defaults after haircut! After the RToken accepts a devaluation this collateral + * plugin will default and the collateral will be removed from the basket. + * + * LP Token should be worth 2x the reference token at deployment + * + * tok = ConvexStakingWrapper(volatileCryptoPool) + * ref = USDC + * tar = USD + * UoA = USD + * + * @notice Curve pools with native ETH or ERC777 should be avoided, + * see docs/collateral.md for information + */ +contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + IRToken internal immutable rToken; // token0, but typed + IAssetRegistry internal immutable pairedAssetRegistry; // AssetRegistry of paired RToken + IBasketHandler internal immutable pairedBasketHandler; // BasketHandler of paired RToken + + /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout + /// @dev config.erc20 should be a CurveGaugeWrapper or ConvexStakingWrapper + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveStableCollateral(config, revenueHiding, ptConfig) { + rToken = IRToken(address(token0)); + IMain main = rToken.main(); + pairedAssetRegistry = main.assetRegistry(); + pairedBasketHandler = main.basketHandler(); + } + + /// Should not revert + /// Refresh exchange rates and update default status. + /// Have to override to add custom default checks + function refresh() public virtual override { + // solhint-disable-next-line no-empty-blocks + try pairedAssetRegistry.refresh() {} catch { + // must allow failure since cannot brick refresh() + } + + CollateralStatus oldStatus = status(); + + // Check for hard default + // must happen before tryPrice() call since `refPerTok()` returns a stored value + + // revenue hiding: do not DISABLE if drawdown is small + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // Check RToken status + try pairedBasketHandler.isReady() returns (bool isReady) { + if (!isReady) { + markStatus(CollateralStatus.IFFY); + } else if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch { + // prefer NOT to revert on empty data here: an RToken missing the `isReady()` + // function would error out with empty data just like an OOG error. + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); + } + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } + } + + /// @dev Not up-only! The RToken can devalue its exchange rate peg + /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens + function underlyingRefPerTok() public view virtual override returns (uint192) { + // {ref/tok} = quantity of the reference unit token in the pool per LP token + + // {lpToken@t=0/lpToken} + uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); + // this is missing the fact that the RToken has also appreciated in this time + + // {BU/rTok} + uint192 rTokenRate = divuu(rToken.basketsNeeded(), rToken.totalSupply()); + // not worth the gas to protect against div-by-zero + + // {ref/tok} = {ref/lpToken} = {lpToken@t=0/lpToken} * {1} * 2{ref/lpToken@t=0} + return virtualPrice.mul(rTokenRate.sqrt()).mulu(2); // LP token worth twice as much + } + + /// @dev Warning: Can revert + /// @dev Only works when the RToken is the 0th index token + /// @param index The index of the token: 0, 1, 2, or 3 + /// @return low {UoA/ref_index} + /// @return high {UoA/ref_index} + function tokenPrice(uint8 index) public view override returns (uint192 low, uint192 high) { + if (index == 0) { + (low, high) = pairedAssetRegistry.toAsset(IERC20(address(rToken))).price(); + require(low != 0 && high != FIX_MAX, "rToken unpriced"); + } else { + return super.tokenPrice(index); + } + } + + // === Internal === + + function _anyDepeggedInPool() internal view virtual override returns (bool) { + // Assumption: token0 is the RToken; token1 is the reference token + + // Check RToken price against reference token, accounting for appreciation + try this.tokenPrice(0) returns (uint192 low0, uint192 high0) { + // {UoA/tok} = {UoA/tok} + {UoA/tok} + uint192 mid0 = (low0 + high0) / 2; + + // Remove the appreciation portion of the RToken price + // {UoA/ref} = {UoA/tok} * {tok} / {ref} + mid0 = mid0.muluDivu(rToken.totalSupply(), rToken.basketsNeeded()); + + try this.tokenPrice(1) returns (uint192 low1, uint192 high1) { + // {target/ref} = {UoA/ref} = {UoA/ref} + {UoA/ref} + uint192 mid1 = (low1 + high1) / 2; + + // Check price of reference token + if (mid1 < pegBottom || mid1 > pegTop) return true; + + // {target/ref} = {UoA/ref} / {UoA/ref} * {target/ref} + uint192 ratio = mid0.div(mid1); // * targetPerRef(), but we know it's 1 + + // Check price of RToken relative to reference token + if (ratio < pegBottom || ratio > pegTop) return true; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + // untested: + // pattern validated in other plugins, cost to test is high + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return true; + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + // untested: + // pattern validated in other plugins, cost to test is high + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return true; + } + + return false; + } +} diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol new file mode 100644 index 0000000000..b4f89be17b --- /dev/null +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol @@ -0,0 +1,81 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "./CurveAppreciatingRTokenFiatCollateral.sol"; + +/** + * @title CurveAppreciatingRTokenSelfReferentialCollateral + * This plugin contract is intended for use with a CurveLP token for a pool between a + * self-referential reference token (WETH) and an RToken that is appreciating relative to it. + * Works for both CurveGaugeWrapper and ConvexStakingWrapper. + * + * Warning: Defaults after haircut! After the RToken accepts a devaluation this collateral + * plugin will default and the collateral will be removed from the basket. + * + * LP Token should be worth 2x the reference token at deployment + * + * tok = ConvexStakingWrapper(volatileCryptoPool) + * ref = WETH + * tar = ETH + * UoA = USD + * + * @notice Curve pools with native ETH or ERC777 should be avoided, + * see docs/collateral.md for information + */ +contract CurveAppreciatingRTokenSelfReferentialCollateral is CurveAppreciatingRTokenFiatCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + // solhint-disable no-empty-blocks + + /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout + /// @dev config.erc20 should be a CurveGaugeWrapper or ConvexStakingWrapper + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveAppreciatingRTokenFiatCollateral(config, revenueHiding, ptConfig) {} + + // solhint-enable no-empty-blocks + + // === Internal === + + function _anyDepeggedInPool() internal view virtual override returns (bool) { + // Assumption: token0 is the RToken; token1 is the reference token + + // Check RToken price against reference token, accounting for appreciation + try this.tokenPrice(0) returns (uint192 low0, uint192 high0) { + // {UoA/tok} = {UoA/tok} + {UoA/tok} + uint192 mid0 = (low0 + high0) / 2; + + // Remove the appreciation portion of the RToken price + // {UoA/ref} = {UoA/tok} * {tok} / {ref} + mid0 = mid0.muluDivu(rToken.totalSupply(), rToken.basketsNeeded()); + + try this.tokenPrice(1) returns (uint192 low1, uint192 high1) { + // {UoA/ref} = {UoA/ref} + {UoA/ref} + uint192 mid1 = (low1 + high1) / 2; + + // {target/ref} = {UoA/ref} / {UoA/ref} * {target/ref} + uint192 ratio = mid0.div(mid1); // * targetPerRef(), but we know it's 1 + + // Check price of RToken relative to reference token + if (ratio < pegBottom || ratio > pegTop) return true; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + // untested: + // pattern validated in other plugins, cost to test is high + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return true; + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + // untested: + // pattern validated in other plugins, cost to test is high + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return true; + } + + return false; + } +} diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol new file mode 100644 index 0000000000..d39354f749 --- /dev/null +++ b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol @@ -0,0 +1,194 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/utils/math/Math.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import "../../../interfaces/IRToken.sol"; +import "../../../libraries/Fixed.sol"; +import "../curve/CurveStableCollateral.sol"; +import "../OracleLib.sol"; + +/** + * @title CurveRecursiveCollateral + * @notice Collateral plugin for a CurveLP token for a pool between a + * a USD reference token and a USD RToken. + * + * Note: + * - The RToken _must_ be the same RToken using this plugin as collateral! + * - The RToken SHOULD have an RSR overcollateralization layer. DO NOT USE WITHOUT RSR! + * - The LP token should be worth ~2x the reference token. Do not use with 1x lpTokens. + * + * tok = ConvexStakingWrapper or CurveGaugeWrapper + * ref = coins(0) in the pool + * tar = USD + * UoA = USD + */ +contract CurveRecursiveCollateral is CurveStableCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + IRToken internal immutable rToken; // token1 + + /// @param config.erc20 must be of type ConvexStakingWrapper or CurveGaugeWrapper + /// @param config.chainlinkFeed Feed units: {UoA/ref} + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveStableCollateral(config, revenueHiding, ptConfig) { + rToken = IRToken(address(token1)); + exposedReferencePrice = _safeWrap(curvePool.get_virtual_price()).mul(revenueShowing); + // exposedReferencePrice is re-used to be the LP token's virtual price + } + + /// Can revert, used by other contract functions in order to catch errors + /// Should not return FIX_MAX for low + /// Should only return FIX_MAX for high if low is 0 + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return {target/ref} Unused. Always 0 + function tryPrice() + external + view + virtual + override + returns ( + uint192 low, + uint192 high, + uint192 + ) + { + // This pricing method is MEV-resistant, but only gives a lower-bound + // for the value of the LP token collateral. It could be that the pool is + // very imbalanced, in which case the LP token could be worth more than this + // method says it is if you can redeem the LP before any further swaps occur. + + // {UoA/tok} = {UoA/ref} * {ref/tok} + uint192 price = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); + + // {UoA/tok} = {UoA/tok} * {1} + uint192 err = price.mul(oracleError, CEIL); + + // we'll overwrite these later... + low = price - err; + high = price + err; + // assert(low <= high); // obviously true by inspection + + return (low, high, 0); + } + + /// Should not revert + /// Refresh exchange rates and update default status. + /// Have to override to add custom default checks + function refresh() public virtual override { + CollateralStatus oldStatus = status(); + + try this.underlyingRefPerTok() returns (uint192) { + // Instead of ensuring the underlyingRefPerTok is up-only, solely check + // that the pool's virtual price is up-only. Otherwise this collateral + // would create default cascades. + + // {ref/tok} + uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); + + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = virtualPrice.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (virtualPrice < exposedReferencePrice) { + exposedReferencePrice = virtualPrice; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); + } + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } + } + + /// @dev Not up-only! The RToken can devalue its exchange rate peg + /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens + function underlyingRefPerTok() public view virtual override returns (uint192) { + // {ref/tok} = quantity of the reference unit token in the pool per vault token + // the vault is 1:1 with the LP token + + // {lpToken@t=0/lpToken} + uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); + // this is missing the fact that USDC+ has also appreciated in this time + + // {BU/rTok} + uint192 rTokenRate = divuu(rToken.basketsNeeded(), rToken.totalSupply()); + // not worth the gas to protect against div-by-zero + + // The rTokenRate is not up-only! We should expect decreases when other + // collateral default and there is not enough RSR stake to cover the hole. + + // {ref/tok} = {ref/lpToken} = {lpToken@t=0/lpToken} * {1} * 2{ref/lpToken@t=0} + return virtualPrice.mul(rTokenRate.sqrt()).mulu(2); // LP token worth twice as much + } + + // === Internal === + + // Override this later to implement non-standard recursive pools + function _anyDepeggedInPool() internal view virtual override returns (bool) { + // Assumption: token0 is the reference token; token1 is the RToken + + // Check reference token + try this.tokenPrice(0) returns (uint192 low, uint192 high) { + // {UoA/tok} = {UoA/tok} + {UoA/tok} + uint192 mid = (low + high) / 2; + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (mid < pegBottom || mid > pegTop) return true; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + // untested: + // pattern validated in other plugins, cost to test is high + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return true; + } + + // Ignore the status of the RToken since it can manage itself + + return false; + } +} diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index a623d41b3f..3bc31ca9f0 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -33,8 +33,8 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // I don't love hard-coding these, but I prefer it to dynamically reading from either // a CurveGaugeWrapper or ConvexStakingWrapper. If we ever use this contract // on something other than mainnet we'll have to change this. - IERC20 public constant CRV = IERC20(0xD533a949740bb3306d119CC777fa900bA034cd52); - IERC20 public constant CVX = IERC20(0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B); + IERC20 internal constant CRV = IERC20(0xD533a949740bb3306d119CC777fa900bA034cd52); + IERC20 internal constant CVX = IERC20(0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B); /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout /// @dev config.erc20 should be a CurveGaugeWrapper or ConvexStakingWrapper diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 780a083a8b..8ae7829d7f 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -19,7 +19,8 @@ import "./CurveStableMetapoolCollateral.sol"; contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { using FixLib for uint192; - IAssetRegistry internal immutable pairedAssetRegistry; // AssetRegistry of pairedToken + IAssetRegistry internal immutable pairedAssetRegistry; // AssetRegistry of paired RToken + IBasketHandler internal immutable pairedBasketHandler; // BasketHandler of paired RToken /// @param config.chainlinkFeed Feed units: {UoA/pairedTok} /// @dev config.chainlinkFeed/oracleError/oracleTimeout are unused; set chainlinkFeed to 0x1 @@ -39,12 +40,86 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { pairedTokenDefaultThreshold_ ) { - pairedAssetRegistry = IRToken(address(pairedToken)).main().assetRegistry(); + IMain main = IRToken(address(pairedToken)).main(); + pairedAssetRegistry = main.assetRegistry(); + pairedBasketHandler = main.basketHandler(); } - function refresh() public override { - pairedAssetRegistry.refresh(); // refresh all registered assets - super.refresh(); // already handles all necessary default checks + /// Should not revert + /// Refresh exchange rates and update default status. + /// Have to override to add custom default checks + function refresh() public virtual override { + // solhint-disable-next-line no-empty-blocks + try pairedAssetRegistry.refresh() {} catch { + // must allow failure since cannot brick refresh() + } + + CollateralStatus oldStatus = status(); + + // Check for hard default + // must happen before tryPrice() call since `refPerTok()` returns a stored value + + // revenue hiding: do not DISABLE if drawdown is small + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // Check RToken status + try pairedBasketHandler.isReady() returns (bool isReady) { + if (!isReady) { + markStatus(CollateralStatus.IFFY); + } else if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch { + // prefer NOT to revert on empty data here: an RToken missing the `isReady()` + // function would error out with empty data just like an OOG error. + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); + } + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } } /// Can revert, used by `_anyDepeggedOutsidePool()` diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index b9e002f8ae..6e8f3e64e5 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -226,7 +226,7 @@ contract PoolTokens { /// @param index The index of the token: 0, 1, 2, or 3 /// @return low {UoA/ref_index} /// @return high {UoA/ref_index} - function tokenPrice(uint8 index) public view returns (uint192 low, uint192 high) { + function tokenPrice(uint8 index) public view virtual returns (uint192 low, uint192 high) { if (index >= nTokens) revert WrongIndex(nTokens - 1); // Use only 1 feed if 2nd feed not defined diff --git a/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol new file mode 100644 index 0000000000..f3e363801f --- /dev/null +++ b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol @@ -0,0 +1,78 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import "../CurveRecursiveCollateral.sol"; + +interface IStakeDAOVault is IERC20Metadata { + function token() external view returns (IERC20Metadata); + + function liquidityGauge() external view returns (IStakeDAOGauge); +} + +interface IStakeDAOGauge { + function claimer() external view returns (IStakeDAOClaimer); + + function reward_count() external view returns (uint256); + + function reward_tokens(uint256 index) external view returns (IERC20Metadata); +} + +interface IStakeDAOClaimer { + function claimRewards(address[] memory gauges, bool claimVeSDT) external; +} + +/** + * @title StakeDAORecursiveCollateral + * @notice Collateral plugin for a StakeDAO USDC+LP-f Vault that contains + * a Curve pool with a reference token and an RToken. The RToken can be + * of like kind of up-only in relation to the reference token. + * + * tok = sdUSDC+LP-f Vault + * ref = USDC + * tar = USD + * UoA = USD + */ +contract StakeDAORecursiveCollateral is CurveRecursiveCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + IStakeDAOGauge internal immutable gauge; + IStakeDAOClaimer internal immutable claimer; + + /// @param config.erc20 must be of type IStakeDAOVault + /// @param config.chainlinkFeed Feed units: {UoA/ref} + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveRecursiveCollateral(config, revenueHiding, ptConfig) { + IStakeDAOVault vault = IStakeDAOVault(address(config.erc20)); + gauge = vault.liquidityGauge(); + claimer = gauge.claimer(); + } + + /// @custom:delegate-call + function claimRewards() external override { + uint256 count = gauge.reward_count(); + + // Save initial bals + IERC20Metadata[] memory rewardTokens = new IERC20Metadata[](count); + uint256[] memory bals = new uint256[](count); + for (uint256 i = 0; i < count; i++) { + rewardTokens[i] = gauge.reward_tokens(i); + bals[i] = rewardTokens[i].balanceOf(address(this)); + } + + // Do actual claim + address[] memory gauges = new address[](1); + gauges[0] = address(gauge); + claimer.claimRewards(gauges, false); + + // Emit balance changes + for (uint256 i = 0; i < rewardTokens.length; i++) { + IERC20Metadata rewardToken = rewardTokens[i]; + emit RewardsClaimed(rewardToken, rewardToken.balanceOf(address(this)) - bals[i]); + } + } +} diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 91cea90b07..9c915e4de0 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -576,9 +576,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, fp('0.001') ) expect(await ctkInf.cTokenCollateral.targetPerRef()).to.equal(fp('1')) - expect(await ctkInf.cTokenCollateral.exposedReferencePrice()).to.equal( - await ctkInf.cTokenCollateral.refPerTok() - ) await expectPrice( ctkInf.cTokenCollateral.address, @@ -677,10 +674,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await atkInf.aTokenCollateral.refPerTok()).to.be.closeTo(fp('1'), fp('0.095')) expect(await atkInf.aTokenCollateral.targetPerRef()).to.equal(fp('1')) - expect(await atkInf.aTokenCollateral.exposedReferencePrice()).to.be.closeTo( - await atkInf.aTokenCollateral.refPerTok(), - fp('0.000005') - ) await expectPrice( atkInf.aTokenCollateral.address, @@ -826,10 +819,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, ) expect(await ctkInf.cTokenCollateral.targetPerRef()).to.equal(fp('1')) - expect(await ctkInf.cTokenCollateral.exposedReferencePrice()).to.equal( - await ctkInf.cTokenCollateral.refPerTok() - ) - // close to $633 usd await expectPrice( ctkInf.cTokenCollateral.address, @@ -946,9 +935,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, fp('0.001') ) expect(await ctkInf.cTokenCollateral.targetPerRef()).to.equal(fp('1')) - expect(await ctkInf.cTokenCollateral.exposedReferencePrice()).to.equal( - await ctkInf.cTokenCollateral.refPerTok() - ) await expectPrice( ctkInf.cTokenCollateral.address, diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index 0a5c8a0c73..9cd0206d6b 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -6,6 +6,9 @@ const forkBlockNumber = { 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum 'facade-monitor': 18742016, // Ethereum + 'old-curve-plugins': 16915576, // Ethereum + 'new-curve-plugins': 19626711, // Ethereum + // TODO add all the block numbers we fork from to benefit from caching default: 19275770, // Ethereum } diff --git a/test/libraries/Fixed.test.ts b/test/libraries/Fixed.test.ts index 8fa2451627..41d0547e21 100644 --- a/test/libraries/Fixed.test.ts +++ b/test/libraries/Fixed.test.ts @@ -771,6 +771,48 @@ describe('In FixLib,', () => { }) }) + describe('sqrt', () => { + context('correctly sqrts inside its range', () => { + // prettier-ignore + const table = [ + [fp('1'), fp('1')], + [fp('4'), fp('2')], + [fp('144'), fp('12')], + [fp('38416'), fp('196')], + [fp('1.21'), fp('1.1')], + ] + + for (const [a, b] of table) { + it(`sqrt(${shortString(a)}) == ${shortString(b)}`, async () => { + expect(await caller.sqrt(a)).to.equal(b) + }) + } + }) + + context('correctly sqrts at the extremes of its range', () => { + const table = [ + [ + MAX_UINT192, + bn(2) + .pow(96) + .mul(10 ** 9) + .sub(1), + ], + [0, 0], + [fp('1e-18'), fp('1e-9')], + ] + + for (const [a, b] of table) { + it(`sqrt(${shortString(a)}) == ${shortString(b)}`, async () => { + expect(await caller.sqrt(a)).to.equal(b) + }) + } + }) + context('fails outside its range', () => { + // nothing is outside its range + }) + }) + describe('lt', () => { it('correctly evaluates <', async () => { for (const [a, b] of uint192Pairs) { diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 4933986b24..da40513cf8 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -209,9 +209,6 @@ describe('Collateral contracts', () => { expect(await aTokenCollateral.bal(owner.address)).to.equal(amt.mul(3).div(4)) expect(await aTokenCollateral.refPerTok()).to.equal(fp('1')) expect(await aTokenCollateral.targetPerRef()).to.equal(fp('1')) - expect(await aTokenCollateral.exposedReferencePrice()).to.equal( - await aTokenCollateral.refPerTok() - ) await expectPrice(aTokenCollateral.address, fp('1'), ORACLE_ERROR, true) await expect(aTokenCollateral.claimRewards()) .to.emit(aToken, 'RewardsClaimed') @@ -233,9 +230,6 @@ describe('Collateral contracts', () => { expect(await cTokenCollateral.bal(owner.address)).to.equal(amt.mul(3).div(4).mul(50)) expect(await cTokenCollateral.refPerTok()).to.equal(fp('0.02')) expect(await cTokenCollateral.targetPerRef()).to.equal(fp('1')) - expect(await cTokenCollateral.exposedReferencePrice()).to.equal( - await cTokenCollateral.refPerTok() - ) await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) await expect(cTokenCollateral.claimRewards()) .to.emit(cTokenCollateral, 'RewardsClaimed') @@ -1636,9 +1630,6 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.bal(owner.address)).to.equal(amt) expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.02')) expect(await cTokenNonFiatCollateral.targetPerRef()).to.equal(fp('1')) - expect(await cTokenNonFiatCollateral.exposedReferencePrice()).to.equal( - await cTokenNonFiatCollateral.refPerTok() - ) await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) // 0.02 of 20k await expect(cTokenNonFiatCollateral.claimRewards()) @@ -2129,9 +2120,6 @@ describe('Collateral contracts', () => { expect(await cTokenSelfReferentialCollateral.bal(owner.address)).to.equal(amt) expect(await cTokenSelfReferentialCollateral.refPerTok()).to.equal(fp('0.02')) expect(await cTokenSelfReferentialCollateral.targetPerRef()).to.equal(fp('1')) - expect(await cTokenSelfReferentialCollateral.exposedReferencePrice()).to.equal( - await cTokenSelfReferentialCollateral.refPerTok() - ) await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) await expect(cTokenSelfReferentialCollateral.claimRewards()) diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 7b0bed849e..a398067e94 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -353,7 +353,6 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await aDaiCollateral.targetName()).to.equal(ethers.utils.formatBytes32String('USD')) expect(refPerTok).to.be.closeTo(fp('1.066'), fp('0.001')) expect(await aDaiCollateral.targetPerRef()).to.equal(fp('1')) - expect(await aDaiCollateral.exposedReferencePrice()).to.equal(refPerTok) const answer = await chainlinkFeed.latestAnswer() diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 262bb2f8a9..b92d9d0e3e 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -329,9 +329,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await cDaiCollateral.targetName()).to.equal(ethers.utils.formatBytes32String('USD')) expect(await cDaiCollateral.refPerTok()).to.be.closeTo(fp('0.022'), fp('0.001')) expect(await cDaiCollateral.targetPerRef()).to.equal(fp('1')) - expect(await cDaiCollateral.exposedReferencePrice()).to.equal( - await cDaiCollateral.refPerTok() - ) await expectPrice( cDaiCollateral.address, fp('0.022015105509346448'), diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 04f6b29507..bdcf4f26e3 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -311,25 +311,23 @@ export default function fn( }) describe('collateral functionality', () => { - before(resetFork) - let ctx: CurveCollateralFixtureContext + let amt: BigNumber beforeEach(async () => { + await resetFork() const [alice] = await ethers.getSigners() ctx = await loadFixture(makeCollateralFixtureContext(alice, {})) + amt = bn('200').mul(bn(10).pow(await ctx.wrapper.decimals())) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) }) describe('functions', () => { it('returns the correct bal (18 decimals)', async () => { - const amount = bn('20000').mul(bn(10).pow(await ctx.wrapper.decimals())) - await mintCollateralTo(ctx, amount, ctx.alice, ctx.alice.address) + await mintCollateralTo(ctx, amt, ctx.alice, ctx.alice.address) const aliceBal = await ctx.collateral.bal(ctx.alice.address) - expect(aliceBal).to.closeTo( - amount.mul(bn(10).pow(18 - (await ctx.wrapper.decimals()))), - bn('100').mul(bn(10).pow(18 - (await ctx.wrapper.decimals()))) - ) + expect(aliceBal).to.closeTo(amt, amt.div(200)) }) }) @@ -339,8 +337,7 @@ export default function fn( }) itClaimsRewards('claims rewards (plugin)', async () => { - const amount = bn('20000').mul(bn(10).pow(await ctx.wrapper.decimals())) - await mintCollateralTo(ctx, amount, ctx.alice, ctx.collateral.address) + await mintCollateralTo(ctx, amt, ctx.alice, ctx.collateral.address) await advanceBlocks(1000) await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) @@ -360,8 +357,7 @@ export default function fn( }) itClaimsRewards('claims rewards (wrapper)', async () => { - const amount = bn('20000').mul(bn(10).pow(await ctx.wrapper.decimals())) - await mintCollateralTo(ctx, amount, ctx.alice, ctx.alice.address) + await mintCollateralTo(ctx, amt, ctx.alice, ctx.alice.address) await advanceBlocks(1000) await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) @@ -385,7 +381,6 @@ export default function fn( }) describe('prices', () => { - before(resetFork) it('prices change as feed price changes', async () => { const initialRefPerTok = await ctx.collateral.refPerTok() const [low, high] = await ctx.collateral.price() @@ -523,8 +518,6 @@ export default function fn( }) describe('status', () => { - before(resetFork) - it('reverts if Chainlink feed reverts or runs out of gas, maintains status', async () => { const InvalidMockV3AggregatorFactory = await ethers.getContractFactory( 'InvalidMockV3Aggregator' @@ -642,7 +635,7 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - await mintCollateralTo(ctx, bn('20000e6'), ctx.alice, ctx.alice.address) + await mintCollateralTo(ctx, amt, ctx.alice, ctx.alice.address) await expect(ctx.collateral.refresh()).to.not.emit( ctx.collateral, @@ -676,7 +669,7 @@ export default function fn( // Check initial state expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - await mintCollateralTo(ctx, bn('20000e6'), ctx.alice, ctx.alice.address) + await mintCollateralTo(ctx, amt, ctx.alice, ctx.alice.address) await expect(ctx.collateral.refresh()).to.not.emit( ctx.collateral, 'CollateralStatusChanged' @@ -706,8 +699,8 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) - // refPerTok should have fallen exactly 2e-18 - expect(await ctx.collateral.refPerTok()).to.equal(refPerTok.sub(2)) + // refPerTok should have fallen + expect(await ctx.collateral.refPerTok()).to.be.closeTo(refPerTok.sub(2), 1) }) describe('collateral-specific tests', collateralSpecificStatusTests) diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index c566ed716f..f1f6c02002 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -74,6 +74,8 @@ export const RSR = networkConfig['1'].tokens.RSR! export const CRV = networkConfig['1'].tokens.CRV! export const CVX = networkConfig['1'].tokens.CVX! +export const ETHPLUS = networkConfig['1'].tokens.ETHPLUS! + // 3pool - USDC, USDT, DAI export const THREE_POOL = '0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7' export const THREE_POOL_TOKEN = '0x6c3F90f043a72FA612cbac8115EE7e52BDe6E490' @@ -106,6 +108,13 @@ export const eUSD_FRAX_BP_POOL_ID = 156 export const eUSD_FRAX_HOLDER = '0x8605dc0C339a2e7e85EEA043bD29d42DA2c6D784' export const eUSD_GAUGE = '0x8605dc0c339a2e7e85eea043bd29d42da2c6d784' +// ETH+ + ETH +export const ETHPLUS_BP_POOL = '0x7fb53345f1b21ab5d9510adb38f7d3590be6364b' +export const ETHPLUS_BP_TOKEN = '0xe8a5677171c87fcb65b76957f2852515b404c7b1' +export const ETHPLUS_BP_POOL_ID = 185 +export const ETHPLUS_ETH_HOLDER = '0x298bf7b80a6343214634aF16EB41Bb5B9fC6A1F1' +export const ETHPLUS_GAUGE = '0x298bf7b80a6343214634af16eb41bb5b9fc6a1f1' + // MIM + 3pool export const MIM_THREE_POOL = '0x5a6A4D54456819380173272A5E8E9B9904BdF41B' export const MIM_THREE_POOL_POOL_ID = 40 @@ -142,9 +151,6 @@ export const DEFAULT_THRESHOLD = fp('0.02') // 2% export const DELAY_UNTIL_DEFAULT = bn('86400') export const MAX_TRADE_VOL = fp('1e6') -// export const FORK_BLOCK = 15850930 // TODO delete after confirming all cvx tests still passing -export const FORK_BLOCK = 16915576 - export enum CurvePoolType { Plain, Lending, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts index 2bf70ca7cd..bfb7ed9ddc 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts @@ -218,10 +218,6 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: true, resetFork, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index ad87c603cb..b0bb27dd07 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -1,11 +1,13 @@ import collateralTests from '../collateralTests' +import forkBlockNumber from '#/test/integration/fork-block-numbers' import { CurveCollateralFixtureContext, CurveMetapoolCollateralOpts, MintCurveCollateralFunc, } from '../pluginTestTypes' +import { getResetFork } from '../../helpers' import { ORACLE_TIMEOUT_BUFFER } from '../../fixtures' -import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' +import { makeWeUSDFraxBP, mintWeUSDFraxBP } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' @@ -289,13 +291,9 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: true, - resetFork, + resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), collateralName: 'CurveStableRTokenMetapoolCollateral - CurveGaugeWrapper', } diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts index 27a7a5c213..22cc0d4eb6 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts @@ -227,10 +227,6 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: false, resetFork, diff --git a/test/plugins/individual-collateral/curve/crv/helpers.ts b/test/plugins/individual-collateral/curve/crv/helpers.ts index e3105d88ad..8dd21ac96c 100644 --- a/test/plugins/individual-collateral/curve/crv/helpers.ts +++ b/test/plugins/individual-collateral/curve/crv/helpers.ts @@ -1,3 +1,4 @@ +import forkBlockNumber from '#/test/integration/fork-block-numbers' import { ethers } from 'hardhat' import { BigNumberish } from 'ethers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -21,7 +22,6 @@ import { THREE_POOL, THREE_POOL_GAUGE, THREE_POOL_TOKEN, - FORK_BLOCK, WBTC, WETH, TRI_CRYPTO, @@ -151,7 +151,7 @@ export const mintWPool = async ( await wrapper.connect(user).deposit(amount, recipient) } -export const resetFork = getResetFork(FORK_BLOCK) +export const resetFork = getResetFork(forkBlockNumber['old-curve-plugins']) export type Numeric = number | bigint diff --git a/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts new file mode 100644 index 0000000000..0aa2d6883d --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts @@ -0,0 +1,362 @@ +import collateralTests from '../collateralTests' +import forkBlockNumber from '#/test/integration/fork-block-numbers' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, +} from '../pluginTestTypes' +import { expectEvents } from '../../../../../common/events' +import { overrideOracle } from '../../../../utils/oracles' +import { ORACLE_TIMEOUT_BUFFER } from '../../fixtures' +import { makeWETHPlusETH, mintWETHPlusETH } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' +import { getResetFork } from '../../helpers' +import { networkConfig } from '../../../../../common/configuration' +import { + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../../typechain' +import { advanceTime } from '../../../../utils/time' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + ETHPLUS_BP_POOL, + ETHPLUS_BP_TOKEN, + ETHPLUS_ETH_HOLDER, + CVX, + WETH_USD_FEED, + WETH_ORACLE_TIMEOUT, + WETH_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + RTOKEN_DELAY_UNTIL_DEFAULT, + CurvePoolType, + CRV, + ETHPLUS, +} from '../constants' +import { whileImpersonating } from '../../../../utils/impersonation' + +type Fixture = () => Promise + +const ETHPLUS_ASSET_REGISTRY = '0xf526f058858E4cD060cFDD775077999562b31bE0' +const ETHPLUS_BASKET_HANDLER = '0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194' +const ETHPLUS_TIMELOCK = '0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B' + +export const defaultCvxAppreciatingCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('ETH'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleTimeout: WETH_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: ETHPLUS_BP_POOL, + lpToken: ETHPLUS_BP_TOKEN, + poolType: CurvePoolType.Plain, // for fraxBP, not the top-level pool + feeds: [[ONE_ADDRESS], [WETH_USD_FEED]], + oracleTimeouts: [[bn('1')], [WETH_ORACLE_TIMEOUT]], + oracleErrors: [[bn('1')], [WETH_ORACLE_ERROR]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute both feeds: ETH+, ETH + const ethplusFeed = await MockV3AggregatorFactory.deploy(8, bn('3300e8')) + const ethFeed = await MockV3AggregatorFactory.deploy(8, bn('3300e8')) + const fix = await makeWETHPlusETH(ethplusFeed) + + opts.feeds = [[ethplusFeed.address], [ethFeed.address]] + opts.erc20 = fix.wPool.address + } + + opts = { ...defaultCvxAppreciatingCollateralOpts, ...opts } + + const CvxAppreciatingRTokenSelfReferentialCollateralFactory: ContractFactory = + await ethers.getContractFactory('CurveAppreciatingRTokenSelfReferentialCollateral') + + const collateral = ( + await CvxAppreciatingRTokenSelfReferentialCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral as unknown as TestICollateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxAppreciatingCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute both feeds: ETH+, ETH + const ethplusFeed = await MockV3AggregatorFactory.deploy(8, bn('3300e8')) + const ethFeed = await MockV3AggregatorFactory.deploy(8, bn('3300e8')) + const fix = await makeWETHPlusETH(ethplusFeed) + + collateralOpts.feeds = [[ethplusFeed.address], [ethFeed.address]] + collateralOpts.erc20 = fix.wPool.address + collateralOpts.curvePool = fix.curvePool.address + + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + + return { + alice, + collateral, + curvePool: fix.curvePool, + wrapper: fix.wPool, + rewardTokens: [cvx, crv], + chainlinkFeed: ethFeed, + poolTokens: [fix.ethplus, fix.weth], + feeds: [ethFeed, ethplusFeed], // reversed order here. 0th feed is always the one manipulated + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintWETHPlusETH(ctx, amount, user, recipient, ETHPLUS_ETH_HOLDER) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => { + it('Regression test -- becomes unpriced if inner RTokenAsset becomes unpriced', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out ETHPLUS's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + ETHPLUS, + bn('1'), // unused + bn('1') // unused + ) + const ethplusAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + ETHPLUS_ASSET_REGISTRY + ) + await whileImpersonating(ETHPLUS_TIMELOCK, async (signer) => { + await ethplusAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset to unpriced + // Would be the price under a stale oracle timeout for a poorly-coded RTokenAsset + await mockRTokenAsset.setPrice(0, MAX_UINT192) + await expectExactPrice(collateral.address, initialPrice) + + // Should decay after oracle timeout + await advanceTime((await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER) + await expectDecayedPrice(collateral.address) + + // Should be unpriced after price timeout + await advanceTime(await collateral.priceTimeout()) + await expectUnpriced(collateral.address) + + // refresh() should not revert + await collateral.refresh() + }) + + it('Regression test -- refreshes inner RTokenAsset on refresh()', async () => { + const [collateral] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out ETHPLUS's RTokenAsset with a mock one + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + ETHPLUS, + bn('1'), // unused + bn('1') // unused + ) + const ethplusAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + ETHPLUS_ASSET_REGISTRY + ) + await whileImpersonating(ETHPLUS_TIMELOCK, async (signer) => { + await ethplusAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset price to stale + await mockRTokenAsset.setStale(true) + expect(await mockRTokenAsset.stale()).to.be.true + + // Refresh CurveAppreciatingRTokenSelfReferentialCollateral + await collateral.refresh() + + // Stale should be false again + expect(await mockRTokenAsset.stale()).to.be.false + }) + + it('Regression test -- becomes IFFY when inner RToken is IFFY', async () => { + const [collateral] = await deployCollateral({}) + const ethplusAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + ETHPLUS_ASSET_REGISTRY + ) + const ethplusBasketHandler = await ethers.getContractAt( + 'IBasketHandler', + ETHPLUS_BASKET_HANDLER + ) + const wstETHCollateral = await ethers.getContractAt( + 'LidoStakedEthCollateral', + await ethplusAssetRegistry.toAsset(networkConfig['1'].tokens.wstETH!) + ) + const initialPrice = await wstETHCollateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + expect(await wstETHCollateral.status()).to.equal(0) + + // De-peg wstETH collateral 20% + const targetPerRefFeed = await wstETHCollateral.targetPerRefChainlinkFeed() + const targetPerRefOracle = await overrideOracle(targetPerRefFeed) + const latestAnswer = await targetPerRefOracle.latestAnswer() + await targetPerRefOracle.updateAnswer(latestAnswer.mul(4).div(5)) + + // wstETHCollateral + CurveAppreciatingRTokenSelfReferentialCollateral should + // become IFFY through the top-level refresh + await expectEvents(collateral.refresh(), [ + { + contract: ethplusBasketHandler, + name: 'BasketStatusChanged', + args: [0, 1], + emitted: true, + }, + { + contract: wstETHCollateral, + name: 'CollateralStatusChanged', + args: [0, 1], + emitted: true, + }, + { + contract: collateral, + name: 'CollateralStatusChanged', + args: [0, 1], + emitted: true, + }, + ]) + expect(await wstETHCollateral.status()).to.equal(1) + expect(await collateral.status()).to.equal(1) + expect(await ethplusBasketHandler.isReady()).to.equal(false) + + // Should remain IFFY for the warmupPeriod even after wstETHCollateral is SOUND + await targetPerRefOracle.updateAnswer(latestAnswer) + await expectEvents(collateral.refresh(), [ + { + contract: ethplusBasketHandler, + name: 'BasketStatusChanged', + args: [1, 0], + emitted: true, + }, + { + contract: wstETHCollateral, + name: 'CollateralStatusChanged', + args: [1, 0], + emitted: true, + }, + { + contract: collateral, + name: 'CollateralStatusChanged', + emitted: false, + }, + ]) + expect(await collateral.status()).to.equal(1) + + // Goes back to SOUND after warmupPeriod + await advanceTime(1000) + await expect(collateral.refresh()).to.emit(collateral, 'CollateralStatusChanged').withArgs(1, 0) + expect(await collateral.status()).to.equal(0) + }) +} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itClaimsRewards: it, + isMetapool: false, + resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), + collateralName: 'CurveAppreciatingRTokenSelfReferentialCollateral - ConvexStakingWrapper', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts index e259ef05be..fc55ecf11e 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts @@ -226,10 +226,6 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: true, resetFork, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 89694aa40e..cd3181a4a2 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -1,14 +1,19 @@ import collateralTests from '../collateralTests' +import forkBlockNumber from '#/test/integration/fork-block-numbers' import { CurveCollateralFixtureContext, CurveMetapoolCollateralOpts, MintCurveCollateralFunc, } from '../pluginTestTypes' +import { expectEvents } from '../../../../../common/events' +import { overrideOracle } from '../../../../utils/oracles' import { ORACLE_TIMEOUT_BUFFER } from '../../fixtures' -import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' +import { makeWeUSDFraxBP, mintWeUSDFraxBP } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' import { expectDecayedPrice, expectExactPrice, expectUnpriced } from '../../../../utils/oracles' +import { getResetFork } from '../../helpers' +import { networkConfig } from '../../../../../common/configuration' import { ERC20Mock, MockV3Aggregator, @@ -42,6 +47,9 @@ import { } from '../constants' import { whileImpersonating } from '../../../../utils/impersonation' +const EUSD_ASSET_REGISTRY = '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' +const EUSD_BASKET_HANDLER = '0x6d309297ddDFeA104A6E89a132e2f05ce3828e07' + type Fixture = () => Promise export const defaultCvxStableCollateralOpts: CurveMetapoolCollateralOpts = { @@ -279,6 +287,80 @@ const collateralSpecificStatusTests = () => { // Stale should be false again expect(await mockRTokenAsset.stale()).to.be.false }) + + it('Regression test -- becomes IFFY when inner RToken is IFFY', async () => { + const [collateral] = await deployCollateral({}) + const eusdAssetRegistry = await ethers.getContractAt('IAssetRegistry', EUSD_ASSET_REGISTRY) + const eusdBasketHandler = await ethers.getContractAt('IBasketHandler', EUSD_BASKET_HANDLER) + const cUSDTCollateral = await ethers.getContractAt( + 'CTokenFiatCollateral', + await eusdAssetRegistry.toAsset(networkConfig['1'].tokens.cUSDT!) + ) + const initialPrice = await cUSDTCollateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + expect(await cUSDTCollateral.status()).to.equal(0) + + // De-peg oracle 20% + const chainlinkFeed = await cUSDTCollateral.chainlinkFeed() + const oracle = await overrideOracle(chainlinkFeed) + const latestAnswer = await oracle.latestAnswer() + await oracle.updateAnswer(latestAnswer.mul(4).div(5)) + + // CTokenFiatCollateral + CurveStableRTokenMetapoolCollateral should + // become IFFY through the top-level refresh + await expectEvents(collateral.refresh(), [ + { + contract: eusdBasketHandler, + name: 'BasketStatusChanged', + args: [0, 1], + emitted: true, + }, + { + contract: cUSDTCollateral, + name: 'CollateralStatusChanged', + args: [0, 1], + emitted: true, + }, + { + contract: collateral, + name: 'CollateralStatusChanged', + args: [0, 1], + emitted: true, + }, + ]) + expect(await cUSDTCollateral.status()).to.equal(1) + expect(await collateral.status()).to.equal(1) + expect(await eusdBasketHandler.isReady()).to.equal(false) + + // Should remain IFFY for the warmupPeriod even after cUSDTCollateral is SOUND again + await oracle.updateAnswer(latestAnswer) + await expectEvents(collateral.refresh(), [ + { + contract: eusdBasketHandler, + name: 'BasketStatusChanged', + args: [1, 0], + emitted: true, + }, + { + contract: cUSDTCollateral, + name: 'CollateralStatusChanged', + args: [1, 0], + emitted: true, + }, + { + contract: collateral, + name: 'CollateralStatusChanged', + emitted: false, + }, + ]) + expect(await collateral.status()).to.equal(1) + + // Goes back to SOUND after warmupPeriod + await advanceTime(1000) + await expect(collateral.refresh()).to.emit(collateral, 'CollateralStatusChanged').withArgs(1, 0) + expect(await collateral.status()).to.equal(0) + }) } /* @@ -291,13 +373,9 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: true, - resetFork, + resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), collateralName: 'CurveStableRTokenMetapoolCollateral - ConvexStakingWrapper', } diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts index 859b762b3f..bf76da6e9e 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts @@ -423,10 +423,6 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: false, resetFork, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts index d142c1ac7e..bce77c0b38 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts @@ -208,10 +208,6 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: false, resetFork: getResetFork(19287000), diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index ab06cdc726..6ed06a37fa 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -1,3 +1,4 @@ +import forkBlockNumber from '#/test/integration/fork-block-numbers' import { ethers } from 'hardhat' import { BigNumberish } from 'ethers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -23,7 +24,6 @@ import { THREE_POOL_CVX_POOL_ID, SUSD_POOL, SUSD_POOL_CVX_POOL_ID, - FORK_BLOCK, WBTC, WETH, TRI_CRYPTO, @@ -37,6 +37,9 @@ import { MIM_THREE_POOL, MIM_THREE_POOL_POOL_ID, MIM_THREE_POOL_HOLDER, + ETHPLUS, + ETHPLUS_BP_POOL, + ETHPLUS_BP_POOL_ID, } from '../constants' import { CurveBase } from '../pluginTestTypes' @@ -187,7 +190,7 @@ export const mintWPool = async ( await cvxWrapper.connect(user).deposit(amount, recipient) } -export const resetFork = getResetFork(FORK_BLOCK) +export const resetFork = getResetFork(forkBlockNumber['old-curve-plugins']) export type Numeric = number | bigint @@ -345,3 +348,78 @@ export const mintWMIM3Pool = async ( await lpToken.connect(user).approve(ctx.wrapper.address, amount) await ctx.wrapper.connect(user).deposit(amount, recipient) } + +// ===== ETH+/ETH + +export interface WrappedETHPlusETHFixture { + ethplus: ERC20Mock + weth: ERC20Mock + curvePool: CurvePoolMock + wPool: ConvexStakingWrapper +} + +export const makeWETHPlusETH = async ( + ethplusFeed: MockV3Aggregator +): Promise => { + // Make a fake RTokenAsset and register it with ETH+'s assetRegistry + const AssetFactory = await ethers.getContractFactory('Asset') + const mockRTokenAsset = await AssetFactory.deploy( + bn('604800'), + ethplusFeed.address, + fp('0.01'), + ETHPLUS, + fp('1e6'), + bn('1e1') + ) + const ethplusAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + '0xf526f058858E4cD060cFDD775077999562b31bE0' + ) + await whileImpersonating('0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B', async (signer) => { + await ethplusAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Use real reference ERC20s + const ethplus = await ethers.getContractAt('ERC20Mock', ETHPLUS) + const weth = await ethers.getContractAt('ERC20Mock', WETH) + + // Get real fraxBP pool + const realCurvePool = await ethers.getContractAt('ICurvePool', ETHPLUS_BP_POOL) + + // Use mock curvePool seeded with initial balances + const CurveMockFactory = await ethers.getContractFactory('CurvePoolMock') + const curvePool = await CurveMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + // Deploy Wrapper + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wPool = await wrapperFactory.deploy() + await wPool.initialize(ETHPLUS_BP_POOL_ID) + + // Ensure ETH+ isReady() + return { ethplus, weth, curvePool, wPool } +} + +export const mintWETHPlusETH = async ( + ctx: CurveBase, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string, + holder: string +) => { + const cvxWrapper = ctx.wrapper as ConvexStakingWrapper + const lpToken = await ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/ERC20.sol:ERC20', + await cvxWrapper.curveToken() + ) + + await whileImpersonating(holder, async (signer) => { + await lpToken.connect(signer).transfer(user.address, amount) + }) + + await lpToken.connect(user).approve(ctx.wrapper.address, amount) + await ctx.wrapper.connect(user).deposit(amount, recipient) +} From b30d125128dbbbecae38b24c6272bdd141132f02 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 11 Apr 2024 19:32:55 -0400 Subject: [PATCH 305/450] get StRSR under contract size limit --- contracts/p0/StRSR.sol | 18 +++++++++--------- contracts/p1/StRSR.sol | 34 +++++++++++++++++----------------- test/Deployer.test.ts | 4 +--- test/RToken.test.ts | 6 +++--- test/ZZStRSR.test.ts | 26 ++++++++++++-------------- 5 files changed, 42 insertions(+), 46 deletions(-) diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index 1d950b4b9c..86e8b2eb42 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -174,8 +174,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @custom:interaction function unstake(uint256 stakeAmount) external notTradingPausedOrFrozen { address account = _msgSender(); - require(stakeAmount > 0, "Cannot withdraw zero"); - require(balances[account] >= stakeAmount, "Not enough balance"); + require(stakeAmount > 0, "zero amount"); + require(balances[account] >= stakeAmount, "insufficient balance"); // Call state keepers _payoutRewards(); @@ -305,7 +305,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @custom:protected function seizeRSR(uint256 rsrAmount) external notTradingPausedOrFrozen { require(_msgSender() == address(main.backingManager()), "!bm"); - require(rsrAmount > 0, "Amount cannot be zero"); + require(rsrAmount > 0, "zero amount"); main.poke(); uint192 initialExchangeRate = exchangeRate(); @@ -453,13 +453,13 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address to, uint256 amount ) private { - require(from != address(0), "zero address transfer"); - require(to != address(0), "zero address transfer"); + require(from != address(0), "zero address"); + require(to != address(0), "zero address"); require(to != address(this), "transfer to self"); uint256 fromBalance = balances[from]; - require(fromBalance >= amount, "transfer amount exceeds balance"); + require(fromBalance >= amount, "insufficient balance"); unchecked { balances[from] = fromBalance - amount; @@ -497,7 +497,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool) { address owner = _msgSender(); uint256 currentAllowance = allowances[owner][spender]; - require(currentAllowance >= subtractedValue, "decreased allowance below zero"); + require(currentAllowance >= subtractedValue, "decrease allowance"); unchecked { _approve(owner, spender, currentAllowance - subtractedValue); } @@ -510,8 +510,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address spender, uint256 amount ) private { - require(owner != address(0), "zero address approval"); - require(spender != address(0), "zero address approval"); + require(owner != address(0), "zero address"); + require(spender != address(0), "zero address"); allowances[owner][spender] = amount; diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index ed86eb029d..5f0bd1dab2 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -35,12 +35,12 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public constant PERIOD = 1; // {s} 1 second + uint48 private constant PERIOD = 1; // {s} 1 second /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes - uint48 public constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year - uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% + uint48 private constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes + uint48 private constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year + uint192 private constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% // === ERC20 === string public name; // immutable @@ -148,7 +148,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // rsrRewardsAtLastPayout was the value of rsrRewards() at that time // {seconds} The last time when rewards were paid out - uint48 public payoutLastPaid; + uint48 private payoutLastPaid; // {qRSR} How much reward RSR was held the last time rewards were paid out uint256 private rsrRewardsAtLastPayout; @@ -181,8 +181,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint192 rewardRatio_, uint192 withdrawalLeak_ ) external initializer { - require(bytes(name_).length > 0, "name empty"); - require(bytes(symbol_).length > 0, "symbol empty"); + assert(bytes(name_).length > 0); + assert(bytes(symbol_).length > 0); __Component_init(main_); __EIP712_init(name_, VERSION); name = name_; @@ -260,8 +260,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab requireNotTradingPausedOrFrozen(); address account = _msgSender(); - require(stakeAmount > 0, "Cannot withdraw zero"); - require(stakes[era][account] >= stakeAmount, "Not enough balance"); + require(stakeAmount > 0, "zero amount"); + require(stakes[era][account] >= stakeAmount, "insufficient balance"); _payoutRewards(); @@ -427,7 +427,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab requireNotTradingPausedOrFrozen(); require(_msgSender() == address(backingManager), "!bm"); - require(rsrAmount > 0, "Amount cannot be zero"); + require(rsrAmount > 0, "zero amount"); uint256 rsrBalance = rsr.balanceOf(address(this)); require(rsrAmount <= rsrBalance, "seize exceeds balance"); @@ -808,7 +808,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) { address owner = _msgSender(); uint256 currentAllowance = _allowances[era][owner][spender]; - require(currentAllowance >= subtractedValue, "decreased allowance below zero"); + require(currentAllowance >= subtractedValue, "decrease allowance"); unchecked { _approve(owner, spender, currentAllowance - subtractedValue); } @@ -823,11 +823,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 amount ) internal { - require(from != address(0) && to != address(0), "zero address transfer"); + require(from != address(0) && to != address(0), "zero address"); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 fromBalance = eraStakes[from]; - require(fromBalance >= amount, "transfer amount exceeds balance"); + require(fromBalance >= amount, "insufficient balance"); unchecked { eraStakes[from] = fromBalance - amount; } @@ -842,7 +842,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // effects: bal[account] += amount; totalStakes += amount // this must only be called from a function that will fixup stakeRSR/Rate function _mint(address account, uint256 amount) internal virtual { - require(account != address(0), "zero address mint"); + require(account != address(0), "zero address"); assert(totalStakes + amount < type(uint224).max); stakes[era][account] += amount; @@ -858,13 +858,13 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function _burn(address account, uint256 amount) internal virtual { // untestable: // _burn is only called from unstake(), which uses msg.sender as `account` - require(account != address(0), "zero address burn"); + require(account != address(0), "zero address"); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 accountBalance = eraStakes[account]; // untestable: // _burn is only called from unstake(), which already checks this - require(accountBalance >= amount, "burn amount exceeds balance"); + require(accountBalance >= amount, "insufficient balances"); unchecked { eraStakes[account] = accountBalance - amount; } @@ -879,7 +879,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address spender, uint256 amount ) internal { - require(owner != address(0) && spender != address(0), "zero address approval"); + require(owner != address(0) && spender != address(0), "zero address"); _allowances[era][owner][spender] = amount; emit Approval(owner, spender, amount); diff --git a/test/Deployer.test.ts b/test/Deployer.test.ts index 1b9e4ed390..8711bcdc67 100644 --- a/test/Deployer.test.ts +++ b/test/Deployer.test.ts @@ -265,9 +265,7 @@ describe(`DeployerP${IMPLEMENTATION} contract #fast`, () => { }) it('Should not allow empty name', async () => { - await expect( - deployer.deploy('', 'RTKN', 'mandate', owner.address, config) - ).to.be.revertedWith('name empty') + await expect(deployer.deploy('', 'RTKN', 'mandate', owner.address, config)).to.be.reverted }) it('Should not allow empty symbol', async () => { diff --git a/test/RToken.test.ts b/test/RToken.test.ts index aadd8e62f1..99eeaaffc1 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -460,7 +460,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { await token3.connect(other).approve(rToken.address, issueAmount) await expect(rToken.connect(other).issue(issueAmount)).to.be.revertedWith( - 'ERC20: transfer amount exceeds balance' + 'ERC20: insufficient balance' ) expect(await rToken.totalSupply()).to.equal(bn('0')) }) @@ -2471,7 +2471,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Perform transfer with user with no balance await expect(rToken.connect(addr2).transfer(addr1.address, amount)).to.be.revertedWith( - 'ERC20: transfer amount exceeds balance' + 'ERC20: insufficient balance' ) // Nothing transferred @@ -2674,7 +2674,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Should not allow to decrease below zero await expect( rToken.connect(addr1).decreaseAllowance(addr2.address, amount.add(1)) - ).to.be.revertedWith('ERC20: decreased allowance below zero') + ).to.be.revertedWith('ERC20: decrease allowance') // No changes expect(await rToken.allowance(addr1.address, addr2.address)).to.equal(amount) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 06a65a1f03..e65ee284d2 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -237,7 +237,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { config.rewardRatio, config.withdrawalLeak ) - ).to.be.revertedWith('name empty') + ).to.be.reverted await expect( newStRSR.init( main.address, @@ -247,7 +247,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { config.rewardRatio, config.withdrawalLeak ) - ).to.be.revertedWith('symbol empty') + ).to.be.reverted }) }) @@ -416,7 +416,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) } else if (IMPLEMENTATION == Implementation.P1) { await whileImpersonating(ZERO_ADDRESS, async (signer) => { - await expect(stRSR.connect(signer).stake(amount)).to.be.revertedWith('zero address mint') + await expect(stRSR.connect(signer).stake(amount)).to.be.revertedWith('zero address') }) } }) @@ -514,14 +514,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const zero: BigNumber = bn(0) // Unstake - await expect(stRSR.connect(addr1).unstake(zero)).to.be.revertedWith('Cannot withdraw zero') + await expect(stRSR.connect(addr1).unstake(zero)).to.be.revertedWith('zero amount') }) it('Should not allow to unstake if not enough balance', async () => { const amount: BigNumber = bn('1000e18') // Unstake with no stakes/balance - await expect(stRSR.connect(addr1).unstake(amount)).to.be.revertedWith('Not enough balance') + await expect(stRSR.connect(addr1).unstake(amount)).to.be.revertedWith('insufficient balance') }) it('Should not unstake if paused', async () => { @@ -1599,9 +1599,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const prevPoolBalance: BigNumber = await rsr.balanceOf(stRSR.address) await whileImpersonating(backingManager.address, async (signer) => { - await expect(stRSR.connect(signer).seizeRSR(zero)).to.be.revertedWith( - 'Amount cannot be zero' - ) + await expect(stRSR.connect(signer).seizeRSR(zero)).to.be.revertedWith('zero amount') }) expect(await rsr.balanceOf(stRSR.address)).to.equal(prevPoolBalance) @@ -2321,7 +2319,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Perform transfer with user with no stake await expect(stRSR.connect(addr2).transfer(addr1.address, amount)).to.be.revertedWith( - 'transfer amount exceeds balance' + 'insufficient balance' ) // Nothing transferred @@ -2338,13 +2336,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to send to zero address await expect(stRSR.connect(addr1).transfer(ZERO_ADDRESS, amount)).to.be.revertedWith( - 'zero address transfer' + 'zero address' ) // Attempt to send from zero address - Impersonation is the only way to get to this validation await whileImpersonating(ZERO_ADDRESS, async (signer) => { await expect(stRSR.connect(signer).transfer(addr2.address, amount)).to.be.revertedWith( - 'zero address transfer' + 'zero address' ) }) @@ -2551,13 +2549,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to set allowance to zero address await expect(stRSR.connect(addr1).approve(ZERO_ADDRESS, amount)).to.be.revertedWith( - 'zero address approval' + 'zero address' ) // Attempt set allowance from zero address - Impersonation is the only way to get to this validation await whileImpersonating(ZERO_ADDRESS, async (signer) => { await expect(stRSR.connect(signer).approve(addr2.address, amount)).to.be.revertedWith( - 'zero address approval' + 'zero address' ) }) @@ -2593,7 +2591,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Should not allow to decrease below zero await expect( stRSR.connect(addr1).decreaseAllowance(addr2.address, amount.add(1)) - ).to.be.revertedWith('decreased allowance below zero') + ).to.be.revertedWith('decrease allowance') // No changes expect(await stRSR.allowance(addr1.address, addr2.address)).to.equal(amount) From da028624606e1ed3655af5d880375d44b03472a8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 11 Apr 2024 21:53:21 -0400 Subject: [PATCH 306/450] fix RToken.test.ts --- test/RToken.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/RToken.test.ts b/test/RToken.test.ts index 99eeaaffc1..8037a3064e 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -460,7 +460,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { await token3.connect(other).approve(rToken.address, issueAmount) await expect(rToken.connect(other).issue(issueAmount)).to.be.revertedWith( - 'ERC20: insufficient balance' + 'ERC20: transfer amount exceeds balance' ) expect(await rToken.totalSupply()).to.equal(bn('0')) }) @@ -2471,7 +2471,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Perform transfer with user with no balance await expect(rToken.connect(addr2).transfer(addr1.address, amount)).to.be.revertedWith( - 'ERC20: insufficient balance' + 'ERC20: transfer amount exceeds balance' ) // Nothing transferred From 67c68ed35c10ed69e7d0c929ed5d641e4644f4ec Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 12 Apr 2024 22:30:32 +0530 Subject: [PATCH 307/450] repeat fix --- contracts/facade/FacadeWrite.sol | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index f07ba82413..da3bef96e4 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -164,12 +164,9 @@ contract FacadeWrite is IFacadeWrite { emit GovernanceCreated(rToken, governance, address(timelock)); // Setup Roles - timelock.grantRole(timelock.PROPOSER_ROLE(), governance); // Gov only proposer timelock.grantRole(timelock.CANCELLER_ROLE(), governance); // Gov can cancel - // Set Guardian as canceller, if address(0) then no one can cancel - timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); - // Set Governance as canceller to enable killing timelock-stuck proposals - timelock.grantRole(timelock.CANCELLER_ROLE(), governance); + timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); // Guardian can cancel + timelock.grantRole(timelock.PROPOSER_ROLE(), governance); // Gov only proposer timelock.grantRole(timelock.EXECUTOR_ROLE(), governance); // Gov only executor timelock.revokeRole(timelock.TIMELOCK_ADMIN_ROLE(), address(this)); // Revoke admin role From 694ecbe58738eaaab275563961db96f941d1e4da Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 12 Apr 2024 13:23:54 -0400 Subject: [PATCH 308/450] RToken.test.ts --- test/RToken.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/RToken.test.ts b/test/RToken.test.ts index 8037a3064e..734adc8858 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -2674,7 +2674,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Should not allow to decrease below zero await expect( rToken.connect(addr1).decreaseAllowance(addr2.address, amount.add(1)) - ).to.be.revertedWith('ERC20: decrease allowance') + ).to.be.revertedWith('ERC20: decreased allowanced below zero') // No changes expect(await rToken.allowance(addr1.address, addr2.address)).to.equal(amount) From 3469e58d04f5f0512c0049c3e2504aaf0d5c33a0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 12 Apr 2024 14:23:10 -0400 Subject: [PATCH 309/450] RToken.test.ts again --- test/RToken.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/RToken.test.ts b/test/RToken.test.ts index 734adc8858..aadd8e62f1 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -2674,7 +2674,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Should not allow to decrease below zero await expect( rToken.connect(addr1).decreaseAllowance(addr2.address, amount.add(1)) - ).to.be.revertedWith('ERC20: decreased allowanced below zero') + ).to.be.revertedWith('ERC20: decreased allowance below zero') // No changes expect(await rToken.allowance(addr1.address, addr2.address)).to.equal(amount) From ae323aac079f1f5da1513110b900d08df2df9ba9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 11:32:02 -0400 Subject: [PATCH 310/450] 1 --- contracts/facade/DeployerRegistry.sol | 1 + test/DeployerRegistry.test.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contracts/facade/DeployerRegistry.sol b/contracts/facade/DeployerRegistry.sol index 1e3344c898..b8f868e75a 100644 --- a/contracts/facade/DeployerRegistry.sol +++ b/contracts/facade/DeployerRegistry.sol @@ -45,6 +45,7 @@ contract DeployerRegistry is IDeployerRegistry, Ownable { /// Unregister by version function unregister(string calldata version) external onlyOwner { emit DeploymentUnregistered(version, deployments[version]); + if (latestDeployment == deployments[version]) latestDeployment = IDeployer(address(0)); deployments[version] = IDeployer(address(0)); } } diff --git a/test/DeployerRegistry.test.ts b/test/DeployerRegistry.test.ts index a63324f4b1..a5e1a9b354 100644 --- a/test/DeployerRegistry.test.ts +++ b/test/DeployerRegistry.test.ts @@ -146,7 +146,7 @@ describe(`DeployerRegistry contract #fast`, () => { .withArgs('1.0.0', deployer.address) // Deployment unregistered - expect(await deployerRegistry.latestDeployment()).to.equal(deployer.address) + expect(await deployerRegistry.latestDeployment()).to.equal(ZERO_ADDRESS) expect(await deployerRegistry.deployments('1.0.0')).to.equal(ZERO_ADDRESS) }) }) From e680b196ad414e51a584579dc67719d256969a09 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 11:37:57 -0400 Subject: [PATCH 311/450] ETH+/ETH deployment/verification scripts (#1115) --- common/configuration.ts | 1 + scripts/deploy.ts | 1 + .../collaterals/deploy_convex_ethplus_eth.ts | 120 ++++++++++++++++++ .../verify_convex_ethplus_eth.ts | 90 +++++++++++++ scripts/verify_etherscan.ts | 1 + test/integration/fork-block-numbers.ts | 2 +- .../individual-collateral/curve/constants.ts | 2 +- 7 files changed, 215 insertions(+), 2 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts create mode 100644 scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts diff --git a/common/configuration.ts b/common/configuration.ts index 29a50100b3..f31ed37bc8 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -120,6 +120,7 @@ export interface IPools { cvxeUSDFRAXBP?: string cvxTriCrypto?: string cvxMIM3Pool?: string + cvxETHPlusETH?: string crv3Pool?: string crveUSDFRAXBP?: string crvTriCrypto?: string diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 671d593f63..d16055f098 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -62,6 +62,7 @@ async function main() { 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', + 'phase2-assets/collaterals/deploy_convex_ethplus_eth.ts', 'phase2-assets/collaterals/deploy_curve_stable_plugin.ts', 'phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts new file mode 100644 index 0000000000..87f2a33d2b --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts @@ -0,0 +1,120 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { expect } from 'chai' +import { ONE_ADDRESS, CollateralStatus } from '../../../../common/constants' +import { bn } from '../../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { CurveAppreciatingRTokenSelfReferentialCollateral } from '../../../../typechain' +import { revenueHiding } from '../../utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + ETHPLUS_BP_POOL_ID, + ETHPLUS_BP_POOL, + ETHPLUS_BP_TOKEN, + WETH_USD_FEED, + WETH_ORACLE_TIMEOUT, + WETH_ORACLE_ERROR, + MAX_TRADE_VOL, + PRICE_TIMEOUT, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// This file specifically deploys CurveAppreciatingRTokenSelfReferentialCollateral Plugin for ETH+/ETH + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying CurveAppreciatingRTokenSelfReferentialCollateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy Convex Appreciating RToken Collateral for ETH+/ETH **************************/ + + const CurveStableCollateralFactory = await hre.ethers.getContractFactory( + 'CurveAppreciatingRTokenSelfReferentialCollateral' + ) + const ConvexStakingWrapperFactory = await hre.ethers.getContractFactory('ConvexStakingWrapper') + + const wPool = await ConvexStakingWrapperFactory.deploy() + await wPool.deployed() + await (await wPool.initialize(ETHPLUS_BP_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Stable ETH+/ETH on ${hre.network.name} (${chainId}): ${wPool.address} ` + ) + + const collateral = ( + await CurveStableCollateralFactory.connect(deployer).deploy( + { + erc20: wPool.address, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, + oracleError: bn('1'), + oracleTimeout: bn('1'), + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD.add(WETH_ORACLE_ERROR), + delayUntilDefault: DELAY_UNTIL_DEFAULT, // 72h + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: ETHPLUS_BP_POOL, + poolType: CurvePoolType.Plain, + feeds: [[ONE_ADDRESS], [WETH_USD_FEED]], + oracleTimeouts: [[bn('1')], [WETH_ORACLE_TIMEOUT]], + oracleErrors: [[bn('1')], [WETH_ORACLE_ERROR]], + lpToken: ETHPLUS_BP_TOKEN, + } + ) + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed Convex Metapool Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.cvxETHPlusETH = collateral.address + assetCollDeployments.erc20s.cvxETHPlusETH = wPool.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts b/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts new file mode 100644 index 0000000000..596b1f03c4 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts @@ -0,0 +1,90 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { ONE_ADDRESS } from '../../../common/constants' +import { bn } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + ETHPLUS_BP_POOL, + ETHPLUS_BP_TOKEN, + WETH_USD_FEED, + WETH_ORACLE_TIMEOUT, + WETH_ORACLE_ERROR, + MAX_TRADE_VOL, + PRICE_TIMEOUT, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const ethPlusETHPlugin = await ethers.getContractAt( + 'CurveAppreciatingRTokenSelfReferentialCollateral', + deployments.collateral.cvxETHPlusETH as string + ) + + /******** Verify ConvexStakingWrapper **************************/ + + await verifyContract( + chainId, + await ethPlusETHPlugin.erc20(), + [], + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + ) + + /******** Verify eUSD/fraxBP plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxETHPlusETH, + [ + { + erc20: await ethPlusETHPlugin.erc20(), + targetName: ethers.utils.formatBytes32String('ETH'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, + oracleError: bn('1'), + oracleTimeout: bn('1'), + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD.add(WETH_ORACLE_ERROR), // 2% + + delayUntilDefault: DELAY_UNTIL_DEFAULT, // 72h + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: ETHPLUS_BP_POOL, + poolType: CurvePoolType.Plain, + feeds: [[ONE_ADDRESS], [WETH_USD_FEED]], + oracleTimeouts: [[bn('1')], [WETH_ORACLE_TIMEOUT]], + oracleErrors: [[bn('1')], [WETH_ORACLE_ERROR]], + lpToken: ETHPLUS_BP_TOKEN, + }, + ], + 'contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol:CurveAppreciatingRTokenSelfReferentialCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 1d0b566a21..550498eaff 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -59,6 +59,7 @@ async function main() { 'collateral-plugins/verify_convex_paypool.ts', 'collateral-plugins/verify_convex_stable_metapool.ts', 'collateral-plugins/verify_convex_stable_rtoken_metapool.ts', + 'collateral-plugins/verify_convex_ethplus_eth.ts', 'collateral-plugins/verify_curve_stable.ts', 'collateral-plugins/verify_curve_stable_metapool.ts', 'collateral-plugins/verify_curve_stable_rtoken_metapool.ts', diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index 9cd0206d6b..a6ac53aa39 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -9,7 +9,7 @@ const forkBlockNumber = { 'old-curve-plugins': 16915576, // Ethereum 'new-curve-plugins': 19626711, // Ethereum // TODO add all the block numbers we fork from to benefit from caching - default: 19275770, // Ethereum + default: 19635384, // Ethereum } export default forkBlockNumber diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index f1f6c02002..cf99ac72e6 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -148,7 +148,7 @@ export const RTOKEN_DELAY_UNTIL_DEFAULT = bn('259200') // 72h export const FIX_ONE = 1n * 10n ** 18n export const PRICE_TIMEOUT = bn('604800') // 1 week export const DEFAULT_THRESHOLD = fp('0.02') // 2% -export const DELAY_UNTIL_DEFAULT = bn('86400') +export const DELAY_UNTIL_DEFAULT = bn('259200') // 72h export const MAX_TRADE_VOL = fp('1e6') export enum CurvePoolType { From 3e257b64dfeebc23bed9888e7e03818bc2afa287 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 11:58:17 -0400 Subject: [PATCH 312/450] 3 --- contracts/plugins/assets/curve/PoolTokens.sol | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index 6e8f3e64e5..f818524d0c 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -302,7 +302,13 @@ contract PoolTokens { function maxPoolOracleTimeout() internal view virtual returns (uint48) { return uint48( - Math.max(Math.max(_t0timeout1, _t1timeout1), Math.max(_t2timeout1, _t3timeout1)) + Math.max( + Math.max( + Math.max(_t0timeout0, _t1timeout0), + Math.max(_t2timeout0, _t3timeout0) + ), + Math.max(Math.max(_t0timeout1, _t1timeout1), Math.max(_t2timeout1, _t3timeout1)) + ) ); } From 436bbb3277abfb43d4a937dd1f6a836087d0a1d5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:14:01 -0400 Subject: [PATCH 313/450] 5 --- contracts/p0/BasketHandler.sol | 3 +++ contracts/p1/BasketHandler.sol | 3 +++ test/Main.test.ts | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 165c86ca9c..8ac18bd8f8 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -114,6 +114,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight + uint256 internal constant MAX_BACKUP_ERC20s = 32; // config is the basket configuration, from which basket will be computed in a basket-switch // event. config is only modified by governance through setPrimeBasket and setBackupConfig @@ -332,6 +333,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint256 max, IERC20[] calldata erc20s ) external governance { + require(max <= MAX_BACKUP_ERC20s, "max too large"); + require(erc20s.length <= MAX_BACKUP_ERC20s, "erc20s too large"); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index c842a982d5..3f25be477e 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -29,6 +29,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year + uint256 internal constant MAX_BACKUP_ERC20s = 32; // Peer components IAssetRegistry private assetRegistry; @@ -289,6 +290,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { IERC20[] calldata erc20s ) external { requireGovernanceOnly(); + require(max <= MAX_BACKUP_ERC20s, "max too large"); + require(erc20s.length <= MAX_BACKUP_ERC20s, "erc20s too large"); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; diff --git a/test/Main.test.ts b/test/Main.test.ts index d316337d31..110b2f17ac 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2862,6 +2862,40 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('invalid collateral') }) + it('Should not allow to set more backup ERC20s than MAX_BACKUP_ERC20s', async () => { + const erc20s = [] + for (let i = 0; i < 32; i++) erc20s.push(ONE_ADDRESS) + + // Should succeed at 32 + await expect( + basketHandler + .connect(owner) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), erc20s) + ).to.not.be.revertedWith('erc20s too large') + + // Should fail at 33 + erc20s.push(ONE_ADDRESS) + await expect( + basketHandler + .connect(owner) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), erc20s) + ).to.be.revertedWith('erc20s too large') + + // Should succeed at 32 + await expect( + basketHandler + .connect(owner) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(32), []) + ).to.not.be.revertedWith('max too large') + + // Should fail at 33 + await expect( + basketHandler + .connect(owner) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(33), []) + ).to.be.revertedWith('max too large') + }) + it('Should allow to set backup Config if OWNER', async () => { // Set basket await expect( From 6f0a1f394942c3b5e2a7261eb6cfe79346701a9a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:28:09 -0400 Subject: [PATCH 314/450] 12 --- contracts/mixins/Auth.sol | 8 ++--- contracts/p0/BackingManager.sol | 4 +-- contracts/p0/BasketHandler.sol | 4 +-- contracts/p0/Broker.sol | 6 ++-- contracts/p0/Distributor.sol | 7 ++--- contracts/p0/RToken.sol | 30 +++++++++---------- contracts/p0/StRSR.sol | 20 ++++++------- contracts/p0/mixins/Component.sol | 2 +- contracts/p1/BackingManager.sol | 4 +-- contracts/p1/BasketHandler.sol | 4 +-- contracts/p1/Broker.sol | 6 ++-- contracts/p1/Distributor.sol | 2 +- contracts/p1/RToken.sol | 30 +++++++++---------- contracts/p1/StRSR.sol | 22 +++++++------- contracts/p1/StRSRVotes.sol | 4 +-- contracts/p1/mixins/Component.sol | 2 +- contracts/p1/mixins/Trading.sol | 2 +- contracts/plugins/mocks/BadERC20.sol | 4 +-- .../plugins/mocks/vendor/EasyAuction.sol | 6 ++-- 19 files changed, 83 insertions(+), 84 deletions(-) diff --git a/contracts/mixins/Auth.sol b/contracts/mixins/Auth.sol index ffdc714816..1e3b459adb 100644 --- a/contracts/mixins/Auth.sol +++ b/contracts/mixins/Auth.sol @@ -74,7 +74,7 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { _setRoleAdmin(LONG_FREEZER, OWNER); _setRoleAdmin(PAUSER, OWNER); - _grantRole(OWNER, _msgSender()); + _grantRole(OWNER, msg.sender); setShortFreeze(shortFreeze_); setLongFreeze(longFreeze_); @@ -123,7 +123,7 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { // - after, caller does not have the SHORT_FREEZER role function freezeShort() external onlyRole(SHORT_FREEZER) { // Revoke short freezer role after one use - _revokeRole(SHORT_FREEZER, _msgSender()); + _revokeRole(SHORT_FREEZER, msg.sender); freezeUntil(uint48(block.timestamp) + shortFreeze); } @@ -137,10 +137,10 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { // - longFreezes'[caller] = longFreezes[caller] - 1 // - if longFreezes'[caller] == 0 then caller loses the LONG_FREEZER role function freezeLong() external onlyRole(LONG_FREEZER) { - longFreezes[_msgSender()] -= 1; // reverts on underflow + longFreezes[msg.sender] -= 1; // reverts on underflow // Revoke on 0 charges as a cleanup step - if (longFreezes[_msgSender()] == 0) _revokeRole(LONG_FREEZER, _msgSender()); + if (longFreezes[msg.sender] == 0) _revokeRole(LONG_FREEZER, msg.sender); freezeUntil(uint48(block.timestamp) + longFreeze); } diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 34a28ce66a..c2ae2375a6 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -74,7 +74,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { delete tokensOut[trade.sell()]; // if the settler is the trade contract itself, try chaining with another rebalance() - if (_msgSender() == address(trade)) { + if (msg.sender == address(trade)) { // solhint-disable-next-line no-empty-blocks try this.rebalance(trade.KIND()) {} catch (bytes memory errData) { // prevent MEV searchers from providing less gas on purpose by reverting if OOG @@ -92,7 +92,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( - _msgSender() == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, + msg.sender == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, "already rebalancing" ); diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 8ac18bd8f8..deb19a6cba 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -185,7 +185,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // checks: caller is assetRegistry // effects: disabled' = true function disableBasket() external { - require(_msgSender() == address(main.assetRegistry()), "asset registry only"); + require(msg.sender == address(main.assetRegistry()), "asset registry only"); uint192[] memory refAmts = new uint192[](basket.erc20s.length); for (uint256 i = 0; i < basket.erc20s.length; i++) { @@ -210,7 +210,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { main.assetRegistry().refresh(); require( - main.hasRole(OWNER, _msgSender()) || + main.hasRole(OWNER, msg.sender) || (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index b53c2e0417..66529bdc26 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -73,7 +73,7 @@ contract BrokerP0 is ComponentP0, IBroker { ) external returns (ITrade) { assert(req.sellAmount > 0); - address caller = _msgSender(); + address caller = msg.sender; require( caller == address(main.backingManager()) || caller == address(main.rsrTrader()) || @@ -93,8 +93,8 @@ contract BrokerP0 is ComponentP0, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected function reportViolation() external { - require(trades[_msgSender()], "unrecognized trade contract"); - ITrade trade = ITrade(_msgSender()); + require(trades[msg.sender], "unrecognized trade contract"); + ITrade trade = ITrade(msg.sender); TradeKind kind = trade.KIND(); if (kind == TradeKind.BATCH_AUCTION) { diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 264d7bfe7e..8e33824d03 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -53,8 +53,7 @@ contract DistributorP0 is ComponentP0, IDistributor { IERC20 rsr = main.rsr(); require( - _msgSender() == address(main.rsrTrader()) || - _msgSender() == address(main.rTokenTrader()), + msg.sender == address(main.rsrTrader()) || msg.sender == address(main.rTokenTrader()), "RevenueTraders only" ); require(erc20 == rsr || erc20 == IERC20(address(main.rToken())), "RSR or RToken"); @@ -88,9 +87,9 @@ contract DistributorP0 is ComponentP0, IDistributor { addrTo = address(main.stRSR()); if (transferAmt > 0) accountRewards = true; } - erc20.safeTransferFrom(_msgSender(), addrTo, transferAmt); + erc20.safeTransferFrom(msg.sender, addrTo, transferAmt); } - emit RevenueDistributed(erc20, _msgSender(), amount); + emit RevenueDistributed(erc20, msg.sender, amount); // Perform reward accounting if (accountRewards) { diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol index e7ce86a0b2..004891594d 100644 --- a/contracts/p0/RToken.sol +++ b/contracts/p0/RToken.sol @@ -85,7 +85,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity of RToken to issue /// @custom:interaction function issue(uint256 amount) public { - issueTo(_msgSender(), amount); + issueTo(msg.sender, amount); } /// Issue an RToken on the current basket, to a particular recipient @@ -116,7 +116,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote(baskets, CEIL); - address issuer = _msgSender(); + address issuer = msg.sender; for (uint256 i = 0; i < erc20s.length; i++) { IERC20(erc20s[i]).safeTransferFrom(issuer, address(main.backingManager()), deposits[i]); } @@ -129,7 +129,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity {qRToken} of RToken to redeem /// @custom:interaction function redeem(uint256 amount) external { - redeemTo(_msgSender(), amount); + redeemTo(msg.sender, amount); } /// Redeem RToken for basket collateral to a particular recipient @@ -141,7 +141,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { main.poke(); require(amount > 0, "Cannot redeem zero"); - require(amount <= balanceOf(_msgSender()), "insufficient balance"); + require(amount <= balanceOf(msg.sender), "insufficient balance"); require(main.basketHandler().fullyCollateralized(), "partial redemption; use redeemCustom"); // redemption while IFFY/DISABLED allowed @@ -150,8 +150,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(totalSupply(), int256(amount)); // reverts on overuse // {BU} - uint192 baskets = _scaleDown(_msgSender(), amount); - emit Redemption(_msgSender(), recipient, amount, baskets); + uint192 baskets = _scaleDown(msg.sender, amount); + emit Redemption(msg.sender, recipient, amount, baskets); (address[] memory erc20s, uint256[] memory amounts) = main.basketHandler().quote( baskets, @@ -188,7 +188,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { uint256[] memory minAmounts ) external notFrozen exchangeRateIsValidAfter { require(amount > 0, "Cannot redeem zero"); - require(amount <= balanceOf(_msgSender()), "insufficient balance"); + require(amount <= balanceOf(msg.sender), "insufficient balance"); // Call collective state keepers. main.poke(); @@ -200,8 +200,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(supply, int256(amount)); // reverts on overuse // {BU} - uint192 basketsRedeemed = _scaleDown(_msgSender(), amount); - emit Redemption(_msgSender(), recipient, amount, basketsRedeemed); + uint192 basketsRedeemed = _scaleDown(msg.sender, amount); + emit Redemption(msg.sender, recipient, amount, basketsRedeemed); // === Get basket redemption amounts === @@ -266,15 +266,15 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param baskets {BU} The number of baskets to mint RToken for /// @custom:protected function mint(uint192 baskets) external exchangeRateIsValidAfter { - require(_msgSender() == address(main.backingManager()), "not backing manager"); + require(msg.sender == address(main.backingManager()), "not backing manager"); _scaleUp(address(main.backingManager()), baskets); } /// Melt a quantity of RToken from the caller's account, increasing the basket rate /// @param amount {qRTok} The amount to be melted function melt(uint256 amount) external exchangeRateIsValidAfter { - require(_msgSender() == address(main.furnace()), "furnace only"); - _burn(_msgSender(), amount); + require(msg.sender == address(main.furnace()), "furnace only"); + _burn(msg.sender, amount); emit Melted(amount); } @@ -283,8 +283,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qRTok} /// @custom:protected function dissolve(uint256 amount) external exchangeRateIsValidAfter { - require(_msgSender() == address(main.backingManager()), "not backing manager"); - _scaleDown(_msgSender(), amount); + require(msg.sender == address(main.backingManager()), "not backing manager"); + _scaleDown(msg.sender, amount); } /// An affordance of last resort for Main in order to ensure re-capitalization @@ -294,7 +294,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { notTradingPausedOrFrozen exchangeRateIsValidAfter { - require(_msgSender() == address(main.backingManager()), "not backing manager"); + require(msg.sender == address(main.backingManager()), "not backing manager"); require(totalSupply() > 0, "0 supply"); emit BasketsNeededChanged(basketsNeeded, basketsNeeded_); basketsNeeded = basketsNeeded_; diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index ba887e30e0..29077cb92d 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -153,7 +153,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @dev Staking continues while paused, without reward handouts /// @custom:interaction function stake(uint256 rsrAmount) external { - address account = _msgSender(); + address account = msg.sender; require(rsrAmount > 0, "Cannot stake zero"); _payoutRewards(); @@ -179,7 +179,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @param stakeAmount {qStRSR} /// @custom:interaction function unstake(uint256 stakeAmount) external notTradingPausedOrFrozen { - address account = _msgSender(); + address account = msg.sender; require(stakeAmount > 0, "Cannot withdraw zero"); require(balances[account] >= stakeAmount, "Not enough balance"); @@ -247,7 +247,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } function cancelUnstake(uint256 endId) external notFrozen { - address account = _msgSender(); + address account = msg.sender; // Call state keepers _payoutRewards(); @@ -310,7 +310,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// seizedRSR will _not_ be smaller than rsrAmount. /// @custom:protected function seizeRSR(uint256 rsrAmount) external notTradingPausedOrFrozen { - require(_msgSender() == address(main.backingManager()), "!bm"); + require(msg.sender == address(main.backingManager()), "!bm"); require(rsrAmount > 0, "Amount cannot be zero"); main.poke(); @@ -365,7 +365,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // Transfer RSR to caller emit ExchangeRateSet(initialExchangeRate, exchangeRate()); - main.rsr().safeTransfer(_msgSender(), seizedRSR); + main.rsr().safeTransfer(msg.sender, seizedRSR); } function bankruptStakers() internal returns (uint256 seizedRSR) { @@ -450,7 +450,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } function transfer(address to, uint256 amount) external returns (bool) { - _transfer(_msgSender(), to, amount); + _transfer(msg.sender, to, amount); return true; } @@ -480,7 +480,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } function approve(address spender, uint256 amount) public returns (bool) { - _approve(_msgSender(), spender, amount); + _approve(msg.sender, spender, amount); return true; } @@ -489,19 +489,19 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address to, uint256 amount ) public returns (bool) { - _spendAllowance(from, _msgSender(), amount); + _spendAllowance(from, msg.sender, amount); _transfer(from, to, amount); return true; } function increaseAllowance(address spender, uint256 addedValue) external returns (bool) { - address owner = _msgSender(); + address owner = msg.sender; _approve(owner, spender, allowances[owner][spender] + addedValue); return true; } function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool) { - address owner = _msgSender(); + address owner = msg.sender; uint256 currentAllowance = allowances[owner][spender]; require(currentAllowance >= subtractedValue, "decreased allowance below zero"); unchecked { diff --git a/contracts/p0/mixins/Component.sol b/contracts/p0/mixins/Component.sol index 09f5846b68..20240cf75a 100644 --- a/contracts/p0/mixins/Component.sol +++ b/contracts/p0/mixins/Component.sol @@ -41,7 +41,7 @@ abstract contract ComponentP0 is Versioned, Initializable, ContextUpgradeable, I } modifier governance() { - require(main.hasRole(OWNER, _msgSender()), "governance only"); + require(main.hasRole(OWNER, msg.sender), "governance only"); _; } } diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 7fd6017a5e..b2f50a1ed7 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -97,7 +97,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { trade = super.settleTrade(sell); // nonReentrant // if the settler is the trade contract itself, try chaining with another rebalance() - if (_msgSender() == address(trade)) { + if (msg.sender == address(trade)) { // solhint-disable-next-line no-empty-blocks try this.rebalance(trade.KIND()) {} catch (bytes memory errData) { // prevent MEV searchers from providing less gas on purpose by reverting if OOG @@ -122,7 +122,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions require( - _msgSender() == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, + msg.sender == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, "already rebalancing" ); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 3f25be477e..5a9a7f6f04 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -128,7 +128,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // checks: caller is assetRegistry // effects: disabled' = true function disableBasket() external { - require(_msgSender() == address(assetRegistry), "asset registry only"); + require(msg.sender == address(assetRegistry), "asset registry only"); uint256 len = basket.erc20s.length; uint192[] memory refAmts = new uint192[](len); @@ -152,7 +152,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { assetRegistry.refresh(); require( - main.hasRole(OWNER, _msgSender()) || + main.hasRole(OWNER, msg.sender) || (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0111d25bc3..83b5ca0323 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -119,7 +119,7 @@ contract BrokerP1 is ComponentP1, IBroker { TradeRequest memory req, TradePrices memory prices ) external returns (ITrade) { - address caller = _msgSender(); + address caller = msg.sender; require( caller == address(backingManager) || caller == address(rsrTrader) || @@ -139,8 +139,8 @@ contract BrokerP1 is ComponentP1, IBroker { // checks: caller is a Trade this contract cloned // effects: disabled' = true function reportViolation() external { - require(trades[_msgSender()], "unrecognized trade contract"); - ITrade trade = ITrade(_msgSender()); + require(trades[msg.sender], "unrecognized trade contract"); + ITrade trade = ITrade(msg.sender); TradeKind kind = trade.KIND(); if (kind == TradeKind.BATCH_AUCTION) { diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index f8a15e4c63..a788744013 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -90,7 +90,7 @@ contract DistributorP1 is ComponentP1, IDistributor { function distribute(IERC20 erc20, uint256 amount) external { // Intentionally do not check notTradingPausedOrFrozen, since handled by caller - address caller = _msgSender(); + address caller = msg.sender; require(caller == rsrTrader || caller == rTokenTrader, "RevenueTraders only"); require(erc20 == rsr || erc20 == rToken, "RSR or RToken"); bool isRSR = erc20 == rsr; // if false: isRToken diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index b91b9ba296..82f56d347d 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -92,7 +92,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity of RToken to issue /// @custom:interaction nearly CEI, but see comments around handling of refunds function issue(uint256 amount) public { - issueTo(_msgSender(), amount); + issueTo(msg.sender, amount); } /// Issue an RToken on the current basket, to a particular recipient @@ -111,7 +111,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks-effects block == - address issuer = _msgSender(); // OK to save: it can't be changed in reentrant runs + address issuer = msg.sender; // OK to save: it can't be changed in reentrant runs // Ensure basket is ready, SOUND and not in warmup period require(basketHandler.isReady(), "basket not ready"); @@ -156,7 +156,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity {qRToken} of RToken to redeem /// @custom:interaction CEI function redeem(uint256 amount) external { - redeemTo(_msgSender(), amount); + redeemTo(msg.sender, amount); } /// Redeem RToken for basket collateral to a particular recipient @@ -185,7 +185,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks and Effects == require(amount > 0, "Cannot redeem zero"); - require(amount <= balanceOf(_msgSender()), "insufficient balance"); + require(amount <= balanceOf(msg.sender), "insufficient balance"); require(basketHandler.fullyCollateralized(), "partial redemption; use redeemCustom"); // redemption while IFFY/DISABLED allowed @@ -196,8 +196,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(supply, int256(amount)); // reverts on over-redemption // {BU} - uint192 baskets = _scaleDown(_msgSender(), amount); - emit Redemption(_msgSender(), recipient, amount, baskets); + uint192 baskets = _scaleDown(msg.sender, amount); + emit Redemption(msg.sender, recipient, amount, baskets); (address[] memory erc20s, uint256[] memory amounts) = basketHandler.quote(baskets, FLOOR); @@ -256,7 +256,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks and Effects == require(amount > 0, "Cannot redeem zero"); - require(amount <= balanceOf(_msgSender()), "insufficient balance"); + require(amount <= balanceOf(msg.sender), "insufficient balance"); uint256 portionsSum; for (uint256 i = 0; i < portions.length; ++i) { portionsSum += portions[i]; @@ -270,8 +270,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(supply, int256(amount)); // reverts on over-redemption // {BU} - uint192 baskets = _scaleDown(_msgSender(), amount); - emit Redemption(_msgSender(), recipient, amount, baskets); + uint192 baskets = _scaleDown(msg.sender, amount); + emit Redemption(msg.sender, recipient, amount, baskets); // === Get basket redemption amounts === @@ -346,7 +346,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // basketsNeeded' = basketsNeeded + baskets // BU exchange rate cannot decrease, and it can only increase when < FIX_ONE. function mint(uint192 baskets) external { - require(_msgSender() == address(backingManager), "not backing manager"); + require(msg.sender == address(backingManager), "not backing manager"); _scaleUp(address(backingManager), baskets, totalSupply()); } @@ -360,8 +360,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // BU exchange rate cannot decrease // BU exchange rate CAN increase, but we already trust furnace to do this slowly function melt(uint256 amtRToken) external { - require(_msgSender() == address(furnace), "furnace only"); - _burn(_msgSender(), amtRToken); + require(msg.sender == address(furnace), "furnace only"); + _burn(msg.sender, amtRToken); emit Melted(amtRToken); } @@ -376,8 +376,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // basketsNeeded' = basketsNeeded - baskets // BU exchange rate cannot decrease, and it can only increase when < FIX_ONE. function dissolve(uint256 amount) external { - require(_msgSender() == address(backingManager), "not backing manager"); - _scaleDown(_msgSender(), amount); + require(msg.sender == address(backingManager), "not backing manager"); + _scaleDown(msg.sender, amount); } /// An affordance of last resort for Main in order to ensure re-capitalization @@ -385,7 +385,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // checks: caller is backingManager // effects: basketsNeeded' = basketsNeeded_ function setBasketsNeeded(uint192 basketsNeeded_) external notTradingPausedOrFrozen { - require(_msgSender() == address(backingManager), "not backing manager"); + require(msg.sender == address(backingManager), "not backing manager"); emit BasketsNeededChanged(basketsNeeded, basketsNeeded_); basketsNeeded = basketsNeeded_; diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 70b36bdef6..07e4665869 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -239,10 +239,10 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab _payoutRewards(); // Mint new stakes - mintStakes(_msgSender(), rsrAmount); + mintStakes(msg.sender, rsrAmount); // == Interactions == - IERC20Upgradeable(address(rsr)).safeTransferFrom(_msgSender(), address(this), rsrAmount); + IERC20Upgradeable(address(rsr)).safeTransferFrom(msg.sender, address(this), rsrAmount); } /// Begins a delayed unstaking for `amount` StRSR @@ -267,7 +267,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function unstake(uint256 stakeAmount) external { requireNotTradingPausedOrFrozen(); - address account = _msgSender(); + address account = msg.sender; require(stakeAmount > 0, "Cannot withdraw zero"); require(stakes[era][account] >= stakeAmount, "Not enough balance"); @@ -354,7 +354,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:interaction CEI function cancelUnstake(uint256 endId) external { requireNotFrozen(); - address account = _msgSender(); + address account = msg.sender; // We specifically allow unstaking when under collateralized // require(basketHandler.fullyCollateralized(), "RToken uncollateralized"); @@ -434,7 +434,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function seizeRSR(uint256 rsrAmount) external { requireNotTradingPausedOrFrozen(); - require(_msgSender() == address(backingManager), "!bm"); + require(msg.sender == address(backingManager), "!bm"); require(rsrAmount > 0, "Amount cannot be zero"); uint256 rsrBalance = rsr.balanceOf(address(this)); @@ -483,7 +483,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // Transfer RSR to caller emit ExchangeRateSet(initRate, exchangeRate()); - IERC20Upgradeable(address(rsr)).safeTransfer(_msgSender(), seizedRSR); + IERC20Upgradeable(address(rsr)).safeTransfer(msg.sender, seizedRSR); } /// @custom:governance @@ -779,7 +779,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab } function transfer(address to, uint256 amount) public returns (bool) { - address owner = _msgSender(); + address owner = msg.sender; _transfer(owner, to, amount); return true; } @@ -789,7 +789,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab * `transferFrom`. This is semantically equivalent to an infinite approval. */ function approve(address spender, uint256 amount) public returns (bool) { - _approve(_msgSender(), spender, amount); + _approve(msg.sender, spender, amount); return true; } @@ -802,19 +802,19 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 amount ) public returns (bool) { - _spendAllowance(from, _msgSender(), amount); + _spendAllowance(from, msg.sender, amount); _transfer(from, to, amount); return true; } function increaseAllowance(address spender, uint256 addedValue) public returns (bool) { - address owner = _msgSender(); + address owner = msg.sender; _approve(owner, spender, _allowances[era][owner][spender] + addedValue); return true; } function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) { - address owner = _msgSender(); + address owner = msg.sender; uint256 currentAllowance = _allowances[era][owner][spender]; require(currentAllowance >= subtractedValue, "decreased allowance below zero"); unchecked { diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 8fc9b93427..63a669be90 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -112,7 +112,7 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { } function delegate(address delegatee) public { - _delegate(_msgSender(), delegatee); + _delegate(msg.sender, delegatee); } function delegateBySig( @@ -138,7 +138,7 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { /// votes from the sender to `delegatee` or self function stakeAndDelegate(uint256 rsrAmount, address delegatee) external { stake(rsrAmount); - address msgSender = _msgSender(); + address msgSender = msg.sender; address currentDelegate = delegates(msgSender); if (delegatee == address(0) && currentDelegate == address(0)) { diff --git a/contracts/p1/mixins/Component.sol b/contracts/p1/mixins/Component.sol index 913379cb85..5b878ebcdb 100644 --- a/contracts/p1/mixins/Component.sol +++ b/contracts/p1/mixins/Component.sol @@ -54,7 +54,7 @@ abstract contract ComponentP1 is } modifier governance() { - require(main.hasRole(OWNER, _msgSender()), "governance only"); + require(main.hasRole(OWNER, msg.sender), "governance only"); _; } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 393cc2435a..5de4e64cd4 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -107,7 +107,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl } /// Try to initiate a trade with a trading partner provided by the broker - /// @param kind TradeKind.DUTCH_AUCTION or TradeKind.BATCH_AUCTION + /// @param kind TradeKind.DUTCH_AUeCTION or TradeKind.BATCH_AUCTION /// @return trade The trade contract created /// @custom:interaction Assumption: Caller is nonReentrant // checks: diff --git a/contracts/plugins/mocks/BadERC20.sol b/contracts/plugins/mocks/BadERC20.sol index 11570a4e4c..697835a50f 100644 --- a/contracts/plugins/mocks/BadERC20.sol +++ b/contracts/plugins/mocks/BadERC20.sol @@ -53,7 +53,7 @@ contract BadERC20 is ERC20Mock { } function transfer(address to, uint256 amount) public virtual override returns (bool) { - address owner = _msgSender(); + address owner = msg.sender; if (censored[owner] || censored[to]) revert("censored"); uint256 fee = transferFee.mulu_toUint(amount, CEIL); _transfer(owner, to, amount - fee); @@ -66,7 +66,7 @@ contract BadERC20 is ERC20Mock { address to, uint256 amount ) public virtual override returns (bool) { - address spender = _msgSender(); + address spender = msg.sender; if (censored[from] || censored[to]) revert("censored"); _spendAllowance(from, spender, amount); uint256 fee = transferFee.mulu_toUint(amount, CEIL); diff --git a/contracts/plugins/mocks/vendor/EasyAuction.sol b/contracts/plugins/mocks/vendor/EasyAuction.sol index a0b843948a..a6608afedd 100644 --- a/contracts/plugins/mocks/vendor/EasyAuction.sol +++ b/contracts/plugins/mocks/vendor/EasyAuction.sol @@ -865,7 +865,7 @@ library Address { * This contract is only required for intermediate, library-like contracts. */ abstract contract Context { - function _msgSender() internal view virtual returns (address payable) { + function msg.sender internal view virtual returns (address payable) { return msg.sender; } @@ -896,7 +896,7 @@ abstract contract Ownable is Context { * @dev Initializes the contract setting the deployer as the initial owner. */ constructor() internal { - address msgSender = _msgSender(); + address msgSender = msg.sender; _owner = msgSender; emit OwnershipTransferred(address(0), msgSender); } @@ -912,7 +912,7 @@ abstract contract Ownable is Context { * @dev Throws if called by any account other than the owner. */ modifier onlyOwner() { - require(_owner == _msgSender(), "Ownable: caller is not the owner"); + require(_owner == msg.sender, "Ownable: caller is not the owner"); _; } From 8ed46a283eea86e995ff68afe83b5352201913bb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:34:01 -0400 Subject: [PATCH 315/450] 12 --- contracts/plugins/mocks/vendor/EasyAuction.sol | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contracts/plugins/mocks/vendor/EasyAuction.sol b/contracts/plugins/mocks/vendor/EasyAuction.sol index a6608afedd..a0b843948a 100644 --- a/contracts/plugins/mocks/vendor/EasyAuction.sol +++ b/contracts/plugins/mocks/vendor/EasyAuction.sol @@ -865,7 +865,7 @@ library Address { * This contract is only required for intermediate, library-like contracts. */ abstract contract Context { - function msg.sender internal view virtual returns (address payable) { + function _msgSender() internal view virtual returns (address payable) { return msg.sender; } @@ -896,7 +896,7 @@ abstract contract Ownable is Context { * @dev Initializes the contract setting the deployer as the initial owner. */ constructor() internal { - address msgSender = msg.sender; + address msgSender = _msgSender(); _owner = msgSender; emit OwnershipTransferred(address(0), msgSender); } @@ -912,7 +912,7 @@ abstract contract Ownable is Context { * @dev Throws if called by any account other than the owner. */ modifier onlyOwner() { - require(_owner == msg.sender, "Ownable: caller is not the owner"); + require(_owner == _msgSender(), "Ownable: caller is not the owner"); _; } From e6822fb9dfc79c3d7ec8a7e10c8b0e49f84d1f0c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:34:07 -0400 Subject: [PATCH 316/450] 14 --- contracts/plugins/assets/OracleErrors.sol | 2 +- contracts/plugins/assets/OracleLib.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/OracleErrors.sol b/contracts/plugins/assets/OracleErrors.sol index ddb96dd9ce..535ff002c6 100644 --- a/contracts/plugins/assets/OracleErrors.sol +++ b/contracts/plugins/assets/OracleErrors.sol @@ -4,4 +4,4 @@ pragma solidity 0.8.19; // 0x19abf40e error StalePrice(); // 0x4dfba023 -error ZeroPrice(); +error InvalidPrice(); diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index aa56808468..06df2abbfb 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -36,7 +36,7 @@ library OracleLib { uint48 secondsSince = uint48(block.timestamp - updateTime); if (secondsSince > timeout + ORACLE_TIMEOUT_BUFFER) revert StalePrice(); - if (p == 0) revert ZeroPrice(); + if (p <= 0) revert InvalidPrice(); // {UoA/tok} return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); From c8991f7ddae151105a74fc8596d13701f6491ec0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:41:57 -0400 Subject: [PATCH 317/450] 15 --- .../compoundv2/CTokenSelfReferentialCollateral.sol | 14 ++++++-------- scripts/verification/6_verify_collateral.ts | 1 - .../deploy-ctoken-selfreferential-collateral.ts | 4 +--- test/integration/AssetPlugins.test.ts | 6 ++---- test/integration/fixtures.ts | 9 +++------ test/plugins/Collateral.test.ts | 3 +-- test/scenario/cETH.test.ts | 3 +-- 7 files changed, 14 insertions(+), 26 deletions(-) diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index fcbe5651c8..65e5004235 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -26,15 +26,13 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { /// @param config.erc20 The CToken itself /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide - /// @param referenceERC20Decimals_ The number of decimals in the reference token - constructor( - CollateralConfig memory config, - uint192 revenueHiding, - uint8 referenceERC20Decimals_ - ) AppreciatingFiatCollateral(config, revenueHiding) { + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + { require(config.defaultThreshold == 0, "default threshold not supported"); - require(referenceERC20Decimals_ > 0, "referenceERC20Decimals missing"); - referenceERC20Decimals = referenceERC20Decimals_; + address referenceERC20 = ICToken(address(config.erc20)).underlying(); + referenceERC20Decimals = IERC20Metadata(referenceERC20).decimals(); + require(referenceERC20Decimals > 0, "referenceERC20Decimals missing"); comptroller = ICToken(address(config.erc20)).comptroller(); comp = IERC20(comptroller.getCompAddress()); } diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index 88bc41a169..31896bd799 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -186,7 +186,6 @@ async function main() { delayUntilDefault: '0', }, revenueHiding.toString(), - '18', ], 'contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol:CTokenSelfReferentialCollateral' ) diff --git a/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts b/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts index 97e401b69c..e2d5cd2038 100644 --- a/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts +++ b/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts @@ -11,7 +11,6 @@ task('deploy-ctoken-selfreferential-collateral', 'Deploys a CToken Self-referent .addParam('oracleTimeout', 'Max oracle timeout') .addParam('targetName', 'Target Name') .addParam('revenueHiding', 'Revenue Hiding') - .addParam('referenceERC20Decimals', 'Decimals in the reference token') .setAction(async (params, hre) => { const [deployer] = await hre.ethers.getSigners() @@ -34,8 +33,7 @@ task('deploy-ctoken-selfreferential-collateral', 'Deploys a CToken Self-referent defaultThreshold: 0, delayUntilDefault: 0, }, - params.revenueHiding, - params.referenceERC20Decimals + params.revenueHiding ) ) await collateral.deployed() diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 9c915e4de0..143d44d074 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -1593,8 +1593,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, defaultThreshold: bn('0'), delayUntilDefault, }, - REVENUE_HIDING, - await weth.decimals() + REVENUE_HIDING ) // CTokens - Collateral with no price info should revert @@ -1623,8 +1622,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, defaultThreshold: bn('0'), delayUntilDefault, }, - REVENUE_HIDING, - await weth.decimals() + REVENUE_HIDING ) await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn('1e10')) await zeroPriceCtokenSelfReferentialCollateral.refresh() diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 8ba38a3e62..5fe53f30ce 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -345,8 +345,7 @@ export async function collateralFixture( const makeCTokenSelfReferentialCollateral = async ( tokenAddress: string, chainlinkAddr: string, - targetName: string, - referenceERC20Decimals: number + targetName: string ): Promise<[IERC20Metadata, CTokenSelfReferentialCollateral]> => { const erc20: IERC20Metadata = ( await ethers.getContractAt('CTokenMock', tokenAddress) @@ -364,8 +363,7 @@ export async function collateralFixture( defaultThreshold: bn(0), delayUntilDefault, }, - REVENUE_HIDING, - referenceERC20Decimals + REVENUE_HIDING ) ) await coll.refresh() @@ -499,8 +497,7 @@ export async function collateralFixture( const cETH = await makeCTokenSelfReferentialCollateral( networkConfig[chainId].tokens.cETH as string, networkConfig[chainId].chainlinkFeeds.ETH as string, - 'ETH', - 18 + 'ETH' ) const eurt = await makeEURFiatCollateral( diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index da40513cf8..0937b8d81e 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -2029,8 +2029,7 @@ describe('Collateral contracts', () => { defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, - REVENUE_HIDING, - await selfRefToken.decimals() + REVENUE_HIDING ) ) await cTokenSelfReferentialCollateral.refresh() diff --git a/test/scenario/cETH.test.ts b/test/scenario/cETH.test.ts index 590623d245..302e89a3a1 100644 --- a/test/scenario/cETH.test.ts +++ b/test/scenario/cETH.test.ts @@ -137,8 +137,7 @@ describe(`CToken of self-referential collateral (eg cETH) - P${IMPLEMENTATION}`, defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, - REVENUE_HIDING, - await weth.decimals() + REVENUE_HIDING ) // Backup From a770d07e4f0ed53e006dc36bddba738fc4912b0f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:42:43 -0400 Subject: [PATCH 318/450] 16 --- contracts/p0/BackingManager.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index c2ae2375a6..6c02ab5481 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -43,10 +43,10 @@ contract BackingManagerP0 is TradingP0, IBackingManager { uint48 tradingDelay_, uint192 backingBuffer_, uint192 maxTradeSlippage_, - uint192 maxTradeVolume_ + uint192 minTradeVolume_ ) public initializer { __Component_init(main_); - __Trading_init(maxTradeSlippage_, maxTradeVolume_); + __Trading_init(maxTradeSlippage_, minTradeVolume_); setTradingDelay(tradingDelay_); setBackingBuffer(backingBuffer_); } From 331bac9d916f588d4783d7f5fa16f9f433573a0b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:44:38 -0400 Subject: [PATCH 319/450] 17 --- contracts/plugins/assets/aave/ATokenFiatCollateral.sol | 4 ++-- contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol | 4 ++-- .../assets/compoundv2/CTokenSelfReferentialCollateral.sol | 4 ++-- contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol | 4 ++-- contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol | 4 ++-- .../plugins/assets/stargate/StargatePoolFiatCollateral.sol | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index 2a40884470..e522320ffc 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -59,8 +59,8 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { /// Claim rewards earned by holding a balance of the ERC20 token /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - uint256 bal = stkAAVE.balanceOf(address(this)); + uint256 _bal = stkAAVE.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); - emit RewardsClaimed(stkAAVE, stkAAVE.balanceOf(address(this)) - bal); + emit RewardsClaimed(stkAAVE, stkAAVE.balanceOf(address(this)) - _bal); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index 057b10bc70..e9304cb9a5 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -72,12 +72,12 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { /// Claim rewards earned by holding a balance of the ERC20 token /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - uint256 bal = comp.balanceOf(address(this)); + uint256 _bal = comp.balanceOf(address(this)); address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); holders[0] = address(this); cTokens[0] = address(erc20); comptroller.claimComp(holders, cTokens, false, true); - emit RewardsClaimed(comp, comp.balanceOf(address(this)) - bal); + emit RewardsClaimed(comp, comp.balanceOf(address(this)) - _bal); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index 65e5004235..d8d18ae894 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -95,12 +95,12 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { /// Claim rewards earned by holding a balance of the ERC20 token /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - uint256 bal = comp.balanceOf(address(this)); + uint256 _bal = comp.balanceOf(address(this)); address[] memory holders = new address[](1); address[] memory cTokens = new address[](1); holders[0] = address(this); cTokens[0] = address(erc20); comptroller.claimComp(holders, cTokens, false, true); - emit RewardsClaimed(comp, comp.balanceOf(address(this)) - bal); + emit RewardsClaimed(comp, comp.balanceOf(address(this)) - _bal); } } diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index c4792f6b73..b39d59a51d 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -38,9 +38,9 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { /// @custom:delegate-call function claimRewards() external override(Asset, IRewardable) { - uint256 bal = comp.balanceOf(address(this)); + uint256 _bal = comp.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); - emit RewardsClaimed(comp, comp.balanceOf(address(this)) - bal); + emit RewardsClaimed(comp, comp.balanceOf(address(this)) - _bal); } function underlyingRefPerTok() public view virtual override returns (uint192) { diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 5b55214855..16cc77b99b 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -48,8 +48,8 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { /// Claim rewards earned by holding a balance of the ERC20 token /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - uint256 bal = morpho.balanceOf(address(this)); + uint256 _bal = morpho.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); - emit RewardsClaimed(morpho, morpho.balanceOf(address(this)) - bal); + emit RewardsClaimed(morpho, morpho.balanceOf(address(this)) - _bal); } } diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 7deb645d81..66c538ad62 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -42,8 +42,8 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { } function claimRewards() external override(Asset, IRewardable) { - uint256 bal = stg.balanceOf(address(this)); + uint256 _bal = stg.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); - emit RewardsClaimed(stg, stg.balanceOf(address(this)) - bal); + emit RewardsClaimed(stg, stg.balanceOf(address(this)) - _bal); } } From 5e6cefe5188e83b120ddb98e63c7e1accf266d1a Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Mon, 15 Apr 2024 22:15:41 +0530 Subject: [PATCH 320/450] small things --- contracts/interfaces/IStRSRVotes.sol | 2 +- contracts/p1/StRSRVotes.sol | 4 ++-- contracts/plugins/governance/Governance.sol | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/interfaces/IStRSRVotes.sol b/contracts/interfaces/IStRSRVotes.sol index 623134b100..128b86d75c 100644 --- a/contracts/interfaces/IStRSRVotes.sol +++ b/contracts/interfaces/IStRSRVotes.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol"; import "@openzeppelin/contracts-upgradeable/interfaces/IERC5805Upgradeable.sol"; -interface IStRSRVotes is IVotesUpgradeable { +interface IStRSRVotes is IVotesUpgradeable, IERC5805Upgradeable { /// @return The current era function currentEra() external view returns (uint256); diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 8deddb699c..9cd28ebb58 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -14,7 +14,7 @@ import "./StRSR.sol"; */ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { // A Checkpoint[] is a value history; it faithfully represents the history of value so long - // as that value is only ever set by _writeCheckpoint. For any *previous* block number N, the + // as that value is only ever set by _writeCheckpoint. For any *previous* timepoint N, the // recorded value at the end of block N was cp.val, where cp in the value history is the // Checkpoint value with fromBlock maximal such that fromBlock <= N. @@ -29,7 +29,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { bytes32 private constant _DELEGATE_TYPEHASH = keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)"); - // _delegates[account] is the address of the delegate that `accountt` has specified + // _delegates[account] is the address of the delegate that `account` has specified mapping(address => address) private _delegates; // era history diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index afacdb7f52..2d4052539e 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -164,7 +164,7 @@ contract Governance is return super._executor(); } - /// @return {qStRSR} The voting weight the account had at a previous block number + /// @return {qStRSR} The voting weight the account had at a previous timepoint function _getVotes( address account, uint256 timepoint, @@ -185,8 +185,8 @@ contract Governance is // === Private === function startedInSameEra(uint256 proposalId) private view returns (bool) { - uint256 startBlock = proposalSnapshot(proposalId); - uint256 pastEra = IStRSRVotes(address(token)).getPastEra(startBlock); + uint256 startTimepoint = proposalSnapshot(proposalId); + uint256 pastEra = IStRSRVotes(address(token)).getPastEra(startTimepoint); uint256 currentEra = IStRSRVotes(address(token)).currentEra(); return currentEra == pastEra; } From 34d50c24c24893b4aa7380cd53b50b3f86fa5e25 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:46:31 -0400 Subject: [PATCH 321/450] 19 --- contracts/plugins/assets/frax/SFraxCollateral.sol | 4 +++- .../frax/SFraxCollateralTestSuite.test.ts | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/frax/SFraxCollateral.sol b/contracts/plugins/assets/frax/SFraxCollateral.sol index 64e9a13297..a5d2e9237d 100644 --- a/contracts/plugins/assets/frax/SFraxCollateral.sol +++ b/contracts/plugins/assets/frax/SFraxCollateral.sol @@ -23,7 +23,9 @@ contract SFraxCollateral is AppreciatingFiatCollateral { /// @param config.chainlinkFeed {UoA/ref} price of DAI in USD terms constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) - {} + { + require(config.defaultThreshold > 0, "defaultThreshold zero"); + } function refresh() public virtual override { try IStakedFrax(address(erc20)).syncRewardsAndDistribution() {} catch {} diff --git a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts index 28d0f1bcd9..2ed9bc5e4d 100644 --- a/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts +++ b/test/plugins/individual-collateral/frax/SFraxCollateralTestSuite.test.ts @@ -194,7 +194,7 @@ const opts = { itClaimsRewards: it.skip, itChecksTargetPerRefDefault: it, itChecksTargetPerRefDefaultUp: it, - itChecksNonZeroDefaultThreshold: it.skip, + itChecksNonZeroDefaultThreshold: it, itChecksRefPerTokDefault: it, itChecksPriceChanges: it, itHasRevenueHiding: it.skip, From 642e3e471ef9ae0462b15412948eb53e23079fd5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:47:56 -0400 Subject: [PATCH 322/450] 20 --- contracts/plugins/assets/cbeth/CBETHCollateralL2.sol | 1 - contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol | 1 - 2 files changed, 2 deletions(-) diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index 1d30070013..d384766941 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -42,7 +42,6 @@ contract CBEthCollateralL2 is L2LSDCollateral { { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 8c9818e0e4..21ec14d585 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -31,7 +31,6 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { ) CTokenFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); From 870c222483b2085e7085dbaf05fab67aaad92366 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Mon, 15 Apr 2024 22:19:48 +0530 Subject: [PATCH 323/450] remove useless cast --- contracts/p1/StRSRVotes.sol | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 9cd28ebb58..f6a2f6419c 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -238,10 +238,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { ckpts.push( - Checkpoint({ - fromBlock: SafeCastUpgradeable.toUint48(clock()), - val: SafeCastUpgradeable.toUint224(newWeight) - }) + Checkpoint({ fromBlock: clock(), val: SafeCastUpgradeable.toUint224(newWeight) }) ); } } From 374d0f82771d3d7b616a3f7e20f758e5049e0786 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:50:07 -0400 Subject: [PATCH 324/450] 21 --- contracts/libraries/Allowance.sol | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/contracts/libraries/Allowance.sol b/contracts/libraries/Allowance.sol index c3e5f62e5d..0ab20aedc5 100644 --- a/contracts/libraries/Allowance.sol +++ b/contracts/libraries/Allowance.sol @@ -22,8 +22,10 @@ library AllowanceLib { IERC20ApproveOnly token = IERC20ApproveOnly(tokenAddress); // 1. Set initial allowance to 0 - token.approve(spender, 0); - require(token.allowance(address(this), spender) == 0, "allowance not 0"); + if (token.allowance(address(this), spender) != 0) { + token.approve(spender, 0); + require(token.allowance(address(this), spender) == 0, "allowance not 0"); + } if (value == 0) return; From 6f1fbefd095290633039c346ffe80289c982e3d2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 12:54:53 -0400 Subject: [PATCH 325/450] 25 --- contracts/p0/mixins/Component.sol | 2 +- contracts/p1/mixins/Component.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p0/mixins/Component.sol b/contracts/p0/mixins/Component.sol index 20240cf75a..fc82ee500d 100644 --- a/contracts/p0/mixins/Component.sol +++ b/contracts/p0/mixins/Component.sol @@ -23,7 +23,7 @@ abstract contract ComponentP0 is Versioned, Initializable, ContextUpgradeable, I main = main_; } - // === See docs/security.md === + // === See docs/pause-freeze-states.md === modifier notTradingPausedOrFrozen() { require(!main.tradingPausedOrFrozen(), "frozen or trading paused"); diff --git a/contracts/p1/mixins/Component.sol b/contracts/p1/mixins/Component.sol index 5b878ebcdb..53e5ea07ba 100644 --- a/contracts/p1/mixins/Component.sol +++ b/contracts/p1/mixins/Component.sol @@ -36,7 +36,7 @@ abstract contract ComponentP1 is main = main_; } - // === See docs/security.md === + // === See docs/pause-freeze-states.md === modifier notTradingPausedOrFrozen() { require(!main.tradingPausedOrFrozen(), "frozen or trading paused"); From 15c2b4d55fee7498d4d2feb2cf2da6d9fe08c1e9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 13:10:00 -0400 Subject: [PATCH 326/450] 28 --- common/configuration.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configuration.ts b/common/configuration.ts index 29a50100b3..9a09069271 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -492,7 +492,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { chainlinkFeeds: { DAI: '0x591e79239a7d679378ec8c847e5038150364c78f', // 0.3%, 24hr ETH: '0x71041dddad3595f9ced3dccfbe3d1f4b0a16bb70', // 0.15%, 20min - WBTC: '0xccadc697c55bbb68dc5bcdf8d3cbe83cdd4e071e', // 0.5%, 24hr + WBTC: '0xccadc697c55bbb68dc5bcdf8d3cbe83cdd4e071e', // 0.1%, 20min USDC: '0x7e860098f58bbfc8648a4311b374b1d669a2bc6b', // 0.3%, 24hr USDT: '0xf19d560eb8d2adf07bd6d13ed03e1d11215721f9', // 0.3%, 24hr COMP: '0x9dda783de64a9d1a60c49ca761ebe528c35ba428', // 0.5%, 24hr From aecd1dbc610dd38ee67844cc014d6316f0a3207c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 13:10:49 -0400 Subject: [PATCH 327/450] 29 --- contracts/plugins/assets/RTokenAsset.sol | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index a045e22fd7..266ed40ab8 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -22,8 +22,6 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { IBasketHandler public immutable basketHandler; IBackingManager public immutable backingManager; IFurnace public immutable furnace; - IERC20 public immutable rsr; - IStRSR public immutable stRSR; IERC20Metadata public immutable erc20; // The RToken @@ -44,8 +42,6 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { basketHandler = main.basketHandler(); backingManager = main.backingManager(); furnace = main.furnace(); - rsr = main.rsr(); - stRSR = main.stRSR(); erc20 = IERC20Metadata(address(erc20_)); erc20Decimals = erc20_.decimals(); From 39e8fc876ec87f113263f043f19d67e985b6b964 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 13:12:11 -0400 Subject: [PATCH 328/450] 30 --- .../plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 376b16470c..10b4d71113 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -31,6 +31,8 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { AggregatorV3Interface targetUnitChainlinkFeed_, uint48 targetUnitOracleTimeout_ ) MorphoFiatCollateral(config, revenueHiding) { + require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); + require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); From 3ab9646da14ef8798177502198d7f21433894216 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 13:17:41 -0400 Subject: [PATCH 329/450] 34 --- contracts/p1/BasketHandler.sol | 2 +- contracts/p1/Distributor.sol | 4 ++-- contracts/p1/mixins/Trading.sol | 4 ++-- .../plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol | 8 ++++---- .../plugins/assets/curve/CurveStableCollateral.sol | 2 +- .../assets/curve/cvx/vendor/ConvexStakingWrapper.sol | 10 +++++----- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 5a9a7f6f04..d3a01473e3 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -625,7 +625,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { /// Require that erc20s is a valid collateral array function requireValidCollArray(IERC20[] calldata erc20s) private view { - for (uint256 i = 0; i < erc20s.length; i++) { + for (uint256 i = 0; i < erc20s.length; ++i) { require( erc20s[i] != rsr && erc20s[i] != IERC20(address(rToken)) && diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index a788744013..72ee483ac5 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -131,12 +131,12 @@ contract DistributorP1 is ComponentP1, IDistributor { } transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); - numTransfers++; + ++numTransfers; } emit RevenueDistributed(erc20, caller, amount); // == Interactions == - for (uint256 i = 0; i < numTransfers; i++) { + for (uint256 i = 0; i < numTransfers; ++i) { Transfer memory t = transfers[i]; IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 5de4e64cd4..fc233bd032 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -136,8 +136,8 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl trade = broker.openTrade(kind, req, prices); trades[sell] = trade; - tradesOpen++; - tradesNonce++; + ++tradesOpen; + ++tradesNonce; emit TradeStarted(trade, sell, req.buy.erc20(), req.sellAmount, req.minBuyAmount); } diff --git a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol index 5189b4370e..d9f1cee356 100644 --- a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol +++ b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol @@ -101,7 +101,7 @@ contract StaticATokenV3LM is ///@inheritdoc IStaticATokenV3LM function refreshRewardTokens() public override { address[] memory rewards = INCENTIVES_CONTROLLER.getRewardsByAsset(address(_aToken)); - for (uint256 i = 0; i < rewards.length; i++) { + for (uint256 i = 0; i < rewards.length; ++i) { _registerRewardToken(rewards[i]); } } @@ -287,7 +287,7 @@ contract StaticATokenV3LM is function claimRewards() external { address[] memory rewardsList = INCENTIVES_CONTROLLER.getRewardsByAsset(address(_aToken)); - for (uint256 i = 0; i < rewardsList.length; i++) { + for (uint256 i = 0; i < rewardsList.length; ++i) { address currentReward = rewardsList[i]; uint256 prevBalance = IERC20(currentReward).balanceOf(msg.sender); @@ -572,7 +572,7 @@ contract StaticATokenV3LM is address to, uint256 ) internal override { - for (uint256 i = 0; i < _rewardTokens.length; i++) { + for (uint256 i = 0; i < _rewardTokens.length; ++i) { address rewardToken = address(_rewardTokens[i]); uint256 rewardsIndex = getCurrentRewardsIndex(rewardToken); if (from != address(0)) { @@ -669,7 +669,7 @@ contract StaticATokenV3LM is address receiver, address[] memory rewards ) internal { - for (uint256 i = 0; i < rewards.length; i++) { + for (uint256 i = 0; i < rewards.length; ++i) { if (address(rewards[i]) == address(0)) { continue; } diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index 3bc31ca9f0..a9a0759feb 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -183,7 +183,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // Override this later to implement non-stable pools function _anyDepeggedInPool() internal view virtual returns (bool) { // Check reference token oracles - for (uint8 i = 0; i < nTokens; i++) { + for (uint8 i = 0; i < nTokens; ++i) { try this.tokenPrice(i) returns (uint192 low, uint192 high) { // {UoA/tok} = {UoA/tok} + {UoA/tok} uint192 mid = (low + high) / 2; diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index cdd990a875..0fe2d5db37 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -175,7 +175,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { } uint256 extraCount = IRewardStaking(mainPool).extraRewardsLength(); - for (uint256 i = 0; i < extraCount; i++) { + for (uint256 i = 0; i < extraCount; ++i) { address extraPool = IRewardStaking(mainPool).extraRewards(i); address extraToken = IRewardStaking(extraPool).rewardToken(); //from pool 151, extra reward tokens are wrapped @@ -253,7 +253,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { } //update user integrals - for (uint256 u = 0; u < _accounts.length; u++) { + for (uint256 u = 0; u < _accounts.length; ++u) { //do not give rewards to address 0 if (_accounts[u] == address(0)) continue; if (_accounts[u] == collateralVault) continue; @@ -297,7 +297,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { IRewardStaking(convexPool).getReward(address(this), true); uint256 rewardCount = rewards.length; - for (uint256 i = 0; i < rewardCount; i++) { + for (uint256 i = 0; i < rewardCount; ++i) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, false); } emit UserCheckpoint(_accounts[0], _accounts[1]); @@ -311,7 +311,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { IRewardStaking(convexPool).getReward(address(this), true); uint256 rewardCount = rewards.length; - for (uint256 i = 0; i < rewardCount; i++) { + for (uint256 i = 0; i < rewardCount; ++i) { _calcRewardIntegral(i, _accounts, depositedBalance, supply, true); } emit UserCheckpoint(_accounts[0], _accounts[1]); @@ -337,7 +337,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { uint256 rewardCount = rewards.length; claimable = new EarnedData[](rewardCount); - for (uint256 i = 0; i < rewardCount; i++) { + for (uint256 i = 0; i < rewardCount; ++i) { RewardType storage reward = rewards[i]; if (reward.reward_token == address(0)) { continue; From 96f16b4a5783e525977f0b7d545c7c07e624c691 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 13:49:17 -0400 Subject: [PATCH 330/450] 35 --- contracts/facade/FacadeWrite.sol | 8 +-- contracts/facade/facets/ActFacet.sol | 4 +- contracts/facade/facets/ReadFacet.sol | 6 +-- contracts/libraries/Fixed.sol | 6 +-- contracts/libraries/Throttle.sol | 2 +- contracts/mixins/Auth.sol | 4 +- contracts/p0/BackingManager.sol | 8 +-- contracts/p0/Main.sol | 3 -- contracts/p0/RToken.sol | 6 +-- contracts/p1/AssetRegistry.sol | 4 +- contracts/p1/BackingManager.sol | 6 +-- contracts/p1/BasketHandler.sol | 4 +- contracts/p1/Broker.sol | 4 +- contracts/p1/Distributor.sol | 10 ++-- contracts/p1/Furnace.sol | 2 +- contracts/p1/RToken.sol | 18 +++---- contracts/p1/RevenueTrader.sol | 10 ++-- contracts/p1/StRSR.sol | 22 ++++---- contracts/p1/StRSRVotes.sol | 4 +- contracts/p1/mixins/BasketLib.sol | 10 ++-- .../p1/mixins/RecollateralizationLib.sol | 4 +- contracts/p1/mixins/TradeLib.sol | 18 +++---- contracts/p1/mixins/Trading.sol | 2 - .../assets/AppreciatingFiatCollateral.sol | 2 +- contracts/plugins/assets/Asset.sol | 10 ++-- .../plugins/assets/ERC4626FiatCollateral.sol | 4 +- .../plugins/assets/EURFiatCollateral.sol | 4 +- contracts/plugins/assets/FiatCollateral.sol | 8 +-- contracts/plugins/assets/L2LSDCollateral.sol | 4 +- .../plugins/assets/NonFiatCollateral.sol | 4 +- contracts/plugins/assets/RTokenAsset.sol | 2 +- .../assets/aave-v3/AaveV3FiatCollateral.sol | 2 +- .../aave-v3/vendor/StaticATokenV3LM.sol | 8 +-- .../assets/aave/ATokenFiatCollateral.sol | 2 +- .../plugins/assets/aave/StaticATokenLM.sol | 10 ++-- .../assets/ankr/AnkrStakedEthCollateral.sol | 2 +- .../plugins/assets/cbeth/CBETHCollateral.sol | 2 +- .../compoundv2/CTokenFiatCollateral.sol | 4 +- .../compoundv2/CTokenNonFiatCollateral.sol | 2 +- .../CTokenSelfReferentialCollateral.sol | 2 +- .../assets/compoundv3/CTokenV3Collateral.sol | 4 +- .../assets/compoundv3/CusdcV3Wrapper.sol | 2 +- .../CurveAppreciatingRTokenFiatCollateral.sol | 2 +- .../assets/curve/CurveRecursiveCollateral.sol | 2 +- .../assets/curve/CurveStableCollateral.sol | 6 +-- .../curve/CurveStableMetapoolCollateral.sol | 2 +- .../CurveStableRTokenMetapoolCollateral.sol | 2 +- contracts/plugins/assets/curve/PoolTokens.sol | 50 +++++++++++-------- .../plugins/assets/curve/{cvx => }/README.md | 0 .../curve/cvx/vendor/ConvexStakingWrapper.sol | 12 ++--- .../plugins/assets/dsr/SDaiCollateral.sol | 2 +- .../assets/erc20/RewardableERC20Wrapper.sol | 4 +- .../assets/frax-eth/SFraxEthCollateral.sol | 2 +- .../plugins/assets/frax/SFraxCollateral.sol | 2 +- .../assets/lido/L2LidoStakedEthCollateral.sol | 1 - .../meta-morpho/MetaMorphoFiatCollateral.sol | 2 +- .../morpho-aave/MorphoFiatCollateral.sol | 2 +- .../morpho-aave/MorphoNonFiatCollateral.sol | 2 +- .../assets/rocket-eth/RethCollateral.sol | 2 +- .../stargate/StargatePoolFiatCollateral.sol | 2 +- .../stargate/StargateRewardableWrapper.sol | 3 +- contracts/plugins/mocks/ATokenMock.sol | 4 +- .../plugins/mocks/AaveLendingPoolMock.sol | 2 +- .../plugins/mocks/BadCollateralPlugin.sol | 2 +- .../mocks/InvalidRefPerTokCollateral.sol | 2 +- contracts/plugins/trading/DutchTrade.sol | 8 +-- contracts/plugins/trading/GnosisTrade.sol | 4 +- 67 files changed, 179 insertions(+), 186 deletions(-) rename contracts/plugins/assets/curve/{cvx => }/README.md (100%) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index 2f4307ae1a..c929034e41 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -26,20 +26,20 @@ contract FacadeWrite is IFacadeWrite { returns (address) { // Perform validations - require(setup.primaryBasket.length > 0, "no collateral"); + require(setup.primaryBasket.length != 0, "no collateral"); require(setup.primaryBasket.length == setup.weights.length, "invalid length"); // Validate backups for (uint256 i = 0; i < setup.backups.length; ++i) { - require(setup.backups[i].backupCollateral.length > 0, "no backup collateral"); + require(setup.backups[i].backupCollateral.length != 0, "no backup collateral"); } // Validate beneficiaries for (uint256 i = 0; i < setup.beneficiaries.length; ++i) { require( setup.beneficiaries[i].beneficiary != address(0) && - (setup.beneficiaries[i].revShare.rTokenDist > 0 || - setup.beneficiaries[i].revShare.rsrDist > 0), + (setup.beneficiaries[i].revShare.rTokenDist != 0 || + setup.beneficiaries[i].revShare.rsrDist != 0), "beneficiary revShare mismatch" ); } diff --git a/contracts/facade/facets/ActFacet.sol b/contracts/facade/facets/ActFacet.sol index bbcf1cfec9..87c4a1f7fb 100644 --- a/contracts/facade/facets/ActFacet.sol +++ b/contracts/facade/facets/ActFacet.sol @@ -51,7 +51,7 @@ contract ActFacet is IActFacet, Multicall { // if 2.1.0, distribute tokenToBuy bytes1 majorVersion = bytes(revenueTrader.version())[0]; - if (toSettle.length > 0 && (majorVersion == bytes1("2") || majorVersion == bytes1("1"))) { + if (toSettle.length != 0 && (majorVersion == bytes1("2") || majorVersion == bytes1("1"))) { address(revenueTrader).functionCall( abi.encodeWithSignature("manageToken(address)", revenueTrader.tokenToBuy()) ); @@ -172,7 +172,7 @@ contract ActFacet is IActFacet, Multicall { IERC20[] memory erc20s = bm.main().assetRegistry().erc20s(); // Settle any settle-able open trades - if (bm.tradesOpen() > 0) { + if (bm.tradesOpen() != 0) { for (uint256 i = 0; i < erc20s.length; ++i) { ITrade trade = bm.trades(erc20s[i]); if (address(trade) != address(0) && trade.canSettle()) { diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index 9a2501203e..9d16432732 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -53,7 +53,7 @@ contract ReadFacet is MaxIssuableFacet { reg.refresh(); // Compute # of baskets to create `amount` qRTok - uint192 baskets = (rTok.totalSupply() > 0) // {BU} + uint192 baskets = (rTok.totalSupply() != 0) // {BU} ? rTok.basketsNeeded().muluDivu(amount, rTok.totalSupply()) // {BU * qRTok / qRTok} : _safeWrap(amount); // take advantage of RToken having 18 decimals @@ -265,7 +265,7 @@ contract ReadFacet is MaxIssuableFacet { (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); uint192 diff = drafts; - if (i + left > 0) { + if (i + left != 0) { (uint192 prevDrafts, ) = stRSR.draftQueues(draftEra, account, i + left - 1); diff = drafts - prevDrafts; } @@ -367,7 +367,7 @@ contract ReadFacet is MaxIssuableFacet { ); (uint192 lowPrice, uint192 highPrice) = rsrAsset.price(); - if (lowPrice > 0 && highPrice < FIX_MAX) { + if (lowPrice != 0 && highPrice != FIX_MAX) { // {UoA} = {tok} * {UoA/tok} uint192 rsrUoA = rsrBal.mul((lowPrice + highPrice) / 2); diff --git a/contracts/libraries/Fixed.sol b/contracts/libraries/Fixed.sol index c69aef1bdc..0457fe9aee 100644 --- a/contracts/libraries/Fixed.sol +++ b/contracts/libraries/Fixed.sol @@ -166,7 +166,7 @@ function _divrnd( result++; } } else { - if (numerator % divisor > 0) { + if (numerator % divisor != 0) { result++; } } @@ -595,7 +595,7 @@ library FixLib { // Apply rounding if (rounding == CEIL) { - if (mm > 0) result_256 += 1; + if (mm != 0) result_256 += 1; } else if (rounding == ROUND) { if (mm > ((c_256 - 1) / 2)) result_256 += 1; } @@ -658,7 +658,7 @@ function mulDiv256( uint256 mm = mulmod(x, y, z); if (rounding == CEIL) { - if (mm > 0) result += 1; + if (mm != 0) result += 1; } else { if (mm > ((z - 1) / 2)) result += 1; // z should be z-1 } diff --git a/contracts/libraries/Throttle.sol b/contracts/libraries/Throttle.sol index 7314325aa8..286fd00479 100644 --- a/contracts/libraries/Throttle.sol +++ b/contracts/libraries/Throttle.sol @@ -39,7 +39,7 @@ library ThrottleLib { uint256 supply, int256 amount ) internal { - // untestable: amtRate will always be greater > 0 due to previous validations + // untestable: amtRate will always be greater != 0 due to previous validations if (throttle.params.amtRate == 0 && throttle.params.pctRate == 0) return; // Calculate hourly limit diff --git a/contracts/mixins/Auth.sol b/contracts/mixins/Auth.sol index 1e3b459adb..9dad3cb7fc 100644 --- a/contracts/mixins/Auth.sol +++ b/contracts/mixins/Auth.sol @@ -196,14 +196,14 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { /// @custom:governance function setShortFreeze(uint48 shortFreeze_) public onlyRole(OWNER) { - require(shortFreeze_ > 0 && shortFreeze_ <= MAX_SHORT_FREEZE, "short freeze out of range"); + require(shortFreeze_ != 0 && shortFreeze_ <= MAX_SHORT_FREEZE, "short freeze out of range"); emit ShortFreezeDurationSet(shortFreeze, shortFreeze_); shortFreeze = shortFreeze_; } /// @custom:governance function setLongFreeze(uint48 longFreeze_) public onlyRole(OWNER) { - require(longFreeze_ > 0 && longFreeze_ <= MAX_LONG_FREEZE, "long freeze out of range"); + require(longFreeze_ != 0 && longFreeze_ <= MAX_LONG_FREEZE, "long freeze out of range"); emit LongFreezeDurationSet(longFreeze, longFreeze_); longFreeze = longFreeze_; } diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 6c02ab5481..cd0c6f3926 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -60,7 +60,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { erc20.safeApprove(address(main.rToken()), type(uint256).max); } - /// Settle a single trade. If DUTCH_AUCTION, try rebalance() + /// Settle a single trade. If the caller is the trade, try rebalance() /// @param sell The sell token in the trade /// @return trade The ITrade contract settled /// @custom:interaction @@ -246,10 +246,10 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // === Private === /// Compromise on how many baskets are needed in order to recollateralize-by-accounting - /// @param wholeBasketsHeld {BU} The number of full basket units held by the BackingManager - function compromiseBasketsNeeded(uint192 wholeBasketsHeld) private { + /// @param basketsHeldBottom {BU} The number of full basket units held by the BackingManager + function compromiseBasketsNeeded(uint192 basketsHeldBottom) private { assert(tradesOpen == 0 && !main.basketHandler().fullyCollateralized()); - main.rToken().setBasketsNeeded(wholeBasketsHeld); + main.rToken().setBasketsNeeded(basketsHeldBottom); assert(main.basketHandler().fullyCollateralized()); } diff --git a/contracts/p0/Main.sol b/contracts/p0/Main.sol index 1859ad8ecb..95dd973b56 100644 --- a/contracts/p0/Main.sol +++ b/contracts/p0/Main.sol @@ -3,7 +3,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../libraries/Fixed.sol"; import "../interfaces/IMain.sol"; import "../mixins/ComponentRegistry.sol"; import "../mixins/Auth.sol"; @@ -15,8 +14,6 @@ import "../mixins/Versioned.sol"; */ // solhint-disable max-states-count contract MainP0 is Versioned, Initializable, Auth, ComponentRegistry, IMain { - using FixLib for uint192; - IERC20 public rsr; /// Initializer diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol index 004891594d..b7710269b9 100644 --- a/contracts/p0/RToken.sol +++ b/contracts/p0/RToken.sol @@ -4,9 +4,7 @@ pragma solidity 0.8.19; // solhint-disable-next-line max-line-length import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@openzeppelin/contracts/utils/math/Math.sol"; import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; -import "@openzeppelin/contracts/access/Ownable.sol"; import "../interfaces/IMain.sol"; import "../interfaces/IBasketHandler.sol"; import "../interfaces/IRToken.sol"; @@ -34,9 +32,6 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// Weakly immutable: expected to be an IPFS link but could be the mandate itself string public mandate; - // List of accounts. If issuances[user].length > 0 then (user is in accounts) - EnumerableSet.AddressSet internal accounts; - uint192 public basketsNeeded; // {BU} // === Supply throttles === @@ -272,6 +267,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// Melt a quantity of RToken from the caller's account, increasing the basket rate /// @param amount {qRTok} The amount to be melted + /// @custom:protected function melt(uint256 amount) external exchangeRateIsValidAfter { require(msg.sender == address(main.furnace()), "furnace only"); _burn(msg.sender, amount); diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 1379d8d00d..7854d27f5b 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -91,7 +91,7 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { require(_erc20s.contains(address(asset.erc20())), "no ERC20 collision"); try basketHandler.quantity{ gas: _reserveGas() }(asset.erc20()) returns (uint192 quantity) { - if (quantity > 0) basketHandler.disableBasket(); // not an interaction + if (quantity != 0) basketHandler.disableBasket(); // not an interaction } catch { basketHandler.disableBasket(); } @@ -110,7 +110,7 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { require(assets[asset.erc20()] == asset, "asset not found"); try basketHandler.quantity{ gas: _reserveGas() }(asset.erc20()) returns (uint192 quantity) { - if (quantity > 0) basketHandler.disableBasket(); // not an interaction + if (quantity != 0) basketHandler.disableBasket(); // not an interaction } catch { basketHandler.disableBasket(); } diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index b2f50a1ed7..82668a0c11 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -219,7 +219,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // Forward any RSR held to StRSR pool and payout rewards // RSR should never be sold for RToken yield - if (rsr.balanceOf(address(this)) > 0) { + if (rsr.balanceOf(address(this)) != 0) { // For CEI, this is an interaction "within our system" even though RSR is already live IERC20(address(rsr)).safeTransfer(address(stRSR), rsr.balanceOf(address(this))); stRSR.payoutRewards(); @@ -258,10 +258,10 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // no div-by-0: Distributor guarantees (totals.rTokenTotal + totals.rsrTotal) > 0 // initial division is intentional here! We'd rather save the dust than be unfair - if (totals.rsrTotal > 0) { + if (totals.rsrTotal != 0) { erc20s[i].safeTransfer(address(rsrTrader), tokensPerShare * totals.rsrTotal); } - if (totals.rTokenTotal > 0) { + if (totals.rTokenTotal != 0) { erc20s[i].safeTransfer( address(rTokenTrader), tokensPerShare * totals.rTokenTotal diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index d3a01473e3..e1b6aaa5bb 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -220,7 +220,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { bool normalize ) internal { requireGovernanceOnly(); - require(erc20s.length > 0, "empty basket"); + require(erc20s.length != 0, "empty basket"); require(erc20s.length == targetAmts.length, "len mismatch"); requireValidCollArray(erc20s); @@ -240,7 +240,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Normalize targetAmts based on UoA value of reference basket (uint192 low, uint192 high) = _price(false); - assert(low > 0 && high < FIX_MAX); // implied by SOUND status + assert(low != 0 && high != FIX_MAX); // implied by SOUND status targetAmts = BasketLibP1.normalizeByPrice( assetRegistry, erc20s, diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 83b5ca0323..2f6f0bb0c4 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -232,7 +232,7 @@ contract BrokerP1 is ComponentP1, IBroker { function newBatchAuction(TradeRequest memory req, address caller) private returns (ITrade) { require(!batchTradeDisabled, "batch auctions disabled"); - require(batchAuctionLength > 0, "batch auctions not enabled"); + require(batchAuctionLength != 0, "batch auctions not enabled"); GnosisTrade trade = GnosisTrade(address(batchTradeImplementation).clone()); trades[address(trade)] = true; @@ -264,7 +264,7 @@ contract BrokerP1 is ComponentP1, IBroker { !dutchTradeDisabled[req.sell.erc20()] && !dutchTradeDisabled[req.buy.erc20()], "dutch auctions disabled for token pair" ); - require(dutchAuctionLength > 0, "dutch auctions not enabled"); + require(dutchAuctionLength != 0, "dutch auctions not enabled"); require( priceNotDecayed(req.sell) && priceNotDecayed(req.buy), "dutch auctions require live prices" diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 72ee483ac5..51f2664aec 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -98,8 +98,8 @@ contract DistributorP1 is ComponentP1, IDistributor { { RevenueTotals memory revTotals = totals(); uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; - if (totalShares > 0) tokensPerShare = amount / totalShares; - require(tokensPerShare > 0, "nothing to distribute"); + if (totalShares != 0) tokensPerShare = amount / totalShares; + require(tokensPerShare != 0, "nothing to distribute"); } // Evenly distribute revenue tokens per distribution share. @@ -124,10 +124,10 @@ contract DistributorP1 is ComponentP1, IDistributor { if (addrTo == FURNACE) { addrTo = furnaceAddr; - if (transferAmt > 0) accountRewards = true; + if (transferAmt != 0) accountRewards = true; } else if (addrTo == ST_RSR) { addrTo = stRSRAddr; - if (transferAmt > 0) accountRewards = true; + if (transferAmt != 0) accountRewards = true; } transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); @@ -198,7 +198,7 @@ contract DistributorP1 is ComponentP1, IDistributor { /// Ensures distribution values are non-zero // checks: at least one of its arguments is nonzero function _ensureNonZeroDistribution(uint24 rTokenDist, uint24 rsrDist) internal pure { - require(rTokenDist > 0 || rsrDist > 0, "no distribution defined"); + require(rTokenDist != 0 || rsrDist != 0, "no distribution defined"); } /// Call after upgrade to >= 3.0.0 diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 63dcc695d4..5ad50c85c7 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -84,7 +84,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { lastPayout += numPeriods * PERIOD; lastPayoutBal = rToken.balanceOf(address(this)) - amount; - if (amount > 0) rToken.melt(amount); + if (amount != 0) rToken.melt(amount); } /// Ratio setting diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 82f56d347d..122a7a292b 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -66,9 +66,9 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { ThrottleLib.Params calldata issuanceThrottleParams_, ThrottleLib.Params calldata redemptionThrottleParams_ ) external initializer { - require(bytes(name_).length > 0, "name empty"); - require(bytes(symbol_).length > 0, "symbol empty"); - require(bytes(mandate_).length > 0, "mandate empty"); + require(bytes(name_).length != 0, "name empty"); + require(bytes(symbol_).length != 0, "symbol empty"); + require(bytes(mandate_).length != 0, "mandate empty"); __Component_init(main_); __ERC20_init(name_, symbol_); __ERC20Permit_init(name_); @@ -103,7 +103,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { /// @custom:interaction RCEI // BU exchange rate cannot decrease, and it can only increase when < FIX_ONE. function issueTo(address recipient, uint256 amount) public notIssuancePausedOrFrozen { - require(amount > 0, "Cannot issue zero"); + require(amount != 0, "Cannot issue zero"); // == Refresh == @@ -130,7 +130,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // amtBaskets: the BU change to be recorded by this issuance // D18{BU} = D18{BU} * {qRTok} / {qRTok} // revert-on-overflow provided by FixLib functions - uint192 amtBaskets = supply > 0 + uint192 amtBaskets = supply != 0 ? basketsNeeded.muluDivu(amount, supply, CEIL) : _safeWrap(amount); emit Issuance(issuer, recipient, amount, amtBaskets); @@ -184,7 +184,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks and Effects == - require(amount > 0, "Cannot redeem zero"); + require(amount != 0, "Cannot redeem zero"); require(amount <= balanceOf(msg.sender), "insufficient balance"); require(basketHandler.fullyCollateralized(), "partial redemption; use redeemCustom"); // redemption while IFFY/DISABLED allowed @@ -255,7 +255,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks and Effects == - require(amount > 0, "Cannot redeem zero"); + require(amount != 0, "Cannot redeem zero"); require(amount <= balanceOf(msg.sender), "insufficient balance"); uint256 portionsSum; for (uint256 i = 0; i < portions.length; ++i) { @@ -391,7 +391,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == P0 exchangeRateIsValidAfter modifier == uint256 supply = totalSupply(); - require(supply > 0, "0 supply"); + require(supply != 0, "0 supply"); // Note: These are D18s, even though they are uint256s. This is because // we cannot assume we stay inside our valid range here, as that is what @@ -476,7 +476,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { uint256 totalSupply ) private { // take advantage of 18 decimals during casting - uint256 amtRToken = totalSupply > 0 + uint256 amtRToken = totalSupply != 0 ? amtBaskets.muluDivu(totalSupply, basketsNeeded) // {rTok} = {BU} * {qRTok} * {qRTok} : amtBaskets; // {rTok} emit BasketsNeededChanged(basketsNeeded, basketsNeeded + amtBaskets); diff --git a/contracts/p1/RevenueTrader.sol b/contracts/p1/RevenueTrader.sol index 998bdc951f..025a761b60 100644 --- a/contracts/p1/RevenueTrader.sol +++ b/contracts/p1/RevenueTrader.sol @@ -110,12 +110,12 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { notTradingPausedOrFrozen { uint256 len = erc20s.length; - require(len > 0, "empty erc20s list"); + require(len != 0, "empty erc20s list"); require(len == kinds.length, "length mismatch"); RevenueTotals memory revTotals = distributor.totals(); require( - (tokenToBuy == rsr && revTotals.rsrTotal > 0) || - (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal > 0), + (tokenToBuy == rsr && revTotals.rsrTotal != 0) || + (address(tokenToBuy) == address(rToken) && revTotals.rTokenTotal != 0), "zero distribution" ); @@ -145,7 +145,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { // Cache and validate buyHigh (uint192 buyLow, uint192 buyHigh) = assetToBuy.price(); // {UoA/tok} - require(buyHigh > 0 && buyHigh < FIX_MAX, "buy asset price unknown"); + require(buyHigh != 0 && buyHigh != FIX_MAX, "buy asset price unknown"); // For each ERC20 that isn't the tokenToBuy, start an auction of the given kind for (uint256 i = 0; i < len; ++i) { @@ -153,7 +153,7 @@ contract RevenueTraderP1 is TradingP1, IRevenueTrader { if (erc20 == tokenToBuy) continue; require(address(trades[erc20]) == address(0), "trade open"); - require(erc20.balanceOf(address(this)) > 0, "0 balance"); + require(erc20.balanceOf(address(this)) != 0, "0 balance"); IAsset assetToSell = assetRegistry.toAsset(erc20); (uint192 sellLow, uint192 sellHigh) = assetToSell.price(); // {UoA/tok} diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 07e4665869..d1b972e1f0 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -189,8 +189,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint192 rewardRatio_, uint192 withdrawalLeak_ ) external initializer { - require(bytes(name_).length > 0, "name empty"); - require(bytes(symbol_).length > 0, "symbol empty"); + require(bytes(name_).length != 0, "name empty"); + require(bytes(symbol_).length != 0, "symbol empty"); __Component_init(main_); __EIP712_init(name_, VERSION); name = name_; @@ -234,7 +234,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // actions: // rsr.transferFrom(account, this, rsrAmount) function stake(uint256 rsrAmount) public { - require(rsrAmount > 0, "Cannot stake zero"); + require(rsrAmount != 0, "Cannot stake zero"); _payoutRewards(); @@ -268,7 +268,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab requireNotTradingPausedOrFrozen(); address account = msg.sender; - require(stakeAmount > 0, "Cannot withdraw zero"); + require(stakeAmount != 0, "Cannot withdraw zero"); require(stakes[era][account] >= stakeAmount, "Not enough balance"); _payoutRewards(); @@ -322,7 +322,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // untestable: // firstId will never be zero, due to previous checks against endId - uint192 oldDrafts = firstId > 0 ? queue[firstId - 1].drafts : 0; + uint192 oldDrafts = firstId != 0 ? queue[firstId - 1].drafts : 0; uint192 draftAmount = queue[endId - 1].drafts - oldDrafts; // advance queue past withdrawal @@ -371,7 +371,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // untestable: // firstId will never be zero, due to previous checks against endId - uint192 oldDrafts = firstId > 0 ? queue[firstId - 1].drafts : 0; + uint192 oldDrafts = firstId != 0 ? queue[firstId - 1].drafts : 0; uint192 draftAmount = queue[endId - 1].drafts - oldDrafts; // advance queue past withdrawal @@ -435,7 +435,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab requireNotTradingPausedOrFrozen(); require(msg.sender == address(backingManager), "!bm"); - require(rsrAmount > 0, "Amount cannot be zero"); + require(rsrAmount != 0, "Amount cannot be zero"); uint256 rsrBalance = rsr.balanceOf(address(this)); require(rsrAmount <= rsrBalance, "seize exceeds balance"); @@ -452,7 +452,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab seizedRSR = stakeRSRToTake; // update stakeRate, possibly beginning a new stake era - if (stakeRSR > 0) { + if (stakeRSR != 0) { // Downcast is safe: totalStakes is 1e38 at most so expression maximum value is 1e56 stakeRate = uint192((FIX_ONE_256 * totalStakes + (stakeRSR - 1)) / stakeRSR); } @@ -467,7 +467,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab seizedRSR += draftRSRToTake; // update draftRate, possibly beginning a new draft era - if (draftRSR > 0) { + if (draftRSR != 0) { // Downcast is safe: totalDrafts is 1e38 at most so expression maximum value is 1e56 draftRate = uint192((FIX_ONE_256 * totalDrafts + (draftRSR - 1)) / draftRSR); } @@ -662,8 +662,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab CumulativeDraft[] storage queue = draftQueues[draftEra][account]; index = queue.length; - uint192 oldDrafts = index > 0 ? queue[index - 1].drafts : 0; - uint64 lastAvailableAt = index > 0 ? queue[index - 1].availableAt : 0; + uint192 oldDrafts = index != 0 ? queue[index - 1].drafts : 0; + uint64 lastAvailableAt = index != 0 ? queue[index - 1].availableAt : 0; availableAt = uint64(block.timestamp) + unstakingDelay; if (lastAvailableAt > availableAt) { availableAt = lastAvailableAt; diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 63a669be90..ee3c7cefc1 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -184,7 +184,7 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { address dst, uint256 amount ) private { - if (src != dst && amount > 0) { + if (src != dst && amount != 0) { if (src != address(0)) { (uint256 oldWeight, uint256 newWeight) = _writeCheckpoint( _checkpoints[era][src], @@ -215,7 +215,7 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; newWeight = op(oldWeight, delta); - if (pos > 0 && ckpts[pos - 1].fromBlock == NetworkConfigLib.blockNumber()) { + if (pos != 0 && ckpts[pos - 1].fromBlock == NetworkConfigLib.blockNumber()) { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { ckpts.push( diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index 80244c0567..e8e96ad4ac 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -168,7 +168,7 @@ library BasketLibP1 { IAssetRegistry assetRegistry ) external returns (bool) { // targetNames := {} - while (targetNames.length() > 0) { + while (targetNames.length() != 0) { targetNames.remove(targetNames.at(targetNames.length() - 1)); } @@ -279,7 +279,7 @@ library BasketLibP1 { // Now we've looped through all values of tgt, so for all e, // targetWeight(newBasket, e) = primeWt(e) + backupWt(e) - return newBasket.erc20s.length > 0; + return newBasket.erc20s.length != 0; } // === Private === @@ -302,8 +302,8 @@ library BasketLibP1 { return targetName == coll.targetName() && coll.status() == CollateralStatus.SOUND && - coll.refPerTok() > 0 && - coll.targetPerRef() > 0; + coll.refPerTok() != 0 && + coll.targetPerRef() != 0; } catch { return false; } @@ -364,7 +364,7 @@ library BasketLibP1 { require(coll.status() == CollateralStatus.SOUND, "unsound new collateral"); (uint192 low, uint192 high) = coll.price(); // {UoA/tok} - require(low > 0 && high < FIX_MAX, "invalid price"); + require(low != 0 && high != FIX_MAX, "invalid price"); // {UoA/BU} += {target/BU} * {UoA/tok} / ({target/ref} * {ref/tok}) newPrice += targetAmts[i].mulDiv( diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index 3b83589e9d..a152a5ccbb 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -114,7 +114,7 @@ library RecollateralizationLibP1 { // tradesOpen can be > 0 when called by RTokenAsset.basketRange() (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} - require(buPriceLow > 0 && buPriceHigh < FIX_MAX, "BUs unpriced"); + require(buPriceLow != 0 && buPriceHigh != FIX_MAX, "BUs unpriced"); uint192 basketsNeeded = ctx.rToken.basketsNeeded(); // {BU} @@ -357,7 +357,7 @@ library RecollateralizationLibP1 { // if rsr does not have a registered asset the below array accesses will revert if ( - high > 0 && + high != 0 && TradeLib.isEnoughToSell( reg.assets[rsrIndex], ctx.bals[rsrIndex], diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index 89fa344945..f02c14f5d0 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -46,9 +46,9 @@ library TradeLib { ) internal view returns (bool notDust, TradeRequest memory req) { // checked for in RevenueTrader / CollateralizatlionLib assert( - trade.prices.buyHigh > 0 && - trade.prices.buyHigh < FIX_MAX && - trade.prices.sellLow < FIX_MAX + trade.prices.buyHigh != 0 && + trade.prices.buyHigh != FIX_MAX && + trade.prices.sellLow != FIX_MAX ); notDust = isEnoughToSell( @@ -112,10 +112,10 @@ library TradeLib { uint192 maxTradeSlippage ) internal view returns (bool notDust, TradeRequest memory req) { assert( - trade.prices.sellLow > 0 && - trade.prices.sellLow < FIX_MAX && - trade.prices.buyHigh > 0 && - trade.prices.buyHigh < FIX_MAX + trade.prices.sellLow != 0 && + trade.prices.sellLow != FIX_MAX && + trade.prices.buyHigh != 0 && + trade.prices.buyHigh != FIX_MAX ); // Don't buy dust. @@ -165,7 +165,7 @@ library TradeLib { function minTradeSize(uint192 minTradeVolume, uint192 price) private pure returns (uint192) { // {tok} = {UoA} / {UoA/tok} uint192 size = price == 0 ? FIX_MAX : minTradeVolume.div(price, CEIL); - return size > 0 ? size : 1; + return size != 0 ? size : 1; } /// Calculates the maximum trade size for a trade pair of tokens @@ -177,6 +177,6 @@ library TradeLib { ) private view returns (uint192) { // D18{tok} = D18{UoA} / D18{UoA/tok} uint192 size = fixMin(sell.maxTradeVolume(), buy.maxTradeVolume()).safeDiv(price, FLOOR); - return size > 0 ? size : 1; + return size != 0 ? size : 1; } } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index fc233bd032..bb8ea8202c 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; -import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/utils/Multicall.sol"; import "../../interfaces/ITrade.sol"; @@ -19,7 +18,6 @@ import "./RewardableLib.sol"; /// It should be fine to leave the non-upgradeable Multicall here permanently. abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeable, ITrading { using FixLib for uint192; - using SafeERC20Upgradeable for IERC20Upgradeable; uint192 public constant MAX_TRADE_VOLUME = 1e29; // {UoA} uint192 public constant MAX_TRADE_SLIPPAGE = 1e18; // {%} diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index c97069aad7..85822345ae 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -100,7 +100,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 86a9a83b98..2a59ebb594 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -50,12 +50,12 @@ contract Asset is IAsset, VersionedAsset { uint192 maxTradeVolume_, uint48 oracleTimeout_ ) { - require(priceTimeout_ > 0, "price timeout zero"); + require(priceTimeout_ != 0, "price timeout zero"); require(address(chainlinkFeed_) != address(0), "missing chainlink feed"); - require(oracleError_ > 0 && oracleError_ < FIX_ONE, "oracle error out of range"); + require(oracleError_ != 0 && oracleError_ < FIX_ONE, "oracle error out of range"); require(address(erc20_) != address(0), "missing erc20"); - require(maxTradeVolume_ > 0, "invalid max trade volume"); - require(oracleTimeout_ > 0, "oracleTimeout zero"); + require(maxTradeVolume_ != 0, "invalid max trade volume"); + require(oracleTimeout_ != 0, "oracleTimeout zero"); priceTimeout = priceTimeout_; chainlinkFeed = chainlinkFeed_; oracleError = oracleError_; @@ -96,7 +96,7 @@ contract Asset is IAsset, VersionedAsset { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/ERC4626FiatCollateral.sol b/contracts/plugins/assets/ERC4626FiatCollateral.sol index 2930f17778..c1a527e527 100644 --- a/contracts/plugins/assets/ERC4626FiatCollateral.sol +++ b/contracts/plugins/assets/ERC4626FiatCollateral.sol @@ -27,8 +27,8 @@ contract ERC4626FiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); - if (config.defaultThreshold > 0) { - require(config.delayUntilDefault > 0, "delayUntilDefault zero"); + if (config.defaultThreshold != 0) { + require(config.delayUntilDefault != 0, "delayUntilDefault zero"); } IERC4626 vault = IERC4626(address(config.erc20)); oneShare = 10**vault.decimals(); diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index d22e3152a0..f195d75527 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -27,8 +27,8 @@ contract EURFiatCollateral is FiatCollateral { uint48 targetUnitOracleTimeout_ ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); - require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(targetUnitOracleTimeout_ != 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index d3afad43c5..136021febf 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -70,14 +70,14 @@ contract FiatCollateral is ICollateral, Asset { ) { require(config.targetName != bytes32(0), "targetName missing"); - if (config.defaultThreshold > 0) { - require(config.delayUntilDefault > 0, "delayUntilDefault zero"); + if (config.defaultThreshold != 0) { + require(config.delayUntilDefault != 0, "delayUntilDefault zero"); } require(config.delayUntilDefault <= 1209600, "delayUntilDefault too long"); // Note: This contract is designed to allow setting defaultThreshold = 0 to disable // default checks. You can apply the check below to child contracts when required - // require(config.defaultThreshold > 0, "defaultThreshold zero"); + // require(config.defaultThreshold != 0, "defaultThreshold zero"); targetName = config.targetName; delayUntilDefault = config.delayUntilDefault; @@ -132,7 +132,7 @@ contract FiatCollateral is ICollateral, Asset { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index f61b4abb72..81047c456d 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -31,7 +31,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_exchangeRateChainlinkFeed) != address(0), "missing exchangeRate feed"); require(_exchangeRateChainlinkTimeout != 0, "exchangeRateChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); exchangeRateChainlinkFeed = _exchangeRateChainlinkFeed; exchangeRateChainlinkTimeout = _exchangeRateChainlinkTimeout; @@ -67,7 +67,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/NonFiatCollateral.sol b/contracts/plugins/assets/NonFiatCollateral.sol index 956fb5337e..b43750ab5a 100644 --- a/contracts/plugins/assets/NonFiatCollateral.sol +++ b/contracts/plugins/assets/NonFiatCollateral.sol @@ -27,8 +27,8 @@ contract NonFiatCollateral is FiatCollateral { uint48 targetUnitOracleTimeout_ ) FiatCollateral(config) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); - require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(targetUnitOracleTimeout_ != 0, "targetUnitOracleTimeout zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index 266ed40ab8..c86f859d30 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -35,7 +35,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA constructor(IRToken erc20_, uint192 maxTradeVolume_) { require(address(erc20_) != address(0), "missing erc20"); - require(maxTradeVolume_ > 0, "invalid max trade volume"); + require(maxTradeVolume_ != 0, "invalid max trade volume"); IMain main = erc20_.main(); assetRegistry = main.assetRegistry(); diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index 240bbacf9f..a4af5a87d0 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -21,7 +21,7 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); } // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol index d9f1cee356..cfe1df770e 100644 --- a/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol +++ b/contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol @@ -489,7 +489,7 @@ contract StaticATokenV3LM is uint256 assets = _assets; uint256 shares = _shares; - if (shares > 0) { + if (shares != 0) { if (depositToAave) { require(shares <= maxMint(receiver), "ERC4626: mint more than max"); } @@ -531,7 +531,7 @@ contract StaticATokenV3LM is uint256 assets = _assets; uint256 shares = _shares; - if (shares > 0) { + if (shares != 0) { if (withdrawFromAave) { require(shares <= maxRedeem(owner), "ERC4626: redeem more than max"); } @@ -596,7 +596,7 @@ contract StaticATokenV3LM is address rewardToken ) internal { uint256 balance = balanceOf[user]; - if (balance > 0) { + if (balance != 0) { _userRewardsData[user][rewardToken].unclaimedRewards = _getClaimableRewards( user, rewardToken, @@ -692,7 +692,7 @@ contract StaticATokenV3LM is unclaimedReward = userReward - totalRewardTokenBalance; userReward = totalRewardTokenBalance; } - if (userReward > 0) { + if (userReward != 0) { _userRewardsData[onBehalfOf][rewards[i]].unclaimedRewards = unclaimedReward .toUint128(); _userRewardsData[onBehalfOf][rewards[i]] diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index e522320ffc..665830de8c 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -44,7 +44,7 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); stkAAVE = IStaticAToken(address(erc20)).REWARD_TOKEN(); } diff --git a/contracts/plugins/assets/aave/StaticATokenLM.sol b/contracts/plugins/assets/aave/StaticATokenLM.sol index e5af94b359..7f57217a23 100644 --- a/contracts/plugins/assets/aave/StaticATokenLM.sol +++ b/contracts/plugins/assets/aave/StaticATokenLM.sol @@ -357,7 +357,7 @@ contract StaticATokenLM is uint256 amountToBurn; uint256 currentRate = rate(); - if (staticAmount > 0) { + if (staticAmount != 0) { amountToBurn = (staticAmount > userBalance) ? userBalance : staticAmount; amountToWithdraw = _staticToDynamicAmount(amountToBurn, currentRate); } else { @@ -453,13 +453,13 @@ contract StaticATokenLM is ); uint256 lifetimeRewards = _lifetimeRewardsClaimed.add(freshlyClaimed); uint256 rewardsAccrued = lifetimeRewards.sub(_lifetimeRewards).wadToRay(); - if (supply > 0 && rewardsAccrued > 0) { + if (supply != 0 && rewardsAccrued != 0) { _accRewardsPerToken = _accRewardsPerToken.add( (rewardsAccrued).rayDivNoRounding(supply.wadToRay()) ); } - if (rewardsAccrued > 0) { + if (rewardsAccrued != 0) { _lifetimeRewards = lifetimeRewards; } @@ -497,7 +497,7 @@ contract StaticATokenLM is if (reward > totBal) { reward = totBal; } - if (reward > 0) { + if (reward != 0) { _unclaimedRewards[onBehalfOf] = 0; _updateUserSnapshotRewardsPerToken(onBehalfOf); REWARD_TOKEN.safeTransfer(receiver, reward); @@ -565,7 +565,7 @@ contract StaticATokenLM is */ function _updateUser(address user) internal { uint256 balance = balanceOf(user); - if (balance > 0) { + if (balance != 0) { uint256 pending = _getPendingRewards(user, balance, false); _unclaimedRewards[user] = _unclaimedRewards[user].add(pending); } diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index 4d3ab9d5ae..ccce6ef615 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -33,7 +33,7 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index e407328197..74e96eb1fa 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -33,7 +33,7 @@ contract CBEthCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index e9304cb9a5..e1d77aeea0 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -31,10 +31,10 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); address referenceERC20 = ICToken(address(config.erc20)).underlying(); referenceERC20Decimals = IERC20Metadata(referenceERC20).decimals(); - require(referenceERC20Decimals > 0, "referenceERC20Decimals missing"); + require(referenceERC20Decimals != 0, "referenceERC20Decimals missing"); comptroller = ICToken(address(config.erc20)).comptroller(); comp = IERC20(comptroller.getCompAddress()); } diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 21ec14d585..0cb59703c3 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -30,7 +30,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { uint192 revenueHiding ) CTokenFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); - require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(targetUnitOracleTimeout_ != 0, "targetUnitOracleTimeout zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index d8d18ae894..5d24dc0910 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -32,7 +32,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { require(config.defaultThreshold == 0, "default threshold not supported"); address referenceERC20 = ICToken(address(config.erc20)).underlying(); referenceERC20Decimals = IERC20Metadata(referenceERC20).decimals(); - require(referenceERC20Decimals > 0, "referenceERC20Decimals missing"); + require(referenceERC20Decimals != 0, "referenceERC20Decimals missing"); comptroller = ICToken(address(config.erc20)).comptroller(); comp = IERC20(comptroller.getCompAddress()); } diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index b39d59a51d..ed285f5db1 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -30,7 +30,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); comp = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); cometDecimals = comet.decimals(); @@ -76,7 +76,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index afbab80784..2ca06046c7 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -302,7 +302,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { uint40 timeDelta = uint40(block.timestamp) - totals.lastAccrualTime; uint64 baseSupplyIndex_ = totals.baseSupplyIndex; uint64 trackingSupplyIndex_ = totals.trackingSupplyIndex; - if (timeDelta > 0) { + if (timeDelta != 0) { uint256 baseTrackingSupplySpeed = underlyingComet.baseTrackingSupplySpeed(); uint256 utilization = underlyingComet.getUtilization(); uint256 supplyRate = underlyingComet.getSupplyRate(utilization); diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol index 95edeb939f..88a50019ca 100644 --- a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol @@ -76,7 +76,7 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol index d39354f749..3ed3be8aad 100644 --- a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol +++ b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol @@ -109,7 +109,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index a9a0759feb..60d27fd0f7 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -7,7 +7,7 @@ import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import "contracts/interfaces/IAsset.sol"; import "contracts/libraries/Fixed.sol"; import "contracts/plugins/assets/AppreciatingFiatCollateral.sol"; -import "contracts/plugins/assets/erc20/RewardableERC20.sol"; +import "../../../interfaces/IRewardable.sol"; import "../curve/PoolTokens.sol"; /** @@ -43,7 +43,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { uint192 revenueHiding, PTConfiguration memory ptConfig ) AppreciatingFiatCollateral(config, revenueHiding) PoolTokens(ptConfig) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); maxOracleTimeout = uint48(Math.max(maxOracleTimeout, maxPoolOracleTimeout())); } @@ -126,7 +126,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 8f759b4e96..61eb351d50 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -48,7 +48,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { ) CurveStableCollateral(config, revenueHiding, ptConfig) { require(address(metapoolToken_) != address(0), "metapoolToken address is zero"); require( - pairedTokenDefaultThreshold_ > 0 && pairedTokenDefaultThreshold_ < FIX_ONE, + pairedTokenDefaultThreshold_ != 0 && pairedTokenDefaultThreshold_ < FIX_ONE, "pairedTokenDefaultThreshold out of bounds" ); metapoolToken = metapoolToken_; diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 8ae7829d7f..36bde1b1e3 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -78,7 +78,7 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if priced - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index f818524d0c..554502d233 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -97,7 +97,7 @@ contract PoolTokens { require(config.nTokens <= 4, "up to 4 tokens max"); require(maxFeedsLength(config.feeds) <= 2, "price feeds limited to 2"); require( - config.feeds.length == config.nTokens && minFeedsLength(config.feeds) > 0, + config.feeds.length == config.nTokens && minFeedsLength(config.feeds) != 0, "each token needs at least 1 price feed" ); require(address(config.curvePool) != address(0), "curvePool address is zero"); @@ -134,15 +134,17 @@ contract PoolTokens { // - immutable variables means values get in-lined in the bytecode // token0 - bool more = config.feeds[0].length > 0; + bool more = config.feeds[0].length != 0; // untestable: // more will always be true based on previous feeds validations _t0feed0 = more ? config.feeds[0][0] : AggregatorV3Interface(address(0)); - _t0timeout0 = more && config.oracleTimeouts[0].length > 0 ? config.oracleTimeouts[0][0] : 0; - _t0error0 = more && config.oracleErrors[0].length > 0 ? config.oracleErrors[0][0] : 0; + _t0timeout0 = more && config.oracleTimeouts[0].length != 0 + ? config.oracleTimeouts[0][0] + : 0; + _t0error0 = more && config.oracleErrors[0].length != 0 ? config.oracleErrors[0][0] : 0; if (more) { require(address(_t0feed0) != address(0), "t0feed0 empty"); - require(_t0timeout0 > 0, "t0timeout0 zero"); + require(_t0timeout0 != 0, "t0timeout0 zero"); require(_t0error0 < FIX_ONE, "t0error0 too large"); } @@ -152,20 +154,22 @@ contract PoolTokens { _t0error1 = more && config.oracleErrors[0].length > 1 ? config.oracleErrors[0][1] : 0; if (more) { require(address(_t0feed1) != address(0), "t0feed1 empty"); - require(_t0timeout1 > 0, "t0timeout1 zero"); + require(_t0timeout1 != 0, "t0timeout1 zero"); require(_t0error1 < FIX_ONE, "t0error1 too large"); } // token1 // untestable: // more will always be true based on previous feeds validations - more = config.feeds[1].length > 0; + more = config.feeds[1].length != 0; _t1feed0 = more ? config.feeds[1][0] : AggregatorV3Interface(address(0)); - _t1timeout0 = more && config.oracleTimeouts[1].length > 0 ? config.oracleTimeouts[1][0] : 0; - _t1error0 = more && config.oracleErrors[1].length > 0 ? config.oracleErrors[1][0] : 0; + _t1timeout0 = more && config.oracleTimeouts[1].length != 0 + ? config.oracleTimeouts[1][0] + : 0; + _t1error0 = more && config.oracleErrors[1].length != 0 ? config.oracleErrors[1][0] : 0; if (more) { require(address(_t1feed0) != address(0), "t1feed0 empty"); - require(_t1timeout0 > 0, "t1timeout0 zero"); + require(_t1timeout0 != 0, "t1timeout0 zero"); require(_t1error0 < FIX_ONE, "t1error0 too large"); } @@ -175,18 +179,20 @@ contract PoolTokens { _t1error1 = more && config.oracleErrors[1].length > 1 ? config.oracleErrors[1][1] : 0; if (more) { require(address(_t1feed1) != address(0), "t1feed1 empty"); - require(_t1timeout1 > 0, "t1timeout1 zero"); + require(_t1timeout1 != 0, "t1timeout1 zero"); require(_t1error1 < FIX_ONE, "t1error1 too large"); } // token2 - more = config.feeds.length > 2 && config.feeds[2].length > 0; + more = config.feeds.length > 2 && config.feeds[2].length != 0; _t2feed0 = more ? config.feeds[2][0] : AggregatorV3Interface(address(0)); - _t2timeout0 = more && config.oracleTimeouts[2].length > 0 ? config.oracleTimeouts[2][0] : 0; - _t2error0 = more && config.oracleErrors[2].length > 0 ? config.oracleErrors[2][0] : 0; + _t2timeout0 = more && config.oracleTimeouts[2].length != 0 + ? config.oracleTimeouts[2][0] + : 0; + _t2error0 = more && config.oracleErrors[2].length != 0 ? config.oracleErrors[2][0] : 0; if (more) { require(address(_t2feed0) != address(0), "t2feed0 empty"); - require(_t2timeout0 > 0, "t2timeout0 zero"); + require(_t2timeout0 != 0, "t2timeout0 zero"); require(_t2error0 < FIX_ONE, "t2error0 too large"); } @@ -196,18 +202,20 @@ contract PoolTokens { _t2error1 = more && config.oracleErrors[2].length > 1 ? config.oracleErrors[2][1] : 0; if (more) { require(address(_t2feed1) != address(0), "t2feed1 empty"); - require(_t2timeout1 > 0, "t2timeout1 zero"); + require(_t2timeout1 != 0, "t2timeout1 zero"); require(_t2error1 < FIX_ONE, "t2error1 too large"); } // token3 - more = config.feeds.length > 3 && config.feeds[3].length > 0; + more = config.feeds.length > 3 && config.feeds[3].length != 0; _t3feed0 = more ? config.feeds[3][0] : AggregatorV3Interface(address(0)); - _t3timeout0 = more && config.oracleTimeouts[3].length > 0 ? config.oracleTimeouts[3][0] : 0; - _t3error0 = more && config.oracleErrors[3].length > 0 ? config.oracleErrors[3][0] : 0; + _t3timeout0 = more && config.oracleTimeouts[3].length != 0 + ? config.oracleTimeouts[3][0] + : 0; + _t3error0 = more && config.oracleErrors[3].length != 0 ? config.oracleErrors[3][0] : 0; if (more) { require(address(_t3feed0) != address(0), "t3feed0 empty"); - require(_t3timeout0 > 0, "t3timeout0 zero"); + require(_t3timeout0 != 0, "t3timeout0 zero"); require(_t3error0 < FIX_ONE, "t3error0 too large"); } @@ -217,7 +225,7 @@ contract PoolTokens { _t3error1 = more && config.oracleErrors[3].length > 1 ? config.oracleErrors[3][1] : 0; if (more) { require(address(_t3feed1) != address(0), "t3feed1 empty"); - require(_t3timeout1 > 0, "t3timeout1 zero"); + require(_t3timeout1 != 0, "t3timeout1 zero"); require(_t3error1 < FIX_ONE, "t3error1 too large"); } } diff --git a/contracts/plugins/assets/curve/cvx/README.md b/contracts/plugins/assets/curve/README.md similarity index 100% rename from contracts/plugins/assets/curve/cvx/README.md rename to contracts/plugins/assets/curve/README.md diff --git a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol index 0fe2d5db37..b20f7c7cba 100644 --- a/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol +++ b/contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol @@ -246,7 +246,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { uint256 bal = IERC20(reward.reward_token).balanceOf(address(this)); //check that balance increased and update integral - if (_supply > 0 && bal > reward.reward_remaining) { + if (_supply != 0 && bal > reward.reward_remaining) { reward.reward_integral = reward.reward_integral + (bal.sub(reward.reward_remaining).mul(1e20).div(_supply)); @@ -265,7 +265,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { uint256 receiveable = reward.claimable_reward[_accounts[u]].add( _balances[u].mul(reward.reward_integral.sub(userI)).div(1e20) ); - if (receiveable > 0) { + if (receiveable != 0) { reward.claimable_reward[_accounts[u]] = 0; //cheat for gas savings by transfering to the second index in accounts list //if claiming only the 0 index will update so 1 index can hold forwarding info @@ -389,7 +389,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { function deposit(uint256 _amount, address _to) external { //dont need to call checkpoint since _mint() will - if (_amount > 0) { + if (_amount != 0) { _mint(_to, _amount); IERC20(curveToken).safeTransferFrom(msg.sender, address(this), _amount); IConvexDeposits(convexBooster).deposit(convexPoolId, _amount, true); @@ -402,7 +402,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { function stake(uint256 _amount, address _to) external { //dont need to call checkpoint since _mint() will - if (_amount > 0) { + if (_amount != 0) { _mint(_to, _amount); IERC20(convexToken).safeTransferFrom(msg.sender, address(this), _amount); IRewardStaking(convexPool).stake(_amount); @@ -415,7 +415,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { function withdraw(uint256 _amount) external { //dont need to call checkpoint since _burn() will - if (_amount > 0) { + if (_amount != 0) { _burn(msg.sender, _amount); IRewardStaking(convexPool).withdraw(_amount, false); IERC20(convexToken).safeTransfer(msg.sender, _amount); @@ -428,7 +428,7 @@ contract ConvexStakingWrapper is ERC20, ReentrancyGuard { function withdrawAndUnwrap(uint256 _amount) external { //dont need to call checkpoint since _burn() will - if (_amount > 0) { + if (_amount != 0) { _burn(msg.sender, _amount); IRewardStaking(convexPool).withdrawAndUnwrap(_amount, false); IERC20(curveToken).safeTransfer(msg.sender, _amount); diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 5b06c26716..215d2e7b74 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -35,7 +35,7 @@ contract SDaiCollateral is AppreciatingFiatCollateral { uint192 revenueHiding, IPot _pot ) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); pot = _pot; } diff --git a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol index 6ae34a21a8..3738b61d13 100644 --- a/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol +++ b/contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol @@ -44,7 +44,7 @@ abstract contract RewardableERC20Wrapper is RewardableERC20 { /// Deposit the underlying token and optionally take an action such as staking in a gauge function deposit(uint256 _amount, address _to) external virtual { - if (_amount > 0) { + if (_amount != 0) { _mint(_to, _amount); // does balance checkpointing underlying.safeTransferFrom(msg.sender, address(this), _amount); _afterDeposit(_amount, _to); @@ -55,7 +55,7 @@ abstract contract RewardableERC20Wrapper is RewardableERC20 { /// Withdraw the underlying token and optionally take an action such as staking in a gauge function withdraw(uint256 _amount, address _to) external virtual { - if (_amount > 0) { + if (_amount != 0) { _burn(msg.sender, _amount); // does balance checkpointing _beforeWithdraw(_amount, _to); underlying.safeTransfer(_to, _amount); diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index b9b615b2bf..6247a7e6bd 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -34,7 +34,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { uint192 revenueHiding, address curvePoolEmaPriceOracleAddress ) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); CURVE_POOL_EMA_PRICE_ORACLE = curvePoolEmaPriceOracleAddress; } diff --git a/contracts/plugins/assets/frax/SFraxCollateral.sol b/contracts/plugins/assets/frax/SFraxCollateral.sol index a5d2e9237d..3128adf501 100644 --- a/contracts/plugins/assets/frax/SFraxCollateral.sol +++ b/contracts/plugins/assets/frax/SFraxCollateral.sol @@ -24,7 +24,7 @@ contract SFraxCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); } function refresh() public virtual override { diff --git a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol index 3309620077..d66bcb8e86 100644 --- a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol @@ -5,7 +5,6 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../../libraries/Fixed.sol"; import "../AppreciatingFiatCollateral.sol"; import "../OracleLib.sol"; -import "./vendor/IWSTETH.sol"; /** * @title Lido Staked ETH Collateral for L2s (like Base) diff --git a/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol b/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol index a365bd21e8..59bc4adc1b 100644 --- a/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol +++ b/contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol @@ -18,6 +18,6 @@ contract MetaMorphoFiatCollateral is ERC4626FiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) ERC4626FiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); } } diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 16cc77b99b..1d8cf4b077 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -29,7 +29,7 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(address(config.erc20) != address(0), "missing erc20"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20)); morpho = IERC20Metadata(address(vault.rewardToken())); oneShare = 10**vault.decimals(); diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 10b4d71113..658309b15a 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -32,7 +32,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { uint48 targetUnitOracleTimeout_ ) MorphoFiatCollateral(config, revenueHiding) { require(address(targetUnitChainlinkFeed_) != address(0), "missing targetUnit feed"); - require(targetUnitOracleTimeout_ > 0, "targetUnitOracleTimeout zero"); + require(targetUnitOracleTimeout_ != 0, "targetUnitOracleTimeout zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index 02fc479afa..76074559fc 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -32,7 +32,7 @@ contract RethCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(address(_targetPerTokChainlinkFeed) != address(0), "missing targetPerTok feed"); require(_targetPerTokChainlinkTimeout != 0, "targetPerTokChainlinkTimeout zero"); - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index 66c538ad62..01178b80e5 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -25,7 +25,7 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(config.defaultThreshold > 0, "defaultThreshold zero"); + require(config.defaultThreshold != 0, "defaultThreshold zero"); pool = StargateRewardableWrapper(address(config.erc20)).pool(); stg = StargateRewardableWrapper(address(config.erc20)).rewardToken(); } diff --git a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol index 50b58dce39..54acf6e721 100644 --- a/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol +++ b/contracts/plugins/assets/stargate/StargateRewardableWrapper.sol @@ -48,8 +48,7 @@ contract StargateRewardableWrapper is RewardableERC20Wrapper { } function _claimAssetRewards() internal override { - // `.deposit` call in a try/catch to prevent staking contract - // this is because `_claimAssetRewards` is called on all movements + // `.deposit` call in a try/catch because `_claimAssetRewards` is called on all movements // and we want to prevent external calls from bricking the contract // solhint-disable-next-line no-empty-blocks try stakingContract.deposit(poolId, 0) {} catch {} diff --git a/contracts/plugins/mocks/ATokenMock.sol b/contracts/plugins/mocks/ATokenMock.sol index 5459fbabae..4d7203ed7f 100644 --- a/contracts/plugins/mocks/ATokenMock.sol +++ b/contracts/plugins/mocks/ATokenMock.sol @@ -81,7 +81,7 @@ contract StaticATokenMock is ERC20Mock { } function claimRewardsToSelf(bool) external { - if (address(aaveToken) != address(0) && aaveBalances[msg.sender] > 0) { + if (address(aaveToken) != address(0) && aaveBalances[msg.sender] != 0) { aaveToken.mint(msg.sender, aaveBalances[msg.sender]); aaveBalances[msg.sender] = 0; } @@ -97,7 +97,7 @@ contract StaticATokenMock is ERC20Mock { function claimRewards() external { uint256 oldBal = aaveToken.balanceOf(msg.sender); - if (address(aaveToken) != address(0) && aaveBalances[msg.sender] > 0) { + if (address(aaveToken) != address(0) && aaveBalances[msg.sender] != 0) { aaveToken.mint(msg.sender, aaveBalances[msg.sender]); aaveBalances[msg.sender] = 0; } diff --git a/contracts/plugins/mocks/AaveLendingPoolMock.sol b/contracts/plugins/mocks/AaveLendingPoolMock.sol index 8c1a969d05..647f7d87ca 100644 --- a/contracts/plugins/mocks/AaveLendingPoolMock.sol +++ b/contracts/plugins/mocks/AaveLendingPoolMock.sol @@ -33,7 +33,7 @@ contract AaveLendingPoolMock is IAaveLendingPool { } function getReserveNormalizedIncome(address asset) external view returns (uint256) { - return _normalizedIncome[asset] > 0 ? _normalizedIncome[asset] : 1e27; + return _normalizedIncome[asset] != 0 ? _normalizedIncome[asset] : 1e27; } function setNormalizedIncome(address asset, uint256 newRate) external { diff --git a/contracts/plugins/mocks/BadCollateralPlugin.sol b/contracts/plugins/mocks/BadCollateralPlugin.sol index f68bb95ccf..b6038eab2b 100644 --- a/contracts/plugins/mocks/BadCollateralPlugin.sol +++ b/contracts/plugins/mocks/BadCollateralPlugin.sol @@ -51,7 +51,7 @@ contract BadCollateralPlugin is ATokenFiatCollateral { // {UoA/tok}, {UoA/tok}, {target/ref} // high can't be FIX_MAX in this contract, but inheritors might mess this up - if (high < FIX_MAX) { + if (high != FIX_MAX) { // Save prices savedLowPrice = low; savedHighPrice = high; diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index 736f9f3ae8..7861f6aeff 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -38,7 +38,7 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { // (0, 0) is a valid price; (0, FIX_MAX) is unpriced // Save prices if high price is finite - if (high < FIX_MAX) { + if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; lastSave = uint48(block.timestamp); diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 0561df1557..fb89a08760 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -207,6 +207,7 @@ contract DutchTrade is ITrade, Versioned { /// @return amountIn {qBuyTok} The quantity of tokens the bidder paid function bid() external returns (uint256 amountIn) { require(bidder == address(0), "bid already received"); + assert(status == TradeStatus.OPEN); // {buyTok/sellTok} uint192 price = _price(uint48(block.timestamp)); // enforces auction ongoing @@ -218,9 +219,6 @@ contract DutchTrade is ITrade, Versioned { bidder = msg.sender; bidType = BidType.TRANSFER; - // status must begin OPEN - assert(status == TradeStatus.OPEN); - // reportViolation if auction cleared in geometric phase if (price > bestPrice.mul(ONE_POINT_FIVE, CEIL)) { broker.reportViolation(); @@ -245,6 +243,7 @@ contract DutchTrade is ITrade, Versioned { /// @return amountIn {qBuyTok} The quantity of tokens the bidder paid function bidWithCallback(bytes calldata data) external returns (uint256 amountIn) { require(bidder == address(0), "bid already received"); + assert(status == TradeStatus.OPEN); // {buyTok/sellTok} uint192 price = _price(uint48(block.timestamp)); // enforces auction ongoing @@ -256,9 +255,6 @@ contract DutchTrade is ITrade, Versioned { bidder = msg.sender; bidType = BidType.CALLBACK; - // status must begin OPEN - assert(status == TradeStatus.OPEN); - // reportViolation if auction cleared in geometric phase if (price > bestPrice.mul(ONE_POINT_FIVE, CEIL)) { broker.reportViolation(); diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 8245791468..ba4291bb68 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -201,8 +201,8 @@ contract GnosisTrade is ITrade, Versioned { // the trades recorded by the IDO contracts and on our side. boughtAmt = buy.balanceOf(address(this)); - if (sellBal > 0) IERC20Upgradeable(address(sell)).safeTransfer(origin, sellBal); - if (boughtAmt > 0) IERC20Upgradeable(address(buy)).safeTransfer(origin, boughtAmt); + if (sellBal != 0) IERC20Upgradeable(address(sell)).safeTransfer(origin, sellBal); + if (boughtAmt != 0) IERC20Upgradeable(address(buy)).safeTransfer(origin, boughtAmt); // Check clearing prices if (sellBal < initBal) { soldAmt = initBal - sellBal; From 5bc93dffb4cb13104a479efdb0f16477f8d6ea82 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 14:07:08 -0400 Subject: [PATCH 331/450] CTokenSelfReferentialCollateral --- .../phase2-assets/2_deploy_collateral.ts | 1 - test/plugins/Collateral.test.ts | 22 ++++++++++++++++--- test/scenario/ComplexBasket.test.ts | 1 - 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index a886658cb7..5386424dfa 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -561,7 +561,6 @@ async function main() { oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: revenueHiding.toString(), - referenceERC20Decimals: '18', } ) collateral = await ethers.getContractAt('ICollateral', cETHCollateral) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 0937b8d81e..3ff592fd2d 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -8,6 +8,7 @@ import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../common/constan import { bn, fp } from '../../common/numbers' import { ATokenFiatCollateral, + BadERC20, ComptrollerMock, CTokenFiatCollateral, CTokenNonFiatCollateral, @@ -2059,21 +2060,36 @@ describe('Collateral contracts', () => { }) it('Should not allow missing reference erc20 decimals', async () => { + // Check cToken with decimals = 0 in underlying + const token0decimals: BadERC20 = await ( + await ethers.getContractFactory('BadERC20') + ).deploy('Bad ERC20', 'BERC20') + await token0decimals.setDecimals(0) + + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') + const vault: CTokenMock = ( + await CTokenMockFactory.deploy( + '0 Decimal Token', + '0 Decimal Token', + token0decimals.address, + compoundMock.address + ) + ) + await expect( CTokenSelfReferentialFactory.deploy( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: chainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: cSelfRefToken.address, + erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, - REVENUE_HIDING, - 0 + REVENUE_HIDING ) ).to.be.revertedWith('referenceERC20Decimals missing') }) diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 2a27078d8f..3ffd560fb7 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -369,7 +369,6 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: REVENUE_HIDING.toString(), - referenceERC20Decimals: bn(18).toString(), noOutput: true, } ) From 1190e7c68a89444f06251f40d9faf48f06d7990e Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 14:18:55 -0400 Subject: [PATCH 332/450] scenario tests --- contracts/p0/BasketHandler.sol | 2 +- contracts/p1/BasketHandler.sol | 2 +- test/scenario/MaxBasketSize.test.ts | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index deb19a6cba..029bfaba3b 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -114,7 +114,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight - uint256 internal constant MAX_BACKUP_ERC20s = 32; + uint256 internal constant MAX_BACKUP_ERC20s = 64; // config is the basket configuration, from which basket will be computed in a basket-switch // event. config is only modified by governance through setPrimeBasket and setBackupConfig diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index e1b6aaa5bb..d921cea8f3 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -29,7 +29,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year - uint256 internal constant MAX_BACKUP_ERC20s = 32; + uint256 internal constant MAX_BACKUP_ERC20s = 64; // Peer components IAssetRegistry private assetRegistry; diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index f78b3434cf..bfcdc8c080 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -292,9 +292,9 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { }) describeGas('Fiatcoins', function () { - const maxBasketSize = 100 + const maxBasketSize = 64 const numBackupTokens = 1 - const tokensToDefault = 99 + const tokensToDefault = 63 beforeEach(async () => { // Setup Max Basket - Only fiatcoins = true @@ -429,8 +429,8 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { }) describeGas('ATokens/CTokens', function () { - const maxBasketSize = 100 - const numBackupTokens = 20 + const maxBasketSize = 64 + const numBackupTokens = 64 const tokensToDefault = 20 beforeEach(async () => { From 38369342573fc1f94582955bfc70f0182480fba7 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 17:02:21 -0400 Subject: [PATCH 333/450] prepare for review --- contracts/facade/facets/ActFacet.sol | 4 +-- contracts/facade/facets/ReadFacet.sol | 6 ++-- contracts/libraries/Allowance.sol | 6 ++-- contracts/libraries/Throttle.sol | 2 +- contracts/p0/BasketHandler.sol | 6 ++-- contracts/p1/BasketHandler.sol | 6 ++-- contracts/p1/Broker.sol | 11 +++---- contracts/p1/Distributor.sol | 7 ++--- contracts/p1/RToken.sol | 6 ++-- contracts/p1/StRSR.sol | 31 ++++++++----------- contracts/p1/StRSRVotes.sol | 7 ++--- contracts/p1/mixins/Trading.sol | 2 +- .../CTokenSelfReferentialCollateral.sol | 14 +++++---- .../assets/compoundv3/CusdcV3Wrapper.sol | 3 +- .../stargate/mocks/StargateLPStakingMock.sol | 16 +++++----- contracts/plugins/mocks/BadERC20.sol | 10 +++--- scripts/verification/6_verify_collateral.ts | 1 + ...eploy-ctoken-selfreferential-collateral.ts | 4 ++- test/Main.test.ts | 16 +++++----- test/integration/AssetPlugins.test.ts | 6 ++-- test/integration/fixtures.ts | 9 ++++-- test/plugins/Collateral.test.ts | 3 +- test/scenario/cETH.test.ts | 3 +- 23 files changed, 87 insertions(+), 92 deletions(-) diff --git a/contracts/facade/facets/ActFacet.sol b/contracts/facade/facets/ActFacet.sol index 87c4a1f7fb..bbcf1cfec9 100644 --- a/contracts/facade/facets/ActFacet.sol +++ b/contracts/facade/facets/ActFacet.sol @@ -51,7 +51,7 @@ contract ActFacet is IActFacet, Multicall { // if 2.1.0, distribute tokenToBuy bytes1 majorVersion = bytes(revenueTrader.version())[0]; - if (toSettle.length != 0 && (majorVersion == bytes1("2") || majorVersion == bytes1("1"))) { + if (toSettle.length > 0 && (majorVersion == bytes1("2") || majorVersion == bytes1("1"))) { address(revenueTrader).functionCall( abi.encodeWithSignature("manageToken(address)", revenueTrader.tokenToBuy()) ); @@ -172,7 +172,7 @@ contract ActFacet is IActFacet, Multicall { IERC20[] memory erc20s = bm.main().assetRegistry().erc20s(); // Settle any settle-able open trades - if (bm.tradesOpen() != 0) { + if (bm.tradesOpen() > 0) { for (uint256 i = 0; i < erc20s.length; ++i) { ITrade trade = bm.trades(erc20s[i]); if (address(trade) != address(0) && trade.canSettle()) { diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index 9d16432732..9a2501203e 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -53,7 +53,7 @@ contract ReadFacet is MaxIssuableFacet { reg.refresh(); // Compute # of baskets to create `amount` qRTok - uint192 baskets = (rTok.totalSupply() != 0) // {BU} + uint192 baskets = (rTok.totalSupply() > 0) // {BU} ? rTok.basketsNeeded().muluDivu(amount, rTok.totalSupply()) // {BU * qRTok / qRTok} : _safeWrap(amount); // take advantage of RToken having 18 decimals @@ -265,7 +265,7 @@ contract ReadFacet is MaxIssuableFacet { (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); uint192 diff = drafts; - if (i + left != 0) { + if (i + left > 0) { (uint192 prevDrafts, ) = stRSR.draftQueues(draftEra, account, i + left - 1); diff = drafts - prevDrafts; } @@ -367,7 +367,7 @@ contract ReadFacet is MaxIssuableFacet { ); (uint192 lowPrice, uint192 highPrice) = rsrAsset.price(); - if (lowPrice != 0 && highPrice != FIX_MAX) { + if (lowPrice > 0 && highPrice < FIX_MAX) { // {UoA} = {tok} * {UoA/tok} uint192 rsrUoA = rsrBal.mul((lowPrice + highPrice) / 2); diff --git a/contracts/libraries/Allowance.sol b/contracts/libraries/Allowance.sol index 0ab20aedc5..c3e5f62e5d 100644 --- a/contracts/libraries/Allowance.sol +++ b/contracts/libraries/Allowance.sol @@ -22,10 +22,8 @@ library AllowanceLib { IERC20ApproveOnly token = IERC20ApproveOnly(tokenAddress); // 1. Set initial allowance to 0 - if (token.allowance(address(this), spender) != 0) { - token.approve(spender, 0); - require(token.allowance(address(this), spender) == 0, "allowance not 0"); - } + token.approve(spender, 0); + require(token.allowance(address(this), spender) == 0, "allowance not 0"); if (value == 0) return; diff --git a/contracts/libraries/Throttle.sol b/contracts/libraries/Throttle.sol index 286fd00479..7314325aa8 100644 --- a/contracts/libraries/Throttle.sol +++ b/contracts/libraries/Throttle.sol @@ -39,7 +39,7 @@ library ThrottleLib { uint256 supply, int256 amount ) internal { - // untestable: amtRate will always be greater != 0 due to previous validations + // untestable: amtRate will always be greater > 0 due to previous validations if (throttle.params.amtRate == 0 && throttle.params.pctRate == 0) return; // Calculate hourly limit diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 029bfaba3b..b9f9099da8 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -114,7 +114,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight - uint256 internal constant MAX_BACKUP_ERC20s = 64; + uint256 internal constant MAX_BACKUP_ERC20S = 64; // config is the basket configuration, from which basket will be computed in a basket-switch // event. config is only modified by governance through setPrimeBasket and setBackupConfig @@ -333,8 +333,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint256 max, IERC20[] calldata erc20s ) external governance { - require(max <= MAX_BACKUP_ERC20s, "max too large"); - require(erc20s.length <= MAX_BACKUP_ERC20s, "erc20s too large"); + require(max <= MAX_BACKUP_ERC20S, "max too large"); + require(erc20s.length <= MAX_BACKUP_ERC20S, "erc20s too large"); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index d921cea8f3..4f2b952eb8 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -29,7 +29,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year - uint256 internal constant MAX_BACKUP_ERC20s = 64; + uint256 internal constant MAX_BACKUP_ERC20S = 64; // Peer components IAssetRegistry private assetRegistry; @@ -290,8 +290,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { IERC20[] calldata erc20s ) external { requireGovernanceOnly(); - require(max <= MAX_BACKUP_ERC20s, "max too large"); - require(erc20s.length <= MAX_BACKUP_ERC20s, "erc20s too large"); + require(max <= MAX_BACKUP_ERC20S, "max too large"); + require(erc20s.length <= MAX_BACKUP_ERC20S, "erc20s too large"); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 2f6f0bb0c4..a7faf1018f 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -119,19 +119,18 @@ contract BrokerP1 is ComponentP1, IBroker { TradeRequest memory req, TradePrices memory prices ) external returns (ITrade) { - address caller = msg.sender; require( - caller == address(backingManager) || - caller == address(rsrTrader) || - caller == address(rTokenTrader), + msg.sender == address(backingManager) || + msg.sender == address(rsrTrader) || + msg.sender == address(rTokenTrader), "only traders" ); // Must be updated when new TradeKinds are created if (kind == TradeKind.BATCH_AUCTION) { - return newBatchAuction(req, caller); + return newBatchAuction(req, msg.sender); } - return newDutchAuction(req, prices, ITrading(caller)); + return newDutchAuction(req, prices, ITrading(msg.sender)); } /// Disable the broker until re-enabled by governance diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 51f2664aec..4bd4d8ea1e 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -90,8 +90,7 @@ contract DistributorP1 is ComponentP1, IDistributor { function distribute(IERC20 erc20, uint256 amount) external { // Intentionally do not check notTradingPausedOrFrozen, since handled by caller - address caller = msg.sender; - require(caller == rsrTrader || caller == rTokenTrader, "RevenueTraders only"); + require(msg.sender == rsrTrader || msg.sender == rTokenTrader, "RevenueTraders only"); require(erc20 == rsr || erc20 == rToken, "RSR or RToken"); bool isRSR = erc20 == rsr; // if false: isRToken uint256 tokensPerShare; @@ -133,12 +132,12 @@ contract DistributorP1 is ComponentP1, IDistributor { transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); ++numTransfers; } - emit RevenueDistributed(erc20, caller, amount); + emit RevenueDistributed(erc20, msg.sender, amount); // == Interactions == for (uint256 i = 0; i < numTransfers; ++i) { Transfer memory t = transfers[i]; - IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); + IERC20Upgradeable(address(erc20)).safeTransferFrom(msg.sender, t.addrTo, t.amount); } // Perform reward accounting diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 122a7a292b..d4c13dae1b 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -111,8 +111,6 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks-effects block == - address issuer = msg.sender; // OK to save: it can't be changed in reentrant runs - // Ensure basket is ready, SOUND and not in warmup period require(basketHandler.isReady(), "basket not ready"); uint256 supply = totalSupply(); @@ -133,7 +131,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { uint192 amtBaskets = supply != 0 ? basketsNeeded.muluDivu(amount, supply, CEIL) : _safeWrap(amount); - emit Issuance(issuer, recipient, amount, amtBaskets); + emit Issuance(msg.sender, recipient, amount, amtBaskets); (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote( amtBaskets, @@ -145,7 +143,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { for (uint256 i = 0; i < erc20s.length; ++i) { IERC20Upgradeable(erc20s[i]).safeTransferFrom( - issuer, + msg.sender, address(backingManager), deposits[i] ); diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index d1b972e1f0..adf82010be 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -267,16 +267,15 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function unstake(uint256 stakeAmount) external { requireNotTradingPausedOrFrozen(); - address account = msg.sender; require(stakeAmount != 0, "Cannot withdraw zero"); - require(stakes[era][account] >= stakeAmount, "Not enough balance"); + require(stakes[era][msg.sender] >= stakeAmount, "Not enough balance"); _payoutRewards(); // ==== Compute changes to stakes and RSR accounting // rsrAmount: how many RSR to move from the stake pool to the draft pool // pick rsrAmount as big as we can such that (newTotalStakes <= newStakeRSR * stakeRate) - _burn(account, stakeAmount); + _burn(msg.sender, stakeAmount); // newStakeRSR: {qRSR} = D18 * {qStRSR} / D18{qStRSR/qRSR} uint256 newStakeRSR = (FIX_ONE_256 * totalStakes + (stakeRate - 1)) / stakeRate; @@ -284,8 +283,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab stakeRSR = newStakeRSR; // Create draft - (uint256 index, uint64 availableAt) = pushDraft(account, rsrAmount); - emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); + (uint256 index, uint64 availableAt) = pushDraft(msg.sender, rsrAmount); + emit UnstakingStarted(index, draftEra, msg.sender, rsrAmount, stakeAmount, availableAt); } /// Complete an account's unstaking; callable by anyone @@ -354,14 +353,13 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:interaction CEI function cancelUnstake(uint256 endId) external { requireNotFrozen(); - address account = msg.sender; // We specifically allow unstaking when under collateralized // require(basketHandler.fullyCollateralized(), "RToken uncollateralized"); // require(basketHandler.isReady(), "basket not ready"); - uint256 firstId = firstRemainingDraft[draftEra][account]; - CumulativeDraft[] storage queue = draftQueues[draftEra][account]; + uint256 firstId = firstRemainingDraft[draftEra][msg.sender]; + CumulativeDraft[] storage queue = draftQueues[draftEra][msg.sender]; if (endId == 0 || firstId >= endId) return; require(endId <= queue.length, "index out-of-bounds"); @@ -375,7 +373,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint192 draftAmount = queue[endId - 1].drafts - oldDrafts; // advance queue past withdrawal - firstRemainingDraft[draftEra][account] = endId; + firstRemainingDraft[draftEra][msg.sender] = endId; // ==== Compute RSR amount uint256 newTotalDrafts = totalDrafts - draftAmount; @@ -391,10 +389,10 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // ==== Transfer RSR from the draft pool totalDrafts = newTotalDrafts; draftRSR = newDraftRSR; - emit UnstakingCancelled(firstId, endId, draftEra, account, rsrAmount); + emit UnstakingCancelled(firstId, endId, draftEra, msg.sender, rsrAmount); // Mint new stakes - mintStakes(account, rsrAmount); + mintStakes(msg.sender, rsrAmount); } /// @param rsrAmount {qRSR} @@ -779,8 +777,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab } function transfer(address to, uint256 amount) public returns (bool) { - address owner = msg.sender; - _transfer(owner, to, amount); + _transfer(msg.sender, to, amount); return true; } @@ -808,17 +805,15 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab } function increaseAllowance(address spender, uint256 addedValue) public returns (bool) { - address owner = msg.sender; - _approve(owner, spender, _allowances[era][owner][spender] + addedValue); + _approve(msg.sender, spender, _allowances[era][msg.sender][spender] + addedValue); return true; } function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) { - address owner = msg.sender; - uint256 currentAllowance = _allowances[era][owner][spender]; + uint256 currentAllowance = _allowances[era][msg.sender][spender]; require(currentAllowance >= subtractedValue, "decreased allowance below zero"); unchecked { - _approve(owner, spender, currentAllowance - subtractedValue); + _approve(msg.sender, spender, currentAllowance - subtractedValue); } return true; diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index ee3c7cefc1..a0e845ce3d 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -138,15 +138,14 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { /// votes from the sender to `delegatee` or self function stakeAndDelegate(uint256 rsrAmount, address delegatee) external { stake(rsrAmount); - address msgSender = msg.sender; - address currentDelegate = delegates(msgSender); + address currentDelegate = delegates(msg.sender); if (delegatee == address(0) && currentDelegate == address(0)) { // Delegate to self if no delegate defined and no delegatee provided - _delegate(msgSender, msgSender); + _delegate(msg.sender, msg.sender); } else if (delegatee != address(0) && currentDelegate != delegatee) { // Delegate to delegatee if provided and different than current delegate - _delegate(msgSender, delegatee); + _delegate(msg.sender, delegatee); } } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index bb8ea8202c..f3cbb65feb 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -105,7 +105,7 @@ abstract contract TradingP1 is Multicall, ComponentP1, ReentrancyGuardUpgradeabl } /// Try to initiate a trade with a trading partner provided by the broker - /// @param kind TradeKind.DUTCH_AUeCTION or TradeKind.BATCH_AUCTION + /// @param kind TradeKind.DUTCH_AUCTION or TradeKind.BATCH_AUCTION /// @return trade The trade contract created /// @custom:interaction Assumption: Caller is nonReentrant // checks: diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index 5d24dc0910..a620b0fb03 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -26,13 +26,15 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { /// @param config.erc20 The CToken itself /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide - constructor(CollateralConfig memory config, uint192 revenueHiding) - AppreciatingFiatCollateral(config, revenueHiding) - { + /// @param referenceERC20Decimals_ The number of decimals in the reference token + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + uint8 referenceERC20Decimals_ + ) AppreciatingFiatCollateral(config, revenueHiding) { require(config.defaultThreshold == 0, "default threshold not supported"); - address referenceERC20 = ICToken(address(config.erc20)).underlying(); - referenceERC20Decimals = IERC20Metadata(referenceERC20).decimals(); - require(referenceERC20Decimals != 0, "referenceERC20Decimals missing"); + require(referenceERC20Decimals_ > 0, "referenceERC20Decimals missing"); + referenceERC20Decimals = referenceERC20Decimals_; comptroller = ICToken(address(config.erc20)).comptroller(); comp = IERC20(comptroller.getCompAddress()); } diff --git a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol index 2ca06046c7..66bd72efd4 100644 --- a/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol +++ b/contracts/plugins/assets/compoundv3/CusdcV3Wrapper.sol @@ -191,8 +191,7 @@ contract CusdcV3Wrapper is ICusdcV3Wrapper, WrappedERC20, CometHelpers { /// @param src The account to claim from /// @param dst The address to send claimed rewards to function claimTo(address src, address dst) public { - address sender = msg.sender; - if (!hasPermission(src, sender)) revert Unauthorized(); + if (!hasPermission(src, msg.sender)) revert Unauthorized(); accrueAccount(src); uint256 claimed = rewardsClaimed[src]; diff --git a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol index 1fcc2c22f2..81dc7959dd 100644 --- a/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol +++ b/contracts/plugins/assets/stargate/mocks/StargateLPStakingMock.sol @@ -47,20 +47,18 @@ contract StargateLPStakingMock is IStargateLPStaking { function updatePool(uint256 pid) external override {} function deposit(uint256 pid, uint256 amount) external override { - address sender = msg.sender; IERC20 pool = _poolInfo[pid].lpToken; - pool.transferFrom(sender, address(this), amount); - _emitUserRewards(pid, sender); - poolToUserBalance[pid][sender] += amount; + pool.transferFrom(msg.sender, address(this), amount); + _emitUserRewards(pid, msg.sender); + poolToUserBalance[pid][msg.sender] += amount; } function withdraw(uint256 pid, uint256 amount) external override { - address sender = msg.sender; - require(amount <= poolToUserBalance[pid][sender]); + require(amount <= poolToUserBalance[pid][msg.sender]); IERC20 pool = _poolInfo[pid].lpToken; - pool.transfer(sender, amount); - _emitUserRewards(pid, sender); - poolToUserBalance[pid][sender] -= amount; + pool.transfer(msg.sender, amount); + _emitUserRewards(pid, msg.sender); + poolToUserBalance[pid][msg.sender] -= amount; } function emergencyWithdraw(uint256 pid) external override { diff --git a/contracts/plugins/mocks/BadERC20.sol b/contracts/plugins/mocks/BadERC20.sol index 697835a50f..4fb24c0cda 100644 --- a/contracts/plugins/mocks/BadERC20.sol +++ b/contracts/plugins/mocks/BadERC20.sol @@ -53,11 +53,10 @@ contract BadERC20 is ERC20Mock { } function transfer(address to, uint256 amount) public virtual override returns (bool) { - address owner = msg.sender; - if (censored[owner] || censored[to]) revert("censored"); + if (censored[msg.sender] || censored[to]) revert("censored"); uint256 fee = transferFee.mulu_toUint(amount, CEIL); - _transfer(owner, to, amount - fee); - _burn(owner, fee); + _transfer(msg.sender, to, amount - fee); + _burn(msg.sender, fee); return true; } @@ -66,9 +65,8 @@ contract BadERC20 is ERC20Mock { address to, uint256 amount ) public virtual override returns (bool) { - address spender = msg.sender; if (censored[from] || censored[to]) revert("censored"); - _spendAllowance(from, spender, amount); + _spendAllowance(from, msg.sender, amount); uint256 fee = transferFee.mulu_toUint(amount, CEIL); _transfer(from, to, amount - fee); _burn(from, fee); diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index 31896bd799..88bc41a169 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -186,6 +186,7 @@ async function main() { delayUntilDefault: '0', }, revenueHiding.toString(), + '18', ], 'contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol:CTokenSelfReferentialCollateral' ) diff --git a/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts b/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts index e2d5cd2038..97e401b69c 100644 --- a/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts +++ b/tasks/deployment/collateral/deploy-ctoken-selfreferential-collateral.ts @@ -11,6 +11,7 @@ task('deploy-ctoken-selfreferential-collateral', 'Deploys a CToken Self-referent .addParam('oracleTimeout', 'Max oracle timeout') .addParam('targetName', 'Target Name') .addParam('revenueHiding', 'Revenue Hiding') + .addParam('referenceERC20Decimals', 'Decimals in the reference token') .setAction(async (params, hre) => { const [deployer] = await hre.ethers.getSigners() @@ -33,7 +34,8 @@ task('deploy-ctoken-selfreferential-collateral', 'Deploys a CToken Self-referent defaultThreshold: 0, delayUntilDefault: 0, }, - params.revenueHiding + params.revenueHiding, + params.referenceERC20Decimals ) ) await collateral.deployed() diff --git a/test/Main.test.ts b/test/Main.test.ts index 110b2f17ac..50360fb614 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2862,18 +2862,18 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('invalid collateral') }) - it('Should not allow to set more backup ERC20s than MAX_BACKUP_ERC20s', async () => { + it('Should not allow to set more backup ERC20s than MAX_BACKUP_ERC20S', async () => { const erc20s = [] - for (let i = 0; i < 32; i++) erc20s.push(ONE_ADDRESS) + for (let i = 0; i < 64; i++) erc20s.push(ONE_ADDRESS) - // Should succeed at 32 + // Should succeed at 64 await expect( basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), erc20s) ).to.not.be.revertedWith('erc20s too large') - // Should fail at 33 + // Should fail at 65 erc20s.push(ONE_ADDRESS) await expect( basketHandler @@ -2881,18 +2881,18 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), erc20s) ).to.be.revertedWith('erc20s too large') - // Should succeed at 32 + // Should succeed at 64 await expect( basketHandler .connect(owner) - .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(32), []) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(64), []) ).to.not.be.revertedWith('max too large') - // Should fail at 33 + // Should fail at 65 await expect( basketHandler .connect(owner) - .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(33), []) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(65), []) ).to.be.revertedWith('max too large') }) diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 143d44d074..9c915e4de0 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -1593,7 +1593,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, defaultThreshold: bn('0'), delayUntilDefault, }, - REVENUE_HIDING + REVENUE_HIDING, + await weth.decimals() ) // CTokens - Collateral with no price info should revert @@ -1622,7 +1623,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, defaultThreshold: bn('0'), delayUntilDefault, }, - REVENUE_HIDING + REVENUE_HIDING, + await weth.decimals() ) await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn('1e10')) await zeroPriceCtokenSelfReferentialCollateral.refresh() diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 5fe53f30ce..8ba38a3e62 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -345,7 +345,8 @@ export async function collateralFixture( const makeCTokenSelfReferentialCollateral = async ( tokenAddress: string, chainlinkAddr: string, - targetName: string + targetName: string, + referenceERC20Decimals: number ): Promise<[IERC20Metadata, CTokenSelfReferentialCollateral]> => { const erc20: IERC20Metadata = ( await ethers.getContractAt('CTokenMock', tokenAddress) @@ -363,7 +364,8 @@ export async function collateralFixture( defaultThreshold: bn(0), delayUntilDefault, }, - REVENUE_HIDING + REVENUE_HIDING, + referenceERC20Decimals ) ) await coll.refresh() @@ -497,7 +499,8 @@ export async function collateralFixture( const cETH = await makeCTokenSelfReferentialCollateral( networkConfig[chainId].tokens.cETH as string, networkConfig[chainId].chainlinkFeeds.ETH as string, - 'ETH' + 'ETH', + 18 ) const eurt = await makeEURFiatCollateral( diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 3ff592fd2d..6d847399df 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -2030,7 +2030,8 @@ describe('Collateral contracts', () => { defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, - REVENUE_HIDING + REVENUE_HIDING, + await selfRefToken.decimals() ) ) await cTokenSelfReferentialCollateral.refresh() diff --git a/test/scenario/cETH.test.ts b/test/scenario/cETH.test.ts index 302e89a3a1..590623d245 100644 --- a/test/scenario/cETH.test.ts +++ b/test/scenario/cETH.test.ts @@ -137,7 +137,8 @@ describe(`CToken of self-referential collateral (eg cETH) - P${IMPLEMENTATION}`, defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, - REVENUE_HIDING + REVENUE_HIDING, + await weth.decimals() ) // Backup From cc71d971960efacde54af3532a38cfe2d91c2101 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 17:03:14 -0400 Subject: [PATCH 334/450] kruft --- scripts/deployment/phase2-assets/2_deploy_collateral.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index 5386424dfa..a886658cb7 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -561,6 +561,7 @@ async function main() { oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: revenueHiding.toString(), + referenceERC20Decimals: '18', } ) collateral = await ethers.getContractAt('ICollateral', cETHCollateral) From 1986c24967c7f975adbc5a6fc8e5c7e5ec0befbd Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 17:04:17 -0400 Subject: [PATCH 335/450] comment --- .../assets/compoundv2/CTokenSelfReferentialCollateral.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index a620b0fb03..d20e4f44fc 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -27,6 +27,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide /// @param referenceERC20Decimals_ The number of decimals in the reference token + /// Has to be passed in because cETH is missing `underlying()` constructor( CollateralConfig memory config, uint192 revenueHiding, From 14ff65abe371f276d1a296b8389e778515f81dfa Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 17:05:21 -0400 Subject: [PATCH 336/450] Collateral.test.ts --- test/plugins/Collateral.test.ts | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 6d847399df..da40513cf8 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -8,7 +8,6 @@ import { CollateralStatus, MAX_UINT48, ZERO_ADDRESS } from '../../common/constan import { bn, fp } from '../../common/numbers' import { ATokenFiatCollateral, - BadERC20, ComptrollerMock, CTokenFiatCollateral, CTokenNonFiatCollateral, @@ -2061,36 +2060,21 @@ describe('Collateral contracts', () => { }) it('Should not allow missing reference erc20 decimals', async () => { - // Check cToken with decimals = 0 in underlying - const token0decimals: BadERC20 = await ( - await ethers.getContractFactory('BadERC20') - ).deploy('Bad ERC20', 'BERC20') - await token0decimals.setDecimals(0) - - const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') - const vault: CTokenMock = ( - await CTokenMockFactory.deploy( - '0 Decimal Token', - '0 Decimal Token', - token0decimals.address, - compoundMock.address - ) - ) - await expect( CTokenSelfReferentialFactory.deploy( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: chainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: vault.address, + erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, - REVENUE_HIDING + REVENUE_HIDING, + 0 ) ).to.be.revertedWith('referenceERC20Decimals missing') }) From b61351bf78ecaf8f0a5fd7145a116d84f3095eb2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 17:06:07 -0400 Subject: [PATCH 337/450] ComplexBasket.test.ts --- test/scenario/ComplexBasket.test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 3ffd560fb7..2a27078d8f 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -369,6 +369,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: REVENUE_HIDING.toString(), + referenceERC20Decimals: bn(18).toString(), noOutput: true, } ) From baa8f1f4cb06ab79fd7fe00eb059ad4bf1b1cb4f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Apr 2024 19:19:04 -0400 Subject: [PATCH 338/450] remove stakedao contracts that went in early by accident --- .../assets/curve/CurveRecursiveCollateral.sol | 194 ------------------ .../stakedao/StakeDAORecursiveCollateral.sol | 78 ------- 2 files changed, 272 deletions(-) delete mode 100644 contracts/plugins/assets/curve/CurveRecursiveCollateral.sol delete mode 100644 contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol deleted file mode 100644 index d39354f749..0000000000 --- a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol +++ /dev/null @@ -1,194 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "@openzeppelin/contracts/utils/math/Math.sol"; -import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; -import "../../../interfaces/IRToken.sol"; -import "../../../libraries/Fixed.sol"; -import "../curve/CurveStableCollateral.sol"; -import "../OracleLib.sol"; - -/** - * @title CurveRecursiveCollateral - * @notice Collateral plugin for a CurveLP token for a pool between a - * a USD reference token and a USD RToken. - * - * Note: - * - The RToken _must_ be the same RToken using this plugin as collateral! - * - The RToken SHOULD have an RSR overcollateralization layer. DO NOT USE WITHOUT RSR! - * - The LP token should be worth ~2x the reference token. Do not use with 1x lpTokens. - * - * tok = ConvexStakingWrapper or CurveGaugeWrapper - * ref = coins(0) in the pool - * tar = USD - * UoA = USD - */ -contract CurveRecursiveCollateral is CurveStableCollateral { - using OracleLib for AggregatorV3Interface; - using FixLib for uint192; - - IRToken internal immutable rToken; // token1 - - /// @param config.erc20 must be of type ConvexStakingWrapper or CurveGaugeWrapper - /// @param config.chainlinkFeed Feed units: {UoA/ref} - constructor( - CollateralConfig memory config, - uint192 revenueHiding, - PTConfiguration memory ptConfig - ) CurveStableCollateral(config, revenueHiding, ptConfig) { - rToken = IRToken(address(token1)); - exposedReferencePrice = _safeWrap(curvePool.get_virtual_price()).mul(revenueShowing); - // exposedReferencePrice is re-used to be the LP token's virtual price - } - - /// Can revert, used by other contract functions in order to catch errors - /// Should not return FIX_MAX for low - /// Should only return FIX_MAX for high if low is 0 - /// @return low {UoA/tok} The low price estimate - /// @return high {UoA/tok} The high price estimate - /// @return {target/ref} Unused. Always 0 - function tryPrice() - external - view - virtual - override - returns ( - uint192 low, - uint192 high, - uint192 - ) - { - // This pricing method is MEV-resistant, but only gives a lower-bound - // for the value of the LP token collateral. It could be that the pool is - // very imbalanced, in which case the LP token could be worth more than this - // method says it is if you can redeem the LP before any further swaps occur. - - // {UoA/tok} = {UoA/ref} * {ref/tok} - uint192 price = chainlinkFeed.price(oracleTimeout).mul(underlyingRefPerTok()); - - // {UoA/tok} = {UoA/tok} * {1} - uint192 err = price.mul(oracleError, CEIL); - - // we'll overwrite these later... - low = price - err; - high = price + err; - // assert(low <= high); // obviously true by inspection - - return (low, high, 0); - } - - /// Should not revert - /// Refresh exchange rates and update default status. - /// Have to override to add custom default checks - function refresh() public virtual override { - CollateralStatus oldStatus = status(); - - try this.underlyingRefPerTok() returns (uint192) { - // Instead of ensuring the underlyingRefPerTok is up-only, solely check - // that the pool's virtual price is up-only. Otherwise this collateral - // would create default cascades. - - // {ref/tok} - uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); - - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = virtualPrice.mul(revenueShowing); - - // uint192(<) is equivalent to Fix.lt - if (virtualPrice < exposedReferencePrice) { - exposedReferencePrice = virtualPrice; - markStatus(CollateralStatus.DISABLED); - } else if (hiddenReferencePrice > exposedReferencePrice) { - exposedReferencePrice = hiddenReferencePrice; - } - - // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - // {UoA/tok}, {UoA/tok}, {UoA/tok} - // (0, 0) is a valid price; (0, FIX_MAX) is unpriced - - // Save prices if priced - if (high < FIX_MAX) { - savedLowPrice = low; - savedHighPrice = high; - lastSave = uint48(block.timestamp); - } else { - // must be unpriced - // untested: - // validated in other plugins, cost to test here is high - assert(low == 0); - } - - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { - markStatus(CollateralStatus.IFFY); - } else { - markStatus(CollateralStatus.SOUND); - } - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.IFFY); - } - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - markStatus(CollateralStatus.DISABLED); - } - - CollateralStatus newStatus = status(); - if (oldStatus != newStatus) { - emit CollateralStatusChanged(oldStatus, newStatus); - } - } - - /// @dev Not up-only! The RToken can devalue its exchange rate peg - /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens - function underlyingRefPerTok() public view virtual override returns (uint192) { - // {ref/tok} = quantity of the reference unit token in the pool per vault token - // the vault is 1:1 with the LP token - - // {lpToken@t=0/lpToken} - uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); - // this is missing the fact that USDC+ has also appreciated in this time - - // {BU/rTok} - uint192 rTokenRate = divuu(rToken.basketsNeeded(), rToken.totalSupply()); - // not worth the gas to protect against div-by-zero - - // The rTokenRate is not up-only! We should expect decreases when other - // collateral default and there is not enough RSR stake to cover the hole. - - // {ref/tok} = {ref/lpToken} = {lpToken@t=0/lpToken} * {1} * 2{ref/lpToken@t=0} - return virtualPrice.mul(rTokenRate.sqrt()).mulu(2); // LP token worth twice as much - } - - // === Internal === - - // Override this later to implement non-standard recursive pools - function _anyDepeggedInPool() internal view virtual override returns (bool) { - // Assumption: token0 is the reference token; token1 is the RToken - - // Check reference token - try this.tokenPrice(0) returns (uint192 low, uint192 high) { - // {UoA/tok} = {UoA/tok} + {UoA/tok} - uint192 mid = (low + high) / 2; - - // If the price is below the default-threshold price, default eventually - // uint192(+/-) is the same as Fix.plus/minus - if (mid < pegBottom || mid > pegTop) return true; - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - // untested: - // pattern validated in other plugins, cost to test is high - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return true; - } - - // Ignore the status of the RToken since it can manage itself - - return false; - } -} diff --git a/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol deleted file mode 100644 index f3e363801f..0000000000 --- a/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol +++ /dev/null @@ -1,78 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; -import "../CurveRecursiveCollateral.sol"; - -interface IStakeDAOVault is IERC20Metadata { - function token() external view returns (IERC20Metadata); - - function liquidityGauge() external view returns (IStakeDAOGauge); -} - -interface IStakeDAOGauge { - function claimer() external view returns (IStakeDAOClaimer); - - function reward_count() external view returns (uint256); - - function reward_tokens(uint256 index) external view returns (IERC20Metadata); -} - -interface IStakeDAOClaimer { - function claimRewards(address[] memory gauges, bool claimVeSDT) external; -} - -/** - * @title StakeDAORecursiveCollateral - * @notice Collateral plugin for a StakeDAO USDC+LP-f Vault that contains - * a Curve pool with a reference token and an RToken. The RToken can be - * of like kind of up-only in relation to the reference token. - * - * tok = sdUSDC+LP-f Vault - * ref = USDC - * tar = USD - * UoA = USD - */ -contract StakeDAORecursiveCollateral is CurveRecursiveCollateral { - using OracleLib for AggregatorV3Interface; - using FixLib for uint192; - - IStakeDAOGauge internal immutable gauge; - IStakeDAOClaimer internal immutable claimer; - - /// @param config.erc20 must be of type IStakeDAOVault - /// @param config.chainlinkFeed Feed units: {UoA/ref} - constructor( - CollateralConfig memory config, - uint192 revenueHiding, - PTConfiguration memory ptConfig - ) CurveRecursiveCollateral(config, revenueHiding, ptConfig) { - IStakeDAOVault vault = IStakeDAOVault(address(config.erc20)); - gauge = vault.liquidityGauge(); - claimer = gauge.claimer(); - } - - /// @custom:delegate-call - function claimRewards() external override { - uint256 count = gauge.reward_count(); - - // Save initial bals - IERC20Metadata[] memory rewardTokens = new IERC20Metadata[](count); - uint256[] memory bals = new uint256[](count); - for (uint256 i = 0; i < count; i++) { - rewardTokens[i] = gauge.reward_tokens(i); - bals[i] = rewardTokens[i].balanceOf(address(this)); - } - - // Do actual claim - address[] memory gauges = new address[](1); - gauges[0] = address(gauge); - claimer.claimRewards(gauges, false); - - // Emit balance changes - for (uint256 i = 0; i < rewardTokens.length; i++) { - IERC20Metadata rewardToken = rewardTokens[i]; - emit RewardsClaimed(rewardToken, rewardToken.balanceOf(address(this)) - bals[i]); - } - } -} From 6c8ac5110654b6234adeb98c4f1bd33ede853867 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 16 Apr 2024 15:53:16 +0530 Subject: [PATCH 339/450] Remove PERIOD --- contracts/p1/Furnace.sol | 12 ++++-------- contracts/p1/StRSR.sol | 9 +++------ 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 6765b06631..1c1391c1d6 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -13,10 +13,6 @@ contract FurnaceP1 is ComponentP1, IFurnace { using FixLib for uint192; uint192 public constant MAX_RATIO = 1e14; // {1} 0.01% - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - uint48 public constant PERIOD = 1; // {s} distribution period - // historical artifact IRToken private rToken; @@ -61,23 +57,23 @@ contract FurnaceP1 is ComponentP1, IFurnace { // let numPeriods = number of whole periods that have passed since `lastPayout` // payoutAmount = RToken.balanceOf(this) * (1 - (1-ratio)**N) from [furnace-payout-formula] // effects: - // lastPayout' = lastPayout + numPeriods * PERIOD (end of last pay period) + // lastPayout' = lastPayout + numPeriods (end of last pay period) // lastPayoutBal' = rToken.balanceOf'(this) (balance now == at end of pay leriod) // actions: // rToken.melt(payoutAmount), paying payoutAmount to RToken holders function melt() public { - if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; + if (uint48(block.timestamp) < uint64(lastPayout)) return; // # of whole periods that have passed since lastPayout - uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; + uint48 numPeriods = uint48((block.timestamp) - lastPayout); // Paying out the ratio r, N times, equals paying out the ratio (1 - (1-r)^N) 1 time. uint192 payoutRatio = FIX_ONE.minus(FIX_ONE.minus(ratio).powu(numPeriods)); uint256 amount = payoutRatio.mulu_toUint(lastPayoutBal); - lastPayout += numPeriods * PERIOD; + lastPayout += numPeriods; lastPayoutBal = rToken.balanceOf(address(this)) - amount; if (amount > 0) rToken.melt(amount); } diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 5f0bd1dab2..8ee8d3ff09 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -33,9 +33,6 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab using CountersUpgradeable for CountersUpgradeable.Counter; using SafeERC20Upgradeable for IERC20Upgradeable; - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - uint48 private constant PERIOD = 1; // {s} 1 second /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase uint48 private constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes @@ -592,8 +589,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // rewards_N = rewards_0 * (1-payoutRatio) ^ N // payout = rewards_N - rewards_0 = rewards_0 * (1 - (1-payoutRatio)^N) function _payoutRewards() internal { - if (block.timestamp < payoutLastPaid + PERIOD) return; - uint48 numPeriods = (uint48(block.timestamp) - payoutLastPaid) / PERIOD; + if (block.timestamp < payoutLastPaid) return; + uint48 numPeriods = uint48(block.timestamp) - payoutLastPaid; uint192 initRate = exchangeRate(); uint256 payout; @@ -611,7 +608,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab stakeRSR += payout; } - payoutLastPaid += numPeriods * PERIOD; + payoutLastPaid += numPeriods; rsrRewardsAtLastPayout = rsrRewards(); // stakeRate else case: D18{qStRSR/qRSR} = {qStRSR} * D18 / {qRSR} From 217fe740b062121eb014cf93b969662c02ca3f65 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Tue, 16 Apr 2024 21:44:58 +0530 Subject: [PATCH 340/450] the fix --- contracts/p1/Furnace.sol | 2 +- contracts/p1/StRSR.sol | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 1c1391c1d6..7a2cbfaacf 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -63,7 +63,7 @@ contract FurnaceP1 is ComponentP1, IFurnace { // rToken.melt(payoutAmount), paying payoutAmount to RToken holders function melt() public { - if (uint48(block.timestamp) < uint64(lastPayout)) return; + if (uint48(block.timestamp) < uint64(lastPayout + 1)) return; // # of whole periods that have passed since lastPayout uint48 numPeriods = uint48((block.timestamp) - lastPayout); diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 8ee8d3ff09..83a2476d3d 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -589,7 +589,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // rewards_N = rewards_0 * (1-payoutRatio) ^ N // payout = rewards_N - rewards_0 = rewards_0 * (1 - (1-payoutRatio)^N) function _payoutRewards() internal { - if (block.timestamp < payoutLastPaid) return; + if (block.timestamp < payoutLastPaid + 1) return; uint48 numPeriods = uint48(block.timestamp) - payoutLastPaid; uint192 initRate = exchangeRate(); From bb5df5dee80fee4efeb089378ca272d9765044c0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Apr 2024 12:25:37 -0400 Subject: [PATCH 341/450] 13 --- common/configuration.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/common/configuration.ts b/common/configuration.ts index a9c813fcb2..d52398b321 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -242,14 +242,12 @@ export const networkConfig: { [key: string]: INetworkConfig } = { BUSD: '0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A', USDP: '0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3', TUSD: '0xec746eCF986E2927Abd291a2A1716c940100f8Ba', - sUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', FRAX: '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', MIM: '0x7A364e8770418566e3eb2001A96116E6138Eb32F', crvUSD: '0xEEf0C605546958c1f899b6fB336C20671f9cD49F', ETH: '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', WBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', BTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', - EURT: '0x01D391A48f4F7339aC64CA2c83a07C22F95F587a', EUR: '0xb49f677943BC038e9857d61E7d053CaA2C1734C1', CVX: '0xd962fC30A72A84cE50161031391756Bf2876Af5D', CRV: '0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f', @@ -349,13 +347,11 @@ export const networkConfig: { [key: string]: INetworkConfig } = { BUSD: '0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A', USDP: '0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3', TUSD: '0xec746eCF986E2927Abd291a2A1716c940100f8Ba', - sUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', FRAX: '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', MIM: '0x7A364e8770418566e3eb2001A96116E6138Eb32F', ETH: '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', WBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', BTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', - EURT: '0x01D391A48f4F7339aC64CA2c83a07C22F95F587a', EUR: '0xb49f677943BC038e9857d61E7d053CaA2C1734C1', CVX: '0xd962fC30A72A84cE50161031391756Bf2876Af5D', CRV: '0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f', @@ -440,7 +436,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { TUSD: '0x96aeE109dF58D4391C965FAbc2625f92dB363410', FRAX: '0x5FbDB2315678afecb367f032d93F642f64180aa3', WBTC: '0xe52CE9436F2D4D4B744720aAEEfD9C6dbFC00b34', - EURT: '0x68aA66BCde901c741C5EF07314875434E51E5D30', EUR: '0x12336777de46b9a6Edd7176E532810149C787bcD', rETH: '0xeb1cDb6C2F18173eaC53fEd1DC03fe13286f86ec', stETHUSD: '0x6dCCE86FFb3c1FC44Ded9a6E200eF12d0D4256a3', From abfe1152b79fa351b170ddffe9a39d37129dd134 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Apr 2024 12:26:34 -0400 Subject: [PATCH 342/450] 27 --- contracts/p1/BasketHandler.sol | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 02149cdf0a..8f2518a78d 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -235,8 +235,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { ); } else if (normalize && config.erc20s.length != 0) { // Confirm reference basket is SOUND - assetRegistry.refresh(); - require(status() == CollateralStatus.SOUND, "unsound basket"); + assetRegistry.refresh(); // will set lastStatus + require(lastStatus == CollateralStatus.SOUND, "unsound basket"); // Normalize targetAmts based on UoA value of reference basket (uint192 low, uint192 high) = _price(false); From 4294c52d786c69794999944457519c08a367934b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Apr 2024 12:41:11 -0400 Subject: [PATCH 343/450] undo 12 --- contracts/p1/BackingManager.sol | 4 +-- contracts/p1/BasketHandler.sol | 4 +-- contracts/p1/Broker.sol | 16 ++++++----- contracts/p1/Distributor.sol | 7 ++--- contracts/p1/RToken.sol | 38 +++++++++++++++----------- contracts/p1/StRSR.sol | 44 ++++++++++++++++++------------- contracts/p1/StRSRVotes.sol | 9 ++++--- contracts/p1/mixins/Component.sol | 2 +- 8 files changed, 70 insertions(+), 54 deletions(-) diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 4827ba438a..3d3afe25f6 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -87,7 +87,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { trade = super.settleTrade(sell); // nonReentrant // if the settler is the trade contract itself, try chaining with another rebalance() - if (msg.sender == address(trade)) { + if (_msgSender() == address(trade)) { // solhint-disable-next-line no-empty-blocks try this.rebalance(trade.KIND()) {} catch (bytes memory errData) { // prevent MEV searchers from providing less gas on purpose by reverting if OOG @@ -113,7 +113,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // DoS prevention: // unless caller is self, require that the next auction is not in same block require( - msg.sender == address(this) || tradeEnd[kind] + 1 < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" ); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 8f2518a78d..4c4d76535b 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -128,7 +128,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // checks: caller is assetRegistry // effects: disabled' = true function disableBasket() external { - require(msg.sender == address(assetRegistry), "asset registry only"); + require(_msgSender() == address(assetRegistry), "asset registry only"); uint256 len = basket.erc20s.length; uint192[] memory refAmts = new uint192[](len); @@ -152,7 +152,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { assetRegistry.refresh(); require( - main.hasRole(OWNER, msg.sender) || + main.hasRole(OWNER, _msgSender()) || (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 931e62c257..4339534d9e 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -113,18 +113,20 @@ contract BrokerP1 is ComponentP1, IBroker { TradeRequest memory req, TradePrices memory prices ) external returns (ITrade) { + address caller = _msgSender(); + require( - msg.sender == address(backingManager) || - msg.sender == address(rsrTrader) || - msg.sender == address(rTokenTrader), + caller == address(backingManager) || + caller == address(rsrTrader) || + caller == address(rTokenTrader), "only traders" ); // Must be updated when new TradeKinds are created if (kind == TradeKind.BATCH_AUCTION) { - return newBatchAuction(req, msg.sender); + return newBatchAuction(req, caller); } - return newDutchAuction(req, prices, ITrading(msg.sender)); + return newDutchAuction(req, prices, ITrading(caller)); } /// Disable the broker until re-enabled by governance @@ -132,8 +134,8 @@ contract BrokerP1 is ComponentP1, IBroker { // checks: caller is a Trade this contract cloned // effects: disabled' = true function reportViolation() external { - require(trades[msg.sender], "unrecognized trade contract"); - ITrade trade = ITrade(msg.sender); + require(trades[_msgSender()], "unrecognized trade contract"); + ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); if (kind == TradeKind.BATCH_AUCTION) { diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 4bd4d8ea1e..75ec383c54 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -90,7 +90,8 @@ contract DistributorP1 is ComponentP1, IDistributor { function distribute(IERC20 erc20, uint256 amount) external { // Intentionally do not check notTradingPausedOrFrozen, since handled by caller - require(msg.sender == rsrTrader || msg.sender == rTokenTrader, "RevenueTraders only"); + address caller = _msgSender(); + require(caller == rsrTrader || caller == rTokenTrader, "RevenueTraders only"); require(erc20 == rsr || erc20 == rToken, "RSR or RToken"); bool isRSR = erc20 == rsr; // if false: isRToken uint256 tokensPerShare; @@ -132,12 +133,12 @@ contract DistributorP1 is ComponentP1, IDistributor { transfers[numTransfers] = Transfer({ addrTo: addrTo, amount: transferAmt }); ++numTransfers; } - emit RevenueDistributed(erc20, msg.sender, amount); + emit RevenueDistributed(erc20, caller, amount); // == Interactions == for (uint256 i = 0; i < numTransfers; ++i) { Transfer memory t = transfers[i]; - IERC20Upgradeable(address(erc20)).safeTransferFrom(msg.sender, t.addrTo, t.amount); + IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); } // Perform reward accounting diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index d4c13dae1b..16033d664e 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -92,7 +92,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity of RToken to issue /// @custom:interaction nearly CEI, but see comments around handling of refunds function issue(uint256 amount) public { - issueTo(msg.sender, amount); + issueTo(_msgSender(), amount); } /// Issue an RToken on the current basket, to a particular recipient @@ -111,6 +111,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks-effects block == + address issuer = _msgSender(); // OK to save: it can't be changed in reentrant runs + // Ensure basket is ready, SOUND and not in warmup period require(basketHandler.isReady(), "basket not ready"); uint256 supply = totalSupply(); @@ -131,7 +133,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { uint192 amtBaskets = supply != 0 ? basketsNeeded.muluDivu(amount, supply, CEIL) : _safeWrap(amount); - emit Issuance(msg.sender, recipient, amount, amtBaskets); + emit Issuance(issuer, recipient, amount, amtBaskets); (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote( amtBaskets, @@ -143,7 +145,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { for (uint256 i = 0; i < erc20s.length; ++i) { IERC20Upgradeable(erc20s[i]).safeTransferFrom( - msg.sender, + issuer, address(backingManager), deposits[i] ); @@ -154,7 +156,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity {qRToken} of RToken to redeem /// @custom:interaction CEI function redeem(uint256 amount) external { - redeemTo(msg.sender, amount); + redeemTo(_msgSender(), amount); } /// Redeem RToken for basket collateral to a particular recipient @@ -182,8 +184,10 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks and Effects == + address caller = _msgSender(); + require(amount != 0, "Cannot redeem zero"); - require(amount <= balanceOf(msg.sender), "insufficient balance"); + require(amount <= balanceOf(caller), "insufficient balance"); require(basketHandler.fullyCollateralized(), "partial redemption; use redeemCustom"); // redemption while IFFY/DISABLED allowed @@ -194,8 +198,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(supply, int256(amount)); // reverts on over-redemption // {BU} - uint192 baskets = _scaleDown(msg.sender, amount); - emit Redemption(msg.sender, recipient, amount, baskets); + uint192 baskets = _scaleDown(caller, amount); + emit Redemption(caller, recipient, amount, baskets); (address[] memory erc20s, uint256[] memory amounts) = basketHandler.quote(baskets, FLOOR); @@ -254,7 +258,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // == Checks and Effects == require(amount != 0, "Cannot redeem zero"); - require(amount <= balanceOf(msg.sender), "insufficient balance"); + require(amount <= balanceOf(_msgSender()), "insufficient balance"); uint256 portionsSum; for (uint256 i = 0; i < portions.length; ++i) { portionsSum += portions[i]; @@ -268,8 +272,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(supply, int256(amount)); // reverts on over-redemption // {BU} - uint192 baskets = _scaleDown(msg.sender, amount); - emit Redemption(msg.sender, recipient, amount, baskets); + uint192 baskets = _scaleDown(_msgSender(), amount); + emit Redemption(_msgSender(), recipient, amount, baskets); // === Get basket redemption amounts === @@ -344,7 +348,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // basketsNeeded' = basketsNeeded + baskets // BU exchange rate cannot decrease, and it can only increase when < FIX_ONE. function mint(uint192 baskets) external { - require(msg.sender == address(backingManager), "not backing manager"); + require(_msgSender() == address(backingManager), "not backing manager"); _scaleUp(address(backingManager), baskets, totalSupply()); } @@ -358,8 +362,9 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // BU exchange rate cannot decrease // BU exchange rate CAN increase, but we already trust furnace to do this slowly function melt(uint256 amtRToken) external { - require(msg.sender == address(furnace), "furnace only"); - _burn(msg.sender, amtRToken); + address caller = _msgSender(); + require(caller == address(furnace), "furnace only"); + _burn(caller, amtRToken); emit Melted(amtRToken); } @@ -374,8 +379,9 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // basketsNeeded' = basketsNeeded - baskets // BU exchange rate cannot decrease, and it can only increase when < FIX_ONE. function dissolve(uint256 amount) external { - require(msg.sender == address(backingManager), "not backing manager"); - _scaleDown(msg.sender, amount); + address caller = _msgSender(); + require(caller == address(backingManager), "not backing manager"); + _scaleDown(caller, amount); } /// An affordance of last resort for Main in order to ensure re-capitalization @@ -383,7 +389,7 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { // checks: caller is backingManager // effects: basketsNeeded' = basketsNeeded_ function setBasketsNeeded(uint192 basketsNeeded_) external notTradingPausedOrFrozen { - require(msg.sender == address(backingManager), "not backing manager"); + require(_msgSender() == address(backingManager), "not backing manager"); emit BasketsNeededChanged(basketsNeeded, basketsNeeded_); basketsNeeded = basketsNeeded_; diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index b19c126d4a..25acd1235e 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -231,10 +231,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab _payoutRewards(); // Mint new stakes - mintStakes(msg.sender, rsrAmount); + address caller = _msgSender(); + mintStakes(caller, rsrAmount); // == Interactions == - IERC20Upgradeable(address(rsr)).safeTransferFrom(msg.sender, address(this), rsrAmount); + IERC20Upgradeable(address(rsr)).safeTransferFrom(caller, address(this), rsrAmount); } /// Begins a delayed unstaking for `amount` StRSR @@ -259,15 +260,16 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function unstake(uint256 stakeAmount) external { requireNotTradingPausedOrFrozen(); + address account = _msgSender(); require(stakeAmount != 0, "zero amount"); - require(stakes[era][msg.sender] >= stakeAmount, "insufficient balance"); + require(stakes[era][account] >= stakeAmount, "insufficient balance"); _payoutRewards(); // ==== Compute changes to stakes and RSR accounting // rsrAmount: how many RSR to move from the stake pool to the draft pool // pick rsrAmount as big as we can such that (newTotalStakes <= newStakeRSR * stakeRate) - _burn(msg.sender, stakeAmount); + _burn(account, stakeAmount); // newStakeRSR: {qRSR} = D18 * {qStRSR} / D18{qStRSR/qRSR} uint256 newStakeRSR = (FIX_ONE_256 * totalStakes + (stakeRate - 1)) / stakeRate; @@ -275,8 +277,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab stakeRSR = newStakeRSR; // Create draft - (uint256 index, uint64 availableAt) = pushDraft(msg.sender, rsrAmount); - emit UnstakingStarted(index, draftEra, msg.sender, rsrAmount, stakeAmount, availableAt); + (uint256 index, uint64 availableAt) = pushDraft(account, rsrAmount); + emit UnstakingStarted(index, draftEra, account, rsrAmount, stakeAmount, availableAt); } /// Complete an account's unstaking; callable by anyone @@ -345,13 +347,14 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:interaction CEI function cancelUnstake(uint256 endId) external { requireNotFrozen(); + address account = _msgSender(); // We specifically allow unstaking when under collateralized // require(basketHandler.fullyCollateralized(), "RToken uncollateralized"); // require(basketHandler.isReady(), "basket not ready"); - uint256 firstId = firstRemainingDraft[draftEra][msg.sender]; - CumulativeDraft[] storage queue = draftQueues[draftEra][msg.sender]; + uint256 firstId = firstRemainingDraft[draftEra][account]; + CumulativeDraft[] storage queue = draftQueues[draftEra][account]; if (endId == 0 || firstId >= endId) return; require(endId <= queue.length, "index out-of-bounds"); @@ -365,7 +368,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint192 draftAmount = queue[endId - 1].drafts - oldDrafts; // advance queue past withdrawal - firstRemainingDraft[draftEra][msg.sender] = endId; + firstRemainingDraft[draftEra][account] = endId; // ==== Compute RSR amount uint256 newTotalDrafts = totalDrafts - draftAmount; @@ -381,10 +384,10 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // ==== Transfer RSR from the draft pool totalDrafts = newTotalDrafts; draftRSR = newDraftRSR; - emit UnstakingCancelled(firstId, endId, draftEra, msg.sender, rsrAmount); + emit UnstakingCancelled(firstId, endId, draftEra, account, rsrAmount); // Mint new stakes - mintStakes(msg.sender, rsrAmount); + mintStakes(account, rsrAmount); } /// @param rsrAmount {qRSR} @@ -424,7 +427,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function seizeRSR(uint256 rsrAmount) external { requireNotTradingPausedOrFrozen(); - require(msg.sender == address(backingManager), "!bm"); + address caller = _msgSender(); + require(caller == address(backingManager), "!bm"); require(rsrAmount != 0, "zero amount"); uint256 rsrBalance = rsr.balanceOf(address(this)); @@ -473,7 +477,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // Transfer RSR to caller emit ExchangeRateSet(initRate, exchangeRate()); - IERC20Upgradeable(address(rsr)).safeTransfer(msg.sender, seizedRSR); + IERC20Upgradeable(address(rsr)).safeTransfer(caller, seizedRSR); } /// @custom:governance @@ -769,7 +773,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab } function transfer(address to, uint256 amount) public returns (bool) { - _transfer(msg.sender, to, amount); + _transfer(_msgSender(), to, amount); return true; } @@ -778,7 +782,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab * `transferFrom`. This is semantically equivalent to an infinite approval. */ function approve(address spender, uint256 amount) public returns (bool) { - _approve(msg.sender, spender, amount); + _approve(_msgSender(), spender, amount); return true; } @@ -791,21 +795,23 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 amount ) public returns (bool) { - _spendAllowance(from, msg.sender, amount); + _spendAllowance(from, _msgSender(), amount); _transfer(from, to, amount); return true; } function increaseAllowance(address spender, uint256 addedValue) public returns (bool) { - _approve(msg.sender, spender, _allowances[era][msg.sender][spender] + addedValue); + address owner = _msgSender(); + _approve(owner, spender, _allowances[era][owner][spender] + addedValue); return true; } function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) { - uint256 currentAllowance = _allowances[era][msg.sender][spender]; + address owner = _msgSender(); + uint256 currentAllowance = _allowances[era][owner][spender]; require(currentAllowance >= subtractedValue, "decrease allowance"); unchecked { - _approve(msg.sender, spender, currentAllowance - subtractedValue); + _approve(owner, spender, currentAllowance - subtractedValue); } return true; diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 1606829122..c79f9d2ebc 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -130,7 +130,7 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { } function delegate(address delegatee) public { - _delegate(msg.sender, delegatee); + _delegate(_msgSender(), delegatee); } function delegateBySig( @@ -156,14 +156,15 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { /// votes from the sender to `delegatee` or self function stakeAndDelegate(uint256 rsrAmount, address delegatee) external { stake(rsrAmount); - address currentDelegate = delegates(msg.sender); + address caller = _msgSender(); + address currentDelegate = delegates(caller); if (delegatee == address(0) && currentDelegate == address(0)) { // Delegate to self if no delegate defined and no delegatee provided - _delegate(msg.sender, msg.sender); + _delegate(caller, caller); } else if (delegatee != address(0) && currentDelegate != delegatee) { // Delegate to delegatee if provided and different than current delegate - _delegate(msg.sender, delegatee); + _delegate(caller, delegatee); } } diff --git a/contracts/p1/mixins/Component.sol b/contracts/p1/mixins/Component.sol index 53e5ea07ba..aac70ec217 100644 --- a/contracts/p1/mixins/Component.sol +++ b/contracts/p1/mixins/Component.sol @@ -54,7 +54,7 @@ abstract contract ComponentP1 is } modifier governance() { - require(main.hasRole(OWNER, msg.sender), "governance only"); + require(main.hasRole(OWNER, _msgSender()), "governance only"); _; } From 2cf64ee2e488535470470b0c57b64e87feacf581 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Apr 2024 12:54:29 -0400 Subject: [PATCH 344/450] fix integration tests --- test/integration/mainnet-test/FacadeActVersion.test.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/test/integration/mainnet-test/FacadeActVersion.test.ts b/test/integration/mainnet-test/FacadeActVersion.test.ts index 44755e476f..d81804b9bc 100644 --- a/test/integration/mainnet-test/FacadeActVersion.test.ts +++ b/test/integration/mainnet-test/FacadeActVersion.test.ts @@ -97,10 +97,7 @@ describeFork( it('Fixed ActFacet should return right revenueOverview', async () => { const FacadeActFactory = await ethers.getContractFactory('ActFacet') - const main = await ethers.getContractAt('IMain', await revenueTrader.main()) - const furnace = await ethers.getContractAt('FurnaceP1', await main.furnace()) - const period = await furnace.PERIOD() - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + period) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + ONE_PERIOD.toNumber()) newFacadeAct = await FacadeActFactory.deploy() const expectedSurpluses = [ From ffb7aa647906887ab906fe9a52217dc0763dcb96 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 10:08:33 -0400 Subject: [PATCH 345/450] comment nit --- contracts/libraries/Throttle.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/libraries/Throttle.sol b/contracts/libraries/Throttle.sol index 7314325aa8..8619a3d5a9 100644 --- a/contracts/libraries/Throttle.sol +++ b/contracts/libraries/Throttle.sol @@ -39,7 +39,7 @@ library ThrottleLib { uint256 supply, int256 amount ) internal { - // untestable: amtRate will always be greater > 0 due to previous validations + // untestable: amtRate will always be > 0 due to previous validations if (throttle.params.amtRate == 0 && throttle.params.pctRate == 0) return; // Calculate hourly limit From 2fe43e6d29476a9c31c16db06c692dc4ef9d6b4b Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 17 Apr 2024 19:38:49 +0530 Subject: [PATCH 346/450] Upgrade `openzeppelin/contracts`, and upgrade protocol to always use time! (#1108) Co-authored-by: Taylor Brent Co-authored-by: Julian R Co-authored-by: Patrick McKelvy --- CHANGELOG.md | 6 + common/constants.ts | 4 +- contracts/facade/FacadeWrite.sol | 9 +- contracts/interfaces/IFacadeWrite.sol | 6 +- contracts/interfaces/IStRSRVotes.sol | 5 +- contracts/libraries/NetworkConfigLib.sol | 48 --- contracts/p0/BackingManager.sol | 15 +- contracts/p0/Broker.sol | 9 +- contracts/p0/Furnace.sol | 7 +- contracts/p0/StRSR.sol | 30 +- contracts/p1/BackingManager.sol | 17 +- contracts/p1/BasketHandler.sol | 2 +- contracts/p1/Broker.sol | 10 +- contracts/p1/Furnace.sol | 17 +- contracts/p1/StRSR.sol | 49 ++- contracts/p1/StRSRVotes.sol | 62 ++-- contracts/p1/mixins/Trading.sol | 2 +- contracts/plugins/governance/Governance.sol | 40 ++- contracts/plugins/mocks/DutchTradeRouter.sol | 2 - contracts/plugins/trading/DutchTrade.sol | 15 +- contracts/vendor/oz/Multicall.sol | 33 ++ package.json | 4 +- test/Broker.test.ts | 36 ++- test/Deployer.test.ts | 4 +- test/Facade.test.ts | 10 +- test/FacadeWrite.test.ts | 5 +- test/Furnace.test.ts | 114 +++---- test/Governance.test.ts | 131 ++++---- test/RToken.test.ts | 18 +- test/Recollateralization.test.ts | 29 +- test/Revenues.test.ts | 10 +- test/ZZStRSR.test.ts | 295 +++++++++--------- test/fixtures.ts | 2 +- test/integration/fixtures.ts | 2 +- .../mainnet-test/FacadeActVersion.test.ts | 2 +- .../aave/ATokenFiatCollateral.test.ts | 2 +- .../individual-collateral/collateralTests.ts | 2 +- .../compoundv2/CTokenFiatCollateral.test.ts | 2 +- .../curve/collateralTests.ts | 2 +- test/scenario/BadERC20.test.ts | 8 +- test/scenario/ComplexBasket.test.ts | 4 +- test/utils/time.ts | 2 + tsconfig.json | 4 +- yarn.lock | 26 +- 44 files changed, 510 insertions(+), 592 deletions(-) delete mode 100644 contracts/libraries/NetworkConfigLib.sol create mode 100644 contracts/vendor/oz/Multicall.sol diff --git a/CHANGELOG.md b/CHANGELOG.md index bb83db17bb..02befc5d1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,12 @@ ## Upgrade Steps +TODO + +Must-do: Upgrade Furnace melt + StRSR drip ratios at time of upgrade to be based on 1s. + +Should-do: Set Governance as Timelock CANCELLER_ROLE + ## Core Protocol Contracts ## Plugins diff --git a/common/constants.ts b/common/constants.ts index 06e166ba1b..f0cffa16b2 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -5,7 +5,9 @@ export const ONE_ADDRESS = '0x0000000000000000000000000000000000000001' export const ONE_ETH = BigNumber.from('1000000000000000000') -export const ONE_PERIOD = BigNumber.from('12') +export const ONE_PERIOD = BigNumber.from('1') + +export const ONE_DAY = BigNumber.from('86400') export const MAX_UINT256 = BigNumber.from(2).pow(256).sub(1) export const MAX_UINT192 = BigNumber.from(2).pow(192).sub(1) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index 2f4307ae1a..da3bef96e4 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -148,7 +148,8 @@ contract FacadeWrite is IFacadeWrite { TimelockController timelock = new TimelockController( govParams.timelockDelay, new address[](0), - new address[](0) + new address[](0), + address(this) ); // Deploy Governance contract @@ -163,11 +164,9 @@ contract FacadeWrite is IFacadeWrite { emit GovernanceCreated(rToken, governance, address(timelock)); // Setup Roles + timelock.grantRole(timelock.CANCELLER_ROLE(), governance); // Gov can cancel + timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); // Guardian can cancel timelock.grantRole(timelock.PROPOSER_ROLE(), governance); // Gov only proposer - // Set Guardian as canceller, if address(0) then no one can cancel - timelock.grantRole(timelock.CANCELLER_ROLE(), govRoles.guardian); - // Set Governance as canceller to enable killing timelock-stuck proposals - timelock.grantRole(timelock.CANCELLER_ROLE(), governance); timelock.grantRole(timelock.EXECUTOR_ROLE(), governance); // Gov only executor timelock.revokeRole(timelock.TIMELOCK_ADMIN_ROLE(), address(this)); // Revoke admin role diff --git a/contracts/interfaces/IFacadeWrite.sol b/contracts/interfaces/IFacadeWrite.sol index f56cd32947..837c68a106 100644 --- a/contracts/interfaces/IFacadeWrite.sol +++ b/contracts/interfaces/IFacadeWrite.sol @@ -56,11 +56,11 @@ struct BeneficiaryInfo { * @notice The set of params required to setup decentralized governance */ struct GovernanceParams { - uint256 votingDelay; // in blocks - uint256 votingPeriod; // in blocks + uint256 votingDelay; // in {s} + uint256 votingPeriod; // in {s} uint256 proposalThresholdAsMicroPercent; // e.g. 1e4 for 0.01% uint256 quorumPercent; // e.g 4 for 4% - uint256 timelockDelay; // in seconds (used for timelock) + uint256 timelockDelay; // in {s} (used for timelock) } /** diff --git a/contracts/interfaces/IStRSRVotes.sol b/contracts/interfaces/IStRSRVotes.sol index 246ead7cd5..128b86d75c 100644 --- a/contracts/interfaces/IStRSRVotes.sol +++ b/contracts/interfaces/IStRSRVotes.sol @@ -2,13 +2,14 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/governance/utils/IVotesUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/interfaces/IERC5805Upgradeable.sol"; -interface IStRSRVotes is IVotesUpgradeable { +interface IStRSRVotes is IVotesUpgradeable, IERC5805Upgradeable { /// @return The current era function currentEra() external view returns (uint256); /// @return The era at a past block number - function getPastEra(uint256 blockNumber) external view returns (uint256); + function getPastEra(uint256 timepoint) external view returns (uint256); /// Stakes an RSR `amount` on the corresponding RToken and allows to delegate /// votes from the sender to `delegatee` or self diff --git a/contracts/libraries/NetworkConfigLib.sol b/contracts/libraries/NetworkConfigLib.sol deleted file mode 100644 index dbdf9731a1..0000000000 --- a/contracts/libraries/NetworkConfigLib.sol +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -interface ArbSys { - function arbBlockNumber() external view returns (uint256); -} - -ArbSys constant ARB_SYS = ArbSys(0x0000000000000000000000000000000000000064); // arb precompile - -/** - * @title NetworkConfigLib - * @notice Provides network-specific configuration parameters - */ -library NetworkConfigLib { - error InvalidNetwork(); - - // Returns the blocktime based on the current network (e.g. 12s for Ethereum PoS) - // See docs/system-design.md for discussion of handling longer or shorter times - /// @dev Round up to 1 if block time <1s - function blocktime() internal view returns (uint48) { - uint256 chainId = block.chainid; - // untestable: - // most of the branches will be shown as uncovered, because we only run coverage - // on local Ethereum PoS network (31337). Manual testing was performed. - if (chainId == 1 || chainId == 3 || chainId == 5 || chainId == 31337) { - return 12; // Ethereum PoS, Goerli, HH (tests) - } else if (chainId == 8453 || chainId == 84531) { - return 2; // Base, Base Goerli - } else if (chainId == 42161 || chainId == 421614) { - return 1; // round up to 1 even though Arbitrum is ~0.26s - } else { - revert InvalidNetwork(); - } - } - - // Returns the current blocknumber based on the current network - // Some L2s such as Arbitrum have special-cased their block number function - function blockNumber() internal view returns (uint256) { - // untestable: - // most of the branches will be shown as uncovered, because we only run coverage - // on local Ethereum PoS network (31337). Manual testing was performed. - if (block.chainid == 42161 || block.chainid == 421614) { - return ARB_SYS.arbBlockNumber(); // use arbitrum precompile - } else { - return block.number; - } - } -} diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 34a28ce66a..ba690e61ab 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -11,7 +11,6 @@ import "../interfaces/IBroker.sol"; import "../interfaces/IMain.sol"; import "../libraries/Array.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; /** * @title BackingManager @@ -21,12 +20,9 @@ contract BackingManagerP0 is TradingP0, IBackingManager { using FixLib for uint192; using SafeERC20 for IERC20; - uint48 public constant MAX_TRADING_DELAY = 31536000; // {s} 1 year + uint48 public constant MAX_TRADING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_BACKING_BUFFER = 1e18; // {%} - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable ONE_BLOCK; // {s} 1 block based on network - uint48 public tradingDelay; // {s} how long to wait until resuming trading after switching uint192 public backingBuffer; // {%} how much extra backing collateral to keep @@ -34,10 +30,6 @@ contract BackingManagerP0 is TradingP0, IBackingManager { mapping(IERC20 => uint192) private tokensOut; // {tok} token balances out in ITrades - constructor() { - ONE_BLOCK = NetworkConfigLib.blocktime(); - } - function init( IMain main_, uint48 tradingDelay_, @@ -90,9 +82,10 @@ contract BackingManagerP0 is TradingP0, IBackingManager { function rebalance(TradeKind kind) external notTradingPausedOrFrozen { main.assetRegistry().refresh(); - // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions + // DoS prevention: + // unless caller is self, require that the next auction is not in same block require( - _msgSender() == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" ); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index b53c2e0417..1a6345cfee 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -11,7 +11,6 @@ import "../interfaces/IBroker.sol"; import "../interfaces/IMain.sol"; import "../interfaces/ITrade.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "./mixins/Component.sol"; // Gnosis: uint96 ~= 7e28 @@ -23,9 +22,9 @@ contract BrokerP0 is ComponentP0, IBroker { using EnumerableSet for EnumerableSet.AddressSet; using SafeERC20 for IERC20Metadata; - uint48 public constant MAX_AUCTION_LENGTH = 604800; // {s} max valid duration -1 week + uint48 public constant MAX_AUCTION_LENGTH = 60 * 60 * 24 * 7; // {s} max valid duration, 1 week // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_AUCTION_LENGTH; // {s} 20 blocks, based on network + uint48 public constant MIN_AUCTION_LENGTH = 20 * 3; // {s} 60 seconds auction min duration // Added for interface compatibility with P1 ITrade public batchTradeImplementation; @@ -42,10 +41,6 @@ contract BrokerP0 is ComponentP0, IBroker { mapping(IERC20Metadata => bool) public dutchTradeDisabled; - constructor() { - MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 20; - } - function init( IMain main_, IGnosis gnosis_, diff --git a/contracts/p0/Furnace.sol b/contracts/p0/Furnace.sol index ea0a404a2e..53fd90ebb5 100644 --- a/contracts/p0/Furnace.sol +++ b/contracts/p0/Furnace.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.19; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../interfaces/IFurnace.sol"; import "./mixins/Component.sol"; @@ -15,7 +14,7 @@ contract FurnaceP0 is ComponentP0, IFurnace { uint192 public constant MAX_RATIO = 1e14; // {1} 0.01% // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {seconds} 1 block based on network + uint48 public constant PERIOD = 1; // {s} distribution period uint192 public ratio; // {1} What fraction of balance to melt each PERIOD @@ -23,10 +22,6 @@ contract FurnaceP0 is ComponentP0, IFurnace { uint48 public lastPayout; // {seconds} The last time we did a payout uint256 public lastPayoutBal; // {qRTok} The balance of RToken at the last payout - constructor() { - PERIOD = NetworkConfigLib.blocktime(); - } - function init(IMain main_, uint192 ratio_) public initializer { __Component_init(main_); setRatio(ratio_); diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index ba887e30e0..86e8b2eb42 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -14,7 +14,6 @@ import "../interfaces/IBasketHandler.sol"; import "../interfaces/IStRSR.sol"; import "../interfaces/IMain.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../libraries/Permit.sol"; import "./mixins/Component.sol"; @@ -33,10 +32,10 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { using FixLib for uint192; // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {s} 1 block based on network + uint48 public constant PERIOD = 1; // {s} 1 second // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_UNSTAKING_DELAY; // {s} based on network - uint48 public constant MAX_UNSTAKING_DELAY = 31536000; // {s} 1 year + uint48 public constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes + uint48 public constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% uint192 public constant MAX_WITHDRAWAL_LEAK = 3e17; // {1} 30% @@ -113,11 +112,6 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { uint192 public rewardRatio; uint192 public withdrawalLeak; // {1} gov param -- % RSR that can be withdrawn without refresh - constructor() { - PERIOD = NetworkConfigLib.blocktime(); - MIN_UNSTAKING_DELAY = PERIOD * 2; - } - function init( IMain main_, string memory name_, @@ -180,8 +174,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @custom:interaction function unstake(uint256 stakeAmount) external notTradingPausedOrFrozen { address account = _msgSender(); - require(stakeAmount > 0, "Cannot withdraw zero"); - require(balances[account] >= stakeAmount, "Not enough balance"); + require(stakeAmount > 0, "zero amount"); + require(balances[account] >= stakeAmount, "insufficient balance"); // Call state keepers _payoutRewards(); @@ -311,7 +305,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @custom:protected function seizeRSR(uint256 rsrAmount) external notTradingPausedOrFrozen { require(_msgSender() == address(main.backingManager()), "!bm"); - require(rsrAmount > 0, "Amount cannot be zero"); + require(rsrAmount > 0, "zero amount"); main.poke(); uint192 initialExchangeRate = exchangeRate(); @@ -459,13 +453,13 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address to, uint256 amount ) private { - require(from != address(0), "zero address transfer"); - require(to != address(0), "zero address transfer"); + require(from != address(0), "zero address"); + require(to != address(0), "zero address"); require(to != address(this), "transfer to self"); uint256 fromBalance = balances[from]; - require(fromBalance >= amount, "transfer amount exceeds balance"); + require(fromBalance >= amount, "insufficient balance"); unchecked { balances[from] = fromBalance - amount; @@ -503,7 +497,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool) { address owner = _msgSender(); uint256 currentAllowance = allowances[owner][spender]; - require(currentAllowance >= subtractedValue, "decreased allowance below zero"); + require(currentAllowance >= subtractedValue, "decrease allowance"); unchecked { _approve(owner, spender, currentAllowance - subtractedValue); } @@ -516,8 +510,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address spender, uint256 amount ) private { - require(owner != address(0), "zero address approval"); - require(spender != address(0), "zero address approval"); + require(owner != address(0), "zero address"); + require(spender != address(0), "zero address"); allowances[owner][spender] = amount; diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 7fd6017a5e..960503a732 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -8,7 +8,6 @@ import "../interfaces/IBackingManager.sol"; import "../interfaces/IMain.sol"; import "../libraries/Array.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "./mixins/Trading.sol"; import "./mixins/RecollateralizationLib.sol"; @@ -22,10 +21,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { using FixLib for uint192; using SafeERC20 for IERC20; - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable ONE_BLOCK; // {s} 1 block based on network - // Cache of peer components IAssetRegistry private assetRegistry; IBasketHandler private basketHandler; @@ -35,7 +30,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { IStRSR private stRSR; IRevenueTrader private rsrTrader; IRevenueTrader private rTokenTrader; - uint48 public constant MAX_TRADING_DELAY = 31536000; // {s} 1 year + uint48 public constant MAX_TRADING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year uint192 public constant MAX_BACKING_BUFFER = FIX_ONE; // {1} 100% uint48 public tradingDelay; // {s} how long to wait until resuming trading after switching @@ -51,11 +46,6 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // ==== Invariants ==== // tradingDelay <= MAX_TRADING_DELAY and backingBuffer <= MAX_BACKING_BUFFER - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() { - ONE_BLOCK = NetworkConfigLib.blocktime(); - } - function init( IMain main_, uint48 tradingDelay_, @@ -120,9 +110,10 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // == Refresh == assetRegistry.refresh(); - // DoS prevention: unless caller is self, require 1 empty block between like-kind auctions + // DoS prevention: + // unless caller is self, require that the next auction is not in same block require( - _msgSender() == address(this) || tradeEnd[kind] + ONE_BLOCK < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, "already rebalancing" ); diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index c842a982d5..6bc325bad8 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -28,7 +28,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192 public constant MAX_TARGET_AMT = 1e3 * FIX_ONE; // {target/BU} max basket weight uint48 public constant MIN_WARMUP_PERIOD = 60; // {s} 1 minute - uint48 public constant MAX_WARMUP_PERIOD = 31536000; // {s} 1 year + uint48 public constant MAX_WARMUP_PERIOD = 60 * 60 * 24 * 365; // {s} 1 year // Peer components IAssetRegistry private assetRegistry; diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 0111d25bc3..71923c3a03 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -8,7 +8,6 @@ import "../interfaces/IBroker.sol"; import "../interfaces/IMain.sol"; import "../interfaces/ITrade.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "./mixins/Component.sol"; import "../plugins/trading/DutchTrade.sol"; import "../plugins/trading/GnosisTrade.sol"; @@ -23,10 +22,10 @@ contract BrokerP1 is ComponentP1, IBroker { using SafeERC20Upgradeable for IERC20Upgradeable; using Clones for address; - uint48 public constant MAX_AUCTION_LENGTH = 604800; // {s} max valid duration - 1 week + uint48 public constant MAX_AUCTION_LENGTH = 60 * 60 * 24 * 7; // {s} max valid duration, 1 week /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_AUCTION_LENGTH; // {s} 20 blocks, based on network + uint48 public constant MIN_AUCTION_LENGTH = 60; // {s} 60 seconds auction min duration IBackingManager private backingManager; IRevenueTrader private rsrTrader; @@ -70,11 +69,6 @@ contract BrokerP1 is ComponentP1, IBroker { // ==== Invariant ==== // (trades[addr] == true) iff this contract has created an ITrade clone at addr - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() { - MIN_AUCTION_LENGTH = NetworkConfigLib.blocktime() * 20; - } - // effects: initial parameters are set function init( IMain main_, diff --git a/contracts/p1/Furnace.sol b/contracts/p1/Furnace.sol index 63dcc695d4..7a2cbfaacf 100644 --- a/contracts/p1/Furnace.sol +++ b/contracts/p1/Furnace.sol @@ -2,7 +2,6 @@ pragma solidity 0.8.19; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../interfaces/IFurnace.sol"; import "./mixins/Component.sol"; @@ -14,9 +13,6 @@ contract FurnaceP1 is ComponentP1, IFurnace { using FixLib for uint192; uint192 public constant MAX_RATIO = 1e14; // {1} 0.01% - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {seconds} 1 block based on network IRToken private rToken; @@ -27,11 +23,6 @@ contract FurnaceP1 is ComponentP1, IFurnace { uint48 public lastPayout; // {seconds} The last time we did a payout uint256 public lastPayoutBal; // {qRTok} The balance of RToken at the last payout - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() ComponentP1() { - PERIOD = NetworkConfigLib.blocktime(); - } - // ==== Invariants ==== // ratio <= MAX_RATIO = 1e18 // lastPayout was the timestamp of the end of the last period we paid out @@ -66,23 +57,23 @@ contract FurnaceP1 is ComponentP1, IFurnace { // let numPeriods = number of whole periods that have passed since `lastPayout` // payoutAmount = RToken.balanceOf(this) * (1 - (1-ratio)**N) from [furnace-payout-formula] // effects: - // lastPayout' = lastPayout + numPeriods * PERIOD (end of last pay period) + // lastPayout' = lastPayout + numPeriods (end of last pay period) // lastPayoutBal' = rToken.balanceOf'(this) (balance now == at end of pay leriod) // actions: // rToken.melt(payoutAmount), paying payoutAmount to RToken holders function melt() public { - if (uint48(block.timestamp) < uint64(lastPayout) + PERIOD) return; + if (uint48(block.timestamp) < uint64(lastPayout + 1)) return; // # of whole periods that have passed since lastPayout - uint48 numPeriods = uint48((block.timestamp) - lastPayout) / PERIOD; + uint48 numPeriods = uint48((block.timestamp) - lastPayout); // Paying out the ratio r, N times, equals paying out the ratio (1 - (1-r)^N) 1 time. uint192 payoutRatio = FIX_ONE.minus(FIX_ONE.minus(ratio).powu(numPeriods)); uint256 amount = payoutRatio.mulu_toUint(lastPayoutBal); - lastPayout += numPeriods * PERIOD; + lastPayout += numPeriods; lastPayoutBal = rToken.balanceOf(address(this)) - amount; if (amount > 0) rToken.melt(amount); } diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 70b36bdef6..83a2476d3d 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -11,7 +11,6 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../interfaces/IStRSR.sol"; import "../interfaces/IMain.sol"; import "../libraries/Fixed.sol"; -import "../libraries/NetworkConfigLib.sol"; import "../libraries/Permit.sol"; import "./mixins/Component.sol"; @@ -30,19 +29,15 @@ import "./mixins/Component.sol"; * across non-withdrawing stakes, while when RSR is seized it is seized uniformly from both * stakes that are in the process of being withdrawn and those that are not. */ -// solhint-disable max-states-count abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeable { using CountersUpgradeable for CountersUpgradeable.Counter; using SafeERC20Upgradeable for IERC20Upgradeable; /// @custom:oz-upgrades-unsafe-allow state-variable-immutable // solhint-disable-next-line var-name-mixedcase - uint48 public immutable PERIOD; // {s} 1 block based on network - /// @custom:oz-upgrades-unsafe-allow state-variable-immutable - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable MIN_UNSTAKING_DELAY; // {s} based on network - uint48 public constant MAX_UNSTAKING_DELAY = 31536000; // {s} 1 year - uint192 public constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% + uint48 private constant MIN_UNSTAKING_DELAY = 60 * 2; // {s} 2 minutes + uint48 private constant MAX_UNSTAKING_DELAY = 60 * 60 * 24 * 365; // {s} 1 year + uint192 private constant MAX_REWARD_RATIO = 1e14; // {1} 0.01% // === ERC20 === string public name; // immutable @@ -150,7 +145,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // rsrRewardsAtLastPayout was the value of rsrRewards() at that time // {seconds} The last time when rewards were paid out - uint48 public payoutLastPaid; + uint48 private payoutLastPaid; // {qRSR} How much reward RSR was held the last time rewards were paid out uint256 private rsrRewardsAtLastPayout; @@ -169,12 +164,6 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // ====================== - /// @custom:oz-upgrades-unsafe-allow constructor - constructor() ComponentP1() { - PERIOD = NetworkConfigLib.blocktime(); - MIN_UNSTAKING_DELAY = PERIOD * 2; - } - // init() can only be called once (initializer) // ==== Financial State: // effects: @@ -189,8 +178,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab uint192 rewardRatio_, uint192 withdrawalLeak_ ) external initializer { - require(bytes(name_).length > 0, "name empty"); - require(bytes(symbol_).length > 0, "symbol empty"); + assert(bytes(name_).length > 0); + assert(bytes(symbol_).length > 0); __Component_init(main_); __EIP712_init(name_, VERSION); name = name_; @@ -268,8 +257,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab requireNotTradingPausedOrFrozen(); address account = _msgSender(); - require(stakeAmount > 0, "Cannot withdraw zero"); - require(stakes[era][account] >= stakeAmount, "Not enough balance"); + require(stakeAmount > 0, "zero amount"); + require(stakes[era][account] >= stakeAmount, "insufficient balance"); _payoutRewards(); @@ -435,7 +424,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab requireNotTradingPausedOrFrozen(); require(_msgSender() == address(backingManager), "!bm"); - require(rsrAmount > 0, "Amount cannot be zero"); + require(rsrAmount > 0, "zero amount"); uint256 rsrBalance = rsr.balanceOf(address(this)); require(rsrAmount <= rsrBalance, "seize exceeds balance"); @@ -600,8 +589,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // rewards_N = rewards_0 * (1-payoutRatio) ^ N // payout = rewards_N - rewards_0 = rewards_0 * (1 - (1-payoutRatio)^N) function _payoutRewards() internal { - if (block.timestamp < payoutLastPaid + PERIOD) return; - uint48 numPeriods = (uint48(block.timestamp) - payoutLastPaid) / PERIOD; + if (block.timestamp < payoutLastPaid + 1) return; + uint48 numPeriods = uint48(block.timestamp) - payoutLastPaid; uint192 initRate = exchangeRate(); uint256 payout; @@ -619,7 +608,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab stakeRSR += payout; } - payoutLastPaid += numPeriods * PERIOD; + payoutLastPaid += numPeriods; rsrRewardsAtLastPayout = rsrRewards(); // stakeRate else case: D18{qStRSR/qRSR} = {qStRSR} * D18 / {qRSR} @@ -816,7 +805,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function decreaseAllowance(address spender, uint256 subtractedValue) public returns (bool) { address owner = _msgSender(); uint256 currentAllowance = _allowances[era][owner][spender]; - require(currentAllowance >= subtractedValue, "decreased allowance below zero"); + require(currentAllowance >= subtractedValue, "decrease allowance"); unchecked { _approve(owner, spender, currentAllowance - subtractedValue); } @@ -831,11 +820,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 amount ) internal { - require(from != address(0) && to != address(0), "zero address transfer"); + require(from != address(0) && to != address(0), "zero address"); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 fromBalance = eraStakes[from]; - require(fromBalance >= amount, "transfer amount exceeds balance"); + require(fromBalance >= amount, "insufficient balance"); unchecked { eraStakes[from] = fromBalance - amount; } @@ -850,7 +839,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // effects: bal[account] += amount; totalStakes += amount // this must only be called from a function that will fixup stakeRSR/Rate function _mint(address account, uint256 amount) internal virtual { - require(account != address(0), "zero address mint"); + require(account != address(0), "zero address"); assert(totalStakes + amount < type(uint224).max); stakes[era][account] += amount; @@ -866,13 +855,13 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function _burn(address account, uint256 amount) internal virtual { // untestable: // _burn is only called from unstake(), which uses msg.sender as `account` - require(account != address(0), "zero address burn"); + require(account != address(0), "zero address"); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 accountBalance = eraStakes[account]; // untestable: // _burn is only called from unstake(), which already checks this - require(accountBalance >= amount, "burn amount exceeds balance"); + require(accountBalance >= amount, "insufficient balances"); unchecked { eraStakes[account] = accountBalance - amount; } @@ -887,7 +876,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address spender, uint256 amount ) internal { - require(owner != address(0) && spender != address(0), "zero address approval"); + require(owner != address(0) && spender != address(0), "zero address"); _allowances[era][owner][spender] = amount; emit Approval(owner, spender, amount); diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index 8fc9b93427..f6a2f6419c 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -3,6 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/utils/math/SafeCastUpgradeable.sol"; import "@openzeppelin/contracts-upgradeable/utils/math/MathUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/interfaces/IERC5805Upgradeable.sol"; import "../interfaces/IStRSRVotes.sol"; import "./StRSR.sol"; @@ -11,14 +12,15 @@ import "./StRSR.sol"; * @notice StRSRP1Votes is an extension of StRSRP1 that makes it IVotesUpgradeable. * It is heavily based on OZ's ERC20VotesUpgradeable */ -contract StRSRP1Votes is StRSRP1, IStRSRVotes { +contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { // A Checkpoint[] is a value history; it faithfully represents the history of value so long - // as that value is only ever set by _writeCheckpoint. For any *previous* block number N, the + // as that value is only ever set by _writeCheckpoint. For any *previous* timepoint N, the // recorded value at the end of block N was cp.val, where cp in the value history is the // Checkpoint value with fromBlock maximal such that fromBlock <= N. // In particular, if the value changed during block N, there will be exactly one // entry cp with cp.fromBlock = N, and cp.val is the value at the _end_ of that block. + // 3.4.0: Even though it says `fromBlock`, it's actually timepoint. struct Checkpoint { uint48 fromBlock; uint224 val; @@ -27,7 +29,7 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { bytes32 private constant _DELEGATE_TYPEHASH = keccak256("Delegation(address delegatee,uint256 nonce,uint256 expiry)"); - // _delegates[account] is the address of the delegate that `accountt` has specified + // _delegates[account] is the address of the delegate that `account` has specified mapping(address => address) private _delegates; // era history @@ -52,6 +54,18 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { _writeCheckpoint(_eras, _add, 1); } + function clock() public view returns (uint48) { + return SafeCastUpgradeable.toUint48(block.timestamp); + } + + /** + * @dev Description of the clock + */ + // solhint-disable-next-line func-name-mixedcase + function CLOCK_MODE() public pure returns (string memory) { + return "mode=timestamp"; + } + function currentEra() external view returns (uint256) { return era; } @@ -73,36 +87,40 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { return pos == 0 ? 0 : _checkpoints[era][account][pos - 1].val; } - function getPastVotes(address account, uint256 blockNumber) public view returns (uint256) { - require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); - uint256 pastEra = _checkpointsLookup(_eras, blockNumber); - return _checkpointsLookup(_checkpoints[pastEra][account], blockNumber); + function getPastVotes(address account, uint256 timepoint) public view returns (uint256) { + require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + + uint256 pastEra = _checkpointsLookup(_eras, timepoint); + return _checkpointsLookup(_checkpoints[pastEra][account], timepoint); } - function getPastTotalSupply(uint256 blockNumber) public view returns (uint256) { - require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); - uint256 pastEra = _checkpointsLookup(_eras, blockNumber); - return _checkpointsLookup(_totalSupplyCheckpoints[pastEra], blockNumber); + function getPastTotalSupply(uint256 timepoint) public view returns (uint256) { + require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + + uint256 pastEra = _checkpointsLookup(_eras, timepoint); + return _checkpointsLookup(_totalSupplyCheckpoints[pastEra], timepoint); } - function getPastEra(uint256 blockNumber) public view returns (uint256) { - require(blockNumber < NetworkConfigLib.blockNumber(), "ERC20Votes: block not yet mined"); - return _checkpointsLookup(_eras, blockNumber); + function getPastEra(uint256 timepoint) public view returns (uint256) { + require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + + return _checkpointsLookup(_eras, timepoint); } - /// Return the value from history `ckpts` that was current for block number `blockNumber` - function _checkpointsLookup(Checkpoint[] storage ckpts, uint256 blockNumber) + /// Return the value from history `ckpts` that was current for timepoint `timepoint` + function _checkpointsLookup(Checkpoint[] storage ckpts, uint256 timepoint) private view returns (uint256) { // We run a binary search to set `high` to the index of the earliest checkpoint - // taken after blockNumber, or ckpts.length if no checkpoint was taken after blockNumber + // taken after timepoint, or ckpts.length if no checkpoint was taken after timepoint uint256 high = ckpts.length; uint256 low = 0; while (low < high) { uint256 mid = MathUpgradeable.average(low, high); - if (ckpts[mid].fromBlock > blockNumber) { + // `fromBlock` is a timepoint + if (ckpts[mid].fromBlock > timepoint) { high = mid; } else { low = mid + 1; @@ -215,14 +233,12 @@ contract StRSRP1Votes is StRSRP1, IStRSRVotes { oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; newWeight = op(oldWeight, delta); - if (pos > 0 && ckpts[pos - 1].fromBlock == NetworkConfigLib.blockNumber()) { + // `fromBlock` is a timepoint + if (pos > 0 && ckpts[pos - 1].fromBlock == clock()) { ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); } else { ckpts.push( - Checkpoint({ - fromBlock: SafeCastUpgradeable.toUint48(NetworkConfigLib.blockNumber()), - val: SafeCastUpgradeable.toUint224(newWeight) - }) + Checkpoint({ fromBlock: clock(), val: SafeCastUpgradeable.toUint224(newWeight) }) ); } } diff --git a/contracts/p1/mixins/Trading.sol b/contracts/p1/mixins/Trading.sol index 393cc2435a..8f7f1be2f2 100644 --- a/contracts/p1/mixins/Trading.sol +++ b/contracts/p1/mixins/Trading.sol @@ -4,11 +4,11 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol"; import "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "@openzeppelin/contracts/utils/Multicall.sol"; import "../../interfaces/ITrade.sol"; import "../../interfaces/ITrading.sol"; import "../../libraries/Allowance.sol"; import "../../libraries/Fixed.sol"; +import "../../vendor/oz/Multicall.sol"; import "./Component.sol"; import "./RewardableLib.sol"; diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 36810c4c2d..2d4052539e 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -8,7 +8,6 @@ import "@openzeppelin/contracts/governance/extensions/GovernorTimelockControl.so import "@openzeppelin/contracts/governance/extensions/GovernorVotes.sol"; import "@openzeppelin/contracts/governance/extensions/GovernorVotesQuorumFraction.sol"; import "../../interfaces/IStRSRVotes.sol"; -import "../../libraries/NetworkConfigLib.sol"; uint256 constant ONE_DAY = 86400; // {s} @@ -34,13 +33,13 @@ contract Governance is uint256 public constant ONE_HUNDRED_PERCENT = 1e8; // {micro %} // solhint-disable-next-line var-name-mixedcase - uint256 public immutable MIN_VOTING_DELAY; // {block} equal to ONE_DAY + uint256 public constant MIN_VOTING_DELAY = 86400; // {s} ONE_DAY constructor( IStRSRVotes token_, TimelockController timelock_, - uint256 votingDelay_, // in blocks - uint256 votingPeriod_, // in blocks + uint256 votingDelay_, // {s} + uint256 votingPeriod_, // {s} uint256 proposalThresholdAsMicroPercent_, // e.g. 1e4 for 0.01% uint256 quorumPercent // e.g 4 for 4% ) @@ -50,9 +49,6 @@ contract Governance is GovernorVotesQuorumFraction(quorumPercent) GovernorTimelockControl(timelock_) { - MIN_VOTING_DELAY = - (ONE_DAY + NetworkConfigLib.blocktime() - 1) / - NetworkConfigLib.blocktime(); // ONE_DAY, in blocks requireValidVotingDelay(votingDelay_); } @@ -81,21 +77,21 @@ contract Governance is uint256 asMicroPercent = super.proposalThreshold(); // {micro %} // {qStRSR} - uint256 pastSupply = token.getPastTotalSupply(NetworkConfigLib.blockNumber() - 1); + uint256 pastSupply = token.getPastTotalSupply(clock() - 1); // max StRSR supply is 1e38 // CEIL to make sure thresholds near 0% don't get rounded down to 0 tokens return (asMicroPercent * pastSupply + (ONE_HUNDRED_PERCENT - 1)) / ONE_HUNDRED_PERCENT; } - function quorum(uint256 blockNumber) + function quorum(uint256 timepoint) public view virtual override(IGovernor, GovernorVotesQuorumFraction) returns (uint256) { - return super.quorum(blockNumber); + return super.quorum(timepoint); } function state(uint256 proposalId) @@ -132,9 +128,11 @@ contract Governance is uint256[] memory values, bytes[] memory calldatas, bytes32 descriptionHash - ) external { + ) public override(Governor, IGovernor) returns (uint256) { uint256 proposalId = _cancel(targets, values, calldatas, descriptionHash); require(!startedInSameEra(proposalId), "same era"); + + return proposalId; } function _execute( @@ -166,13 +164,13 @@ contract Governance is return super._executor(); } - /// @return {qStRSR} The voting weight the account had at a previous block number + /// @return {qStRSR} The voting weight the account had at a previous timepoint function _getVotes( address account, - uint256 blockNumber, + uint256 timepoint, bytes memory /*params*/ ) internal view override(Governor, GovernorVotes) returns (uint256) { - return token.getPastVotes(account, blockNumber); // {qStRSR} + return token.getPastVotes(account, timepoint); // {qStRSR} } function supportsInterface(bytes4 interfaceId) @@ -187,13 +185,21 @@ contract Governance is // === Private === function startedInSameEra(uint256 proposalId) private view returns (bool) { - uint256 startBlock = proposalSnapshot(proposalId); - uint256 pastEra = IStRSRVotes(address(token)).getPastEra(startBlock); + uint256 startTimepoint = proposalSnapshot(proposalId); + uint256 pastEra = IStRSRVotes(address(token)).getPastEra(startTimepoint); uint256 currentEra = IStRSRVotes(address(token)).currentEra(); return currentEra == pastEra; } - function requireValidVotingDelay(uint256 newVotingDelay) private view { + function requireValidVotingDelay(uint256 newVotingDelay) private pure { require(newVotingDelay >= MIN_VOTING_DELAY, "invalid votingDelay"); } + + function clock() public view override(GovernorVotes, IGovernor) returns (uint48) { + return SafeCast.toUint48(block.timestamp); + } + + function CLOCK_MODE() public pure override(GovernorVotes, IGovernor) returns (string memory) { + return "mode=timestamp"; + } } diff --git a/contracts/plugins/mocks/DutchTradeRouter.sol b/contracts/plugins/mocks/DutchTradeRouter.sol index 5841596dfa..6e5198586b 100644 --- a/contracts/plugins/mocks/DutchTradeRouter.sol +++ b/contracts/plugins/mocks/DutchTradeRouter.sol @@ -6,8 +6,6 @@ import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IDutchTradeCallee, TradeStatus, DutchTrade } from "../trading/DutchTrade.sol"; import { IMain } from "../../interfaces/IMain.sol"; -import { NetworkConfigLib } from "../../libraries/NetworkConfigLib.sol"; - /** @title DutchTradeRouter * @notice Utility contract for placing bids on DutchTrade auctions */ diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 0561df1557..153d51c796 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -4,7 +4,6 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol"; import "../../libraries/Fixed.sol"; -import "../../libraries/NetworkConfigLib.sol"; import "../../interfaces/IAsset.sol"; import "../../interfaces/IBroker.sol"; import "../../interfaces/ITrade.sol"; @@ -95,9 +94,6 @@ contract DutchTrade is ITrade, Versioned { TradeKind public constant KIND = TradeKind.DUTCH_AUCTION; - // solhint-disable-next-line var-name-mixedcase - uint48 public immutable ONE_BLOCK; // {s} 1 block based on network - BidType public bidType; // = BidType.NONE TradeStatus public status; // reentrancy protection @@ -147,8 +143,6 @@ contract DutchTrade is ITrade, Versioned { // ==== Constructor === constructor() { - ONE_BLOCK = NetworkConfigLib.blocktime(); - status = TradeStatus.CLOSED; } @@ -167,11 +161,8 @@ contract DutchTrade is ITrade, Versioned { uint48 auctionLength, TradePrices memory prices ) external stateTransition(TradeStatus.NOT_STARTED, TradeStatus.OPEN) { - assert( - address(sell_) != address(0) && - address(buy_) != address(0) && - auctionLength >= 20 * ONE_BLOCK - ); // misuse by caller + // 60 sec min auction duration + assert(address(sell_) != address(0) && address(buy_) != address(0) && auctionLength >= 60); // Only start dutch auctions under well-defined prices require(prices.sellLow != 0 && prices.sellHigh < FIX_MAX / 1000, "bad sell pricing"); @@ -186,7 +177,7 @@ contract DutchTrade is ITrade, Versioned { sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals())); // {sellTok} // Track auction end by time, to generalize to all chains - uint48 _startTime = uint48(block.timestamp) + ONE_BLOCK; // can exceed 1 block + uint48 _startTime = uint48(block.timestamp) + 1; // cannot fulfill in current block startTime = _startTime; // gas-saver endTime = _startTime + auctionLength; diff --git a/contracts/vendor/oz/Multicall.sol b/contracts/vendor/oz/Multicall.sol new file mode 100644 index 0000000000..bd4a121081 --- /dev/null +++ b/contracts/vendor/oz/Multicall.sol @@ -0,0 +1,33 @@ +// SPDX-License-Identifier: MIT +// OpenZeppelin Contracts (last updated v4.9.5) (utils/Multicall.sol) + +pragma solidity ^0.8.0; + +import "@openzeppelin/contracts-upgradeable/utils/AddressUpgradeable.sol"; +import "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol"; +import { Initializable } from "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol"; + +/** + * @dev Forked from OpenZeppelin v4.9.6, removes gap + * + */ +abstract contract Multicall is Initializable, ContextUpgradeable { + /** + * @dev Receives and executes a batch of function calls on this contract. + * @custom:oz-upgrades-unsafe-allow-reachable delegatecall + */ + function multicall(bytes[] calldata data) external virtual returns (bytes[] memory results) { + bytes memory context = msg.sender == _msgSender() + ? new bytes(0) + : msg.data[msg.data.length - _contextSuffixLength():]; + + results = new bytes[](data.length); + for (uint256 i = 0; i < data.length; i++) { + results[i] = AddressUpgradeable.functionDelegateCall( + address(this), + bytes.concat(data[i], context) + ); + } + return results; + } +} diff --git a/package.json b/package.json index ba1f2ec495..72bc0501de 100644 --- a/package.json +++ b/package.json @@ -58,8 +58,8 @@ "@nomicfoundation/hardhat-toolbox": "^2.0.1", "@nomiclabs/hardhat-ethers": "^2.2.3", "@nomiclabs/hardhat-etherscan": "^3.1.0", - "@openzeppelin/contracts": "~4.7.3", - "@openzeppelin/contracts-upgradeable": "~4.7.3", + "@openzeppelin/contracts": "4.9.6", + "@openzeppelin/contracts-upgradeable": "4.9.6", "@openzeppelin/hardhat-upgrades": "^1.23.0", "@tenderly/hardhat-tenderly": "^1.7.7", "@typechain/ethers-v5": "^7.2.0", diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 4a6e401872..8192e0b3a4 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -3,7 +3,7 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' import { expect } from 'chai' import { BigNumber, ContractFactory, constants } from 'ethers' -import { ethers, upgrades } from 'hardhat' +import hre, { ethers, upgrades } from 'hardhat' import { IConfig, MAX_AUCTION_LENGTH } from '../common/configuration' import { MAX_UINT48, @@ -50,10 +50,11 @@ import { } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' import { + advanceBlocks, advanceTime, advanceToTimestamp, getLatestBlockTimestamp, - getLatestBlockNumber, + setNextBlockTimestamp, } from './utils/time' import { ITradeRequest, disableBatchTrade, disableDutchTrade } from './utils/trades' import { useEnv } from '#/utils/env' @@ -1134,9 +1135,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await trade.sell()).to.equal(token0.address) expect(await trade.buy()).to.equal(token1.address) expect(await trade.sellAmount()).to.equal(amount) - expect(await trade.startTime()).to.equal((await getLatestBlockTimestamp()) + 12) + expect(await trade.startTime()).to.equal((await getLatestBlockTimestamp()) + 1) const tradeLen = (await trade.endTime()) - (await trade.startTime()) - expect(await trade.endTime()).to.equal(tradeLen + 12 + (await getLatestBlockTimestamp())) + expect(await trade.endTime()).to.equal(tradeLen + 1 + (await getLatestBlockTimestamp())) expect(await trade.bestPrice()).to.equal( divCeil(prices.sellHigh.mul(fp('1')), prices.buyLow) ) @@ -1298,7 +1299,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Advance blocks til trade can be settled const now = await getLatestBlockTimestamp() const tradeLen = (await trade.endTime()) - now - await advanceToTimestamp(now + tradeLen + 12) + await advanceToTimestamp(now + tradeLen + 1) // Settle trade expect(await trade.canSettle()).to.equal(true) @@ -1338,7 +1339,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Advance blocks til trade can be settled const now = await getLatestBlockTimestamp() const tradeLen = (await trade.endTime()) - now - await advanceToTimestamp(now + tradeLen + 12) + await advanceToTimestamp(now + tradeLen + 1) // Settle trade await whileImpersonating(backingManager.address, async (bmSigner) => { @@ -1456,10 +1457,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Get Trade const tradeAddr = await backingManager.trades(sellTok.address) - await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) - await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) - const now = await getLatestBlockTimestamp() const startTime = await trade.startTime() const endTime = await trade.endTime() const bidTime = @@ -1468,24 +1466,28 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { .mul(endTime - startTime) .div(fp('1')) .toNumber() - if (now < bidTime) await advanceToTimestamp(bidTime - 1) + const bidAmt = await trade.bidAmount(bidTime) // Bid const sellAmt = await trade.lot() - const bidAmt = await trade.bidAmount(bidTime) expect(bidAmt).to.be.gt(0) const buyBalBefore = await buyTok.balanceOf(backingManager.address) const sellBalBefore = await sellTok.balanceOf(addr1.address) + if (bidTime > (await getLatestBlockTimestamp())) await setNextBlockTimestamp(bidTime) + + // Set automine to false for multiple transactions in one block + await hre.network.provider.send('evm_setAutomine', [false]) + if (bidType.eq(bn(BidType.CALLBACK))) { - await expect(router.connect(addr1).bid(trade.address, addr1.address)) - .to.emit(backingManager, 'TradeSettled') - .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) + await router.connect(addr1).bid(trade.address, addr1.address) } else if (bidType.eq(bn(BidType.TRANSFER))) { - await expect(trade.connect(addr1).bid()) - .to.emit(backingManager, 'TradeSettled') - .withArgs(anyValue, sellTok.address, buyTok.address, sellAmt, bidAmt) + await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) + await trade.connect(addr1).bid() } + await advanceBlocks(1) + await hre.network.provider.send('evm_setAutomine', [true]) // Check balances expect(await sellTok.balanceOf(addr1.address)).to.equal(sellBalBefore.add(sellAmt)) diff --git a/test/Deployer.test.ts b/test/Deployer.test.ts index 1b9e4ed390..8711bcdc67 100644 --- a/test/Deployer.test.ts +++ b/test/Deployer.test.ts @@ -265,9 +265,7 @@ describe(`DeployerP${IMPLEMENTATION} contract #fast`, () => { }) it('Should not allow empty name', async () => { - await expect( - deployer.deploy('', 'RTKN', 'mandate', owner.address, config) - ).to.be.revertedWith('name empty') + await expect(deployer.deploy('', 'RTKN', 'mandate', owner.address, config)).to.be.reverted }) it('Should not allow empty symbol', async () => { diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 725816a58d..cae68950af 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -1231,7 +1231,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issuance #2 - Consume all throttle const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check new issuance available - all consumed @@ -1289,7 +1289,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issue full throttle const issueAmount1: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount1) // Check redemption throttles updated @@ -1308,7 +1308,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issuance #2 - Full throttle again - will be processed const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check new issuance available - all consumed @@ -1336,7 +1336,7 @@ describe('Facade + FacadeMonitor contracts', () => { // Issuance #3 - Should be allowed, does not exceed supply restriction const issueAmount3: BigNumber = bn('100000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount3) // Check issuance throttle updated - Previous issuances recharged @@ -1371,7 +1371,7 @@ describe('Facade + FacadeMonitor contracts', () => { const issueAmount4: BigNumber = fp('105800') // Issuance #4 - almost all available - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount4) expect(await facadeMonitor.issuanceAvailable(rToken.address)).to.be.closeTo( diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 81ef31667e..a3adc3b0bd 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -20,6 +20,7 @@ import { OWNER, PAUSER, ZERO_ADDRESS, + ONE_DAY, } from '../common/constants' import { expectInIndirectReceipt, expectInReceipt } from '../common/events' import { bn, fp } from '../common/numbers' @@ -193,8 +194,8 @@ describe('FacadeWrite contract', () => { // Set governance params govParams = { - votingDelay: bn(7200), // 1 day - votingPeriod: bn(21600), // 3 days + votingDelay: ONE_DAY, // 1 day + votingPeriod: ONE_DAY.mul(3), // 3 days proposalThresholdAsMicroPercent: bn(1e6), // 1% quorumPercent: bn(4), // 4% timelockDelay: bn(60 * 60 * 24), // 1 day diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 5883101e4b..536a4066f6 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -234,7 +234,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal) expect(await rToken.balanceOf(furnace.address)).to.equal(0) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) // Melt @@ -255,15 +255,11 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) // Advance one period - await advanceTime(Number(ONE_PERIOD)) + await advanceTime(1) // Melt await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') - // Another immediate call to melt should also have no impact - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') - expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) }) @@ -275,30 +271,29 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await advanceTime(Number(ONE_PERIOD)) + await advanceTime(1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - // Advance to the end to melt full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + // Advance 1s + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, 1) // 1 period + const expAmt = decayFn(hndAmt, 1) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') .withArgs(hndAmt.sub(expAmt)) - // Another call to melt right away before next period should have no impact - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') + // Another call to melt right away in a separate block will also melt + await expect(furnace.connect(addr1).melt()).to.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) + expect(await rToken.balanceOf(furnace.address)).to.be.lt(expAmt) // additional melting occurred }) it('Should allow melt - two periods, one at a time #fast', async () => { @@ -308,36 +303,35 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - // Advance to the end to melt full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + // Advance 1s + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt1 = decayFn(hndAmt, 1) // 1 period + const expAmt1 = decayFn(hndAmt, 1) // Melt await expect(furnace.connect(addr1).melt()) .to.emit(rToken, 'Melted') .withArgs(hndAmt.sub(expAmt1)) - // Advance to the end to withdraw full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + // Advance 1s + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - const expAmt2 = decayFn(hndAmt, 2) // 2 periods + const expAmt2 = decayFn(hndAmt, 2) // Melt - await expect(furnace.connect(addr1).melt()) - .to.emit(rToken, 'Melted') - .withArgs(bn(expAmt1).sub(expAmt2)) + await expect(furnace.connect(addr1).melt()).to.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt2) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expAmt2, 1) // within 1 + expect(await rToken.balanceOf(furnace.address)).to.be.gte(expAmt2) // defensive rounding }) it('Should melt before updating the ratio #fast', async () => { @@ -347,30 +341,26 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - // Advance to the end to melt full amount - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + // Advance 1s + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) const decayFn = makeDecayFn(await furnace.ratio()) - const expAmt = decayFn(hndAmt, 1) // 1 period + const expAmt = decayFn(hndAmt, 1) // Melt await expect(furnace.setRatio(bn('1e13'))) .to.emit(rToken, 'Melted') .withArgs(hndAmt.sub(expAmt)) - // Another call to melt right away before next period should have no impact - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) - await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') - expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) + expect(await rToken.balanceOf(furnace.address)).to.be.equal(expAmt) }) it('Should accumulate negligible error - a year all at once', async () => { @@ -380,29 +370,25 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await rToken.connect(addr1).transfer(furnace.address, hndAmt) // Get past first noop melt - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) await expect(furnace.connect(addr1).melt()).to.not.emit(rToken, 'Melted') expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) expect(await rToken.balanceOf(furnace.address)).to.equal(hndAmt) - const periods = 2628000 // one year worth + const periods = 60 * 60 * 24 * 365 // one year worth // Advance a year's worth of periods - await setNextBlockTimestamp( - Number(await getLatestBlockTimestamp()) + periods * Number(ONE_PERIOD) - ) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + periods) - // Precise JS calculation should be within 3 atto const decayFn = makeDecayFn(await furnace.ratio()) const expAmt = decayFn(hndAmt, periods) - const error = bn('3') - await expect(furnace.melt()).to.emit(rToken, 'Melted').withArgs(hndAmt.sub(expAmt).add(error)) + await expect(furnace.melt()).to.emit(rToken, 'Melted').withArgs(hndAmt.sub(expAmt)) expect(await rToken.balanceOf(addr1.address)).to.equal(initialBal.sub(hndAmt)) - expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt.sub(error)) + expect(await rToken.balanceOf(furnace.address)).to.equal(expAmt) }) it('Should accumulate negligible error - parallel furnaces', async () => { - // Maintain two furnaces in parallel, one burning every block and one burning annually + // Maintain two furnaces in parallel, one burning every second and one burning once per hour // We have to use two brand new instances here to ensure their timestamps are synced const firstFurnace = await deployNewFurnace() const secondFurnace = await deployNewFurnace() @@ -418,31 +404,32 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await secondFurnace.init(main.address, config.rewardRatio) await advanceBlocks(1) - // Set automine to true again - await hre.network.provider.send('evm_setAutomine', [true]) - - const oneDay = bn('86400') + // Simulate an hour + const oneHour = 3600 await setFurnace(main, firstFurnace) - for (let i = 0; i < Number(oneDay.div(ONE_PERIOD)); i++) { - // Advance a period - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + const before = await getLatestBlockTimestamp() + for (let i = 0; i < oneHour; i++) { + // Advance a second each block, as if we're on an L2 or something fast await firstFurnace.melt() + await setNextBlockTimestamp(before + 1 + i) + await advanceBlocks(1) // secondFurnace does not melt } - // SecondFurnace melts once await setFurnace(main, secondFurnace) + + // Set automine to true + await hre.network.provider.send('evm_setAutomine', [true]) + + // Melt furnace 2 + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) await secondFurnace.melt() + // Expected to be off by 1 rewardRatio worth of RToken const one = await rToken.balanceOf(firstFurnace.address) const two = await rToken.balanceOf(secondFurnace.address) - const diff = one.sub(two).abs() // {qRTok} - const expectedDiff = bn(3555) // empirical exact diff - // At a rate of 3555 qRToken per day error, a year's worth of error would result in - // a difference only starting in the 12th decimal place: .000000000001 - // This seems more than acceptable - - expect(diff).to.be.lte(expectedDiff) + expect(one).to.be.gte(two) + expect(one).to.be.closeTo(two, config.rewardRatio) }) it('Regression test -- C4 June 2023 Issue #29', async () => { @@ -481,7 +468,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { // Should have melted expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.eq(fp('99.990000494983830300')) + expect(await furnace.lastPayoutBal()).to.eq(fp('99.989900504983335400')) // Unfreeze and advance 100 periods await main.connect(owner).unfreeze() @@ -493,8 +480,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { // Should have updated lastPayout + lastPayoutBal and melted at new ratio expect(await furnace.lastPayout()).to.be.closeTo(await getLatestBlockTimestamp(), 12) expect(await furnace.lastPayout()).to.be.lte(await getLatestBlockTimestamp()) - expect(await furnace.lastPayoutBal()).to.equal(fp('98.995033865808581644')) - // if the ratio were not increased 100x, this would be more like 99.980001989868666200 + expect(await furnace.lastPayoutBal()).to.equal(fp('98.985035377287638455')) // Total supply should have decreased by the cumulative melted amount expect(await rToken.totalSupply()).to.equal(mintAmount.add(await furnace.lastPayoutBal())) @@ -600,7 +586,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await snapshotGasCost(furnace.connect(addr1).melt()) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) const decayFn = makeDecayFn(await furnace.ratio()) @@ -627,7 +613,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) await snapshotGasCost(furnace.connect(addr1).melt()) - // Advance to the end to melt full amount + // Advance 1s await setNextBlockTimestamp( Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD.mul(numPeriods)) ) diff --git a/test/Governance.test.ts b/test/Governance.test.ts index 3b8b9cf097..a3f033a59d 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -1,7 +1,7 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' -import { BigNumber, ContractFactory } from 'ethers' +import { BigNumber } from 'ethers' import { ethers } from 'hardhat' import { IConfig } from '../common/configuration' import { @@ -16,16 +16,18 @@ import { bn, fp } from '../common/numbers' import { ERC20Mock, Governance, + Governance__factory, StRSRP1Votes, TestIBackingManager, TestIBroker, TestIMain, TestIStRSR, TimelockController, + TimelockController__factory, } from '../typechain' import { defaultFixture, Implementation, IMPLEMENTATION } from './fixtures' import { whileImpersonating } from './utils/impersonation' -import { advanceBlocks, advanceTime, getLatestBlockNumber } from './utils/time' +import { advanceBlocks, advanceTime, getLatestBlockTimestamp } from './utils/time' const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip @@ -53,14 +55,16 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { let stRSRVotes: StRSRP1Votes // Factories - let GovernorFactory: ContractFactory - let TimelockFactory: ContractFactory + let GovernorFactory: Governance__factory + let TimelockFactory: TimelockController__factory let initialBal: BigNumber - const MIN_DELAY = 7 * 60 * 60 * 24 // 7 days - const VOTING_DELAY = 7200 // 1 day (in blocks) - const VOTING_PERIOD = 21600 // 3 days (in blocks) + const ONE_DAY = 86400 + + const MIN_DELAY = ONE_DAY * 7 // 7 days + const VOTING_DELAY = ONE_DAY // 1 day (in s) + const VOTING_PERIOD = ONE_DAY * 3 // 3 days (in s) const PROPOSAL_THRESHOLD = 1e6 // 1% const QUORUM_PERCENTAGE = 4 // 4% @@ -76,23 +80,21 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await rsr.connect(owner).mint(addr3.address, initialBal) // Cast to ERC20Votes contract - stRSRVotes = await ethers.getContractAt('StRSRP1Votes', stRSR.address) + stRSRVotes = await ethers.getContractAt('StRSRP1Votes', stRSR.address) - // Deploy Tiuelock + // Deploy Timelock TimelockFactory = await ethers.getContractFactory('TimelockController') - timelock = await TimelockFactory.deploy(MIN_DELAY, [], []) + timelock = await TimelockFactory.deploy(MIN_DELAY, [], [], owner.address) // Deploy Governor GovernorFactory = await ethers.getContractFactory('Governance') - governor = ( - await GovernorFactory.deploy( - stRSRVotes.address, - timelock.address, - VOTING_DELAY, - VOTING_PERIOD, - PROPOSAL_THRESHOLD, - QUORUM_PERCENTAGE - ) + governor = await GovernorFactory.deploy( + stRSRVotes.address, + timelock.address, + VOTING_DELAY, + VOTING_PERIOD, + PROPOSAL_THRESHOLD, + QUORUM_PERCENTAGE ) // Setup Roles @@ -141,7 +143,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // At first with no StRSR supply, these should be 0 expect(await governor.proposalThreshold()).to.equal(0) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(0) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(0) // Other contract addresses expect(await governor.timelock()).to.equal(timelock.address) @@ -163,31 +165,32 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { const stkAmt2: BigNumber = bn('500e18') // Initially no supply at all - let currBlockNumber: number = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + let currentBlockTimestamp: number = (await getLatestBlockTimestamp()) - 1 + + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Stake some RSR with addr1 - And delegate await rsr.connect(addr1).approve(stRSRVotes.address, stkAmt1) await stRSRVotes.connect(addr1).stake(stkAmt1) // Before delegate, should remain 0 - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await governor.proposalThreshold()).to.equal(0) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(0) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(0) // Now delegate await stRSRVotes.connect(addr1).delegate(addr1.address) expect(await governor.proposalThreshold()).to.equal( stkAmt1.mul(PROPOSAL_THRESHOLD).div(bn('1e8')) ) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal( + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal( stkAmt1.mul(QUORUM_PERCENTAGE).div(100) ) @@ -195,11 +198,11 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await advanceBlocks(2) // Check new values - Owner has their stkAmt1 vote - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(0) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Stake some RSR with addr2, delegate in same transaction await rsr.connect(addr2).approve(stRSRVotes.address, stkAmt1) @@ -209,11 +212,11 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await advanceBlocks(2) // Check new values - Addr1 and addr2 both have stkAmt1 - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal(stkAmt1.mul(2)) - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(stkAmt1.mul(2)) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Stake a smaller portion of RSR with addr3 await rsr.connect(addr3).approve(stRSRVotes.address, stkAmt2) @@ -223,15 +226,15 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Advance a few blocks await advanceBlocks(2) - currBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currBlockNumber)).to.equal( + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( stkAmt1.mul(2).add(stkAmt2) ) // Everyone has stkAmt1 - expect(await governor.getVotes(addr1.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr2.address, currBlockNumber)).to.equal(stkAmt1) - expect(await governor.getVotes(addr3.address, currBlockNumber)).to.equal(stkAmt2) + expect(await governor.getVotes(addr1.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr2.address, currentBlockTimestamp)).to.equal(stkAmt1) + expect(await governor.getVotes(addr3.address, currentBlockTimestamp)).to.equal(stkAmt2) }) it('Should not allow vote manipulation', async () => { @@ -376,10 +379,10 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { await stRSRVotes.connect(addr3).stake(stkAmt2) await stRSRVotes.connect(addr3).delegate(addr3.address) - // Check proposer threshold is not enought for caller - expect(await governor.getVotes(addr3.address, (await getLatestBlockNumber()) - 1)).to.be.lt( - PROPOSAL_THRESHOLD - ) + // Check proposer threshold is not enough for caller + expect( + await governor.getVotes(addr3.address, (await getLatestBlockTimestamp()) - 1) + ).to.be.lt(PROPOSAL_THRESHOLD) // Propose will fail await expect( @@ -395,9 +398,9 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Propose will fail again await advanceBlocks(5) - expect(await governor.getVotes(addr3.address, (await getLatestBlockNumber()) - 1)).to.be.gt( - PROPOSAL_THRESHOLD - ) + expect( + await governor.getVotes(addr3.address, (await getLatestBlockTimestamp()) - 1) + ).to.be.gt(PROPOSAL_THRESHOLD) const proposeTx = await governor .connect(addr3) @@ -503,14 +506,14 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Quorum should be equal to cast votes const expectedQuorum = stkAmt1.mul(2).mul(QUORUM_PERCENTAGE).div(100) - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(expectedQuorum) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(expectedQuorum) voteWay = 2 // abstain await governor.connect(addr2).castVoteWithReason(proposalId, voteWay, 'I abstain') await advanceBlocks(1) // Quorum should be equal to sum of abstain + for votes - expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(expectedQuorum) + expect(await governor.quorum((await getLatestBlockTimestamp()) - 1)).to.equal(expectedQuorum) // Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Active) @@ -521,7 +524,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) @@ -798,7 +801,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([backingManager.address], [0], [encodedFunctionCall], proposalDescHash) @@ -935,7 +938,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Advance time to start voting await advanceBlocks(VOTING_DELAY + 1) - const snapshotBlock1 = (await getLatestBlockNumber()) - 1 + const snapshotBlock1 = (await getLatestBlockTimestamp()) - 1 // Change Rate (decrease by 50%) - should only impact the new proposal await whileImpersonating(backingManager.address, async (signer) => { @@ -973,7 +976,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Advance time to start voting 2nd proposal await advanceBlocks(VOTING_DELAY + 1) - const snapshotBlock2 = (await getLatestBlockNumber()) - 1 + const snapshotBlock2 = (await getLatestBlockTimestamp()) - 1 // Check proposal states expect(await governor.state(proposalId)).to.equal(ProposalState.Active) @@ -1047,13 +1050,13 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { it('Should allow to update GovernorSettings via governance', async () => { // Attempt to update if not governance - await expect(governor.setVotingDelay(bn(14400))).to.be.revertedWith( + await expect(governor.setVotingDelay(bn(172800))).to.be.revertedWith( 'Governor: onlyGovernance' ) // Attempt to update without governance process in place await whileImpersonating(timelock.address, async (signer) => { - await expect(governor.connect(signer).setVotingDelay(bn(14400))).to.be.reverted + await expect(governor.connect(signer).setVotingDelay(bn(172800))).to.be.reverted }) // Update votingDelay via proposal @@ -1095,7 +1098,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) @@ -1157,7 +1160,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { // Finished voting - Check proposal state expect(await governor.state(proposalId)).to.equal(ProposalState.Succeeded) - // Queue propoal + // Queue proposal await governor .connect(addr1) .queue([governor.address], [0], [encodedFunctionCall], proposalDescHash) diff --git a/test/RToken.test.ts b/test/RToken.test.ts index a2e61bcfdb..aadd8e62f1 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -738,7 +738,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #1 - Will be processed const issueAmount1: BigNumber = bn('100e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount1) // Check issuance throttle updated @@ -751,7 +751,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #2 - Should be processed const issueAmount2: BigNumber = bn('400e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check issuance throttle updated, previous issuance recharged @@ -765,7 +765,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #3 - Should be processed const issueAmount3: BigNumber = bn('50000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount3) // Check issuance throttle updated - Previous issuances recharged @@ -780,7 +780,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #4 - Should be processed const issueAmount4: BigNumber = bn('100000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount4) // Check issuance throttle updated - we got the 3.3K from the recharge @@ -812,7 +812,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #1 - Will be processed const issueAmount1: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount1) // Check issuance throttle updated @@ -831,7 +831,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #2 - Will be processed const issueAmount2: BigNumber = config.issuanceThrottle.amtRate - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount2) // Check new issuance available - al consumed @@ -860,7 +860,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Issuance #3 - Should be allowed, does not exceed supply restriction const issueAmount3: BigNumber = bn('50000e18') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).issue(issueAmount3) // Check issuance throttle updated - Previous issuances recharged @@ -1487,7 +1487,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Redeem #1 - Will be processed redeemAmount = fp('10000') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).redeem(redeemAmount) // Check redemption throttle updated @@ -2303,7 +2303,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // Redeem #1 - Will be processed redeemAmount = fp('10000') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) await rToken.connect(addr1).redeem(redeemAmount) // Check redemption throttle updated diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index ad9d46fda4..ce9c04f586 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -37,12 +37,7 @@ import { USDCMock, DutchTradeRouter, } from '../typechain' -import { - advanceBlocks, - advanceTime, - advanceToTimestamp, - getLatestBlockTimestamp, -} from './utils/time' +import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp } from './utils/time' import { Collateral, defaultFixture, @@ -3229,18 +3224,13 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith( 'trade open' ) - - // Check the empty buffer block as well - await advanceBlocks(1) - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.be.revertedWith( - 'already rebalancing' - ) - await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith( - 'trade open' - ) }) it('Should quote piecewise-falling price correctly throughout entirety of auction', async () => { + // Provide approval to router + const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() + await token1.connect(addr1).approve(router.address, constants.MaxUint256) + await backingManager.rebalance(TradeKind.DUTCH_AUCTION) const trade = await ethers.getContractAt( 'DutchTrade', @@ -3251,10 +3241,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { const start = await trade.startTime() const end = await trade.endTime() - // Simulate 30 minutes of blocks, should swap at right price each time - const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await token1.connect(addr1).approve(router.address, constants.MaxUint256) - await advanceToTimestamp(start) let now = start while (now < end) { const actual = await trade.connect(addr1).bidAmount(now) @@ -3387,10 +3373,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token0.balanceOf(trade2.address)).to.equal(0) expect(await token1.balanceOf(trade2.address)).to.equal(0) - // Only BATCH_AUCTION can be launched - await expect(backingManager.rebalance(TradeKind.DUTCH_AUCTION)).to.be.revertedWith( - 'already rebalancing' - ) + // BATCH_AUCTION can be launched await backingManager.rebalance(TradeKind.BATCH_AUCTION) expect(await backingManager.tradesOpen()).to.equal(1) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 903ce29867..176768c5ca 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1861,7 +1861,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Furnace expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmt.add(minBuyAmtRemainder), - minBuyAmt.add(minBuyAmtRemainder).div(bn('1e4')) // melting + minBuyAmt.add(minBuyAmtRemainder).div(bn('1e3')) // melting ) }) @@ -2082,7 +2082,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e4')) // melting + minBuyAmtRToken.div(bn('1e2')) // melting ) }) @@ -3497,7 +3497,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .connect(addr1) .approve(router.address, constants.MaxUint256) - await advanceToTimestamp(await trade.startTime()) await router.connect(addr1).bid(trade.address, addr1.address) expect(await trade.bidder()).to.equal(router.address) // Cannot bid once is settled @@ -3511,7 +3510,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .connect(addr1) .approve(trade.address, constants.MaxUint256) - await advanceToTimestamp(await trade.startTime()) await trade.connect(addr1).bid() expect(await trade.bidder()).to.equal(addr1.address) // Cannot bid once is settled @@ -3545,7 +3543,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .approve(trade.address, constants.MaxUint256) // Bid - await advanceToTimestamp(await trade.startTime()) await trade.connect(addr1).bid() expect(await trade.bidType()).to.be.eq(2) expect(await trade.bidder()).to.equal(addr1.address) @@ -3570,7 +3567,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidder') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) - await advanceToTimestamp(await trade.startTime()) await bidder.connect(addr1).bid(trade.address) expect(await trade.bidType()).to.be.eq(1) expect(await trade.bidder()).to.equal(bidder.address) @@ -3591,7 +3587,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidderLowBaller') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) - await advanceToTimestamp(await trade.startTime()) await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( 'insufficient buy tokens' ) @@ -3614,7 +3609,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await ethers.getContractFactory('CallbackDutchTraderBidderNoPayer') ).deploy() await rToken.connect(addr1).transfer(bidder.address, issueAmount) - await advanceToTimestamp(await trade.startTime()) await expect(bidder.connect(addr1).bid(trade.address)).to.be.revertedWith( 'insufficient buy tokens' ) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 1ac0b1f34c..e65ee284d2 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -28,6 +28,7 @@ import { IConfig, MAX_RATIO, MAX_UNSTAKING_DELAY } from '../common/configuration import { CollateralStatus, MAX_UINT256, ONE_PERIOD, ZERO_ADDRESS } from '../common/constants' import { advanceBlocks, + advanceTime, advanceToTimestamp, getLatestBlockNumber, getLatestBlockTimestamp, @@ -236,7 +237,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { config.rewardRatio, config.withdrawalLeak ) - ).to.be.revertedWith('name empty') + ).to.be.reverted await expect( newStRSR.init( main.address, @@ -246,7 +247,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { config.rewardRatio, config.withdrawalLeak ) - ).to.be.revertedWith('symbol empty') + ).to.be.reverted }) }) @@ -415,7 +416,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { }) } else if (IMPLEMENTATION == Implementation.P1) { await whileImpersonating(ZERO_ADDRESS, async (signer) => { - await expect(stRSR.connect(signer).stake(amount)).to.be.revertedWith('zero address mint') + await expect(stRSR.connect(signer).stake(amount)).to.be.revertedWith('zero address') }) } }) @@ -513,14 +514,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const zero: BigNumber = bn(0) // Unstake - await expect(stRSR.connect(addr1).unstake(zero)).to.be.revertedWith('Cannot withdraw zero') + await expect(stRSR.connect(addr1).unstake(zero)).to.be.revertedWith('zero amount') }) it('Should not allow to unstake if not enough balance', async () => { const amount: BigNumber = bn('1000e18') // Unstake with no stakes/balance - await expect(stRSR.connect(addr1).unstake(amount)).to.be.revertedWith('Not enough balance') + await expect(stRSR.connect(addr1).unstake(amount)).to.be.revertedWith('insufficient balance') }) it('Should not unstake if paused', async () => { @@ -700,7 +701,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await rsr.balanceOf(addr1.address)).to.equal(initialBal.sub(amount)) // RSR wasn't returned }) - it('Should not allow to cancel unstake if fozen', async () => { + it('Should not allow to cancel unstake if frozen', async () => { const amount: BigNumber = bn('1000e18') // Stake @@ -1166,6 +1167,8 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { Number(await getLatestBlockTimestamp()) + stkWithdrawalDelay / 2 ) + await hre.network.provider.send('evm_setAutomine', [false]) + // Send reward RSR -- bn('3e18') await rsr.connect(addr1).transfer(stRSR.address, amount3) await stRSR.connect(owner).setRewardRatio(bn('1e14')) // handout max ratio @@ -1173,6 +1176,12 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Create 2nd withdrawal for user 2 -- should unstake at 1:1 rate expect(await stRSR.exchangeRate()).to.equal(fp('1')) await stRSR.connect(addr2).unstake(amount3) + + await hre.network.provider.send('evm_setAutomine', [true]) + + // Mine block + await advanceTime(1) + expect(await stRSR.exchangeRate()).to.equal(fp('1')) // Check withdrawals - Nothing available yet @@ -1189,7 +1198,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Calculate new exchange rate ~1.91 -- regression test const decayFn = makeDecayFn(await stRSR.rewardRatio()) - const numRounds = stkWithdrawalDelay / 4 / 12 + const numRounds = stkWithdrawalDelay / 4 const rewardHandout = amount3.sub(decayFn(amount3, numRounds)) const newExchangeRate = amount3.add(rewardHandout).mul(fp('1')).div(amount3).add(1) expect(await stRSR.exchangeRate()).to.be.closeTo(newExchangeRate, bn(200)) @@ -1421,7 +1430,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.connect(addr1).stake(stake) // Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) // Calculate payout amount const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1)) // 1 round @@ -1470,7 +1479,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSR.balanceOf(addr2.address)).to.equal(stake.div(2)) // Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) // Calculate payout amount const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1)) // 1 round @@ -1500,7 +1509,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { let error = bn('2') for (let i = 0; i < 100; i++) { // Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 1) // Calculate payout amount, as if closed-form from the beginning const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 1 + i)) // 1+i rounds @@ -1530,7 +1539,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSR.connect(addr1).stake(stake) // Advance to get 100 rounds of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.mul(100).add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 100) // Calculate payout amount as if it were a closed form calculation from start const addedRSRStake = amountAdded.sub(decayFn(amountAdded, 100)) @@ -1590,9 +1599,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const prevPoolBalance: BigNumber = await rsr.balanceOf(stRSR.address) await whileImpersonating(backingManager.address, async (signer) => { - await expect(stRSR.connect(signer).seizeRSR(zero)).to.be.revertedWith( - 'Amount cannot be zero' - ) + await expect(stRSR.connect(signer).seizeRSR(zero)).to.be.revertedWith('zero amount') }) expect(await rsr.balanceOf(stRSR.address)).to.equal(prevPoolBalance) @@ -2217,7 +2224,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should reset stakes and perform validations on rate - MIN', async () => { const stakeAmt: BigNumber = bn('1000e18') const addAmt1: BigNumber = bn('100e18') - const addAmt2: BigNumber = bn('10e30') + const addAmt2: BigNumber = bn('120e30') // Stake await rsr.connect(addr1).approve(stRSR.address, stakeAmt) @@ -2234,7 +2241,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await rsr.connect(owner).transfer(stRSR.address, addAmt1) // Advance to the end of noop period - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 1) await stRSR.payoutRewards() // Calculate payout amount @@ -2243,7 +2250,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { const newRate: BigNumber = fp(stakeAmt.add(addedRSRStake)).div(stakeAmt) // Payout rewards - Advance to get 1 round of rewards - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.closeTo(newRate, 1) expect(await stRSR.totalSupply()).to.equal(stakeAmt) @@ -2257,11 +2264,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await rsr.connect(owner).transfer(stRSR.address, addAmt2) // Advance to the end of noop period - await setNextBlockTimestamp(Number(ONE_PERIOD.add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 1) await stRSR.payoutRewards() // Payout rewards - Advance time - rate will be unsafe - await setNextBlockTimestamp(Number(ONE_PERIOD.mul(100).add(await getLatestBlockTimestamp()))) + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 100) await expect(stRSR.payoutRewards()).to.emit(stRSR, 'ExchangeRateSet') expect(await stRSR.exchangeRate()).to.be.gte(fp('1e6')) expect(await stRSR.exchangeRate()).to.be.lte(fp('1e9')) @@ -2312,7 +2319,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Perform transfer with user with no stake await expect(stRSR.connect(addr2).transfer(addr1.address, amount)).to.be.revertedWith( - 'transfer amount exceeds balance' + 'insufficient balance' ) // Nothing transferred @@ -2329,13 +2336,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to send to zero address await expect(stRSR.connect(addr1).transfer(ZERO_ADDRESS, amount)).to.be.revertedWith( - 'zero address transfer' + 'zero address' ) // Attempt to send from zero address - Impersonation is the only way to get to this validation await whileImpersonating(ZERO_ADDRESS, async (signer) => { await expect(stRSR.connect(signer).transfer(addr2.address, amount)).to.be.revertedWith( - 'zero address transfer' + 'zero address' ) }) @@ -2542,13 +2549,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to set allowance to zero address await expect(stRSR.connect(addr1).approve(ZERO_ADDRESS, amount)).to.be.revertedWith( - 'zero address approval' + 'zero address' ) // Attempt set allowance from zero address - Impersonation is the only way to get to this validation await whileImpersonating(ZERO_ADDRESS, async (signer) => { await expect(stRSR.connect(signer).approve(addr2.address, amount)).to.be.revertedWith( - 'zero address approval' + 'zero address' ) }) @@ -2584,7 +2591,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Should not allow to decrease below zero await expect( stRSR.connect(addr1).decreaseAllowance(addr2.address, amount.add(1)) - ).to.be.revertedWith('decreased allowance below zero') + ).to.be.revertedWith('decrease allowance') // No changes expect(await stRSR.allowance(addr1.address, addr2.address)).to.equal(amount) @@ -2862,25 +2869,25 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(0) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Still zero for addr1, requires delegation - let currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(0) + let currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Cannot check votes on future block - await expect(stRSRVotes.getPastTotalSupply(currentBlockNumber + 1)).to.be.revertedWith( - 'ERC20Votes: block not yet mined' + await expect(stRSRVotes.getPastTotalSupply(currentBlockTimestamp + 1)).to.be.revertedWith( + 'ERC20Votes: future lookup' ) await expect( - stRSRVotes.getPastVotes(addr1.address, currentBlockNumber + 1) - ).to.be.revertedWith('ERC20Votes: block not yet mined') - await expect(stRSRVotes.getPastEra(currentBlockNumber + 1)).to.be.revertedWith( - 'ERC20Votes: block not yet mined' + stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp + 1) + ).to.be.revertedWith('ERC20Votes: future lookup') + await expect(stRSRVotes.getPastEra(currentBlockTimestamp + 1)).to.be.revertedWith( + 'ERC20Votes: future lookup' ) // Delegate votes @@ -2889,20 +2896,20 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint stored expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr1.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount1, ]) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Now properly counted - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -2918,20 +2925,22 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint stored expect(await stRSRVotes.numCheckpoints(addr2.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr2.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2, ]) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Couting votes for addr2 - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1.add(amount2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount2) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( + amount1.add(amount2) + ) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount2) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -2948,7 +2957,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoints stored expect(await stRSRVotes.numCheckpoints(addr2.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr2.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2.add(amount3), ]) expect(await stRSRVotes.numCheckpoints(addr3.address)).to.equal(0) @@ -2957,16 +2966,16 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await advanceBlocks(1) // Check new values - Delegated votes from addr3 count for addr2 - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal( + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( amount1.add(amount2).add(amount3) ) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal( + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal( amount2.add(amount3) ) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -2999,7 +3008,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.delegates(addr1.address)).to.equal(addr1.address) expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr1.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount1, ]) @@ -3007,12 +3016,12 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await advanceBlocks(1) // Check new values - Now properly counted - let currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + let currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -3033,20 +3042,22 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.delegates(addr2.address)).to.equal(addr3.address) expect(await stRSRVotes.numCheckpoints(addr3.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr3.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2, ]) - // Advance block - await advanceBlocks(1) + // Advance time + await advanceTime(1) // Check new values - Counting votes for addr3 - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount1.add(amount2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount1) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(amount2) - expect(await stRSRVotes.getPastEra(currentBlockNumber)).to.equal(1) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal( + amount1.add(amount2) + ) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount1) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(amount2) + expect(await stRSRVotes.getPastEra(currentBlockTimestamp)).to.equal(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -3069,12 +3080,12 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoint stored for delegatee correctly expect(await stRSRVotes.numCheckpoints(addr3.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr3.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount2.add(amount3), ]) - // Advance block - await advanceBlocks(1) + // Advance tim + await advanceTime(1) // Check current votes expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount1) @@ -3095,7 +3106,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr1).delegate(addr1.address) // Mine block - await advanceBlocks(1) + await advanceTime(1) // Set automine to true again await hre.network.provider.send('evm_setAutomine', [true]) @@ -3103,7 +3114,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Check checkpoints stored - Only one checkpoint expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(1) expect(await stRSRVotes.checkpoints(addr1.address, 0)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount.mul(2), ]) @@ -3111,17 +3122,17 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount.mul(2)) // Mine an additional block - await advanceBlocks(1) + await advanceTime(1) - const currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal( + const currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal( amount.mul(2) ) }) context('With stakes', function () { - let currentBlockNumber: number + let currentBlockTimestamp: number let amount: BigNumber beforeEach(async function () { @@ -3138,16 +3149,16 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr3).delegate(addr3.address) // Advance block - await advanceBlocks(1) + await advanceTime(1) }) it('Should count votes properly when changing exchange rate', async function () { // Check values before changing rate - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr3.address)).to.equal(0) @@ -3172,14 +3183,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.exchangeRate()).to.equal(fp('0.5')) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Check values after changing exchange rate - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr3.address)).to.equal(0) @@ -3189,14 +3200,14 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr3).stake(amount) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Check values after new stake - final stake counts double - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(4)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal( + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(4)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal( amount.mul(2) ) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) @@ -3206,11 +3217,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should track votes properly when changing era', async function () { // Check values before changing era - let currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + let currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) @@ -3230,20 +3241,20 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { expect(await stRSRVotes.exchangeRate()).to.equal(fp('1')) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Should not have retroactively wiped past vote - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) // Check values after changing era - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(0) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(0) @@ -3254,23 +3265,23 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { await stRSRVotes.connect(addr3).stake(amount) // Advance block - await advanceBlocks(1) + await advanceTime(1) // Check values after new stake - final stake is registered - currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(0) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(amount) + currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(amount) }) it('Should update votes/checkpoints on transfer', async function () { // Check values before transfers - const currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + const currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) @@ -3286,19 +3297,19 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Checkpoints stored expect(await stRSRVotes.numCheckpoints(addr1.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr1.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), bn(0), ]) expect(await stRSRVotes.numCheckpoints(addr2.address)).to.equal(2) expect(await stRSRVotes.checkpoints(addr2.address, 1)).to.eql([ - await getLatestBlockNumber(), + await getLatestBlockTimestamp(), amount.mul(2), ]) // Check current voting power has moved, previous values remain for older blocks - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(0) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount.mul(2)) @@ -3307,11 +3318,11 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { it('Should remove voting weight on unstaking', async function () { // Check values before transfers - const currentBlockNumber = (await getLatestBlockNumber()) - 1 - expect(await stRSRVotes.getPastTotalSupply(currentBlockNumber)).to.equal(amount.mul(2)) - expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockNumber)).to.equal(amount) - expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockNumber)).to.equal(0) + const currentBlockTimestamp = (await getLatestBlockTimestamp()) - 1 + expect(await stRSRVotes.getPastTotalSupply(currentBlockTimestamp)).to.equal(amount.mul(2)) + expect(await stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr2.address, currentBlockTimestamp)).to.equal(amount) + expect(await stRSRVotes.getPastVotes(addr3.address, currentBlockTimestamp)).to.equal(0) expect(await stRSRVotes.getVotes(addr1.address)).to.equal(amount) expect(await stRSRVotes.getVotes(addr2.address)).to.equal(amount) diff --git a/test/fixtures.ts b/test/fixtures.ts index 40291d38e5..1af9aa578d 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -450,7 +450,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 8ba38a3e62..a8043b8dcb 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -632,7 +632,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/integration/mainnet-test/FacadeActVersion.test.ts b/test/integration/mainnet-test/FacadeActVersion.test.ts index 1ff6300e68..87e426ea8d 100644 --- a/test/integration/mainnet-test/FacadeActVersion.test.ts +++ b/test/integration/mainnet-test/FacadeActVersion.test.ts @@ -97,7 +97,7 @@ describeFork( it('Fixed ActFacet should return right revenueOverview', async () => { const FacadeActFactory = await ethers.getContractFactory('ActFacet') - await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) + await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + 12) newFacadeAct = await FacadeActFactory.deploy() const expectedSurpluses = [ diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index a398067e94..b906eac08c 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -141,7 +141,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index c5f9ab663b..5a1cc4692a 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -670,7 +670,7 @@ export default function fn( rTokenMaxTradeVolume: MAX_UINT192, // +inf shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index b92d9d0e3e..ffb1516550 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -139,7 +139,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi rTokenMaxTradeVolume: fp('1e6'), // $1M shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index bdcf4f26e3..25e8a39c40 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -820,7 +820,7 @@ export default function fn( rTokenMaxTradeVolume: MAX_UINT192, // +inf shortFreeze: bn('259200'), // 3 days longFreeze: bn('2592000'), // 30 days - rewardRatio: bn('1069671574938'), // approx. half life of 90 days + rewardRatio: bn('89139297916'), // per second. approx half life of 90 days unstakingDelay: bn('1209600'), // 2 weeks withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) diff --git a/test/scenario/BadERC20.test.ts b/test/scenario/BadERC20.test.ts index 220ed60d0f..65f0aa5494 100644 --- a/test/scenario/BadERC20.test.ts +++ b/test/scenario/BadERC20.test.ts @@ -387,13 +387,7 @@ describe(`Bad ERC20 - P${IMPLEMENTATION}`, () => { .withArgs(rTokenTrader.address, furnace.address, issueAmt.div(2)) await expect(rsrTrader.manageTokens([rToken.address], [TradeKind.BATCH_AUCTION])) .to.emit(rsrTrader, 'TradeStarted') - .withArgs( - anyValue, - rToken.address, - rsr.address, - issueAmt.div(2), - toMinBuyAmt(issueAmt.div(2), fp('1'), fp('1'), ORACLE_ERROR, config.maxTradeSlippage) - ) + .withArgs(anyValue, rToken.address, rsr.address, issueAmt.div(2), anyValue) }) }) diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 2a27078d8f..a14028e444 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -1140,7 +1140,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) expect(await rToken.totalSupply()).to.be.closeTo( currentTotalSupply, - currentTotalSupply.div(bn('1e9')) // within 1 billionth + currentTotalSupply.div(bn('1e8')) ) // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace @@ -1260,7 +1260,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) expect(await rToken.totalSupply()).to.be.closeTo( currentTotalSupply, - currentTotalSupply.div(bn('1e5')) + currentTotalSupply.div(bn('1e4')) ) // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace diff --git a/test/utils/time.ts b/test/utils/time.ts index 64225299cc..6dac6a3e0f 100644 --- a/test/utils/time.ts +++ b/test/utils/time.ts @@ -17,11 +17,13 @@ export const setNextBlockTimestamp = async (timestamp: number | string) => { export const getLatestBlockTimestamp = async (): Promise => { const latestBlock = await ethers.provider.getBlock('latest') + return latestBlock.timestamp } export const getLatestBlockNumber = async (): Promise => { const latestBlock = await ethers.provider.getBlock('latest') + return latestBlock.number } diff --git a/tsconfig.json b/tsconfig.json index 53f2ccb76b..9d8a661264 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,9 +11,7 @@ "paths": { "@typechain/*": ["./typechain/*"], "#/*": ["./*"] - }, - "typeRoots": ["./typechain", "./node_modules/@types"], - "types": ["@nomiclabs/hardhat-ethers"] + } }, "exclude": ["./dist/**/*", "./node_modules/**/*"], "include": ["./test", "./tasks/**/*", "./common", "./scripts", "./typechain/**/*"], diff --git a/yarn.lock b/yarn.lock index 7b7e7a4873..244b998ab1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1617,10 +1617,10 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts-upgradeable@npm:~4.7.3": - version: 4.7.3 - resolution: "@openzeppelin/contracts-upgradeable@npm:4.7.3" - checksum: c9ffb40cb847a975d440204fc6a811f43af960050242f707332b984d29bd16dc242ffa0935de61867aeb9e0357fadedb16b09b276deda5e9775582face831021 +"@openzeppelin/contracts-upgradeable@npm:4.9.6": + version: 4.9.6 + resolution: "@openzeppelin/contracts-upgradeable@npm:4.9.6" + checksum: 481075e7222cab025ae55304263fca69a2d04305521957bc16d2aece9fa2b86b6914711724822493e3d04df7e793469cd0bcb1e09f0ddd10cb4e360ac7eed12a languageName: node linkType: hard @@ -1631,6 +1631,13 @@ __metadata: languageName: node linkType: hard +"@openzeppelin/contracts@npm:4.9.6": + version: 4.9.6 + resolution: "@openzeppelin/contracts@npm:4.9.6" + checksum: 274b6e968268294f12d5ca4f0278f6e6357792c8bb4d76664f83dbdc325f780541538a127e6a6e97e4f018088b42f65952014dec9c745c0fa25081f43ef9c4bf + languageName: node + linkType: hard + "@openzeppelin/contracts@npm:^4.3.3": version: 4.9.2 resolution: "@openzeppelin/contracts@npm:4.9.2" @@ -1638,13 +1645,6 @@ __metadata: languageName: node linkType: hard -"@openzeppelin/contracts@npm:~4.7.3": - version: 4.7.3 - resolution: "@openzeppelin/contracts@npm:4.7.3" - checksum: 18382fcacf7cfd652f5dd0e70c08f08ea74eaa8ff11e9f9850639ada70198ae01a3f9493d89a52d724f2db394e9616bf6258017804612ba273167cf657fbb073 - languageName: node - linkType: hard - "@openzeppelin/defender-base-client@npm:^1.46.0": version: 1.47.0 resolution: "@openzeppelin/defender-base-client@npm:1.47.0" @@ -8845,8 +8845,8 @@ __metadata: "@nomicfoundation/hardhat-toolbox": ^2.0.1 "@nomiclabs/hardhat-ethers": ^2.2.3 "@nomiclabs/hardhat-etherscan": ^3.1.0 - "@openzeppelin/contracts": ~4.7.3 - "@openzeppelin/contracts-upgradeable": ~4.7.3 + "@openzeppelin/contracts": 4.9.6 + "@openzeppelin/contracts-upgradeable": 4.9.6 "@openzeppelin/hardhat-upgrades": ^1.23.0 "@tenderly/hardhat-tenderly": ^1.7.7 "@typechain/ethers-v5": ^7.2.0 From 0d01a0df3820a7d5495167d4a1930a46caf90d81 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 10:36:31 -0400 Subject: [PATCH 347/450] deprecate sUSD tests --- ...bleTestSuite.test.ts => CvxStableTestSuite.test.ts_DEPRECATED} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/plugins/individual-collateral/curve/cvx/{CvxStableTestSuite.test.ts => CvxStableTestSuite.test.ts_DEPRECATED} (100%) diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts_DEPRECATED similarity index 100% rename from test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts rename to test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite.test.ts_DEPRECATED From eadfa32af738fb6f392480d80d86b29aebea203a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 10:36:38 -0400 Subject: [PATCH 348/450] route around broken EURT feed --- tasks/testing/mint-tokens.ts | 1 - test/integration/fixtures.ts | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/tasks/testing/mint-tokens.ts b/tasks/testing/mint-tokens.ts index b823d51271..5d6c298cef 100644 --- a/tasks/testing/mint-tokens.ts +++ b/tasks/testing/mint-tokens.ts @@ -53,7 +53,6 @@ task('mint-tokens', 'Mints all the tokens to an address') 'COMP', 'WETH', 'WBTC', - 'EURT', 'RSR', ] diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index a8043b8dcb..fec57dbc26 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -503,10 +503,17 @@ export async function collateralFixture( 18 ) + // EURT chainlink feed dead, use mock + const FeedFactory = await ethers.getContractFactory('MockV3Aggregator') + const eurFeed = await ethers.getContractAt( + 'MockV3Aggregator', + networkConfig[chainId].chainlinkFeeds.EUR! + ) + const feed = await FeedFactory.deploy(8, await eurFeed.latestAnswer()) const eurt = await makeEURFiatCollateral( - networkConfig[chainId].tokens.EURT as string, - networkConfig[chainId].chainlinkFeeds.EURT as string, - networkConfig[chainId].chainlinkFeeds.EUR as string, + networkConfig[chainId].tokens.EURT!, + feed.address, + networkConfig[chainId].chainlinkFeeds.EUR!, 'EUR' ) From 1ba5480aa5ad365edec32a7f841611f41b75ed54 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 11:03:21 -0400 Subject: [PATCH 349/450] fix EURT tests --- test/integration/AssetPlugins.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 9c915e4de0..91187af0ff 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -973,8 +973,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, eurFiatTokenDecimals: 6, eurFiatTokenAddress: networkConfig[chainId].tokens.EURT || '', eurFiatTokenCollateral: eurtCollateral, - targetPrice: fp('1.07025'), // approx price EUR-USD June 6, 2022 - refPrice: fp('1.073'), // approx price EURT-USD June 6, 2022 + targetPrice: fp('1.07025'), // mimic ref price + refPrice: fp('1.07025'), // approx price EURT-USD June 6, 2022 targetName: 'EUR', }, ] @@ -2168,7 +2168,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectPrice(cETHCollateral.address, cETHPrice, ORACLE_ERROR, true, bn('1e5')) // EURT - const eurPrice = fp('1.073') // approx price EUR-USD June 6, 2022 + const eurPrice = fp('1.07025') // approx price EURT-USD June 6, 2022 await expectPrice(eurtCollateral.address, eurPrice, ORACLE_ERROR, true, bn('1e5')) // ref price approx 1.07 // Aproximate total price of Basket in USD From 74c67931f32ea417f413b323e44da942416c0ffc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 11:49:01 -0400 Subject: [PATCH 350/450] fix Main.test.ts to correctly test index vs non-index basketHandlers --- test/Main.test.ts | 938 +++++++++++++++++++++++++--------------------- 1 file changed, 502 insertions(+), 436 deletions(-) diff --git a/test/Main.test.ts b/test/Main.test.ts index 50360fb614..f246971e03 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -203,6 +203,15 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await mintCollaterals(owner, [addr1, addr2], initialBal, basket) }) + const swapBasketHandlerIn = async (bh: TestIBasketHandler) => { + await setStorageAt(main.address, 204, bh.address) + if (IMPLEMENTATION == Implementation.P1) { + await setStorageAt(rToken.address, 355, bh.address) + await setStorageAt(backingManager.address, 302, bh.address) + await setStorageAt(assetRegistry.address, 201, bh.address) + } + } + describe('Deployment #fast', () => { it('Should setup Main correctly', async () => { // Auth roles @@ -1732,490 +1741,552 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await assetRegistry.connect(owner).register(eurColl.address) }) - it('Should not allow to set prime Basket if not OWNER', async () => { - await expect( - indexBH.connect(other).setPrimeBasket([token0.address], [fp('1')]) - ).to.be.revertedWith('governance only') - await expect( - basketHandler.connect(other).setPrimeBasket([token0.address], [fp('1')]) - ).to.be.revertedWith('governance only') - await expect( - indexBH.connect(other).forceSetPrimeBasket([token0.address], [fp('1')]) - ).to.be.revertedWith('governance only') - await expect( - basketHandler.connect(other).forceSetPrimeBasket([token0.address], [fp('1')]) - ).to.be.revertedWith('governance only') - }) - - it('Should not allow to set prime Basket with invalid length', async () => { - await expect(indexBH.connect(owner).setPrimeBasket([token0.address], [])).to.be.revertedWith( - 'len mismatch' - ) - await expect( - basketHandler.connect(owner).setPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') - await expect( - indexBH.connect(owner).forceSetPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') - }) - - it('Should not allow to set prime Basket with non-collateral tokens', async () => { - await expect( - basketHandler.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) - ).to.be.revertedWith('erc20 is not collateral') - await expect( - indexBH.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) - ).to.be.revertedWith('erc20 is not collateral') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([compToken.address], [fp('1')]) - ).to.be.revertedWith('erc20 is not collateral') - await expect( - indexBH.connect(owner).forceSetPrimeBasket([compToken.address], [fp('1')]) - ).to.be.revertedWith('erc20 is not collateral') - }) + context('Non-index BasketHandler', () => { + beforeEach(async () => { + await swapBasketHandlerIn(basketHandler) + }) - it('Should not allow to set prime Basket with duplicate ERC20s', async () => { - await expect( - indexBH.connect(owner).setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) - ).to.be.revertedWith('contains duplicates') - await expect( - basketHandler - .connect(owner) - .setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) - ).to.be.revertedWith('contains duplicates') - await expect( - indexBH - .connect(owner) - .forceSetPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) - ).to.be.revertedWith('contains duplicates') - await expect( - basketHandler - .connect(owner) - .forceSetPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) - ).to.be.revertedWith('contains duplicates') - }) + it('Should not allow to set prime Basket if not OWNER', async () => { + await expect( + basketHandler.connect(other).setPrimeBasket([token0.address], [fp('1')]) + ).to.be.revertedWith('governance only') + await expect( + basketHandler.connect(other).forceSetPrimeBasket([token0.address], [fp('1')]) + ).to.be.revertedWith('governance only') + }) - it('Should not allow to set prime Basket with 0 address tokens', async () => { - await expect( - indexBH.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - indexBH.connect(owner).forceSetPrimeBasket([ZERO_ADDRESS], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([ZERO_ADDRESS], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - }) + it('Should not allow to set prime Basket with invalid length', async () => { + await expect( + basketHandler.connect(owner).setPrimeBasket([token0.address], []) + ).to.be.revertedWith('len mismatch') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], []) + ).to.be.revertedWith('len mismatch') + }) - it('Should not allow to set prime Basket with stRSR', async () => { - await expect( - indexBH.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - indexBH.connect(owner).forceSetPrimeBasket([stRSR.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([stRSR.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - }) + it('Should not allow to set prime Basket with non-collateral tokens', async () => { + await expect( + basketHandler.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) + ).to.be.revertedWith('erc20 is not collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([compToken.address], [fp('1')]) + ).to.be.revertedWith('erc20 is not collateral') + }) - it('Should not allow to bypass MAX_TARGET_AMT', async () => { - // not possible on non-fresh basketHandler - await expect( - indexBH.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) - ).to.be.revertedWith('invalid target amount; too large') - await expect( - indexBH.connect(owner).forceSetPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) - ).to.be.revertedWith('invalid target amount; too large') - }) + it('Should not allow to set prime Basket with duplicate ERC20s', async () => { + await expect( + basketHandler + .connect(owner) + .setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + ).to.be.revertedWith('contains duplicates') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + ).to.be.revertedWith('contains duplicates') + }) - it('Should not allow to increase prime Basket weights', async () => { - // not possible on indexBH - await expect( - basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').add(1)]) - ).to.be.revertedWith('new target weights') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [fp('1').add(1)]) - ).to.be.revertedWith('new target weights') - }) + it('Should not allow to set prime Basket with 0 address tokens', async () => { + await expect( + basketHandler.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([ZERO_ADDRESS], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + }) - it('Should not allow to decrease prime Basket weights', async () => { - // not possible on indexBH - await expect( - basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').sub(1)]) - ).to.be.revertedWith('missing target weights') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [fp('1').sub(1)]) - ).to.be.revertedWith('missing target weights') - }) + it('Should not allow to set prime Basket with stRSR', async () => { + await expect( + basketHandler.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([stRSR.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + }) - it('Should not allow to set prime Basket with an empty basket', async () => { - await expect(indexBH.connect(owner).setPrimeBasket([], [])).to.be.revertedWith('empty basket') - await expect(basketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' - ) - await expect(indexBH.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' - ) - await expect(basketHandler.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' - ) - }) + it('Should not allow to increase prime Basket weights', async () => { + // not possible on indexBH + await expect( + basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').add(1)]) + ).to.be.revertedWith('new target weights') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [fp('1').add(1)]) + ).to.be.revertedWith('new target weights') + }) - it('Should not allow to set prime Basket with a zero amount', async () => { - await expect(indexBH.connect(owner).setPrimeBasket([token0.address], [0])).to.be.revertedWith( - 'invalid target amount; must be nonzero' - ) - await expect( - basketHandler.connect(owner).setPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('missing target weights') - await expect( - indexBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('invalid target amount; must be nonzero') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('missing target weights') - - // for non-reweightable baskets, also try setting a zero amount as the *original* basket - const newBH = await newBasketHandler() - await newBH.init(main.address, config.warmupPeriod, false) - await expect(newBH.connect(owner).setPrimeBasket([token0.address], [0])).to.be.revertedWith( - 'invalid target amount; must be nonzero' - ) - await expect( - newBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('invalid target amount; must be nonzero') - }) + it('Should not allow to decrease prime Basket weights', async () => { + // not possible on indexBH + await expect( + basketHandler.connect(owner).setPrimeBasket([token0.address], [fp('1').sub(1)]) + ).to.be.revertedWith('missing target weights') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [fp('1').sub(1)]) + ).to.be.revertedWith('missing target weights') + }) - it('Should be able to set exactly same basket', async () => { - await basketHandler - .connect(owner) - .setPrimeBasket( - [token0.address, token1.address, token2.address, token3.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + it('Should not allow to set prime Basket with an empty basket', async () => { + await expect(basketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( + 'empty basket' ) - await basketHandler - .connect(owner) - .forceSetPrimeBasket( - [token0.address, token1.address, token2.address, token3.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + await expect(basketHandler.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( + 'empty basket' ) + }) - await indexBH - .connect(owner) - .forceSetPrimeBasket( - [token0.address, token1.address, token2.address, token3.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ) - await indexBH - .connect(owner) - .forceSetPrimeBasket( - [token0.address, token1.address, token2.address, token3.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + it('Should not allow to set prime Basket with a zero amount', async () => { + await expect( + basketHandler.connect(owner).setPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('missing target weights') + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('missing target weights') + + // for non-reweightable baskets, also try setting a zero amount as the *original* basket + const newBH = await newBasketHandler() + await newBH.init(main.address, config.warmupPeriod, false) + await expect(newBH.connect(owner).setPrimeBasket([token0.address], [0])).to.be.revertedWith( + 'invalid target amount; must be nonzero' ) - }) + await expect( + newBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('invalid target amount; must be nonzero') + }) - it('Should be able to set prime basket multiple times', async () => { - // basketHandler - await expect( - basketHandler + it('Should be able to set exactly same basket', async () => { + await basketHandler .connect(owner) - .setPrimeBasket([token0.address, token3.address], [fp('0.5'), fp('0.5')]) - ) - .to.emit(basketHandler, 'PrimeBasketSet') - .withArgs( - [token0.address, token3.address], - [fp('0.5'), fp('0.5')], - [ethers.utils.formatBytes32String('USD')] + .setPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + await basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + }) + + it('Should be able to set prime basket multiple times', async () => { + // basketHandler + await expect( + basketHandler + .connect(owner) + .setPrimeBasket([token0.address, token3.address], [fp('0.5'), fp('0.5')]) ) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs( + [token0.address, token3.address], + [fp('0.5'), fp('0.5')], + [ethers.utils.formatBytes32String('USD')] + ) - await expect(basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')])) - .to.emit(basketHandler, 'PrimeBasketSet') - .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await expect(basketHandler.connect(owner).setPrimeBasket([token1.address], [fp('1')])) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - await expect(basketHandler.connect(owner).setPrimeBasket([token2.address], [fp('1')])) - .to.emit(basketHandler, 'PrimeBasketSet') - .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await expect(basketHandler.connect(owner).setPrimeBasket([token2.address], [fp('1')])) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - await expect(basketHandler.connect(owner).forceSetPrimeBasket([token1.address], [fp('1')])) - .to.emit(basketHandler, 'PrimeBasketSet') - .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await expect(basketHandler.connect(owner).forceSetPrimeBasket([token1.address], [fp('1')])) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - await expect(basketHandler.connect(owner).forceSetPrimeBasket([token2.address], [fp('1')])) - .to.emit(basketHandler, 'PrimeBasketSet') - .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await expect(basketHandler.connect(owner).forceSetPrimeBasket([token2.address], [fp('1')])) + .to.emit(basketHandler, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + }) - // indexBH - await expect( - indexBH - .connect(owner) - .setPrimeBasket([token0.address, token3.address], [fp('0.5'), fp('0.5')]) - ) - .to.emit(indexBH, 'PrimeBasketSet') - .withArgs( - [token0.address, token3.address], - [fp('0.5'), fp('0.5')], - [ethers.utils.formatBytes32String('USD')] - ) - await indexBH.connect(owner).refreshBasket() + it('Should not allow to set prime Basket as superset of old basket', async () => { + await assetRegistry.connect(owner).register(backupCollateral1.address) + await expect( + basketHandler + .connect(owner) + .setPrimeBasket( + [ + token0.address, + token1.address, + token2.address, + token3.address, + backupToken1.address, + ], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] + ) + ).to.be.revertedWith('new target weights') - await expect(indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')])) - .to.emit(indexBH, 'PrimeBasketSet') - .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - await indexBH.connect(owner).refreshBasket() + await expect( + basketHandler + .connect(owner) + .setPrimeBasket( + [token0.address, token1.address, token2.address, token3.address, eurToken.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] + ) + ).to.be.revertedWith('new target weights') - await expect(indexBH.connect(owner).setPrimeBasket([token2.address], [fp('1')])) - .to.emit(indexBH, 'PrimeBasketSet') - .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - await indexBH.connect(owner).refreshBasket() + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [ + token0.address, + token1.address, + token2.address, + token3.address, + backupToken1.address, + ], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] + ) + ).to.be.revertedWith('new target weights') + }) - await expect(indexBH.connect(owner).forceSetPrimeBasket([token1.address], [fp('1')])) - .to.emit(indexBH, 'PrimeBasketSet') - .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + it('Should not allow to set prime Basket as subset of old basket', async () => { + await expect( + basketHandler + .connect(owner) + .setPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.24')] + ) + ).to.be.revertedWith('missing target weights') + await expect( + basketHandler + .connect(owner) + .setPrimeBasket( + [token0.address, token1.address, token2.address], + [fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('missing target weights') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.24')] + ) + ).to.be.revertedWith('missing target weights') + }) - await expect(indexBH.connect(owner).forceSetPrimeBasket([token2.address], [fp('1')])) - .to.emit(indexBH, 'PrimeBasketSet') - .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - }) + it('Should not allow to change target unit in old basket', async () => { + await expect( + basketHandler + .connect(owner) + .setPrimeBasket( + [token0.address, token1.address, token2.address, eurToken.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('new target weights') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, eurToken.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('new target weights') + }) - it('Should not allow to set prime Basket as superset of old basket', async () => { - await assetRegistry.connect(owner).register(backupCollateral1.address) - await expect( - basketHandler - .connect(owner) - .setPrimeBasket( - [token0.address, token1.address, token2.address, token3.address, backupToken1.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] - ) - ).to.be.revertedWith('new target weights') + it('Should not allow to set prime Basket with RSR/RToken', async () => { + await expect( + basketHandler.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler - .connect(owner) - .setPrimeBasket( - [token0.address, token1.address, token2.address, token3.address, eurToken.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] - ) - ).to.be.revertedWith('new target weights') + await expect( + basketHandler + .connect(owner) + .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) + ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler - .connect(owner) - .forceSetPrimeBasket( - [token0.address, token1.address, token2.address, token3.address, backupToken1.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25'), fp('0.01')] - ) - ).to.be.revertedWith('new target weights') - }) + await expect( + basketHandler.connect(owner).forceSetPrimeBasket([rsr.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') - it('Should not allow to set prime Basket as subset of old basket', async () => { - await expect( - basketHandler - .connect(owner) - .setPrimeBasket( - [token0.address, token1.address, token2.address, token3.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.24')] - ) - ).to.be.revertedWith('missing target weights') - await expect( - basketHandler - .connect(owner) - .setPrimeBasket( - [token0.address, token1.address, token2.address], - [fp('0.25'), fp('0.25'), fp('0.25')] - ) - ).to.be.revertedWith('missing target weights') - await expect( - basketHandler - .connect(owner) - .forceSetPrimeBasket( - [token0.address, token1.address, token2.address, token3.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.24')] - ) - ).to.be.revertedWith('missing target weights') - }) + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) + ).to.be.revertedWith('invalid collateral') + }) - it('Should not allow to change target unit in old basket', async () => { - await expect( - basketHandler - .connect(owner) - .setPrimeBasket( - [token0.address, token1.address, token2.address, eurToken.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ) - ).to.be.revertedWith('new target weights') - await expect( - basketHandler - .connect(owner) - .forceSetPrimeBasket( - [token0.address, token1.address, token2.address, eurToken.address], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ) - ).to.be.revertedWith('new target weights') + it('Should revert if target has been changed in asset registry', async () => { + // Swap registered asset for NEW_TARGET target + const FiatCollateralFactory = await ethers.getContractFactory('FiatCollateral') + const coll = await FiatCollateralFactory.deploy({ + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: await collateral0.chainlinkFeed(), + oracleError: ORACLE_ERROR, + erc20: await collateral0.erc20(), + maxTradeVolume: config.rTokenMaxTradeVolume, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('NEW_TARGET'), + defaultThreshold: fp('0.01'), + delayUntilDefault: await collateral0.delayUntilDefault(), + }) + await assetRegistry.connect(owner).swapRegistered(coll.address) + + // Should revert + await expect( + basketHandler + .connect(owner) + .setPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('new target weights') + await expect( + basketHandler + .connect(owner) + .forceSetPrimeBasket( + [token0.address, token1.address, token2.address, token3.address], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ) + ).to.be.revertedWith('new target weights') + }) }) - it('Should not allow to set prime Basket with RSR/RToken', async () => { - await expect( - indexBH.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') + context('Index BasketHandler', () => { + beforeEach(async () => { + await swapBasketHandlerIn(indexBH) + }) - await expect( - indexBH - .connect(owner) - .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler - .connect(owner) - .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) - ).to.be.revertedWith('invalid collateral') + it('Should not allow to set prime Basket if not OWNER', async () => { + await expect( + indexBH.connect(other).setPrimeBasket([token0.address], [fp('1')]) + ).to.be.revertedWith('governance only') + await expect( + indexBH.connect(other).forceSetPrimeBasket([token0.address], [fp('1')]) + ).to.be.revertedWith('governance only') + }) - await expect( - indexBH.connect(owner).forceSetPrimeBasket([rsr.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler.connect(owner).forceSetPrimeBasket([rsr.address], [fp('1')]) - ).to.be.revertedWith('invalid collateral') + it('Should not allow to set prime Basket with invalid length', async () => { + await expect( + indexBH.connect(owner).setPrimeBasket([token0.address], []) + ).to.be.revertedWith('len mismatch') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([token0.address], []) + ).to.be.revertedWith('len mismatch') + }) - await expect( - indexBH - .connect(owner) - .forceSetPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) - ).to.be.revertedWith('invalid collateral') - await expect( - basketHandler - .connect(owner) - .forceSetPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) - ).to.be.revertedWith('invalid collateral') - }) + it('Should not allow to set prime Basket with non-collateral tokens', async () => { + await expect( + indexBH.connect(owner).setPrimeBasket([compToken.address], [fp('1')]) + ).to.be.revertedWith('erc20 is not collateral') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([compToken.address], [fp('1')]) + ).to.be.revertedWith('erc20 is not collateral') + }) - it('Should revert if target has been changed in asset registry', async () => { - // Swap registered asset for NEW_TARGET target - const FiatCollateralFactory = await ethers.getContractFactory('FiatCollateral') - const coll = await FiatCollateralFactory.deploy({ - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: await collateral0.chainlinkFeed(), - oracleError: ORACLE_ERROR, - erc20: await collateral0.erc20(), - maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT, - targetName: ethers.utils.formatBytes32String('NEW_TARGET'), - defaultThreshold: fp('0.01'), - delayUntilDefault: await collateral0.delayUntilDefault(), + it('Should not allow to set prime Basket with duplicate ERC20s', async () => { + await expect( + indexBH + .connect(owner) + .setPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + ).to.be.revertedWith('contains duplicates') + await expect( + indexBH + .connect(owner) + .forceSetPrimeBasket([token0.address, token0.address], [fp('1'), fp('1')]) + ).to.be.revertedWith('contains duplicates') }) - await assetRegistry.connect(owner).swapRegistered(coll.address) - // Should revert - await expect( - basketHandler + it('Should not allow to set prime Basket with 0 address tokens', async () => { + await expect( + indexBH.connect(owner).setPrimeBasket([ZERO_ADDRESS], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([ZERO_ADDRESS], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + }) + + it('Should not allow to set prime Basket with stRSR', async () => { + await expect( + indexBH.connect(owner).setPrimeBasket([stRSR.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([stRSR.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + }) + + it('Should not allow to bypass MAX_TARGET_AMT', async () => { + // not possible on non-fresh basketHandler + await expect( + indexBH.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) + ).to.be.revertedWith('invalid target amount; too large') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) + ).to.be.revertedWith('invalid target amount; too large') + }) + + it('Should not allow to set prime Basket with an empty basket', async () => { + await expect(indexBH.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( + 'empty basket' + ) + await expect(indexBH.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( + 'empty basket' + ) + }) + + it('Should not allow to set prime Basket with a zero amount', async () => { + await expect( + indexBH.connect(owner).setPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('invalid target amount; must be nonzero') + await expect( + indexBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) + ).to.be.revertedWith('invalid target amount; must be nonzero') + }) + + it('Should be able to set exactly same basket', async () => { + await indexBH .connect(owner) - .setPrimeBasket( + .forceSetPrimeBasket( [token0.address, token1.address, token2.address, token3.address], [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] ) - ).to.be.revertedWith('new target weights') - await expect( - basketHandler + await indexBH .connect(owner) .forceSetPrimeBasket( [token0.address, token1.address, token2.address, token3.address], [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] ) - ).to.be.revertedWith('new target weights') - }) + }) - it('Should normalize by price for index RTokens', async () => { - // Throughout this test the $ value of the RToken should remain + it('Should be able to set prime basket multiple times', async () => { + // indexBH + await expect( + indexBH + .connect(owner) + .setPrimeBasket([token0.address, token3.address], [fp('0.5'), fp('0.5')]) + ) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs( + [token0.address, token3.address], + [fp('0.5'), fp('0.5')], + [ethers.utils.formatBytes32String('USD')] + ) + await indexBH.connect(owner).refreshBasket() - // Set initial basket - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - let [erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(tokAmts[0]).to.equal(fp('1')) + await expect(indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await indexBH.connect(owner).refreshBasket() - // Add EURO into the basket as a pure addition, changing price to $0.80 in USD and $0.20 in EURO - await indexBH - .connect(owner) - .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) - await indexBH.connect(owner).refreshBasket() - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(2) - expect(erc20s[0]).to.equal(token0.address) - expect(erc20s[1]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('0.8')) - expect(tokAmts[1]).to.equal(fp('0.2')) - - // Remove USD from the basket entirely, changing price to $1 in EURO - await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('1000')]) - await indexBH.connect(owner).refreshBasket() - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(erc20s[0]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('1')) // still $1! + await expect(indexBH.connect(owner).setPrimeBasket([token2.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + await indexBH.connect(owner).refreshBasket() - // No change by simply resizing the basket - await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('0.000001')]) - await indexBH.connect(owner).refreshBasket() - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(erc20s[0]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('1')) // still $1! - - // Not refreshing the basket in between should still allow a consecutive setPrimeBasket - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(erc20s[0]).to.equal(eurToken.address) // not token0 yet - expect(tokAmts[0]).to.equal(fp('1')) - await indexBH - .connect(owner) - .setPrimeBasket([token0.address, eurToken.address], [fp('0.25'), fp('0.25')]) - await indexBH.connect(owner).refreshBasket() + await expect(indexBH.connect(owner).forceSetPrimeBasket([token1.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token1.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) - // $0.50 USD / $0.50 EURO by the end - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(2) - expect(erc20s[0]).to.equal(token0.address) - expect(erc20s[1]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('0.5')) - expect(tokAmts[1]).to.equal(fp('0.5')) - }) + await expect(indexBH.connect(owner).forceSetPrimeBasket([token2.address], [fp('1')])) + .to.emit(indexBH, 'PrimeBasketSet') + .withArgs([token2.address], [fp('1')], [ethers.utils.formatBytes32String('USD')]) + }) - it('Should not normalize by price when the current basket is unsound', async () => { - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - await setOraclePrice(collateral0.address, fp('0.5')) - await assetRegistry.refresh() - expect(await collateral0.status()).to.equal(CollateralStatus.IFFY) - expect(await collateral1.status()).to.equal(CollateralStatus.SOUND) - await expect( - indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) - ).to.be.revertedWith('unsound basket') - }) + it('Should not allow to set prime Basket with RSR/RToken', async () => { + await expect( + indexBH.connect(owner).setPrimeBasket([rsr.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') - it('Should not normalize by price if the new collateral is unsound', async () => { - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - await setOraclePrice(collateral1.address, fp('0.5')) - await assetRegistry.refresh() - expect(await collateral0.status()).to.equal(CollateralStatus.SOUND) - expect(await collateral1.status()).to.equal(CollateralStatus.IFFY) - await expect( - indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) - ).to.be.revertedWith('unsound new collateral') + await expect( + indexBH + .connect(owner) + .setPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) + ).to.be.revertedWith('invalid collateral') + + await expect( + indexBH.connect(owner).forceSetPrimeBasket([rsr.address], [fp('1')]) + ).to.be.revertedWith('invalid collateral') + + await expect( + indexBH + .connect(owner) + .forceSetPrimeBasket([token0.address, rToken.address], [fp('0.5'), fp('0.5')]) + ).to.be.revertedWith('invalid collateral') + }) + + it('Should normalize by price for index RTokens', async () => { + // Throughout this test the $ value of the RToken should remain + + // Set initial basket + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + let [erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(tokAmts[0]).to.equal(fp('1')) + + // Add EURO into the basket as a pure addition, changing price to $0.80 in USD and $0.20 in EURO + await indexBH + .connect(owner) + .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) + await indexBH.connect(owner).refreshBasket() + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(2) + expect(erc20s[0]).to.equal(token0.address) + expect(erc20s[1]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('0.8')) + expect(tokAmts[1]).to.equal(fp('0.2')) + + // Remove USD from the basket entirely, changing price to $1 in EURO + await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('1000')]) + await indexBH.connect(owner).refreshBasket() + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(erc20s[0]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('1')) // still $1! + + // No change by simply resizing the basket + await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('0.000001')]) + await indexBH.connect(owner).refreshBasket() + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(erc20s[0]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('1')) // still $1! + + // Not refreshing the basket in between should still allow a consecutive setPrimeBasket + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(1) + expect(erc20s[0]).to.equal(eurToken.address) // not token0 yet + expect(tokAmts[0]).to.equal(fp('1')) + await indexBH + .connect(owner) + .setPrimeBasket([token0.address, eurToken.address], [fp('0.25'), fp('0.25')]) + await indexBH.connect(owner).refreshBasket() + + // $0.50 USD / $0.50 EURO by the end + ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) + expect(erc20s.length).to.equal(2) + expect(erc20s[0]).to.equal(token0.address) + expect(erc20s[1]).to.equal(eurToken.address) + expect(tokAmts[0]).to.equal(fp('0.5')) + expect(tokAmts[1]).to.equal(fp('0.5')) + }) + + it('Should not normalize by price when the current basket is unsound', async () => { + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + await setOraclePrice(collateral0.address, fp('0.5')) + await assetRegistry.refresh() + expect(await collateral0.status()).to.equal(CollateralStatus.IFFY) + expect(await collateral1.status()).to.equal(CollateralStatus.SOUND) + await expect( + indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) + ).to.be.revertedWith('unsound basket') + }) + + it('Should not normalize by price if the new collateral is unsound', async () => { + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + await setOraclePrice(collateral1.address, fp('0.5')) + await assetRegistry.refresh() + expect(await collateral0.status()).to.equal(CollateralStatus.SOUND) + expect(await collateral1.status()).to.equal(CollateralStatus.IFFY) + await expect( + indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) + ).to.be.revertedWith('unsound new collateral') + }) }) describe('Custom Redemption', () => { @@ -2234,12 +2305,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ) // Swap-in indexBH - await setStorageAt(main.address, 204, indexBH.address) - if (IMPLEMENTATION == Implementation.P1) { - await setStorageAt(rToken.address, 355, indexBH.address) - await setStorageAt(backingManager.address, 302, indexBH.address) - await setStorageAt(assetRegistry.address, 201, indexBH.address) - } + await swapBasketHandlerIn(indexBH) await indexBH .connect(owner) .forceSetPrimeBasket( From 0ca65e0a103855b5e7782dc389591d398290365f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 12:03:36 -0400 Subject: [PATCH 351/450] update suggested rewardRatio vals --- docs/deployment-variables.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index 5671f02154..1a556067c2 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -39,11 +39,11 @@ Mainnet reasonable range: 1e22 to 1e27. Dimension: `{1}` -The `rewardRatio` is the fraction of the current reward amount that should be handed out per block. +The `rewardRatio` is the fraction of the current reward amount that should be handed out per second. -Default value: `6876460100000` = a half life of 14 days. +Default value: `573038343750` = a half life of 14 days. -Mainnet reasonable range: 1e12 to 1e14 +Mainnet reasonable range: 1e10 to 1e13 To calculate: `ln(2) / (60*60*24*desired_days_in_half_life/12)`, and then multiply by 1e18. From dd49c6adb42e3c6f4b4e5aa494700ed3f4481f75 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 12:04:02 -0400 Subject: [PATCH 352/450] nit --- docs/deployment-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index 1a556067c2..db431b2ecc 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -45,7 +45,7 @@ Default value: `573038343750` = a half life of 14 days. Mainnet reasonable range: 1e10 to 1e13 -To calculate: `ln(2) / (60*60*24*desired_days_in_half_life/12)`, and then multiply by 1e18. +To calculate: `ln(2) / (60*60*24*desired_days_in_half_life)`, and then multiply by 1e18. ### `unstakingDelay` From 201e6829ec2270f88fcf1fc9d30d93859be99262 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 17 Apr 2024 12:04:23 -0400 Subject: [PATCH 353/450] more nitting --- docs/deployment-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index db431b2ecc..e9d66182eb 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -43,7 +43,7 @@ The `rewardRatio` is the fraction of the current reward amount that should be ha Default value: `573038343750` = a half life of 14 days. -Mainnet reasonable range: 1e10 to 1e13 +Reasonable range: 1e10 to 1e13 To calculate: `ln(2) / (60*60*24*desired_days_in_half_life)`, and then multiply by 1e18. From cd4085f4792ff23c7654a4a3c5da66f908846218 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Apr 2024 11:25:27 -0400 Subject: [PATCH 354/450] P0 _msgSender() --- contracts/mixins/Auth.sol | 8 ++++---- contracts/p0/BackingManager.sol | 2 +- contracts/p0/BasketHandler.sol | 4 ++-- contracts/p0/Broker.sol | 6 +++--- contracts/p0/Distributor.sol | 7 ++++--- contracts/p0/RToken.sol | 30 +++++++++++++++--------------- contracts/p0/StRSR.sol | 16 ++++++++-------- contracts/p0/mixins/Component.sol | 2 +- 8 files changed, 38 insertions(+), 37 deletions(-) diff --git a/contracts/mixins/Auth.sol b/contracts/mixins/Auth.sol index 9dad3cb7fc..0b8028c2f7 100644 --- a/contracts/mixins/Auth.sol +++ b/contracts/mixins/Auth.sol @@ -74,7 +74,7 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { _setRoleAdmin(LONG_FREEZER, OWNER); _setRoleAdmin(PAUSER, OWNER); - _grantRole(OWNER, msg.sender); + _grantRole(OWNER, _msgSender()); setShortFreeze(shortFreeze_); setLongFreeze(longFreeze_); @@ -123,7 +123,7 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { // - after, caller does not have the SHORT_FREEZER role function freezeShort() external onlyRole(SHORT_FREEZER) { // Revoke short freezer role after one use - _revokeRole(SHORT_FREEZER, msg.sender); + _revokeRole(SHORT_FREEZER, _msgSender()); freezeUntil(uint48(block.timestamp) + shortFreeze); } @@ -137,10 +137,10 @@ abstract contract Auth is AccessControlUpgradeable, IAuth { // - longFreezes'[caller] = longFreezes[caller] - 1 // - if longFreezes'[caller] == 0 then caller loses the LONG_FREEZER role function freezeLong() external onlyRole(LONG_FREEZER) { - longFreezes[msg.sender] -= 1; // reverts on underflow + longFreezes[_msgSender()] -= 1; // reverts on underflow // Revoke on 0 charges as a cleanup step - if (longFreezes[msg.sender] == 0) _revokeRole(LONG_FREEZER, msg.sender); + if (longFreezes[_msgSender()] == 0) _revokeRole(LONG_FREEZER, _msgSender()); freezeUntil(uint48(block.timestamp) + longFreeze); } diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 43befc7d1d..1058b47a55 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -66,7 +66,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { delete tokensOut[trade.sell()]; // if the settler is the trade contract itself, try chaining with another rebalance() - if (msg.sender == address(trade)) { + if (_msgSender() == address(trade)) { // solhint-disable-next-line no-empty-blocks try this.rebalance(trade.KIND()) {} catch (bytes memory errData) { // prevent MEV searchers from providing less gas on purpose by reverting if OOG diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index b9f9099da8..2b8e9e7439 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -185,7 +185,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // checks: caller is assetRegistry // effects: disabled' = true function disableBasket() external { - require(msg.sender == address(main.assetRegistry()), "asset registry only"); + require(_msgSender() == address(main.assetRegistry()), "asset registry only"); uint192[] memory refAmts = new uint192[](basket.erc20s.length); for (uint256 i = 0; i < basket.erc20s.length; i++) { @@ -210,7 +210,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { main.assetRegistry().refresh(); require( - main.hasRole(OWNER, msg.sender) || + main.hasRole(OWNER, _msgSender()) || (lastStatus == CollateralStatus.DISABLED && !main.tradingPausedOrFrozen()), "basket unrefreshable" ); diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index e7f1e7005e..1a6345cfee 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -68,7 +68,7 @@ contract BrokerP0 is ComponentP0, IBroker { ) external returns (ITrade) { assert(req.sellAmount > 0); - address caller = msg.sender; + address caller = _msgSender(); require( caller == address(main.backingManager()) || caller == address(main.rsrTrader()) || @@ -88,8 +88,8 @@ contract BrokerP0 is ComponentP0, IBroker { /// Disable the broker until re-enabled by governance /// @custom:protected function reportViolation() external { - require(trades[msg.sender], "unrecognized trade contract"); - ITrade trade = ITrade(msg.sender); + require(trades[_msgSender()], "unrecognized trade contract"); + ITrade trade = ITrade(_msgSender()); TradeKind kind = trade.KIND(); if (kind == TradeKind.BATCH_AUCTION) { diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 8e33824d03..264d7bfe7e 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -53,7 +53,8 @@ contract DistributorP0 is ComponentP0, IDistributor { IERC20 rsr = main.rsr(); require( - msg.sender == address(main.rsrTrader()) || msg.sender == address(main.rTokenTrader()), + _msgSender() == address(main.rsrTrader()) || + _msgSender() == address(main.rTokenTrader()), "RevenueTraders only" ); require(erc20 == rsr || erc20 == IERC20(address(main.rToken())), "RSR or RToken"); @@ -87,9 +88,9 @@ contract DistributorP0 is ComponentP0, IDistributor { addrTo = address(main.stRSR()); if (transferAmt > 0) accountRewards = true; } - erc20.safeTransferFrom(msg.sender, addrTo, transferAmt); + erc20.safeTransferFrom(_msgSender(), addrTo, transferAmt); } - emit RevenueDistributed(erc20, msg.sender, amount); + emit RevenueDistributed(erc20, _msgSender(), amount); // Perform reward accounting if (accountRewards) { diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol index b7710269b9..3a4b476aff 100644 --- a/contracts/p0/RToken.sol +++ b/contracts/p0/RToken.sol @@ -80,7 +80,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity of RToken to issue /// @custom:interaction function issue(uint256 amount) public { - issueTo(msg.sender, amount); + issueTo(_msgSender(), amount); } /// Issue an RToken on the current basket, to a particular recipient @@ -111,7 +111,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote(baskets, CEIL); - address issuer = msg.sender; + address issuer = _msgSender(); for (uint256 i = 0; i < erc20s.length; i++) { IERC20(erc20s[i]).safeTransferFrom(issuer, address(main.backingManager()), deposits[i]); } @@ -124,7 +124,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qTok} The quantity {qRToken} of RToken to redeem /// @custom:interaction function redeem(uint256 amount) external { - redeemTo(msg.sender, amount); + redeemTo(_msgSender(), amount); } /// Redeem RToken for basket collateral to a particular recipient @@ -136,7 +136,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { main.poke(); require(amount > 0, "Cannot redeem zero"); - require(amount <= balanceOf(msg.sender), "insufficient balance"); + require(amount <= balanceOf(_msgSender()), "insufficient balance"); require(main.basketHandler().fullyCollateralized(), "partial redemption; use redeemCustom"); // redemption while IFFY/DISABLED allowed @@ -145,8 +145,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(totalSupply(), int256(amount)); // reverts on overuse // {BU} - uint192 baskets = _scaleDown(msg.sender, amount); - emit Redemption(msg.sender, recipient, amount, baskets); + uint192 baskets = _scaleDown(_msgSender(), amount); + emit Redemption(_msgSender(), recipient, amount, baskets); (address[] memory erc20s, uint256[] memory amounts) = main.basketHandler().quote( baskets, @@ -183,7 +183,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { uint256[] memory minAmounts ) external notFrozen exchangeRateIsValidAfter { require(amount > 0, "Cannot redeem zero"); - require(amount <= balanceOf(msg.sender), "insufficient balance"); + require(amount <= balanceOf(_msgSender()), "insufficient balance"); // Call collective state keepers. main.poke(); @@ -195,8 +195,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { redemptionThrottle.useAvailable(supply, int256(amount)); // reverts on overuse // {BU} - uint192 basketsRedeemed = _scaleDown(msg.sender, amount); - emit Redemption(msg.sender, recipient, amount, basketsRedeemed); + uint192 basketsRedeemed = _scaleDown(_msgSender(), amount); + emit Redemption(_msgSender(), recipient, amount, basketsRedeemed); // === Get basket redemption amounts === @@ -261,7 +261,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param baskets {BU} The number of baskets to mint RToken for /// @custom:protected function mint(uint192 baskets) external exchangeRateIsValidAfter { - require(msg.sender == address(main.backingManager()), "not backing manager"); + require(_msgSender() == address(main.backingManager()), "not backing manager"); _scaleUp(address(main.backingManager()), baskets); } @@ -269,8 +269,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qRTok} The amount to be melted /// @custom:protected function melt(uint256 amount) external exchangeRateIsValidAfter { - require(msg.sender == address(main.furnace()), "furnace only"); - _burn(msg.sender, amount); + require(_msgSender() == address(main.furnace()), "furnace only"); + _burn(_msgSender(), amount); emit Melted(amount); } @@ -279,8 +279,8 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { /// @param amount {qRTok} /// @custom:protected function dissolve(uint256 amount) external exchangeRateIsValidAfter { - require(msg.sender == address(main.backingManager()), "not backing manager"); - _scaleDown(msg.sender, amount); + require(_msgSender() == address(main.backingManager()), "not backing manager"); + _scaleDown(_msgSender(), amount); } /// An affordance of last resort for Main in order to ensure re-capitalization @@ -290,7 +290,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { notTradingPausedOrFrozen exchangeRateIsValidAfter { - require(msg.sender == address(main.backingManager()), "not backing manager"); + require(_msgSender() == address(main.backingManager()), "not backing manager"); require(totalSupply() > 0, "0 supply"); emit BasketsNeededChanged(basketsNeeded, basketsNeeded_); basketsNeeded = basketsNeeded_; diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index 8a65dd5216..86e8b2eb42 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -147,7 +147,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @dev Staking continues while paused, without reward handouts /// @custom:interaction function stake(uint256 rsrAmount) external { - address account = msg.sender; + address account = _msgSender(); require(rsrAmount > 0, "Cannot stake zero"); _payoutRewards(); @@ -241,7 +241,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } function cancelUnstake(uint256 endId) external notFrozen { - address account = msg.sender; + address account = _msgSender(); // Call state keepers _payoutRewards(); @@ -359,7 +359,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // Transfer RSR to caller emit ExchangeRateSet(initialExchangeRate, exchangeRate()); - main.rsr().safeTransfer(msg.sender, seizedRSR); + main.rsr().safeTransfer(_msgSender(), seizedRSR); } function bankruptStakers() internal returns (uint256 seizedRSR) { @@ -444,7 +444,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } function transfer(address to, uint256 amount) external returns (bool) { - _transfer(msg.sender, to, amount); + _transfer(_msgSender(), to, amount); return true; } @@ -474,7 +474,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { } function approve(address spender, uint256 amount) public returns (bool) { - _approve(msg.sender, spender, amount); + _approve(_msgSender(), spender, amount); return true; } @@ -483,19 +483,19 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { address to, uint256 amount ) public returns (bool) { - _spendAllowance(from, msg.sender, amount); + _spendAllowance(from, _msgSender(), amount); _transfer(from, to, amount); return true; } function increaseAllowance(address spender, uint256 addedValue) external returns (bool) { - address owner = msg.sender; + address owner = _msgSender(); _approve(owner, spender, allowances[owner][spender] + addedValue); return true; } function decreaseAllowance(address spender, uint256 subtractedValue) external returns (bool) { - address owner = msg.sender; + address owner = _msgSender(); uint256 currentAllowance = allowances[owner][spender]; require(currentAllowance >= subtractedValue, "decrease allowance"); unchecked { diff --git a/contracts/p0/mixins/Component.sol b/contracts/p0/mixins/Component.sol index fc82ee500d..c1e64d4a22 100644 --- a/contracts/p0/mixins/Component.sol +++ b/contracts/p0/mixins/Component.sol @@ -41,7 +41,7 @@ abstract contract ComponentP0 is Versioned, Initializable, ContextUpgradeable, I } modifier governance() { - require(main.hasRole(OWNER, msg.sender), "governance only"); + require(main.hasRole(OWNER, _msgSender()), "governance only"); _; } } From 8fd2b061b7f6b088fba7dc602ebb8b5bae198db6 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Apr 2024 13:13:17 -0400 Subject: [PATCH 355/450] rename test --- test/Main.test.ts | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/test/Main.test.ts b/test/Main.test.ts index e3635c1fec..c7b6389471 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -2264,6 +2264,22 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(tokAmts[1]).to.equal(fp('0.5')) }) + it('Should not normalize by price when the current basket is unpriced', async () => { + await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) + await indexBH.connect(owner).refreshBasket() + + // Set Token0 to unpriced - stale oracle + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) + await expectUnpriced(collateral0.address) + + // Attempt to add EURO, basket is not SOUND + await expect( + indexBH + .connect(owner) + .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) + ).to.be.revertedWith('unsound basket') + }) + it('Should not normalize by price when the current basket is unsound', async () => { await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) await indexBH.connect(owner).refreshBasket() @@ -2287,22 +2303,6 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) ).to.be.revertedWith('unsound new collateral') }) - - it('Should handle unpriced asset in normalization', async () => { - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - - // Set Token0 to unpriced - stale oracle - await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) - await expectUnpriced(collateral0.address) - - // Attempt to add EURO, basket is not SOUND - await expect( - indexBH - .connect(owner) - .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) - ).to.be.revertedWith('unsound basket') - }) }) describe('Custom Redemption', () => { From abdf9c5a6ae34001de11083c2c6cf43448b2c2fc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 19 Apr 2024 13:46:23 -0400 Subject: [PATCH 356/450] CHANGELOG --- CHANGELOG.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02befc5d1a..671e2bae6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,18 +51,14 @@ All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be - compound-v3 - Emit `RewardsClaimed` event during `claimRewards()` - curve - - Make `price()` more resistant to manipulation by MEV - Emit `RewardsClaimed` event during `claimRewards()` - convex - - Make `price()` more resistant to manipulation by MEV - Emit `RewardsClaimed` event during `claimRewards()` - Add new `crvUSD-USDC` plugin - morpho-aave - Emit `RewardsClaimed` event during `claimRewards()` - stargate - Emit `RewardsClaimed` event during `claimRewards()` -- yearn-v2 - - Make `price()` more resistant to manipulation by MEV ### Trading From 9c528d8ac1b4bff6c736b95e86645c70da98cd3b Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 23 Apr 2024 08:32:04 -0300 Subject: [PATCH 357/450] Review blacklist Scenario test (#1119) --- contracts/plugins/mocks/BadERC20.sol | 6 ++++-- test/scenario/BadERC20.test.ts | 17 +++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/contracts/plugins/mocks/BadERC20.sol b/contracts/plugins/mocks/BadERC20.sol index 4fb24c0cda..dc0c9a0c52 100644 --- a/contracts/plugins/mocks/BadERC20.sol +++ b/contracts/plugins/mocks/BadERC20.sol @@ -48,6 +48,7 @@ contract BadERC20 is ERC20Mock { } function approve(address spender, uint256 amount) public virtual override returns (bool) { + if (censored[msg.sender] || censored[spender]) revert("censored"); if (revertApprove && amount > 0 && amount < type(uint256).max) revert("revertApprove"); return super.approve(spender, amount); } @@ -65,8 +66,9 @@ contract BadERC20 is ERC20Mock { address to, uint256 amount ) public virtual override returns (bool) { - if (censored[from] || censored[to]) revert("censored"); - _spendAllowance(from, msg.sender, amount); + address spender = msg.sender; + if (censored[spender] || censored[from] || censored[to]) revert("censored"); + _spendAllowance(from, spender, amount); uint256 fee = transferFee.mulu_toUint(amount, CEIL); _transfer(from, to, amount - fee); _burn(from, fee); diff --git a/test/scenario/BadERC20.test.ts b/test/scenario/BadERC20.test.ts index 65f0aa5494..e837428d43 100644 --- a/test/scenario/BadERC20.test.ts +++ b/test/scenario/BadERC20.test.ts @@ -280,19 +280,16 @@ describe(`Bad ERC20 - P${IMPLEMENTATION}`, () => { await token0.setCensored(rToken.address, true) }) - it('should revert during atomic issuance', async () => { - await token0.connect(addr2).approve(rToken.address, issueAmt) - await expect(rToken.connect(addr2).issue(issueAmt)).to.be.revertedWith('censored') + it('should revert on issuance', async () => { + // Will revert even on approval + await expect(token0.connect(addr2).approve(rToken.address, issueAmt)).to.be.revertedWith( + 'censored' + ) - // Should work now - await token0.setCensored(backingManager.address, false) + // Allow approval temporarily await token0.setCensored(rToken.address, false) - await rToken.connect(addr2).issue(issueAmt) - }) - - it('should revert during slow issuance', async () => { - issueAmt = initialBal.div(10) // over 1 block await token0.connect(addr2).approve(rToken.address, issueAmt) + await token0.setCensored(rToken.address, true) await expect(rToken.connect(addr2).issue(issueAmt)).to.be.revertedWith('censored') // Should work now From de6025e8cc532800beb906cd55e4488e4fac7ab3 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 24 Apr 2024 21:54:00 +0530 Subject: [PATCH 358/450] Misc changes (#1121) Co-authored-by: Taylor Brent --- contracts/p0/BackingManager.sol | 2 +- contracts/p0/StRSR.sol | 8 +- contracts/p1/BackingManager.sol | 2 +- contracts/p1/StRSR.sol | 57 +++++++----- contracts/p1/StRSRVotes.sol | 97 +++++++++++++++------ contracts/plugins/governance/Governance.sol | 5 +- test/FacadeWrite.test.ts | 2 +- test/Governance.test.ts | 2 +- test/ZZStRSR.test.ts | 24 ++--- 9 files changed, 124 insertions(+), 75 deletions(-) diff --git a/contracts/p0/BackingManager.sol b/contracts/p0/BackingManager.sol index 1058b47a55..0bcb1b48c6 100644 --- a/contracts/p0/BackingManager.sol +++ b/contracts/p0/BackingManager.sol @@ -85,7 +85,7 @@ contract BackingManagerP0 is TradingP0, IBackingManager { // DoS prevention: // unless caller is self, require that the next auction is not in same block require( - _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] < block.timestamp, "already rebalancing" ); diff --git a/contracts/p0/StRSR.sol b/contracts/p0/StRSR.sol index 86e8b2eb42..814a4a94e7 100644 --- a/contracts/p0/StRSR.sol +++ b/contracts/p0/StRSR.sol @@ -148,7 +148,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { /// @custom:interaction function stake(uint256 rsrAmount) external { address account = _msgSender(); - require(rsrAmount > 0, "Cannot stake zero"); + require(rsrAmount > 0, "zero amount"); _payoutRewards(); @@ -232,8 +232,8 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { leakyRefresh(total); // Checks - require(bh.fullyCollateralized(), "RToken uncollateralized"); - require(bh.isReady(), "basket not ready"); + require(bh.isReady(), "RToken readying"); + require(bh.fullyCollateralized(), "RToken readying"); // Execute accumulated withdrawals emit UnstakingCompleted(start, i, draftEra, account, total); @@ -248,7 +248,7 @@ contract StRSRP0 is IStRSR, ComponentP0, EIP712Upgradeable { // We specifically allow unstaking when under collateralized // IBasketHandler bh = main.basketHandler(); - // require(bh.fullyCollateralized(), "RToken uncollateralized"); + // require(bh.fullyCollateralized(), "RToken readying"); // require(bh.isReady(), "basket not ready"); Withdrawal[] storage queue = withdrawals[account]; diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index 3d3afe25f6..ce477745dc 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -113,7 +113,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { // DoS prevention: // unless caller is self, require that the next auction is not in same block require( - _msgSender() == address(this) || tradeEnd[kind] + 1 < block.timestamp, + _msgSender() == address(this) || tradeEnd[kind] < block.timestamp, "already rebalancing" ); diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index a07b1e9aad..906b8dccd7 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -14,6 +14,8 @@ import "../libraries/Fixed.sol"; import "../libraries/Permit.sol"; import "./mixins/Component.sol"; +// solhint-disable max-states-count + /* * @title StRSRP1 * @notice StRSR is an ERC20 token contract that allows people to stake their RSR as @@ -223,7 +225,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // actions: // rsr.transferFrom(account, this, rsrAmount) function stake(uint256 rsrAmount) public { - require(rsrAmount != 0, "Cannot stake zero"); + _notZero(rsrAmount); _payoutRewards(); @@ -255,10 +257,10 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // A draft for (totalDrafts' - totalDrafts) drafts // is freshly appended to the caller's draft record. function unstake(uint256 stakeAmount) external { - requireNotTradingPausedOrFrozen(); + _requireNotTradingPausedOrFrozen(); + _notZero(stakeAmount); address account = _msgSender(); - require(stakeAmount != 0, "zero amount"); require(stakes[era][account] >= stakeAmount, "insufficient balance"); _payoutRewards(); @@ -300,7 +302,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // actions: // rsr.transfer(account, rsrOut) function withdraw(address account, uint256 endId) external { - requireNotTradingPausedOrFrozen(); + _requireNotTradingPausedOrFrozen(); uint256 firstId = firstRemainingDraft[draftEra][account]; CumulativeDraft[] storage queue = draftQueues[draftEra][account]; @@ -336,19 +338,17 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab emit UnstakingCompleted(firstId, endId, draftEra, account, rsrAmount); // == Checks == - require(basketHandler.fullyCollateralized(), "RToken uncollateralized"); - require(basketHandler.isReady(), "basket not ready"); + require(basketHandler.isReady() && basketHandler.fullyCollateralized(), "RToken readying"); } /// Cancel an ongoing unstaking; resume staking /// @custom:interaction CEI function cancelUnstake(uint256 endId) external { - requireNotFrozen(); + _requireNotFrozen(); address account = _msgSender(); - // We specifically allow unstaking when under collateralized - // require(basketHandler.fullyCollateralized(), "RToken uncollateralized"); - // require(basketHandler.isReady(), "basket not ready"); + // We specifically allow cancelling unstaking when undercollateralized + // require(basketHandler.isReady() && basketHandler.fullyCollateralized(), """); uint256 firstId = firstRemainingDraft[draftEra][account]; CumulativeDraft[] storage queue = draftQueues[draftEra][account]; @@ -422,11 +422,11 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // other properties: // seized >= rsrAmount, which should be a logical consequence of the above effects function seizeRSR(uint256 rsrAmount) external { - requireNotTradingPausedOrFrozen(); + _requireNotTradingPausedOrFrozen(); + _notZero(rsrAmount); address caller = _msgSender(); require(caller == address(backingManager), "!bm"); - require(rsrAmount != 0, "zero amount"); uint256 rsrBalance = rsr.balanceOf(address(this)); require(rsrAmount <= rsrBalance, "seize exceeds balance"); @@ -488,7 +488,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// There is currently no good and easy way to mitigate the possibility of this situation, /// and the risk of it occurring is low enough that it is not worth the effort to mitigate. function resetStakes() external { - requireGovernanceOnly(); + _requireGovernanceOnly(); require( stakeRate <= MIN_SAFE_STAKE_RATE || stakeRate >= MAX_SAFE_STAKE_RATE, "rate still safe" @@ -737,15 +737,15 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // contract-size-saver // solhint-disable-next-line no-empty-blocks - function requireNotTradingPausedOrFrozen() private notTradingPausedOrFrozen {} + function _requireNotTradingPausedOrFrozen() private notTradingPausedOrFrozen {} // contract-size-saver // solhint-disable-next-line no-empty-blocks - function requireNotFrozen() private notFrozen {} + function _requireNotFrozen() private notFrozen {} // contract-size-saver // solhint-disable-next-line no-empty-blocks - function requireGovernanceOnly() private governance {} + function _requireGovernanceOnly() private governance {} // ==== ERC20 ==== // This section extracted from ERC20; adjusted to work with stakes/eras @@ -821,7 +821,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address to, uint256 amount ) internal { - require(from != address(0) && to != address(0), "zero address"); + _notZero(from); + _notZero(to); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 fromBalance = eraStakes[from]; @@ -832,7 +833,6 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab eraStakes[to] += amount; emit Transfer(from, to, amount); - _afterTokenTransfer(from, to, amount); } @@ -840,7 +840,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab // effects: bal[account] += amount; totalStakes += amount // this must only be called from a function that will fixup stakeRSR/Rate function _mint(address account, uint256 amount) internal virtual { - require(account != address(0), "zero address"); + _notZero(account); assert(totalStakes + amount < type(uint224).max); stakes[era][account] += amount; @@ -856,7 +856,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab function _burn(address account, uint256 amount) internal virtual { // untestable: // _burn is only called from unstake(), which uses msg.sender as `account` - require(account != address(0), "zero address"); + _notZero(account); mapping(address => uint256) storage eraStakes = stakes[era]; uint256 accountBalance = eraStakes[account]; @@ -877,7 +877,8 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab address spender, uint256 amount ) internal { - require(owner != address(0) && spender != address(0), "zero address"); + _notZero(owner); + _notZero(spender); _allowances[era][owner][spender] = amount; emit Approval(owner, spender, amount); @@ -907,6 +908,14 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab require(to != address(this), "transfer to self"); } + function _notZero(address addr) internal pure { + require(addr != address(0), "zero address"); + } + + function _notZero(uint256 val) internal pure { + require(val != 0, "zero amount"); + } + // === ERC20Permit === // This section extracted from OZ:ERC20PermitUpgradeable @@ -959,7 +968,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:governance function setUnstakingDelay(uint48 val) public { - requireGovernanceOnly(); + _requireGovernanceOnly(); require(val > MIN_UNSTAKING_DELAY && val <= MAX_UNSTAKING_DELAY, "invalid unstakingDelay"); emit UnstakingDelaySet(unstakingDelay, val); unstakingDelay = val; @@ -967,7 +976,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:governance function setRewardRatio(uint192 val) public { - requireGovernanceOnly(); + _requireGovernanceOnly(); _payoutRewards(); require(val <= MAX_REWARD_RATIO, "invalid rewardRatio"); emit RewardRatioSet(rewardRatio, val); @@ -976,7 +985,7 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab /// @custom:governance function setWithdrawalLeak(uint192 val) public { - requireGovernanceOnly(); + _requireGovernanceOnly(); require(val <= MAX_WITHDRAWAL_LEAK, "invalid withdrawalLeak"); emit WithdrawalLeakSet(withdrawalLeak, val); withdrawalLeak = val; diff --git a/contracts/p1/StRSRVotes.sol b/contracts/p1/StRSRVotes.sol index c79f9d2ebc..837cf1445b 100644 --- a/contracts/p1/StRSRVotes.sol +++ b/contracts/p1/StRSRVotes.sol @@ -15,14 +15,15 @@ import "./StRSR.sol"; contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { // A Checkpoint[] is a value history; it faithfully represents the history of value so long // as that value is only ever set by _writeCheckpoint. For any *previous* timepoint N, the - // recorded value at the end of block N was cp.val, where cp in the value history is the - // Checkpoint value with fromBlock maximal such that fromBlock <= N. + // recorded value at the end of timepoint N was cp.val, where cp in the value history is the + // Checkpoint value with fromTimepoint maximal such that fromTimepoint <= N. - // In particular, if the value changed during block N, there will be exactly one - // entry cp with cp.fromBlock = N, and cp.val is the value at the _end_ of that block. - // 3.4.0: Even though it says `fromBlock`, it's actually timepoint. + // In particular, if the value changed during timepoint N, there will be exactly one + // entry cp with cp.fromTimepoint = N, and cp.val is the value at the _end_ of that timepoint. + // 3.4.0: it's actually a timepoint described by clock(). + // !!!! REMEMBER THIS IS 2 SLOTS, NOT ONE, UNLIKE OZ !!!! struct Checkpoint { - uint48 fromBlock; + uint48 fromTimepoint; uint224 val; } @@ -88,21 +89,21 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { } function getPastVotes(address account, uint256 timepoint) public view returns (uint256) { - require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + _requireValidTimepoint(timepoint); uint256 pastEra = _checkpointsLookup(_eras, timepoint); return _checkpointsLookup(_checkpoints[pastEra][account], timepoint); } function getPastTotalSupply(uint256 timepoint) public view returns (uint256) { - require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + _requireValidTimepoint(timepoint); uint256 pastEra = _checkpointsLookup(_eras, timepoint); return _checkpointsLookup(_totalSupplyCheckpoints[pastEra], timepoint); } function getPastEra(uint256 timepoint) public view returns (uint256) { - require(timepoint < block.timestamp, "ERC20Votes: future lookup"); + _requireValidTimepoint(timepoint); return _checkpointsLookup(_eras, timepoint); } @@ -113,20 +114,49 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { view returns (uint256) { - // We run a binary search to set `high` to the index of the earliest checkpoint - // taken after timepoint, or ckpts.length if no checkpoint was taken after timepoint - uint256 high = ckpts.length; + // We run a binary search to look for the last (most recent) checkpoint taken before + // (or at) `timepoint`. + // + // Initially we check if the timepoint is recent to narrow the search range. + // During the loop, the index of the wanted checkpoint remains + // in the range [low-1, high). + // With each iteration, either `low` or `high` is moved towards the middle of the + // range to maintain the invariant. + // - If the middle checkpoint is after `timepoint`, we look in [low, mid) + // - If the middle checkpoint is before or equal to `timepoint`, we look in [mid+1, high) + // Once we reach a single value (when low == high), we've found the right checkpoint at + // the index high-1, if not out of bounds (in which case we're looking too far in the past + // and the result is 0). + // + // Note that if the latest checkpoint available is exactly for `timepoint`, we end up with + // an index that is past the end of the array, so we technically don't find a checkpoint + // after `timepoint`, but it works out the same. + uint256 length = ckpts.length; + uint256 low = 0; + uint256 high = length; + + if (length > 5) { + uint256 mid = length - MathUpgradeable.sqrt(length); + if (ckpts[mid].fromTimepoint > timepoint) { + high = mid; + } else { + low = mid + 1; + } + } + while (low < high) { uint256 mid = MathUpgradeable.average(low, high); - // `fromBlock` is a timepoint - if (ckpts[mid].fromBlock > timepoint) { + if (ckpts[mid].fromTimepoint > timepoint) { high = mid; } else { low = mid + 1; } } - return high == 0 ? 0 : ckpts[high - 1].val; + + unchecked { + return high == 0 ? 0 : ckpts[high - 1].val; + } } function delegate(address delegatee) public { @@ -141,14 +171,14 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { bytes32 r, bytes32 s ) public { - require(block.timestamp <= expiry, "ERC20Votes: signature expired"); + require(block.timestamp <= expiry, "signature expired"); address signer = ECDSAUpgradeable.recover( _hashTypedDataV4(keccak256(abi.encode(_DELEGATE_TYPEHASH, delegatee, nonce, expiry))), v, r, s ); - require(nonce == _useDelegationNonce(signer), "ERC20Votes: invalid nonce"); + require(nonce == _useDelegationNonce(signer), "invalid nonce"); _delegate(signer, delegatee); } @@ -223,23 +253,30 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { } } - // Set this block's value in the history `ckpts` + // Set this timepoint's value in the history `ckpts` function _writeCheckpoint( Checkpoint[] storage ckpts, function(uint256, uint256) view returns (uint256) op, uint256 delta ) private returns (uint256 oldWeight, uint256 newWeight) { uint256 pos = ckpts.length; - oldWeight = pos == 0 ? 0 : ckpts[pos - 1].val; - newWeight = op(oldWeight, delta); - - // `fromBlock` is a timepoint - if (pos != 0 && ckpts[pos - 1].fromBlock == clock()) { - ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); - } else { - ckpts.push( - Checkpoint({ fromBlock: clock(), val: SafeCastUpgradeable.toUint224(newWeight) }) - ); + + unchecked { + Checkpoint memory oldCkpt = pos == 0 ? Checkpoint(0, 0) : ckpts[pos - 1]; + + oldWeight = oldCkpt.val; + newWeight = op(oldWeight, delta); + + if (pos != 0 && oldCkpt.fromTimepoint == clock()) { + ckpts[pos - 1].val = SafeCastUpgradeable.toUint224(newWeight); + } else { + ckpts.push( + Checkpoint({ + fromTimepoint: clock(), + val: SafeCastUpgradeable.toUint224(newWeight) + }) + ); + } } } @@ -251,6 +288,10 @@ contract StRSRP1Votes is StRSRP1, IERC5805Upgradeable, IStRSRVotes { return a - b; } + function _requireValidTimepoint(uint256 timepoint) private view { + require(timepoint < block.timestamp, "future lookup"); + } + /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. diff --git a/contracts/plugins/governance/Governance.sol b/contracts/plugins/governance/Governance.sol index 2d4052539e..797d818fa7 100644 --- a/contracts/plugins/governance/Governance.sol +++ b/contracts/plugins/governance/Governance.sol @@ -43,7 +43,7 @@ contract Governance is uint256 proposalThresholdAsMicroPercent_, // e.g. 1e4 for 0.01% uint256 quorumPercent // e.g 4 for 4% ) - Governor("Governor Alexios") + Governor("Governor Anastasius") GovernorSettings(votingDelay_, votingPeriod_, proposalThresholdAsMicroPercent_) GovernorVotes(IVotes(address(token_))) GovernorVotesQuorumFraction(quorumPercent) @@ -52,8 +52,6 @@ contract Governance is requireValidVotingDelay(votingDelay_); } - // solhint-enable no-empty-blocks - function votingDelay() public view override(IGovernor, GovernorSettings) returns (uint256) { return super.votingDelay(); } @@ -199,6 +197,7 @@ contract Governance is return SafeCast.toUint48(block.timestamp); } + // solhint-disable-next-line func-name-mixedcase function CLOCK_MODE() public pure override(GovernorVotes, IGovernor) returns (string memory) { return "mode=timestamp"; } diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index a3adc3b0bd..cf7c533b60 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -743,7 +743,7 @@ describe('FacadeWrite contract', () => { expect(await governor.proposalThreshold()).to.equal(0) expect(await governor.quorum((await getLatestBlockNumber()) - 1)).to.equal(0) } - expect(await governor.name()).to.equal('Governor Alexios') + expect(await governor.name()).to.equal('Governor Anastasius') // Quorum expect(await governor['quorumNumerator()']()).to.equal(govParams.quorumPercent) diff --git a/test/Governance.test.ts b/test/Governance.test.ts index a3f033a59d..3b5e051fbc 100644 --- a/test/Governance.test.ts +++ b/test/Governance.test.ts @@ -135,7 +135,7 @@ describeP1(`Governance - P${IMPLEMENTATION}`, () => { it('Should deploy Governor correctly', async () => { expect(await governor.votingDelay()).to.equal(VOTING_DELAY) expect(await governor.votingPeriod()).to.equal(VOTING_PERIOD) - expect(await governor.name()).to.equal('Governor Alexios') + expect(await governor.name()).to.equal('Governor Anastasius') // Quorum expect(await governor['quorumNumerator()']()).to.equal(QUORUM_PERCENTAGE) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index e65ee284d2..6fbcd2b3d4 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -395,7 +395,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Approve transfer and stake await rsr.connect(addr1).approve(stRSR.address, amount) - await expect(stRSR.connect(addr1).stake(zero)).to.be.revertedWith('Cannot stake zero') + await expect(stRSR.connect(addr1).stake(zero)).to.be.revertedWith('zero amount') // Check deposit not registered expect(await rsr.balanceOf(stRSR.address)).to.equal(0) @@ -769,7 +769,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Depeg collateral await setOraclePrice(collateral1.address, bn('0.5e8')) - await expect(stRSR.withdraw(addr1.address, 1)).to.be.revertedWith('basket not ready') + await expect(stRSR.withdraw(addr1.address, 1)).to.be.revertedWith('RToken readying') }) }) @@ -887,7 +887,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Withdraw await expect(stRSR.connect(addr1).withdraw(addr1.address, 1)).to.be.revertedWith( - 'RToken uncollateralized' + 'RToken readying' ) // If fully collateralized should withdraw OK - Set back original basket @@ -919,7 +919,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to Withdraw await expect(stRSR.connect(addr1).withdraw(addr1.address, 1)).to.be.revertedWith( - 'basket not ready' + 'RToken readying' ) // Nothing completed @@ -939,7 +939,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to Withdraw await expect(stRSR.connect(addr1).withdraw(addr1.address, 1)).to.be.revertedWith( - 'basket not ready' + 'RToken readying' ) }) @@ -2738,7 +2738,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to delegate with invalid nonce await expect( stRSRVotes.connect(other).delegateBySig(addr1.address, invalidNonce, expiry, v, r, s) - ).to.be.revertedWith('ERC20Votes: invalid nonce') + ).to.be.revertedWith('invalid nonce') // Attempt to delegate with invalid signature await expect( @@ -2762,7 +2762,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Attempt to delegate with invalid expiry await expect( stRSRVotes.connect(other).delegateBySig(addr1.address, nonce, invalidExpiry, v, r, s) - ).to.be.revertedWith('ERC20Votes: signature expired') + ).to.be.revertedWith('signature expired') // Check result - No delegates expect(await stRSRVotes.delegates(addr1.address)).to.equal(ZERO_ADDRESS) @@ -2833,7 +2833,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { stRSRVotes .connect(other) .delegateBySig(addr1.address, nonce1, expiry, sig1.v, sig1.r, sig1.s) - ).to.be.revertedWith('ERC20Votes: invalid nonce') + ).to.be.revertedWith('invalid nonce') const nonce2 = await stRSRVotes.delegationNonces(addr1.address) @@ -2881,13 +2881,13 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Cannot check votes on future block await expect(stRSRVotes.getPastTotalSupply(currentBlockTimestamp + 1)).to.be.revertedWith( - 'ERC20Votes: future lookup' + 'future lookup' ) await expect( stRSRVotes.getPastVotes(addr1.address, currentBlockTimestamp + 1) - ).to.be.revertedWith('ERC20Votes: future lookup') + ).to.be.revertedWith('future lookup') await expect(stRSRVotes.getPastEra(currentBlockTimestamp + 1)).to.be.revertedWith( - 'ERC20Votes: future lookup' + 'future lookup' ) // Delegate votes @@ -2987,7 +2987,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { // Should perform basic validations on stake await expect( stRSRVotes.connect(addr1).stakeAndDelegate(bn(0), ZERO_ADDRESS) - ).to.be.revertedWith('Cannot stake zero') + ).to.be.revertedWith('zero amount') expect(await stRSRVotes.delegates(addr1.address)).to.equal(ZERO_ADDRESS) From b192d59d32cc09584168ddbb62de3187744a7855 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 24 Apr 2024 16:06:05 -0400 Subject: [PATCH 359/450] New arbitrum addresses (#1116) --- .openzeppelin/arbitrum-one.json | 896 +++++++++--------- .../42161-tmp-assets-collateral.json | 24 + .../arbitrum-3.4.0/42161-tmp-deployments.json | 44 +- scripts/deploy.ts | 9 +- .../phase2-assets/1_deploy_assets.ts | 2 +- scripts/verification/4_verify_facade.ts | 2 +- scripts/verification/6_verify_collateral.ts | 347 +++---- 7 files changed, 699 insertions(+), 625 deletions(-) create mode 100644 scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json diff --git a/.openzeppelin/arbitrum-one.json b/.openzeppelin/arbitrum-one.json index 45f6e32ee2..22373ff1de 100644 --- a/.openzeppelin/arbitrum-one.json +++ b/.openzeppelin/arbitrum-one.json @@ -2,9 +2,9 @@ "manifestVersion": "3.2", "proxies": [], "impls": { - "cea42ee549d84b1f5161926bc95e346e17c9bccd61affaf8346b569dde739f9e": { - "address": "0x9C75314AFD011F22648ca9C655b61674e27bA4AC", - "txHash": "0x1076116e3a79551374c2d136ef6d42d6f3d903a1aeba7d7b74c8f2f99c8cf5a5", + "7b21ba261eaa32c050f596075a3105499b91bb6fc0858682955d346a59ef20bb": { + "address": "0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461", + "txHash": "0xb65050997b973564dcb427b423b2f0555e217462adf3a519a74f90fe485a4326", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -14,7 +14,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -23,7 +23,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -31,7 +31,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -45,9 +45,9 @@ "label": "_roles", "offset": 0, "slot": "101", - "type": "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)", + "type": "t_mapping(t_bytes32,t_struct(RoleData)3730_storage)", "contract": "AccessControlUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:61" + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:57" }, { "label": "__gap", @@ -55,7 +55,7 @@ "slot": "102", "type": "t_array(t_uint256)49_storage", "contract": "AccessControlUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:259" + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:260" }, { "label": "longFreezes", @@ -118,81 +118,81 @@ "label": "rToken", "offset": 0, "slot": "201", - "type": "t_contract(IRToken)21733", + "type": "t_contract(IRToken)33364", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:34" + "src": "contracts/mixins/ComponentRegistry.sol:33" }, { "label": "stRSR", "offset": 0, "slot": "202", - "type": "t_contract(IStRSR)22301", + "type": "t_contract(IStRSR)33928", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:42" + "src": "contracts/mixins/ComponentRegistry.sol:41" }, { "label": "assetRegistry", "offset": 0, "slot": "203", - "type": "t_contract(IAssetRegistry)20070", + "type": "t_contract(IAssetRegistry)31496", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:50" + "src": "contracts/mixins/ComponentRegistry.sol:49" }, { "label": "basketHandler", "offset": 0, "slot": "204", - "type": "t_contract(IBasketHandler)20449", + "type": "t_contract(IBasketHandler)31870", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:58" + "src": "contracts/mixins/ComponentRegistry.sol:57" }, { "label": "backingManager", "offset": 0, "slot": "205", - "type": "t_contract(IBackingManager)20178", + "type": "t_contract(IBackingManager)31603", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:66" + "src": "contracts/mixins/ComponentRegistry.sol:65" }, { "label": "distributor", "offset": 0, "slot": "206", - "type": "t_contract(IDistributor)20914", + "type": "t_contract(IDistributor)32390", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:74" + "src": "contracts/mixins/ComponentRegistry.sol:73" }, { "label": "rsrTrader", "offset": 0, "slot": "207", - "type": "t_contract(IRevenueTrader)22089", + "type": "t_contract(IRevenueTrader)33719", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:82" + "src": "contracts/mixins/ComponentRegistry.sol:81" }, { "label": "rTokenTrader", "offset": 0, "slot": "208", - "type": "t_contract(IRevenueTrader)22089", + "type": "t_contract(IRevenueTrader)33719", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:90" + "src": "contracts/mixins/ComponentRegistry.sol:89" }, { "label": "furnace", "offset": 0, "slot": "209", - "type": "t_contract(IFurnace)21069", + "type": "t_contract(IFurnace)32702", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:98" + "src": "contracts/mixins/ComponentRegistry.sol:97" }, { "label": "broker", "offset": 0, "slot": "210", - "type": "t_contract(IBroker)20598", + "type": "t_contract(IBroker)32025", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:106" + "src": "contracts/mixins/ComponentRegistry.sol:105" }, { "label": "__gap", @@ -200,7 +200,7 @@ "slot": "211", "type": "t_array(t_uint256)40_storage", "contract": "ComponentRegistry", - "src": "contracts/mixins/ComponentRegistry.sol:119" + "src": "contracts/mixins/ComponentRegistry.sol:118" }, { "label": "__gap", @@ -208,7 +208,7 @@ "slot": "251", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -216,13 +216,13 @@ "slot": "301", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "rsr", "offset": 0, "slot": "351", - "type": "t_contract(IERC20)11113", + "type": "t_contract(IERC20)16806", "contract": "MainP1", "src": "contracts/p1/Main.sol:19" }, @@ -264,43 +264,43 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IAssetRegistry)20070": { + "t_contract(IAssetRegistry)31496": { "label": "contract IAssetRegistry", "numberOfBytes": "20" }, - "t_contract(IBackingManager)20178": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IBasketHandler)20449": { + "t_contract(IBasketHandler)31870": { "label": "contract IBasketHandler", "numberOfBytes": "20" }, - "t_contract(IBroker)20598": { + "t_contract(IBroker)32025": { "label": "contract IBroker", "numberOfBytes": "20" }, - "t_contract(IDistributor)20914": { + "t_contract(IDistributor)32390": { "label": "contract IDistributor", "numberOfBytes": "20" }, - "t_contract(IERC20)11113": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IFurnace)21069": { + "t_contract(IFurnace)32702": { "label": "contract IFurnace", "numberOfBytes": "20" }, - "t_contract(IRToken)21733": { + "t_contract(IRToken)33364": { "label": "contract IRToken", "numberOfBytes": "20" }, - "t_contract(IRevenueTrader)22089": { + "t_contract(IRevenueTrader)33719": { "label": "contract IRevenueTrader", "numberOfBytes": "20" }, - "t_contract(IStRSR)22301": { + "t_contract(IStRSR)33928": { "label": "contract IStRSR", "numberOfBytes": "20" }, @@ -312,11 +312,11 @@ "label": "mapping(address => uint256)", "numberOfBytes": "32" }, - "t_mapping(t_bytes32,t_struct(RoleData)3741_storage)": { + "t_mapping(t_bytes32,t_struct(RoleData)3730_storage)": { "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)", "numberOfBytes": "32" }, - "t_struct(RoleData)3741_storage": { + "t_struct(RoleData)3730_storage": { "label": "struct AccessControlUpgradeable.RoleData", "members": [ { @@ -349,9 +349,9 @@ } } }, - "7553bc7cd604ca500db9812e90f0f3770ea95be5f37a483aa877c442248a5985": { - "address": "0xFa93538Ed210486bfdE01b7E2295392fE7153106", - "txHash": "0x5ac047d1d76d120fda91a799b7f4f7b93401b666f354d2ecf8c6a5ef1e96f93c", + "9e6f4198309784cc2a3e363639954bc4a3130f1b175b95d43a9fe332ca0bf7ca": { + "address": "0xA9df960Af018178C0138CD5780c768A0a0A7e61f", + "txHash": "0x1b6dbfb937be6214db66aa1a58e72e3e9e3f36e4b664fc026f6f54a55542d6e3", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -361,7 +361,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -370,7 +370,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -378,7 +378,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -386,7 +386,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -394,13 +394,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)21513", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -416,7 +416,7 @@ "label": "basketHandler", "offset": 0, "slot": "201", - "type": "t_contract(IBasketHandler)20449", + "type": "t_contract(IBasketHandler)31870", "contract": "AssetRegistryP1", "src": "contracts/p1/AssetRegistry.sol:19" }, @@ -424,7 +424,7 @@ "label": "backingManager", "offset": 0, "slot": "202", - "type": "t_contract(IBackingManager)20178", + "type": "t_contract(IBackingManager)31603", "contract": "AssetRegistryP1", "src": "contracts/p1/AssetRegistry.sol:20" }, @@ -432,7 +432,7 @@ "label": "_erc20s", "offset": 0, "slot": "203", - "type": "t_struct(AddressSet)15750_storage", + "type": "t_struct(AddressSet)25549_storage", "contract": "AssetRegistryP1", "src": "contracts/p1/AssetRegistry.sol:23" }, @@ -440,7 +440,7 @@ "label": "assets", "offset": 0, "slot": "205", - "type": "t_mapping(t_contract(IERC20)11113,t_contract(IAsset)19803)", + "type": "t_mapping(t_contract(IERC20)16806,t_contract(IAsset)31229)", "contract": "AssetRegistryP1", "src": "contracts/p1/AssetRegistry.sol:26" }, @@ -486,23 +486,23 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IAsset)19803": { + "t_contract(IAsset)31229": { "label": "contract IAsset", "numberOfBytes": "20" }, - "t_contract(IBackingManager)20178": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IBasketHandler)20449": { + "t_contract(IBasketHandler)31870": { "label": "contract IBasketHandler", "numberOfBytes": "20" }, - "t_contract(IERC20)11113": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IMain)21513": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, @@ -510,23 +510,23 @@ "label": "mapping(bytes32 => uint256)", "numberOfBytes": "32" }, - "t_mapping(t_contract(IERC20)11113,t_contract(IAsset)19803)": { + "t_mapping(t_contract(IERC20)16806,t_contract(IAsset)31229)": { "label": "mapping(contract IERC20 => contract IAsset)", "numberOfBytes": "32" }, - "t_struct(AddressSet)15750_storage": { + "t_struct(AddressSet)25549_storage": { "label": "struct EnumerableSet.AddressSet", "members": [ { "label": "_inner", - "type": "t_struct(Set)15449_storage", + "type": "t_struct(Set)25234_storage", "offset": 0, "slot": "0" } ], "numberOfBytes": "64" }, - "t_struct(Set)15449_storage": { + "t_struct(Set)25234_storage": { "label": "struct EnumerableSet.Set", "members": [ { @@ -559,9 +559,9 @@ } } }, - "bd423c48ce3ae6ba0dfeec131e9480fb097b234ca3b98a4c5b9be20198b028d9": { - "address": "0xcd77df48E548dda056f8563f2520fFD94aD147eE", - "txHash": "0xa54b7526c192d0c83a6a1d97f214e65742904e27d215b03fc06fe6e1ab59334b", + "39d633761533db50d87664716ad282f351b568289380f7bf1aedeaaf11d509e8": { + "address": "0xD85Fac03804a3e44D29c494f3761D11A2262cBBe", + "txHash": "0xdf48ba622844715078d120ffaee041ff34514b99f32c754715365a7c15ccea60", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -571,7 +571,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -580,7 +580,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -588,7 +588,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -596,7 +596,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -604,13 +604,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)21513", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -636,23 +636,23 @@ "slot": "202", "type": "t_array(t_uint256)49_storage", "contract": "ReentrancyGuardUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88" }, { "label": "broker", "offset": 0, "slot": "251", - "type": "t_contract(IBroker)20598", + "type": "t_contract(IBroker)32025", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:28" + "src": "contracts/p1/mixins/Trading.sol:26" }, { "label": "trades", "offset": 0, "slot": "252", - "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)", + "type": "t_mapping(t_contract(IERC20)16806,t_contract(ITrade)34075)", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:31" + "src": "contracts/p1/mixins/Trading.sol:29" }, { "label": "tradesOpen", @@ -660,7 +660,7 @@ "slot": "253", "type": "t_uint48", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:32" + "src": "contracts/p1/mixins/Trading.sol:30" }, { "label": "maxTradeSlippage", @@ -668,7 +668,7 @@ "slot": "253", "type": "t_uint192", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:35" + "src": "contracts/p1/mixins/Trading.sol:33" }, { "label": "minTradeVolume", @@ -676,7 +676,7 @@ "slot": "254", "type": "t_uint192", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:36" + "src": "contracts/p1/mixins/Trading.sol:34" }, { "label": "tradesNonce", @@ -684,7 +684,7 @@ "slot": "255", "type": "t_uint256", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:39" + "src": "contracts/p1/mixins/Trading.sol:37" }, { "label": "__gap", @@ -692,71 +692,71 @@ "slot": "256", "type": "t_array(t_uint256)45_storage", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:166" + "src": "contracts/p1/mixins/Trading.sol:164" }, { "label": "assetRegistry", "offset": 0, "slot": "301", - "type": "t_contract(IAssetRegistry)20070", + "type": "t_contract(IAssetRegistry)31496", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:30" + "src": "contracts/p1/BackingManager.sol:25" }, { "label": "basketHandler", "offset": 0, "slot": "302", - "type": "t_contract(IBasketHandler)20449", + "type": "t_contract(IBasketHandler)31870", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:31" + "src": "contracts/p1/BackingManager.sol:26" }, { "label": "distributor", "offset": 0, "slot": "303", - "type": "t_contract(IDistributor)20914", + "type": "t_contract(IDistributor)32390", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:32" + "src": "contracts/p1/BackingManager.sol:27" }, { "label": "rToken", "offset": 0, "slot": "304", - "type": "t_contract(IRToken)21733", + "type": "t_contract(IRToken)33364", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:33" + "src": "contracts/p1/BackingManager.sol:28" }, { "label": "rsr", "offset": 0, "slot": "305", - "type": "t_contract(IERC20)11113", + "type": "t_contract(IERC20)16806", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:34" + "src": "contracts/p1/BackingManager.sol:29" }, { "label": "stRSR", "offset": 0, "slot": "306", - "type": "t_contract(IStRSR)22301", + "type": "t_contract(IStRSR)33928", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:35" + "src": "contracts/p1/BackingManager.sol:30" }, { "label": "rsrTrader", "offset": 0, "slot": "307", - "type": "t_contract(IRevenueTrader)22089", + "type": "t_contract(IRevenueTrader)33719", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:36" + "src": "contracts/p1/BackingManager.sol:31" }, { "label": "rTokenTrader", "offset": 0, "slot": "308", - "type": "t_contract(IRevenueTrader)22089", + "type": "t_contract(IRevenueTrader)33719", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:37" + "src": "contracts/p1/BackingManager.sol:32" }, { "label": "tradingDelay", @@ -764,7 +764,7 @@ "slot": "308", "type": "t_uint48", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:41" + "src": "contracts/p1/BackingManager.sol:36" }, { "label": "backingBuffer", @@ -772,31 +772,31 @@ "slot": "309", "type": "t_uint192", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:42" + "src": "contracts/p1/BackingManager.sol:37" }, { "label": "furnace", "offset": 0, "slot": "310", - "type": "t_contract(IFurnace)21069", + "type": "t_contract(IFurnace)32702", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:45" + "src": "contracts/p1/BackingManager.sol:40" }, { "label": "tradeEnd", "offset": 0, "slot": "311", - "type": "t_mapping(t_enum(TradeKind)20471,t_uint48)", + "type": "t_mapping(t_enum(TradeKind)31898,t_uint48)", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:46" + "src": "contracts/p1/BackingManager.sol:41" }, { "label": "tokensOut", "offset": 0, "slot": "312", - "type": "t_mapping(t_contract(IERC20)11113,t_uint192)", + "type": "t_mapping(t_contract(IERC20)16806,t_uint192)", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:49" + "src": "contracts/p1/BackingManager.sol:44" }, { "label": "__gap", @@ -804,7 +804,7 @@ "slot": "313", "type": "t_array(t_uint256)38_storage", "contract": "BackingManagerP1", - "src": "contracts/p1/BackingManager.sol:355" + "src": "contracts/p1/BackingManager.sol:344" } ], "types": { @@ -828,51 +828,51 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(IAssetRegistry)20070": { + "t_contract(IAssetRegistry)31496": { "label": "contract IAssetRegistry", "numberOfBytes": "20" }, - "t_contract(IBasketHandler)20449": { + "t_contract(IBasketHandler)31870": { "label": "contract IBasketHandler", "numberOfBytes": "20" }, - "t_contract(IBroker)20598": { + "t_contract(IBroker)32025": { "label": "contract IBroker", "numberOfBytes": "20" }, - "t_contract(IDistributor)20914": { + "t_contract(IDistributor)32390": { "label": "contract IDistributor", "numberOfBytes": "20" }, - "t_contract(IERC20)11113": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IFurnace)21069": { + "t_contract(IFurnace)32702": { "label": "contract IFurnace", "numberOfBytes": "20" }, - "t_contract(IMain)21513": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, - "t_contract(IRToken)21733": { + "t_contract(IRToken)33364": { "label": "contract IRToken", "numberOfBytes": "20" }, - "t_contract(IRevenueTrader)22089": { + "t_contract(IRevenueTrader)33719": { "label": "contract IRevenueTrader", "numberOfBytes": "20" }, - "t_contract(IStRSR)22301": { + "t_contract(IStRSR)33928": { "label": "contract IStRSR", "numberOfBytes": "20" }, - "t_contract(ITrade)22445": { + "t_contract(ITrade)34075": { "label": "contract ITrade", "numberOfBytes": "20" }, - "t_enum(TradeKind)20471": { + "t_enum(TradeKind)31898": { "label": "enum TradeKind", "members": [ "DUTCH_AUCTION", @@ -880,15 +880,15 @@ ], "numberOfBytes": "1" }, - "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)": { + "t_mapping(t_contract(IERC20)16806,t_contract(ITrade)34075)": { "label": "mapping(contract IERC20 => contract ITrade)", "numberOfBytes": "32" }, - "t_mapping(t_contract(IERC20)11113,t_uint192)": { + "t_mapping(t_contract(IERC20)16806,t_uint192)": { "label": "mapping(contract IERC20 => uint192)", "numberOfBytes": "32" }, - "t_mapping(t_enum(TradeKind)20471,t_uint48)": { + "t_mapping(t_enum(TradeKind)31898,t_uint48)": { "label": "mapping(enum TradeKind => uint48)", "numberOfBytes": "32" }, @@ -911,9 +911,9 @@ } } }, - "358aa59e6030181250f8600f132c0bee676826ee94a80e1ed82375e9303d4a89": { - "address": "0xa8d818C719c1034E731Feba2088F4F011D44ACB3", - "txHash": "0x44b998d2048e17a4922679f43250b075015a4ee70a1767e89b869a64ef748b41", + "c9ec197d7fab0f71c4133c6f9b2fb92bd55c3db1075b1dd7e193472126357c26": { + "address": "0x157b0C032192F5714BD68bf33dF96C122EA5e1d6", + "txHash": "0xcbb1c436c8bd091589585ca4ad66ad748b5694fcb2706fce04356824d6573e52", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -923,7 +923,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -932,7 +932,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -940,7 +940,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -948,7 +948,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -956,13 +956,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)13760", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -978,57 +978,57 @@ "label": "assetRegistry", "offset": 0, "slot": "201", - "type": "t_contract(IAssetRegistry)12411", + "type": "t_contract(IAssetRegistry)31496", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:34" + "src": "contracts/p1/BasketHandler.sol:35" }, { "label": "backingManager", "offset": 0, "slot": "202", - "type": "t_contract(IBackingManager)12519", + "type": "t_contract(IBackingManager)31603", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:35" + "src": "contracts/p1/BasketHandler.sol:36" }, { "label": "rsr", "offset": 0, "slot": "203", - "type": "t_contract(IERC20)6205", + "type": "t_contract(IERC20)16806", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:36" + "src": "contracts/p1/BasketHandler.sol:37" }, { "label": "rToken", "offset": 0, "slot": "204", - "type": "t_contract(IRToken)13980", + "type": "t_contract(IRToken)33364", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:37" + "src": "contracts/p1/BasketHandler.sol:38" }, { "label": "stRSR", "offset": 0, "slot": "205", - "type": "t_contract(IStRSR)14548", + "type": "t_contract(IStRSR)33928", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:38" + "src": "contracts/p1/BasketHandler.sol:39" }, { "label": "config", "offset": 0, "slot": "206", - "type": "t_struct(BasketConfig)38008_storage", + "type": "t_struct(BasketConfig)62617_storage", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:42" + "src": "contracts/p1/BasketHandler.sol:43" }, { "label": "basket", "offset": 0, "slot": "210", - "type": "t_struct(Basket)38018_storage", + "type": "t_struct(Basket)62627_storage", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:46" + "src": "contracts/p1/BasketHandler.sol:47" }, { "label": "nonce", @@ -1036,7 +1036,7 @@ "slot": "212", "type": "t_uint48", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:48" + "src": "contracts/p1/BasketHandler.sol:49" }, { "label": "timestamp", @@ -1044,7 +1044,7 @@ "slot": "212", "type": "t_uint48", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:49" + "src": "contracts/p1/BasketHandler.sol:50" }, { "label": "disabled", @@ -1052,23 +1052,23 @@ "slot": "212", "type": "t_bool", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:53" + "src": "contracts/p1/BasketHandler.sol:54" }, { "label": "_targetNames", "offset": 0, "slot": "213", - "type": "t_struct(Bytes32Set)8824_storage", + "type": "t_struct(Bytes32Set)25428_storage", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:59" + "src": "contracts/p1/BasketHandler.sol:60" }, { "label": "_newBasket", "offset": 0, "slot": "215", - "type": "t_struct(Basket)38018_storage", + "type": "t_struct(Basket)62627_storage", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:60" + "src": "contracts/p1/BasketHandler.sol:61" }, { "label": "warmupPeriod", @@ -1076,7 +1076,7 @@ "slot": "217", "type": "t_uint48", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:66" + "src": "contracts/p1/BasketHandler.sol:67" }, { "label": "lastStatusTimestamp", @@ -1084,31 +1084,31 @@ "slot": "217", "type": "t_uint48", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:70" + "src": "contracts/p1/BasketHandler.sol:71" }, { "label": "lastStatus", "offset": 12, "slot": "217", - "type": "t_enum(CollateralStatus)12194", + "type": "t_enum(CollateralStatus)31279", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:71" + "src": "contracts/p1/BasketHandler.sol:72" }, { "label": "basketHistory", "offset": 0, "slot": "218", - "type": "t_mapping(t_uint48,t_struct(Basket)38018_storage)", + "type": "t_mapping(t_uint48,t_struct(Basket)62627_storage)", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:77" + "src": "contracts/p1/BasketHandler.sol:78" }, { "label": "_targetAmts", "offset": 0, "slot": "219", - "type": "t_struct(Bytes32ToUintMap)8436_storage", + "type": "t_struct(Bytes32ToUintMap)25010_storage", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:80" + "src": "contracts/p1/BasketHandler.sol:81" }, { "label": "reweightable", @@ -1116,7 +1116,7 @@ "slot": "222", "type": "t_bool", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:86" + "src": "contracts/p1/BasketHandler.sol:87" }, { "label": "lastCollateralized", @@ -1124,7 +1124,7 @@ "slot": "222", "type": "t_uint48", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:88" + "src": "contracts/p1/BasketHandler.sol:89" }, { "label": "__gap", @@ -1132,7 +1132,7 @@ "slot": "223", "type": "t_array(t_uint256)36_storage", "contract": "BasketHandlerP1", - "src": "contracts/p1/BasketHandler.sol:722" + "src": "contracts/p1/BasketHandler.sol:728" } ], "types": { @@ -1140,7 +1140,7 @@ "label": "bytes32[]", "numberOfBytes": "32" }, - "t_array(t_contract(IERC20)6205)dyn_storage": { + "t_array(t_contract(IERC20)16806)dyn_storage": { "label": "contract IERC20[]", "numberOfBytes": "32" }, @@ -1164,31 +1164,31 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IAssetRegistry)12411": { + "t_contract(IAssetRegistry)31496": { "label": "contract IAssetRegistry", "numberOfBytes": "20" }, - "t_contract(IBackingManager)12519": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IERC20)6205": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IMain)13760": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, - "t_contract(IRToken)13980": { + "t_contract(IRToken)33364": { "label": "contract IRToken", "numberOfBytes": "20" }, - "t_contract(IStRSR)14548": { + "t_contract(IStRSR)33928": { "label": "contract IStRSR", "numberOfBytes": "20" }, - "t_enum(CollateralStatus)12194": { + "t_enum(CollateralStatus)31279": { "label": "enum CollateralStatus", "members": [ "SOUND", @@ -1201,7 +1201,7 @@ "label": "mapping(bytes32 => bytes32)", "numberOfBytes": "32" }, - "t_mapping(t_bytes32,t_struct(BackupConfig)37988_storage)": { + "t_mapping(t_bytes32,t_struct(BackupConfig)62597_storage)": { "label": "mapping(bytes32 => struct BackupConfig)", "numberOfBytes": "32" }, @@ -1209,19 +1209,19 @@ "label": "mapping(bytes32 => uint256)", "numberOfBytes": "32" }, - "t_mapping(t_contract(IERC20)6205,t_bytes32)": { + "t_mapping(t_contract(IERC20)16806,t_bytes32)": { "label": "mapping(contract IERC20 => bytes32)", "numberOfBytes": "32" }, - "t_mapping(t_contract(IERC20)6205,t_uint192)": { + "t_mapping(t_contract(IERC20)16806,t_uint192)": { "label": "mapping(contract IERC20 => uint192)", "numberOfBytes": "32" }, - "t_mapping(t_uint48,t_struct(Basket)38018_storage)": { + "t_mapping(t_uint48,t_struct(Basket)62627_storage)": { "label": "mapping(uint48 => struct Basket)", "numberOfBytes": "32" }, - "t_struct(BackupConfig)37988_storage": { + "t_struct(BackupConfig)62597_storage": { "label": "struct BackupConfig", "members": [ { @@ -1232,79 +1232,79 @@ }, { "label": "erc20s", - "type": "t_array(t_contract(IERC20)6205)dyn_storage", + "type": "t_array(t_contract(IERC20)16806)dyn_storage", "offset": 0, "slot": "1" } ], "numberOfBytes": "64" }, - "t_struct(Basket)38018_storage": { + "t_struct(Basket)62627_storage": { "label": "struct Basket", "members": [ { "label": "erc20s", - "type": "t_array(t_contract(IERC20)6205)dyn_storage", + "type": "t_array(t_contract(IERC20)16806)dyn_storage", "offset": 0, "slot": "0" }, { "label": "refAmts", - "type": "t_mapping(t_contract(IERC20)6205,t_uint192)", + "type": "t_mapping(t_contract(IERC20)16806,t_uint192)", "offset": 0, "slot": "1" } ], "numberOfBytes": "64" }, - "t_struct(BasketConfig)38008_storage": { + "t_struct(BasketConfig)62617_storage": { "label": "struct BasketConfig", "members": [ { "label": "erc20s", - "type": "t_array(t_contract(IERC20)6205)dyn_storage", + "type": "t_array(t_contract(IERC20)16806)dyn_storage", "offset": 0, "slot": "0" }, { "label": "targetAmts", - "type": "t_mapping(t_contract(IERC20)6205,t_uint192)", + "type": "t_mapping(t_contract(IERC20)16806,t_uint192)", "offset": 0, "slot": "1" }, { "label": "targetNames", - "type": "t_mapping(t_contract(IERC20)6205,t_bytes32)", + "type": "t_mapping(t_contract(IERC20)16806,t_bytes32)", "offset": 0, "slot": "2" }, { "label": "backups", - "type": "t_mapping(t_bytes32,t_struct(BackupConfig)37988_storage)", + "type": "t_mapping(t_bytes32,t_struct(BackupConfig)62597_storage)", "offset": 0, "slot": "3" } ], "numberOfBytes": "128" }, - "t_struct(Bytes32Set)8824_storage": { + "t_struct(Bytes32Set)25428_storage": { "label": "struct EnumerableSet.Bytes32Set", "members": [ { "label": "_inner", - "type": "t_struct(Set)8630_storage", + "type": "t_struct(Set)25234_storage", "offset": 0, "slot": "0" } ], "numberOfBytes": "64" }, - "t_struct(Bytes32ToBytes32Map)7513_storage": { + "t_struct(Bytes32ToBytes32Map)23981_storage": { "label": "struct EnumerableMap.Bytes32ToBytes32Map", "members": [ { "label": "_keys", - "type": "t_struct(Bytes32Set)8824_storage", + "type": "t_struct(Bytes32Set)25428_storage", "offset": 0, "slot": "0" }, @@ -1317,19 +1317,19 @@ ], "numberOfBytes": "96" }, - "t_struct(Bytes32ToUintMap)8436_storage": { + "t_struct(Bytes32ToUintMap)25010_storage": { "label": "struct EnumerableMap.Bytes32ToUintMap", "members": [ { "label": "_inner", - "type": "t_struct(Bytes32ToBytes32Map)7513_storage", + "type": "t_struct(Bytes32ToBytes32Map)23981_storage", "offset": 0, "slot": "0" } ], "numberOfBytes": "96" }, - "t_struct(Set)8630_storage": { + "t_struct(Set)25234_storage": { "label": "struct EnumerableSet.Set", "members": [ { @@ -1366,9 +1366,9 @@ } } }, - "d01f6f145f45838dad5d67cc7a6ce17e3fe0694e3252e98c9f63930092a56827": { - "address": "0xd3025304C6487FC5c39010bEA0B46cc0690ab229", - "txHash": "0xfd5177293b0b861649abe145d2479d3dc6a85255ccb9aca62b39eff0492d9e6c", + "8fac727ec1a54b397875c4baa54e123813976105c25207a68c511e4572cc5270": { + "address": "0xa24E0D3E77Ec4849A288C72F9d9bC4dF84B26558", + "txHash": "0xced1540a118320f9b67ccd586165846bcad44cd9c118dbf198b7d51d7f1f192d", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -1378,7 +1378,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -1387,7 +1387,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -1395,7 +1395,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -1403,7 +1403,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -1411,13 +1411,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)13760", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -1433,42 +1433,42 @@ "label": "backingManager", "offset": 0, "slot": "201", - "type": "t_contract(IBackingManager)12519", + "type": "t_contract(IBackingManager)31603", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:31" + "src": "contracts/p1/Broker.sol:30" }, { "label": "rsrTrader", "offset": 0, "slot": "202", - "type": "t_contract(IRevenueTrader)14336", + "type": "t_contract(IRevenueTrader)33719", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:32" + "src": "contracts/p1/Broker.sol:31" }, { "label": "rTokenTrader", "offset": 0, "slot": "203", - "type": "t_contract(IRevenueTrader)14336", + "type": "t_contract(IRevenueTrader)33719", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:33" + "src": "contracts/p1/Broker.sol:32" }, { "label": "batchTradeImplementation", "offset": 0, "slot": "204", - "type": "t_contract(ITrade)14692", + "type": "t_contract(ITrade)34075", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:37", + "src": "contracts/p1/Broker.sol:36", "renamedFrom": "tradeImplementation" }, { "label": "gnosis", "offset": 0, "slot": "205", - "type": "t_contract(IGnosis)13416", + "type": "t_contract(IGnosis)32802", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:40" + "src": "contracts/p1/Broker.sol:39" }, { "label": "batchAuctionLength", @@ -1476,7 +1476,7 @@ "slot": "205", "type": "t_uint48", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:44", + "src": "contracts/p1/Broker.sol:43", "renamedFrom": "auctionLength" }, { @@ -1485,7 +1485,7 @@ "slot": "205", "type": "t_bool", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:50", + "src": "contracts/p1/Broker.sol:49", "renamedFrom": "disabled" }, { @@ -1494,15 +1494,15 @@ "slot": "206", "type": "t_mapping(t_address,t_bool)", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:53" + "src": "contracts/p1/Broker.sol:52" }, { "label": "dutchTradeImplementation", "offset": 0, "slot": "207", - "type": "t_contract(ITrade)14692", + "type": "t_contract(ITrade)34075", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:58" + "src": "contracts/p1/Broker.sol:57" }, { "label": "dutchAuctionLength", @@ -1510,23 +1510,23 @@ "slot": "207", "type": "t_uint48", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:61" + "src": "contracts/p1/Broker.sol:60" }, { "label": "dutchTradeDisabled", "offset": 0, "slot": "208", - "type": "t_mapping(t_contract(IERC20Metadata)6230,t_bool)", + "type": "t_mapping(t_contract(IERC20Metadata)17458,t_bool)", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:64" + "src": "contracts/p1/Broker.sol:63" }, { "label": "rToken", "offset": 0, "slot": "209", - "type": "t_contract(IRToken)13980", + "type": "t_contract(IRToken)33364", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:68" + "src": "contracts/p1/Broker.sol:67" }, { "label": "__gap", @@ -1534,7 +1534,7 @@ "slot": "210", "type": "t_array(t_uint256)41_storage", "contract": "BrokerP1", - "src": "contracts/p1/Broker.sol:297" + "src": "contracts/p1/Broker.sol:293" } ], "types": { @@ -1558,31 +1558,31 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(IBackingManager)12519": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IERC20Metadata)6230": { + "t_contract(IERC20Metadata)17458": { "label": "contract IERC20Metadata", "numberOfBytes": "20" }, - "t_contract(IGnosis)13416": { + "t_contract(IGnosis)32802": { "label": "contract IGnosis", "numberOfBytes": "20" }, - "t_contract(IMain)13760": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, - "t_contract(IRToken)13980": { + "t_contract(IRToken)33364": { "label": "contract IRToken", "numberOfBytes": "20" }, - "t_contract(IRevenueTrader)14336": { + "t_contract(IRevenueTrader)33719": { "label": "contract IRevenueTrader", "numberOfBytes": "20" }, - "t_contract(ITrade)14692": { + "t_contract(ITrade)34075": { "label": "contract ITrade", "numberOfBytes": "20" }, @@ -1590,7 +1590,7 @@ "label": "mapping(address => bool)", "numberOfBytes": "32" }, - "t_mapping(t_contract(IERC20Metadata)6230,t_bool)": { + "t_mapping(t_contract(IERC20Metadata)17458,t_bool)": { "label": "mapping(contract IERC20Metadata => bool)", "numberOfBytes": "32" }, @@ -1609,9 +1609,9 @@ } } }, - "e904978ac5293e4e74599d6ee2867d9c63dc5208e99421b2ab4b40b544181bcf": { - "address": "0x38eF27D791cd60074Fa0345E8F82Df25e1f80B41", - "txHash": "0xb8295fbb2f7c3ccc78def5ec8e67c0c2363d27f87ee705cc9d9a6e451edd5c7b", + "cd59c74dbbcdccc4cd63cefc93f3019c084744d14f3d461de54da1299450e0e1": { + "address": "0x5Ef74A083Ac932b5f050bf41cDe1F67c659b4b88", + "txHash": "0xafbf7935db3518c92966781d720c1b7db0c2fc00b6ece1611a0b36d990f96db9", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -1621,7 +1621,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -1630,7 +1630,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -1638,7 +1638,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -1646,7 +1646,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -1654,13 +1654,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)21513", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -1676,7 +1676,7 @@ "label": "destinations", "offset": 0, "slot": "201", - "type": "t_struct(AddressSet)15750_storage", + "type": "t_struct(AddressSet)25549_storage", "contract": "DistributorP1", "src": "contracts/p1/Distributor.sol:17" }, @@ -1684,7 +1684,7 @@ "label": "distribution", "offset": 0, "slot": "203", - "type": "t_mapping(t_address,t_struct(RevenueShare)20852_storage)", + "type": "t_mapping(t_address,t_struct(RevenueShare)32328_storage)", "contract": "DistributorP1", "src": "contracts/p1/Distributor.sol:18" }, @@ -1692,7 +1692,7 @@ "label": "rsr", "offset": 0, "slot": "204", - "type": "t_contract(IERC20)11113", + "type": "t_contract(IERC20)16806", "contract": "DistributorP1", "src": "contracts/p1/Distributor.sol:36" }, @@ -1700,7 +1700,7 @@ "label": "rToken", "offset": 0, "slot": "205", - "type": "t_contract(IERC20)11113", + "type": "t_contract(IERC20)16806", "contract": "DistributorP1", "src": "contracts/p1/Distributor.sol:37" }, @@ -1708,7 +1708,7 @@ "label": "furnace", "offset": 0, "slot": "206", - "type": "t_contract(IFurnace)21069", + "type": "t_contract(IFurnace)32702", "contract": "DistributorP1", "src": "contracts/p1/Distributor.sol:38" }, @@ -1716,7 +1716,7 @@ "label": "stRSR", "offset": 0, "slot": "207", - "type": "t_contract(IStRSR)22301", + "type": "t_contract(IStRSR)33928", "contract": "DistributorP1", "src": "contracts/p1/Distributor.sol:39" }, @@ -1774,23 +1774,23 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IERC20)11113": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IFurnace)21069": { + "t_contract(IFurnace)32702": { "label": "contract IFurnace", "numberOfBytes": "20" }, - "t_contract(IMain)21513": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, - "t_contract(IStRSR)22301": { + "t_contract(IStRSR)33928": { "label": "contract IStRSR", "numberOfBytes": "20" }, - "t_mapping(t_address,t_struct(RevenueShare)20852_storage)": { + "t_mapping(t_address,t_struct(RevenueShare)32328_storage)": { "label": "mapping(address => struct RevenueShare)", "numberOfBytes": "32" }, @@ -1798,19 +1798,19 @@ "label": "mapping(bytes32 => uint256)", "numberOfBytes": "32" }, - "t_struct(AddressSet)15750_storage": { + "t_struct(AddressSet)25549_storage": { "label": "struct EnumerableSet.AddressSet", "members": [ { "label": "_inner", - "type": "t_struct(Set)15449_storage", + "type": "t_struct(Set)25234_storage", "offset": 0, "slot": "0" } ], "numberOfBytes": "64" }, - "t_struct(RevenueShare)20852_storage": { + "t_struct(RevenueShare)32328_storage": { "label": "struct RevenueShare", "members": [ { @@ -1828,7 +1828,7 @@ ], "numberOfBytes": "32" }, - "t_struct(Set)15449_storage": { + "t_struct(Set)25234_storage": { "label": "struct EnumerableSet.Set", "members": [ { @@ -1861,9 +1861,9 @@ } } }, - "a0a52b0a37bee3a0e8e1d831f13f1a23be270d517e67eb1e34685cfaa4eb58b0": { - "address": "0xDf99ccA98349DeF0eaB8eC37C1a0B270de38E682", - "txHash": "0x6a311748d452b51d65e6aba76adf8f0494a4b1bd471988f45e7c77f1ae0b97ab", + "f3b89b86d7a085af5b9ca363d5e9c7f8afdc97e72ba2840ad16f99aeb3cba1ad": { + "address": "0x8A11D590B32186E1236B5E75F2d8D72c280dc880", + "txHash": "0x4069eddd042a2a0fe5c32c8825f4a6c8d36846354e6a4a3c47e638d20ecc13f9", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -1873,7 +1873,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -1882,7 +1882,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -1890,7 +1890,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -1898,7 +1898,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -1906,13 +1906,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)21513", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -1928,9 +1928,9 @@ "label": "rToken", "offset": 0, "slot": "201", - "type": "t_contract(IRToken)21733", + "type": "t_contract(IRToken)33364", "contract": "FurnaceP1", - "src": "contracts/p1/Furnace.sol:21" + "src": "contracts/p1/Furnace.sol:17" }, { "label": "ratio", @@ -1938,7 +1938,7 @@ "slot": "202", "type": "t_uint192", "contract": "FurnaceP1", - "src": "contracts/p1/Furnace.sol:24" + "src": "contracts/p1/Furnace.sol:20" }, { "label": "lastPayout", @@ -1946,7 +1946,7 @@ "slot": "202", "type": "t_uint48", "contract": "FurnaceP1", - "src": "contracts/p1/Furnace.sol:27" + "src": "contracts/p1/Furnace.sol:23" }, { "label": "lastPayoutBal", @@ -1954,7 +1954,7 @@ "slot": "203", "type": "t_uint256", "contract": "FurnaceP1", - "src": "contracts/p1/Furnace.sol:28" + "src": "contracts/p1/Furnace.sol:24" }, { "label": "__gap", @@ -1962,7 +1962,7 @@ "slot": "204", "type": "t_array(t_uint256)47_storage", "contract": "FurnaceP1", - "src": "contracts/p1/Furnace.sol:106" + "src": "contracts/p1/Furnace.sol:97" } ], "types": { @@ -1982,11 +1982,11 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(IMain)21513": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, - "t_contract(IRToken)21733": { + "t_contract(IRToken)33364": { "label": "contract IRToken", "numberOfBytes": "20" }, @@ -2009,9 +2009,9 @@ } } }, - "7ca0c34e143543d27f61131b037ed71cb62b4b37cd6f3c3685758dda5d395419": { - "address": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", - "txHash": "0xb5a603c20890e2006b43f3ff087fb530663773f8036eee44757dc1806dc32d67", + "80d51dee0982bc46becfd81417c9fe6bc95c4e550828a74d7f6a34e2c815cb58": { + "address": "0xaeCa35F0cB9d12D68adC4d734D4383593F109654", + "txHash": "0x30e20bfc8307b82c46371c986a0ee79407038bd175194496c64f8414c8e7ee56", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -2021,7 +2021,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -2030,7 +2030,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -2038,7 +2038,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -2046,7 +2046,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -2054,13 +2054,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)21513", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -2086,23 +2086,23 @@ "slot": "202", "type": "t_array(t_uint256)49_storage", "contract": "ReentrancyGuardUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:74" + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88" }, { "label": "broker", "offset": 0, "slot": "251", - "type": "t_contract(IBroker)20598", + "type": "t_contract(IBroker)32025", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:28" + "src": "contracts/p1/mixins/Trading.sol:26" }, { "label": "trades", "offset": 0, "slot": "252", - "type": "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)", + "type": "t_mapping(t_contract(IERC20)16806,t_contract(ITrade)34075)", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:31" + "src": "contracts/p1/mixins/Trading.sol:29" }, { "label": "tradesOpen", @@ -2110,7 +2110,7 @@ "slot": "253", "type": "t_uint48", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:32" + "src": "contracts/p1/mixins/Trading.sol:30" }, { "label": "maxTradeSlippage", @@ -2118,7 +2118,7 @@ "slot": "253", "type": "t_uint192", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:35" + "src": "contracts/p1/mixins/Trading.sol:33" }, { "label": "minTradeVolume", @@ -2126,7 +2126,7 @@ "slot": "254", "type": "t_uint192", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:36" + "src": "contracts/p1/mixins/Trading.sol:34" }, { "label": "tradesNonce", @@ -2134,7 +2134,7 @@ "slot": "255", "type": "t_uint256", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:39" + "src": "contracts/p1/mixins/Trading.sol:37" }, { "label": "__gap", @@ -2142,13 +2142,13 @@ "slot": "256", "type": "t_array(t_uint256)45_storage", "contract": "TradingP1", - "src": "contracts/p1/mixins/Trading.sol:166" + "src": "contracts/p1/mixins/Trading.sol:164" }, { "label": "tokenToBuy", "offset": 0, "slot": "301", - "type": "t_contract(IERC20)11113", + "type": "t_contract(IERC20)16806", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:19" }, @@ -2156,7 +2156,7 @@ "label": "assetRegistry", "offset": 0, "slot": "302", - "type": "t_contract(IAssetRegistry)20070", + "type": "t_contract(IAssetRegistry)31496", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:20" }, @@ -2164,7 +2164,7 @@ "label": "distributor", "offset": 0, "slot": "303", - "type": "t_contract(IDistributor)20914", + "type": "t_contract(IDistributor)32390", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:21" }, @@ -2172,7 +2172,7 @@ "label": "backingManager", "offset": 0, "slot": "304", - "type": "t_contract(IBackingManager)20178", + "type": "t_contract(IBackingManager)31603", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:22" }, @@ -2180,7 +2180,7 @@ "label": "furnace", "offset": 0, "slot": "305", - "type": "t_contract(IFurnace)21069", + "type": "t_contract(IFurnace)32702", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:23" }, @@ -2188,7 +2188,7 @@ "label": "rToken", "offset": 0, "slot": "306", - "type": "t_contract(IRToken)21733", + "type": "t_contract(IRToken)33364", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:24" }, @@ -2196,7 +2196,7 @@ "label": "rsr", "offset": 0, "slot": "307", - "type": "t_contract(IERC20)11113", + "type": "t_contract(IERC20)16806", "contract": "RevenueTraderP1", "src": "contracts/p1/RevenueTrader.sol:25" }, @@ -2206,7 +2206,7 @@ "slot": "308", "type": "t_array(t_uint256)43_storage", "contract": "RevenueTraderP1", - "src": "contracts/p1/RevenueTrader.sol:202" + "src": "contracts/p1/RevenueTrader.sol:204" } ], "types": { @@ -2230,43 +2230,43 @@ "label": "bool", "numberOfBytes": "1" }, - "t_contract(IAssetRegistry)20070": { + "t_contract(IAssetRegistry)31496": { "label": "contract IAssetRegistry", "numberOfBytes": "20" }, - "t_contract(IBackingManager)20178": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IBroker)20598": { + "t_contract(IBroker)32025": { "label": "contract IBroker", "numberOfBytes": "20" }, - "t_contract(IDistributor)20914": { + "t_contract(IDistributor)32390": { "label": "contract IDistributor", "numberOfBytes": "20" }, - "t_contract(IERC20)11113": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IFurnace)21069": { + "t_contract(IFurnace)32702": { "label": "contract IFurnace", "numberOfBytes": "20" }, - "t_contract(IMain)21513": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, - "t_contract(IRToken)21733": { + "t_contract(IRToken)33364": { "label": "contract IRToken", "numberOfBytes": "20" }, - "t_contract(ITrade)22445": { + "t_contract(ITrade)34075": { "label": "contract ITrade", "numberOfBytes": "20" }, - "t_mapping(t_contract(IERC20)11113,t_contract(ITrade)22445)": { + "t_mapping(t_contract(IERC20)16806,t_contract(ITrade)34075)": { "label": "mapping(contract IERC20 => contract ITrade)", "numberOfBytes": "32" }, @@ -2289,9 +2289,9 @@ } } }, - "5a888c497492660bc17c0ece874207430449e7ad4f2959e282bb4ddbf4450863": { - "address": "0x6bae9bE78cbE3Cd93FC02D974a66F9700E4a299C", - "txHash": "0x7b70fb4a38ad1f57820b37a5bbf325f432979decd4b439511add25e29a15a4fe", + "e5163e65dc1206da906aa4c21b9a5e763b011d2f5d15c9e15780f15f8fc3c011": { + "address": "0xC8f487B34251Eb76761168B70Dc10fA38B0Bd90b", + "txHash": "0xdbe2a37346e0101d3d158b924c605b410983e4bf58293fa0a949cc4ae0b7eac0", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -2301,7 +2301,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -2310,7 +2310,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -2318,7 +2318,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -2326,7 +2326,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -2334,13 +2334,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)13760", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -2358,7 +2358,7 @@ "slot": "201", "type": "t_mapping(t_address,t_uint256)", "contract": "ERC20Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:37" + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:40" }, { "label": "_allowances", @@ -2366,7 +2366,7 @@ "slot": "202", "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))", "contract": "ERC20Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:39" + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:42" }, { "label": "_totalSupply", @@ -2374,7 +2374,7 @@ "slot": "203", "type": "t_uint256", "contract": "ERC20Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:41" + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" }, { "label": "_name", @@ -2382,7 +2382,7 @@ "slot": "204", "type": "t_string_storage", "contract": "ERC20Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:43" + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:46" }, { "label": "_symbol", @@ -2390,7 +2390,7 @@ "slot": "205", "type": "t_string_storage", "contract": "ERC20Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:47" }, { "label": "__gap", @@ -2398,37 +2398,55 @@ "slot": "206", "type": "t_array(t_uint256)45_storage", "contract": "ERC20Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:394" + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:376" }, { - "label": "_HASHED_NAME", + "label": "_hashedName", "offset": 0, "slot": "251", "type": "t_bytes32", "contract": "EIP712Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:40", + "renamedFrom": "_HASHED_NAME" }, { - "label": "_HASHED_VERSION", + "label": "_hashedVersion", "offset": 0, "slot": "252", "type": "t_bytes32", "contract": "EIP712Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:42", + "renamedFrom": "_HASHED_VERSION" }, { - "label": "__gap", + "label": "_name", "offset": 0, "slot": "253", - "type": "t_array(t_uint256)50_storage", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:44" + }, + { + "label": "_version", + "offset": 0, + "slot": "254", + "type": "t_string_storage", "contract": "EIP712Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:45" + }, + { + "label": "__gap", + "offset": 0, + "slot": "255", + "type": "t_array(t_uint256)48_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:204" }, { "label": "_nonces", "offset": 0, "slot": "303", - "type": "t_mapping(t_address,t_struct(Counter)2548_storage)", + "type": "t_mapping(t_address,t_struct(Counter)6665_storage)", "contract": "ERC20PermitUpgradeable", "src": "contracts/vendor/ERC20PermitUpgradeable.sol:37" }, @@ -2461,7 +2479,7 @@ "label": "assetRegistry", "offset": 0, "slot": "354", - "type": "t_contract(IAssetRegistry)12411", + "type": "t_contract(IAssetRegistry)31496", "contract": "RTokenP1", "src": "contracts/p1/RToken.sol:47" }, @@ -2469,7 +2487,7 @@ "label": "basketHandler", "offset": 0, "slot": "355", - "type": "t_contract(IBasketHandler)12790", + "type": "t_contract(IBasketHandler)31870", "contract": "RTokenP1", "src": "contracts/p1/RToken.sol:48" }, @@ -2477,7 +2495,7 @@ "label": "backingManager", "offset": 0, "slot": "356", - "type": "t_contract(IBackingManager)12519", + "type": "t_contract(IBackingManager)31603", "contract": "RTokenP1", "src": "contracts/p1/RToken.sol:49" }, @@ -2485,7 +2503,7 @@ "label": "furnace", "offset": 0, "slot": "357", - "type": "t_contract(IFurnace)13316", + "type": "t_contract(IFurnace)32702", "contract": "RTokenP1", "src": "contracts/p1/RToken.sol:50" }, @@ -2501,7 +2519,7 @@ "label": "issuanceThrottle", "offset": 0, "slot": "359", - "type": "t_struct(Throttle)17193_storage", + "type": "t_struct(Throttle)36712_storage", "contract": "RTokenP1", "src": "contracts/p1/RToken.sol:58" }, @@ -2509,7 +2527,7 @@ "label": "redemptionThrottle", "offset": 0, "slot": "363", - "type": "t_struct(Throttle)17193_storage", + "type": "t_struct(Throttle)36712_storage", "contract": "RTokenP1", "src": "contracts/p1/RToken.sol:59" }, @@ -2519,7 +2537,7 @@ "slot": "367", "type": "t_array(t_uint256)42_storage", "contract": "RTokenP1", - "src": "contracts/p1/RToken.sol:535" + "src": "contracts/p1/RToken.sol:539" } ], "types": { @@ -2555,23 +2573,23 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IAssetRegistry)12411": { + "t_contract(IAssetRegistry)31496": { "label": "contract IAssetRegistry", "numberOfBytes": "20" }, - "t_contract(IBackingManager)12519": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IBasketHandler)12790": { + "t_contract(IBasketHandler)31870": { "label": "contract IBasketHandler", "numberOfBytes": "20" }, - "t_contract(IFurnace)13316": { + "t_contract(IFurnace)32702": { "label": "contract IFurnace", "numberOfBytes": "20" }, - "t_contract(IMain)13760": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, @@ -2579,7 +2597,7 @@ "label": "mapping(address => mapping(address => uint256))", "numberOfBytes": "32" }, - "t_mapping(t_address,t_struct(Counter)2548_storage)": { + "t_mapping(t_address,t_struct(Counter)6665_storage)": { "label": "mapping(address => struct CountersUpgradeable.Counter)", "numberOfBytes": "32" }, @@ -2591,7 +2609,7 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(Counter)2548_storage": { + "t_struct(Counter)6665_storage": { "label": "struct CountersUpgradeable.Counter", "members": [ { @@ -2603,7 +2621,7 @@ ], "numberOfBytes": "32" }, - "t_struct(Params)17185_storage": { + "t_struct(Params)36704_storage": { "label": "struct ThrottleLib.Params", "members": [ { @@ -2621,12 +2639,12 @@ ], "numberOfBytes": "64" }, - "t_struct(Throttle)17193_storage": { + "t_struct(Throttle)36712_storage": { "label": "struct ThrottleLib.Throttle", "members": [ { "label": "params", - "type": "t_struct(Params)17185_storage", + "type": "t_struct(Params)36704_storage", "offset": 0, "slot": "0" }, @@ -2664,9 +2682,9 @@ } } }, - "3bd3a4a1d8f7febf9931ad399cea033644f08c15cd22b815d5afdaaec5ac6412": { - "address": "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178", - "txHash": "0x5d0a6f5e281b3b7be44108251986f24cfef92b77c22bdcad2b8c5dad607d4c58", + "45d0e7dbbbcc04b6b1815cbc2791be5136c957c2c8ec0ba5bcb55adb44b812ef": { + "address": "0x437b525F96A2Da0A4b165efe27c61bea5c8d3CD4", + "txHash": "0x01f2290b71e53a210fa0d45425495d3f175bc7d20bef54b6e83b876249046756", "layout": { "solcVersion": "0.8.19", "storage": [ @@ -2676,7 +2694,7 @@ "slot": "0", "type": "t_uint8", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", "retypedFrom": "bool" }, { @@ -2685,7 +2703,7 @@ "slot": "0", "type": "t_bool", "contract": "Initializable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" }, { "label": "__gap", @@ -2693,7 +2711,7 @@ "slot": "1", "type": "t_array(t_uint256)50_storage", "contract": "ContextUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" }, { "label": "__gap", @@ -2701,7 +2719,7 @@ "slot": "51", "type": "t_array(t_uint256)50_storage", "contract": "ERC1967UpgradeUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" }, { "label": "__gap", @@ -2709,13 +2727,13 @@ "slot": "101", "type": "t_array(t_uint256)50_storage", "contract": "UUPSUpgradeable", - "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" }, { "label": "main", "offset": 0, "slot": "151", - "type": "t_contract(IMain)13760", + "type": "t_contract(IMain)33146", "contract": "ComponentP1", "src": "contracts/p1/mixins/Component.sol:21" }, @@ -2728,28 +2746,46 @@ "src": "contracts/p1/mixins/Component.sol:69" }, { - "label": "_HASHED_NAME", + "label": "_hashedName", "offset": 0, "slot": "201", "type": "t_bytes32", "contract": "EIP712Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:32" + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:40", + "renamedFrom": "_HASHED_NAME" }, { - "label": "_HASHED_VERSION", + "label": "_hashedVersion", "offset": 0, "slot": "202", "type": "t_bytes32", "contract": "EIP712Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:33" + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:42", + "renamedFrom": "_HASHED_VERSION" }, { - "label": "__gap", + "label": "_name", "offset": 0, "slot": "203", - "type": "t_array(t_uint256)50_storage", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:44" + }, + { + "label": "_version", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:45" + }, + { + "label": "__gap", + "offset": 0, + "slot": "205", + "type": "t_array(t_uint256)48_storage", "contract": "EIP712Upgradeable", - "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/draft-EIP712Upgradeable.sol:120" + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:204" }, { "label": "name", @@ -2757,7 +2793,7 @@ "slot": "253", "type": "t_string_storage", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:48" + "src": "contracts/p1/StRSR.sol:45" }, { "label": "symbol", @@ -2765,39 +2801,39 @@ "slot": "254", "type": "t_string_storage", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:49" + "src": "contracts/p1/StRSR.sol:46" }, { "label": "assetRegistry", "offset": 0, "slot": "255", - "type": "t_contract(IAssetRegistry)12411", + "type": "t_contract(IAssetRegistry)31496", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:54" + "src": "contracts/p1/StRSR.sol:51" }, { "label": "backingManager", "offset": 0, "slot": "256", - "type": "t_contract(IBackingManager)12519", + "type": "t_contract(IBackingManager)31603", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:55" + "src": "contracts/p1/StRSR.sol:52" }, { "label": "basketHandler", "offset": 0, "slot": "257", - "type": "t_contract(IBasketHandler)12790", + "type": "t_contract(IBasketHandler)31870", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:56" + "src": "contracts/p1/StRSR.sol:53" }, { "label": "rsr", "offset": 0, "slot": "258", - "type": "t_contract(IERC20)6205", + "type": "t_contract(IERC20)16806", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:57" + "src": "contracts/p1/StRSR.sol:54" }, { "label": "era", @@ -2805,7 +2841,7 @@ "slot": "259", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:62" + "src": "contracts/p1/StRSR.sol:59" }, { "label": "stakes", @@ -2813,7 +2849,7 @@ "slot": "260", "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:66" + "src": "contracts/p1/StRSR.sol:63" }, { "label": "totalStakes", @@ -2821,7 +2857,7 @@ "slot": "261", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:67" + "src": "contracts/p1/StRSR.sol:64" }, { "label": "stakeRSR", @@ -2829,7 +2865,7 @@ "slot": "262", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:68" + "src": "contracts/p1/StRSR.sol:65" }, { "label": "stakeRate", @@ -2837,7 +2873,7 @@ "slot": "263", "type": "t_uint192", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:69" + "src": "contracts/p1/StRSR.sol:66" }, { "label": "_allowances", @@ -2845,7 +2881,7 @@ "slot": "264", "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:74" + "src": "contracts/p1/StRSR.sol:71" }, { "label": "draftEra", @@ -2853,15 +2889,15 @@ "slot": "265", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:79" + "src": "contracts/p1/StRSR.sol:76" }, { "label": "draftQueues", "offset": 0, "slot": "266", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage))", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)59577_storage)dyn_storage))", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:87" + "src": "contracts/p1/StRSR.sol:84" }, { "label": "firstRemainingDraft", @@ -2869,7 +2905,7 @@ "slot": "267", "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:88" + "src": "contracts/p1/StRSR.sol:85" }, { "label": "totalDrafts", @@ -2877,7 +2913,7 @@ "slot": "268", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:89" + "src": "contracts/p1/StRSR.sol:86" }, { "label": "draftRSR", @@ -2885,7 +2921,7 @@ "slot": "269", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:90" + "src": "contracts/p1/StRSR.sol:87" }, { "label": "draftRate", @@ -2893,23 +2929,23 @@ "slot": "270", "type": "t_uint192", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:91" + "src": "contracts/p1/StRSR.sol:88" }, { "label": "_nonces", "offset": 0, "slot": "271", - "type": "t_mapping(t_address,t_struct(Counter)2548_storage)", + "type": "t_mapping(t_address,t_struct(Counter)6665_storage)", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:129" + "src": "contracts/p1/StRSR.sol:126" }, { "label": "_delegationNonces", "offset": 0, "slot": "272", - "type": "t_mapping(t_address,t_struct(Counter)2548_storage)", + "type": "t_mapping(t_address,t_struct(Counter)6665_storage)", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:131" + "src": "contracts/p1/StRSR.sol:128" }, { "label": "unstakingDelay", @@ -2917,7 +2953,7 @@ "slot": "273", "type": "t_uint48", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:141" + "src": "contracts/p1/StRSR.sol:138" }, { "label": "rewardRatio", @@ -2925,7 +2961,7 @@ "slot": "273", "type": "t_uint192", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:142" + "src": "contracts/p1/StRSR.sol:139" }, { "label": "payoutLastPaid", @@ -2933,7 +2969,7 @@ "slot": "274", "type": "t_uint48", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:153" + "src": "contracts/p1/StRSR.sol:150" }, { "label": "rsrRewardsAtLastPayout", @@ -2941,7 +2977,7 @@ "slot": "275", "type": "t_uint256", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:156" + "src": "contracts/p1/StRSR.sol:153" }, { "label": "leaked", @@ -2949,7 +2985,7 @@ "slot": "276", "type": "t_uint192", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:162" + "src": "contracts/p1/StRSR.sol:159" }, { "label": "lastWithdrawRefresh", @@ -2957,7 +2993,7 @@ "slot": "276", "type": "t_uint48", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:163" + "src": "contracts/p1/StRSR.sol:160" }, { "label": "withdrawalLeak", @@ -2965,7 +3001,7 @@ "slot": "277", "type": "t_uint192", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:164" + "src": "contracts/p1/StRSR.sol:161" }, { "label": "__gap", @@ -2973,7 +3009,7 @@ "slot": "278", "type": "t_array(t_uint256)28_storage", "contract": "StRSRP1", - "src": "contracts/p1/StRSR.sol:1000" + "src": "contracts/p1/StRSR.sol:999" }, { "label": "_delegates", @@ -2981,31 +3017,31 @@ "slot": "306", "type": "t_mapping(t_address,t_address)", "contract": "StRSRP1Votes", - "src": "contracts/p1/StRSRVotes.sol:31" + "src": "contracts/p1/StRSRVotes.sol:34" }, { "label": "_eras", "offset": 0, "slot": "307", - "type": "t_array(t_struct(Checkpoint)37235_storage)dyn_storage", + "type": "t_array(t_struct(Checkpoint)61786_storage)dyn_storage", "contract": "StRSRP1Votes", - "src": "contracts/p1/StRSRVotes.sol:34" + "src": "contracts/p1/StRSRVotes.sol:37" }, { "label": "_checkpoints", "offset": 0, "slot": "308", - "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)37235_storage)dyn_storage))", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)61786_storage)dyn_storage))", "contract": "StRSRP1Votes", - "src": "contracts/p1/StRSRVotes.sol:38" + "src": "contracts/p1/StRSRVotes.sol:41" }, { "label": "_totalSupplyCheckpoints", "offset": 0, "slot": "309", - "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)37235_storage)dyn_storage)", + "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)61786_storage)dyn_storage)", "contract": "StRSRP1Votes", - "src": "contracts/p1/StRSRVotes.sol:40" + "src": "contracts/p1/StRSRVotes.sol:43" }, { "label": "__gap", @@ -3013,7 +3049,7 @@ "slot": "310", "type": "t_array(t_uint256)46_storage", "contract": "StRSRP1Votes", - "src": "contracts/p1/StRSRVotes.sol:243" + "src": "contracts/p1/StRSRVotes.sol:300" } ], "types": { @@ -3021,11 +3057,11 @@ "label": "address", "numberOfBytes": "20" }, - "t_array(t_struct(Checkpoint)37235_storage)dyn_storage": { + "t_array(t_struct(Checkpoint)61786_storage)dyn_storage": { "label": "struct StRSRP1Votes.Checkpoint[]", "numberOfBytes": "32" }, - "t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage": { + "t_array(t_struct(CumulativeDraft)59577_storage)dyn_storage": { "label": "struct StRSRP1.CumulativeDraft[]", "numberOfBytes": "32" }, @@ -3037,6 +3073,10 @@ "label": "uint256[46]", "numberOfBytes": "1472" }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, "t_array(t_uint256)49_storage": { "label": "uint256[49]", "numberOfBytes": "1568" @@ -3053,23 +3093,23 @@ "label": "bytes32", "numberOfBytes": "32" }, - "t_contract(IAssetRegistry)12411": { + "t_contract(IAssetRegistry)31496": { "label": "contract IAssetRegistry", "numberOfBytes": "20" }, - "t_contract(IBackingManager)12519": { + "t_contract(IBackingManager)31603": { "label": "contract IBackingManager", "numberOfBytes": "20" }, - "t_contract(IBasketHandler)12790": { + "t_contract(IBasketHandler)31870": { "label": "contract IBasketHandler", "numberOfBytes": "20" }, - "t_contract(IERC20)6205": { + "t_contract(IERC20)16806": { "label": "contract IERC20", "numberOfBytes": "20" }, - "t_contract(IMain)13760": { + "t_contract(IMain)33146": { "label": "contract IMain", "numberOfBytes": "20" }, @@ -3077,11 +3117,11 @@ "label": "mapping(address => address)", "numberOfBytes": "32" }, - "t_mapping(t_address,t_array(t_struct(Checkpoint)37235_storage)dyn_storage)": { + "t_mapping(t_address,t_array(t_struct(Checkpoint)61786_storage)dyn_storage)": { "label": "mapping(address => struct StRSRP1Votes.Checkpoint[])", "numberOfBytes": "32" }, - "t_mapping(t_address,t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage)": { + "t_mapping(t_address,t_array(t_struct(CumulativeDraft)59577_storage)dyn_storage)": { "label": "mapping(address => struct StRSRP1.CumulativeDraft[])", "numberOfBytes": "32" }, @@ -3089,7 +3129,7 @@ "label": "mapping(address => mapping(address => uint256))", "numberOfBytes": "32" }, - "t_mapping(t_address,t_struct(Counter)2548_storage)": { + "t_mapping(t_address,t_struct(Counter)6665_storage)": { "label": "mapping(address => struct CountersUpgradeable.Counter)", "numberOfBytes": "32" }, @@ -3097,15 +3137,15 @@ "label": "mapping(address => uint256)", "numberOfBytes": "32" }, - "t_mapping(t_uint256,t_array(t_struct(Checkpoint)37235_storage)dyn_storage)": { + "t_mapping(t_uint256,t_array(t_struct(Checkpoint)61786_storage)dyn_storage)": { "label": "mapping(uint256 => struct StRSRP1Votes.Checkpoint[])", "numberOfBytes": "32" }, - "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)37235_storage)dyn_storage))": { + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)61786_storage)dyn_storage))": { "label": "mapping(uint256 => mapping(address => struct StRSRP1Votes.Checkpoint[]))", "numberOfBytes": "32" }, - "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)34992_storage)dyn_storage))": { + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)59577_storage)dyn_storage))": { "label": "mapping(uint256 => mapping(address => struct StRSRP1.CumulativeDraft[]))", "numberOfBytes": "32" }, @@ -3121,11 +3161,11 @@ "label": "string", "numberOfBytes": "32" }, - "t_struct(Checkpoint)37235_storage": { + "t_struct(Checkpoint)61786_storage": { "label": "struct StRSRP1Votes.Checkpoint", "members": [ { - "label": "fromBlock", + "label": "fromTimepoint", "type": "t_uint48", "offset": 0, "slot": "0" @@ -3139,7 +3179,7 @@ ], "numberOfBytes": "64" }, - "t_struct(Counter)2548_storage": { + "t_struct(Counter)6665_storage": { "label": "struct CountersUpgradeable.Counter", "members": [ { @@ -3151,7 +3191,7 @@ ], "numberOfBytes": "32" }, - "t_struct(CumulativeDraft)34992_storage": { + "t_struct(CumulativeDraft)59577_storage": { "label": "struct StRSRP1.CumulativeDraft", "members": [ { diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json new file mode 100644 index 0000000000..e9ccea593e --- /dev/null +++ b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json @@ -0,0 +1,24 @@ +{ + "assets": { + "COMP": "0x6882560A919714A742afd2A2a0af6b4D8d20cF22", + "ARB": "0x21fBa52dA03e1F964fa521532f8B8951fC212055" + }, + "collateral": { + "DAI": "0x6FE56A3EEa3fEc93601a94D26bEa1876bD48192F", + "USDC": "0xa96aE05dFa869F4FCC4142E8D4E4F2706FEe2B57", + "USDT": "0x3Ac8F000D75a2EA4a9a36c6844410926bc0c32f7", + "saArbUSDCn": "0x7be9Bc50734820516693A376238Cc6Bf029BA682", + "saArbUSDT": "0x529D7e23Ce63efdcE41dA2a41296Fd7399157F5b", + "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6" + }, + "erc20s": { + "COMP": "0x354A6dA3fcde098F8389cad84b0182725c6C91dE", + "DAI": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1", + "USDC": "0xaf88d065e77c8cc2239327c5edb3a432268e5831", + "USDT": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9", + "saArbUSDCn": "0x030cDeCBDcA6A34e8De3f49d1798d5f70E3a3414", + "saArbUSDT": "0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128", + "cUSDCv3": "0xd54804250E9C561AEa9Dee34e9cf2342f767ACC5", + "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548" + } +} \ No newline at end of file diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json index 6d1483912b..d144304069 100644 --- a/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json +++ b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json @@ -4,35 +4,35 @@ "RSR_FEED": "0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488", "GNOSIS_EASY_AUCTION": "0xcD033976a011F41D2AB6ef47984041568F818E73" }, - "tradingLib": "0x8569D60Df34354CDd1115b90de832845b31C28d2", + "tradingLib": "0x348644F24FA34c40a8E3C4Cf9aF14f8a96aD63fC", "cvxMiningLib": "", - "facade": "0xB7F55aA5C7d09C091C1bD22B3352e8cb3fACF289", + "facade": "0x387A0C36681A22F728ab54426356F4CAa6bB48a9", "facets": { - "actFacet": "0x182e86Ad4a6139ced4f9Fa4ED3f1Cd9E4F7449e7", - "readFacet": "0x37C8ebD57864D38C8F7987B6762e0301b0bAfF6d" + "actFacet": "0xE774CCF1431c3DEe7Fa4c20f67534b61289CAa45", + "readFacet": "0x15175d35F3d88548B49600B4ee8067253A2e4e66" }, - "facadeWriteLib": "0xfd529fa21FBd569Bcf7c7f49694568fD66e8d1e9", - "basketLib": "0xf4C5d33DABb9D4681ED9b83618d629BA1006AE16", - "facadeWrite": "0x0F345F57ee2b395e23390f8e1F1869D7E6C0F70e", - "deployer": "0x184460704886f9F2A7F3A0c2887680867954dC6E", - "rsrAsset": "0xaB6b734b618a4824fCCa63014cfaC30CDB41Db2a", + "facadeWriteLib": "0x042D85e9eb1F4372ffA362240E0630229CaA1904", + "basketLib": "0x53f1Df4E5591Ae35Bf738742981669c3767241FA", + "facadeWrite": "0xe2B652E538543d02f985A5E422645A704633956d", + "deployer": "0xfd7eb6B208E1fa7B14E26A1fb10fFC17Cf695d68", + "rsrAsset": "0x7182e3A6E29936C8B14c4fa6f63a62D0b1D0f767", "implementations": { - "main": "0x9C75314AFD011F22648ca9C655b61674e27bA4AC", + "main": "0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461", "trading": { - "gnosisTrade": "0x13B63e7094B61CCbe79CAe3fb602DFd12D59314a", - "dutchTrade": "0x46c600CB3Fb7Bf386F8f53952D64aC028e289AFb" + "gnosisTrade": "0xD42620d04fCe65B1F5E8Facc894a2e34D764FEc9", + "dutchTrade": "0x8b4374005291B8FCD14C4E947604b2FB3C660A73" }, "components": { - "assetRegistry": "0xFa93538Ed210486bfdE01b7E2295392fE7153106", - "backingManager": "0xcd77df48E548dda056f8563f2520fFD94aD147eE", - "basketHandler": "0xa8d818C719c1034E731Feba2088F4F011D44ACB3", - "broker": "0xd3025304C6487FC5c39010bEA0B46cc0690ab229", - "distributor": "0x38eF27D791cd60074Fa0345E8F82Df25e1f80B41", - "furnace": "0xDf99ccA98349DeF0eaB8eC37C1a0B270de38E682", - "rsrTrader": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", - "rTokenTrader": "0xf67454a5e8081F52768cD350A4Ac9E832c5101b6", - "rToken": "0x6bae9bE78cbE3Cd93FC02D974a66F9700E4a299C", - "stRSR": "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178" + "assetRegistry": "0xA9df960Af018178C0138CD5780c768A0a0A7e61f", + "backingManager": "0xD85Fac03804a3e44D29c494f3761D11A2262cBBe", + "basketHandler": "0x157b0C032192F5714BD68bf33dF96C122EA5e1d6", + "broker": "0xa24E0D3E77Ec4849A288C72F9d9bC4dF84B26558", + "distributor": "0x5Ef74A083Ac932b5f050bf41cDe1F67c659b4b88", + "furnace": "0x8A11D590B32186E1236B5E75F2d8D72c280dc880", + "rsrTrader": "0xaeCa35F0cB9d12D68adC4d734D4383593F109654", + "rTokenTrader": "0xaeCa35F0cB9d12D68adC4d734D4383593F109654", + "rToken": "0xC8f487B34251Eb76761168B70Dc10fA38B0Bd90b", + "stRSR": "0x437b525F96A2Da0A4b165efe27c61bea5c8d3CD4" } } } \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index d16055f098..c7ef59ead8 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -41,7 +41,11 @@ async function main() { // Phase 1.5 -- Facets // To update the existing Facade, add new facets to the below list - scripts.push('phase1-facade/1_deploy_readFacet.ts', 'phase1-facade/2_deploy_actFacet.ts') + scripts.push( + 'phase1-facade/1_deploy_readFacet.ts', + 'phase1-facade/2_deploy_actFacet.ts', + 'phase1-facade/3_deploy_maxIssuable.ts' + ) // ============================================= @@ -50,8 +54,6 @@ async function main() { scripts.push( 'phase2-assets/0_setup_deployments.ts', 'phase2-assets/1_deploy_assets.ts', - 'phase2-assets/assets/deploy_crv.ts', - 'phase2-assets/assets/deploy_cvx.ts', 'phase2-assets/2_deploy_collateral.ts', 'phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts', 'phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts', @@ -95,6 +97,7 @@ async function main() { } else if (chainId == '42161' || chainId == '421614') { // Arbitrum One scripts.push( + 'phase2-assets/0_setup_deployments.ts', 'phase2-assets/1_deploy_assets.ts', 'phase2-assets/2_deploy_collateral.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', diff --git a/scripts/deployment/phase2-assets/1_deploy_assets.ts b/scripts/deployment/phase2-assets/1_deploy_assets.ts index 9ba6b53f4a..c7ec54639d 100644 --- a/scripts/deployment/phase2-assets/1_deploy_assets.ts +++ b/scripts/deployment/phase2-assets/1_deploy_assets.ts @@ -37,7 +37,7 @@ async function main() { const deployedAssets: string[] = [] /******** Deploy StkAAVE Asset **************************/ - if (!baseL2Chains.includes(hre.network.name)) { + if (!baseL2Chains.includes(hre.network.name) && !arbitrumL2Chains.includes(hre.network.name)) { const { asset: stkAAVEAsset } = await hre.run('deploy-asset', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.AAVE, diff --git a/scripts/verification/4_verify_facade.ts b/scripts/verification/4_verify_facade.ts index 1521481ecf..28226f1eff 100644 --- a/scripts/verification/4_verify_facade.ts +++ b/scripts/verification/4_verify_facade.ts @@ -20,7 +20,7 @@ async function main() { deployments = getDeploymentFile(getDeploymentFilename(chainId)) - /** ******************** Verify FacadeRead ****************************************/ + /** ******************** Verify Facade ****************************************/ await verifyContract(chainId, deployments.facade, [], 'contracts/facade/Facade.sol:Facade') /** ******************** Verify ReadFacet ****************************************/ diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index 88bc41a169..a750f337bd 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -1,8 +1,13 @@ import hre, { ethers } from 'hardhat' - import { getChainId } from '../../common/blockchain-utils' -import { baseL2Chains, developmentChains, networkConfig } from '../../common/configuration' +import { + arbitrumL2Chains, + baseL2Chains, + developmentChains, + networkConfig, +} from '../../common/configuration' import { fp, bn } from '../../common/numbers' +import { USDC_ARBITRUM_ORACLE_ERROR } from '../../test/plugins/individual-collateral/aave-v3/constants' import { getDeploymentFile, getAssetCollDeploymentFilename, @@ -82,180 +87,182 @@ async function main() { ) } - /******** Verify StaticATokenLM - aDAI **************************/ - // Get AToken to retrieve name and symbol - const aToken: ATokenMock = ( - await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aDAI as string) - ) - const aTokenCollateral: ATokenFiatCollateral = ( - await ethers.getContractAt('ATokenFiatCollateral', deployments.collateral.aDAI as string) - ) + if (!arbitrumL2Chains.includes(hre.network.name)) { + /******** Verify StaticATokenLM - aDAI **************************/ + // Get AToken to retrieve name and symbol + const aToken: ATokenMock = ( + await ethers.getContractAt('ATokenMock', networkConfig[chainId].tokens.aDAI as string) + ) + const aTokenCollateral: ATokenFiatCollateral = ( + await ethers.getContractAt('ATokenFiatCollateral', deployments.collateral.aDAI as string) + ) - await verifyContract( - chainId, - await aTokenCollateral.erc20(), - [ - networkConfig[chainId].AAVE_LENDING_POOL as string, - aToken.address, - 'Static ' + (await aToken.name()), - 's' + (await aToken.symbol()), - ], - 'contracts/plugins/assets/aave/vendor/StaticATokenLM.sol:StaticATokenLM' - ) - /******** Verify ATokenFiatCollateral - aDAI **************************/ - await verifyContract( - chainId, - aTokenCollateral.address, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - erc20: await aTokenCollateral.erc20(), - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - }, - revenueHiding.toString(), - ], - 'contracts/plugins/assets/aave/ATokenFiatCollateral.sol:ATokenFiatCollateral' - ) - /********************** Verify CTokenFiatCollateral - cDAI ****************************************/ - await verifyContract( - chainId, - deployments.collateral.cDAI, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - erc20: deployments.erc20s.cDAI, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - }, - revenueHiding.toString(), - ], - 'contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol:CTokenFiatCollateral' - ) - /********************** Verify CTokenNonFiatCollateral - cWBTC ****************************************/ + await verifyContract( + chainId, + await aTokenCollateral.erc20(), + [ + networkConfig[chainId].AAVE_LENDING_POOL as string, + aToken.address, + 'Static ' + (await aToken.name()), + 's' + (await aToken.symbol()), + ], + 'contracts/plugins/assets/aave/vendor/StaticATokenLM.sol:StaticATokenLM' + ) + /******** Verify ATokenFiatCollateral - aDAI **************************/ + await verifyContract( + chainId, + aTokenCollateral.address, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: fp('0.0025').toString(), // 0.25% + erc20: await aTokenCollateral.erc20(), + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + }, + revenueHiding.toString(), + ], + 'contracts/plugins/assets/aave/ATokenFiatCollateral.sol:ATokenFiatCollateral' + ) + /********************** Verify CTokenFiatCollateral - cDAI ****************************************/ + await verifyContract( + chainId, + deployments.collateral.cDAI, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI, + oracleError: fp('0.0025').toString(), // 0.25% + erc20: deployments.erc20s.cDAI, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125').toString(), // 1.25% + delayUntilDefault: bn('86400').toString(), // 24h + }, + revenueHiding.toString(), + ], + 'contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol:CTokenFiatCollateral' + ) + /********************** Verify CTokenNonFiatCollateral - cWBTC ****************************************/ - const wbtcOracleError = fp('0.02') // 2% - const btcOracleError = fp('0.005') // 0.5% - const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) + const wbtcOracleError = fp('0.02') // 2% + const btcOracleError = fp('0.005') // 0.5% + const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) - await verifyContract( - chainId, - deployments.collateral.cWBTC, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC, - oracleError: combinedBTCWBTCError.toString(), - erc20: deployments.erc20s.cWBTC, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetName: hre.ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% - delayUntilDefault: bn('86400').toString(), // 24h - }, - networkConfig[chainId].chainlinkFeeds.BTC, - '3600', - revenueHiding.toString(), - ], - 'contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol:CTokenNonFiatCollateral' - ) - /********************** Verify CTokenSelfReferentialFiatCollateral - cETH ****************************************/ - await verifyContract( - chainId, - deployments.collateral.cETH, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: fp('0.005').toString(), // 0.5% - erc20: deployments.erc20s.cETH, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: '0', - delayUntilDefault: '0', - }, - revenueHiding.toString(), - '18', - ], - 'contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol:CTokenSelfReferentialCollateral' - ) - /********************** Verify NonFiatCollateral - wBTC ****************************************/ - await verifyContract( - chainId, - deployments.collateral.WBTC, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC, - oracleError: combinedBTCWBTCError.toString(), - erc20: networkConfig[chainId].tokens.WBTC, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24h - targetName: ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% - delayUntilDefault: bn('86400').toString(), // 24h - }, - networkConfig[chainId].chainlinkFeeds.BTC, - '3600', - ], - 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' - ) + await verifyContract( + chainId, + deployments.collateral.cWBTC, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC, + oracleError: combinedBTCWBTCError.toString(), + erc20: deployments.erc20s.cWBTC, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24 hr + targetName: hre.ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + networkConfig[chainId].chainlinkFeeds.BTC, + '3600', + revenueHiding.toString(), + ], + 'contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol:CTokenNonFiatCollateral' + ) + /********************** Verify CTokenSelfReferentialFiatCollateral - cETH ****************************************/ + await verifyContract( + chainId, + deployments.collateral.cETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: fp('0.005').toString(), // 0.5% + erc20: deployments.erc20s.cETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: '0', + delayUntilDefault: '0', + }, + revenueHiding.toString(), + '18', + ], + 'contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol:CTokenSelfReferentialCollateral' + ) + /********************** Verify NonFiatCollateral - wBTC ****************************************/ + await verifyContract( + chainId, + deployments.collateral.WBTC, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC, + oracleError: combinedBTCWBTCError.toString(), + erc20: networkConfig[chainId].tokens.WBTC, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24h + targetName: ethers.utils.formatBytes32String('BTC'), + defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + networkConfig[chainId].chainlinkFeeds.BTC, + '3600', + ], + 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' + ) - /********************** Verify SelfReferentialCollateral - WETH ****************************************/ - const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr - const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% + /********************** Verify SelfReferentialCollateral - WETH ****************************************/ + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr + const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% - await verifyContract( - chainId, - deployments.collateral.WETH, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: ethOracleError.toString(), // 0.5% - erc20: networkConfig[chainId].tokens.WETH, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: ethOracleTimeout, - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: '0', - delayUntilDefault: '0', - }, - ], - 'contracts/plugins/assets/SelfReferentialCollateral.sol:SelfReferentialCollateral' - ) + await verifyContract( + chainId, + deployments.collateral.WETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: ethOracleError.toString(), // 0.5% + erc20: networkConfig[chainId].tokens.WETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: ethOracleTimeout, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: '0', + delayUntilDefault: '0', + }, + ], + 'contracts/plugins/assets/SelfReferentialCollateral.sol:SelfReferentialCollateral' + ) - /********************** Verify EURFiatCollateral - EURT ****************************************/ - await verifyContract( - chainId, - deployments.collateral.EURT, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.EURT, - oracleError: fp('0.02').toString(), // 2% - erc20: networkConfig[chainId].tokens.EURT, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24hr - targetName: ethers.utils.formatBytes32String('EUR'), - defaultThreshold: fp('0.03').toString(), // 3% - delayUntilDefault: bn('86400').toString(), // 24h - }, - networkConfig[chainId].chainlinkFeeds.EUR, - '86400', - ], - 'contracts/plugins/assets/EURFiatCollateral.sol:EURFiatCollateral' - ) + /********************** Verify EURFiatCollateral - EURT ****************************************/ + await verifyContract( + chainId, + deployments.collateral.EURT, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.EURT, + oracleError: fp('0.02').toString(), // 2% + erc20: networkConfig[chainId].tokens.EURT, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '86400', // 24hr + targetName: ethers.utils.formatBytes32String('EUR'), + defaultThreshold: fp('0.03').toString(), // 3% + delayUntilDefault: bn('86400').toString(), // 24h + }, + networkConfig[chainId].chainlinkFeeds.EUR, + '86400', + ], + 'contracts/plugins/assets/EURFiatCollateral.sol:EURFiatCollateral' + ) + } } main().catch((error) => { From 5ff5c2beb67bfbfe16e80eee9303e0a6cea61080 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 25 Apr 2024 18:51:42 -0400 Subject: [PATCH 360/450] StakeDAO recursive collateral (#1111) Co-authored-by: Akshat Mittal --- common/configuration.ts | 4 + .../assets/curve/CurveRecursiveCollateral.sol | 193 +++++++++++ .../assets/curve/stakedao/IStakeDAO.sol | 20 ++ .../stakedao/StakeDAORecursiveCollateral.sol | 59 ++++ .../compoundv3/CometTestSuite.test.ts | 7 +- .../curve/collateralTests.ts | 11 +- .../individual-collateral/curve/constants.ts | 19 +- ...xAppreciatingRTokenSelfReferential.test.ts | 9 +- .../curve/cvx/helpers.ts | 13 +- .../StakeDAORecursiveCollateral.test.ts | 311 ++++++++++++++++++ .../curve/stakedao/helpers.ts | 82 +++++ 11 files changed, 703 insertions(+), 25 deletions(-) create mode 100644 contracts/plugins/assets/curve/CurveRecursiveCollateral.sol create mode 100644 contracts/plugins/assets/curve/stakedao/IStakeDAO.sol create mode 100644 contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol create mode 100644 test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts create mode 100644 test/plugins/individual-collateral/curve/stakedao/helpers.ts diff --git a/common/configuration.ts b/common/configuration.ts index d52398b321..b65e05e3d9 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -57,6 +57,8 @@ export interface ITokens { RSR?: string CRV?: string CVX?: string + SDT?: string + USDCPLUS?: string ETHPLUS?: string ankrETH?: string frxETH?: string @@ -202,6 +204,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { RSR: '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', CRV: '0xD533a949740bb3306d119CC777fa900bA034cd52', CVX: '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B', + SDT: '0x73968b9a57c6E53d41345FD57a6E6ae27d6CDB2F', + USDCPLUS: '0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b', ETHPLUS: '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8', ankrETH: '0xE95A203B1a91a908F9B9CE46459d101078c2c3cb', frxETH: '0x5E8422345238F34275888049021821E8E08CAa1f', diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol new file mode 100644 index 0000000000..d07190c57a --- /dev/null +++ b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol @@ -0,0 +1,193 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/utils/math/Math.sol"; +import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import "../../../interfaces/IRToken.sol"; +import "../../../libraries/Fixed.sol"; +import "../curve/CurveStableCollateral.sol"; +import "../OracleLib.sol"; + +/** + * @title CurveRecursiveCollateral + * @notice Collateral plugin for a CurveLP token for a pool between a + * a USD reference token and a USD RToken. + * + * Note: + * - The RToken _must_ be the same RToken using this plugin as collateral! + * - The RToken SHOULD have an RSR overcollateralization layer. DO NOT USE WITHOUT RSR! + * - The LP token should be worth ~2x the reference token. Do not use with 1x lpTokens. + * + * tok = ConvexStakingWrapper or CurveGaugeWrapper + * ref = coins(0) in the pool + * tar = USD + * UoA = USD + */ +contract CurveRecursiveCollateral is CurveStableCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + IRToken internal immutable rToken; // token1 + + /// @param config.erc20 must be of type ConvexStakingWrapper or CurveGaugeWrapper + /// @param config.chainlinkFeed Feed units: {UoA/ref} + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveStableCollateral(config, revenueHiding, ptConfig) { + rToken = IRToken(address(token1)); + + // {ref/tok} LP token's virtual price + exposedReferencePrice = _safeWrap(curvePool.get_virtual_price()).mul(revenueShowing); + } + + /// Can revert, used by other contract functions in order to catch errors + /// Should not return FIX_MAX for low + /// Should only return FIX_MAX for high if low is 0 + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return {target/ref} Unused. Always 0 + function tryPrice() + external + view + virtual + override + returns ( + uint192 low, + uint192 high, + uint192 + ) + { + // This pricing method is MEV-resistant, but only gives a lower-bound + // for the value of the LP token collateral. It could be that the pool is + // very imbalanced, in which case the LP token could be worth more than this + // method says it is. + + // Get reference token price + (uint192 refLow, uint192 refHigh) = this.tokenPrice(0); // reference token + + // Multiply by the underlyingRefPerTok() + uint192 rate = underlyingRefPerTok(); + low = refLow.mul(rate, FLOOR); + high = refHigh.mul(rate, CEIL); + + assert(low <= high); // not obviously true by inspection + return (low, high, 0); + } + + /// Should not revert + /// Refresh exchange rates and update default status. + /// Have to override to add custom default checks + function refresh() public virtual override { + CollateralStatus oldStatus = status(); + + try this.underlyingRefPerTok() returns (uint192) { + // Instead of ensuring the underlyingRefPerTok is up-only, solely check + // that the pool's virtual price is up-only. Otherwise this collateral + // would create default cascades. + + // {ref/tok} + uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); + + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = virtualPrice.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (virtualPrice < exposedReferencePrice) { + exposedReferencePrice = virtualPrice; + markStatus(CollateralStatus.DISABLED); + } else if (hiddenReferencePrice > exposedReferencePrice) { + exposedReferencePrice = hiddenReferencePrice; + } + + // Check for soft default + save prices + try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + // {UoA/tok}, {UoA/tok}, {UoA/tok} + // (0, 0) is a valid price; (0, FIX_MAX) is unpriced + + // Save prices if priced + if (high < FIX_MAX) { + savedLowPrice = low; + savedHighPrice = high; + lastSave = uint48(block.timestamp); + } else { + // must be unpriced + // untested: + // validated in other plugins, cost to test here is high + assert(low == 0); + } + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + markStatus(CollateralStatus.IFFY); + } else { + markStatus(CollateralStatus.SOUND); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.IFFY); + } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + markStatus(CollateralStatus.DISABLED); + } + + CollateralStatus newStatus = status(); + if (oldStatus != newStatus) { + emit CollateralStatusChanged(oldStatus, newStatus); + } + } + + /// @dev Not up-only! The RToken can devalue its exchange rate peg + /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens + function underlyingRefPerTok() public view virtual override returns (uint192) { + // {ref/tok} = quantity of the reference unit token in the pool per vault token + // the vault is 1:1 with the LP token + + // {lpToken@t=0/lpToken} + uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); + // this is missing the fact that USDC+ has also appreciated in this time + + // {BU/rTok} + uint192 rTokenRate = divuu(rToken.basketsNeeded(), rToken.totalSupply()); + // not worth the gas to protect against div-by-zero + + // The rTokenRate is not up-only! We should expect decreases when other + // collateral default and there is not enough RSR stake to cover the hole. + + // {ref/tok} = {ref/lpToken} = {lpToken@t=0/lpToken} * {1} * 2{ref/lpToken@t=0} + return virtualPrice.mul(rTokenRate.sqrt()).mulu(2); // LP token worth twice as much + } + + // === Internal === + + // Override this later to implement non-standard recursive pools + function _anyDepeggedInPool() internal view virtual override returns (bool) { + // Assumption: token0 is the reference token; token1 is the RToken + + // Check reference token + try this.tokenPrice(0) returns (uint192 low, uint192 high) { + // {UoA/tok} = {UoA/tok} + {UoA/tok} + uint192 mid = (low + high) / 2; + + // If the price is below the default-threshold price, default eventually + // uint192(+/-) is the same as Fix.plus/minus + if (mid < pegBottom || mid > pegTop) return true; + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + // untested: + // pattern validated in other plugins, cost to test is high + if (errData.length == 0) revert(); // solhint-disable-line reason-string + return true; + } + + // Ignore the status of the RToken to prevent circularity + + return false; + } +} diff --git a/contracts/plugins/assets/curve/stakedao/IStakeDAO.sol b/contracts/plugins/assets/curve/stakedao/IStakeDAO.sol new file mode 100644 index 0000000000..b53ed0dcd4 --- /dev/null +++ b/contracts/plugins/assets/curve/stakedao/IStakeDAO.sol @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; + +interface IStakeDAOGauge is IERC20Metadata { + function deposit(uint256 amount) external; + + function claimer() external view returns (IStakeDAOClaimer); + + // solhint-disable-next-line func-name-mixedcase + function reward_count() external view returns (uint256); + + // solhint-disable-next-line func-name-mixedcase + function reward_tokens(uint256 index) external view returns (IERC20Metadata); +} + +interface IStakeDAOClaimer { + function claimRewards(address[] memory gauges, bool claimVeSDT) external; +} diff --git a/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol new file mode 100644 index 0000000000..69bc291bbc --- /dev/null +++ b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../CurveRecursiveCollateral.sol"; +import "./IStakeDAO.sol"; + +/** + * @title StakeDAORecursiveCollateral + * @notice Collateral plugin for a StakeDAO sdUSDC+LP-f-gauge corresponding + * to a Curve pool with a reference token and an RToken. The RToken must + * be strictly up-only with respect to the reference token. + * + * tok = sdUSDC+LP-f-gauge + * ref = USDC + * tar = USD + * UoA = USD + */ +contract StakeDAORecursiveCollateral is CurveRecursiveCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + IStakeDAOGauge internal immutable gauge; // typed erc20 variable + IStakeDAOClaimer internal immutable claimer; + + /// @param config.erc20 must be of type IStakeDAOGauge + /// @param config.chainlinkFeed Feed units: {UoA/ref} + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveRecursiveCollateral(config, revenueHiding, ptConfig) { + gauge = IStakeDAOGauge(address(config.erc20)); + claimer = gauge.claimer(); + } + + /// @custom:delegate-call + function claimRewards() external override { + uint256 count = gauge.reward_count(); + + // Save initial bals + IERC20Metadata[] memory rewardTokens = new IERC20Metadata[](count); + uint256[] memory bals = new uint256[](count); + for (uint256 i = 0; i < count; i++) { + rewardTokens[i] = gauge.reward_tokens(i); + bals[i] = rewardTokens[i].balanceOf(address(this)); + } + + // Do actual claim + address[] memory gauges = new address[](1); + gauges[0] = address(gauge); + claimer.claimRewards(gauges, false); + + // Emit balance changes + for (uint256 i = 0; i < rewardTokens.length; i++) { + IERC20Metadata rewardToken = rewardTokens[i]; + emit RewardsClaimed(rewardToken, rewardToken.balanceOf(address(this)) - bals[i]); + } + } +} diff --git a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts index 008c69d1c3..78c334c90c 100644 --- a/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts +++ b/test/plugins/individual-collateral/compoundv3/CometTestSuite.test.ts @@ -27,12 +27,7 @@ import { bn, fp } from '../../../../common/numbers' import { MAX_UINT48 } from '../../../../common/constants' import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { - advanceBlocks, - advanceTime, - getLatestBlockTimestamp, - setNextBlockTimestamp, -} from '../../../utils/time' +import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from '../../../utils/time' import { forkNetwork, ORACLE_ERROR, diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 25e8a39c40..572fef573c 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -88,10 +88,11 @@ export default function fn( describeFork(`Collateral: ${collateralName}`, () => { let defaultOpts: CurveCollateralOpts let mockERC20: ERC20Mock + let collateral: TestICollateral before(async () => { await resetFork() - ;[, defaultOpts] = await deployCollateral({}) + ;[collateral, defaultOpts] = await deployCollateral({}) const ERC20Factory = await ethers.getContractFactory('ERC20Mock') mockERC20 = await ERC20Factory.deploy('Mock ERC20', 'ERC20') }) @@ -147,7 +148,7 @@ export default function fn( await expect( deployCollateral({ - erc20: mockERC20.address, // can be anything. + erc20: await collateral.erc20(), feeds, oracleTimeouts, oracleErrors, @@ -343,11 +344,11 @@ export default function fn( await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) const before = await Promise.all( - ctx.rewardTokens.map((t) => t.balanceOf(ctx.wrapper.address)) + ctx.rewardTokens.map((t) => t.balanceOf(ctx.collateral.address)) ) - await expect(ctx.wrapper.claimRewards()).to.emit(ctx.wrapper, 'RewardsClaimed') + await expect(ctx.collateral.claimRewards()).to.emit(ctx.collateral, 'RewardsClaimed') const after = await Promise.all( - ctx.rewardTokens.map((t) => t.balanceOf(ctx.wrapper.address)) + ctx.rewardTokens.map((t) => t.balanceOf(ctx.collateral.address)) ) // Each reward token should have grew diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index cf99ac72e6..5656cde62f 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -73,8 +73,19 @@ export const pyUSD = networkConfig['1'].tokens.pyUSD! export const RSR = networkConfig['1'].tokens.RSR! export const CRV = networkConfig['1'].tokens.CRV! export const CVX = networkConfig['1'].tokens.CVX! +export const SDT = networkConfig['1'].tokens.SDT! +// ETH+ export const ETHPLUS = networkConfig['1'].tokens.ETHPLUS! +export const ETHPLUS_ASSET_REGISTRY = '0xf526f058858E4cD060cFDD775077999562b31bE0' +export const ETHPLUS_BASKET_HANDLER = '0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194' +export const ETHPLUS_TIMELOCK = '0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B' + +// USDC+ +export const USDCPLUS = networkConfig['1'].tokens.USDCPLUS! +export const USDCPLUS_ASSET_REGISTRY = '0xbCd2719E4862d1Eb32A36e8C956D3118ebB2f511' +export const USDCPLUS_BASKET_HANDLER = '0x162587b5B4c01d26AfaFD4A1ccA61CdC632c9508' +export const USDCPLUS_TIMELOCK = '0x6C957417cB6DF6e821eec8555DEE8b116C291999' // 3pool - USDC, USDT, DAI export const THREE_POOL = '0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7' @@ -113,7 +124,13 @@ export const ETHPLUS_BP_POOL = '0x7fb53345f1b21ab5d9510adb38f7d3590be6364b' export const ETHPLUS_BP_TOKEN = '0xe8a5677171c87fcb65b76957f2852515b404c7b1' export const ETHPLUS_BP_POOL_ID = 185 export const ETHPLUS_ETH_HOLDER = '0x298bf7b80a6343214634aF16EB41Bb5B9fC6A1F1' -export const ETHPLUS_GAUGE = '0x298bf7b80a6343214634af16eb41bb5b9fc6a1f1' + +// USDC+ + USDC +export const USDCPLUS_USDC_GAUGE = '0x9bbF31E99F30c38a5003952206C31EEa77540BeF' +export const USDCPLUS_USDC_GAUGE_HOLDER = '0xC6625129C9df3314a4dd604845488f4bA62F9dB8' +export const USDCPLUS_USDC_POOL = '0xf2b25362a03f6eacca8de8d5350a9f37944c1e59' +export const USDCPLUS_USDC_TOKEN = '0xfed2B54453F75634bcdaEA5e5b11a3f99b9C28Fa' +export const USDCPLUS_USDC_POOL_ID = 238 // MIM + 3pool export const MIM_THREE_POOL = '0x5a6A4D54456819380173272A5E8E9B9904BdF41B' diff --git a/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts index 0aa2d6883d..fd4df26b5b 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts @@ -40,15 +40,14 @@ import { CurvePoolType, CRV, ETHPLUS, + ETHPLUS_ASSET_REGISTRY, + ETHPLUS_BASKET_HANDLER, + ETHPLUS_TIMELOCK, } from '../constants' import { whileImpersonating } from '../../../../utils/impersonation' type Fixture = () => Promise -const ETHPLUS_ASSET_REGISTRY = '0xf526f058858E4cD060cFDD775077999562b31bE0' -const ETHPLUS_BASKET_HANDLER = '0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194' -const ETHPLUS_TIMELOCK = '0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B' - export const defaultCvxAppreciatingCollateralOpts: CurveCollateralOpts = { erc20: ZERO_ADDRESS, targetName: ethers.utils.formatBytes32String('ETH'), @@ -63,7 +62,7 @@ export const defaultCvxAppreciatingCollateralOpts: CurveCollateralOpts = { nTokens: 2, curvePool: ETHPLUS_BP_POOL, lpToken: ETHPLUS_BP_TOKEN, - poolType: CurvePoolType.Plain, // for fraxBP, not the top-level pool + poolType: CurvePoolType.Plain, feeds: [[ONE_ADDRESS], [WETH_USD_FEED]], oracleTimeouts: [[bn('1')], [WETH_ORACLE_TIMEOUT]], oracleErrors: [[bn('1')], [WETH_ORACLE_ERROR]], diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index 6ed06a37fa..f137faa3b9 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -40,6 +40,8 @@ import { ETHPLUS, ETHPLUS_BP_POOL, ETHPLUS_BP_POOL_ID, + ETHPLUS_ASSET_REGISTRY, + ETHPLUS_TIMELOCK, } from '../constants' import { CurveBase } from '../pluginTestTypes' @@ -371,11 +373,8 @@ export const makeWETHPlusETH = async ( fp('1e6'), bn('1e1') ) - const ethplusAssetRegistry = await ethers.getContractAt( - 'IAssetRegistry', - '0xf526f058858E4cD060cFDD775077999562b31bE0' - ) - await whileImpersonating('0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B', async (signer) => { + const ethplusAssetRegistry = await ethers.getContractAt('IAssetRegistry', ETHPLUS_ASSET_REGISTRY) + await whileImpersonating(ETHPLUS_TIMELOCK, async (signer) => { await ethplusAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) }) @@ -383,7 +382,7 @@ export const makeWETHPlusETH = async ( const ethplus = await ethers.getContractAt('ERC20Mock', ETHPLUS) const weth = await ethers.getContractAt('ERC20Mock', WETH) - // Get real fraxBP pool + // Get real ETH+ pool const realCurvePool = await ethers.getContractAt('ICurvePool', ETHPLUS_BP_POOL) // Use mock curvePool seeded with initial balances @@ -398,8 +397,6 @@ export const makeWETHPlusETH = async ( const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') const wPool = await wrapperFactory.deploy() await wPool.initialize(ETHPLUS_BP_POOL_ID) - - // Ensure ETH+ isReady() return { ethplus, weth, curvePool, wPool } } diff --git a/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts b/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts new file mode 100644 index 0000000000..fdac1eca04 --- /dev/null +++ b/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts @@ -0,0 +1,311 @@ +import collateralTests from '../collateralTests' +import forkBlockNumber from '#/test/integration/fork-block-numbers' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { CollateralStatus } from '../../pluginTestTypes' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, +} from '../pluginTestTypes' +import { ORACLE_TIMEOUT_BUFFER } from '../../fixtures' +import { makeUSDCUSDCPlus, mintUSDCUSDCPlus } from './helpers' +import { expectEvents } from '#/common/events' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { expectExactPrice } from '../../../../utils/oracles' +import { getResetFork } from '../../helpers' +import { CurveBase } from '../pluginTestTypes' +import { + advanceBlocks, + advanceTime, + advanceToTimestamp, + getLatestBlockTimestamp, +} from '#/test/utils/time' +import { + ConvexStakingWrapper, + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../../typechain' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS, ONE_ADDRESS, MAX_UINT192 } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + USDCPLUS_USDC_POOL, + USDCPLUS_USDC_TOKEN, + USDCPLUS_ASSET_REGISTRY, + USDCPLUS_TIMELOCK, + CVX, + USDC_USD_FEED, + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + RTOKEN_DELAY_UNTIL_DEFAULT, + CurvePoolType, + CRV, + SDT, + USDCPLUS, +} from '../constants' +import { whileImpersonating } from '../../../../utils/impersonation' + +type Fixture = () => Promise + +export const defaultCvxRecursiveCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: USDCPLUS_USDC_POOL, + lpToken: USDCPLUS_USDC_TOKEN, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [ONE_ADDRESS]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [bn('1')]], + oracleErrors: [[USDC_ORACLE_ERROR], [bn('1')]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute both feeds: USDC, USDC+ + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const usdcplusFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const fix = await makeUSDCUSDCPlus(usdcplusFeed) + + opts.feeds = [[usdcFeed.address], [usdcplusFeed.address]] + opts.erc20 = fix.gauge.address + } + + opts = { ...defaultCvxRecursiveCollateralOpts, ...opts } + + const StakeDAORecursiveCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'StakeDAORecursiveCollateral' + ) + + const collateral = await StakeDAORecursiveCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral as unknown as TestICollateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxRecursiveCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute both feeds: USDC, USDC+ + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const usdcplusFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const fix = await makeUSDCUSDCPlus(usdcplusFeed) + + collateralOpts.feeds = [[usdcFeed.address], [usdcplusFeed.address]] + collateralOpts.erc20 = fix.gauge.address + collateralOpts.curvePool = fix.curvePool.address + + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const sdt = await ethers.getContractAt('ERC20Mock', SDT) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + + return { + alice, + collateral, + curvePool: fix.curvePool, + wrapper: fix.gauge as unknown as ConvexStakingWrapper, // cast to make work with curve tests + rewardTokens: [sdt, cvx, crv], + chainlinkFeed: usdcFeed, + poolTokens: [fix.usdc, fix.usdcplus], + feeds: [usdcFeed, usdcplusFeed], + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintUSDCUSDCPlus(ctx, amount, user, recipient) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => { + it('Does not depend on USDC+ RTokenAsset.price()', async () => { + const [collateral, opts] = await deployCollateral({}) + const initialPrice = await collateral.price() + expect(initialPrice[0]).to.be.gt(0) + expect(initialPrice[1]).to.be.lt(MAX_UINT192) + + // Swap out USDCPLUS's RTokenAsset with a mock one, which should be IGNORED + const AssetMockFactory = await ethers.getContractFactory('AssetMock') + const mockRTokenAsset = await AssetMockFactory.deploy( + bn('1'), // unused + ONE_ADDRESS, // unused + bn('1'), // unused + USDCPLUS, + bn('1'), // unused + bn('1') // unused + ) + const usdcplusAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + USDCPLUS_ASSET_REGISTRY + ) + const usdcFeed = await ethers.getContractAt('MockV3Aggregator', opts.feeds![0][0]) + const initialAnswer = await usdcFeed.latestAnswer() + await whileImpersonating(USDCPLUS_TIMELOCK, async (signer) => { + await usdcplusAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Set RTokenAsset to unpriced, which should end up being IGNORED + await mockRTokenAsset.setPrice(0, MAX_UINT192) + + // Should be SOUND still + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(collateral.address, initialPrice) + + // SOUND after decay period + await advanceTime((await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER) + await usdcFeed.updateAnswer(initialAnswer) + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(collateral.address, initialPrice) + + // SOUND after full price timeout + await advanceTime(await collateral.priceTimeout()) + await usdcFeed.updateAnswer(initialAnswer) + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + await expectExactPrice(collateral.address, initialPrice) + }) + + it('Claims rewards', async () => { + // Reward claiming is tested here instead of in the generic suite due to not all 3 + // reward tokens being claimed for positive token balances + + const [collateral] = await deployCollateral() + const [alice] = await ethers.getSigners() + const amt = bn('200').mul(bn(10).pow(await collateral.erc20Decimals())) + + // Transfer some gauge token to the collateral plugin + await mintUSDCUSDCPlus({} as CurveBase, amt, alice, collateral.address) + + await advanceBlocks(1000) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) + + const rewardTokens = [ + // StakeDAO is waiting to start SDT/CVX rewards as of the time of this plugin development + // await ethers.getContractAt('ERC20Mock', SDT), + // await ethers.getContractAt('ERC20Mock', CVX), + await ethers.getContractAt('ERC20Mock', CRV), + ] + + // Expect 3 RewardsClaimed events to be emitted: [SDT, CVX, CRV] + const before = await Promise.all(rewardTokens.map((t) => t.balanceOf(collateral.address))) + await expectEvents(collateral.claimRewards(), [ + { + contract: collateral, + name: 'RewardsClaimed', + args: [SDT, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [CRV, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [CVX, anyValue], + emitted: true, + }, + ]) + + // All 3 reward token balances should grow + const after = await Promise.all(rewardTokens.map((t) => t.balanceOf(collateral.address))) + for (let i = 0; i < rewardTokens.length; i++) { + expect(after[i]).gt(before[i]) + } + }) +} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itClaimsRewards: it.skip, // in this file + isMetapool: false, + resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), + collateralName: 'StakeDAORecursiveCollateral - StakeDAOGauge', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/curve/stakedao/helpers.ts b/test/plugins/individual-collateral/curve/stakedao/helpers.ts new file mode 100644 index 0000000000..12405cd213 --- /dev/null +++ b/test/plugins/individual-collateral/curve/stakedao/helpers.ts @@ -0,0 +1,82 @@ +import { ethers } from 'hardhat' +import { BigNumberish } from 'ethers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { whileImpersonating } from '../../../../utils/impersonation' +import { bn, fp } from '../../../../../common/numbers' +import { + CurvePoolMock, + ERC20Mock, + IStakeDAOGauge, + MockV3Aggregator, +} from '../../../../../typechain' +import { + USDC, + USDCPLUS, + USDCPLUS_USDC_POOL, + USDCPLUS_ASSET_REGISTRY, + USDCPLUS_TIMELOCK, + USDCPLUS_USDC_GAUGE, + USDCPLUS_USDC_GAUGE_HOLDER, +} from '../constants' +import { CurveBase } from '../pluginTestTypes' + +// ===== USDC/USDC+ + +export interface WrappedUSDCUSDCPlusFixture { + usdcplus: ERC20Mock + usdc: ERC20Mock + curvePool: CurvePoolMock + gauge: IStakeDAOGauge +} + +export const makeUSDCUSDCPlus = async ( + usdcplusFeed: MockV3Aggregator +): Promise => { + // Make a fake RTokenAsset and register it with USDC+'s assetRegistry + const AssetFactory = await ethers.getContractFactory('Asset') + const mockRTokenAsset = await AssetFactory.deploy( + bn('604800'), + usdcplusFeed.address, + fp('0.01'), + USDCPLUS, + fp('1e6'), + bn('1e1') + ) + const usdcplusAssetRegistry = await ethers.getContractAt( + 'IAssetRegistry', + USDCPLUS_ASSET_REGISTRY + ) + await whileImpersonating(USDCPLUS_TIMELOCK, async (signer) => { + await usdcplusAssetRegistry.connect(signer).swapRegistered(mockRTokenAsset.address) + }) + + // Use real reference ERC20s + const usdc = await ethers.getContractAt('ERC20Mock', USDC) + const usdcplus = await ethers.getContractAt('ERC20Mock', USDCPLUS) + + // Get real USDC+ pool + const realCurvePool = await ethers.getContractAt('ICurvePool', USDCPLUS_USDC_POOL) + + // Use mock curvePool seeded with initial balances + const CurveMockFactory = await ethers.getContractFactory('CurvePoolMock') + const curvePool = await CurveMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + const gauge = await ethers.getContractAt('IStakeDAOGauge', USDCPLUS_USDC_GAUGE) + return { usdcplus, usdc, curvePool, gauge } +} + +export const mintUSDCUSDCPlus = async ( + ctx: CurveBase, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + const gauge = await ethers.getContractAt('IStakeDAOGauge', USDCPLUS_USDC_GAUGE) + await whileImpersonating(USDCPLUS_USDC_GAUGE_HOLDER, async (signer) => { + await gauge.connect(signer).transfer(recipient, amount) + }) +} From 71c24904d63655bede5b37c2cf180eeea4fbd4d5 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 27 Apr 2024 03:39:13 +0530 Subject: [PATCH 361/450] Starting of new release --- contracts/mixins/Versioned.sol | 2 +- test/fixtures.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contracts/mixins/Versioned.sol b/contracts/mixins/Versioned.sol index fa2787a203..3c0038087e 100644 --- a/contracts/mixins/Versioned.sol +++ b/contracts/mixins/Versioned.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant VERSION = "3.4.0"; +string constant VERSION = "4.0.0"; /** * @title Versioned diff --git a/test/fixtures.ts b/test/fixtures.ts index 1af9aa578d..7ee2b6f41f 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -94,7 +94,7 @@ export const ORACLE_ERROR = fp('0.01') // 1% oracle error export const REVENUE_HIDING = fp('0') // no revenue hiding by default; test individually // This will have to be updated on each release -export const VERSION = '3.4.0' +export const VERSION = '4.0.0' export type Collateral = | FiatCollateral From 1eb54416d4680074b4f955712ef1235abccf8a35 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 29 Apr 2024 15:45:40 -0400 Subject: [PATCH 362/450] StakeDAO USDC/USDC+ plugin scripts (#1122) Co-authored-by: Akshat Mittal --- common/configuration.ts | 4 +- scripts/deploy.ts | 1 + .../deploy_stakedao_usdc_usdcplus.ts | 105 ++++++++++++++++++ .../verify_stakedao_usdc_usdcplus.ts | 80 +++++++++++++ scripts/verify_etherscan.ts | 1 + .../individual-collateral/curve/constants.ts | 12 +- .../StakeDAORecursiveCollateral.test.ts | 8 +- .../curve/stakedao/helpers.ts | 14 +-- 8 files changed, 207 insertions(+), 18 deletions(-) create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_stakedao_usdc_usdcplus.ts create mode 100644 scripts/verification/collateral-plugins/verify_stakedao_usdc_usdcplus.ts diff --git a/common/configuration.ts b/common/configuration.ts index b65e05e3d9..e91482385a 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -127,11 +127,12 @@ export interface IPools { crveUSDFRAXBP?: string crvTriCrypto?: string crvMIM3Pool?: string + sdUSDCUSDCPlus?: string } interface INetworkConfig { name: string - tokens: ITokens + tokens: ITokens & IPools chainlinkFeeds: ITokens & ICurrencies & IFeeds AAVE_LENDING_POOL?: string AAVE_INCENTIVES?: string @@ -235,6 +236,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { steakPYUSD: '0xbEEF02e5E13584ab96848af90261f0C8Ee04722a', bbUSDT: '0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1', Re7WETH: '0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0', + sdUSDCUSDCPlus: '0x9bbF31E99F30c38a5003952206C31EEa77540BeF', }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', diff --git a/scripts/deploy.ts b/scripts/deploy.ts index c7ef59ead8..5436487545 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -65,6 +65,7 @@ async function main() { 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_ethplus_eth.ts', + 'phase2-assets/collaterals/deploy_stakedao_usdc_usdcplus.ts', 'phase2-assets/collaterals/deploy_curve_stable_plugin.ts', 'phase2-assets/collaterals/deploy_curve_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_curve_stable_metapool_plugin.ts', diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stakedao_usdc_usdcplus.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stakedao_usdc_usdcplus.ts new file mode 100644 index 0000000000..5ad2551f6d --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stakedao_usdc_usdcplus.ts @@ -0,0 +1,105 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { networkConfig } from '../../../../common/configuration' +import { expect } from 'chai' +import { ONE_ADDRESS, CollateralStatus } from '../../../../common/constants' +import { bn, fp } from '../../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { StakeDAORecursiveCollateral } from '../../../../typechain' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + USDC_USDCPLUS_GAUGE, + USDC_USDCPLUS_POOL, + USDC_USDCPLUS_LP_TOKEN, + USDC_USD_FEED, + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + MAX_TRADE_VOL, + PRICE_TIMEOUT, +} from '../../../../test/plugins/individual-collateral/curve/constants' + +// This file specifically deploys StakeDAORecursiveCollateral Plugin for USDC/USDC+ + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying StakeDAORecursiveCollateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy StakeDAO Recursive RToken Collateral for USDC/USDC+ **************************/ + + const CollateralFactory = await hre.ethers.getContractFactory('StakeDAORecursiveCollateral') + + const collateral = await CollateralFactory.connect(deployer).deploy( + { + erc20: USDC_USDCPLUS_GAUGE, + targetName: hre.ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, + oracleError: bn('1'), + oracleTimeout: bn('1'), + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD.add(USDC_ORACLE_ERROR), + delayUntilDefault: DELAY_UNTIL_DEFAULT, // 72h + }, + fp('1e-4'), // backtest to confirm: 0.01% since pool virtual price will probably decrease + { + nTokens: 2, + curvePool: USDC_USDCPLUS_POOL, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [ONE_ADDRESS]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [bn('1')]], + oracleErrors: [[USDC_ORACLE_ERROR], [bn('1')]], + lpToken: USDC_USDCPLUS_LP_TOKEN, + } + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + `Deployed StakeDAO Recursive Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + + assetCollDeployments.collateral.sdUSDCUSDCPlus = collateral.address + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_stakedao_usdc_usdcplus.ts b/scripts/verification/collateral-plugins/verify_stakedao_usdc_usdcplus.ts new file mode 100644 index 0000000000..084df746a2 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_stakedao_usdc_usdcplus.ts @@ -0,0 +1,80 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { ONE_ADDRESS } from '../../../common/constants' +import { bn, fp } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + USDC_USDCPLUS_POOL, + USDC_USDCPLUS_LP_TOKEN, + USDC_ORACLE_ERROR, + USDC_ORACLE_TIMEOUT, + USDC_USD_FEED, + MAX_TRADE_VOL, + PRICE_TIMEOUT, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const collateral = await ethers.getContractAt( + 'StakeDAORecursiveCollateral', + deployments.collateral.sdUSDCUSDCPlus! + ) + + /******** Verify USDC/USDC+ plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.sdUSDCUSDCPlus, + [ + { + erc20: await collateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, + oracleError: bn('1'), + oracleTimeout: bn('1'), + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD.add(USDC_ORACLE_ERROR), // 2% + + delayUntilDefault: DELAY_UNTIL_DEFAULT, // 72h + }, + fp('1e-4'), // backtest to confirm: 0.01% since pool virtual price will probably decrease + { + nTokens: 2, + curvePool: USDC_USDCPLUS_POOL, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [ONE_ADDRESS]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [bn('1')]], + oracleErrors: [[USDC_ORACLE_ERROR], [bn('1')]], + lpToken: USDC_USDCPLUS_LP_TOKEN, + }, + ], + 'contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol:StakeDAORecursiveCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 550498eaff..7d0bb839ca 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -63,6 +63,7 @@ async function main() { 'collateral-plugins/verify_curve_stable.ts', 'collateral-plugins/verify_curve_stable_metapool.ts', 'collateral-plugins/verify_curve_stable_rtoken_metapool.ts', + 'collateral-plugins/verify_stakedao_usdc_usdcplus.ts', 'collateral-plugins/verify_cusdcv3.ts', 'collateral-plugins/verify_reth.ts', 'collateral-plugins/verify_wsteth.ts', diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index 5656cde62f..27039b9f5e 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -125,12 +125,12 @@ export const ETHPLUS_BP_TOKEN = '0xe8a5677171c87fcb65b76957f2852515b404c7b1' export const ETHPLUS_BP_POOL_ID = 185 export const ETHPLUS_ETH_HOLDER = '0x298bf7b80a6343214634aF16EB41Bb5B9fC6A1F1' -// USDC+ + USDC -export const USDCPLUS_USDC_GAUGE = '0x9bbF31E99F30c38a5003952206C31EEa77540BeF' -export const USDCPLUS_USDC_GAUGE_HOLDER = '0xC6625129C9df3314a4dd604845488f4bA62F9dB8' -export const USDCPLUS_USDC_POOL = '0xf2b25362a03f6eacca8de8d5350a9f37944c1e59' -export const USDCPLUS_USDC_TOKEN = '0xfed2B54453F75634bcdaEA5e5b11a3f99b9C28Fa' -export const USDCPLUS_USDC_POOL_ID = 238 +// USDC + USDC+ +export const USDC_USDCPLUS_GAUGE = networkConfig['1'].tokens.sdUSDCUSDCPlus! +export const USDC_USDCPLUS_GAUGE_HOLDER = '0xC6625129C9df3314a4dd604845488f4bA62F9dB8' +export const USDC_USDCPLUS_POOL = '0xf2b25362a03f6eacca8de8d5350a9f37944c1e59' +export const USDC_USDCPLUS_LP_TOKEN = '0xfed2B54453F75634bcdaEA5e5b11a3f99b9C28Fa' +export const USDC_USDCPLUS_POOL_ID = 238 // MIM + 3pool export const MIM_THREE_POOL = '0x5a6A4D54456819380173272A5E8E9B9904BdF41B' diff --git a/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts b/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts index fdac1eca04..81c98fab5f 100644 --- a/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts +++ b/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts @@ -34,8 +34,8 @@ import { expect } from 'chai' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { PRICE_TIMEOUT, - USDCPLUS_USDC_POOL, - USDCPLUS_USDC_TOKEN, + USDC_USDCPLUS_POOL, + USDC_USDCPLUS_LP_TOKEN, USDCPLUS_ASSET_REGISTRY, USDCPLUS_TIMELOCK, CVX, @@ -66,8 +66,8 @@ export const defaultCvxRecursiveCollateralOpts: CurveCollateralOpts = { delayUntilDefault: RTOKEN_DELAY_UNTIL_DEFAULT, revenueHiding: bn('0'), nTokens: 2, - curvePool: USDCPLUS_USDC_POOL, - lpToken: USDCPLUS_USDC_TOKEN, + curvePool: USDC_USDCPLUS_POOL, + lpToken: USDC_USDCPLUS_LP_TOKEN, poolType: CurvePoolType.Plain, feeds: [[USDC_USD_FEED], [ONE_ADDRESS]], oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [bn('1')]], diff --git a/test/plugins/individual-collateral/curve/stakedao/helpers.ts b/test/plugins/individual-collateral/curve/stakedao/helpers.ts index 12405cd213..53c13e7269 100644 --- a/test/plugins/individual-collateral/curve/stakedao/helpers.ts +++ b/test/plugins/individual-collateral/curve/stakedao/helpers.ts @@ -12,11 +12,11 @@ import { import { USDC, USDCPLUS, - USDCPLUS_USDC_POOL, + USDC_USDCPLUS_POOL, USDCPLUS_ASSET_REGISTRY, USDCPLUS_TIMELOCK, - USDCPLUS_USDC_GAUGE, - USDCPLUS_USDC_GAUGE_HOLDER, + USDC_USDCPLUS_GAUGE, + USDC_USDCPLUS_GAUGE_HOLDER, } from '../constants' import { CurveBase } from '../pluginTestTypes' @@ -55,7 +55,7 @@ export const makeUSDCUSDCPlus = async ( const usdcplus = await ethers.getContractAt('ERC20Mock', USDCPLUS) // Get real USDC+ pool - const realCurvePool = await ethers.getContractAt('ICurvePool', USDCPLUS_USDC_POOL) + const realCurvePool = await ethers.getContractAt('ICurvePool', USDC_USDCPLUS_POOL) // Use mock curvePool seeded with initial balances const CurveMockFactory = await ethers.getContractFactory('CurvePoolMock') @@ -65,7 +65,7 @@ export const makeUSDCUSDCPlus = async ( ) await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) - const gauge = await ethers.getContractAt('IStakeDAOGauge', USDCPLUS_USDC_GAUGE) + const gauge = await ethers.getContractAt('IStakeDAOGauge', USDC_USDCPLUS_GAUGE) return { usdcplus, usdc, curvePool, gauge } } @@ -75,8 +75,8 @@ export const mintUSDCUSDCPlus = async ( user: SignerWithAddress, recipient: string ) => { - const gauge = await ethers.getContractAt('IStakeDAOGauge', USDCPLUS_USDC_GAUGE) - await whileImpersonating(USDCPLUS_USDC_GAUGE_HOLDER, async (signer) => { + const gauge = await ethers.getContractAt('IStakeDAOGauge', USDC_USDCPLUS_GAUGE) + await whileImpersonating(USDC_USDCPLUS_GAUGE_HOLDER, async (signer) => { await gauge.connect(signer).transfer(recipient, amount) }) } From 17213b7d42169d1a389d2a038f2158db9dbb64d2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 29 Apr 2024 18:38:43 -0400 Subject: [PATCH 363/450] docs/deployment-variables.md --- docs/deployment-variables.md | 77 +++++++++++++++++++----------------- 1 file changed, 41 insertions(+), 36 deletions(-) diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index e9d66182eb..3e73f8e65e 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -5,7 +5,7 @@ The fraction of revenues that should go towards RToken holders vs stakers, as given by the relative values of `dist.rTokenDist` and `dist.rsrDist`. This can be thought of as a single variable between 0 and 100% (during deployment). Default value: 60% to stakers and 40% to RToken holders. -Mainnet reasonable range: 0% to 100% +Reasonable range: 0% to 100% ### `minTradeVolume` @@ -21,8 +21,8 @@ This variable should NOT be interpreted to mean that auction sizes above this va This parameter can be set to zero. -Default value: `1e21` = $1k -Mainnet reasonable range: 1e19 to 1e23 +Default value: `1e21` = $1k on mainnet; `1e20` = $100 on L2s +Reasonable range: 1e19 to 1e23 #### `rTokenMaxTradeVolume` @@ -33,7 +33,7 @@ The maximum sized trade for any trade involving RToken, in terms of the unit of This parameter can be set to zero. Default value: `1e24` = $1M -Mainnet reasonable range: 1e22 to 1e27. +Reasonable range: 1e22 to 1e27. ### `rewardRatio` @@ -41,11 +41,15 @@ Dimension: `{1}` The `rewardRatio` is the fraction of the current reward amount that should be handed out per second. -Default value: `573038343750` = a half life of 14 days. +Default value: `1146076687500` = a half life of 7 days -Reasonable range: 1e10 to 1e13 +Reasonable range: 1e11 to 1e14 -To calculate: `ln(2) / (60*60*24*desired_days_in_half_life)`, and then multiply by 1e18. +To calculate: `ln(2) / (seconds in half life)`, and then multiply by 1e18. + +``` +1 week half-life: ln(2) / (7 * 24 * 60 * 60) * 1e18 = 1146076687500 +``` ### `unstakingDelay` @@ -54,7 +58,7 @@ Dimension: `{seconds}` The unstaking delay is the number of seconds that all RSR unstakings must be delayed in order to account for stakers trying to frontrun defaults. It must be longer than governance cycle, and must be long enough that RSR stakers do not unstake in advance of foreseeable basket change in order to avoid being expensed for slippage. Default value: `1209600` = 2 weeks -Mainnet reasonable range: 1 to 31536000 +Reasonable range: 1 to 31536000 ### `tradingDelay` @@ -62,8 +66,8 @@ Dimension: `{seconds}` The trading delay is how many seconds should pass after the basket has been changed before a trade can be opened. In the long term this can be set to 0 after MEV searchers are firmly integrated, but at the start it may be useful to have a delay before trading in order to avoid worst-case prices. -Default value: `7200` = 2 hours -Mainnet reasonable range: 0 to 604800 +Default value: `0` = 0s +Reasonable range: 0 to 604800 ### `warmupPeriod` @@ -72,7 +76,7 @@ Dimension: `{seconds}` The warmup period is how many seconds should pass after the basket regained the SOUND status before an RToken can be issued and/or a trade can be opened. Default value: `900` = 15 minutes -Mainnet reasonable range: 0 to 604800 +Reasonable range: 0 to 604800 ### `batchAuctionLength` @@ -81,7 +85,7 @@ Dimension: `{seconds}` The auction length is how many seconds long Gnosis EasyAuctions should be. Default value: `900` = 15 minutes -Mainnet reasonable range: 60 to 3600 +Reasonable range: 60 to 3600 ### `dutchAuctionLength` @@ -91,10 +95,8 @@ The dutch auction length is how many seconds long falling-price dutch auctions s In general, the dutchAuctionLength should be a multiple of the blocktime. This is not enforced at a smart-contract level. -Default value: `1800` = 30 minutes -Mainnet reasonable range: 300 to 3600 - -At 30 minutes, a 12-second blocktime chain would have 10.87% price drops during the first 40% of the auction, and 0.055% price drops during the second 60%. +Default value: `1800` = 30 minutes on (12s blocktime) mainnet; `900` = 15 minutes on L2s +Reasonable range: 100 to 3600 ### `backingBuffer` @@ -103,7 +105,7 @@ Dimension: `{1}` The backing buffer is a percentage value that describes how much overcollateralization to hold in the form of RToken. This buffer allows collateral tokens to be converted into RToken, which is a more efficient form of revenue production than trading each individual collateral for the desired RToken, and also adds a small buffer that can prevent RSR from being seized when there are small losses due to slippage during rebalancing. Default value: `1e15` = 0.1% -Mainnet reasonable range: 1e12 to 1e18 +Reasonable range: 1e12 to 1e18 ### `maxTradeSlippage` @@ -111,8 +113,8 @@ Dimension: `{1}` The max trade slippage is a percentage value that describes the maximum deviation from oracle prices that any trade can clear at. Oracle prices have ranges of their own; the maximum trade slippage permits additional price movement beyond the worst-case oracle price. -Default value: `0.01e18` = 1% -Mainnet reasonable range: 1e12 to 1e18 +Default value: `0.01e18` = 1% on mainnet; 0.5% on L2s (with liquidity caveats) +Reasonable range: 1e12 to 1e18 ### `shortFreeze` @@ -121,7 +123,7 @@ Dimension: `{s}` The number of seconds a short freeze lasts. Governance can freeze forever. Default value: `259200` = 3 days -Mainnet reasonable range: 3600 to 2592000 (1 hour to 1 month) +Reasonable range: 3600 to 2592000 (1 hour to 1 month) ### `longFreeze` @@ -130,7 +132,7 @@ Dimension: `{s}` The number of seconds a long freeze lasts. Long freezes can be disabled by removing all addresses from the `LONG_FREEZER` role. A long freezer has 6 charges that can be used. Default value: `604800` = 7 days -Mainnet reasonable range: 86400 to 31536000 (1 day to 1 year) +Reasonable range: 86400 to 31536000 (1 day to 1 year) ### `withdrawalLeak` @@ -140,8 +142,8 @@ The fraction of RSR stake that should be permitted to withdraw without a refresh Setting this number larger allows unstakers to save more on gas at the cost of allowing more RSR to exit improperly prior to a default. -Default value: `5e16` = 5% -Mainnet reasonable range: 0 to 25e16 (0 to 25%) +Default value: `5e16` = 5% on mainnet; 1% on L2s +Reasonable range: 0 to 25e16 (0 to 25%) ### `RToken Supply Throttles` @@ -150,15 +152,17 @@ In order to restrict the system to organic patterns of behavior, we maintain two The recommended starting values (amt-rate normalized to $USD) for these parameters are as follows: |**Parameter**|**Value**| |-------------|---------| -|issuanceThrottle.amtRate|$250k| -|issuanceThrottle.pctRate|5%| -|redemptionThrottle.amtRate|$500k| -|redemptionThrottle.pctRate|7.5%| +|issuanceThrottle.amtRate|$2m| +|issuanceThrottle.pctRate|10%| +|redemptionThrottle.amtRate|$2.5m| +|redemptionThrottle.pctRate|12.5%| Be sure to convert a $ amtRate (units of `{qUSD}`) back into RTokens (units of `{qTok}`). Note the differing units: the `amtRate` variable is in terms of `{qRTok/hour}` while the `pctRate` variable is in terms of `{1/hour}`, i.e a fraction. +**The redemption throttle must be set higher than the issuance throttle.** + #### `issuanceThrottle.amtRate` Dimension: `{qRTok/hour}` @@ -167,8 +171,9 @@ A quantity of RToken that serves as a lower-bound for how much net issuance to a Must be at least 1 whole RToken, or 1e18. Can be as large as 1e48. Set it to 1e48 if you want to effectively disable the issuance throttle altogether. -Default value: `2.5e23` = 250,000 RToken -Mainnet reasonable range: 1e23 to 1e27 +Default value: `2e24` = 2,000,000 RToken. If the RToken is not pegged to USD then this number should be discounted by a factor of the RToken price in USD. For example: an ETH-pegged RToken might use `2e24 / 4000` = 500,000 RToken. + +Reasonable range: 1e22 to 1e27 #### `issuanceThrottle.pctRate` @@ -178,8 +183,8 @@ A fraction of the RToken supply that indicates how much net issuance to allow pe Can be 0 to solely rely on `amtRate`; cannot be above 1e18. -Default value: `5e16` = 5% per hour -Mainnet reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) +Default value: `10e16` = 10% per hour +Reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) #### `redemptionThrottle.amtRate` @@ -189,8 +194,8 @@ A quantity of RToken that serves as a lower-bound for how much net redemption to Must be at least 1 whole RToken, or 1e18. Can be as large as 1e48. Set it to 1e48 if you want to effectively disable the redemption throttle altogether. -Default value: `5e23` = 500,000 RToken -Mainnet reasonable range: 1e23 to 1e27 +Default value: `2.5e24` = 2,500,000 RToken. If the RToken is not pegged to USD then this number should be discounted by a factor of the RToken price in USD. For example: an ETH-pegged RToken might use `2.5e24 / 4000` = 625,000 RToken. +Reasonable range: 1e23 to 1e27 #### `redemptionThrottle.pctRate` @@ -200,12 +205,12 @@ A fraction of the RToken supply that indicates how much net redemption to allow Can be 0 to solely rely on `amtRate`; cannot be above 1e18. -Default value: `7.5e16` = 7.5% per hour -Mainnet reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) +Default value: `12.5e16` = 12.5% per hour +Reasonable range: 1e15 to 1e18 (0.1% per hour to 100% per hour) ### Governance Parameters -Governance is 8 days end-to-end. +Governance is generally 8 days end-to-end. **Default values** From eaff6b3f33b080b1c2e304515a324d7424c1f4ab Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 29 Apr 2024 19:59:17 -0400 Subject: [PATCH 364/450] add claimRewards to MorphoSelfReferentialCollateral --- .../assets/morpho-aave/MorphoFiatCollateral.sol | 2 +- .../MorphoSelfReferentialCollateral.sol | 17 ++++++++++++++--- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 1d8cf4b077..b3429791e7 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -18,7 +18,7 @@ import { shiftl_toFix, FIX_ONE } from "../../../libraries/Fixed.sol"; contract MorphoFiatCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; - IERC20Metadata private immutable morpho; + IERC20Metadata private immutable morpho; // MORPHO token uint256 private immutable oneShare; int8 private immutable refDecimals; diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index d839931ee2..2c61150119 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -1,14 +1,15 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -// solhint-disable-next-line max-line-length +// solhint-disable max-line-length import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; -import { AppreciatingFiatCollateral, CollateralConfig } from "../AppreciatingFiatCollateral.sol"; +import { Asset, AppreciatingFiatCollateral, CollateralConfig, IRewardable } from "../AppreciatingFiatCollateral.sol"; import { MorphoTokenisedDeposit } from "./MorphoTokenisedDeposit.sol"; import { OracleLib } from "../OracleLib.sol"; -// solhint-disable-next-line max-line-length import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import { shiftl_toFix, FIX_ONE, FixLib, CEIL } from "../../../libraries/Fixed.sol"; +// solhint-enable max-line-length + /** * @title MorphoSelfReferentialCollateral * @notice Collateral plugin for a Morpho pool with self referential collateral, like WETH @@ -19,6 +20,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { using FixLib for uint192; MorphoTokenisedDeposit public immutable vault; + IERC20Metadata private immutable morpho; // MORPHO token uint256 private immutable oneShare; int8 private immutable refDecimals; @@ -31,6 +33,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { require(config.defaultThreshold == 0, "default threshold not supported"); require(address(config.erc20) != address(0), "missing erc20"); vault = MorphoTokenisedDeposit(address(config.erc20)); + morpho = IERC20Metadata(address(vault.rewardToken())); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); } @@ -64,4 +67,12 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals); } + + /// Claim rewards earned by holding a balance of the ERC20 token + /// @custom:delegate-call + function claimRewards() external virtual override(Asset, IRewardable) { + uint256 _bal = morpho.balanceOf(address(this)); + IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(morpho, morpho.balanceOf(address(this)) - _bal); + } } From b5d40cbc4c5f9869f18b43e148f30d44861d9ddb Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 30 Apr 2024 13:53:37 -0400 Subject: [PATCH 365/450] 3.4.0 deployment (#1126) --- .openzeppelin/mainnet.json | 3238 +++++++++++++++++ contracts/facade/facets/ActFacet.sol | 3 +- contracts/facade/facets/ReadFacet.sol | 15 +- contracts/interfaces/IActFacet.sol | 73 - contracts/interfaces/IFacade.sol | 7 +- contracts/interfaces/IReadFacet.sol | 147 - contracts/p1/StRSR.sol | 2 +- .../CurveAppreciatingRTokenFiatCollateral.sol | 4 +- .../8453-tmp-assets-collateral.json | 25 +- .../base-3.4.0/8453-tmp-deployments.json | 38 + .../1-tmp-assets-collateral.json | 103 +- .../mainnet-3.4.0/1-tmp-deployments.json | 38 + scripts/deploy.ts | 12 +- scripts/deployment/common.ts | 1 - .../phase1-core/0_setup_deployments.ts | 2 +- .../phase1-core/1_deploy_libraries.ts | 4 +- .../phase1-facade/2_deploy_actFacet.ts | 2 +- .../phase2-assets/assets/deploy_stg.ts | 4 +- .../collaterals/deploy_convex_ethplus_eth.ts | 5 +- .../deploy_convex_rToken_metapool_plugin.ts | 2 - .../deploy_convex_stable_metapool_plugin.ts | 2 - .../collaterals/deploy_curve_stable_plugin.ts | 2 +- .../deploy_stargate_usdc_collateral.ts | 1 + scripts/deployment/utils.ts | 29 +- scripts/verification/6_verify_collateral.ts | 31 +- .../verify_convex_ethplus_eth.ts | 5 +- .../collateral-plugins/verify_morpho.ts | 8 +- .../collateral-plugins/verify_sdai.ts | 4 +- .../collateral-plugins/verify_sfrax.ts | 4 +- .../verify_yearn_v2_curve_usdc.ts | 15 +- scripts/verify_etherscan.ts | 7 +- tasks/deployment/create-deployer-registry.ts | 2 +- tasks/upgrades/validate-upgrade.ts | 14 +- test/Facade.test.ts | 10 +- test/fixtures.ts | 15 + test/integration/fork-block-numbers.ts | 2 +- 36 files changed, 3536 insertions(+), 340 deletions(-) delete mode 100644 contracts/interfaces/IActFacet.sol delete mode 100644 contracts/interfaces/IReadFacet.sol create mode 100644 scripts/addresses/base-3.4.0/8453-tmp-deployments.json create mode 100644 scripts/addresses/mainnet-3.4.0/1-tmp-deployments.json diff --git a/.openzeppelin/mainnet.json b/.openzeppelin/mainnet.json index ed9459b7e3..7e50e1dc38 100644 --- a/.openzeppelin/mainnet.json +++ b/.openzeppelin/mainnet.json @@ -6928,6 +6928,3244 @@ } } } + }, + "7b21ba261eaa32c050f596075a3105499b91bb6fc0858682955d346a59ef20bb": { + "address": "0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7", + "txHash": "0x55ae51af7516c2715f9e54dafff171f7d677e6dab413c46ea76c2b611aa8cb9d", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC165Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/introspection/ERC165Upgradeable.sol:41" + }, + { + "label": "_roles", + "offset": 0, + "slot": "101", + "type": "t_mapping(t_bytes32,t_struct(RoleData)3730_storage)", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:57" + }, + { + "label": "__gap", + "offset": 0, + "slot": "102", + "type": "t_array(t_uint256)49_storage", + "contract": "AccessControlUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/AccessControlUpgradeable.sol:260" + }, + { + "label": "longFreezes", + "offset": 0, + "slot": "151", + "type": "t_mapping(t_address,t_uint256)", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:36" + }, + { + "label": "unfreezeAt", + "offset": 0, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:38" + }, + { + "label": "shortFreeze", + "offset": 6, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:39" + }, + { + "label": "longFreeze", + "offset": 12, + "slot": "152", + "type": "t_uint48", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:40" + }, + { + "label": "tradingPaused", + "offset": 18, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:45", + "renamedFrom": "paused" + }, + { + "label": "issuancePaused", + "offset": 19, + "slot": "152", + "type": "t_bool", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:46" + }, + { + "label": "__gap", + "offset": 0, + "slot": "153", + "type": "t_array(t_uint256)48_storage", + "contract": "Auth", + "src": "contracts/mixins/Auth.sol:225" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)32962", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:33" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "202", + "type": "t_contract(IStRSR)33299", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:41" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "203", + "type": "t_contract(IAssetRegistry)31093", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:49" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "204", + "type": "t_contract(IBasketHandler)31467", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:57" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "205", + "type": "t_contract(IBackingManager)31200", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:65" + }, + { + "label": "distributor", + "offset": 0, + "slot": "206", + "type": "t_contract(IDistributor)31987", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:73" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "207", + "type": "t_contract(IRevenueTrader)33090", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:81" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_contract(IRevenueTrader)33090", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:89" + }, + { + "label": "furnace", + "offset": 0, + "slot": "209", + "type": "t_contract(IFurnace)32300", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:97" + }, + { + "label": "broker", + "offset": 0, + "slot": "210", + "type": "t_contract(IBroker)31622", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:105" + }, + { + "label": "__gap", + "offset": 0, + "slot": "211", + "type": "t_array(t_uint256)40_storage", + "contract": "ComponentRegistry", + "src": "contracts/mixins/ComponentRegistry.sol:118" + }, + { + "label": "__gap", + "offset": 0, + "slot": "251", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "301", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "rsr", + "offset": 0, + "slot": "351", + "type": "t_contract(IERC20)16483", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:19" + }, + { + "label": "__gap", + "offset": 0, + "slot": "352", + "type": "t_array(t_uint256)49_storage", + "contract": "MainP1", + "src": "contracts/p1/Main.sol:70" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)40_storage": { + "label": "uint256[40]", + "numberOfBytes": "1280" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)31093": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)31200": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)31467": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)31622": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)31987": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)16483": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)32300": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IRToken)32962": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)33090": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)33299": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(RoleData)3730_storage)": { + "label": "mapping(bytes32 => struct AccessControlUpgradeable.RoleData)", + "numberOfBytes": "32" + }, + "t_struct(RoleData)3730_storage": { + "label": "struct AccessControlUpgradeable.RoleData", + "members": [ + { + "label": "members", + "type": "t_mapping(t_address,t_bool)", + "offset": 0, + "slot": "0" + }, + { + "label": "adminRole", + "type": "t_bytes32", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "9e6f4198309784cc2a3e363639954bc4a3130f1b175b95d43a9fe332ca0bf7ca": { + "address": "0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463", + "txHash": "0x4ab68d516f640ed8fee76a1fa33e751388d98def56e38380618f8f68c5fc6131", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)32744", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "201", + "type": "t_contract(IBasketHandler)31467", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:19" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)31200", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:20" + }, + { + "label": "_erc20s", + "offset": 0, + "slot": "203", + "type": "t_struct(AddressSet)25226_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:23" + }, + { + "label": "assets", + "offset": 0, + "slot": "205", + "type": "t_mapping(t_contract(IERC20)16483,t_contract(IAsset)30826)", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:26" + }, + { + "label": "lastRefresh", + "offset": 0, + "slot": "206", + "type": "t_uint48", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:30" + }, + { + "label": "__gap", + "offset": 0, + "slot": "207", + "type": "t_array(t_uint256)46_storage", + "contract": "AssetRegistryP1", + "src": "contracts/p1/AssetRegistry.sol:237" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAsset)30826": { + "label": "contract IAsset", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)31200": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)31467": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)16483": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)32744": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)16483,t_contract(IAsset)30826)": { + "label": "mapping(contract IERC20 => contract IAsset)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)25226_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)24911_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Set)24911_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "dccc8209182e300c142d833ea5134cffa74c8c66d5db877c4e0f6dbd41138cd2": { + "address": "0x20C801869e578E71F2298649870765Aa81f7DC69", + "txHash": "0xbdfc558729b1f69ed8077a9f593db9be5b4a6ef0c2e349bdbf3946dd39320fdc", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)32744", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)31622", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:26" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)16483,t_contract(ITrade)33446)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:29" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:33" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:37" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:164" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "301", + "type": "t_contract(IAssetRegistry)31093", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:25" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "302", + "type": "t_contract(IBasketHandler)31467", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:26" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)31987", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:27" + }, + { + "label": "rToken", + "offset": 0, + "slot": "304", + "type": "t_contract(IRToken)32962", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:28" + }, + { + "label": "rsr", + "offset": 0, + "slot": "305", + "type": "t_contract(IERC20)16483", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:29" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "306", + "type": "t_contract(IStRSR)33299", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:30" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "307", + "type": "t_contract(IRevenueTrader)33090", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:31" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "308", + "type": "t_contract(IRevenueTrader)33090", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:32" + }, + { + "label": "tradingDelay", + "offset": 20, + "slot": "308", + "type": "t_uint48", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:36" + }, + { + "label": "backingBuffer", + "offset": 0, + "slot": "309", + "type": "t_uint192", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:37" + }, + { + "label": "furnace", + "offset": 0, + "slot": "310", + "type": "t_contract(IFurnace)32300", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:40" + }, + { + "label": "tradeEnd", + "offset": 0, + "slot": "311", + "type": "t_mapping(t_enum(TradeKind)31495,t_uint48)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:41" + }, + { + "label": "tokensOut", + "offset": 0, + "slot": "312", + "type": "t_mapping(t_contract(IERC20)16483,t_uint192)", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:44" + }, + { + "label": "__gap", + "offset": 0, + "slot": "313", + "type": "t_array(t_uint256)38_storage", + "contract": "BackingManagerP1", + "src": "contracts/p1/BackingManager.sol:344" + } + ], + "types": { + "t_array(t_uint256)38_storage": { + "label": "uint256[38]", + "numberOfBytes": "1216" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)31093": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)31467": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IBroker)31622": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)31987": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)16483": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)32300": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)32744": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)32962": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)33090": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)33299": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_contract(ITrade)33446": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_enum(TradeKind)31495": { + "label": "enum TradeKind", + "members": [ + "DUTCH_AUCTION", + "BATCH_AUCTION" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_contract(IERC20)16483,t_contract(ITrade)33446)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)16483,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_enum(TradeKind)31495,t_uint48)": { + "label": "mapping(enum TradeKind => uint48)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "8b6036debddeb199ea8fa112563fdd30275fcf05f63c69b0dc63a65819654697": { + "address": "0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC", + "txHash": "0x482861a6731e61d438d5525fa01047083c9013c238eea65628185ce356ce9797", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)14381", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "201", + "type": "t_contract(IAssetRegistry)13147", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:35" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "202", + "type": "t_contract(IBackingManager)13254", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:36" + }, + { + "label": "rsr", + "offset": 0, + "slot": "203", + "type": "t_contract(IERC20)6312", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:37" + }, + { + "label": "rToken", + "offset": 0, + "slot": "204", + "type": "t_contract(IRToken)14599", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:38" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "205", + "type": "t_contract(IStRSR)14912", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:39" + }, + { + "label": "config", + "offset": 0, + "slot": "206", + "type": "t_struct(BasketConfig)24356_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:43" + }, + { + "label": "basket", + "offset": 0, + "slot": "210", + "type": "t_struct(Basket)24366_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:47" + }, + { + "label": "nonce", + "offset": 0, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:49" + }, + { + "label": "timestamp", + "offset": 6, + "slot": "212", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:50" + }, + { + "label": "disabled", + "offset": 12, + "slot": "212", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:54" + }, + { + "label": "_targetNames", + "offset": 0, + "slot": "213", + "type": "t_struct(Bytes32Set)9523_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:60" + }, + { + "label": "_newBasket", + "offset": 0, + "slot": "215", + "type": "t_struct(Basket)24366_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:61" + }, + { + "label": "warmupPeriod", + "offset": 0, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:67" + }, + { + "label": "lastStatusTimestamp", + "offset": 6, + "slot": "217", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:71" + }, + { + "label": "lastStatus", + "offset": 12, + "slot": "217", + "type": "t_enum(CollateralStatus)12930", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:72" + }, + { + "label": "basketHistory", + "offset": 0, + "slot": "218", + "type": "t_mapping(t_uint48,t_struct(Basket)24366_storage)", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:78" + }, + { + "label": "_targetAmts", + "offset": 0, + "slot": "219", + "type": "t_struct(Bytes32ToUintMap)9105_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:81" + }, + { + "label": "reweightable", + "offset": 0, + "slot": "222", + "type": "t_bool", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:87" + }, + { + "label": "lastCollateralized", + "offset": 1, + "slot": "222", + "type": "t_uint48", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:89" + }, + { + "label": "__gap", + "offset": 0, + "slot": "223", + "type": "t_array(t_uint256)36_storage", + "contract": "BasketHandlerP1", + "src": "contracts/p1/BasketHandler.sol:728" + } + ], + "types": { + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_contract(IERC20)6312)dyn_storage": { + "label": "contract IERC20[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)36_storage": { + "label": "uint256[36]", + "numberOfBytes": "1152" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)13147": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)13254": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20)6312": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)14381": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)14599": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)14912": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_enum(CollateralStatus)12930": { + "label": "enum CollateralStatus", + "members": [ + "SOUND", + "IFFY", + "DISABLED" + ], + "numberOfBytes": "1" + }, + "t_mapping(t_bytes32,t_bytes32)": { + "label": "mapping(bytes32 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_struct(BackupConfig)24336_storage)": { + "label": "mapping(bytes32 => struct BackupConfig)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)6312,t_bytes32)": { + "label": "mapping(contract IERC20 => bytes32)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20)6312,t_uint192)": { + "label": "mapping(contract IERC20 => uint192)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint48,t_struct(Basket)24366_storage)": { + "label": "mapping(uint48 => struct Basket)", + "numberOfBytes": "32" + }, + "t_struct(BackupConfig)24336_storage": { + "label": "struct BackupConfig", + "members": [ + { + "label": "max", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)6312)dyn_storage", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Basket)24366_storage": { + "label": "struct Basket", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)6312)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "refAmts", + "type": "t_mapping(t_contract(IERC20)6312,t_uint192)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(BasketConfig)24356_storage": { + "label": "struct BasketConfig", + "members": [ + { + "label": "erc20s", + "type": "t_array(t_contract(IERC20)6312)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "targetAmts", + "type": "t_mapping(t_contract(IERC20)6312,t_uint192)", + "offset": 0, + "slot": "1" + }, + { + "label": "targetNames", + "type": "t_mapping(t_contract(IERC20)6312,t_bytes32)", + "offset": 0, + "slot": "2" + }, + { + "label": "backups", + "type": "t_mapping(t_bytes32,t_struct(BackupConfig)24336_storage)", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_struct(Bytes32Set)9523_storage": { + "label": "struct EnumerableSet.Bytes32Set", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)9329_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Bytes32ToBytes32Map)8076_storage": { + "label": "struct EnumerableMap.Bytes32ToBytes32Map", + "members": [ + { + "label": "_keys", + "type": "t_struct(Bytes32Set)9523_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_values", + "type": "t_mapping(t_bytes32,t_bytes32)", + "offset": 0, + "slot": "2" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Bytes32ToUintMap)9105_storage": { + "label": "struct EnumerableMap.Bytes32ToUintMap", + "members": [ + { + "label": "_inner", + "type": "t_struct(Bytes32ToBytes32Map)8076_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "96" + }, + "t_struct(Set)9329_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "8fac727ec1a54b397875c4baa54e123813976105c25207a68c511e4572cc5270": { + "address": "0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c", + "txHash": "0xd57d5c2b310bb77d7ebb7a4b13affdb8dcb80400f1caacf6776ad17e761aafcb", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)32744", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "201", + "type": "t_contract(IBackingManager)31200", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:30" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "202", + "type": "t_contract(IRevenueTrader)33090", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:31" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "203", + "type": "t_contract(IRevenueTrader)33090", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:32" + }, + { + "label": "batchTradeImplementation", + "offset": 0, + "slot": "204", + "type": "t_contract(ITrade)33446", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:36", + "renamedFrom": "tradeImplementation" + }, + { + "label": "gnosis", + "offset": 0, + "slot": "205", + "type": "t_contract(IGnosis)32400", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:39" + }, + { + "label": "batchAuctionLength", + "offset": 20, + "slot": "205", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:43", + "renamedFrom": "auctionLength" + }, + { + "label": "batchTradeDisabled", + "offset": 26, + "slot": "205", + "type": "t_bool", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:49", + "renamedFrom": "disabled" + }, + { + "label": "trades", + "offset": 0, + "slot": "206", + "type": "t_mapping(t_address,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:52" + }, + { + "label": "dutchTradeImplementation", + "offset": 0, + "slot": "207", + "type": "t_contract(ITrade)33446", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:57" + }, + { + "label": "dutchAuctionLength", + "offset": 20, + "slot": "207", + "type": "t_uint48", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:60" + }, + { + "label": "dutchTradeDisabled", + "offset": 0, + "slot": "208", + "type": "t_mapping(t_contract(IERC20Metadata)17135,t_bool)", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:63" + }, + { + "label": "rToken", + "offset": 0, + "slot": "209", + "type": "t_contract(IRToken)32962", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)41_storage", + "contract": "BrokerP1", + "src": "contracts/p1/Broker.sol:293" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)41_storage": { + "label": "uint256[41]", + "numberOfBytes": "1312" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IBackingManager)31200": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IERC20Metadata)17135": { + "label": "contract IERC20Metadata", + "numberOfBytes": "20" + }, + "t_contract(IGnosis)32400": { + "label": "contract IGnosis", + "numberOfBytes": "20" + }, + "t_contract(IMain)32744": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)32962": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(IRevenueTrader)33090": { + "label": "contract IRevenueTrader", + "numberOfBytes": "20" + }, + "t_contract(ITrade)33446": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_bool)": { + "label": "mapping(address => bool)", + "numberOfBytes": "32" + }, + "t_mapping(t_contract(IERC20Metadata)17135,t_bool)": { + "label": "mapping(contract IERC20Metadata => bool)", + "numberOfBytes": "32" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "cd59c74dbbcdccc4cd63cefc93f3019c084744d14f3d461de54da1299450e0e1": { + "address": "0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee", + "txHash": "0x26e6e2921870e316864a24a50664451ab836dbbff52f917b8885e647577f639a", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)32744", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "destinations", + "offset": 0, + "slot": "201", + "type": "t_struct(AddressSet)25226_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:17" + }, + { + "label": "distribution", + "offset": 0, + "slot": "203", + "type": "t_mapping(t_address,t_struct(RevenueShare)31925_storage)", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:18" + }, + { + "label": "rsr", + "offset": 0, + "slot": "204", + "type": "t_contract(IERC20)16483", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:36" + }, + { + "label": "rToken", + "offset": 0, + "slot": "205", + "type": "t_contract(IERC20)16483", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:37" + }, + { + "label": "furnace", + "offset": 0, + "slot": "206", + "type": "t_contract(IFurnace)32300", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:38" + }, + { + "label": "stRSR", + "offset": 0, + "slot": "207", + "type": "t_contract(IStRSR)33299", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:39" + }, + { + "label": "rTokenTrader", + "offset": 0, + "slot": "208", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:40" + }, + { + "label": "rsrTrader", + "offset": 0, + "slot": "209", + "type": "t_address", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:41" + }, + { + "label": "__gap", + "offset": 0, + "slot": "210", + "type": "t_array(t_uint256)44_storage", + "contract": "DistributorP1", + "src": "contracts/p1/Distributor.sol:221" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_bytes32)dyn_storage": { + "label": "bytes32[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)44_storage": { + "label": "uint256[44]", + "numberOfBytes": "1408" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IERC20)16483": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)32300": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)32744": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IStRSR)33299": { + "label": "contract IStRSR", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_struct(RevenueShare)31925_storage)": { + "label": "mapping(address => struct RevenueShare)", + "numberOfBytes": "32" + }, + "t_mapping(t_bytes32,t_uint256)": { + "label": "mapping(bytes32 => uint256)", + "numberOfBytes": "32" + }, + "t_struct(AddressSet)25226_storage": { + "label": "struct EnumerableSet.AddressSet", + "members": [ + { + "label": "_inner", + "type": "t_struct(Set)24911_storage", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "64" + }, + "t_struct(RevenueShare)31925_storage": { + "label": "struct RevenueShare", + "members": [ + { + "label": "rTokenDist", + "type": "t_uint16", + "offset": 0, + "slot": "0" + }, + { + "label": "rsrDist", + "type": "t_uint16", + "offset": 2, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Set)24911_storage": { + "label": "struct EnumerableSet.Set", + "members": [ + { + "label": "_values", + "type": "t_array(t_bytes32)dyn_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "_indexes", + "type": "t_mapping(t_bytes32,t_uint256)", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_uint16": { + "label": "uint16", + "numberOfBytes": "2" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "f3b89b86d7a085af5b9ca363d5e9c7f8afdc97e72ba2840ad16f99aeb3cba1ad": { + "address": "0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81", + "txHash": "0x13bb5807f03b3bd20917a96e3efa348ca3e1d65fedcaef56a8fc017f11a4aab6", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)32744", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "rToken", + "offset": 0, + "slot": "201", + "type": "t_contract(IRToken)32962", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:17" + }, + { + "label": "ratio", + "offset": 0, + "slot": "202", + "type": "t_uint192", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:20" + }, + { + "label": "lastPayout", + "offset": 24, + "slot": "202", + "type": "t_uint48", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:23" + }, + { + "label": "lastPayoutBal", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:24" + }, + { + "label": "__gap", + "offset": 0, + "slot": "204", + "type": "t_array(t_uint256)47_storage", + "contract": "FurnaceP1", + "src": "contracts/p1/Furnace.sol:97" + } + ], + "types": { + "t_array(t_uint256)47_storage": { + "label": "uint256[47]", + "numberOfBytes": "1504" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IMain)32744": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)32962": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "80d51dee0982bc46becfd81417c9fe6bc95c4e550828a74d7f6a34e2c815cb58": { + "address": "0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c", + "txHash": "0xb25791e42791b88557be95faa37265a89b32d2c898b054ac724e81eabd79f548", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)32744", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_status", + "offset": 0, + "slot": "201", + "type": "t_uint256", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:38" + }, + { + "label": "__gap", + "offset": 0, + "slot": "202", + "type": "t_array(t_uint256)49_storage", + "contract": "ReentrancyGuardUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol:88" + }, + { + "label": "broker", + "offset": 0, + "slot": "251", + "type": "t_contract(IBroker)31622", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:26" + }, + { + "label": "trades", + "offset": 0, + "slot": "252", + "type": "t_mapping(t_contract(IERC20)16483,t_contract(ITrade)33446)", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:29" + }, + { + "label": "tradesOpen", + "offset": 0, + "slot": "253", + "type": "t_uint48", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:30" + }, + { + "label": "maxTradeSlippage", + "offset": 6, + "slot": "253", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:33" + }, + { + "label": "minTradeVolume", + "offset": 0, + "slot": "254", + "type": "t_uint192", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:34" + }, + { + "label": "tradesNonce", + "offset": 0, + "slot": "255", + "type": "t_uint256", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:37" + }, + { + "label": "__gap", + "offset": 0, + "slot": "256", + "type": "t_array(t_uint256)45_storage", + "contract": "TradingP1", + "src": "contracts/p1/mixins/Trading.sol:164" + }, + { + "label": "tokenToBuy", + "offset": 0, + "slot": "301", + "type": "t_contract(IERC20)16483", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:19" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "302", + "type": "t_contract(IAssetRegistry)31093", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:20" + }, + { + "label": "distributor", + "offset": 0, + "slot": "303", + "type": "t_contract(IDistributor)31987", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:21" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "304", + "type": "t_contract(IBackingManager)31200", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:22" + }, + { + "label": "furnace", + "offset": 0, + "slot": "305", + "type": "t_contract(IFurnace)32300", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:23" + }, + { + "label": "rToken", + "offset": 0, + "slot": "306", + "type": "t_contract(IRToken)32962", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:24" + }, + { + "label": "rsr", + "offset": 0, + "slot": "307", + "type": "t_contract(IERC20)16483", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:25" + }, + { + "label": "__gap", + "offset": 0, + "slot": "308", + "type": "t_array(t_uint256)43_storage", + "contract": "RevenueTraderP1", + "src": "contracts/p1/RevenueTrader.sol:204" + } + ], + "types": { + "t_array(t_uint256)43_storage": { + "label": "uint256[43]", + "numberOfBytes": "1376" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_contract(IAssetRegistry)31093": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)31200": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBroker)31622": { + "label": "contract IBroker", + "numberOfBytes": "20" + }, + "t_contract(IDistributor)31987": { + "label": "contract IDistributor", + "numberOfBytes": "20" + }, + "t_contract(IERC20)16483": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)32300": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)32744": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_contract(IRToken)32962": { + "label": "contract IRToken", + "numberOfBytes": "20" + }, + "t_contract(ITrade)33446": { + "label": "contract ITrade", + "numberOfBytes": "20" + }, + "t_mapping(t_contract(IERC20)16483,t_contract(ITrade)33446)": { + "label": "mapping(contract IERC20 => contract ITrade)", + "numberOfBytes": "32" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "e5163e65dc1206da906aa4c21b9a5e763b011d2f5d15c9e15780f15f8fc3c011": { + "address": "0x784955641292b0014BC9eF82321300f0b6C7E36d", + "txHash": "0xe760a00d29baf4ee46c4fd2ca081618a9c6a632af7c95c67d1c352d214001d7a", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)14381", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_balances", + "offset": 0, + "slot": "201", + "type": "t_mapping(t_address,t_uint256)", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:40" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "202", + "type": "t_mapping(t_address,t_mapping(t_address,t_uint256))", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:42" + }, + { + "label": "_totalSupply", + "offset": 0, + "slot": "203", + "type": "t_uint256", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:44" + }, + { + "label": "_name", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:46" + }, + { + "label": "_symbol", + "offset": 0, + "slot": "205", + "type": "t_string_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:47" + }, + { + "label": "__gap", + "offset": 0, + "slot": "206", + "type": "t_array(t_uint256)45_storage", + "contract": "ERC20Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/token/ERC20/ERC20Upgradeable.sol:376" + }, + { + "label": "_hashedName", + "offset": 0, + "slot": "251", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:40", + "renamedFrom": "_HASHED_NAME" + }, + { + "label": "_hashedVersion", + "offset": 0, + "slot": "252", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:42", + "renamedFrom": "_HASHED_VERSION" + }, + { + "label": "_name", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:44" + }, + { + "label": "_version", + "offset": 0, + "slot": "254", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:45" + }, + { + "label": "__gap", + "offset": 0, + "slot": "255", + "type": "t_array(t_uint256)48_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:204" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "303", + "type": "t_mapping(t_address,t_struct(Counter)2449_storage)", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:37" + }, + { + "label": "_PERMIT_TYPEHASH_DEPRECATED_SLOT", + "offset": 0, + "slot": "304", + "type": "t_bytes32", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:51", + "renamedFrom": "_PERMIT_TYPEHASH" + }, + { + "label": "__gap", + "offset": 0, + "slot": "305", + "type": "t_array(t_uint256)48_storage", + "contract": "ERC20PermitUpgradeable", + "src": "contracts/vendor/ERC20PermitUpgradeable.sol:129" + }, + { + "label": "mandate", + "offset": 0, + "slot": "353", + "type": "t_string_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:44" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "354", + "type": "t_contract(IAssetRegistry)13147", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:47" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "355", + "type": "t_contract(IBasketHandler)13521", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:48" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "356", + "type": "t_contract(IBackingManager)13254", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:49" + }, + { + "label": "furnace", + "offset": 0, + "slot": "357", + "type": "t_contract(IFurnace)13937", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:50" + }, + { + "label": "basketsNeeded", + "offset": 0, + "slot": "358", + "type": "t_uint192", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:55" + }, + { + "label": "issuanceThrottle", + "offset": 0, + "slot": "359", + "type": "t_struct(Throttle)17605_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:58" + }, + { + "label": "redemptionThrottle", + "offset": 0, + "slot": "363", + "type": "t_struct(Throttle)17605_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:59" + }, + { + "label": "__gap", + "offset": 0, + "slot": "367", + "type": "t_array(t_uint256)42_storage", + "contract": "RTokenP1", + "src": "contracts/p1/RToken.sol:539" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)42_storage": { + "label": "uint256[42]", + "numberOfBytes": "1344" + }, + "t_array(t_uint256)45_storage": { + "label": "uint256[45]", + "numberOfBytes": "1440" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)13147": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)13254": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)13521": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IFurnace)13937": { + "label": "contract IFurnace", + "numberOfBytes": "20" + }, + "t_contract(IMain)14381": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)2449_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Counter)2449_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(Params)17597_storage": { + "label": "struct ThrottleLib.Params", + "members": [ + { + "label": "amtRate", + "type": "t_uint256", + "offset": 0, + "slot": "0" + }, + { + "label": "pctRate", + "type": "t_uint192", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Throttle)17605_storage": { + "label": "struct ThrottleLib.Throttle", + "members": [ + { + "label": "params", + "type": "t_struct(Params)17597_storage", + "offset": 0, + "slot": "0" + }, + { + "label": "lastTimestamp", + "type": "t_uint48", + "offset": 0, + "slot": "2" + }, + { + "label": "lastAvailable", + "type": "t_uint256", + "offset": 0, + "slot": "3" + } + ], + "numberOfBytes": "128" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "45d0e7dbbbcc04b6b1815cbc2791be5136c957c2c8ec0ba5bcb55adb44b812ef": { + "address": "0xE433673648c94FEC0706E5AC95d4f4097f58B5fb", + "txHash": "0x1fa44a3042b46d9622c2e8a53792575ef312497d14ce749313f51d80ed83cf5c", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "__gap", + "offset": 0, + "slot": "51", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + }, + { + "label": "main", + "offset": 0, + "slot": "151", + "type": "t_contract(IMain)14381", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:21" + }, + { + "label": "__gap", + "offset": 0, + "slot": "152", + "type": "t_array(t_uint256)49_storage", + "contract": "ComponentP1", + "src": "contracts/p1/mixins/Component.sol:69" + }, + { + "label": "_hashedName", + "offset": 0, + "slot": "201", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:40", + "renamedFrom": "_HASHED_NAME" + }, + { + "label": "_hashedVersion", + "offset": 0, + "slot": "202", + "type": "t_bytes32", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:42", + "renamedFrom": "_HASHED_VERSION" + }, + { + "label": "_name", + "offset": 0, + "slot": "203", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:44" + }, + { + "label": "_version", + "offset": 0, + "slot": "204", + "type": "t_string_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:45" + }, + { + "label": "__gap", + "offset": 0, + "slot": "205", + "type": "t_array(t_uint256)48_storage", + "contract": "EIP712Upgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/cryptography/EIP712Upgradeable.sol:204" + }, + { + "label": "name", + "offset": 0, + "slot": "253", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:45" + }, + { + "label": "symbol", + "offset": 0, + "slot": "254", + "type": "t_string_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:46" + }, + { + "label": "assetRegistry", + "offset": 0, + "slot": "255", + "type": "t_contract(IAssetRegistry)13147", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:51" + }, + { + "label": "backingManager", + "offset": 0, + "slot": "256", + "type": "t_contract(IBackingManager)13254", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:52" + }, + { + "label": "basketHandler", + "offset": 0, + "slot": "257", + "type": "t_contract(IBasketHandler)13521", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:53" + }, + { + "label": "rsr", + "offset": 0, + "slot": "258", + "type": "t_contract(IERC20)6312", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:54" + }, + { + "label": "era", + "offset": 0, + "slot": "259", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:59" + }, + { + "label": "stakes", + "offset": 0, + "slot": "260", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:63" + }, + { + "label": "totalStakes", + "offset": 0, + "slot": "261", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:64" + }, + { + "label": "stakeRSR", + "offset": 0, + "slot": "262", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:65" + }, + { + "label": "stakeRate", + "offset": 0, + "slot": "263", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:66" + }, + { + "label": "_allowances", + "offset": 0, + "slot": "264", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:71" + }, + { + "label": "draftEra", + "offset": 0, + "slot": "265", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:76" + }, + { + "label": "draftQueues", + "offset": 0, + "slot": "266", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)21316_storage)dyn_storage))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:84" + }, + { + "label": "firstRemainingDraft", + "offset": 0, + "slot": "267", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_uint256))", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:85" + }, + { + "label": "totalDrafts", + "offset": 0, + "slot": "268", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:86" + }, + { + "label": "draftRSR", + "offset": 0, + "slot": "269", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:87" + }, + { + "label": "draftRate", + "offset": 0, + "slot": "270", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:88" + }, + { + "label": "_nonces", + "offset": 0, + "slot": "271", + "type": "t_mapping(t_address,t_struct(Counter)2449_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:126" + }, + { + "label": "_delegationNonces", + "offset": 0, + "slot": "272", + "type": "t_mapping(t_address,t_struct(Counter)2449_storage)", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:128" + }, + { + "label": "unstakingDelay", + "offset": 0, + "slot": "273", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:138" + }, + { + "label": "rewardRatio", + "offset": 6, + "slot": "273", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:139" + }, + { + "label": "payoutLastPaid", + "offset": 0, + "slot": "274", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:150" + }, + { + "label": "rsrRewardsAtLastPayout", + "offset": 0, + "slot": "275", + "type": "t_uint256", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:153" + }, + { + "label": "leaked", + "offset": 0, + "slot": "276", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:159" + }, + { + "label": "lastWithdrawRefresh", + "offset": 24, + "slot": "276", + "type": "t_uint48", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:160" + }, + { + "label": "withdrawalLeak", + "offset": 0, + "slot": "277", + "type": "t_uint192", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:161" + }, + { + "label": "__gap", + "offset": 0, + "slot": "278", + "type": "t_array(t_uint256)28_storage", + "contract": "StRSRP1", + "src": "contracts/p1/StRSR.sol:999" + }, + { + "label": "_delegates", + "offset": 0, + "slot": "306", + "type": "t_mapping(t_address,t_address)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:34" + }, + { + "label": "_eras", + "offset": 0, + "slot": "307", + "type": "t_array(t_struct(Checkpoint)23525_storage)dyn_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:37" + }, + { + "label": "_checkpoints", + "offset": 0, + "slot": "308", + "type": "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)23525_storage)dyn_storage))", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:41" + }, + { + "label": "_totalSupplyCheckpoints", + "offset": 0, + "slot": "309", + "type": "t_mapping(t_uint256,t_array(t_struct(Checkpoint)23525_storage)dyn_storage)", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:43" + }, + { + "label": "__gap", + "offset": 0, + "slot": "310", + "type": "t_array(t_uint256)46_storage", + "contract": "StRSRP1Votes", + "src": "contracts/p1/StRSRVotes.sol:300" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_struct(Checkpoint)23525_storage)dyn_storage": { + "label": "struct StRSRP1Votes.Checkpoint[]", + "numberOfBytes": "32" + }, + "t_array(t_struct(CumulativeDraft)21316_storage)dyn_storage": { + "label": "struct StRSRP1.CumulativeDraft[]", + "numberOfBytes": "32" + }, + "t_array(t_uint256)28_storage": { + "label": "uint256[28]", + "numberOfBytes": "896" + }, + "t_array(t_uint256)46_storage": { + "label": "uint256[46]", + "numberOfBytes": "1472" + }, + "t_array(t_uint256)48_storage": { + "label": "uint256[48]", + "numberOfBytes": "1536" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_bytes32": { + "label": "bytes32", + "numberOfBytes": "32" + }, + "t_contract(IAssetRegistry)13147": { + "label": "contract IAssetRegistry", + "numberOfBytes": "20" + }, + "t_contract(IBackingManager)13254": { + "label": "contract IBackingManager", + "numberOfBytes": "20" + }, + "t_contract(IBasketHandler)13521": { + "label": "contract IBasketHandler", + "numberOfBytes": "20" + }, + "t_contract(IERC20)6312": { + "label": "contract IERC20", + "numberOfBytes": "20" + }, + "t_contract(IMain)14381": { + "label": "contract IMain", + "numberOfBytes": "20" + }, + "t_mapping(t_address,t_address)": { + "label": "mapping(address => address)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(Checkpoint)23525_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_array(t_struct(CumulativeDraft)21316_storage)dyn_storage)": { + "label": "mapping(address => struct StRSRP1.CumulativeDraft[])", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_mapping(t_address,t_uint256))": { + "label": "mapping(address => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_struct(Counter)2449_storage)": { + "label": "mapping(address => struct CountersUpgradeable.Counter)", + "numberOfBytes": "32" + }, + "t_mapping(t_address,t_uint256)": { + "label": "mapping(address => uint256)", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_array(t_struct(Checkpoint)23525_storage)dyn_storage)": { + "label": "mapping(uint256 => struct StRSRP1Votes.Checkpoint[])", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(Checkpoint)23525_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1Votes.Checkpoint[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_array(t_struct(CumulativeDraft)21316_storage)dyn_storage))": { + "label": "mapping(uint256 => mapping(address => struct StRSRP1.CumulativeDraft[]))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_mapping(t_address,t_uint256)))": { + "label": "mapping(uint256 => mapping(address => mapping(address => uint256)))", + "numberOfBytes": "32" + }, + "t_mapping(t_uint256,t_mapping(t_address,t_uint256))": { + "label": "mapping(uint256 => mapping(address => uint256))", + "numberOfBytes": "32" + }, + "t_string_storage": { + "label": "string", + "numberOfBytes": "32" + }, + "t_struct(Checkpoint)23525_storage": { + "label": "struct StRSRP1Votes.Checkpoint", + "members": [ + { + "label": "fromTimepoint", + "type": "t_uint48", + "offset": 0, + "slot": "0" + }, + { + "label": "val", + "type": "t_uint224", + "offset": 0, + "slot": "1" + } + ], + "numberOfBytes": "64" + }, + "t_struct(Counter)2449_storage": { + "label": "struct CountersUpgradeable.Counter", + "members": [ + { + "label": "_value", + "type": "t_uint256", + "offset": 0, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_struct(CumulativeDraft)21316_storage": { + "label": "struct StRSRP1.CumulativeDraft", + "members": [ + { + "label": "drafts", + "type": "t_uint176", + "offset": 0, + "slot": "0" + }, + { + "label": "availableAt", + "type": "t_uint64", + "offset": 22, + "slot": "0" + } + ], + "numberOfBytes": "32" + }, + "t_uint176": { + "label": "uint176", + "numberOfBytes": "22" + }, + "t_uint192": { + "label": "uint192", + "numberOfBytes": "24" + }, + "t_uint224": { + "label": "uint224", + "numberOfBytes": "28" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint48": { + "label": "uint48", + "numberOfBytes": "6" + }, + "t_uint64": { + "label": "uint64", + "numberOfBytes": "8" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/contracts/facade/facets/ActFacet.sol b/contracts/facade/facets/ActFacet.sol index bbcf1cfec9..7294859c2e 100644 --- a/contracts/facade/facets/ActFacet.sol +++ b/contracts/facade/facets/ActFacet.sol @@ -6,7 +6,6 @@ import "@openzeppelin/contracts/utils/Address.sol"; import "@openzeppelin/contracts/utils/Multicall.sol"; import "../../plugins/trading/DutchTrade.sol"; import "../../plugins/trading/GnosisTrade.sol"; -import "../../interfaces/IActFacet.sol"; import "../../interfaces/IBackingManager.sol"; /** @@ -17,7 +16,7 @@ import "../../interfaces/IBackingManager.sol"; * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start -contract ActFacet is IActFacet, Multicall { +contract ActFacet is Multicall { using Address for address; using SafeERC20 for IERC20; using FixLib for uint192; diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index 9a2501203e..9924807e8f 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -5,7 +5,6 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../plugins/trading/DutchTrade.sol"; import "../../interfaces/IAsset.sol"; import "../../interfaces/IAssetRegistry.sol"; -import "../../interfaces/IReadFacet.sol"; import "../../interfaces/IRToken.sol"; import "../../interfaces/IStRSR.sol"; import "../../libraries/Fixed.sol"; @@ -22,7 +21,7 @@ import "./MaxIssuableFacet.sol"; * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start -contract ReadFacet is MaxIssuableFacet { +contract ReadFacet { using FixLib for uint192; // === Static Calls === @@ -247,6 +246,12 @@ contract ReadFacet is MaxIssuableFacet { // === Views === + struct Pending { + uint256 index; + uint256 availableAt; + uint256 amount; + } + /// @param draftEra {draftEra} The draft era to query unstakings for /// @param account The account for the query /// @return unstakings {qRSR} All the pending StRSR unstakings for an account, in RSR @@ -254,13 +259,13 @@ contract ReadFacet is MaxIssuableFacet { RTokenP1 rToken, uint256 draftEra, address account - ) external view returns (IReadFacet.Pending[] memory unstakings) { + ) external view returns (Pending[] memory unstakings) { StRSRP1 stRSR = StRSRP1(address(rToken.main().stRSR())); uint256 left = stRSR.firstRemainingDraft(draftEra, account); uint256 right = stRSR.draftQueueLen(draftEra, account); uint192 draftRate = stRSR.draftRate(); - unstakings = new IReadFacet.Pending[](right - left); + unstakings = new Pending[](right - left); for (uint256 i = 0; i < right - left; i++) { (uint192 drafts, uint64 availableAt) = stRSR.draftQueues(draftEra, account, i + left); @@ -271,7 +276,7 @@ contract ReadFacet is MaxIssuableFacet { } // {qRSR} = {qDrafts} / {qDrafts/qRSR} - unstakings[i] = IReadFacet.Pending(i + left, availableAt, diff.div(draftRate)); + unstakings[i] = Pending(i + left, availableAt, diff.div(draftRate)); } } diff --git a/contracts/interfaces/IActFacet.sol b/contracts/interfaces/IActFacet.sol deleted file mode 100644 index 7cf5b00274..0000000000 --- a/contracts/interfaces/IActFacet.sol +++ /dev/null @@ -1,73 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "../interfaces/IBackingManager.sol"; -import "../interfaces/IStRSRVotes.sol"; -import "../interfaces/IRevenueTrader.sol"; -import "../interfaces/IRToken.sol"; - -/** - * @title IActFacet - * @notice A Facade to help batch compound actions that cannot be done from an EOA, solely. -v */ -interface IActFacet { - /// Claims rewards from all places they can accrue. - function claimRewards(IRToken rToken) external; - - /// To use this, first call: - /// - IReadFacet.auctionsSettleable(revenueTrader) - /// - IReadFacet.revenueOverview(revenueTrader) - /// If either arrays returned are non-empty, then can execute this function productively. - /// Logic: - /// For each ERC20 in `toSettle`: - /// - Settle any open ERC20 trades - /// Then: - /// - Transfer any revenue for that ERC20 from the backingManager to revenueTrader - /// - Call `revenueTrader.manageTokens(ERC20)` to start an auction - function runRevenueAuctions( - IRevenueTrader revenueTrader, - IERC20[] memory toSettle, - IERC20[] memory toStart, - TradeKind[] memory kinds - ) external; - - // === Static Calls === - - /// To use this, call via callStatic. - /// Includes consideration of when to distribute the RevenueTrader tokenToBuy - /// @return erc20s The ERC20s that have auctions that can be started - /// @return canStart If the ERC20 auction can be started - /// @return surpluses {qTok} The surplus amounts currently held, ignoring reward balances - /// @return minTradeAmounts {qTok} The minimum amount worth trading - /// @return bmRewards {qTok} The amounts would be claimed by backingManager.claimRewards() - /// @return revTraderRewards {qTok} The amounts that would be claimed by trader.claimRewards() - /// @dev Note that `surpluses` + `bmRewards` + `revTraderRewards` - /// @custom:static-call - function revenueOverview(IRevenueTrader revenueTrader) - external - returns ( - IERC20[] memory erc20s, - bool[] memory canStart, - uint256[] memory surpluses, - uint256[] memory minTradeAmounts, - uint256[] memory bmRewards, - uint256[] memory revTraderRewards - ); - - /// To use this, call via callStatic. - /// If canStart is true, call backingManager.rebalance(). May require settling a - /// trade first; see auctionsSettleable. - /// @return canStart true iff a recollateralization auction can be started - /// @return sell The sell token in the auction - /// @return buy The buy token in the auction - /// @return sellAmount {qSellTok} How much would be sold - /// @custom:static-call - function nextRecollateralizationAuction(IBackingManager bm, TradeKind kind) - external - returns ( - bool canStart, - IERC20 sell, - IERC20 buy, - uint256 sellAmount - ); -} diff --git a/contracts/interfaces/IFacade.sol b/contracts/interfaces/IFacade.sol index afd227acd3..e1d846884f 100644 --- a/contracts/interfaces/IFacade.sol +++ b/contracts/interfaces/IFacade.sol @@ -1,8 +1,9 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import "./IActFacet.sol"; -import "./IReadFacet.sol"; +import "../facade/facets/ActFacet.sol"; +import "../facade/facets/ReadFacet.sol"; +import "../facade/facets/MaxIssuableFacet.sol"; interface IFacade { event SelectorSaved(address indexed facet, bytes4 indexed selector); @@ -14,6 +15,6 @@ interface IFacade { } // solhint-disable-next-line no-empty-blocks -interface TestIFacade is IFacade, IActFacet, IReadFacet { +abstract contract TestIFacade is IFacade, ActFacet, MaxIssuableFacet, ReadFacet { } diff --git a/contracts/interfaces/IReadFacet.sol b/contracts/interfaces/IReadFacet.sol deleted file mode 100644 index 94e90880db..0000000000 --- a/contracts/interfaces/IReadFacet.sol +++ /dev/null @@ -1,147 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "../p1/RToken.sol"; -import "./IRToken.sol"; -import "./IStRSR.sol"; - -/** - * @title IReadFacet - * @notice A UX-friendly layer for read operations, especially those that first require refresh() - * - * - @custom:static-call - Use ethers callStatic() in order to get result after update -v */ -interface IReadFacet { - // === Static Calls === - - /// @return How many RToken `account` can issue given current holdings - /// @custom:static-call - function maxIssuable(IRToken rToken, address account) external returns (uint256); - - /// @param amounts {qTok} The balances of each basket ERC20 to assume - /// @return How many RToken can be issued - /// @custom:static-call - function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) - external - returns (uint256); - - /// @return tokens The erc20 needed for the issuance - /// @return deposits {qTok} The deposits necessary to issue `amount` RToken - /// @return depositsUoA {UoA} The UoA value of the deposits necessary to issue `amount` RToken - /// @custom:static-call - function issue(IRToken rToken, uint256 amount) - external - returns ( - address[] memory tokens, - uint256[] memory deposits, - uint192[] memory depositsUoA - ); - - /// @return tokens The erc20s returned for the redemption - /// @return withdrawals The balances the reedemer would receive after a full redemption - /// @return available The amount actually available, for each token - /// @dev If available[i] < withdrawals[i], then RToken.redeem() would revert - /// @custom:static-call - function redeem(IRToken rToken, uint256 amount) - external - returns ( - address[] memory tokens, - uint256[] memory withdrawals, - uint256[] memory available - ); - - /// @return tokens The erc20s returned for the redemption - /// @return withdrawals The balances the reedemer would receive after redemption - /// @custom:static-call - function redeemCustom( - IRToken rToken, - uint256 amount, - uint48[] memory basketNonces, - uint192[] memory portions - ) external returns (address[] memory tokens, uint256[] memory withdrawals); - - /// @return erc20s The ERC20 addresses in the current basket - /// @return uoaShares The proportion of the basket associated with each ERC20 - /// @return targets The bytes32 representations of the target unit associated with each ERC20 - /// @custom:static-call - function basketBreakdown(IRToken rToken) - external - returns ( - address[] memory erc20s, - uint192[] memory uoaShares, - bytes32[] memory targets - ); - - /// @return erc20s The registered ERC20s - /// @return balances {qTok} The held balances of each ERC20 across all traders - /// @return balancesNeededByBackingManager {qTok} does not account for backingBuffer - /// @custom:static-call - function balancesAcrossAllTraders(IRToken rToken) - external - returns ( - IERC20[] memory erc20s, - uint256[] memory balances, - uint256[] memory balancesNeededByBackingManager - ); - - // === Views === - - struct Pending { - uint256 index; - uint256 availableAt; - uint256 amount; - } - - /// @param draftEra {draftEra} The draft era to query unstakings for - /// @param account The account for the query - /// @return {qRSR} All the pending StRSR unstakings for an account, in RSR - function pendingUnstakings( - RTokenP1 rToken, - uint256 draftEra, - address account - ) external view returns (Pending[] memory); - - /// Returns the prime basket - /// @dev Indices are shared across return values - /// @return erc20s The erc20s in the prime basket - /// @return targetNames The bytes32 name identifier of the target unit, per ERC20 - /// @return targetAmts {target/BU} The amount of the target unit in the basket, per ERC20 - function primeBasket(IRToken rToken) - external - view - returns ( - IERC20[] memory erc20s, - bytes32[] memory targetNames, - uint192[] memory targetAmts - ); - - /// Returns the backup configuration for a given targetName - /// @param targetName The name of the target unit to lookup the backup for - /// @return erc20s The backup erc20s for the target unit, in order of most to least desirable - /// @return max The maximum number of tokens from the array to use at a single time - function backupConfig(IRToken rToken, bytes32 targetName) - external - view - returns (IERC20[] memory erc20s, uint256 max); - - /// @return tokens The ERC20s backing the RToken - function basketTokens(IRToken rToken) external view returns (address[] memory tokens); - - /// @return stTokenAddress The address of the corresponding stToken address - function stToken(IRToken rToken) external view returns (IStRSR stTokenAddress); - - /// @return backing The worst-case collaterazation % the protocol will have after done trading - /// @return overCollateralization The over-collateralization value relative to the - /// fully-backed value - function backingOverview(IRToken rToken) - external - view - returns (uint192 backing, uint192 overCollateralization); - - /// @return low {UoA/tok} The low price of the RToken as given by the relevant RTokenAsset - /// @return high {UoA/tok} The high price of the RToken as given by the relevant RTokenAsset - function price(IRToken rToken) external view returns (uint192 low, uint192 high); - - /// @return erc20s The list of ERC20s that have auctions that can be settled, for given trader - function auctionsSettleable(ITrading trader) external view returns (IERC20[] memory erc20s); -} diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 906b8dccd7..5a6c001229 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -16,7 +16,7 @@ import "./mixins/Component.sol"; // solhint-disable max-states-count -/* +/** * @title StRSRP1 * @notice StRSR is an ERC20 token contract that allows people to stake their RSR as * over-collateralization behind an RToken. As compensation stakers receive a share of revenues diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol index 88a50019ca..a4ce5e60d2 100644 --- a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol @@ -89,9 +89,7 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { // Check RToken status try pairedBasketHandler.isReady() returns (bool isReady) { - if (!isReady) { - markStatus(CollateralStatus.IFFY); - } else if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + if (!isReady || low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { // If the price is below the default-threshold price, default eventually // uint192(+/-) is the same as Fix.plus/minus markStatus(CollateralStatus.IFFY); diff --git a/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json index 6eb3b4b007..4602fbd2dd 100644 --- a/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json +++ b/scripts/addresses/base-3.4.0/8453-tmp-assets-collateral.json @@ -1,9 +1,28 @@ { - "assets": {}, + "assets": { + "COMP": "0xB8794Fb1CCd62bFe631293163F4A3fC2d22e37e0", + "STG": "0xEE527CC63122732532d0f1ad33Ec035D30f3050f" + }, "collateral": { - "saBasUSDC": "0x0F345F57ee2b395e23390f8e1F1869D7E6C0F70e" + "DAI": "0x3E40840d0282C9F9cC7d17094b5239f87fcf18e5", + "USDC": "0xaa85216187F92a781D8F9Bcb40825E356ee2635a", + "USDbC": "0xD126741474B0348D9B0F4911573d8f543c01C2c4", + "WETH": "0x073BD162BBD05Cd2CF631B90D44239B8a367276e", + "cbETH": "0x851B461a9744f4c9E996C03072cAB6f44Fa04d0D", + "saBasUSDC": "0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50", + "cUSDCv3": "0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461", + "wstETH": "0x8b4374005291B8FCD14C4E947604b2FB3C660A73" }, "erc20s": { - "saBasUSDC": "0x184460704886f9F2A7F3A0c2887680867954dC6E" + "COMP": "0x9e1028F5F1D5eDE59748FFceE5532509976840E0", + "DAI": "0x50c5725949A6F0c72E6C4a641F24049A917DB0Cb", + "USDC": "0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913", + "USDbC": "0xd9aAEc86B65D86f6A7B5B1b0c42FFA531710b6CA", + "WETH": "0x4200000000000000000000000000000000000006", + "cbETH": "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22", + "saBasUSDC": "0x6F6f81e5E66f503184f2202D83a79650c3285759", + "STG": "0xE3B53AF74a4BF62Ae5511055290838050bf764Df", + "cUSDCv3": "0x53f1Df4E5591Ae35Bf738742981669c3767241FA", + "wstETH": "0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452" } } diff --git a/scripts/addresses/base-3.4.0/8453-tmp-deployments.json b/scripts/addresses/base-3.4.0/8453-tmp-deployments.json new file mode 100644 index 0000000000..90ff83fd9a --- /dev/null +++ b/scripts/addresses/base-3.4.0/8453-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0xaB36452DbAC151bE02b16Ca17d8919826072f64a", + "RSR_FEED": "0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1", + "GNOSIS_EASY_AUCTION": "0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02" + }, + "tradingLib": "0x6419fe6cf428150e2d8ed38a3316b1bb468f79a7", + "facade": "0xEb2071e9B542555E90E6e4E1F83fa17423583991", + "facets": { + "actFacet": "0x0eac15B9Fe585432E48Cf175571D75D111861F43", + "readFacet": "0x5Af543D6F95a98200Dd770f39A902Fe793BAeB27", + "maxIssuableFacet": "0x63FDcB1E8Ee5C4B64A5c4ce0FB97597917920cb6" + }, + "facadeWriteLib": "0x186d05580E6B7195323b5dC8c3ee9179Ad086d4C", + "basketLib": "0x182e86ad4a6139ced4f9fa4ed3f1cd9e4f7449e7", + "facadeWrite": "0x43E205A805c4be5A62C71d49de68dF60200548A0", + "deployer": "0xFD18bA9B2f9241Ce40CDE14079c1cDA1502A8D0A", + "rsrAsset": "0x02062c16c28A169D1f2F5EfA7eEDc42c3311ec23", + "implementations": { + "main": "0x2a2A842Dda2Da2170a531dfF4bD4A821321e4485", + "trading": { + "gnosisTrade": "0x93de153Ba104D15785c8d8af01AE9425960de49e", + "dutchTrade": "0x270284ecb6aF0dc521D2c8f9D77b03EEd2aace90" + }, + "components": { + "assetRegistry": "0x3DDe17cfd36e740CB7452cb2F59FC925eACb91aB", + "backingManager": "0xb5bDFF1FB47635383ABf13b78a79C8a21aA1b23E", + "basketHandler": "0xA4f1Fc88eFF9a72bCc278a2D3B79cafCc1551fb5", + "broker": "0x1cddc45cb390C3b4a739861155E8ee95b7321eD6", + "distributor": "0xba748FAF1a94B5C8De5C8Ca8D87A0906C5B0300c", + "furnace": "0xE0B810bD674132b553770064Fc90440c5A5f518d", + "rsrTrader": "0x3c2460ACa70bedf096f71Cf91fFBc0789F08503f", + "rTokenTrader": "0x3c2460ACa70bedf096f71Cf91fFBc0789F08503f", + "rToken": "0x02Ab5B6dF2c17d060EE3e95D08225Ff3A42504a5", + "stRSR": "0x4Cf200D7fA568611DD8B4BD85053ba9419982C7D" + } + } +} diff --git a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json index e96d88efa0..b7d3762111 100644 --- a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json @@ -1,6 +1,55 @@ { - "assets": {}, + "assets": { + "stkAAVE": "0xF4493581D52671a9E04d693a68ccc61853bceEaE", + "COMP": "0x63eDdF26Bc65eDa1D1c0147ce8E23c09BE963596", + "CRV": "0xc18bF46F178F7e90b9CD8b7A8b00Af026D5ce3D3", + "CVX": "0x7ef93b20C10E6662931b32Dd9D4b85861eB2E4b8" + }, "collateral": { + "DAI": "0xEc375F2984D21D5ddb0D82767FD8a9C4CE8Eec2F", + "USDC": "0x442f8fc98e3cc6B3d49a66f9858Ac9B6e70Dad3e", + "USDT": "0xe7Dcd101A027Ec34860ECb634a2797d0D2dc4d8b", + "USDP": "0x4C0B21Acb267f1fAE4aeFA977A26c4a63C9B35e6", + "BUSD": "0x97bb4a995b98b1BfF99046b3c518276f78fA5250", + "aDAI": "0x9ca9A9cdcE9E943608c945E7001dC89EB163991E", + "aUSDC": "0xc4240D22FFa144E2712aACF3E2cC302af0339ED0", + "aUSDT": "0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333", + "aBUSD": "0x01F9A6bf339cff820cA503A56FD3705AE35c27F7", + "aUSDP": "0xda5cc207CCefD116fF167a8ABEBBd52bD67C958E", + "cDAI": "0x337E418b880bDA5860e05D632CF039B7751B907B", + "cUSDC": "0x043be931D9C4422e1cFeA528e19818dcDfdE9Ebc", + "cUSDT": "0x5ceadb6606C5D82FcCd3f9b312C018fE1f8aa6dA", + "cUSDP": "0xa0c02De8FfBb9759b9beBA5e29C82112688A0Ff4", + "cWBTC": "0xC0f89AFcb6F1c4E943aA61FFcdFc41fDcB7D84DD", + "cETH": "0x4d3A8507a8eb9036895efdD1a462210CE58DE4ad", + "WBTC": "0x832D65735E541c0404a58B741bEF5652c2B7D0Db", + "WETH": "0xADDca344c92Be84A053C5CBE8e067460767FB816", + "wstETH": "0xb7049ee9F533D32C9434101f0645E6Ea5DFe2cdb", + "rETH": "0x987f5e0f845D46262893e680b652D8aAF1B5bCc0", + "fUSDC": "0xB58D95003Af73CF76Ce349103726a51D4Ec8af17", + "fUSDT": "0xD5254b740FbEF6AAcD674936ea7Fb9f4053781aF", + "fDAI": "0xA0a620B94446a7DC8952ECf252FcC495eeC65873", + "fFRAX": "0xFd9c32198D3cf3ad3b165918FD78De3654cb22eA", + "cUSDCv3": "0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0", + "cvx3Pool": "0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2", + "cvxPayPool": "0x5315Fbe0CEB299F53aE375f65fd9376767C8224c", + "cvxeUSDFRAXBP": "0xE529B59C1764d6E5a274099Eb660DD9e130A5481", + "cvxMIM3Pool": "0x3d21f841C0Fb125176C1DBDF0DE196b071323A75", + "cvxETHPlusETH": "0xc4a5Fb266E8081D605D87f0b1290F54B0a5Dc221", + "crveUSDFRAXBP": "0x945b0ad788dD6dB3864AB23876C68C1bf000d237", + "crvMIM3Pool": "0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62", + "crv3Pool": "0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9", + "sDAI": "0x62a9DDC6FF6077E823690118eCc935d16A8de47e", + "cbETH": "0xC8b80813cad9139D0eeFe38C711a11b20147aA54", + "maUSDT": "0x2F8F8Ac64ECbAC38f212b05115836120784a29F7", + "maUSDC": "0xC5d03FB7A38E6025D9A32C7444cfbBfa18B7D656", + "maDAI": "0x7be70371e7ECd9af5A5b49015EC8F8C336B52D81", + "maWBTC": "0x75B6921925e8BD632380706e722035752ffF175d", + "maWETH": "0xA402078f0A2e077Ea2b1Fb3b6ab74F0cBA10E508", + "maStETH": "0x4a139215D9E696c0e7618a441eD3CFd12bbD8CD6", + "yvCurveUSDCcrvUSD": "0x1573416df7095F698e37A954D9e951868E526650", + "yvCurveUSDPcrvUSD": "0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF", + "sFRAX": "0x0b7DcCBceA6f985301506D575E2661bf858CdEcC", "saEthUSDC": "0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB", "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E", "bbUSDT": "0x3017d881724D93783e7f065Cc5F62c81C62c36A0", @@ -12,6 +61,52 @@ "sfrxETH": "0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67" }, "erc20s": { + "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7", + "USDP": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", + "BUSD": "0x4Fabb145d64652a948d72533023f6E7A623C7C53", + "aDAI": "0x717AC7A53C6a6a5529175dff7fCc76858436f8c0", + "aUSDC": "0xa8157BF67Fd7BcDCC139CB9Bf1bd7Eb921A779D3", + "aUSDT": "0x684AA4faf9b07d5091B88c6e0a8160aCa5e6d17b", + "aBUSD": "0xf3840c4B214699F94fBB69ad3922f44176c93658", + "aUSDP": "0x5Ad7CeD3c64847980082e106390DeC3765A5f1C4", + "cDAI": "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643", + "cUSDC": "0x39AA39c021dfbaE8faC545936693aC917d5E7563", + "cUSDT": "0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9", + "cUSDP": "0x041171993284df560249B57358F931D9eB7b925D", + "cWBTC": "0xccF4429DB6322D5C611ee964527D42E5d685DD6a", + "cETH": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5", + "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", + "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "fUSDC": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", + "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7", + "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b", + "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B", + "cUSDCv3": "0x27F2f159Fe990Ba83D57f39Fd69661764BEbf37a", + "cvx3Pool": "0x24CDc6b4Edd3E496b7283D94D93119983A61056a", + "cvxPayPool": "0x511daB8150966aFfE15F0a5bFfBa7F4d2b62DEd4", + "cvxeUSDFRAXBP": "0x81697e25DFf8564d9E0bC6D27edb40006b34ea2A", + "cvxMIM3Pool": "0x3e8f7EDc03E0133b95EcB4dD2f72B5027E695413", + "cvxETHPlusETH": "0xDbC0cE2321B76D3956412B36e9c0FA9B0fD176E7", + "crv3Pool": "0x8A6029C6D921dCa4fAbf6F5b2F6D14606F8Fd0aB", + "crveUSDFRAXBP": "0x3D07B9b2Aa60843470e6dAb09a0c3a31DE42E7Ea", + "crvMIM3Pool": "0xB1d0076d156D83B117De3bc63E7CE8031AB117fD", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704", + "maUSDT": "0x9FD7165AEf369913258F4C8B19c9C350C2dE63cC", + "maUSDC": "0x6Bf3356923E6D611b8352B4895135e1Edfcf217B", + "maDAI": "0x9E5EC103944c19D7E7aBfb2947a865d51bc6947C", + "maWBTC": "0x1F423dC943738b9c31cB3d96c2A744dd7502593d", + "maWETH": "0xB7c4c4a2B7453E10d7e4e23Fa8E8D2335d09afab", + "maStETH": "0xAdc10669354aAd42A581E6F6cC8990B540AA5689", + "yvCurveUSDCcrvUSD": "0x7cA00559B978CFde81297849be6151d3ccB408A9", + "yvCurveUSDPcrvUSD": "0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469", + "sFRAX": "0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32", "saEthUSDC": "0x0aDc69041a2B086f8772aCcE2A754f410F211bed", "saEthPyUSD": "0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b", "bbUSDT": "0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1", @@ -20,6 +115,8 @@ "Re7WETH": "0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0", "cvxCrvUSDUSDC": "0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8", "cvxCrvUSDUSDT": "0x5d1B749bA7f689ef9f260EDC54326C48919cA88b", - "sfrxETH": "0xac3E018457B222d93114458476f3E3416Abbe38F" + "sfrxETH": "0xac3E018457B222d93114458476f3E3416Abbe38F", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B" } -} \ No newline at end of file +} diff --git a/scripts/addresses/mainnet-3.4.0/1-tmp-deployments.json b/scripts/addresses/mainnet-3.4.0/1-tmp-deployments.json new file mode 100644 index 0000000000..3101baf7e4 --- /dev/null +++ b/scripts/addresses/mainnet-3.4.0/1-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0x320623b8E4fF03373931769A31Fc52A4E78B5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "0xa54544C6C36C0d776cc4F04EBB847e0BB3A11ea2", + "facade": "0x2C7ca56342177343A2954C250702Fd464f4d0613", + "facets": { + "actFacet": "0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB", + "readFacet": "0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526", + "maxIssuableFacet": "0x5771d976696AA180Fed276FB6571fE2f41D0b849" + }, + "facadeWriteLib": "0xDf73Cd789422040182b0C24a8b2C97bbCbba3263", + "basketLib": "0xf383dC60D29A5B9ba461F40A0606870d80d1EA88", + "facadeWrite": "0x1D94290F82D0B417B088d9F5dB316B11C9cf220C", + "deployer": "0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF", + "rsrAsset": "0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA", + "implementations": { + "main": "0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7", + "trading": { + "gnosisTrade": "0x030c9B66Ac089cB01aA2058FC8f7d9baddC9ae75", + "dutchTrade": "0x971c890ACb9EeB084f292996Be667bB9A2889AE9" + }, + "components": { + "assetRegistry": "0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463", + "backingManager": "0x20C801869e578E71F2298649870765Aa81f7DC69", + "basketHandler": "0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC", + "broker": "0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c", + "distributor": "0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee", + "furnace": "0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81", + "rsrTrader": "0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c", + "rTokenTrader": "0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c", + "rToken": "0x784955641292b0014BC9eF82321300f0b6C7E36d", + "stRSR": "0xE433673648c94FEC0706E5AC95d4f4097f58B5fb" + } + } +} diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 5436487545..6c8ee02fb5 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -31,7 +31,7 @@ async function main() { 'phase1-core/1_deploy_libraries.ts', 'phase1-core/2_deploy_implementations.ts', 'phase1-core/3_deploy_rsrAsset.ts', - 'phase1-core/4_deploy_facade.ts', // comment this out before deployment to keep old Facade + 'phase1-core/4_deploy_facade.ts', 'phase1-core/5_deploy_deployer.ts', 'phase1-core/6_deploy_facadeWrite.ts', ] @@ -62,6 +62,7 @@ async function main() { 'phase2-assets/collaterals/deploy_convex_3pool_collateral.ts', 'phase2-assets/collaterals/deploy_convex_paypool_collateral.ts', 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', + 'phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts', 'phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts', 'phase2-assets/collaterals/deploy_convex_ethplus_eth.ts', @@ -81,7 +82,9 @@ async function main() { 'phase2-assets/collaterals/deploy_steakusdc.ts', 'phase2-assets/collaterals/deploy_steakpyusd.ts', 'phase2-assets/collaterals/deploy_bbusdt.ts', - 'phase2-assets/collaterals/deploy_re7weth.ts' + 'phase2-assets/collaterals/deploy_re7weth.ts', + 'phase2-assets/assets/deploy_crv.ts', + 'phase2-assets/assets/deploy_cvx.ts' ) } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains @@ -90,9 +93,10 @@ async function main() { 'phase2-assets/1_deploy_assets.ts', 'phase2-assets/2_deploy_collateral.ts', 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', - 'phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts', + 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', - 'phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts', + 'phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts', + 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/assets/deploy_stg.ts' ) } else if (chainId == '42161' || chainId == '421614') { diff --git a/scripts/deployment/common.ts b/scripts/deployment/common.ts index b87565bbd1..66f03c7c97 100644 --- a/scripts/deployment/common.ts +++ b/scripts/deployment/common.ts @@ -23,7 +23,6 @@ export interface IDeployments { facade: string facets: IFacets facadeWriteLib: string - cvxMiningLib: string facadeWrite: string deployer: string rsrAsset: string diff --git a/scripts/deployment/phase1-core/0_setup_deployments.ts b/scripts/deployment/phase1-core/0_setup_deployments.ts index 9cddc68e88..f2c4666e54 100644 --- a/scripts/deployment/phase1-core/0_setup_deployments.ts +++ b/scripts/deployment/phase1-core/0_setup_deployments.ts @@ -54,11 +54,11 @@ async function main() { GNOSIS_EASY_AUCTION: gnosisAddr, }, tradingLib: '', - cvxMiningLib: '', facade: '', facets: { actFacet: '', readFacet: '', + maxIssuableFacet: '', }, facadeWriteLib: '', basketLib: '', diff --git a/scripts/deployment/phase1-core/1_deploy_libraries.ts b/scripts/deployment/phase1-core/1_deploy_libraries.ts index 78a4efa683..5b4080d2b0 100644 --- a/scripts/deployment/phase1-core/1_deploy_libraries.ts +++ b/scripts/deployment/phase1-core/1_deploy_libraries.ts @@ -1,10 +1,10 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../../../common/configuration' +import { networkConfig } from '../../../common/configuration' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' import { validatePrerequisites } from '../utils' -import { BasketLibP1, CvxMining, RecollateralizationLibP1 } from '../../../typechain' +import { BasketLibP1, RecollateralizationLibP1 } from '../../../typechain' let tradingLib: RecollateralizationLibP1 let basketLib: BasketLibP1 diff --git a/scripts/deployment/phase1-facade/2_deploy_actFacet.ts b/scripts/deployment/phase1-facade/2_deploy_actFacet.ts index 97ee29342a..38b48c8e4c 100644 --- a/scripts/deployment/phase1-facade/2_deploy_actFacet.ts +++ b/scripts/deployment/phase1-facade/2_deploy_actFacet.ts @@ -13,7 +13,7 @@ async function main() { const [burner] = await hre.ethers.getSigners() const chainId = await getChainId(hre) - console.log(`Deploying Facade to network ${hre.network.name} (${chainId}) + console.log(`Deploying ActFacet to network ${hre.network.name} (${chainId}) with burner account: ${burner.address}`) if (!networkConfig[chainId]) { diff --git a/scripts/deployment/phase2-assets/assets/deploy_stg.ts b/scripts/deployment/phase2-assets/assets/deploy_stg.ts index 98c81e2be1..2cac620c9a 100644 --- a/scripts/deployment/phase2-assets/assets/deploy_stg.ts +++ b/scripts/deployment/phase2-assets/assets/deploy_stg.ts @@ -10,7 +10,7 @@ import { IAssetCollDeployments, fileExists, } from '../../../deployment/common' -import { priceTimeout, oracleTimeout } from '../../../deployment/utils' +import { priceTimeout } from '../../../deployment/utils' import { Asset } from '../../../../typechain' async function main() { @@ -43,7 +43,7 @@ async function main() { oracleError: fp('0.02').toString(), // 2% tokenAddress: networkConfig[chainId].tokens.STG, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24 hr + oracleTimeout: '86400', // 24 hr }) await (await ethers.getContractAt('Asset', stgAsset)).refresh() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts index 87f2a33d2b..7b55998602 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_ethplus_eth.ts @@ -4,7 +4,7 @@ import { getChainId } from '../../../../common/blockchain-utils' import { networkConfig } from '../../../../common/configuration' import { expect } from 'chai' import { ONE_ADDRESS, CollateralStatus } from '../../../../common/constants' -import { bn } from '../../../../common/numbers' +import { bn, fp } from '../../../../common/numbers' import { getDeploymentFile, getAssetCollDeploymentFilename, @@ -13,7 +13,6 @@ import { fileExists, } from '../../common' import { CurveAppreciatingRTokenSelfReferentialCollateral } from '../../../../typechain' -import { revenueHiding } from '../../utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -83,7 +82,7 @@ async function main() { defaultThreshold: DEFAULT_THRESHOLD.add(WETH_ORACLE_ERROR), delayUntilDefault: DELAY_UNTIL_DEFAULT, // 72h }, - revenueHiding.toString(), + fp('1e-3').toString(), { nTokens: 2, curvePool: ETHPLUS_BP_POOL, diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts index b382962e58..2356c4dfea 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_rToken_metapool_plugin.ts @@ -9,7 +9,6 @@ import { getDeploymentFile, getAssetCollDeploymentFilename, IAssetCollDeployments, - IDeployments, getDeploymentFilename, fileExists, } from '../../common' @@ -53,7 +52,6 @@ async function main() { if (!fileExists(phase1File)) { throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) } - const deployments = getDeploymentFile(phase1File) // Check previous step completed const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts index 6727ff25d7..de99d2885b 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_stable_metapool_plugin.ts @@ -8,7 +8,6 @@ import { getDeploymentFile, getAssetCollDeploymentFilename, IAssetCollDeployments, - IDeployments, getDeploymentFilename, fileExists, } from '../../common' @@ -59,7 +58,6 @@ async function main() { if (!fileExists(phase1File)) { throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) } - const deployments = getDeploymentFile(phase1File) // Check previous step completed const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts index 6b9f415d01..15b55e069a 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_curve_stable_plugin.ts @@ -114,7 +114,7 @@ async function main() { await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - assetCollDeployments.collateral.cvx3Pool = collateral.address + assetCollDeployments.collateral.crv3Pool = collateral.address assetCollDeployments.erc20s.crv3Pool = w3Pool.address deployedCollateral.push(collateral.address.toString()) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts index dfd837767f..301e15b2ab 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts @@ -57,6 +57,7 @@ async function main() { let oracleError = fp('0.0025') if (chainIdKey == '8453') { + throw new Error('deprecated; no pure USDC market available') USDC_NAME = 'USDbC' name = 'Wrapped Stargate USDbC' symbol = 'wsgUSDbC' diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index e2d68af55c..5abd9ecb5f 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -115,21 +115,20 @@ export async function verifyContract( if (baseL2Chains.includes(hre.network.name)) { const BASESCAN_API_KEY = useEnv('BASESCAN_API_KEY') // Base L2 - url = `${getCustomVerificationURL( + url = `${getVerificationURL( chainId - )}/?module=contract&action=getsourcecode&address=${address}&apikey=${BASESCAN_API_KEY}` + )}?module=contract&action=getsourcecode&address=${address}&apikey=${BASESCAN_API_KEY}` } else if (arbitrumL2Chains.includes(hre.network.name)) { const ARBISCAN_API_KEY = useEnv('ARBISCAN_API_KEY') // Arbitrum L2 - url = `${getCustomVerificationURL( + url = `${getVerificationURL( chainId - )}/?module=contract&action=getsourcecode&address=${address}&apikey=${ARBISCAN_API_KEY}` + )}?module=contract&action=getsourcecode&address=${address}&apikey=${ARBISCAN_API_KEY}` } else { // Ethereum - url = `${getEtherscanBaseURL( - chainId, - true - )}/api/?module=contract&action=getsourcecode&address=${address}&apikey=${ETHERSCAN_API_KEY}` + url = `${getVerificationURL( + chainId + )}/api?module=contract&action=getsourcecode&address=${address}&apikey=${ETHERSCAN_API_KEY}` } // Check to see if already verified @@ -154,7 +153,7 @@ export async function verifyContract( } catch (e) { console.log( `IMPORTANT: failed to verify ${contract}. - ${getEtherscanBaseURL(chainId)}/address/${address}#code`, + ${getVerificationURL(chainId)}/address/${address}#code`, e ) } @@ -163,14 +162,9 @@ export async function verifyContract( } } -export const getEtherscanBaseURL = (chainId: number, api = false) => { - let prefix: string - if (api) prefix = chainId == 1 ? 'api.' : `api-${hre.network.name}.` - else prefix = chainId == 1 ? '' : `${hre.network.name}.` - return `https://${prefix}etherscan.io` -} +export const getVerificationURL = (chainId: number) => { + if (chainId == 1) return 'https://api.etherscan.io' -export const getCustomVerificationURL = (chainId: number) => { // For Base, get URL from HH config const chainConfig = hre.config.etherscan.customChains.find((chain) => chain.chainId == chainId) if (!chainConfig || !chainConfig.urls) { @@ -188,10 +182,9 @@ export const getEmptyDeployment = (): IDeployments => { }, tradingLib: '', basketLib: '', - facets: { actFacet: '', readFacet: '' }, + facets: { actFacet: '', readFacet: '', maxIssuableFacet: '' }, facade: '', facadeWriteLib: '', - cvxMiningLib: '', facadeWrite: '', deployer: '', rsrAsset: '', diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index a750f337bd..a1babf1a77 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -7,7 +7,6 @@ import { networkConfig, } from '../../common/configuration' import { fp, bn } from '../../common/numbers' -import { USDC_ARBITRUM_ORACLE_ERROR } from '../../test/plugins/individual-collateral/aave-v3/constants' import { getDeploymentFile, getAssetCollDeploymentFilename, @@ -69,13 +68,13 @@ async function main() { if (baseL2Chains.includes(hre.network.name)) { await verifyContract( chainId, - deployments.collateral.USDbC, + deployments.collateral.USDC, [ { priceTimeout: priceTimeout.toString(), chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC, oracleError: usdcOracleError.toString(), - erc20: networkConfig[chainId].tokens.USDbC, + erc20: networkConfig[chainId].tokens.USDC, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: usdcOracleTimeout, targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -87,7 +86,7 @@ async function main() { ) } - if (!arbitrumL2Chains.includes(hre.network.name)) { + if (!arbitrumL2Chains.includes(hre.network.name) && !baseL2Chains.includes(hre.network.name)) { /******** Verify StaticATokenLM - aDAI **************************/ // Get AToken to retrieve name and symbol const aToken: ATokenMock = ( @@ -106,7 +105,7 @@ async function main() { 'Static ' + (await aToken.name()), 's' + (await aToken.symbol()), ], - 'contracts/plugins/assets/aave/vendor/StaticATokenLM.sol:StaticATokenLM' + 'contracts/plugins/assets/aave/StaticATokenLM.sol:StaticATokenLM' ) /******** Verify ATokenFiatCollateral - aDAI **************************/ await verifyContract( @@ -240,28 +239,6 @@ async function main() { ], 'contracts/plugins/assets/SelfReferentialCollateral.sol:SelfReferentialCollateral' ) - - /********************** Verify EURFiatCollateral - EURT ****************************************/ - await verifyContract( - chainId, - deployments.collateral.EURT, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.EURT, - oracleError: fp('0.02').toString(), // 2% - erc20: networkConfig[chainId].tokens.EURT, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24hr - targetName: ethers.utils.formatBytes32String('EUR'), - defaultThreshold: fp('0.03').toString(), // 3% - delayUntilDefault: bn('86400').toString(), // 24h - }, - networkConfig[chainId].chainlinkFeeds.EUR, - '86400', - ], - 'contracts/plugins/assets/EURFiatCollateral.sol:EURFiatCollateral' - ) } } diff --git a/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts b/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts index 596b1f03c4..93ce97fd68 100644 --- a/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts +++ b/scripts/verification/collateral-plugins/verify_convex_ethplus_eth.ts @@ -2,14 +2,13 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' import { developmentChains, networkConfig } from '../../../common/configuration' import { ONE_ADDRESS } from '../../../common/constants' -import { bn } from '../../../common/numbers' +import { bn, fp } from '../../../common/numbers' import { getDeploymentFile, getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -69,7 +68,7 @@ async function main() { defaultThreshold: DEFAULT_THRESHOLD.add(WETH_ORACLE_ERROR), // 2% + delayUntilDefault: DELAY_UNTIL_DEFAULT, // 72h }, - revenueHiding.toString(), + fp('1e-3').toString(), { nTokens: 2, curvePool: ETHPLUS_BP_POOL, diff --git a/scripts/verification/collateral-plugins/verify_morpho.ts b/scripts/verification/collateral-plugins/verify_morpho.ts index 4f9e6d832b..7119245c6e 100644 --- a/scripts/verification/collateral-plugins/verify_morpho.ts +++ b/scripts/verification/collateral-plugins/verify_morpho.ts @@ -86,16 +86,16 @@ async function main() { priceTimeout: priceTimeout.toString(), oracleError: combinedBTCWBTCError.toString(), // 0.25% maxTradeVolume: fp('1e6'), // $1m, - oracleTimeout: '3600', // 1 hr + oracleTimeout: '86400', // 24 hr targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: fp('0.01').add(combinedBTCWBTCError), // ~3.5% delayUntilDefault: bn('86400'), // 24h - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.BTC!, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.WBTC!, erc20: await maWBTC.erc20(), }, revenueHiding, - networkConfig[chainId].chainlinkFeeds.WBTC!, - '86400', // 1 hr + networkConfig[chainId].chainlinkFeeds.BTC!, + '3600', // 1 hr ], 'contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol:MorphoNonFiatCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_sdai.ts b/scripts/verification/collateral-plugins/verify_sdai.ts index 393c6264b3..f34f279849 100644 --- a/scripts/verification/collateral-plugins/verify_sdai.ts +++ b/scripts/verification/collateral-plugins/verify_sdai.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { priceTimeout, verifyContract } from '../../deployment/utils' import { POT } from '../../../test/plugins/individual-collateral/dsr/constants' let deployments: IAssetCollDeployments @@ -37,7 +37,7 @@ async function main() { oracleError: fp('0.0025').toString(), // 0.25% erc20: networkConfig[chainId].tokens.sDAI, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.0125').toString(), // 1.25% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_sfrax.ts b/scripts/verification/collateral-plugins/verify_sfrax.ts index 5e4be4fc45..f6fe3a1d6d 100644 --- a/scripts/verification/collateral-plugins/verify_sfrax.ts +++ b/scripts/verification/collateral-plugins/verify_sfrax.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { priceTimeout, verifyContract } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -36,7 +36,7 @@ async function main() { oracleError: fp('0.01').toString(), // 1% erc20: networkConfig[chainId].tokens.sFRAX, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '3600').toString(), // 1 hr + oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.02').toString(), // 2% delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts index 7505cfdb85..b0f8794085 100644 --- a/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_yearn_v2_curve_usdc.ts @@ -7,7 +7,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract } from '../../deployment/utils' +import { priceTimeout, verifyContract } from '../../deployment/utils' import { PRICE_PER_SHARE_HELPER, YVUSDC_LP_TOKEN, @@ -40,7 +40,7 @@ async function main() { oracleError: fp('0.0025').toString(), // not used but can't be empty erc20: networkConfig[chainId].tokens.yvCurveUSDCcrvUSD, maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout(chainId, '86400').toString(), // 24hr -- max of all oracleTimeouts + oracleTimeout: '86400', // 24hr -- max of all oracleTimeouts targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.015').toString(), // 1.5% = max oracleError + 1% delayUntilDefault: bn('86400').toString(), // 24h @@ -51,14 +51,11 @@ async function main() { curvePool: YVUSDC_LP_TOKEN, poolType: '0', feeds: [ - networkConfig[chainId].chainlinkFeeds.USDC, - networkConfig[chainId].chainlinkFeeds.crvUSD, + [networkConfig[chainId].chainlinkFeeds.USDC], + [networkConfig[chainId].chainlinkFeeds.crvUSD], ], - oracleTimeouts: [ - oracleTimeout(chainId, '86400').toString(), - oracleTimeout(chainId, '86400').toString(), - ], - oracleErrors: [fp('0.0025').toString(), fp('0.005').toString()], + oracleTimeouts: [['86400'], ['86400']], + oracleErrors: [[fp('0.0025').toString()], [fp('0.005').toString()]], lpToken: YVUSDC_LP_TOKEN, }, PRICE_PER_SHARE_HELPER, diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index 7d0bb839ca..d3fed82f61 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -72,7 +72,6 @@ async function main() { 'collateral-plugins/verify_morpho.ts', 'collateral-plugins/verify_aave_v3_usdc.ts', 'collateral-plugins/verify_yearn_v2_curve_usdc.ts', - 'collateral-plugins/verify_yearn_v2_curve_usdp.ts', 'collateral-plugins/verify_sfrax.ts', 'collateral-plugins/verify_sfrax_eth.ts', 'collateral-plugins/verify_steakusdc.ts', @@ -81,10 +80,10 @@ async function main() { } else if (chainId == '8453' || chainId == '84531') { // Base L2 chains scripts.push( - 'collateral-plugins/verify_cbeth.ts', - 'collateral-plugins/verify_cusdbcv3.ts', + 'collateral-plugins/verify_cusdcv3.ts', 'collateral-plugins/verify_aave_v3_usdc.ts', - 'collateral-plugins/verify_stargate_usdc', + 'collateral-plugins/verify_wsteth.ts', + 'collateral-plugins/verify_cbeth.ts', 'assets/verify_stg.ts' ) } else if (chainId == '42161' || chainId == '421614') { diff --git a/tasks/deployment/create-deployer-registry.ts b/tasks/deployment/create-deployer-registry.ts index 125510b071..bdaaf019c0 100644 --- a/tasks/deployment/create-deployer-registry.ts +++ b/tasks/deployment/create-deployer-registry.ts @@ -1,6 +1,6 @@ import { getChainId } from '../../common/blockchain-utils' import { task, types } from 'hardhat/config' -import { DeployerRegistry, IDeployer } from '../../typechain' +import { DeployerRegistry } from '../../typechain' export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000' diff --git a/tasks/upgrades/validate-upgrade.ts b/tasks/upgrades/validate-upgrade.ts index 21c199e4fb..beceec0786 100644 --- a/tasks/upgrades/validate-upgrade.ts +++ b/tasks/upgrades/validate-upgrade.ts @@ -52,7 +52,15 @@ task('validate-upgrade', 'Validates if upgrade to new version is safe') await validateUpgrade(hre, deployments.implementations.main, 'MainP1') await validateUpgrade(hre, deployments.implementations.components.rToken, 'RTokenP1') - await validateUpgrade(hre, deployments.implementations.components.stRSR, 'StRSRP1Votes') + await validateUpgrade( + hre, + deployments.implementations.components.stRSR, + 'StRSRP1Votes', + undefined, + undefined, + undefined, + true + ) await validateUpgrade( hre, deployments.implementations.components.assetRegistry, @@ -102,7 +110,8 @@ const validateUpgrade = async ( factoryName: string, tradingLibAddress?: string, basketLibAddress?: string, - unsafeAllow?: any[] + unsafeAllow?: any[], + unsafeAllowRenames?: boolean ) => { // Get Contract Factory let contractFactory: ContractFactory @@ -129,6 +138,7 @@ const validateUpgrade = async ( await hre.upgrades.validateUpgrade(prevImplAddress, contractFactory, { kind: 'uups', unsafeAllow, + unsafeAllowRenames, }) console.log( diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 222fbb1d96..e104d87385 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -54,13 +54,7 @@ import { PRICE_TIMEOUT, } from './fixtures' import { advanceToTimestamp, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' -import { - CollateralStatus, - TradeKind, - MAX_UINT256, - ONE_PERIOD, - ZERO_ADDRESS, -} from '#/common/constants' +import { CollateralStatus, TradeKind, MAX_UINT256, ZERO_ADDRESS } from '#/common/constants' import { expectTrade } from './utils/trades' import { mintCollaterals } from './utils/tokens' @@ -213,7 +207,7 @@ describe('Facade + FacadeMonitor contracts', () => { }) }) - describe('ReadFacet + ActFacet', () => { + describe('Facets', () => { let issueAmount: BigNumber const expectValidBasketBreakdown = async (rToken: TestIRToken) => { diff --git a/test/fixtures.ts b/test/fixtures.ts index 1af9aa578d..c769bd5e94 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -46,6 +46,7 @@ import { GnosisTrade, IAssetRegistry, MainP1, + MaxIssuableFacet, MockV3Aggregator, RevenueTraderP1, RTokenAsset, @@ -411,6 +412,7 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt facade: TestIFacade readFacet: ReadFacet actFacet: ActFacet + maxIssuableFacet: MaxIssuableFacet facadeTest: FacadeTest facadeMonitor: FacadeMonitor broker: TestIBroker @@ -751,6 +753,18 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = Object.entries(actFacet.functions).map(([fn]) => actFacet.interface.getSighash(fn)) ) + // Save MaxIssuableFacet to Facade + const MaxIssuableFacetFactory: ContractFactory = await ethers.getContractFactory( + 'MaxIssuableFacet' + ) + const maxIssuableFacet = await MaxIssuableFacetFactory.deploy() + await facade.save( + maxIssuableFacet.address, + Object.entries(maxIssuableFacet.functions).map(([fn]) => + maxIssuableFacet.interface.getSighash(fn) + ) + ) + return { rsr, rsrAsset, @@ -782,6 +796,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = facade, readFacet, actFacet, + maxIssuableFacet, facadeTest, facadeMonitor, rsrTrader, diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index a6ac53aa39..e0adbbffc9 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -9,7 +9,7 @@ const forkBlockNumber = { 'old-curve-plugins': 16915576, // Ethereum 'new-curve-plugins': 19626711, // Ethereum // TODO add all the block numbers we fork from to benefit from caching - default: 19635384, // Ethereum + default: 19742528, // Ethereum } export default forkBlockNumber From 7de427497eb77f3d5227ae15fab8d060ec5a3e33 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 30 Apr 2024 18:03:15 -0400 Subject: [PATCH 366/450] add task for forking governor anastasius from existing governor alexios --- .../deployment/deploy-governor-anastasius.ts | 43 +++++++++++++++++++ tasks/index.ts | 1 + 2 files changed, 44 insertions(+) create mode 100644 tasks/deployment/deploy-governor-anastasius.ts diff --git a/tasks/deployment/deploy-governor-anastasius.ts b/tasks/deployment/deploy-governor-anastasius.ts new file mode 100644 index 0000000000..626e12ed9d --- /dev/null +++ b/tasks/deployment/deploy-governor-anastasius.ts @@ -0,0 +1,43 @@ +import { getChainId } from '../../common/blockchain-utils' +import { task } from 'hardhat/config' +import { bn } from '../../common/numbers' + +task( + 'deploy-governor-anastasius', + 'Deploy an instance of governor anastasius from an existing deployment of Governor Alexios' +) + .addParam('governor', 'The previous governor, must be of type Alexios') + .setAction(async (params, hre) => { + const chainId = await getChainId(hre) + + const oldGovernor = await hre.ethers.getContractAt('Governance', params.governor) + const timelock = await hre.ethers.getContractAt( + 'TimelockController', + await oldGovernor.timelock() + ) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await oldGovernor.token()) + if ((await oldGovernor.name()) != 'Governor Alexios') throw new Error('Alexios only') + + let blocktime = 1 // arbitrum + if (chainId == 1 || chainId == 3 || chainId == 5) blocktime = 12 // mainnet + if (chainId == 8453 || chainId == 84531) blocktime = 2 // base + + const votingDelay = await oldGovernor.votingDelay() + const votingPeriod = await oldGovernor.votingPeriod() + const proposalThresholdVotes = await oldGovernor.proposalThreshold() + const stRSRSupply = await stRSR.totalSupply() + const quorumNumerator = await oldGovernor['quorumNumerator()']() + if (!(await oldGovernor.quorumDenominator()).eq(100)) throw new Error('quorumDenominator wrong') + + const GovernorAnastasiusFactory = await hre.ethers.getContractFactory('Governance') + const governorAnastasius = await GovernorAnastasiusFactory.deploy( + stRSR.address, + timelock.address, + votingDelay.mul(blocktime), + votingPeriod.mul(blocktime), + proposalThresholdVotes.mul(bn('1e8')).div(stRSRSupply), + quorumNumerator + ) + + console.log('Deployed a new Governor Anastasius to: ', governorAnastasius.address) + }) diff --git a/tasks/index.ts b/tasks/index.ts index b1a9df3b56..a15a094fbd 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -21,6 +21,7 @@ import './deployment/empty-wallet' import './deployment/cancel-tx' import './deployment/sign-msg' import './deployment/get-addresses' +import './deployment/deploy-governor-anastasius' import './upgrades/force-import' import './upgrades/validate-upgrade' import './testing/mint-tokens' From 6e99d5095df51a8d35d09c0bd06353e72cbedab7 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Thu, 2 May 2024 21:26:17 -0400 Subject: [PATCH 367/450] Proposal validator (#1132) Co-authored-by: Taylor Brent --- common/blockchain-utils.ts | 17 +- common/configuration.ts | 6 + package.json | 7 +- run.sh | 1 + .../addresses/1-tmp-assets-collateral.json | 122 +++++ scripts/addresses/1-tmp-deployments.json | 38 ++ scripts/refresh-whales.ts | 158 ++++++ scripts/whalesConfig.ts | 65 +++ tasks/index.ts | 5 +- tasks/testing/tenderly.ts | 64 --- .../upgrade-checker-utils/upgrades/2_1_0.ts | 233 --------- .../upgrade-checker-utils/upgrades/3_0_0.ts | 464 ------------------ .../upgrades/3_3_0_plugins.ts | 207 -------- tasks/testing/upgrade-checker.ts | 345 ------------- tasks/{testing => validation}/mint-tokens.ts | 0 tasks/validation/proposal-validator.ts | 316 ++++++++++++ tasks/validation/proposals/3_4_0.ts | 169 +++++++ ...8432860995231621586111571059800714939.json | 14 + ...8997429824418248202790423910218544052.json | 85 ++++ tasks/validation/test-proposal.ts | 85 ++++ .../utils}/constants.ts | 0 .../utils}/governance.ts | 18 +- .../utils}/logs.ts | 0 .../utils}/oracles.ts | 16 +- .../utils}/rewards.ts | 14 +- .../utils}/rtokens.ts | 2 +- .../utils}/trades.ts | 122 +++-- tasks/validation/whales/whales_1.json | 158 ++++++ tasks/validation/whales/whales_31337.json | 140 ++++++ tasks/validation/whales/whales_8453.json | 54 ++ .../MorphoAAVEFiatCollateral.test.ts | 22 +- .../MorphoAaveV2TokenisedDeposit.test.ts | 2 +- .../morpho-aave/mintCollateralTo.ts | 9 +- utils/env.ts | 1 + yarn.lock | 195 +++++++- 35 files changed, 1759 insertions(+), 1395 deletions(-) create mode 100755 run.sh create mode 100644 scripts/addresses/1-tmp-assets-collateral.json create mode 100644 scripts/addresses/1-tmp-deployments.json create mode 100644 scripts/refresh-whales.ts create mode 100644 scripts/whalesConfig.ts delete mode 100644 tasks/testing/tenderly.ts delete mode 100644 tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts delete mode 100644 tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts delete mode 100644 tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts delete mode 100644 tasks/testing/upgrade-checker.ts rename tasks/{testing => validation}/mint-tokens.ts (100%) create mode 100644 tasks/validation/proposal-validator.ts create mode 100644 tasks/validation/proposals/3_4_0.ts create mode 100644 tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json create mode 100644 tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json create mode 100644 tasks/validation/test-proposal.ts rename tasks/{testing/upgrade-checker-utils => validation/utils}/constants.ts (100%) rename tasks/{testing/upgrade-checker-utils => validation/utils}/governance.ts (95%) rename tasks/{testing/upgrade-checker-utils => validation/utils}/logs.ts (100%) rename tasks/{testing/upgrade-checker-utils => validation/utils}/oracles.ts (91%) rename tasks/{testing/upgrade-checker-utils => validation/utils}/rewards.ts (87%) rename tasks/{testing/upgrade-checker-utils => validation/utils}/rtokens.ts (99%) rename tasks/{testing/upgrade-checker-utils => validation/utils}/trades.ts (73%) create mode 100644 tasks/validation/whales/whales_1.json create mode 100644 tasks/validation/whales/whales_31337.json create mode 100644 tasks/validation/whales/whales_8453.json diff --git a/common/blockchain-utils.ts b/common/blockchain-utils.ts index 0b426b568c..bf34e006b4 100644 --- a/common/blockchain-utils.ts +++ b/common/blockchain-utils.ts @@ -1,8 +1,9 @@ +import { useEnv } from '#/utils/env' import { BigNumber } from 'ethers' import { HardhatRuntimeEnvironment } from 'hardhat/types' // getChainId: Returns current chain Id -export const getChainId = async (hre: HardhatRuntimeEnvironment) => { +export const getChainId = async (hre: HardhatRuntimeEnvironment): Promise => { let _chainId try { _chainId = await hre.network.provider.send('eth_chainId') @@ -17,6 +18,20 @@ export const getChainId = async (hre: HardhatRuntimeEnvironment) => { if (_chainId.startsWith('0x')) { _chainId = BigNumber.from(_chainId).toString() } + + if (useEnv('FORK') && _chainId === '31337') { + switch (useEnv('FORK_NETWORK').toLowerCase()) { + case 'mainnet': + _chainId = '1' + break; + case 'base': + _chainId = '8453' + break; + case 'arbitrum': + _chainId = '42161' + break; + } + } return _chainId } diff --git a/common/configuration.ts b/common/configuration.ts index e91482385a..bfae5bab6a 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -67,6 +67,7 @@ export interface ITokens { wstETH?: string rETH?: string cUSDCv3?: string + wcUSDCv3?: string cUSDbCv3?: string ONDO?: string sFRAX?: string @@ -105,6 +106,8 @@ export interface ITokens { Re7WETH?: string } +export type ITokensKeys = Array; + export interface IFeeds { stETHETH?: string stETHUSD?: string @@ -215,6 +218,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', + wcUSDCv3: '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A', ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', sFRAX: '0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32', sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', @@ -333,6 +337,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', + wcUSDCv3: '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A', ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', cbETH: '0xBe9895146f7AF43049ca1c1AE358B0541Ea49704', @@ -483,6 +488,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { cbETH: '0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22', cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', cUSDCv3: '0xb125E6687d4313864e53df431d5425969c15Eb2F', + wcUSDCv3: '0xA694f7177C6c839C951C74C797283B35D0A486c8', aBasUSDC: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB', saBasUSDC: '0x184460704886f9F2A7F3A0c2887680867954dC6E', // our wrapper aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', diff --git a/package.json b/package.json index 72bc0501de..9442079bf1 100644 --- a/package.json +++ b/package.json @@ -10,11 +10,12 @@ }, "scripts": { "compile": "hardhat compile", - "devchain": "FORK=true hardhat node --port 8546", + "devchain": "NODE_OPTIONS='--max-old-space-size=12000' FORK=true hardhat node --port 8546", "deploy:check_env": "hardhat run scripts/check_env.ts", "deploy:run": "hardhat run scripts/deploy.ts", "deploy:confirm": "hardhat run scripts/confirm.ts", "deploy:verify_etherscan": "hardhat run scripts/verify_etherscan.ts", + "whales": "npx hardhat run scripts/refresh-whales.ts", "test:extreme": "EXTREME=1 PROTO_IMPL=1 npx hardhat test test/{Broker,Furnace,RTokenExtremes,ZTradingExtremes,ZZStRSR}.test.ts", "test:extreme:integration": "FORK=1 EXTREME=1 PROTO_IMPL=1 npx hardhat test test/integration/**/*.test.ts", "test:unit": "yarn test:plugins && yarn test:p0 && yarn test:p1", @@ -70,7 +71,7 @@ "@types/node": "^12.20.37", "@typescript-eslint/eslint-plugin": "5.17.0", "@typescript-eslint/parser": "5.17.0", - "axios": "^0.24.0", + "axios": "^1.6.8", "bignumber.js": "^9.1.1", "caip": "^1.1.0", "chai": "^4.3.4", @@ -115,6 +116,8 @@ "@aave/periphery-v3": "^2.5.0", "@nomicfoundation/hardhat-toolbox": "^2.0.1", "@types/isomorphic-fetch": "^0.0.36", + "axios-retry": "^4.1.0", + "cheerio": "^1.0.0-rc.12", "isomorphic-fetch": "^3.0.0" } } diff --git a/run.sh b/run.sh new file mode 100755 index 0000000000..b49a6b9040 --- /dev/null +++ b/run.sh @@ -0,0 +1 @@ +NODE_OPTIONS='--max-old-space-size=12000' FORK=true npx hardhat proposal-validator --proposalid 19635069547141631801899721667815895344178432860995231621586111571059800714939 --network hardhat --verbose \ No newline at end of file diff --git a/scripts/addresses/1-tmp-assets-collateral.json b/scripts/addresses/1-tmp-assets-collateral.json new file mode 100644 index 0000000000..b7d3762111 --- /dev/null +++ b/scripts/addresses/1-tmp-assets-collateral.json @@ -0,0 +1,122 @@ +{ + "assets": { + "stkAAVE": "0xF4493581D52671a9E04d693a68ccc61853bceEaE", + "COMP": "0x63eDdF26Bc65eDa1D1c0147ce8E23c09BE963596", + "CRV": "0xc18bF46F178F7e90b9CD8b7A8b00Af026D5ce3D3", + "CVX": "0x7ef93b20C10E6662931b32Dd9D4b85861eB2E4b8" + }, + "collateral": { + "DAI": "0xEc375F2984D21D5ddb0D82767FD8a9C4CE8Eec2F", + "USDC": "0x442f8fc98e3cc6B3d49a66f9858Ac9B6e70Dad3e", + "USDT": "0xe7Dcd101A027Ec34860ECb634a2797d0D2dc4d8b", + "USDP": "0x4C0B21Acb267f1fAE4aeFA977A26c4a63C9B35e6", + "BUSD": "0x97bb4a995b98b1BfF99046b3c518276f78fA5250", + "aDAI": "0x9ca9A9cdcE9E943608c945E7001dC89EB163991E", + "aUSDC": "0xc4240D22FFa144E2712aACF3E2cC302af0339ED0", + "aUSDT": "0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333", + "aBUSD": "0x01F9A6bf339cff820cA503A56FD3705AE35c27F7", + "aUSDP": "0xda5cc207CCefD116fF167a8ABEBBd52bD67C958E", + "cDAI": "0x337E418b880bDA5860e05D632CF039B7751B907B", + "cUSDC": "0x043be931D9C4422e1cFeA528e19818dcDfdE9Ebc", + "cUSDT": "0x5ceadb6606C5D82FcCd3f9b312C018fE1f8aa6dA", + "cUSDP": "0xa0c02De8FfBb9759b9beBA5e29C82112688A0Ff4", + "cWBTC": "0xC0f89AFcb6F1c4E943aA61FFcdFc41fDcB7D84DD", + "cETH": "0x4d3A8507a8eb9036895efdD1a462210CE58DE4ad", + "WBTC": "0x832D65735E541c0404a58B741bEF5652c2B7D0Db", + "WETH": "0xADDca344c92Be84A053C5CBE8e067460767FB816", + "wstETH": "0xb7049ee9F533D32C9434101f0645E6Ea5DFe2cdb", + "rETH": "0x987f5e0f845D46262893e680b652D8aAF1B5bCc0", + "fUSDC": "0xB58D95003Af73CF76Ce349103726a51D4Ec8af17", + "fUSDT": "0xD5254b740FbEF6AAcD674936ea7Fb9f4053781aF", + "fDAI": "0xA0a620B94446a7DC8952ECf252FcC495eeC65873", + "fFRAX": "0xFd9c32198D3cf3ad3b165918FD78De3654cb22eA", + "cUSDCv3": "0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0", + "cvx3Pool": "0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2", + "cvxPayPool": "0x5315Fbe0CEB299F53aE375f65fd9376767C8224c", + "cvxeUSDFRAXBP": "0xE529B59C1764d6E5a274099Eb660DD9e130A5481", + "cvxMIM3Pool": "0x3d21f841C0Fb125176C1DBDF0DE196b071323A75", + "cvxETHPlusETH": "0xc4a5Fb266E8081D605D87f0b1290F54B0a5Dc221", + "crveUSDFRAXBP": "0x945b0ad788dD6dB3864AB23876C68C1bf000d237", + "crvMIM3Pool": "0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62", + "crv3Pool": "0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9", + "sDAI": "0x62a9DDC6FF6077E823690118eCc935d16A8de47e", + "cbETH": "0xC8b80813cad9139D0eeFe38C711a11b20147aA54", + "maUSDT": "0x2F8F8Ac64ECbAC38f212b05115836120784a29F7", + "maUSDC": "0xC5d03FB7A38E6025D9A32C7444cfbBfa18B7D656", + "maDAI": "0x7be70371e7ECd9af5A5b49015EC8F8C336B52D81", + "maWBTC": "0x75B6921925e8BD632380706e722035752ffF175d", + "maWETH": "0xA402078f0A2e077Ea2b1Fb3b6ab74F0cBA10E508", + "maStETH": "0x4a139215D9E696c0e7618a441eD3CFd12bbD8CD6", + "yvCurveUSDCcrvUSD": "0x1573416df7095F698e37A954D9e951868E526650", + "yvCurveUSDPcrvUSD": "0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF", + "sFRAX": "0x0b7DcCBceA6f985301506D575E2661bf858CdEcC", + "saEthUSDC": "0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB", + "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E", + "bbUSDT": "0x3017d881724D93783e7f065Cc5F62c81C62c36A0", + "steakUSDC": "0x4895b9aee383b5dec499F54172Ccc7Ee05FC8Bbc", + "steakPYUSD": "0xBd01C789Be742688fb73F6aE46f1320196B6c973", + "Re7WETH": "0x3421d2cB19c8E69c6FA642C43e60cD943e75Ca8b", + "cvxCrvUSDUSDC": "0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5", + "cvxCrvUSDUSDT": "0x69c6597690B8Df61D15F201519C03725bdec40c1", + "sfrxETH": "0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67" + }, + "erc20s": { + "stkAAVE": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "COMP": "0xc00e94Cb662C3520282E6f5717214004A7f26888", + "DAI": "0x6B175474E89094C44Da98b954EedeAC495271d0F", + "USDC": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", + "USDT": "0xdAC17F958D2ee523a2206206994597C13D831ec7", + "USDP": "0x8E870D67F660D95d5be530380D0eC0bd388289E1", + "BUSD": "0x4Fabb145d64652a948d72533023f6E7A623C7C53", + "aDAI": "0x717AC7A53C6a6a5529175dff7fCc76858436f8c0", + "aUSDC": "0xa8157BF67Fd7BcDCC139CB9Bf1bd7Eb921A779D3", + "aUSDT": "0x684AA4faf9b07d5091B88c6e0a8160aCa5e6d17b", + "aBUSD": "0xf3840c4B214699F94fBB69ad3922f44176c93658", + "aUSDP": "0x5Ad7CeD3c64847980082e106390DeC3765A5f1C4", + "cDAI": "0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643", + "cUSDC": "0x39AA39c021dfbaE8faC545936693aC917d5E7563", + "cUSDT": "0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9", + "cUSDP": "0x041171993284df560249B57358F931D9eB7b925D", + "cWBTC": "0xccF4429DB6322D5C611ee964527D42E5d685DD6a", + "cETH": "0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5", + "WBTC": "0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599", + "WETH": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2", + "wstETH": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "rETH": "0xae78736Cd615f374D3085123A210448E74Fc6393", + "fUSDC": "0x465a5a630482f3abD6d3b84B39B29b07214d19e5", + "fUSDT": "0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7", + "fDAI": "0xe2bA8693cE7474900A045757fe0efCa900F6530b", + "fFRAX": "0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B", + "cUSDCv3": "0x27F2f159Fe990Ba83D57f39Fd69661764BEbf37a", + "cvx3Pool": "0x24CDc6b4Edd3E496b7283D94D93119983A61056a", + "cvxPayPool": "0x511daB8150966aFfE15F0a5bFfBa7F4d2b62DEd4", + "cvxeUSDFRAXBP": "0x81697e25DFf8564d9E0bC6D27edb40006b34ea2A", + "cvxMIM3Pool": "0x3e8f7EDc03E0133b95EcB4dD2f72B5027E695413", + "cvxETHPlusETH": "0xDbC0cE2321B76D3956412B36e9c0FA9B0fD176E7", + "crv3Pool": "0x8A6029C6D921dCa4fAbf6F5b2F6D14606F8Fd0aB", + "crveUSDFRAXBP": "0x3D07B9b2Aa60843470e6dAb09a0c3a31DE42E7Ea", + "crvMIM3Pool": "0xB1d0076d156D83B117De3bc63E7CE8031AB117fD", + "sDAI": "0x83f20f44975d03b1b09e64809b757c47f942beea", + "cbETH": "0xBe9895146f7AF43049ca1c1AE358B0541Ea49704", + "maUSDT": "0x9FD7165AEf369913258F4C8B19c9C350C2dE63cC", + "maUSDC": "0x6Bf3356923E6D611b8352B4895135e1Edfcf217B", + "maDAI": "0x9E5EC103944c19D7E7aBfb2947a865d51bc6947C", + "maWBTC": "0x1F423dC943738b9c31cB3d96c2A744dd7502593d", + "maWETH": "0xB7c4c4a2B7453E10d7e4e23Fa8E8D2335d09afab", + "maStETH": "0xAdc10669354aAd42A581E6F6cC8990B540AA5689", + "yvCurveUSDCcrvUSD": "0x7cA00559B978CFde81297849be6151d3ccB408A9", + "yvCurveUSDPcrvUSD": "0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469", + "sFRAX": "0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32", + "saEthUSDC": "0x0aDc69041a2B086f8772aCcE2A754f410F211bed", + "saEthPyUSD": "0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b", + "bbUSDT": "0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1", + "steakUSDC": "0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB", + "steakPYUSD": "0xbEEF02e5E13584ab96848af90261f0C8Ee04722a", + "Re7WETH": "0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0", + "cvxCrvUSDUSDC": "0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8", + "cvxCrvUSDUSDT": "0x5d1B749bA7f689ef9f260EDC54326C48919cA88b", + "sfrxETH": "0xac3E018457B222d93114458476f3E3416Abbe38F", + "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", + "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B" + } +} diff --git a/scripts/addresses/1-tmp-deployments.json b/scripts/addresses/1-tmp-deployments.json new file mode 100644 index 0000000000..3101baf7e4 --- /dev/null +++ b/scripts/addresses/1-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0x320623b8E4fF03373931769A31Fc52A4E78B5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "0xa54544C6C36C0d776cc4F04EBB847e0BB3A11ea2", + "facade": "0x2C7ca56342177343A2954C250702Fd464f4d0613", + "facets": { + "actFacet": "0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB", + "readFacet": "0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526", + "maxIssuableFacet": "0x5771d976696AA180Fed276FB6571fE2f41D0b849" + }, + "facadeWriteLib": "0xDf73Cd789422040182b0C24a8b2C97bbCbba3263", + "basketLib": "0xf383dC60D29A5B9ba461F40A0606870d80d1EA88", + "facadeWrite": "0x1D94290F82D0B417B088d9F5dB316B11C9cf220C", + "deployer": "0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF", + "rsrAsset": "0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA", + "implementations": { + "main": "0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7", + "trading": { + "gnosisTrade": "0x030c9B66Ac089cB01aA2058FC8f7d9baddC9ae75", + "dutchTrade": "0x971c890ACb9EeB084f292996Be667bB9A2889AE9" + }, + "components": { + "assetRegistry": "0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463", + "backingManager": "0x20C801869e578E71F2298649870765Aa81f7DC69", + "basketHandler": "0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC", + "broker": "0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c", + "distributor": "0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee", + "furnace": "0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81", + "rsrTrader": "0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c", + "rTokenTrader": "0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c", + "rToken": "0x784955641292b0014BC9eF82321300f0b6C7E36d", + "stRSR": "0xE433673648c94FEC0706E5AC95d4f4097f58B5fb" + } + } +} diff --git a/scripts/refresh-whales.ts b/scripts/refresh-whales.ts new file mode 100644 index 0000000000..5f170ae066 --- /dev/null +++ b/scripts/refresh-whales.ts @@ -0,0 +1,158 @@ +import hre from 'hardhat' +import { getChainId } from '../common/blockchain-utils' +import { ITokens, ITokensKeys, networkConfig } from '#/common/configuration' +import { whileImpersonating } from '#/utils/impersonation' +import axios from "axios"; +import * as cheerio from "cheerio"; +import { NetworkWhales, RTOKENS, getWhalesFile, getWhalesFileName } from './whalesConfig'; +import fs from 'fs' +import { useEnv } from '#/utils/env'; + +// set to true to force a refresh of all whales +const FORCE_REFRESH = useEnv('FORCE_WHALE_REFRESH'); +const BASESCAN_API_KEY = useEnv('BASESCAN_API_KEY') +const FORK_NETWORK = useEnv('FORK_NETWORK') + +const SCANNER_URLS: {[key: string]: string} = { + 'mainnet': 'etherscan.io', + 'base': 'basescan.org' +} + +const getstRSRs = async (rTokens: string[]) => { + const strsrs: string[] = [] + for (let i = 0; i < rTokens.length; i++) { + const rToken = rTokens[i] + const rTokenContract = await hre.ethers.getContractAt('RTokenP1', rToken) + // lazy way to skip rtokens that are bridged + try { + const mainAddress = await rTokenContract.main() + const main = await hre.ethers.getContractAt('IMain', mainAddress) + strsrs.push(await main.stRSR()) + } catch {} + } + return strsrs +} + +async function main() { + const chainId = await getChainId(hre) + + // ********** Read config ********** + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + console.log('Refreshing whales for network', chainId, hre.network.name, FORK_NETWORK) + + const rTokens = RTOKENS[chainId] + const stRSRs = await getstRSRs(rTokens) + + const whalesFile = getWhalesFileName(chainId) + const whales: NetworkWhales = getWhalesFile(chainId) + + const isGoodWhale = (whale: string) => { + return !stRSRs.includes(whale) + } + + const getBigWhale = async (token: string) => { + const ethUrl = `https://${SCANNER_URLS[FORK_NETWORK]}/token/generic-tokenholders2?m=light&a=${token}&p=1` + // const response = await axios.get(ethUrl); + + if (FORK_NETWORK === 'mainnet') { + const response = await axios.get(ethUrl); + const selector = cheerio.load(response.data); + let found = false; + let i = 0; + let whale = ""; + while (!found) { + whale = selector(selector("tbody > tr")[i]).find("td > div > .link-secondary")[0].attribs['data-clipboard-text']; + if (isGoodWhale(whale)) { + found = true; + break; + } + i++; + } + return whale + } else if (FORK_NETWORK === 'base') { + const response = await fetch(ethUrl, { + "headers": { + "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", + "accept-language": "en-US,en;q=0.9", + "cache-control": "max-age=0", + "priority": "u=0, i", + "sec-ch-ua": "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\", \"Not-A.Brand\";v=\"99\"", + "sec-ch-ua-mobile": "?0", + "sec-ch-ua-platform": "\"macOS\"", + "sec-fetch-dest": "document", + "sec-fetch-mode": "navigate", + "sec-fetch-site": "none", + "sec-fetch-user": "?1", + "upgrade-insecure-requests": "1" + }, + "referrerPolicy": "strict-origin-when-cross-origin", + "body": null, + "method": "GET", + "mode": "cors", + "credentials": "include" + }); + const selector = cheerio.load(await response.text()); + let found = false; + let i = 0; + let whale = ""; + while (!found) { + whale = selector(selector("tbody > tr")[i]).find("td > span > a")[0].attribs['href'].split('?a=')[1]; + if (isGoodWhale(whale)) { + found = true; + break; + } + i++; + } + return whale; + } else { + throw new Error('Invalid network') + } + // TODO: make sure that the selector is ok to use + // example: if the token is RSR, we don't want an stRSR to be the whale + } + + const refreshWhale = async (tokenAddress: string) => { + let tokenWhale = whales.tokens[tokenAddress] + let lastUpdated = whales.lastUpdated[tokenAddress] + // only get a big whale if the whale is not already set or if it was last updated more than 1 day ago + if (!FORCE_REFRESH && tokenWhale && lastUpdated && new Date().getTime() - new Date(lastUpdated).getTime() < 86400000) { + console.log('Whale already set for', tokenAddress, 'skipping...') + return + } + console.log('Getting whale for', tokenAddress) + try { + const bigWhale = await getBigWhale(tokenAddress) + // FIX THIS + whales.tokens[tokenAddress] = bigWhale + whales.lastUpdated[tokenAddress] = new Date().toISOString() + fs.writeFileSync(whalesFile, JSON.stringify(whales, null, 2)) + console.log(`Whale ${bigWhale} updated for`, tokenAddress) + } catch (error) { + console.error('Error getting whale for', tokenAddress, error) + } + } + + // ERC20 Collaterals + const tokens: ITokensKeys = Object.keys(networkConfig[chainId].tokens) as ITokensKeys + for (let i = 0; i < tokens.length; i++) { + let tokenAddress = networkConfig[chainId].tokens[tokens[i]]!.toLowerCase() + await refreshWhale(tokenAddress) + } + + // RTokens + for (let i = 0; i < rTokens.length; i++) { + let tokenAddress = rTokens[i] + await refreshWhale(tokenAddress) + } + + console.log('All whales updated for network', chainId) +} + +main() + .then(() => process.exit(0)) + .catch((error) => { + console.error(error) + process.exit(1) + }) \ No newline at end of file diff --git a/scripts/whalesConfig.ts b/scripts/whalesConfig.ts new file mode 100644 index 0000000000..1adf923ba4 --- /dev/null +++ b/scripts/whalesConfig.ts @@ -0,0 +1,65 @@ +import { ITokens } from "#/common/configuration" +import fs from "fs" + +export interface Whales { + [key: string]: string +} +export interface Updated { + [key: string]: string +} + +export interface NetworkWhales { + tokens: Whales + lastUpdated: Updated +} + +export interface RTokens { + [key: string]: string[] +} + +export const RTOKENS: RTokens = { + // mainnet + '1': [ + '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F'.toLowerCase(), // eUSD + '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8'.toLowerCase(), // ETH+ + '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be'.toLowerCase(), // hyUSD + '0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b'.toLowerCase(), // USDC+ + '0x0d86883FAf4FfD7aEb116390af37746F45b6f378'.toLowerCase(), // USD3 + '0x78da5799CF427Fee11e9996982F4150eCe7a99A7'.toLowerCase(), // rgUSD + ], + // hardhat + '31337': [ + '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F'.toLowerCase(), // eUSD + '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8'.toLowerCase(), // ETH+ + '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be'.toLowerCase(), // hyUSD + '0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b'.toLowerCase(), // USDC+ + '0x0d86883FAf4FfD7aEb116390af37746F45b6f378'.toLowerCase(), // USD3 + '0x78da5799CF427Fee11e9996982F4150eCe7a99A7'.toLowerCase(), // rgUSD + ], + // base + '8453': [ + '0xCfA3Ef56d303AE4fAabA0592388F19d7C3399FB4'.toLowerCase(), // eUSD + '0xEFb97aaF77993922aC4be4Da8Fbc9A2425322677'.toLowerCase(), // USDC3 + '0x8E5E9DF4F0EA39aE5270e79bbABFCc34203A3470'.toLowerCase(), // rgUSD + '0xCc7FF230365bD730eE4B352cC2492CEdAC49383e'.toLowerCase(), // hyUSD + '0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff'.toLowerCase(), // bsdETH + '0xfE0D6D83033e313691E96909d2188C150b834285'.toLowerCase(), // iUSDC + '0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d'.toLowerCase(), // VAYA + ], + // arbitrum + '42161': [ + '0x12275DCB9048680c4Be40942eA4D92c74C63b844'.toLowerCase(), // eUSD + '0x18c14c2d707b2212e17d1579789fc06010cfca23'.toLowerCase(), // ETH+ + '0x96a993f06951b01430523d0d5590192d650ebf3e'.toLowerCase(), // rgUSD + ] +} + +export function getWhalesFileName(chainId: string | number): string { + return `./tasks/validation/whales/whales_${chainId}.json` +} + +export function getWhalesFile(chainId: string | number): NetworkWhales { + const whalesFile = getWhalesFileName(chainId) + const whales: NetworkWhales = JSON.parse(fs.readFileSync(whalesFile, 'utf8')) + return whales +} \ No newline at end of file diff --git a/tasks/index.ts b/tasks/index.ts index a15a094fbd..b595bfbebc 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -24,6 +24,5 @@ import './deployment/get-addresses' import './deployment/deploy-governor-anastasius' import './upgrades/force-import' import './upgrades/validate-upgrade' -import './testing/mint-tokens' -import './testing/upgrade-checker' -import './testing/tenderly' +import './validation/mint-tokens' +import './validation/proposal-validator' diff --git a/tasks/testing/tenderly.ts b/tasks/testing/tenderly.ts deleted file mode 100644 index 0622a6f68b..0000000000 --- a/tasks/testing/tenderly.ts +++ /dev/null @@ -1,64 +0,0 @@ -import { task } from 'hardhat/config' -import { networkConfig } from '../../common/configuration' -import { getChainId } from '../../common/blockchain-utils' -import { fp } from '#/common/numbers' -import { whileImpersonating } from '#/utils/impersonation' - -task('give-eth', 'Mints ETH to an address on a tenderly fork') - .addParam('address', 'Ethereum address to receive the tokens') - .addParam('rpc', 'The Tenderly RPC endpoint') - .setAction(async (params, hre) => { - const chainId = await getChainId(hre) - - // ********** Read config ********** - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - const forkProvider = new hre.ethers.providers.JsonRpcProvider(params.rpc) - - await forkProvider.send('tenderly_setBalance', [ - [params.address], - hre.ethers.utils.hexValue(hre.ethers.utils.parseUnits('10', 'ether').toHexString()), - ]) - - console.log(`10 ETH sent to ${params.address}`) - }) - -task('give-rsr-tenderly', 'Mints RSR to an address on a tenderly fork') - .addParam('address', 'Ethereum address to receive the tokens') - .addParam('rpc', 'The Tenderly RPC endpoint') - .setAction(async (params, hre) => { - const chainId = await getChainId(hre) - - // ********** Read config ********** - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - const rsr = await hre.ethers.getContractAt('ERC20Mock', networkConfig[chainId].tokens.RSR!) - - const unsignedTx = await rsr.populateTransaction['transfer'](params.address, fp('100e6')) - const rsrWhale = '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1' - const transactionParameters = [ - { - to: rsr.address, - from: rsrWhale, - data: unsignedTx.data, - gas: hre.ethers.utils.hexValue(300000), - gasPrice: hre.ethers.utils.hexValue(1), - value: hre.ethers.utils.hexValue(0), - }, - ] - - const forkProvider = new hre.ethers.providers.JsonRpcProvider(params.rpc) - - await forkProvider.send('tenderly_setBalance', [ - [rsrWhale], - hre.ethers.utils.hexValue(hre.ethers.utils.parseUnits('1', 'ether').toHexString()), - ]) - - const txHash = await forkProvider.send('eth_sendTransaction', transactionParameters) - - console.log(`100m RSR sent to ${params.address}`) - }) diff --git a/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts b/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts deleted file mode 100644 index c5398e5744..0000000000 --- a/tasks/testing/upgrade-checker-utils/upgrades/2_1_0.ts +++ /dev/null @@ -1,233 +0,0 @@ -import { whileImpersonating } from '#/utils/impersonation' -import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { ProposalBuilder, buildProposal } from '../governance' -import { Proposal } from '#/utils/subgraph' -import { overrideOracle, pushOracleForward } from '../oracles' -import { networkConfig } from '#/common/configuration' -import { recollateralize } from '../rtokens' -import { TradeKind } from '#/common/constants' -import { bn, fp } from '#/common/numbers' -import { advanceBlocks, advanceTime, getLatestBlockTimestamp } from '#/utils/time' -import { LogDescription, Interface } from 'ethers/lib/utils' -import { logToken } from '../logs' -import { QUEUE_START } from '#/common/constants' -import { getTrade } from '#/utils/trades' -import { whales } from '../constants' -import { BigNumber } from 'ethers' - -export default async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string, - governorAddress: string -) => { - console.log('\n* * * * * Run checks for release 2.1.0...') - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) - const governor = await hre.ethers.getContractAt('Governance', governorAddress) - const timelock = await hre.ethers.getContractAt('TimelockController', await governor.timelock()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - - // check Broker updates - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const preGnosis = await broker.gnosis() - const preTrade = await broker.batchTradeImplementation() - - const gnosisFactory = await hre.ethers.getContractFactory('EasyAuction') - const newGnosis = await gnosisFactory.deploy() - const tradeFactory = await hre.ethers.getContractFactory('GnosisTrade') - const newTrade = await tradeFactory.deploy() - - await whileImpersonating(hre, timelock.address, async (govSigner) => { - await broker.connect(govSigner).setGnosis(newGnosis.address) - await broker.connect(govSigner).setBatchTradeImplementation(newTrade.address) - }) - - const postGnosis = await broker.gnosis() - const postTrade = await broker.batchTradeImplementation() - - if (postGnosis != newGnosis.address) { - throw new Error(`setGnosis() failure: received: ${postGnosis} / expected: ${newGnosis.address}`) - } - - if (postTrade != newTrade.address) { - throw new Error( - `setBatchTradeImplementation() failure: received: ${postTrade} / expected: ${newTrade.address}` - ) - } - - await whileImpersonating(hre, timelock.address, async (govSigner) => { - await broker.connect(govSigner).setGnosis(preGnosis) - await broker.connect(govSigner).setBatchTradeImplementation(preTrade) - }) - - // check stRSR updates - // if these calls succeed, then the functions exist - await stRSR.getDraftRSR() - await stRSR.getStakeRSR() - await stRSR.getTotalDrafts() - - /* - Verify broker disable bug is gone - */ - await whileImpersonating(hre, timelock.address, async (govSigner) => { - await basketHandler - .connect(govSigner) - .setBackupConfig(hre.ethers.utils.formatBytes32String('USD'), bn(1), [ - networkConfig['1'].tokens.USDT!, - ]) - }) - - const ar = await hre.ethers.getContractAt('AssetRegistryP1', await main.assetRegistry()) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - const usdcCollat = await ar.toColl(networkConfig['1'].tokens.USDC!) - const usdc = await hre.ethers.getContractAt('FiatCollateral', usdcCollat) - const oracle = await overrideOracle(hre, await usdc.chainlinkFeed()) - const lastPrice = await oracle.latestAnswer() - await oracle.updateAnswer(lastPrice.mul(90).div(100)) - await ar.refresh() - - // default - await advanceTime(hre, 60 * 60 * 25) - await advanceBlocks(hre, 5 * 60 * 25) - - // push other oracles forward - console.log(`\nPushing some oracles forward for RToken ${rTokenAddress}...`) - const registry = await ar.getRegistry() - for (const asset of registry.assets) { - const assetContract = await hre.ethers.getContractAt('TestIAsset', asset) - const erc20 = await assetContract.erc20() - if (!logToken(erc20).includes('USDC')) { - await pushOracleForward(hre, asset) - } - } - - await ar.refresh() - await basketHandler.refreshBasket() - - const tradingDelay = await backingManager.tradingDelay() - await advanceBlocks(hre, tradingDelay / 12 + 1) - await advanceTime(hre, tradingDelay + 1) - - const iface: Interface = backingManager.interface - - // do first trade as a bad trade - // buy half of the auction for the absolute minimum price - - console.log('\n* * * * * Try to break broker...') - const r = await backingManager.rebalance(TradeKind.BATCH_AUCTION) - const resp = await r.wait() - for (const event of resp.events!) { - let parsedLog: LogDescription | undefined - try { - parsedLog = iface.parseLog(event) - } catch {} - if (parsedLog && parsedLog.name == 'TradeStarted') { - console.log( - `\n====== Trade Started: sell ${logToken(parsedLog.args.sell)} / buy ${logToken( - parsedLog.args.buy - )} ======\n\tmbuyAmount: ${parsedLog.args.minBuyAmount}\n\tsellAmount: ${ - parsedLog.args.sellAmount - }` - ) - // - // run trade - const tradeToken = parsedLog.args.sell - const trade = await getTrade(hre, backingManager, tradeToken) - const buyTokenAddress = await trade.buy() - console.log(`Running trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...`) - const endTime = await trade.endTime() - const worstPrice = await trade.worstCasePrice() // trade.buy() per trade.sell() - const auctionId = await trade.auctionId() - - /* - we're only placing a half bid - */ - const sellAmount = (await trade.initBal()).div(2) - - const sellToken = await hre.ethers.getContractAt('ERC20Mock', await trade.sell()) - const sellDecimals = await sellToken.decimals() - const buytoken = await hre.ethers.getContractAt('ERC20Mock', await buyTokenAddress) - const buyDecimals = await buytoken.decimals() - let buyAmount = sellAmount.mul(worstPrice).div(fp('1')) - if (buyDecimals > sellDecimals) { - buyAmount = buyAmount.mul(bn(10 ** (buyDecimals - sellDecimals))) - } else if (sellDecimals > buyDecimals) { - buyAmount = buyAmount.div(bn(10 ** (sellDecimals - buyDecimals))) - } - - buyAmount = buyAmount.add(1) // need 1 wei to be at min price - - const gnosis = await hre.ethers.getContractAt('EasyAuction', await trade.gnosis()) - await whileImpersonating(hre, whales[buyTokenAddress.toLowerCase()], async (whale) => { - const sellToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) - let repeat = true - while (repeat) { - try { - await sellToken.connect(whale).approve(gnosis.address, 0) - await sellToken.connect(whale).approve(gnosis.address, buyAmount) - await gnosis - .connect(whale) - .placeSellOrders( - auctionId, - [sellAmount], - [buyAmount], - [QUEUE_START], - hre.ethers.constants.HashZero - ) - repeat = false - } catch (e) { - console.log(e) - buyAmount = buyAmount.add(1) - console.log('Trying again...') - } - } - }) - - const lastTimestamp = await getLatestBlockTimestamp(hre) - await advanceTime(hre, BigNumber.from(endTime).sub(lastTimestamp).toString()) - await backingManager.settleTrade(tradeToken) - console.log(`Settled trade for ${logToken(buyTokenAddress)}.`) - } - } - - console.log('\n* * * * * Broker did not break!') - - await recollateralize(hre, rTokenAddress) - - console.log('\n2.1.0 check succeeded!') -} - -export const proposal_2_1_0: ProposalBuilder = async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string -): Promise => { - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - - const txs = [ - await broker.populateTransaction.upgradeTo('0x89209a52d085D975b14555F3e828F43fb7EaF3B7'), - await stRSR.populateTransaction.upgradeTo('0xfDa8C62d86E426D5fB653B6c44a455Bb657b693f'), - await basketHandler.populateTransaction.upgradeTo('0x5c13b3b6f40aD4bF7aa4793F844BA24E85482030'), - await rToken.populateTransaction.upgradeTo('0x5643D5AC6b79ae8467Cf2F416da6D465d8e7D9C1'), - await broker.populateTransaction.setBatchTradeImplementation( - '0xAd4B0B11B041BB1342fEA16fc9c12Ef2a6443439' - ), - ] - - const description = 'Upgrade Broker implementation and set new trade plugin' - - return buildProposal(txs, description) -} diff --git a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts b/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts deleted file mode 100644 index 82e7892e64..0000000000 --- a/tasks/testing/upgrade-checker-utils/upgrades/3_0_0.ts +++ /dev/null @@ -1,464 +0,0 @@ -import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { expect } from 'chai' -import { ProposalBuilder, buildProposal } from '../governance' -import { Proposal } from '#/utils/subgraph' -import { networkConfig } from '#/common/configuration' -import { bn, fp, toBNDecimals } from '#/common/numbers' -import { CollateralStatus, TradeKind, ZERO_ADDRESS } from '#/common/constants' -import { pushOraclesForward, setOraclePrice } from '../oracles' -import { whileImpersonating } from '#/utils/impersonation' -import { whales } from '../constants' -import { getTokens, runDutchTrade } from '../trades' -import { EURFiatCollateral, MockV3Aggregator } from '../../../../typechain' -import { - advanceTime, - advanceToTimestamp, - getLatestBlockTimestamp, - setNextBlockTimestamp, -} from '#/utils/time' - -export default async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string, - governorAddress: string -) => { - console.log('\n* * * * * Run checks for release 3.0.0...') - const [tester] = await hre.ethers.getSigners() - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) - const governor = await hre.ethers.getContractAt('Governance', governorAddress) - const timelockAddress = await governor.timelock() - const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) - - const assetRegistry = await hre.ethers.getContractAt( - 'AssetRegistryP1', - await main.assetRegistry() - ) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) - const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) - - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, rTokenAddress) - - /* - Asset Registry - new getters - */ - const nextTimestamp = (await getLatestBlockTimestamp(hre)) + 10 - await setNextBlockTimestamp(hre, nextTimestamp) - await assetRegistry.refresh() - expect(await assetRegistry.lastRefresh()).to.equal(nextTimestamp) - expect(await assetRegistry.size()).to.equal(16) - console.log(`successfully tested new AssetRegistry getters`) - - /* - New Basket validations - units and weights - */ - const usdcCollat = await assetRegistry.toColl(networkConfig['1'].tokens.USDC!) - const usdcFiatColl = await hre.ethers.getContractAt('FiatCollateral', usdcCollat) - const usdc = await hre.ethers.getContractAt('USDCMock', await usdcFiatColl.erc20()) - - // Attempt to change target weights in basket - await whileImpersonating(hre, timelockAddress, async (tl) => { - await expect( - basketHandler.connect(tl).setPrimeBasket([usdc.address], [fp('20')]) - ).to.be.revertedWith('new target weights') - }) - - // Attempt to change target unit in basket - const eurt = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.EURT!) - const EURFiatCollateralFactory = await hre.ethers.getContractFactory('EURFiatCollateral') - const feedMock = ( - await (await hre.ethers.getContractFactory('MockV3Aggregator')).deploy(8, bn('1e8')) - ) - const eurFiatCollateral = await EURFiatCollateralFactory.deploy( - { - priceTimeout: bn('604800'), - chainlinkFeed: feedMock.address, - oracleError: fp('0.01'), - erc20: eurt.address, - maxTradeVolume: fp('1000'), - oracleTimeout: await usdcFiatColl.oracleTimeout(), - targetName: hre.ethers.utils.formatBytes32String('EUR'), - defaultThreshold: fp('0.01'), - delayUntilDefault: bn('86400'), - }, - feedMock.address, - await usdcFiatColl.oracleTimeout() - ) - await eurFiatCollateral.refresh() - - // Attempt to set basket with an EUR token - await whileImpersonating(hre, timelockAddress, async (tl) => { - await assetRegistry.connect(tl).register(eurFiatCollateral.address) - await expect( - basketHandler.connect(tl).setPrimeBasket([eurt.address], [fp('1')]) - ).to.be.revertedWith('new target weights') - await assetRegistry.connect(tl).unregister(eurFiatCollateral.address) - }) - - console.log(`successfully tested validations of weights and units on basket switch`) - - /* - Main - Pausing issuance and trading - */ - // Can pause/unpause issuance and trading separately - await whileImpersonating(hre, timelockAddress, async (tl) => { - await main.connect(tl).pauseIssuance() - - await expect(rToken.connect(tester).issue(fp('100'))).to.be.revertedWith( - 'frozen or issuance paused' - ) - - await main.connect(tl).unpauseIssuance() - - await expect(rToken.connect(tester).issue(fp('100'))).to.emit(rToken, 'Issuance') - - await main.connect(tl).pauseTrading() - - await expect(backingManager.connect(tester).forwardRevenue([])).to.be.revertedWith( - 'frozen or trading paused' - ) - - await main.connect(tl).unpauseTrading() - - await expect(backingManager.connect(tester).forwardRevenue([])).to.not.be.reverted - }) - - console.log(`successfully tested issuance and trading pause`) - - /* - New getters/setters for auctions - */ - // Auction getters/setters - await whileImpersonating(hre, timelockAddress, async (tl) => { - await broker.connect(tl).enableBatchTrade() - await broker.connect(tl).enableDutchTrade(rsr.address) - }) - expect(await broker.batchTradeDisabled()).to.equal(false) - expect(await broker.dutchTradeDisabled(rsr.address)).to.equal(false) - - console.log(`successfully tested new auction getters/setters`) - - /* - Dust Auctions - */ - console.log(`testing dust auctions...`) - - const minTrade = bn('1e18') - const minTradePrev = await rsrTrader.minTradeVolume() - await whileImpersonating(hre, timelockAddress, async (tl) => { - await broker.connect(tl).setDutchAuctionLength(1800) - await rsrTrader.connect(tl).setMinTradeVolume(minTrade) - }) - await usdcFiatColl.refresh() - - const dustAmount = bn('1e17') - await getTokens(hre, usdc.address, toBNDecimals(dustAmount, 6), tester.address) - await usdc.connect(tester).transfer(rsrTrader.address, toBNDecimals(dustAmount, 6)) - - await expect(rsrTrader.manageTokens([usdc.address], [TradeKind.DUTCH_AUCTION])).to.emit( - rsrTrader, - 'TradeStarted' - ) - - await runDutchTrade(hre, rsrTrader, usdc.address) - - // Restore values - await whileImpersonating(hre, timelockAddress, async (tl) => { - await rsrTrader.connect(tl).setMinTradeVolume(minTradePrev) - await broker.connect(tl).setDutchAuctionLength(0) - }) - - console.log(`succesfully tested dust auctions`) - - /* - Warmup period - */ - - console.log(`testing warmup period...`) - - const usdcChainlinkFeed = await hre.ethers.getContractAt( - 'AggregatorV3Interface', - await usdcFiatColl.chainlinkFeed() - ) - - const roundData = await usdcChainlinkFeed.latestRoundData() - await setOraclePrice(hre, usdcFiatColl.address, bn('0.8e8')) - await assetRegistry.refresh() - expect(await usdcFiatColl.status()).to.equal(CollateralStatus.IFFY) - expect(await basketHandler.status()).to.equal(CollateralStatus.IFFY) - expect(await basketHandler.isReady()).to.equal(false) - - // Restore SOUND - await setOraclePrice(hre, usdcFiatColl.address, roundData.answer) - await assetRegistry.refresh() - - // Still cannot issue - expect(await usdcFiatColl.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - - // If warmup period defined - if ((await basketHandler.warmupPeriod()) > 0) { - expect(await basketHandler.isReady()).to.equal(false) - await expect(rToken.connect(tester).issue(fp('1'))).to.be.revertedWith('basket not ready') - - // Move post warmup period - await advanceTime(hre, Number(await basketHandler.warmupPeriod()) + 1) - } - - // Can issue now - expect(await usdcFiatColl.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - expect(await basketHandler.isReady()).to.equal(true) - await expect(rToken.connect(tester).issue(fp('1'))).to.emit(rToken, 'Issuance') - console.log(`succesfully tested warmup period`) - - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, rTokenAddress) - - /* - Melting occurs when paused - */ - - await whileImpersonating(hre, timelockAddress, async (tl) => { - await main.connect(tl).pauseIssuance() - await main.connect(tl).pauseTrading() - - await furnace.melt() - - await main.connect(tl).unpauseIssuance() - await main.connect(tl).unpauseTrading() - }) - console.log(`successfully tested melting during paused state`) - - /* - Stake and delegate - */ - - console.log(`testing stakeAndDelegate...`) - const stakeAmount = fp('4e6') - await whileImpersonating(hre, whales[networkConfig['1'].tokens.RSR!], async (rsrSigner) => { - expect(await stRSR.delegates(rsrSigner.address)).to.equal(ZERO_ADDRESS) - expect(await stRSR.balanceOf(rsrSigner.address)).to.equal(0) - - await rsr.connect(rsrSigner).approve(stRSR.address, stakeAmount) - await stRSR.connect(rsrSigner).stakeAndDelegate(stakeAmount, rsrSigner.address) - - expect(await stRSR.delegates(rsrSigner.address)).to.equal(rsrSigner.address) - expect(await stRSR.balanceOf(rsrSigner.address)).to.be.gt(0) - }) - console.log(`successfully tested stakeAndDelegate`) - - /* - Withdrawal leak - */ - - console.log(`testing withrawalLeak...`) - - // Decrease withdrawal leak to be able to test with previous stake - const withdrawalLeakPrev = await stRSR.withdrawalLeak() - const withdrawalLeak = withdrawalLeakPrev.eq(bn(0)) ? bn(0) : bn('1e5') - const unstakingDelay = await stRSR.unstakingDelay() - - await whileImpersonating(hre, timelockAddress, async (tl) => { - await stRSR.connect(tl).setWithdrawalLeak(withdrawalLeak) - }) - - await whileImpersonating(hre, whales[networkConfig['1'].tokens.RSR!], async (rsrSigner) => { - const withdrawal = stakeAmount - await stRSR.connect(rsrSigner).unstake(1) - await stRSR.connect(rsrSigner).unstake(withdrawal) - await stRSR.connect(rsrSigner).unstake(1) - - // Move forward past stakingWithdrawalDelay - await advanceToTimestamp(hre, Number(await getLatestBlockTimestamp(hre)) + unstakingDelay) - - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, rTokenAddress) - - let lastRefresh = await assetRegistry.lastRefresh() - - // Should not refresh if withdrawal leak is applied - await stRSR.connect(rsrSigner).withdraw(rsrSigner.address, 1) - if (withdrawalLeak.gt(bn(0))) { - expect(await assetRegistry.lastRefresh()).to.eq(lastRefresh) - } - - // Should refresh - await stRSR.connect(rsrSigner).withdraw(rsrSigner.address, 2) - expect(await assetRegistry.lastRefresh()).to.be.gt(lastRefresh) - lastRefresh = await assetRegistry.lastRefresh() - - // Should not refresh - await stRSR.connect(rsrSigner).withdraw(rsrSigner.address, 3) - if (withdrawalLeak.gt(bn(0))) { - expect(await assetRegistry.lastRefresh()).to.eq(lastRefresh) - } - }) - - // Restore values - await whileImpersonating(hre, timelockAddress, async (tl) => { - await stRSR.connect(tl).setWithdrawalLeak(withdrawalLeakPrev) - }) - console.log(`successfully tested withrawalLeak`) - - /* - Governance changes - */ - console.log(`testing governance...`) - - const EXECUTOR_ROLE = await timelock.EXECUTOR_ROLE() - expect(await timelock.hasRole(EXECUTOR_ROLE, governor.address)).to.equal(true) - expect(await timelock.hasRole(EXECUTOR_ROLE, ZERO_ADDRESS)).to.equal(false) - - console.log(`successfully tested governance`) - - // we pushed the chain forward, so we need to keep the rToken SOUND - await pushOraclesForward(hre, rTokenAddress) - - console.log('\n3.0.0 check succeeded!') -} - -export const proposal_3_0_0: ProposalBuilder = async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string, - governorAddress: string -): Promise => { - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const assetRegistry = await hre.ethers.getContractAt( - 'AssetRegistryP1', - await main.assetRegistry() - ) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const distributor = await hre.ethers.getContractAt('DistributorP1', await main.distributor()) - const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) - const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) - const rTokenTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rTokenTrader()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - - const governor = await hre.ethers.getContractAt('Governance', governorAddress) - const timelock = await hre.ethers.getContractAt('TimelockController', await governor.timelock()) - - const mainImplAddr = '0xF5366f67FF66A3CefcB18809a762D5b5931FebF8' - const batchTradeImplAddr = '0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630' - const dutchTradeImplAddr = '0x2387C22727ACb91519b80A15AEf393ad40dFdb2F' - const assetRegImplAddr = '0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450' - const bckMgrImplAddr = '0x0A388FC05AA017b31fb084e43e7aEaFdBc043080' - const bsktHdlImplAddr = '0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc' - const brokerImplAddr = '0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04' - const distImplAddr = '0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac' - const furnaceImplAddr = '0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c' - const rsrTraderImplAddr = '0x1cCa3FBB11C4b734183f997679d52DeFA74b613A' - const rTokenTraderImplAddr = '0x1cCa3FBB11C4b734183f997679d52DeFA74b613A' - const rTokenImplAddr = '0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F' - const stRSRImplAddr = '0xC98eaFc9F249D90e3E35E729e3679DD75A899c10' - - const cUSDCVaultAddr = '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022' - const cUSDCVaultCollateralAddr = '0x50a9d529EA175CdE72525Eaa809f5C3c47dAA1bB' - const cUSDTVaultAddr = '0x4Be33630F92661afD646081BC29079A38b879aA0' - const cUSDTVaultCollateralAddr = '0x5757fF814da66a2B4f9D11d48570d742e246CfD9' - const saUSDCAddr = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15' - const aUSDCCollateralAddr = '0x7CD9CA6401f743b38B3B16eA314BbaB8e9c1aC51' - const saUSDTAddr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' - const aUSDTCollateralAddr = '0xE39188Ddd4eb27d1D25f5f58cC6A5fD9228EEdeF' - - const RSRAssetAddr = '0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6' - const TUSDCollateralAddr = '0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2' - const USDPCollateralAddr = '0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89' - const DAICollateralAddr = '0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833' - const USDTCollateralAddr = '0x58D7bF13D3572b08dE5d96373b8097d94B1325ad' - const USDCCollateralAddr = '0xBE9D23040fe22E8Bd8A88BF5101061557355cA04' - const COMPAssetAddr = '0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1' - const stkAAVEAssetAddr = '0x6647c880Eb8F57948AF50aB45fca8FE86C154D24' - const RTokenAssetAddr = '0x70C34352a73b76322cEc6bB965B9fd1a95C77A61' - - // Step 1 - Update implementations - const txs = [ - await assetRegistry.populateTransaction.upgradeTo(assetRegImplAddr), - await backingManager.populateTransaction.upgradeTo(bckMgrImplAddr), - await basketHandler.populateTransaction.upgradeTo(bsktHdlImplAddr), - await broker.populateTransaction.upgradeTo(brokerImplAddr), - await distributor.populateTransaction.upgradeTo(distImplAddr), - await furnace.populateTransaction.upgradeTo(furnaceImplAddr), - await main.populateTransaction.upgradeTo(mainImplAddr), - await rsrTrader.populateTransaction.upgradeTo(rsrTraderImplAddr), - await rTokenTrader.populateTransaction.upgradeTo(rTokenTraderImplAddr), - await rToken.populateTransaction.upgradeTo(rTokenImplAddr), - await stRSR.populateTransaction.upgradeTo(stRSRImplAddr), - ] - - // Step 2 - Cache components - txs.push( - await backingManager.populateTransaction.cacheComponents(), - await distributor.populateTransaction.cacheComponents(), - await rsrTrader.populateTransaction.cacheComponents(), - await rTokenTrader.populateTransaction.cacheComponents() - ) - - // Step 3 - Register and swap assets - txs.push( - await assetRegistry.populateTransaction.register(cUSDCVaultCollateralAddr), - await assetRegistry.populateTransaction.register(cUSDTVaultCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(aUSDCCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(aUSDTCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(RSRAssetAddr), - await assetRegistry.populateTransaction.swapRegistered(TUSDCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(USDPCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(DAICollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(USDTCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(USDCCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(COMPAssetAddr), - await assetRegistry.populateTransaction.swapRegistered(stkAAVEAssetAddr), - await assetRegistry.populateTransaction.swapRegistered(RTokenAssetAddr) - ) - - // Step 4 - Basket change - txs.push( - await basketHandler.populateTransaction.setPrimeBasket( - [cUSDCVaultAddr, cUSDTVaultAddr, saUSDCAddr, saUSDTAddr], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ), - await basketHandler.populateTransaction.refreshBasket() - ) - - // Step 5 - Governance - const EXECUTOR_ROLE = await timelock.EXECUTOR_ROLE() - txs.push( - await timelock.populateTransaction.grantRole(EXECUTOR_ROLE, governor.address), - await timelock.populateTransaction.revokeRole(EXECUTOR_ROLE, ZERO_ADDRESS) - ) - - // Step 6 - Initializations - txs.push( - await basketHandler.populateTransaction.setWarmupPeriod(900), - await stRSR.populateTransaction.setWithdrawalLeak(bn('5e16')), - await broker.populateTransaction.setBatchTradeImplementation(batchTradeImplAddr), - await broker.populateTransaction.setDutchTradeImplementation(dutchTradeImplAddr), - await broker.populateTransaction.setDutchAuctionLength(1800) - ) - - const description = - 'Upgrade implementations, assets, set trade plugins, config values, and update basket' - - return buildProposal(txs, description) -} diff --git a/tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts b/tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts deleted file mode 100644 index 93cdc5ce88..0000000000 --- a/tasks/testing/upgrade-checker-utils/upgrades/3_3_0_plugins.ts +++ /dev/null @@ -1,207 +0,0 @@ -import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { expect } from 'chai' -import { ProposalBuilder, buildProposal } from '../governance' -import { Proposal } from '#/utils/subgraph' -import { networkConfig } from '#/common/configuration' -import { bn, fp, toBNDecimals } from '#/common/numbers' -import { CollateralStatus, TradeKind, ZERO_ADDRESS } from '#/common/constants' -import { setOraclePrice } from '../oracles' -import { whileImpersonating } from '#/utils/impersonation' -import { whales } from '../constants' -import { getTokens, runDutchTrade } from '../trades' -import { - advanceTime, - advanceToTimestamp, - getLatestBlockTimestamp, - setNextBlockTimestamp, -} from '#/utils/time' - -export default async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string, - governorAddress: string -) => { - console.log('\n* * * * * Run checks for release 3.3.0...') - const [tester] = await hre.ethers.getSigners() - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) - const governor = await hre.ethers.getContractAt('Governance', governorAddress) - const timelockAddress = await governor.timelock() - const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) - - const assetRegistry = await hre.ethers.getContractAt( - 'AssetRegistryP1', - await main.assetRegistry() - ) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) - const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) - - console.log('\n3.3.0 check succeeded!') -} - -const saUSDTCollateralAddr = '0x8AD3055286f4E59B399616Bd6BEfE24F64573928' -const saUSDCCollateralAddr = '0x6E14943224d6E4F7607943512ba17DbBA9524B8e' -const saEthUSDCCollateralAddr = '0x05beee046A5C28844804E679aD5587046dBffbc0' -const wcUSDCv3CollateralAddr = '0xf0Fb23485057Fd88C80B9CEc8b433FdA47e0a07A' -const cUSDTCollateralAddr = '0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8' -const saEthPyUSDCollateralAddr = '0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7' -const TUSDCollateralAddr = '0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2' -const cUSDCVaultCollateralAddr = '0x50a9d529ea175cde72525eaa809f5c3c47daa1bb' -const cUSDTVaultCollateralAddr = '0x5757fF814da66a2B4f9D11d48570d742e246CfD9' - -const saEthUSDCERC20Addr = '0x093cB4f405924a0C468b43209d5E466F1dd0aC7d' -const wcUSDCv3ERC20Addr = '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A' -const cUSDTVaultERC20Addr = '0x4Be33630F92661afD646081BC29079A38b879aA0' -const saUSDTERC20Addr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' -const cUSDTERC20Addr = '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9' -const saEthPyUSDERC20Addr = '0x8d6E0402A3E3aD1b43575b05905F9468447013cF' - -const batchTradeImplAddr = '0x803a52c5DAB69B78419bb160051071eF2F9Fd227' -const dutchTradeImplAddr = '0x4eDEb80Ce684A890Dd58Ae0d9762C38731b11b99' - -export const proposal_3_3_0_step_1: ProposalBuilder = async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string -): Promise => { - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const assetRegistry = await hre.ethers.getContractAt( - 'AssetRegistryP1', - await main.assetRegistry() - ) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - - // Build proposal - const txs = [ - await broker.populateTransaction.setDutchTradeImplementation(dutchTradeImplAddr), - await broker.populateTransaction.setBatchTradeImplementation(batchTradeImplAddr), - await assetRegistry.populateTransaction.swapRegistered(saUSDTCollateralAddr), - await assetRegistry.populateTransaction.swapRegistered(saUSDCCollateralAddr), - await assetRegistry.populateTransaction.register(saEthUSDCCollateralAddr), - await assetRegistry.populateTransaction.register(wcUSDCv3CollateralAddr), - await assetRegistry.populateTransaction.register(cUSDTCollateralAddr), - await assetRegistry.populateTransaction.register(saEthPyUSDCollateralAddr), - await basketHandler.populateTransaction.setPrimeBasket( - [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTVaultERC20Addr, saUSDTERC20Addr], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ), - await basketHandler.populateTransaction.refreshBasket(), - await rToken.populateTransaction.setRedemptionThrottleParams({ - amtRate: bn('25e23'), - pctRate: bn('125000000000000000'), - }), - ] - - const description = 'Step 1/4 of eUSD 3.3.0 plugin upgrade.' - - return buildProposal(txs, description) -} - -export const proposal_3_3_0_step_2: ProposalBuilder = async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string -): Promise => { - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - - // Build proposal - const txs = [ - await basketHandler.populateTransaction.setPrimeBasket( - [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTERC20Addr, saUSDTERC20Addr], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ), - await basketHandler.populateTransaction.refreshBasket(), - ] - - const description = 'Step 2/4 of eUSD 3.3.0 plugin upgrade.' - - return buildProposal(txs, description) -} - -export const proposal_3_3_0_step_3: ProposalBuilder = async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string -): Promise => { - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - - // Build proposal - const txs = [ - await basketHandler.populateTransaction.setPrimeBasket( - [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTERC20Addr, saEthPyUSDERC20Addr], - [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] - ), - await basketHandler.populateTransaction.refreshBasket(), - ] - - const description = 'Step 3/4 of eUSD 3.3.0 plugin upgrade.' - - return buildProposal(txs, description) -} - -export const proposal_3_3_0_step_4: ProposalBuilder = async ( - hre: HardhatRuntimeEnvironment, - rTokenAddress: string -): Promise => { - const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) - const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const assetRegistry = await hre.ethers.getContractAt( - 'AssetRegistryP1', - await main.assetRegistry() - ) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - - // Build proposal - const txs = [ - await rToken.populateTransaction.setIssuanceThrottleParams({ - amtRate: bn('2e24'), - pctRate: bn('100000000000000000'), - }), - await basketHandler.populateTransaction.setBackupConfig( - '0x5553440000000000000000000000000000000000000000000000000000000000', - bn('2000000000000000000'), - [ - '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48', - '0xdac17f958d2ee523a2206206994597c13d831ec7', - '0x8e870d67f660d95d5be530380d0ec0bd388289e1', - '0x6b175474e89094c44da98b954eedeac495271d0f', - ] - ), - await assetRegistry.populateTransaction.unregister(TUSDCollateralAddr), - await assetRegistry.populateTransaction.unregister(cUSDCVaultCollateralAddr), - await assetRegistry.populateTransaction.unregister(cUSDTVaultCollateralAddr), - await assetRegistry.populateTransaction.unregister(saUSDCCollateralAddr), - await assetRegistry.populateTransaction.unregister(saUSDTCollateralAddr), - ] - - const description = 'Step 4/4 of eUSD 3.3.0 plugin upgrade.' - - return buildProposal(txs, description) -} diff --git a/tasks/testing/upgrade-checker.ts b/tasks/testing/upgrade-checker.ts deleted file mode 100644 index 057f4ee5f7..0000000000 --- a/tasks/testing/upgrade-checker.ts +++ /dev/null @@ -1,345 +0,0 @@ -import { task } from 'hardhat/config' -import { networkConfig } from '../../common/configuration' -import { getChainId } from '../../common/blockchain-utils' -import { whileImpersonating } from '#/utils/impersonation' -import { useEnv } from '#/utils/env' -import { expect } from 'chai' -import { fp } from '#/common/numbers' -import { MAX_UINT256, TradeKind } from '#/common/constants' -import { formatEther, formatUnits } from 'ethers/lib/utils' -import { recollateralize, redeemRTokens } from './upgrade-checker-utils/rtokens' -import { claimRsrRewards } from './upgrade-checker-utils/rewards' -import { whales } from './upgrade-checker-utils/constants' -import { pushOraclesForward } from './upgrade-checker-utils/oracles' -import runChecks3_3_0, { - proposal_3_3_0_step_1, - proposal_3_3_0_step_2, - proposal_3_3_0_step_3, - proposal_3_3_0_step_4, -} from './upgrade-checker-utils/upgrades/3_3_0_plugins' -import { - passProposal, - executeProposal, - proposeUpgrade, - stakeAndDelegateRsr, - moveProposalToActive, - voteProposal, -} from './upgrade-checker-utils/governance' -import { advanceTime, getLatestBlockNumber } from '#/utils/time' - -// run script for eUSD (version 3.3.0) -// npx hardhat upgrade-checker --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --governor 0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6 - -/* - This script is currently useful for the upcoming eUSD upgrade. - In order to make this useful for future upgrades and for other rTokens, we will need the following: - - generic minting (5 pts) - - dynamically gather and approve the necessary basket tokens needed to mint - - use ZAPs - - generic reward claiming (5 pts) - - check for where revenue should be allocated - - dynamically run and complete necessary auctions to realize revenue - - generic basket switching (8 pts) - - not sure if possible if there is no backup basket - - 21-34 more points of work to make this more generic -*/ - -interface Params { - rtoken: string - governor: string - proposalId?: string -} - -task('upgrade-checker', 'Runs a proposal and confirms can fully rebalance + redeem + mint') - .addParam('rtoken', 'the address of the RToken being upgraded') - .addParam('governor', 'the address of the OWNER of the RToken being upgraded') - .addOptionalParam('proposalId', 'the ID of the governance proposal', undefined) - .setAction(async (params: Params, hre) => { - const chainId = await getChainId(hre) - - // make sure config exists - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // only run locally - if (hre.network.name != 'localhost' && hre.network.name != 'hardhat') { - throw new Error('Only run this on a local fork') - } - - // make sure subgraph is configured - if (params.proposalId && !useEnv('SUBGRAPH_URL')) { - throw new Error('SUBGRAPH_URL required for subgraph queries') - } - - console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) - - await hre.run('propose', { - step: '1', - rtoken: params.rtoken, - governor: params.governor, - }) - - await hre.run('recollateralize', { - rtoken: params.rtoken, - governor: params.governor, - }) - - await hre.run('propose', { - step: '2', - rtoken: params.rtoken, - governor: params.governor, - }) - - await hre.run('recollateralize', { - rtoken: params.rtoken, - governor: params.governor, - }) - - await hre.run('propose', { - step: '3', - rtoken: params.rtoken, - governor: params.governor, - }) - - await hre.run('recollateralize', { - rtoken: params.rtoken, - governor: params.governor, - }) - - await hre.run('propose', { - step: '4', - rtoken: params.rtoken, - governor: params.governor, - }) - - const rToken = await hre.ethers.getContractAt('IRToken', params.rtoken) - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) - const assetRegistry = await hre.ethers.getContractAt( - 'IAssetRegistry', - await main.assetRegistry() - ) - const basketHandler = await hre.ethers.getContractAt( - 'IBasketHandler', - await main.basketHandler() - ) - await assetRegistry.refresh() - if (!((await basketHandler.status()) == 0)) throw new Error('Basket is not SOUND') - if (!(await basketHandler.fullyCollateralized())) { - throw new Error('Basket is not fully collateralized') - } - console.log('Basket is SOUND and fully collateralized!') - }) - -interface ProposeParams { - step: string - rtoken: string - governor: string - proposalId?: string -} - -task('propose', 'propose a gov action') - .addParam('step', 'the step of the proposal') - .addParam('rtoken', 'the address of the RToken being upgraded') - .addParam('governor', 'the address of the OWNER of the RToken being upgraded') - .setAction(async (params: ProposeParams, hre) => { - const stepFunction = (() => { - console.log(`=========================== STEP ${params.step} ===============================`) - if (params.step === '1') { - return proposal_3_3_0_step_1 - } - if (params.step === '2') { - return proposal_3_3_0_step_2 - } - if (params.step === '3') { - return proposal_3_3_0_step_3 - } - if (params.step === '4') { - return proposal_3_3_0_step_4 - } - - throw Error('Invalid step') - })() - - const proposal = await proposeUpgrade(hre, params.rtoken, params.governor, stepFunction) - - await moveProposalToActive(hre, params.rtoken, params.governor, proposal.proposalId) - await voteProposal(hre, params.rtoken, params.governor, proposal.proposalId) - await passProposal(hre, params.rtoken, params.governor, proposal.proposalId) - await executeProposal(hre, params.rtoken, params.governor, proposal.proposalId, proposal) - }) - -task('recollateralize') - .addParam('rtoken', 'the address of the RToken being upgraded') - .addParam('governor', 'the address of the OWNER of the RToken being upgraded') - .setAction(async (params: Params, hre) => { - const [tester] = await hre.ethers.getSigners() - const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) - - // 2. Bring back to fully collateralized - const main = await hre.ethers.getContractAt('IMain', await rToken.main()) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - // const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - - /* - recollateralize - */ - await advanceTime(hre, (await backingManager.tradingDelay()) + 1) - await pushOraclesForward(hre, params.rtoken, []) - await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION).catch((e: Error) => { - if (e.message.includes('already collateralized')) { - console.log('Already Collateralized!') - - return - } - - throw e - }) - if (!(await basketHandler.fullyCollateralized())) throw new Error('Failed to recollateralize') - - // Give `tester` RTokens from a whale - const redeemAmt = fp('1e3') - await whileImpersonating(hre, whales[params.rtoken.toLowerCase()], async (whaleSigner) => { - await rToken.connect(whaleSigner).transfer(tester.address, redeemAmt) - }) - if (!(await rToken.balanceOf(tester.address)).gte(redeemAmt)) throw new Error('missing R') - - /* - redeem - */ - await redeemRTokens(hre, tester, params.rtoken, redeemAmt) - - // 3. Run the 3.0.0 checks - await runChecks3_3_0(hre, params.rtoken, params.governor) - - /* - mint - */ - - const issueAmt = redeemAmt.div(2) - console.log(`\nIssuing ${formatEther(issueAmt)} RTokens...`) - const [erc20s] = await basketHandler.quote(fp('1'), 0) - for (const e of erc20s) { - const erc20 = await hre.ethers.getContractAt( - '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', - e - ) - await erc20.connect(tester).approve(rToken.address, MAX_UINT256) // max approval - } - const preBal = await rToken.balanceOf(tester.address) - await rToken.connect(tester).issue(issueAmt) - - const postIssueBal = await rToken.balanceOf(tester.address) - if (!postIssueBal.eq(preBal.add(issueAmt))) { - throw new Error( - `Did not issue the correct amount of RTokens. wanted: ${formatUnits( - preBal.add(issueAmt), - 'mwei' - )} balance: ${formatUnits(postIssueBal, 'mwei')}` - ) - } - - console.log('Successfully minted RTokens') - - /* - claim rewards - */ - await claimRsrRewards(hre, params.rtoken) - - /* - staking/unstaking - */ - - // get RSR - const stakeAmount = fp('4e6') - const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.RSR!.toLowerCase()], - async (rsrSigner) => { - await rsr.connect(rsrSigner).transfer(tester.address, stakeAmount) - } - ) - - const balPrevRSR = await rsr.balanceOf(stRSR.address) - const balPrevStRSR = await stRSR.balanceOf(tester.address) - const testerBal = await rsr.balanceOf(tester.address) - - await stakeAndDelegateRsr(hre, rToken.address, tester.address) - - expect(await rsr.balanceOf(stRSR.address)).to.equal(balPrevRSR.add(testerBal)) - expect(await stRSR.balanceOf(tester.address)).to.be.gt(balPrevStRSR) - }) - -task('eusd-q1-2024-test', 'Test deployed eUSD Proposals').setAction(async (_, hre) => { - console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) - - const RTokenAddress = '0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f' - const RTokenGovernor = '0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6' - - const ProposalIdOne = - '114052081659629247617665835769035094910371266951213483500173240902265689564540' - const ProposalIdTwo = - '84013999114211651083886802889501217056607481369823717462033802424606122383108' - - // Make sure both proposals are active. - await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await hre.run('recollateralize', { - rtoken: RTokenAddress, - governor: RTokenGovernor, - }) - - await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - await hre.run('recollateralize', { - rtoken: RTokenAddress, - governor: RTokenGovernor, - }) -}) - -task('hyusd-q1-2024-test', 'Test deployed hyUSD Proposals').setAction(async (_, hre) => { - console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) - - const RTokenAddress = '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be' - const RTokenGovernor = '0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1' - - const ProposalIdOne = - '12128108731947079972460039600592322347543776217408895065380983128537007111991' - const ProposalIdTwo = - '67602359440860478788595002306085984888572052896929999758442845286427134600253' - - // Make sure both proposals are active. - await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await moveProposalToActive(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await voteProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await passProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdOne) - await executeProposal(hre, RTokenAddress, RTokenGovernor, ProposalIdTwo) - - await hre.run('recollateralize', { - rtoken: RTokenAddress, - governor: RTokenGovernor, - }) -}) diff --git a/tasks/testing/mint-tokens.ts b/tasks/validation/mint-tokens.ts similarity index 100% rename from tasks/testing/mint-tokens.ts rename to tasks/validation/mint-tokens.ts diff --git a/tasks/validation/proposal-validator.ts b/tasks/validation/proposal-validator.ts new file mode 100644 index 0000000000..72bd613e42 --- /dev/null +++ b/tasks/validation/proposal-validator.ts @@ -0,0 +1,316 @@ +import { task } from 'hardhat/config' +import { networkConfig } from '../../common/configuration' +import { getChainId } from '../../common/blockchain-utils' +import { whileImpersonating } from '#/utils/impersonation' +import { useEnv } from '#/utils/env' +import { expect } from 'chai' +import { fp } from '#/common/numbers' +import { MAX_UINT256, TradeKind } from '#/common/constants' +import { formatEther, formatUnits } from 'ethers/lib/utils' +import { recollateralize, redeemRTokens } from './utils/rtokens' +import { claimRsrRewards } from './utils/rewards' +import { pushOraclesForward } from './utils/oracles' +import { + passProposal, + executeProposal, + proposeUpgrade, + stakeAndDelegateRsr, + moveProposalToActive, + voteProposal, +} from './utils/governance' +import { advanceTime, getLatestBlockNumber } from '#/utils/time' +import { test_proposal } from './test-proposal' +import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { resetFork } from '#/utils/chain' +import fs from 'fs' +import { BigNumber } from 'ethers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { BasketHandlerP1 } from '@typechain/BasketHandlerP1' +import { RTokenP1 } from '@typechain/RTokenP1' +import { StRSRP1Votes } from '@typechain/StRSRP1Votes' +import { MainP1 } from '@typechain/MainP1' +import { IMain } from '@typechain/IMain' +import { Whales, getWhalesFile } from '#/scripts/whalesConfig' + +interface Params { + proposalid?: string +} + +task('proposal-validator', 'Runs a proposal and confirms can fully rebalance + redeem + mint') + .addParam('proposalid', 'the ID of the governance proposal', undefined) + .setAction(async (params: Params, hre) => { + await resetFork(hre, Number(process.env.FORK_BLOCK)) + + const chainId = await getChainId(hre) + + // make sure config exists + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // only run locally + if (hre.network.name != 'localhost' && hre.network.name != 'hardhat') { + throw new Error('Only run this on a local fork') + } + + // make sure subgraph is configured + if (params.proposalid && !useEnv('SUBGRAPH_URL')) { + throw new Error('SUBGRAPH_URL required for subgraph queries') + } + + console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) + + await hre.run('propose', { + pid: params.proposalid, + }) + + const proposalData = JSON.parse(fs.readFileSync(`./tasks/validation/proposals/proposal-${params.proposalid}.json`, 'utf-8')) + await hre.run('recollateralize', { + rtoken: proposalData.rtoken, + governor: proposalData.governor, + }) + + await hre.run('run-validations', { + rtoken: proposalData.rtoken, + governor: proposalData.governor, + }) + + const rToken = await hre.ethers.getContractAt('IRToken', proposalData.rtoken) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'IAssetRegistry', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'IBasketHandler', + await main.basketHandler() + ) + await assetRegistry.refresh() + if (!((await basketHandler.status()) == 0)) throw new Error('Basket is not SOUND') + if (!(await basketHandler.fullyCollateralized())) { + throw new Error('Basket is not fully collateralized') + } + console.log('Basket is SOUND and fully collateralized!') + }) + +interface ProposeParams { + pid: string +} + +task('propose', 'propose a gov action') + .addParam('pid', 'the ID of the governance proposal') + .setAction(async (params: ProposeParams, hre) => { + const proposalData = JSON.parse(fs.readFileSync(`./tasks/validation/proposals/proposal-${params.pid}.json`, 'utf-8')) + + const proposal = await proposeUpgrade(hre, proposalData.rtoken, proposalData.governor, proposalData) + + if (proposal.proposalId != params.pid) { + throw new Error(`Proposed Proposal ID does not match expected ID: ${params.pid}`) + } + + await moveProposalToActive(hre, proposalData.rtoken, proposalData.governor, proposal.proposalId) + await voteProposal(hre, proposalData.rtoken, proposalData.governor, proposal.proposalId) + await passProposal(hre, proposalData.governor, proposal.proposalId) + await executeProposal(hre, proposalData.rtoken, proposalData.governor, proposal.proposalId, proposal) + }) + +task('recollateralize') + .addParam('rtoken', 'the address of the RToken being upgraded') + .addParam('governor', 'the address of the OWNER of the RToken being upgraded') + .setAction(async (params, hre) => { + const [tester] = await hre.ethers.getSigners() + const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) + + // 2. Bring back to fully collateralized + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + // const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + + /* + recollateralize + */ + await advanceTime(hre, (await backingManager.tradingDelay()) + 1) + await pushOraclesForward(hre, params.rtoken, []) + await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION).catch((e: Error) => { + if (e.message.includes('already collateralized')) { + console.log('Already Collateralized!') + return + } + throw e + }) + if (!(await basketHandler.fullyCollateralized())) throw new Error('Failed to recollateralize') + }) + +task('run-validations', 'Runs all validations') + .addParam('rtoken', 'the address of the RToken being upgraded') + .addParam('governor', 'the address of the OWNER of the RToken being upgraded') + .setAction(async (params, hre) => { + const [tester] = await hre.ethers.getSigners() + const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) + + // 2. Bring back to fully collateralized + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + + /* + redeem + */ + // Give `tester` RTokens from a whale + const redeemAmt = fp('1e4') + await whileImpersonating(hre, whales[params.rtoken.toLowerCase()], async (whaleSigner) => { + await rToken.connect(whaleSigner).transfer(tester.address, redeemAmt) + }) + if (!(await rToken.balanceOf(tester.address)).gte(redeemAmt)) throw new Error('missing R') + + await runCheck_redeem(hre, tester, rToken.address, redeemAmt) + + /* + mint + */ + await runCheck_mint(hre, fp('1e3'), tester, basketHandler, rToken) + + /* + claim rewards + */ + await claimRsrRewards(hre, params.rtoken) + + await pushOraclesForward(hre, params.rtoken, []) + + /* + staking/unstaking + */ + await runCheck_stakeUnstake(hre, tester, rToken, stRSR, main) + }) + +const runCheck_stakeUnstake = async ( + hre: HardhatRuntimeEnvironment, + tester: SignerWithAddress, + rToken: RTokenP1, + stRSR: StRSRP1Votes, + main: IMain +) => { + const chainId = await getChainId(hre) + const whales = getWhalesFile(chainId).tokens + + // get RSR + const stakeAmount = fp('4e6') + const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.RSR!.toLowerCase()], + async (rsrSigner) => { + await rsr.connect(rsrSigner).transfer(tester.address, stakeAmount) + } + ) + + const balPrevRSR = await rsr.balanceOf(stRSR.address) + const balPrevStRSR = await stRSR.balanceOf(tester.address) + const testerBal = await rsr.balanceOf(tester.address) + + await stakeAndDelegateRsr(hre, rToken.address, tester.address) + + expect(await rsr.balanceOf(stRSR.address)).to.equal(balPrevRSR.add(testerBal)) + expect(await stRSR.balanceOf(tester.address)).to.be.gt(balPrevStRSR) +} + +const runCheck_redeem = async ( + hre: HardhatRuntimeEnvironment, + signer: SignerWithAddress, + rToken: string, + redeemAmt: BigNumber +) => { + await redeemRTokens(hre, signer, rToken, redeemAmt) +} + +const runCheck_mint = async ( + hre: HardhatRuntimeEnvironment, + issueAmt: BigNumber, + signer: SignerWithAddress, + basketHandler: BasketHandlerP1, + rToken: RTokenP1 +) => { + console.log(`\nIssuing ${formatEther(issueAmt)} RTokens...`) + const [erc20s] = await basketHandler.quote(fp('1'), 0) + for (const e of erc20s) { + const erc20 = await hre.ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', + e + ) + await erc20.connect(signer).approve(rToken.address, MAX_UINT256) // max approval + } + const preBal = await rToken.balanceOf(signer.address) + await rToken.connect(signer).issue(issueAmt) + + const postIssueBal = await rToken.balanceOf(signer.address) + if (!postIssueBal.eq(preBal.add(issueAmt))) { + throw new Error( + `Did not issue the correct amount of RTokens. wanted: ${formatUnits( + preBal.add(issueAmt), + 'mwei' + )} balance: ${formatUnits(postIssueBal, 'mwei')}` + ) + } + + console.log('Successfully minted RTokens') +} + +import { proposal_3_4_0_step_1 } from './proposals/3_4_0' + +task('print-proposal') + .addParam('rtoken', 'the address of the RToken being upgraded') + .addParam('gov', 'the address of the OWNER of the RToken being upgraded') + .addParam('time', 'the address of the timelock') + .setAction(async (params, hre) => { + const proposal = await proposal_3_4_0_step_1(hre, params.rtoken, params.gov, params.time) + + console.log(`\nGenerating and proposing proposal...`) + const [tester] = await hre.ethers.getSigners() + + await hre.run('give-rsr', { address: tester.address }) + await stakeAndDelegateRsr(hre, params.rtoken, tester.address) + + const governor = await hre.ethers.getContractAt('Governance', params.gov) + + const call = await governor.populateTransaction.propose( + proposal.targets, + proposal.values, + proposal.calldatas, + proposal.description + ) + + console.log(`Proposal Transaction:\n`, call.data) + + const r = await governor.propose( + proposal.targets, + proposal.values, + proposal.calldatas, + proposal.description + ) + const resp = await r.wait() + + console.log('\nSuccessfully proposed!') + console.log(`Proposal ID: ${resp.events![0].args!.proposalId}`) + + proposal.proposalId = resp.events![0].args!.proposalId.toString() + + fs.writeFileSync(`./tasks/validation/proposals/proposal-${proposal.proposalId}.json`, JSON.stringify(proposal, null, 2)) + }) \ No newline at end of file diff --git a/tasks/validation/proposals/3_4_0.ts b/tasks/validation/proposals/3_4_0.ts new file mode 100644 index 0000000000..b28a3838dc --- /dev/null +++ b/tasks/validation/proposals/3_4_0.ts @@ -0,0 +1,169 @@ +import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { ProposalBuilder, buildProposal } from '../utils/governance' +import { Proposal } from '#/utils/subgraph' +import { getDeploymentFile, getDeploymentFilename, IDeployments } from '#/scripts/deployment/common' +import { bn } from '#/common/numbers' + +const EXECUTOR_ROLE = '0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63' +const PROPOSER_ROLE = '0xb09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc1' + +// RToken address => Governor Anastasius address +export const GOVERNOR_ANASTASIUSES: { [key: string]: string } = { + '0xCc7FF230365bD730eE4B352cC2492CEdAC49383e': '0x5ef74a083ac932b5f050bf41cde1f67c659b4b88', + '0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff': '0x8A11D590B32186E1236B5E75F2d8D72c280dc880', + '0xfE0D6D83033e313691E96909d2188C150b834285': '0xaeCa35F0cB9d12D68adC4d734D4383593F109654', + '0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d': '0xC8f487B34251Eb76761168B70Dc10fA38B0Bd90b', + '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F': '0xfa4Cc3c65c5CCe085Fc78dD262d00500cf7546CD', + '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8': '0x991c13ff5e8bd3FFc59244A8cF13E0253C78d2bD', + '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be': '0xb79434b4778E5C1930672053f4bE88D11BbD1f97', + '0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b': '0x6814F3489cbE3EB32b27508a75821073C85C12b7', + '0x0d86883FAf4FfD7aEb116390af37746F45b6f378': '0x16a0F420426FD102a85A7CcA4BA25f6be1E98cFc', + '0x78da5799CF427Fee11e9996982F4150eCe7a99A7': '0xE5D337258a1e8046fa87Ca687e3455Eb8b626e1F', +} + +// some RTokens are on 1 week and some 2 week +const ONE_WEEK_REWARD_RATIO = '1146076687500' +const TWO_WEEK_REWARD_RATIO = '573038343750' + +export const proposal_3_4_0_step_1: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string, + governorAddress: string, + timelockAddress?: string +): Promise => { + const deploymentFilename = getDeploymentFilename(1) // mainnet only + const deployments = getDeploymentFile(deploymentFilename) + console.log(deployments.implementations.components) + + // Confirm old governor is Alexios + const alexios = await hre.ethers.getContractAt('Governance', governorAddress) + if ((await alexios.name()) != 'Governor Alexios') throw new Error('Governor Alexios only') + + // Confirm a Governor Anastasius exists + const anastasius = await hre.ethers.getContractAt( + 'Governance', + GOVERNOR_ANASTASIUSES[rTokenAddress] + ) + if ((await anastasius.name()) != 'Governor Anastasius') throw new Error('configuration error') + + // Validate timelock is controlled by governance + if (!timelockAddress) throw new Error('missing timelockAddress') + const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) + if (!(await timelock.hasRole(EXECUTOR_ROLE, governorAddress))) + throw new Error('missing EXECUTOR_ROLE') + if (!(await timelock.hasRole(PROPOSER_ROLE, governorAddress))) + throw new Error('missing PROPOSER_ROLE') + + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + const distributor = await hre.ethers.getContractAt('DistributorP1', await main.distributor()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) + const rTokenTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rTokenTrader()) + + // Build proposal + const txs = [ + await main.populateTransaction.upgradeTo(deployments.implementations.main), + await assetRegistry.populateTransaction.upgradeTo( + deployments.implementations.components.assetRegistry + ), + await backingManager.populateTransaction.upgradeTo( + deployments.implementations.components.backingManager + ), + await basketHandler.populateTransaction.upgradeTo( + deployments.implementations.components.basketHandler + ), + await broker.populateTransaction.upgradeTo(deployments.implementations.components.broker), + await distributor.populateTransaction.upgradeTo( + deployments.implementations.components.distributor + ), + await furnace.populateTransaction.upgradeTo(deployments.implementations.components.furnace), + await rsrTrader.populateTransaction.upgradeTo(deployments.implementations.components.rsrTrader), + await rTokenTrader.populateTransaction.upgradeTo( + deployments.implementations.components.rTokenTrader + ), + await stRSR.populateTransaction.upgradeTo(deployments.implementations.components.stRSR), + await rToken.populateTransaction.upgradeTo(deployments.implementations.components.rToken), + await broker.populateTransaction.cacheComponents(), + await backingManager.populateTransaction.cacheComponents(), + await distributor.populateTransaction.cacheComponents(), + await rTokenTrader.populateTransaction.cacheComponents(), + await rsrTrader.populateTransaction.cacheComponents(), + await broker.populateTransaction.setDutchTradeImplementation( + deployments.implementations.trading.dutchTrade + ), + await broker.populateTransaction.setBatchTradeImplementation( + deployments.implementations.trading.gnosisTrade + ), + await furnace.populateTransaction.setRatio(TWO_WEEK_REWARD_RATIO), + await stRSR.populateTransaction.setRewardRatio(TWO_WEEK_REWARD_RATIO), + // TODO + // plugin rotation + + await timelock.populateTransaction.grantRole(EXECUTOR_ROLE, anastasius.address), + await timelock.populateTransaction.grantRole(PROPOSER_ROLE, anastasius.address), + await timelock.populateTransaction.revokeRole(EXECUTOR_ROLE, alexios.address), + await timelock.populateTransaction.grantRole(PROPOSER_ROLE, alexios.address), + ] + + const description = '3.4.0 Upgrade (1/2) - Core Contracts + Plugins' + + return buildProposal(txs, description) +} + +export const proposal_3_4_0_step_2: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string, + governorAddress: string, + timelockAddress?: string +): Promise => { + // Confirm governor is now Anastasius + const anastasius = await hre.ethers.getContractAt('Governance', governorAddress) + if ((await anastasius.name()) != 'Governor Anastasius') throw new Error('step one incomplete') + + // Validate timelock is controlled by governance + if (!timelockAddress) throw new Error('missing timelockAddress') + const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) + if (!(await timelock.hasRole(EXECUTOR_ROLE, governorAddress))) + throw new Error('missing EXECUTOR_ROLE') + if (!(await timelock.hasRole(PROPOSER_ROLE, governorAddress))) + throw new Error('missing PROPOSER_ROLE') + + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + + // Build proposal + const txs = [ + await backingManager.populateTransaction.setTradingDelay(0), + await furnace.populateTransaction.setRatio(ONE_WEEK_REWARD_RATIO), + await stRSR.populateTransaction.setRewardRatio(ONE_WEEK_REWARD_RATIO), + await rToken.populateTransaction.setIssuanceThrottleParams({ + amtRate: bn('2e24'), + pctRate: bn('1e17'), + }), + ] + + const description = '3.4.0 Upgrade (2/2) - Parameters' + + return buildProposal(txs, description) +} \ No newline at end of file diff --git a/tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json b/tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json new file mode 100644 index 0000000000..6743faf97e --- /dev/null +++ b/tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json @@ -0,0 +1,14 @@ +{ + "rtoken": "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F", + "governor": "0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6", + "targets": [ + "0x6d309297ddDFeA104A6E89a132e2f05ce3828e07", + "0x6d309297ddDFeA104A6E89a132e2f05ce3828e07" + ], + "values": [0, 0], + "calldatas": [ + "0xef2b9337000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000093cb4f405924a0c468b43209d5e466f1dd0ac7d000000000000000000000000fbd1a538f5707c0d67a16ca4e3fc711b80bd931a000000000000000000000000f650c3d88d12db855b8bf7d11be6c55a4e07dcc90000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000003782dace9d9000000000000000000000000000000000000000000000000000003782dace9d9000000000000000000000000000000000000000000000000000003782dace9d9000000000000000000000000000000000000000000000000000003782dace9d90000", + "0x8a55015b" + ], + "description": "Test proposal (swap dai into the basket)" +} \ No newline at end of file diff --git a/tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json b/tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json new file mode 100644 index 0000000000..bedb8078e1 --- /dev/null +++ b/tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json @@ -0,0 +1,85 @@ +{ + "rtoken": "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F", + "governor": "0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6", + "timelock": "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", + "targets": [ + "0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a", + "0x9B85aC04A09c8C813c37de9B3d563C2D3F936162", + "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", + "0x6d309297ddDFeA104A6E89a132e2f05ce3828e07", + "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", + "0x8a77980f82A1d537600891D782BCd8bd41B85472", + "0x57084b3a6317bea01bA8f7c582eD033d9345c2B2", + "0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f", + "0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A", + "0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8", + "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F", + "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", + "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", + "0x8a77980f82A1d537600891D782BCd8bd41B85472", + "0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A", + "0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f", + "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", + "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", + "0x57084b3a6317bea01bA8f7c582eD033d9345c2B2", + "0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8", + "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", + "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", + "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", + "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c" + ], + "values": [ + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0, + 0 + ], + "calldatas": [ + "0x3659cfe600000000000000000000000024a4b37f9c40fb0e80ec436df2e9989fbafa8bb7", + "0x3659cfe6000000000000000000000000bf1c0206de440b2cf76ea4405e1dbf2fc227a463", + "0x3659cfe600000000000000000000000020c801869e578e71f2298649870765aa81f7dc69", + "0x3659cfe6000000000000000000000000ee7fc703f84ae2ce30475333c57e56d3a7d3adbc", + "0x3659cfe600000000000000000000000062bd44b05542bff1e59a01bf7151f533e1c9c12c", + "0x3659cfe600000000000000000000000044a42a0f14128e81a21c5fc4322a9f91ff83b4ee", + "0x3659cfe6000000000000000000000000845b8b0a1c6db8318414d708da25fa28d4a0dc81", + "0x3659cfe6000000000000000000000000c60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c", + "0x3659cfe6000000000000000000000000c60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c", + "0x3659cfe6000000000000000000000000e433673648c94fec0706e5ac95d4f4097f58b5fb", + "0x3659cfe6000000000000000000000000784955641292b0014bc9ef82321300f0b6c7e36d", + "0x7162c797", + "0x7162c797", + "0x7162c797", + "0x7162c797", + "0x7162c797", + "0x2a6b85da000000000000000000000000971c890acb9eeb084f292996be667bb9a2889ae9", + "0x6e300590000000000000000000000000030c9b66ac089cb01aa2058fc8f7d9baddc9ae75", + "0x4f533b23000000000000000000000000000000000000000000000000000000856bbf3646", + "0xd7ccc275000000000000000000000000000000000000000000000000000000856bbf3646", + "0x2f2ff15dd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63000000000000000000000000fa4cc3c65c5cce085fc78dd262d00500cf7546cd", + "0x2f2ff15db09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc1000000000000000000000000fa4cc3c65c5cce085fc78dd262d00500cf7546cd", + "0xd547741fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e630000000000000000000000007e880d8bd9c9612d6a9759f96acd23df4a4650e6", + "0x2f2ff15db09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc10000000000000000000000007e880d8bd9c9612d6a9759f96acd23df4a4650e6" + ], + "description": "3.4.0 Upgrade (1/2) - Core Contracts + Plugins", + "proposalId": "57514285674680658177308923843884653494858997429824418248202790423910218544052" +} \ No newline at end of file diff --git a/tasks/validation/test-proposal.ts b/tasks/validation/test-proposal.ts new file mode 100644 index 0000000000..c431515c1c --- /dev/null +++ b/tasks/validation/test-proposal.ts @@ -0,0 +1,85 @@ +import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { ProposalBuilder, buildProposal } from './utils/governance' +import { Proposal } from '#/utils/subgraph' +import { fp } from '#/common/numbers' + +export default async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string, + governorAddress: string +) => { + console.log('\n* * * * * Run checks for release 3.3.0...') + const [tester] = await hre.ethers.getSigners() + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const governor = await hre.ethers.getContractAt('Governance', governorAddress) + const timelockAddress = await governor.timelock() + const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) + + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + const backingManager = await hre.ethers.getContractAt( + 'BackingManagerP1', + await main.backingManager() + ) + const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) + const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) + + console.log('\n3.3.0 check succeeded!') +} + +export const saUSDTCollateralAddr = '0x8AD3055286f4E59B399616Bd6BEfE24F64573928' +export const saUSDCCollateralAddr = '0x6E14943224d6E4F7607943512ba17DbBA9524B8e' +export const saEthUSDCCollateralAddr = '0x05beee046A5C28844804E679aD5587046dBffbc0' +export const wcUSDCv3CollateralAddr = '0xf0Fb23485057Fd88C80B9CEc8b433FdA47e0a07A' +export const cUSDTCollateralAddr = '0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8' +export const saEthPyUSDCollateralAddr = '0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7' +export const TUSDCollateralAddr = '0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2' +export const cUSDCVaultCollateralAddr = '0x50a9d529ea175cde72525eaa809f5c3c47daa1bb' +export const cUSDTVaultCollateralAddr = '0x5757fF814da66a2B4f9D11d48570d742e246CfD9' +export const daiCollateralAddr = '0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833' + +export const saEthUSDCERC20Addr = '0x093cB4f405924a0C468b43209d5E466F1dd0aC7d' +export const wcUSDCv3ERC20Addr = '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A' +export const cUSDTVaultERC20Addr = '0x4Be33630F92661afD646081BC29079A38b879aA0' +export const saUSDTERC20Addr = '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9' +export const cUSDTERC20Addr = '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9' +export const saEthPyUSDERC20Addr = '0x8d6E0402A3E3aD1b43575b05905F9468447013cF' +export const daiAddr = '0x6B175474E89094C44Da98b954EedeAC495271d0F' + +const batchTradeImplAddr = '0x803a52c5DAB69B78419bb160051071eF2F9Fd227' +const dutchTradeImplAddr = '0x4eDEb80Ce684A890Dd58Ae0d9762C38731b11b99' + +export const test_proposal: ProposalBuilder = async ( + hre: HardhatRuntimeEnvironment, + rTokenAddress: string +): Promise => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) + const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) + const basketHandler = await hre.ethers.getContractAt( + 'BasketHandlerP1', + await main.basketHandler() + ) + + // Build proposal + const txs = [ + await basketHandler.populateTransaction.setPrimeBasket( + [saEthUSDCERC20Addr, wcUSDCv3ERC20Addr, cUSDTERC20Addr, daiAddr], + [fp('0.25'), fp('0.25'), fp('0.25'), fp('0.25')] + ), + await basketHandler.populateTransaction.refreshBasket(), + ] + + const description = 'Test proposal (swap dai into the basket)' + + return buildProposal(txs, description) +} diff --git a/tasks/testing/upgrade-checker-utils/constants.ts b/tasks/validation/utils/constants.ts similarity index 100% rename from tasks/testing/upgrade-checker-utils/constants.ts rename to tasks/validation/utils/constants.ts diff --git a/tasks/testing/upgrade-checker-utils/governance.ts b/tasks/validation/utils/governance.ts similarity index 95% rename from tasks/testing/upgrade-checker-utils/governance.ts rename to tasks/validation/utils/governance.ts index 37ca3c0157..10b2057004 100644 --- a/tasks/testing/upgrade-checker-utils/governance.ts +++ b/tasks/validation/utils/governance.ts @@ -31,7 +31,10 @@ export const moveProposalToActive = async ( // Advance time to start voting const votingDelay = await governor.votingDelay() - await advanceBlocks(hre, votingDelay.add(2)) + const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) + const version = await rToken.version() + if (version == '3.0.0' || version == '3.0.1') await advanceBlocks(hre, votingDelay.add(2)) + else await advanceTime(hre, votingDelay.add(2).toNumber()) } else { if (propState == ProposalState.Active) { console.log(`Proposal is already ${ProposalState[ProposalState.Active]}... skipping step.`) @@ -96,7 +99,6 @@ export const voteProposal = async ( export const passProposal = async ( hre: HardhatRuntimeEnvironment, - rtokenAddress: string, governorAddress: string, proposalId: string ) => { @@ -119,8 +121,7 @@ export const executeProposal = async ( rtokenAddress: string, governorAddress: string, proposalId: string, - proposal?: Proposal, - extraAssets: string[] = [] + proposal?: Proposal ) => { console.log('Executing Proposal:', proposalId) const governor = await hre.ethers.getContractAt('Governance', governorAddress) @@ -167,7 +168,7 @@ export const executeProposal = async ( ** Executing proposals requires that the oracles aren't stale. ** Make sure to specify any extra assets that may have been registered. */ - await pushOraclesForward(hre, rtokenAddress, extraAssets) + await pushOraclesForward(hre, rtokenAddress, []) console.log('Executing now...') @@ -216,14 +217,15 @@ export const buildProposal = (txs: Array, description: str export type ProposalBuilder = ( hre: HardhatRuntimeEnvironment, rTokenAddress: string, - governorAddress: string + governorAddress: string, + timelockAddress: string ) => Promise export const proposeUpgrade = async ( hre: HardhatRuntimeEnvironment, rTokenAddress: string, governorAddress: string, - proposalBuilder: ProposalBuilder + proposal: Proposal ) => { console.log(`\nGenerating and proposing proposal...`) const [tester] = await hre.ethers.getSigners() @@ -231,8 +233,6 @@ export const proposeUpgrade = async ( await hre.run('give-rsr', { address: tester.address }) await stakeAndDelegateRsr(hre, rTokenAddress, tester.address) - const proposal = await proposalBuilder(hre, rTokenAddress, governorAddress) - const governor = await hre.ethers.getContractAt('Governance', governorAddress) const call = await governor.populateTransaction.propose( diff --git a/tasks/testing/upgrade-checker-utils/logs.ts b/tasks/validation/utils/logs.ts similarity index 100% rename from tasks/testing/upgrade-checker-utils/logs.ts rename to tasks/validation/utils/logs.ts diff --git a/tasks/testing/upgrade-checker-utils/oracles.ts b/tasks/validation/utils/oracles.ts similarity index 91% rename from tasks/testing/upgrade-checker-utils/oracles.ts rename to tasks/validation/utils/oracles.ts index a4d1c72aac..e4bb0874b8 100644 --- a/tasks/testing/upgrade-checker-utils/oracles.ts +++ b/tasks/validation/utils/oracles.ts @@ -68,7 +68,9 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s await assetContract.chainlinkFeed() ) if (feed.address != ONE_ADDRESS) await updateAnswer(feed) - } catch {} + } catch { + // console.error('❌ chainlinkFeed not found for:', asset, 'skipping...') + } // targetUnitChainlinkFeed try { @@ -78,7 +80,9 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s await assetContractNonFiat.targetUnitChainlinkFeed() ) await updateAnswer(feed) - } catch {} + } catch { + // console.error('❌ targetUnitChainlinkFeed not found for:', asset, 'skipping...') + } // targetPerRefChainlinkFeed, uoaPerTargetChainlinkFeed, refPerTokenChainlinkFeed try { @@ -98,7 +102,9 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s await assetContractLido.refPerTokenChainlinkFeed() ) await updateAnswer(feed) - } catch {} + } catch { + // console.error('❌ targetPerRefChainlinkFeed, uoaPerTargetChainlinkFeed, or refPerTokenChainlinkFeed not found for:', asset, 'skipping...') + } // targetPerTokChainlinkFeed try { @@ -108,7 +114,9 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s await assetContractReth.targetPerTokChainlinkFeed() ) await updateAnswer(feed) - } catch {} + } catch { + // console.error('❌ targetPerTokChainlinkFeed not found for:', asset, 'skipping...') + } // TODO do better // Problem: The feeds on PoolTokens are internal immutable. Not in storage nor are there getters. diff --git a/tasks/testing/upgrade-checker-utils/rewards.ts b/tasks/validation/utils/rewards.ts similarity index 87% rename from tasks/testing/upgrade-checker-utils/rewards.ts rename to tasks/validation/utils/rewards.ts index 46e694e373..8213618a08 100644 --- a/tasks/testing/upgrade-checker-utils/rewards.ts +++ b/tasks/validation/utils/rewards.ts @@ -5,7 +5,7 @@ import { advanceBlocks, advanceTime } from '#/utils/time' import { IRewardable } from '@typechain/IRewardable' import { formatEther } from 'ethers/lib/utils' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { runBatchTrade } from '../upgrade-checker-utils/trades' +import { runBatchTrade } from './trades' const claimRewards = async (claimer: IRewardable) => { const resp = await claimer.claimRewards() @@ -23,6 +23,10 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr console.log(`\n* * * * * Claiming RSR rewards...`) const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) const backingManager = await hre.ethers.getContractAt( 'BackingManagerP1', await main.backingManager() @@ -32,8 +36,11 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr const strsr = await hre.ethers.getContractAt('StRSRP1', await main.stRSR()) const rsrRatePre = await strsr.exchangeRate() - const rewards = await claimRewards(backingManager) - console.log('rewards claimed', rewards) + // requires 3.4.0 plugins to be swapped in + // const rewards = await claimRewards(backingManager) + // console.log('rewards claimed', rewards) + const rewards = await assetRegistry.erc20s() + await backingManager.forwardRevenue(rewards) const comp = '0xc00e94Cb662C3520282E6f5717214004A7f26888' const compContract = await hre.ethers.getContractAt('ERC20Mock', comp) @@ -45,7 +52,6 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr await rsrTrader.manageTokens([comp], [TradeKind.BATCH_AUCTION]) await runBatchTrade(hre, rsrTrader, comp, false) - await rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) await strsr.payoutRewards() await advanceBlocks(hre, 100) await advanceTime(hre, 1200) diff --git a/tasks/testing/upgrade-checker-utils/rtokens.ts b/tasks/validation/utils/rtokens.ts similarity index 99% rename from tasks/testing/upgrade-checker-utils/rtokens.ts rename to tasks/validation/utils/rtokens.ts index 59db68913d..933eb46ade 100644 --- a/tasks/testing/upgrade-checker-utils/rtokens.ts +++ b/tasks/validation/utils/rtokens.ts @@ -10,7 +10,7 @@ import { callAndGetNextTrade, runBatchTrade, runDutchTrade } from './trades' import { CollateralStatus } from '#/common/constants' import { ActFacet } from '@typechain/ActFacet' import { ReadFacet } from '@typechain/ReadFacet' -import { pushOraclesForward } from '../upgrade-checker-utils/oracles' +import { pushOraclesForward } from './oracles' type Balances = { [key: string]: BigNumber } diff --git a/tasks/testing/upgrade-checker-utils/trades.ts b/tasks/validation/utils/trades.ts similarity index 73% rename from tasks/testing/upgrade-checker-utils/trades.ts rename to tasks/validation/utils/trades.ts index fe31ed4310..af256b8543 100644 --- a/tasks/testing/upgrade-checker-utils/trades.ts +++ b/tasks/validation/utils/trades.ts @@ -14,8 +14,9 @@ import { TestITrading } from '@typechain/TestITrading' import { BigNumber, ContractTransaction } from 'ethers' import { LogDescription } from 'ethers/lib/utils' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { whales } from './constants' import { logToken } from './logs' +import { getChainId } from '#/common/blockchain-utils' +import { Whales, getWhalesFile } from '#/scripts/whalesConfig' export const runBatchTrade = async ( hre: HardhatRuntimeEnvironment, @@ -26,6 +27,8 @@ export const runBatchTrade = async ( // NOTE: // buy & sell are from the perspective of the auction-starter // placeSellOrders() flips it to be from the perspective of the trader + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens const tradeAddr = await trader.trades(tradeToken) const trade = await hre.ethers.getContractAt('GnosisTrade', tradeAddr) @@ -35,7 +38,7 @@ export const runBatchTrade = async ( throw new Error(`Invalid Trade Type`) } - const buyTokenAddress = await trade.buy() + const buyTokenAddress = (await trade.buy()).toLowerCase() console.log( `Running batch trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...` ) @@ -93,6 +96,8 @@ export const runDutchTrade = async ( // NOTE: // buy & sell are from the perspective of the auction-starter // bid() flips it to be from the perspective of the trader + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens let tradesRemain = false let newSellToken = '' @@ -115,11 +120,9 @@ export const runDutchTrade = async ( const whaleAddr = whales[buyTokenAddress.toLowerCase()] // Bid near 1:1 point, which occurs at the 70% mark - const toAdvance = endBlock - .sub(await getLatestBlockNumber(hre)) - .mul(7) - .div(10) - await advanceBlocks(hre, toAdvance) + const latestTimestamp = await getLatestBlockTimestamp(hre) + const toAdvance = (endTime - latestTimestamp) * 7 / 10 + await advanceTime(hre, toAdvance) const buyAmount = await trade.bidAmount(await getLatestBlockNumber(hre)) // Ensure funds available @@ -150,7 +153,7 @@ export const runDutchTrade = async ( throw new Error(`Error settling Dutch Trade`) } - console.log(`Settled trade for ${logToken(buyTokenAddress)}.`) + console.log(`Settled trade for ${logToken(buyTokenAddress)} in amount ${buyAmount}.`) // Return new trade (if exists) return [tradesRemain, newSellToken] @@ -204,21 +207,56 @@ export const getTokens = async ( recipient: string ) => { console.log('Acquiring tokens...', tokenAddress) - switch (tokenAddress) { - case '0x60C384e226b120d93f3e0F4C502957b2B9C32B15': // saUSDC - case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9': // saUSDT + switch (tokenAddress.toLowerCase()) { + case '0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase(): // saUSDC mainnet + case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase(): // saUSDT mainnet + case '0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50'.toLowerCase(): // saBasUSDC base await getStaticAToken(hre, tokenAddress, amount, recipient) break - case '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022': // cUSDCVault - case '0x4Be33630F92661afD646081BC29079A38b879aA0': // cUSDTVault + case '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase(): // cUSDCVault mainnet + case '0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase(): // cUSDTVault mainnet await getCTokenVault(hre, tokenAddress, amount, recipient) break + case '0x24CDc6b4Edd3E496b7283D94D93119983A61056a'.toLowerCase(): // cvx3Pool mainnet + case '0x511daB8150966aFfE15F0a5bFfBa7F4d2b62DEd4'.toLowerCase(): // cvxPayPool mainnet + case '0x81697e25DFf8564d9E0bC6D27edb40006b34ea2A'.toLowerCase(): // cvxeUSDFRAXBP mainnet + case '0x3e8f7EDc03E0133b95EcB4dD2f72B5027E695413'.toLowerCase(): // cvxMIM3Pool mainnet + case '0xDbC0cE2321B76D3956412B36e9c0FA9B0fD176E7'.toLowerCase(): // cvxETHPlusETH mainnet + case '0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8'.toLowerCase(): // cvxCrvUSDUSDC mainnet + case '0x5d1B749bA7f689ef9f260EDC54326C48919cA88b'.toLowerCase(): // cvxCrvUSDUSDT mainnet + await getCvxVault(hre, tokenAddress, amount, recipient) default: await getERC20Tokens(hre, tokenAddress, amount, recipient) return } } +const getCvxVault = async ( + hre: HardhatRuntimeEnvironment, + tokenAddress: string, + amount: BigNumber, + recipient: string +) => { + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + + const cvxWrapper = await hre.ethers.getContractAt('ConvexStakingWrapper', tokenAddress) + const curveTokenAddy = await cvxWrapper.curveToken() + const curvePool = await hre.ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', + curveTokenAddy + ) + + await whileImpersonating(hre, whales[curveTokenAddy.toLowerCase()], async (whaleSigner) => { + await curvePool.connect(whaleSigner).transfer(recipient, amount) + }) + + await whileImpersonating(hre, recipient, async (recipientSigner) => { + await curvePool.connect(recipientSigner).approve(cvxWrapper.address, amount) + await cvxWrapper.connect(recipientSigner).deposit(amount, recipient) + }) +} + // get a specific amount of wrapped cTokens const getCTokenVault = async ( hre: HardhatRuntimeEnvironment, @@ -226,6 +264,9 @@ const getCTokenVault = async ( amount: BigNumber, recipient: string ) => { + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + const collateral = await hre.ethers.getContractAt('CTokenWrapper', tokenAddress) const cToken = await hre.ethers.getContractAt('ICToken', await collateral.underlying()) @@ -246,6 +287,9 @@ const getStaticAToken = async ( amount: BigNumber, recipient: string ) => { + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + const collateral = await hre.ethers.getContractAt('StaticATokenLM', tokenAddress) const aTokensNeeded = await collateral.staticToDynamicAmount(amount) const aToken = await hre.ethers.getContractAt( @@ -271,27 +315,22 @@ const getERC20Tokens = async ( amount: BigNumber, recipient: string ) => { + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + const token = await hre.ethers.getContractAt('ERC20Mock', tokenAddress) // special-cases for wrappers with 0 supply - const wcUSDCv3 = await hre.ethers.getContractAt( - 'CusdcV3Wrapper', - '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A' - ) - const saEthUSDC = await hre.ethers.getContractAt( - 'IStaticATokenV3LM', - networkConfig['1'].tokens.saEthUSDC! - ) - const saEthPyUSD = await hre.ethers.getContractAt( - 'IStaticATokenV3LM', - networkConfig['1'].tokens.saEthPyUSD! - ) - const stkcvxeUSDFRAXBP = await hre.ethers.getContractAt( - 'ConvexStakingWrapper', - '0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1' - ) - - if (tokenAddress == wcUSDCv3.address) { + const wcUSDCv3Address = networkConfig[chainId].tokens.wcUSDCv3!.toLowerCase() + const aUSDCv3Address = networkConfig[chainId].tokens.saEthUSDC!.toLowerCase() + const aPyUSDv3Address = networkConfig[chainId].tokens.saEthPyUSD!.toLowerCase() + const stkcvxeUSDFRAXBPAddress = '0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1'.toLowerCase() + + if (tokenAddress.toLowerCase() == wcUSDCv3Address) { + const wcUSDCv3 = await hre.ethers.getContractAt( + 'CusdcV3Wrapper', + wcUSDCv3Address + ) await whileImpersonating( hre, whales[networkConfig['1'].tokens.cUSDCv3!.toLowerCase()], @@ -307,7 +346,11 @@ const getERC20Tokens = async ( await wcUSDCv3.connect(whaleSigner).transfer(recipient, bal) } ) - } else if (tokenAddress == saEthUSDC.address) { + } else if (tokenAddress.toLowerCase() == aUSDCv3Address) { + const saEthUSDC = await hre.ethers.getContractAt( + 'IStaticATokenV3LM', + aUSDCv3Address + ) await whileImpersonating( hre, whales[networkConfig['1'].tokens.USDC!.toLowerCase()], @@ -318,7 +361,11 @@ const getERC20Tokens = async ( await token.connect(whaleSigner).transfer(recipient, amount) // saEthUSDC transfer } ) - } else if (tokenAddress == saEthPyUSD.address) { + } else if (tokenAddress.toLowerCase() == aPyUSDv3Address) { + const saEthPyUSD = await hre.ethers.getContractAt( + 'IStaticATokenV3LM', + aPyUSDv3Address + ) await whileImpersonating( hre, whales[networkConfig['1'].tokens.pyUSD!.toLowerCase()], @@ -329,8 +376,13 @@ const getERC20Tokens = async ( await token.connect(whaleSigner).transfer(recipient, amount) // saEthPyUSD transfer } ) - } else if (tokenAddress == stkcvxeUSDFRAXBP.address) { - const lpTokenAddr = '0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f' + } else if (tokenAddress.toLowerCase() == stkcvxeUSDFRAXBPAddress) { + const stkcvxeUSDFRAXBP = await hre.ethers.getContractAt( + 'ConvexStakingWrapper', + stkcvxeUSDFRAXBPAddress + ) + + const lpTokenAddr = '0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f'.toLowerCase() await whileImpersonating(hre, whales[lpTokenAddr], async (whaleSigner) => { const lpToken = await hre.ethers.getContractAt('ERC20Mock', lpTokenAddr) diff --git a/tasks/validation/whales/whales_1.json b/tasks/validation/whales/whales_1.json new file mode 100644 index 0000000000..b8215cf6ee --- /dev/null +++ b/tasks/validation/whales/whales_1.json @@ -0,0 +1,158 @@ +{ + "tokens": { + "0xfbd1a538f5707c0d67a16ca4e3fc711b80bd931a": "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", + "0x6b175474e89094c44da98b954eedeac495271d0f": "0x40ec5B33f54e0E8A33A975908C5BA1c14e5BbbDf", + "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": "0x4B16c5dE96EB2117bBE5fd171E4d203624B014aa", + "0xdac17f958d2ee523a2206206994597c13d831ec7": "0xF977814e90dA44bFA03b6295A0616a897441aceC", + "0x4fabb145d64652a948d72533023f6e7a623c7c53": "0x8Fe348f2F890046719aAceA910F01d772Dc20a65", + "0x8e870d67f660d95d5be530380d0ec0bd388289e1": "0x38699d04656fF537ef8671b6b595402ebDBdf6f4", + "0x0000000000085d4780b73119b644ae5ecd22b376": "0x9FCc67D7DB763787BB1c7f3bC7f34d3C548c19Fe", + "0x57ab1ec28d129707052df4df418d58a2d46d5f51": "0x99F4176EE457afedFfCB1839c7aB7A030a5e4A92", + "0x853d955acef822db058eb8505911ed77f175b99e": "0xcE6431D21E3fb1036CE9973a3312368ED96F5CE7", + "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3": "0x439a5f0f5E8d149DDA9a0Ca367D4a8e4D6f83C10", + "0xf939e0a03fb07f59a73314e73794be0e57ac1b4e": "0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635", + "0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35", + "0x028171bca77440897b824ca71d1c56cac55b68a3": "0x07edE94cF6316F4809f2B725f5d79AD303fB4Dc8", + "0xbcca60bb61934080951369a648fb03df4f96263c": "0xc9E6E51C7dA9FF1198fdC5b3369EfeDA9b19C34c", + "0x3ed3b47dd13ec9a98b44e6204a523e766b225811": "0x295E5eE985246cfD09B615f8706854600084c529", + "0xa361718326c15715591c299427c62086f69923d9": "0xc579a79376148c4B17821C5Eb9434965f3a15C80", + "0x2e8f4bdbe3d47d7d7de490437aea9915d930f1a3": "0x01820D92f8F86947CA0454789172AD60e05817fA", + "0x030ba81f1c18d280636f32af80b9aad02cf0854e": "0x777777c9898D384F785Ee44Acfe945efDFf5f3E0", + "0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c": "0xA91661efEe567b353D55948C0f051C1A16E503A5", + "0x093cb4f405924a0c468b43209d5e466f1dd0ac7d": "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", + "0x5d3a536e4d6dbd6114cc1ead35777bab948e3643": "0x30030383d959675eC884E7EC88F05EE0f186cC06", + "0x39aa39c021dfbae8fac545936693ac917d5e7563": "0xC2F61a6eEEC48d686901D325CDE9233b81c793F3", + "0xf650c3d88d12db855b8bf7d11be6c55a4e07dcc9": "0xb99CC7e10Fe0Acc68C50C7829F473d81e23249cc", + "0x041171993284df560249b57358f931d9eb7b925d": "0x01820D92f8F86947CA0454789172AD60e05817fA", + "0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5": "0x08CFd293D687B6CEe139219a607ACBBC10A6eb25", + "0xccf4429db6322d5c611ee964527d42e5d685dd6a": "0xceEf57F6C40A7CB2392eaAD101Ee0440aA43bA42", + "0x465a5a630482f3abd6d3b84b39b29b07214d19e5": "0x7Fbe0de6ffA86f4B9528AA27029595429B0c74A9", + "0x81994b9607e06ab3d5cf3afff9a67374f05f27d7": "0x7Fbe0de6ffA86f4B9528AA27029595429B0c74A9", + "0x1c9a2d6b33b4826757273d47ebee0e2dddcd978b": "0x11cC283d06FA762061df2B0D2f0787651ceef659", + "0xe2ba8693ce7474900a045757fe0efca900f6530b": "0x7Fbe0de6ffA86f4B9528AA27029595429B0c74A9", + "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "0x4da27a545c0c5b758a6ba100e3a049001de870f5": "0xb56333581B852e61E1413A2A7A66BF679D8ACf81", + "0xc00e94cb662c3520282e6f5717214004a7f26888": "0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B", + "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": "0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E", + "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656": "0x777777c9898D384F785Ee44Acfe945efDFf5f3E0", + "0x8dae6cb04688c62d939ed9b68d32bc62e49970b1": "0xB5587A54fF7022AC218438720BDCD840a32f0481", + "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": "0x5Ee5bf7ae06D1Be5997A1A72006FE6C607eC6DE8", + "0xc581b735a1688071a1746c968e0798d642ede491": "0x5754284f345afc66a98fbB0a0Afe71e0F007B949", + "0x320623b8e4ff03373931769a31fc52a4e78b5d70": "0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1", + "0xd533a949740bb3306d119cc777fa900ba034cd52": "0x5f3b5DfEb7B28CDbD7FAba78963EE202a494e2A2", + "0x4e3fbd56cd56c3e72c1403e103b45db9da5b9d2b": "0x72a19342e8F1838460eBFCCEf09F6585e32db86E", + "0xe95a203b1a91a908f9b9ce46459d101078c2c3cb": "0xF02e86D9E0eFd57aD034FaF52201B79917fE0713", + "0x5e8422345238f34275888049021821e8e08caa1f": "0xac3E018457B222d93114458476f3E3416Abbe38F", + "0xac3e018457b222d93114458476f3e3416abbe38f": "0x78bB3aEC3d855431bd9289fD98dA13F9ebB7ef15", + "0xae7ab96520de3a18e5e111b5eaab095312d7fe84": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0": "0x0B925eD163218f6662a35e0f0371Ac234f9E9371", + "0xae78736cd615f374d3085123a210448e74fc6393": "0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2", + "0xc3d688b66703497daa19211eedff47f25384cdc3": "0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03", + "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": "0x677FD4Ed8aE623f2f625DEB2D64F2070E46cA1A1", + "0xa663b02cf0a4b149d2ad41910cb81e23e1c41c32": "0x6A7efa964Cf6D9Ab3BC3c47eBdDB853A8853C502", + "0x83f20f44975d03b1b09e64809b757c47f942beea": "0xDdE0d6e90bfB74f1dC8ea070cFd0c0180C03Ad16", + "0xbe9895146f7af43049ca1c1ae358b0541ea49704": "0xED1F7bb04D2BA2b6EbE087026F03C96Ea2c357A8", + "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6": "0x65bb797c2B9830d891D87288F029ed8dACc19705", + "0xdf0770df86a8034b3efef0a1bb3c889b8332ff56": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", + "0x38ea452219524bb87e18de1c24d3bb59510bd783": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", + "0x101816545f6bd2b1076434b54383a1e633390a2e": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", + "0x1982b2f5814301d4e9a8b0201555376e62f82428": "0x777777c9898D384F785Ee44Acfe945efDFf5f3E0", + "0x9994e35db50125e0df82e4c2dde62496ce330999": "0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa", + "0xf56fb6cc29f0666bdd1662feaae2a3c935ee3469": "0x93A62dA5a14C80f265DAbC077fCEE437B1a0Efde", + "0x7ca00559b978cfde81297849be6151d3ccb408a9": "0xa931b486F661540c6D709aE6DfC8BcEF347ea437", + "0x6c3ea9036406852006290770bedfcaba0e23a0e8": "0xE25a329d385f77df5D4eD56265babe2b99A5436e", + "0x0c0d01abf3e6adfca0989ebba9d6e85dd58eab1e": "0x01820D92f8F86947CA0454789172AD60e05817fA", + "0xe72b141df173b999ae7c1adcbf60cc9833ce56a8": "0x7cc1bfAB73bE4E02BB53814d1059A98cF7e49644", + "0xacdf0dba4b9839b96221a8487e9ca660a48212be": "0x7cc1bfAB73bE4E02BB53814d1059A98cF7e49644", + "0xfc0b1eef20e4c68b3dcf36c4537cfa7ce46ca70b": "0xF2B25362a03f6EACCa8De8d5350A9f37944c1e59", + "0x0d86883faf4ffd7aeb116390af37746f45b6f378": "0x7cc1bfAB73bE4E02BB53814d1059A98cF7e49644", + "0x78da5799cf427fee11e9996982f4150ece7a99a7": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35", + "0x73968b9a57c6e53d41345fd57a6e6ae27d6cdb2f": "0x0C30476f66034E11782938DF8e4384970B6c9e8a", + "0x48c3399719b582dd63eb5aadf12a40b4c3f52fa2": "0xF0d99D5d1D5E06CdAd4766503Cb82213B5E1d1bE", + "0xc55126051b22ebb829d00368f4b12bde432de5da": "0x742B70151cd3Bc7ab598aAFF1d54B90c3ebC6027", + "0x1576b2d7ef15a2ebe9c22c8765dd9c1efea8797b": "0x4B0b3d40b0623f3a9eac09d2E01F592710ee59F0", + "0xbeef01735c132ada46aa9aa4c54623caa92a64cb": "0xC977d218Fde6A39c7aCE71C8243545c276B48931", + "0xbeef02e5e13584ab96848af90261f0c8ee04722a": "0x7E4B4DC22111B84594d9b7707A8DCFFd793D477A", + "0x2c25f6c25770ffec5959d34b94bf898865e5d6b1": "0x3D3eb99C278C7A50d8cf5fE7eBF0AD69066Fb7d1", + "0x78fc2c2ed1a4cdb5402365934ae5648adad094d0": "0x733c33339684F38C8aADA0434751611e168255c4", + "0x9bbf31e99f30c38a5003952206c31eea77540bef": "0xC6625129C9df3314a4dd604845488f4bA62F9dB8" + }, + "lastUpdated": { + "0xfbd1a538f5707c0d67a16ca4e3fc711b80bd931a": "2024-05-02T02:11:46.313Z", + "0x6b175474e89094c44da98b954eedeac495271d0f": "2024-05-02T02:11:34.493Z", + "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": "2024-05-02T02:11:34.631Z", + "0xdac17f958d2ee523a2206206994597c13d831ec7": "2024-05-02T02:11:34.780Z", + "0x4fabb145d64652a948d72533023f6e7a623c7c53": "2024-05-02T02:11:35.369Z", + "0x8e870d67f660d95d5be530380d0ec0bd388289e1": "2024-05-02T02:11:36.021Z", + "0x0000000000085d4780b73119b644ae5ecd22b376": "2024-05-02T02:11:36.361Z", + "0x57ab1ec28d129707052df4df418d58a2d46d5f51": "2024-05-02T02:11:36.568Z", + "0x853d955acef822db058eb8505911ed77f175b99e": "2024-05-02T02:11:36.725Z", + "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3": "2024-05-02T02:11:37.105Z", + "0xf939e0a03fb07f59a73314e73794be0e57ac1b4e": "2024-05-02T02:11:37.529Z", + "0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f": "2024-05-02T02:11:49.841Z", + "0x028171bca77440897b824ca71d1c56cac55b68a3": "2024-05-02T02:11:37.783Z", + "0xbcca60bb61934080951369a648fb03df4f96263c": "2024-05-02T02:11:37.936Z", + "0x3ed3b47dd13ec9a98b44e6204a523e766b225811": "2024-05-02T02:11:38.094Z", + "0xa361718326c15715591c299427c62086f69923d9": "2024-05-02T02:11:38.433Z", + "0x2e8f4bdbe3d47d7d7de490437aea9915d930f1a3": "2024-05-02T02:11:38.717Z", + "0x030ba81f1c18d280636f32af80b9aad02cf0854e": "2024-05-02T02:11:38.928Z", + "0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c": "2024-05-02T02:11:39.073Z", + "0x093cb4f405924a0c468b43209d5e466f1dd0ac7d": "2024-05-01T16:12:29.624Z", + "0x5d3a536e4d6dbd6114cc1ead35777bab948e3643": "2024-05-02T02:11:39.347Z", + "0x39aa39c021dfbae8fac545936693ac917d5e7563": "2024-05-02T02:11:39.804Z", + "0xf650c3d88d12db855b8bf7d11be6c55a4e07dcc9": "2024-05-02T02:11:40.098Z", + "0x041171993284df560249b57358f931d9eb7b925d": "2024-05-02T02:11:40.253Z", + "0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5": "2024-05-02T02:11:40.801Z", + "0xccf4429db6322d5c611ee964527d42e5d685dd6a": "2024-05-02T02:11:40.942Z", + "0x465a5a630482f3abd6d3b84b39b29b07214d19e5": "2024-05-02T02:11:41.068Z", + "0x81994b9607e06ab3d5cf3afff9a67374f05f27d7": "2024-05-02T02:11:41.168Z", + "0x1c9a2d6b33b4826757273d47ebee0e2dddcd978b": "2024-05-02T02:11:41.262Z", + "0xe2ba8693ce7474900a045757fe0efca900f6530b": "2024-05-02T02:11:41.393Z", + "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9": "2024-05-02T02:11:42.140Z", + "0x4da27a545c0c5b758a6ba100e3a049001de870f5": "2024-05-02T02:11:42.337Z", + "0xc00e94cb662c3520282e6f5717214004a7f26888": "2024-05-02T02:11:42.548Z", + "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": "2024-05-02T02:11:43.099Z", + "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656": "2024-05-02T02:11:43.243Z", + "0x8dae6cb04688c62d939ed9b68d32bc62e49970b1": "2024-05-02T02:11:43.367Z", + "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": "2024-05-02T02:11:43.821Z", + "0xc581b735a1688071a1746c968e0798d642ede491": "2024-05-02T02:11:43.940Z", + "0x320623b8e4ff03373931769a31fc52a4e78b5d70": "2024-05-02T02:11:44.121Z", + "0xd533a949740bb3306d119cc777fa900ba034cd52": "2024-05-02T02:11:44.562Z", + "0x4e3fbd56cd56c3e72c1403e103b45db9da5b9d2b": "2024-05-02T02:11:44.740Z", + "0xe95a203b1a91a908f9b9ce46459d101078c2c3cb": "2024-05-02T02:11:45.221Z", + "0x5e8422345238f34275888049021821e8e08caa1f": "2024-05-02T02:11:45.334Z", + "0xac3e018457b222d93114458476f3e3416abbe38f": "2024-05-02T02:11:45.476Z", + "0xae7ab96520de3a18e5e111b5eaab095312d7fe84": "2024-05-02T02:11:45.755Z", + "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0": "2024-05-02T02:11:45.929Z", + "0xae78736cd615f374d3085123a210448e74fc6393": "2024-05-02T02:11:46.130Z", + "0xc3d688b66703497daa19211eedff47f25384cdc3": "2024-05-02T02:11:46.235Z", + "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": "2024-05-02T02:11:46.579Z", + "0xa663b02cf0a4b149d2ad41910cb81e23e1c41c32": "2024-05-02T02:11:46.677Z", + "0x83f20f44975d03b1b09e64809b757c47f942beea": "2024-05-02T02:11:46.802Z", + "0xbe9895146f7af43049ca1c1ae358b0541ea49704": "2024-05-02T02:11:47.091Z", + "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6": "2024-05-02T02:11:47.333Z", + "0xdf0770df86a8034b3efef0a1bb3c889b8332ff56": "2024-05-02T02:11:47.488Z", + "0x38ea452219524bb87e18de1c24d3bb59510bd783": "2024-05-02T02:11:47.584Z", + "0x101816545f6bd2b1076434b54383a1e633390a2e": "2024-05-02T02:11:47.713Z", + "0x1982b2f5814301d4e9a8b0201555376e62f82428": "2024-05-02T02:11:47.935Z", + "0x9994e35db50125e0df82e4c2dde62496ce330999": "2024-05-02T02:11:48.057Z", + "0xf56fb6cc29f0666bdd1662feaae2a3c935ee3469": "2024-05-02T02:11:48.422Z", + "0x7ca00559b978cfde81297849be6151d3ccb408a9": "2024-05-02T02:11:48.810Z", + "0x6c3ea9036406852006290770bedfcaba0e23a0e8": "2024-05-02T02:11:48.960Z", + "0x0c0d01abf3e6adfca0989ebba9d6e85dd58eab1e": "2024-05-02T02:11:49.072Z", + "0xe72b141df173b999ae7c1adcbf60cc9833ce56a8": "2024-05-02T02:11:49.960Z", + "0xacdf0dba4b9839b96221a8487e9ca660a48212be": "2024-05-02T02:11:50.073Z", + "0xfc0b1eef20e4c68b3dcf36c4537cfa7ce46ca70b": "2024-05-02T02:11:50.194Z", + "0x0d86883faf4ffd7aeb116390af37746f45b6f378": "2024-05-02T02:11:50.289Z", + "0x78da5799cf427fee11e9996982f4150ece7a99a7": "2024-05-02T02:11:50.392Z", + "0x73968b9a57c6e53d41345fd57a6e6ae27d6cdb2f": "2024-05-02T02:11:44.902Z", + "0x48c3399719b582dd63eb5aadf12a40b4c3f52fa2": "2024-05-02T02:11:48.194Z", + "0xc55126051b22ebb829d00368f4b12bde432de5da": "2024-05-02T02:11:48.339Z", + "0x1576b2d7ef15a2ebe9c22c8765dd9c1efea8797b": "2024-05-02T02:11:49.159Z", + "0xbeef01735c132ada46aa9aa4c54623caa92a64cb": "2024-05-02T02:11:49.303Z", + "0xbeef02e5e13584ab96848af90261f0c8ee04722a": "2024-05-02T02:11:49.422Z", + "0x2c25f6c25770ffec5959d34b94bf898865e5d6b1": "2024-05-02T02:11:49.529Z", + "0x78fc2c2ed1a4cdb5402365934ae5648adad094d0": "2024-05-02T02:11:49.639Z", + "0x9bbf31e99f30c38a5003952206c31eea77540bef": "2024-05-02T02:11:49.748Z" + } +} \ No newline at end of file diff --git a/tasks/validation/whales/whales_31337.json b/tasks/validation/whales/whales_31337.json new file mode 100644 index 0000000000..808ba0a19b --- /dev/null +++ b/tasks/validation/whales/whales_31337.json @@ -0,0 +1,140 @@ +{ + "tokens": { + "0xfbd1a538f5707c0d67a16ca4e3fc711b80bd931a": "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", + "0x6b175474e89094c44da98b954eedeac495271d0f": "0x40ec5B33f54e0E8A33A975908C5BA1c14e5BbbDf", + "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": "0x4B16c5dE96EB2117bBE5fd171E4d203624B014aa", + "0xdac17f958d2ee523a2206206994597c13d831ec7": "0xF977814e90dA44bFA03b6295A0616a897441aceC", + "0x4fabb145d64652a948d72533023f6e7a623c7c53": "0x8Fe348f2F890046719aAceA910F01d772Dc20a65", + "0x8e870d67f660d95d5be530380d0ec0bd388289e1": "0x38699d04656fF537ef8671b6b595402ebDBdf6f4", + "0x0000000000085d4780b73119b644ae5ecd22b376": "0x9FCc67D7DB763787BB1c7f3bC7f34d3C548c19Fe", + "0x57ab1ec28d129707052df4df418d58a2d46d5f51": "0x99F4176EE457afedFfCB1839c7aB7A030a5e4A92", + "0x853d955acef822db058eb8505911ed77f175b99e": "0xcE6431D21E3fb1036CE9973a3312368ED96F5CE7", + "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3": "0x439a5f0f5E8d149DDA9a0Ca367D4a8e4D6f83C10", + "0xf939e0a03fb07f59a73314e73794be0e57ac1b4e": "0xA920De414eA4Ab66b97dA1bFE9e6EcA7d4219635", + "0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35", + "0x028171bca77440897b824ca71d1c56cac55b68a3": "0x07edE94cF6316F4809f2B725f5d79AD303fB4Dc8", + "0xbcca60bb61934080951369a648fb03df4f96263c": "0xc9E6E51C7dA9FF1198fdC5b3369EfeDA9b19C34c", + "0x3ed3b47dd13ec9a98b44e6204a523e766b225811": "0x295E5eE985246cfD09B615f8706854600084c529", + "0xa361718326c15715591c299427c62086f69923d9": "0xc579a79376148c4B17821C5Eb9434965f3a15C80", + "0x2e8f4bdbe3d47d7d7de490437aea9915d930f1a3": "0x01820D92f8F86947CA0454789172AD60e05817fA", + "0x030ba81f1c18d280636f32af80b9aad02cf0854e": "0x777777c9898D384F785Ee44Acfe945efDFf5f3E0", + "0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c": "0xA91661efEe567b353D55948C0f051C1A16E503A5", + "0x093cb4f405924a0c468b43209d5e466f1dd0ac7d": "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", + "0x5d3a536e4d6dbd6114cc1ead35777bab948e3643": "0x30030383d959675eC884E7EC88F05EE0f186cC06", + "0x39aa39c021dfbae8fac545936693ac917d5e7563": "0xC2F61a6eEEC48d686901D325CDE9233b81c793F3", + "0xf650c3d88d12db855b8bf7d11be6c55a4e07dcc9": "0xb99CC7e10Fe0Acc68C50C7829F473d81e23249cc", + "0x041171993284df560249b57358f931d9eb7b925d": "0x01820D92f8F86947CA0454789172AD60e05817fA", + "0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5": "0x08CFd293D687B6CEe139219a607ACBBC10A6eb25", + "0xccf4429db6322d5c611ee964527d42e5d685dd6a": "0xceEf57F6C40A7CB2392eaAD101Ee0440aA43bA42", + "0x465a5a630482f3abd6d3b84b39b29b07214d19e5": "0x7Fbe0de6ffA86f4B9528AA27029595429B0c74A9", + "0x81994b9607e06ab3d5cf3afff9a67374f05f27d7": "0x7Fbe0de6ffA86f4B9528AA27029595429B0c74A9", + "0x1c9a2d6b33b4826757273d47ebee0e2dddcd978b": "0x11cC283d06FA762061df2B0D2f0787651ceef659", + "0xe2ba8693ce7474900a045757fe0efca900f6530b": "0x7Fbe0de6ffA86f4B9528AA27029595429B0c74A9", + "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9": "0x4da27a545c0c5B758a6BA100e3a049001de870f5", + "0x4da27a545c0c5b758a6ba100e3a049001de870f5": "0xb56333581B852e61E1413A2A7A66BF679D8ACf81", + "0xc00e94cb662c3520282e6f5717214004a7f26888": "0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B", + "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": "0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E", + "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656": "0x777777c9898D384F785Ee44Acfe945efDFf5f3E0", + "0x8dae6cb04688c62d939ed9b68d32bc62e49970b1": "0xB5587A54fF7022AC218438720BDCD840a32f0481", + "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": "0x5Ee5bf7ae06D1Be5997A1A72006FE6C607eC6DE8", + "0xc581b735a1688071a1746c968e0798d642ede491": "0x5754284f345afc66a98fbB0a0Afe71e0F007B949", + "0x320623b8e4ff03373931769a31fc52a4e78b5d70": "0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1", + "0xd533a949740bb3306d119cc777fa900ba034cd52": "0x5f3b5DfEb7B28CDbD7FAba78963EE202a494e2A2", + "0x4e3fbd56cd56c3e72c1403e103b45db9da5b9d2b": "0x72a19342e8F1838460eBFCCEf09F6585e32db86E", + "0xe95a203b1a91a908f9b9ce46459d101078c2c3cb": "0xF02e86D9E0eFd57aD034FaF52201B79917fE0713", + "0x5e8422345238f34275888049021821e8e08caa1f": "0xac3E018457B222d93114458476f3E3416Abbe38F", + "0xac3e018457b222d93114458476f3e3416abbe38f": "0x78bB3aEC3d855431bd9289fD98dA13F9ebB7ef15", + "0xae7ab96520de3a18e5e111b5eaab095312d7fe84": "0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0", + "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0": "0x0B925eD163218f6662a35e0f0371Ac234f9E9371", + "0xae78736cd615f374d3085123a210448e74fc6393": "0x1BeE69b7dFFfA4E2d53C2a2Df135C388AD25dCD2", + "0xc3d688b66703497daa19211eedff47f25384cdc3": "0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03", + "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": "0x677FD4Ed8aE623f2f625DEB2D64F2070E46cA1A1", + "0xa663b02cf0a4b149d2ad41910cb81e23e1c41c32": "0x6A7efa964Cf6D9Ab3BC3c47eBdDB853A8853C502", + "0x83f20f44975d03b1b09e64809b757c47f942beea": "0xDdE0d6e90bfB74f1dC8ea070cFd0c0180C03Ad16", + "0xbe9895146f7af43049ca1c1ae358b0541ea49704": "0xED1F7bb04D2BA2b6EbE087026F03C96Ea2c357A8", + "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6": "0x65bb797c2B9830d891D87288F029ed8dACc19705", + "0xdf0770df86a8034b3efef0a1bb3c889b8332ff56": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", + "0x38ea452219524bb87e18de1c24d3bb59510bd783": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", + "0x101816545f6bd2b1076434b54383a1e633390a2e": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", + "0x1982b2f5814301d4e9a8b0201555376e62f82428": "0x777777c9898D384F785Ee44Acfe945efDFf5f3E0", + "0x9994e35db50125e0df82e4c2dde62496ce330999": "0xcBa28b38103307Ec8dA98377ffF9816C164f9AFa", + "0xf56fb6cc29f0666bdd1662feaae2a3c935ee3469": "0x93A62dA5a14C80f265DAbC077fCEE437B1a0Efde", + "0x7ca00559b978cfde81297849be6151d3ccb408a9": "0xa931b486F661540c6D709aE6DfC8BcEF347ea437", + "0x6c3ea9036406852006290770bedfcaba0e23a0e8": "0xE25a329d385f77df5D4eD56265babe2b99A5436e", + "0x0c0d01abf3e6adfca0989ebba9d6e85dd58eab1e": "0x01820D92f8F86947CA0454789172AD60e05817fA", + "0xe72b141df173b999ae7c1adcbf60cc9833ce56a8": "0x7cc1bfAB73bE4E02BB53814d1059A98cF7e49644", + "0xacdf0dba4b9839b96221a8487e9ca660a48212be": "0x7cc1bfAB73bE4E02BB53814d1059A98cF7e49644", + "0xfc0b1eef20e4c68b3dcf36c4537cfa7ce46ca70b": "0xF2B25362a03f6EACCa8De8d5350A9f37944c1e59", + "0x0d86883faf4ffd7aeb116390af37746f45b6f378": "0x7cc1bfAB73bE4E02BB53814d1059A98cF7e49644", + "0x78da5799cf427fee11e9996982f4150ece7a99a7": "0x3154Cf16ccdb4C6d922629664174b904d80F2C35" + }, + "lastUpdated": { + "0xfbd1a538f5707c0d67a16ca4e3fc711b80bd931a": "2024-05-01T16:12:37.530Z", + "0x6b175474e89094c44da98b954eedeac495271d0f": "2024-05-01T16:12:25.407Z", + "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48": "2024-05-01T16:12:25.554Z", + "0xdac17f958d2ee523a2206206994597c13d831ec7": "2024-05-01T16:12:25.703Z", + "0x4fabb145d64652a948d72533023f6e7a623c7c53": "2024-05-01T16:12:26.453Z", + "0x8e870d67f660d95d5be530380d0ec0bd388289e1": "2024-05-01T16:12:27.130Z", + "0x0000000000085d4780b73119b644ae5ecd22b376": "2024-05-01T16:12:27.569Z", + "0x57ab1ec28d129707052df4df418d58a2d46d5f51": "2024-05-01T16:12:27.764Z", + "0x853d955acef822db058eb8505911ed77f175b99e": "2024-05-01T16:12:27.975Z", + "0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3": "2024-05-01T16:12:28.088Z", + "0xf939e0a03fb07f59a73314e73794be0e57ac1b4e": "2024-05-01T16:12:28.205Z", + "0xa0d69e286b938e21cbf7e51d71f6a4c8918f482f": "2024-05-01T16:12:40.247Z", + "0x028171bca77440897b824ca71d1c56cac55b68a3": "2024-05-01T16:12:28.532Z", + "0xbcca60bb61934080951369a648fb03df4f96263c": "2024-05-01T16:12:28.694Z", + "0x3ed3b47dd13ec9a98b44e6204a523e766b225811": "2024-05-01T16:12:28.810Z", + "0xa361718326c15715591c299427c62086f69923d9": "2024-05-01T16:12:28.910Z", + "0x2e8f4bdbe3d47d7d7de490437aea9915d930f1a3": "2024-05-01T16:12:29.070Z", + "0x030ba81f1c18d280636f32af80b9aad02cf0854e": "2024-05-01T16:12:29.261Z", + "0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c": "2024-05-01T16:12:29.463Z", + "0x093cb4f405924a0c468b43209d5e466f1dd0ac7d": "2024-05-01T16:12:29.624Z", + "0x5d3a536e4d6dbd6114cc1ead35777bab948e3643": "2024-05-01T16:12:29.787Z", + "0x39aa39c021dfbae8fac545936693ac917d5e7563": "2024-05-01T16:12:30.022Z", + "0xf650c3d88d12db855b8bf7d11be6c55a4e07dcc9": "2024-05-01T16:12:30.189Z", + "0x041171993284df560249b57358f931d9eb7b925d": "2024-05-01T16:12:30.288Z", + "0x4ddc2d193948926d02f9b1fe9e1daa0718270ed5": "2024-05-01T16:12:30.721Z", + "0xccf4429db6322d5c611ee964527d42e5d685dd6a": "2024-05-01T16:12:30.991Z", + "0x465a5a630482f3abd6d3b84b39b29b07214d19e5": "2024-05-01T16:12:31.228Z", + "0x81994b9607e06ab3d5cf3afff9a67374f05f27d7": "2024-05-01T16:12:31.501Z", + "0x1c9a2d6b33b4826757273d47ebee0e2dddcd978b": "2024-05-01T16:12:31.605Z", + "0xe2ba8693ce7474900a045757fe0efca900f6530b": "2024-05-01T16:12:31.723Z", + "0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9": "2024-05-01T16:12:32.700Z", + "0x4da27a545c0c5b758a6ba100e3a049001de870f5": "2024-05-01T16:12:32.886Z", + "0xc00e94cb662c3520282e6f5717214004a7f26888": "2024-05-01T16:12:33.230Z", + "0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2": "2024-05-01T16:12:33.980Z", + "0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656": "2024-05-01T16:12:34.120Z", + "0x8dae6cb04688c62d939ed9b68d32bc62e49970b1": "2024-05-01T16:12:34.389Z", + "0x2260fac5e5542a773aa44fbcfedf7c193bc2c599": "2024-05-01T16:12:34.970Z", + "0xc581b735a1688071a1746c968e0798d642ede491": "2024-05-01T16:12:35.065Z", + "0x320623b8e4ff03373931769a31fc52a4e78b5d70": "2024-05-01T16:12:35.305Z", + "0xd533a949740bb3306d119cc777fa900ba034cd52": "2024-05-01T16:12:35.845Z", + "0x4e3fbd56cd56c3e72c1403e103b45db9da5b9d2b": "2024-05-01T16:12:36.092Z", + "0xe95a203b1a91a908f9b9ce46459d101078c2c3cb": "2024-05-01T16:12:36.200Z", + "0x5e8422345238f34275888049021821e8e08caa1f": "2024-05-01T16:12:36.316Z", + "0xac3e018457b222d93114458476f3e3416abbe38f": "2024-05-01T16:12:36.462Z", + "0xae7ab96520de3a18e5e111b5eaab095312d7fe84": "2024-05-01T16:12:36.867Z", + "0x7f39c581f595b53c5cb19bd0b3f8da6c935e2ca0": "2024-05-01T16:12:37.045Z", + "0xae78736cd615f374d3085123a210448e74fc6393": "2024-05-01T16:12:37.238Z", + "0xc3d688b66703497daa19211eedff47f25384cdc3": "2024-05-01T16:12:37.349Z", + "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": "2024-05-01T16:12:37.800Z", + "0xa663b02cf0a4b149d2ad41910cb81e23e1c41c32": "2024-05-01T16:12:37.889Z", + "0x83f20f44975d03b1b09e64809b757c47f942beea": "2024-05-01T16:12:38.007Z", + "0xbe9895146f7af43049ca1c1ae358b0541ea49704": "2024-05-01T16:12:38.340Z", + "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6": "2024-05-01T16:12:38.615Z", + "0xdf0770df86a8034b3efef0a1bb3c889b8332ff56": "2024-05-01T16:12:38.909Z", + "0x38ea452219524bb87e18de1c24d3bb59510bd783": "2024-05-01T16:12:39.004Z", + "0x101816545f6bd2b1076434b54383a1e633390a2e": "2024-05-01T16:12:39.156Z", + "0x1982b2f5814301d4e9a8b0201555376e62f82428": "2024-05-01T16:12:39.350Z", + "0x9994e35db50125e0df82e4c2dde62496ce330999": "2024-05-01T16:12:39.452Z", + "0xf56fb6cc29f0666bdd1662feaae2a3c935ee3469": "2024-05-01T16:12:39.550Z", + "0x7ca00559b978cfde81297849be6151d3ccb408a9": "2024-05-01T16:12:39.629Z", + "0x6c3ea9036406852006290770bedfcaba0e23a0e8": "2024-05-01T16:12:39.775Z", + "0x0c0d01abf3e6adfca0989ebba9d6e85dd58eab1e": "2024-05-01T16:12:39.942Z", + "0xe72b141df173b999ae7c1adcbf60cc9833ce56a8": "2024-05-01T16:12:40.337Z", + "0xacdf0dba4b9839b96221a8487e9ca660a48212be": "2024-05-01T16:12:40.447Z", + "0xfc0b1eef20e4c68b3dcf36c4537cfa7ce46ca70b": "2024-05-01T16:12:40.528Z", + "0x0d86883faf4ffd7aeb116390af37746f45b6f378": "2024-05-01T16:12:40.659Z", + "0x78da5799cf427fee11e9996982f4150ece7a99a7": "2024-05-01T16:12:40.776Z" + } +} \ No newline at end of file diff --git a/tasks/validation/whales/whales_8453.json b/tasks/validation/whales/whales_8453.json new file mode 100644 index 0000000000..1b7fdbe5d6 --- /dev/null +++ b/tasks/validation/whales/whales_8453.json @@ -0,0 +1,54 @@ +{ + "tokens": { + "0x50c5725949a6f0c72e6c4a641f24049a917db0cb": "0x73b06d8d18de422e269645eace15400de7462417", + "0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca": "0x0b25c51637c43decd6cc1c1e3da4518d54ddb528", + "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913": "0x7c41fdced2ea646ed85665d1a9b28e6632b61c41", + "0xab36452dbac151be02b16ca17d8919826072f64a": "0x796d2367af69deb3319b8e10712b8b65957371c3", + "0x9e1028f5f1d5ede59748ffcee5532509976840e0": "0x123964802e6ababbe1bc9547d72ef1b69b00a6b1", + "0x4200000000000000000000000000000000000006": "0xcdac0d6c6c59727a65f871236188350531885c43", + "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22": "0x3bf93770f2d4a794c3d9ebefbaebae2a8f09a5e5", + "0x9c4ec768c28520b50860ea7a15bd7213a9ff58bf": "0xd2c32f54a26285decf30e6d208f722e7d5fd3f58", + "0xb125e6687d4313864e53df431d5425969c15eb2f": "0xa694f7177c6c839c951c74c797283b35d0a486c8", + "0xa694f7177c6c839c951c74c797283b35d0a486c8": "0xa1e1a94977ec3159db546bf01d7a8d17dd3ebbed", + "0x4e65fe4dba92790696d040ac24aa414708f5c0ab": "0x09ad6981381610a5f58c56219f0fe939043f0a36", + "0x184460704886f9f2a7f3a0c2887680867954dc6e": "0xa1e1a94977ec3159db546bf01d7a8d17dd3ebbed", + "0xd4a0e0b9149bcee3c920d2e00b5de09138fd8bb7": "0x28b41cf49c00fe3787cd962feef93238f569c77b", + "0xcf3d55c10db69f28fd1a75bd73f3d8a2d9c595ad": "0x8c789c68cd1277846c6ffdbf3ea0ca460a0fe78b", + "0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca": "0x06eb48763f117c7be887296cdcdfad2e4092739c", + "0xc1cba3fcea344f92d9239c08c0568f6f2f0ee452": "0x627fe393bc6edda28e99ae648fd6ff362514304b", + "0xe3b53af74a4bf62ae5511055290838050bf764df": "0x1d7c6783328c145393e84fb47a7f7c548f5ee28d", + "0xcfa3ef56d303ae4faaba0592388f19d7c3399fb4": "0xb5e331615fdba7df49e05cdeaceb14acdd5091c3", + "0xefb97aaf77993922ac4be4da8fbc9a2425322677": "0xd3561da2bfcac843494854f7de1af98a3962925f", + "0x8e5e9df4f0ea39ae5270e79bbabfcc34203a3470": "0xd7adbf474e991f4aebf95c0b095001ce661aad17", + "0xcc7ff230365bd730ee4b352cc2492cedac49383e": "0xb5e331615fdba7df49e05cdeaceb14acdd5091c3", + "0xcb327b99ff831bf8223cced12b1338ff3aa322ff": "0x6b87b8663ee63191887f18225f79d9eeb2de0d34", + "0xfe0d6d83033e313691e96909d2188c150b834285": "0x1ef46018244179810dec43291d693cb2bf7f40e5", + "0xc9a3e2b3064c1c0546d3d0edc0a748e9f93cf18d": "0x6f1d6b86d4ad705385e751e6e88b0fdfdbadf298" + }, + "lastUpdated": { + "0x50c5725949a6f0c72e6c4a641f24049a917db0cb": "2024-05-02T02:08:54.913Z", + "0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca": "2024-05-02T02:09:09.449Z", + "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913": "2024-05-02T02:09:20.185Z", + "0xab36452dbac151be02b16ca17d8919826072f64a": "2024-05-02T02:09:20.356Z", + "0x9e1028f5f1d5ede59748ffcee5532509976840e0": "2024-05-02T02:09:20.574Z", + "0x4200000000000000000000000000000000000006": "2024-05-02T02:09:23.915Z", + "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22": "2024-05-02T02:09:24.479Z", + "0x9c4ec768c28520b50860ea7a15bd7213a9ff58bf": "2024-05-02T02:09:24.656Z", + "0xb125e6687d4313864e53df431d5425969c15eb2f": "2024-05-02T02:09:24.843Z", + "0xa694f7177c6c839c951c74c797283b35d0a486c8": "2024-05-02T02:09:24.946Z", + "0x4e65fe4dba92790696d040ac24aa414708f5c0ab": "2024-05-02T02:09:25.575Z", + "0x184460704886f9f2a7f3a0c2887680867954dc6e": "2024-05-02T02:09:25.682Z", + "0xd4a0e0b9149bcee3c920d2e00b5de09138fd8bb7": "2024-05-02T02:09:27.328Z", + "0xcf3d55c10db69f28fd1a75bd73f3d8a2d9c595ad": "2024-05-02T02:09:27.473Z", + "0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca": "2024-05-02T02:09:28.015Z", + "0xc1cba3fcea344f92d9239c08c0568f6f2f0ee452": "2024-05-02T02:09:28.612Z", + "0xe3b53af74a4bf62ae5511055290838050bf764df": "2024-05-02T02:09:30.272Z", + "0xcfa3ef56d303ae4faaba0592388f19d7c3399fb4": "2024-05-02T02:09:30.448Z", + "0xefb97aaf77993922ac4be4da8fbc9a2425322677": "2024-05-02T02:09:30.580Z", + "0x8e5e9df4f0ea39ae5270e79bbabfcc34203a3470": "2024-05-02T02:09:30.808Z", + "0xcc7ff230365bd730ee4b352cc2492cedac49383e": "2024-05-02T02:09:30.955Z", + "0xcb327b99ff831bf8223cced12b1338ff3aa322ff": "2024-05-02T02:09:31.083Z", + "0xfe0d6d83033e313691e96909d2188c150b834285": "2024-05-02T02:09:31.159Z", + "0xc9a3e2b3064c1c0546d3d0edc0a748e9f93cf18d": "2024-05-02T02:09:31.258Z" + } +} \ No newline at end of file diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts index 7f1a19c867..9a9b94fad7 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAAVEFiatCollateral.test.ts @@ -23,9 +23,11 @@ import hre from 'hardhat' import { MorphoAaveCollateralFixtureContext, mintCollateralTo } from './mintCollateralTo' import { setCode } from '@nomicfoundation/hardhat-network-helpers' import { whileImpersonating } from '#/utils/impersonation' -import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' +import { whales } from '#/tasks/validation/utils/constants' import { advanceBlocks, advanceTime } from '#/utils/time' +whales[networkConfig['1'].tokens.USDC!.toLowerCase()] = '0xD6153F5af5679a75cC85D8974463545181f48772' + interface MAFiatCollateralOpts extends CollateralOpts { underlyingToken?: string poolToken?: string @@ -402,16 +404,16 @@ const makeOpts = ( Run the test suite */ const { tokens, chainlinkFeeds } = networkConfig[31337] -makeAaveFiatCollateralTestSuite( - 'MorphoAAVEV2FiatCollateral - USDT', - makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!), - true // Only run specific tests once, since they are slow -) +// makeAaveFiatCollateralTestSuite( +// 'MorphoAAVEV2FiatCollateral - USDT', +// makeOpts(tokens.USDT!, tokens.aUSDT!, chainlinkFeeds.USDT!), +// true // Only run specific tests once, since they are slow +// ) makeAaveFiatCollateralTestSuite( 'MorphoAAVEV2FiatCollateral - USDC', makeOpts(tokens.USDC!, tokens.aUSDC!, chainlinkFeeds.USDC!) ) -makeAaveFiatCollateralTestSuite( - 'MorphoAAVEV2FiatCollateral - DAI', - makeOpts(tokens.DAI!, tokens.aDAI!, chainlinkFeeds.DAI!) -) +// makeAaveFiatCollateralTestSuite( +// 'MorphoAAVEV2FiatCollateral - DAI', +// makeOpts(tokens.DAI!, tokens.aDAI!, chainlinkFeeds.DAI!) +// ) diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index a23666dfd6..aa5a764dd4 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -2,7 +2,7 @@ import hre from 'hardhat' import { ITokens, networkConfig } from '#/common/configuration' import { ethers } from 'hardhat' import { whileImpersonating } from '../../../utils/impersonation' -import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' +import { whales } from '#/tasks/validation/utils/constants' import { BigNumber, Signer } from 'ethers' import { formatUnits, parseUnits } from 'ethers/lib/utils' import { expect } from 'chai' diff --git a/test/plugins/individual-collateral/morpho-aave/mintCollateralTo.ts b/test/plugins/individual-collateral/morpho-aave/mintCollateralTo.ts index 300d04712d..1b817a821b 100644 --- a/test/plugins/individual-collateral/morpho-aave/mintCollateralTo.ts +++ b/test/plugins/individual-collateral/morpho-aave/mintCollateralTo.ts @@ -1,12 +1,14 @@ import { CollateralFixtureContext, MintCollateralFunc } from '../pluginTestTypes' import hre from 'hardhat' +import { networkConfig } from '#/common/configuration' import { BigNumberish, constants } from 'ethers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { whales } from '#/tasks/testing/upgrade-checker-utils/constants' import { whileImpersonating } from '#/utils/impersonation' import { IERC20 } from '@typechain/IERC20' import { MockV3Aggregator } from '@typechain/MockV3Aggregator' import { MorphoAaveV2TokenisedDepositMock } from '@typechain/MorphoAaveV2TokenisedDepositMock' +import { getChainId } from '#/common/blockchain-utils' +import { Whales, getWhalesFile } from '#/scripts/whalesConfig' /** * Interface representing the context object for the MorphoAaveCollateralFixture. @@ -32,6 +34,11 @@ export const mintCollateralTo: MintCollateralFunc { + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + whales[networkConfig['1'].tokens.USDC!.toLowerCase()] = + '0xD6153F5af5679a75cC85D8974463545181f48772' + await whileImpersonating( hre, whales[ctx.underlyingErc20.address.toLowerCase()], diff --git a/utils/env.ts b/utils/env.ts index 69b7ad5e7b..8deae52e77 100644 --- a/utils/env.ts +++ b/utils/env.ts @@ -28,6 +28,7 @@ type IEnvVars = | 'ARBITRUM_RPC_URL' | 'FORK_NETWORK' | 'FORK_BLOCK' + | 'FORCE_WHALE_REFRESH' export function useEnv(key: IEnvVars | IEnvVars[], _default = ''): string { if (typeof key === 'string') { diff --git a/yarn.lock b/yarn.lock index 244b998ab1..127cbc0c0a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2846,6 +2846,17 @@ __metadata: languageName: node linkType: hard +"axios-retry@npm:^4.1.0": + version: 4.1.0 + resolution: "axios-retry@npm:4.1.0" + dependencies: + is-retry-allowed: ^2.2.0 + peerDependencies: + axios: 0.x || 1.x + checksum: e1e07f710d12e3367bc1e934b49f3056bc6a1d8c4b1c5cc69afb89841c5ee360fe36565894d53c043c7ea43bc7ac353b87573c8d6d721b12ac4d567be38cc117 + languageName: node + linkType: hard + "axios@npm:^0.21.1, axios@npm:^0.21.2": version: 0.21.4 resolution: "axios@npm:0.21.4" @@ -2855,15 +2866,6 @@ __metadata: languageName: node linkType: hard -"axios@npm:^0.24.0": - version: 0.24.0 - resolution: "axios@npm:0.24.0" - dependencies: - follow-redirects: ^1.14.4 - checksum: 468cf496c08a6aadfb7e699bebdac02851e3043d4e7d282350804ea8900e30d368daa6e3cd4ab83b8ddb5a3b1e17a5a21ada13fc9cebd27b74828f47a4236316 - languageName: node - linkType: hard - "axios@npm:^0.27.2": version: 0.27.2 resolution: "axios@npm:0.27.2" @@ -2885,6 +2887,17 @@ __metadata: languageName: node linkType: hard +"axios@npm:^1.6.8": + version: 1.6.8 + resolution: "axios@npm:1.6.8" + dependencies: + follow-redirects: ^1.15.6 + form-data: ^4.0.0 + proxy-from-env: ^1.1.0 + checksum: bf007fa4b207d102459300698620b3b0873503c6d47bf5a8f6e43c0c64c90035a4f698b55027ca1958f61ab43723df2781c38a99711848d232cad7accbcdfcdd + languageName: node + linkType: hard + "babel-plugin-istanbul@npm:^6.1.1": version: 6.1.1 resolution: "babel-plugin-istanbul@npm:6.1.1" @@ -3028,6 +3041,13 @@ __metadata: languageName: node linkType: hard +"boolbase@npm:^1.0.0": + version: 1.0.0 + resolution: "boolbase@npm:1.0.0" + checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0 + languageName: node + linkType: hard + "brace-expansion@npm:^1.1.7": version: 1.1.11 resolution: "brace-expansion@npm:1.1.11" @@ -3385,6 +3405,35 @@ __metadata: languageName: node linkType: hard +"cheerio-select@npm:^2.1.0": + version: 2.1.0 + resolution: "cheerio-select@npm:2.1.0" + dependencies: + boolbase: ^1.0.0 + css-select: ^5.1.0 + css-what: ^6.1.0 + domelementtype: ^2.3.0 + domhandler: ^5.0.3 + domutils: ^3.0.1 + checksum: 843d6d479922f28a6c5342c935aff1347491156814de63c585a6eb73baf7bb4185c1b4383a1195dca0f12e3946d737c7763bcef0b9544c515d905c5c44c5308b + languageName: node + linkType: hard + +"cheerio@npm:^1.0.0-rc.12": + version: 1.0.0-rc.12 + resolution: "cheerio@npm:1.0.0-rc.12" + dependencies: + cheerio-select: ^2.1.0 + dom-serializer: ^2.0.0 + domhandler: ^5.0.3 + domutils: ^3.0.1 + htmlparser2: ^8.0.1 + parse5: ^7.0.0 + parse5-htmlparser2-tree-adapter: ^7.0.0 + checksum: 5d4c1b7a53cf22d3a2eddc0aff70cf23cbb30d01a4c79013e703a012475c02461aa1fcd99127e8d83a02216386ed6942b2c8103845fd0812300dd199e6e7e054 + languageName: node + linkType: hard + "chokidar@npm:3.3.0": version: 3.3.0 resolution: "chokidar@npm:3.3.0" @@ -3842,6 +3891,26 @@ __metadata: languageName: node linkType: hard +"css-select@npm:^5.1.0": + version: 5.1.0 + resolution: "css-select@npm:5.1.0" + dependencies: + boolbase: ^1.0.0 + css-what: ^6.1.0 + domhandler: ^5.0.2 + domutils: ^3.0.1 + nth-check: ^2.0.1 + checksum: 2772c049b188d3b8a8159907192e926e11824aea525b8282981f72ba3f349cf9ecd523fdf7734875ee2cb772246c22117fc062da105b6d59afe8dcd5c99c9bda + languageName: node + linkType: hard + +"css-what@npm:^6.1.0": + version: 6.1.0 + resolution: "css-what@npm:6.1.0" + checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe + languageName: node + linkType: hard + "dashdash@npm:^1.12.0": version: 1.14.1 resolution: "dashdash@npm:1.14.1" @@ -4056,6 +4125,44 @@ __metadata: languageName: node linkType: hard +"dom-serializer@npm:^2.0.0": + version: 2.0.0 + resolution: "dom-serializer@npm:2.0.0" + dependencies: + domelementtype: ^2.3.0 + domhandler: ^5.0.2 + entities: ^4.2.0 + checksum: cd1810544fd8cdfbd51fa2c0c1128ec3a13ba92f14e61b7650b5de421b88205fd2e3f0cc6ace82f13334114addb90ed1c2f23074a51770a8e9c1273acbc7f3e6 + languageName: node + linkType: hard + +"domelementtype@npm:^2.3.0": + version: 2.3.0 + resolution: "domelementtype@npm:2.3.0" + checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6 + languageName: node + linkType: hard + +"domhandler@npm:^5.0.2, domhandler@npm:^5.0.3": + version: 5.0.3 + resolution: "domhandler@npm:5.0.3" + dependencies: + domelementtype: ^2.3.0 + checksum: 0f58f4a6af63e6f3a4320aa446d28b5790a009018707bce2859dcb1d21144c7876482b5188395a188dfa974238c019e0a1e610d2fc269a12b2c192ea2b0b131c + languageName: node + linkType: hard + +"domutils@npm:^3.0.1": + version: 3.1.0 + resolution: "domutils@npm:3.1.0" + dependencies: + dom-serializer: ^2.0.0 + domelementtype: ^2.3.0 + domhandler: ^5.0.3 + checksum: e5757456ddd173caa411cfc02c2bb64133c65546d2c4081381a3bafc8a57411a41eed70494551aa58030be9e58574fcc489828bebd673863d39924fb4878f416 + languageName: node + linkType: hard + "dotenv@npm:^16.0.0": version: 16.3.1 resolution: "dotenv@npm:16.3.1" @@ -4163,6 +4270,13 @@ __metadata: languageName: node linkType: hard +"entities@npm:^4.2.0, entities@npm:^4.4.0": + version: 4.5.0 + resolution: "entities@npm:4.5.0" + checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7 + languageName: node + linkType: hard + "env-paths@npm:^2.2.0": version: 2.2.1 resolution: "env-paths@npm:2.2.1" @@ -5267,7 +5381,7 @@ __metadata: languageName: node linkType: hard -"follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.4, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": +"follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.0": version: 1.15.2 resolution: "follow-redirects@npm:1.15.2" peerDependenciesMeta: @@ -5277,6 +5391,16 @@ __metadata: languageName: node linkType: hard +"follow-redirects@npm:^1.15.6": + version: 1.15.6 + resolution: "follow-redirects@npm:1.15.6" + peerDependenciesMeta: + debug: + optional: true + checksum: a62c378dfc8c00f60b9c80cab158ba54e99ba0239a5dd7c81245e5a5b39d10f0c35e249c3379eae719ff0285fff88c365dd446fab19dee771f1d76252df1bbf5 + languageName: node + linkType: hard + "for-each@npm:^0.3.3": version: 0.3.3 resolution: "for-each@npm:0.3.3" @@ -6131,6 +6255,18 @@ __metadata: languageName: node linkType: hard +"htmlparser2@npm:^8.0.1": + version: 8.0.2 + resolution: "htmlparser2@npm:8.0.2" + dependencies: + domelementtype: ^2.3.0 + domhandler: ^5.0.3 + domutils: ^3.0.1 + entities: ^4.4.0 + checksum: 29167a0f9282f181da8a6d0311b76820c8a59bc9e3c87009e21968264c2987d2723d6fde5a964d4b7b6cba663fca96ffb373c06d8223a85f52a6089ced942700 + languageName: node + linkType: hard + "http-basic@npm:^8.1.1": version: 8.1.3 resolution: "http-basic@npm:8.1.3" @@ -6580,6 +6716,13 @@ __metadata: languageName: node linkType: hard +"is-retry-allowed@npm:^2.2.0": + version: 2.2.0 + resolution: "is-retry-allowed@npm:2.2.0" + checksum: 3d1103a9290b5d03626756a41054844633eac78bc5d3e3a95b13afeae94fa3cfbcf7f0b5520d83f75f48a25ce7b142fdbac4217dc4b0630f3ea55e866ec3a029 + languageName: node + linkType: hard + "is-shared-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "is-shared-array-buffer@npm:1.0.2" @@ -7984,6 +8127,15 @@ __metadata: languageName: node linkType: hard +"nth-check@npm:^2.0.1": + version: 2.1.1 + resolution: "nth-check@npm:2.1.1" + dependencies: + boolbase: ^1.0.0 + checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3 + languageName: node + linkType: hard + "number-to-bn@npm:1.7.0": version: 1.7.0 resolution: "number-to-bn@npm:1.7.0" @@ -8269,6 +8421,25 @@ __metadata: languageName: node linkType: hard +"parse5-htmlparser2-tree-adapter@npm:^7.0.0": + version: 7.0.0 + resolution: "parse5-htmlparser2-tree-adapter@npm:7.0.0" + dependencies: + domhandler: ^5.0.2 + parse5: ^7.0.0 + checksum: fc5d01e07733142a1baf81de5c2a9c41426c04b7ab29dd218acb80cd34a63177c90aff4a4aee66cf9f1d0aeecff1389adb7452ad6f8af0a5888e3e9ad6ef733d + languageName: node + linkType: hard + +"parse5@npm:^7.0.0": + version: 7.1.2 + resolution: "parse5@npm:7.1.2" + dependencies: + entities: ^4.4.0 + checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713 + languageName: node + linkType: hard + "parseurl@npm:~1.3.3": version: 1.3.3 resolution: "parseurl@npm:1.3.3" @@ -8858,10 +9029,12 @@ __metadata: "@types/node": ^12.20.37 "@typescript-eslint/eslint-plugin": 5.17.0 "@typescript-eslint/parser": 5.17.0 - axios: ^0.24.0 + axios: ^1.6.8 + axios-retry: ^4.1.0 bignumber.js: ^9.1.1 caip: ^1.1.0 chai: ^4.3.4 + cheerio: ^1.0.0-rc.12 decimal.js: ^10.4.3 dotenv: ^16.0.0 eslint: 8.14.0 From 9f74dd5b01095725b2ea89e6d6758e4ebdd8977e Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 3 May 2024 11:47:38 -0300 Subject: [PATCH 368/450] fix extreme tests for new backup limit (#1128) --- common/configuration.ts | 2 ++ test/ZTradingExtremes.test.ts | 32 +++++++++++++++++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/common/configuration.ts b/common/configuration.ts index bfae5bab6a..a314f24af4 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -686,6 +686,8 @@ 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)) +export const MAX_BASKET_SIZE = 100 +export const MAX_BACKUP_SIZE = 64 // Timestamps export const MAX_ORACLE_TIMEOUT = BigNumber.from(2).pow(48).sub(1).sub(300) diff --git a/test/ZTradingExtremes.test.ts b/test/ZTradingExtremes.test.ts index 111faaefd4..e394a2105d 100644 --- a/test/ZTradingExtremes.test.ts +++ b/test/ZTradingExtremes.test.ts @@ -3,7 +3,13 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' import { ethers } from 'hardhat' -import { IConfig, MAX_ORACLE_TIMEOUT, MAX_THROTTLE_AMT_RATE } from '../common/configuration' +import { + IConfig, + MAX_ORACLE_TIMEOUT, + MAX_THROTTLE_AMT_RATE, + MAX_BASKET_SIZE, + MAX_BACKUP_SIZE, +} from '../common/configuration' import { FURNACE_DEST, STRSR_DEST, MAX_UINT256, ZERO_ADDRESS } from '../common/constants' import { bn, fp, shortString, toBNDecimals, divCeil } from '../common/numbers' import { @@ -365,11 +371,11 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, if (SLOW) { dimensions = [ [fp('1e-6'), fp('1e30')], // RToken supply - [1, 100], // basket size + [1, MAX_BASKET_SIZE], // basket size [fp('1e-6'), fp('1e3'), fp('1')], // prime basket weights [8, 18], // collateral decimals [fp('1e9'), fp('1').add(fp('1e-9'))], // exchange rate at appreciation - [1, 100], // how many collateral assets appreciate (up to) + [1, MAX_BASKET_SIZE], // how many collateral assets appreciate (up to) [fp('0'), fp('1'), fp('0.6')], // StRSR cut (f) ] } else { @@ -515,7 +521,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, if (SLOW) { dimensions = [ [fp('1e-6'), fp('1e30')], // RToken supply - [1, 100], // basket size + [1, MAX_BASKET_SIZE], // basket size [1, 2], // num reward tokens [bn('0'), bn('1e11'), bn('1e6')], // reward amount (whole tokens), up to 100B supply tokens [fp('0'), fp('1'), fp('0.6')], // StRSR cut (f) @@ -638,11 +644,14 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, primeBasket.map((c) => c.address), targetAmts ) + + const bkpSize = basketSize <= MAX_BACKUP_SIZE ? basketSize : MAX_BACKUP_SIZE await basketHandler.connect(owner).setBackupConfig( ethers.utils.formatBytes32String('USD'), - basketSize, - primeBasket.map((c) => c.address) + bkpSize, + primeBasket.slice(-1 * bkpSize).map((c) => c.address) ) + await basketHandler.connect(owner).refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) @@ -680,10 +689,10 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, if (SLOW) { dimensions = [ [fp('1e-6'), fp('1e30')], // RToken supply - [2, 100], // basket size + [2, MAX_BASKET_SIZE], // basket size [fp('1e-6'), fp('1e3'), fp('1')], // prime basket weights [8, 18], // collateral decimals - [1, 99], // how many collateral assets default (up to) + [1, MAX_BASKET_SIZE - 1], // how many collateral assets default (up to) ] } else { dimensions = [ @@ -796,7 +805,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, } for (let i = 0; i < targetUnits; i++) { const targetUnit = ethers.utils.formatBytes32String(i.toString()) - await basketHandler.setBackupConfig(targetUnit, numPrimeTokens, backups[i]) + await basketHandler.setBackupConfig(targetUnit, numBackupTokens, backups[i]) } // Set prime basket with all collateral @@ -813,11 +822,12 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, } } - const size = SLOW ? 100 : 4 // Currently 100 takes >5 minutes to execute 32 cases + const size = SLOW ? MAX_BASKET_SIZE : 4 // Currently 100 takes >5 minutes to execute 32 cases + const bkpsize = SLOW ? MAX_BACKUP_SIZE : 4 const primeTokens = [size, 1] - const backupTokens = [size, 0] + const backupTokens = [bkpsize, 0] const targetUnits = [size, 1] From 71cef57b5d9932879d0b9d0ba8502d25d5ef6ab0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 6 May 2024 12:08:57 -0400 Subject: [PATCH 369/450] Trust metamorpho mitigations (#1129) --- contracts/plugins/assets/ERC4626FiatCollateral.sol | 4 ---- .../meta-morpho/MetaMorphoSelfReferentialCollateral.sol | 2 +- .../morpho-aave/MorphoSelfReferentialCollateral.sol | 2 +- .../addresses/mainnet-3.4.0/1-tmp-assets-collateral.json | 8 ++++---- .../deployment/phase2-assets/collaterals/deploy_bbusdt.ts | 2 +- .../phase2-assets/collaterals/deploy_re7weth.ts | 2 +- .../phase2-assets/collaterals/deploy_steakpyusd.ts | 2 +- .../phase2-assets/collaterals/deploy_steakusdc.ts | 2 +- scripts/verification/collateral-plugins/verify_re7weth.ts | 2 +- .../verification/collateral-plugins/verify_steakusdc.ts | 2 +- 10 files changed, 12 insertions(+), 16 deletions(-) diff --git a/contracts/plugins/assets/ERC4626FiatCollateral.sol b/contracts/plugins/assets/ERC4626FiatCollateral.sol index c1a527e527..b2ce03a4e4 100644 --- a/contracts/plugins/assets/ERC4626FiatCollateral.sol +++ b/contracts/plugins/assets/ERC4626FiatCollateral.sol @@ -26,10 +26,6 @@ contract ERC4626FiatCollateral is AppreciatingFiatCollateral { constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { - require(address(config.erc20) != address(0), "missing erc20"); - if (config.defaultThreshold != 0) { - require(config.delayUntilDefault != 0, "delayUntilDefault zero"); - } IERC4626 vault = IERC4626(address(config.erc20)); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); diff --git a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol index 90ed8f0a88..8db21fd6fe 100644 --- a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol @@ -11,7 +11,7 @@ import { ERC4626FiatCollateral } from "../ERC4626FiatCollateral.sol"; /** * @title MetaMorphoSelfReferentialCollateral * @notice Collateral plugin for a MetaMorpho vault with self referential collateral, like WETH - * Expected: {tok} == {ref}, {ref} == {target}, {target} != {UoA} + * Expected: {tok} != {ref}, {ref} == {target}, {target} != {UoA} * * For example: Re7WETH */ diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index 2c61150119..c12f2c2547 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -13,7 +13,7 @@ import { shiftl_toFix, FIX_ONE, FixLib, CEIL } from "../../../libraries/Fixed.so /** * @title MorphoSelfReferentialCollateral * @notice Collateral plugin for a Morpho pool with self referential collateral, like WETH - * Expected: {tok} == {ref}, {ref} == {target}, {target} != {UoA} + * Expected: {tok} != {ref}, {ref} == {target}, {target} != {UoA} */ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; diff --git a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json index b7d3762111..8fec0d8289 100644 --- a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json @@ -52,10 +52,10 @@ "sFRAX": "0x0b7DcCBceA6f985301506D575E2661bf858CdEcC", "saEthUSDC": "0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB", "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E", - "bbUSDT": "0x3017d881724D93783e7f065Cc5F62c81C62c36A0", - "steakUSDC": "0x4895b9aee383b5dec499F54172Ccc7Ee05FC8Bbc", - "steakPYUSD": "0xBd01C789Be742688fb73F6aE46f1320196B6c973", - "Re7WETH": "0x3421d2cB19c8E69c6FA642C43e60cD943e75Ca8b", + "bbUSDT": "0x01355C7439982c57cF89CA9785d211806f866224", + "steakUSDC": "0x565CBc99EE04667581c7f3459561fCaf1CF68602", + "steakPYUSD": "0x23f06D5Fe858B18CD064A5D95054e8ae8536094a", + "Re7WETH": "0xa0a6C06e45437d4Ae1D778AaeB4605AC2B62A870", "cvxCrvUSDUSDC": "0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5", "cvxCrvUSDUSDT": "0x69c6597690B8Df61D15F201519C03725bdec40c1", "sfrxETH": "0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67" diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts b/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts index 034a22aa52..8da827002e 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_bbusdt.ts @@ -66,7 +66,7 @@ async function main() { defaultThreshold: USDT_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, - fp('1e-6') // small admin fee uncertainty + fp('1e-4') // can have small drawdowns ) await collateral.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts b/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts index 0902cc5520..efe39efbc9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_re7weth.ts @@ -65,7 +65,7 @@ async function main() { defaultThreshold: '0', // WETH delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, - fp('1e-6') // small admin fee uncertainty + fp('1e-3') // can have large drawdowns ) ) await collateral.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts b/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts index f796086e9d..6100f1012d 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_steakpyusd.ts @@ -66,7 +66,7 @@ async function main() { defaultThreshold: PYUSD_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, - fp('1e-6') // small admin fee uncertainty + fp('1e-4') // can have small drawdowns ) await collateral.deployed() diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts index 5d8ae1a02a..53f46681e2 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_steakusdc.ts @@ -66,7 +66,7 @@ async function main() { defaultThreshold: USDC_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, - fp('1e-6') // small admin fee uncertainty + fp('1e-4') // can have mild drawdowns ) await collateral.deployed() diff --git a/scripts/verification/collateral-plugins/verify_re7weth.ts b/scripts/verification/collateral-plugins/verify_re7weth.ts index 3d80cfff29..c000046cf6 100644 --- a/scripts/verification/collateral-plugins/verify_re7weth.ts +++ b/scripts/verification/collateral-plugins/verify_re7weth.ts @@ -48,7 +48,7 @@ async function main() { defaultThreshold: '0', // WETH delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, - fp('1e-6'), // small admin fee uncertainty + fp('1e-3'), // can have large drawdowns ], 'contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol:MetaMorphoSelfReferentialCollateral' ) diff --git a/scripts/verification/collateral-plugins/verify_steakusdc.ts b/scripts/verification/collateral-plugins/verify_steakusdc.ts index 277f30b6af..af67aec4ec 100644 --- a/scripts/verification/collateral-plugins/verify_steakusdc.ts +++ b/scripts/verification/collateral-plugins/verify_steakusdc.ts @@ -48,7 +48,7 @@ async function main() { defaultThreshold: USDC_ORACLE_ERROR.add(fp('0.01')).toString(), // +1% buffer rule delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), }, - fp('1e-6'), // small admin fee uncertainty + fp('1e-4'), // can have small drawdowns ], 'contracts/plugins/assets/meta-morpho/MetaMorphoFiatCollateral.sol:MetaMorphoFiatCollateral' ) From 7acd6d8c1f044efa8a6f4753e40e27720ccbb5f8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 6 May 2024 16:12:16 -0400 Subject: [PATCH 370/450] CHANGELOG --- CHANGELOG.md | 66 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 671e2bae6b..87da72eb58 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,25 +2,83 @@ # 3.4.0 +This release adds Arbitrum support by adjusting `Furnace`/`StRSR`/`Governance` to function off of timestamp/timepoints, instead of discrete periods. + ## Upgrade Steps -TODO +Upgrade all core contracts and plugins. Call `cacheComponents()` on `BackingManager`, `Broker`, `Distributor`, and both `RevenueTraders`. -Must-do: Upgrade Furnace melt + StRSR drip ratios at time of upgrade to be based on 1s. +Adjust Furnace melt + StRSR drip ratios at time of upgrade to be based on 1s. For example: divide ratios by 12 for ethereum mainnet. -Should-do: Set Governance as Timelock CANCELLER_ROLE +Set Governance as Timelock CANCELLER_ROLE. ## Core Protocol Contracts +Throughout many core contracts negligible gas improvements have been applied. These are excluded from the list below. + +- `BackingManager` + - Remove requirement for empty block between auctions of same kind (auctions must still be in different blocks) +- `BasketHandler` + - Set max number of backup erc20s: 64 + - Require all collateral are SOUND during index RToken `setPrimeBasket()` +- `Broker` + - Switch to timestamp-based auctions +- `Furnace` + - Switch to timestamp-based melting +- `StRSR` + - Switch to timestamp-based RSR drip +- `StRSRP1Votes` + - Switch to timestamp-based checkpointing + - Add IERC58505 support + - `clock() external view returns (uint48)` + - `CLOCK_MODE() external view returns (string memory)` + ## Plugins +### Assets + +- Deprecate `EURT` +- Rename `ZeroPrice()` error to `InvalidPrice()` +- aave-v3 + - Add try-catch to `StaticATokenV3LM.metaDeposit()` +- compound-v3 + - Fix allowance check in `claimTo()` to use `msg.sender` +- curve/convex + - Add `CurveAppreciatingRTokenFiatCollateral` + `CurveAppreciatingRTokenSelfReferentialCollateral` to support `ETH+/ETH` curve pools in non-recursive cases + - Add `CurveRecursiveCollateral` + `StakeDAORecursiveCollateral` to support `USDC/USDC+` curve pool in the recursive case. That is: USDC+ will be backed somewhat by its own liquidity against USDC. + - Modify `CurveStableRTokenMetapoolCollateral` to check `isReady()` status of underlying RTokens; try-catch asset-registry call. +- metamorpho + - Add `MetaMorphoFiatCollateral` + `MetaMorphoSelfReferentialCollateral` to support `steakUSDC`/`steakUSDP`/`bbUSDT`/`Re7WETH` morpho blue managed vaults +- frax + - Add missing `defaultThreshold != 0` check + ### Trading - `DutchTrade` - Switch to timestamp-based model - `price(uint256 blockNumber)` -> `price(uint48 timestamp)` - Remove `startBlock() returns (uint256)` + `endBlock() returns (uint256)` - - Add `startTime() returns (uint48)` (`endTime() returns (uint48)` already existed and is now used in the contract) + - Add `startTime() returns (uint48)` + - `bid(uint256 blockNumber)` => `bid(uint48 timestamp)` + +### Facades + +Switch to new Facade singleton model with multiple facets + +- `FacadeRead` => `ReadFacet` + `MaxIssuableFacet` +- `FacadeAct` => `ActFacet` + +FacadeMonitor remains independent. + +### Governance + +Create new Governor Anastasius contract to supersede Governor Alexios. Required to work with new timepoint-based model in StRSRP1Votes. + +- `name()`: "Governor Alexios" => "Governor Anastasius" +- `quorum(uint256 blockNumber)` => `quorum(uint256 timepoint)` +- Add IERC58505 support + - `clock() external view returns (uint48)` + - `CLOCK_MODE() external view returns (string memory)` # 3.3.0 From 102a7611230106dcd0674e36051aac0a1b53541d Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 7 May 2024 12:24:36 -0300 Subject: [PATCH 371/450] include slitherin detectors (#1136) --- .github/workflows/tests.yml | 1 + docs/dev-env.md | 18 ++++++++++++------ docs/solidity-style.md | 2 +- tools/slither.py | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b84b99c26..14f39a45b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -39,6 +39,7 @@ jobs: - run: yarn install --immutable - run: yarn lint - run: pip3 install solc-select slither-analyzer + - run: pip3 install slitherin - run: solc-select install 0.8.19 - run: solc-select use 0.8.19 - run: yarn slither diff --git a/docs/dev-env.md b/docs/dev-env.md index 40ca0d3368..edd3e822e0 100644 --- a/docs/dev-env.md +++ b/docs/dev-env.md @@ -3,13 +3,14 @@ We're using: - [Hardhat](hardhat.org) to compile, test, and deploy our smart contracts. -- [Slither][] and [Echidna][], from the [Trail of Bits contract security toolkit][tob-suite] for static analysis, fuzz checking, and differential testing. +- [Slither][], [Slitherin][], and [Echidna][], from the [Trail of Bits contract security toolkit][tob-suite] for static analysis, fuzz checking, and differential testing. - [Prettier][] to auto-format both Solidity and Typescript (test) code - [Solhint][] for Solidity linting - [ESlint][] for Typescript linting [echidna]: https://github.com/crytic/echidna [slither]: https://github.com/crytic/slither +[slitherin]: https://github.com/pessimistic-io/slitherin [tob-suite]: https://blog.trailofbits.com/2018/03/23/use-our-suite-of-ethereum-security-tools/ [prettier]: https://prettier.io/ [solhint]: https://protofire.github.io/solhint/ @@ -56,18 +57,24 @@ tenderly login --authentication-method access-key --access-key {your_access_key} ### Slither -You should also setup `slither`. The [Trail of Bits tools][tob-suite] require solc-select. Check [the installation instructions](https://github.com/crytic/solc-select) to ensure you have all prerequisites. Then: +You should also setup `slither` and `slitherin`. The [Trail of Bits tools][tob-suite] require solc-select. Check [the installation instructions](https://github.com/crytic/solc-select) to ensure you have all prerequisites. Then: ```bash # Install solc-select and slither pip3 install solc-select slither-analyzer +# Include slitherin detectors within slither +pip3 install slitherin + # Install and use solc version 0.8.19 solc-select install 0.8.19 solc-select use 0.8.19 # Double-check that your slither version is at least 0.8.3! hash -r && slither --version + +# Slitherin version should be at least 0.7.0 +slitherin --version ``` ## Usage @@ -83,7 +90,7 @@ hash -r && slither --version - Run integration tests: `yarn test:integration` - Run tests and report test coverage: `yarn test:coverage` - Lint Solidity + Typescript code: `yarn lint` -- Run the Slither static checker: `yarn slither` +- Run the Slither static checker: `yarn slither` (will include Slitherin detectors) - Run a local mainnet fork devchain: `yarn devchain` - Deploy to devchain: `yarn deploy:run --network localhost` @@ -107,7 +114,6 @@ We _have_ some tooling for testing with Echidna, but it is specifically in `fuzz See our [deployment documentation](deployment.md). -## Slither Analysis - -The ToB Sliter tool is run on any pull request, and is expected to be checked by devs for any unexpected high or medium issues raised. +## Slither/Slitherin Analysis +The ToB Sliter tool is run on any pull request, and is expected to be checked by devs for any unexpected high or medium issues raised. It also includes the additional Slitherin detectors developed by Pessimistic. diff --git a/docs/solidity-style.md b/docs/solidity-style.md index 1ff39574db..4bec58a300 100644 --- a/docs/solidity-style.md +++ b/docs/solidity-style.md @@ -48,7 +48,7 @@ We're using 192 bits instead of the full 256 bits because it makes typical multi Initial versions of this code were written using the custom type `Fix` everywhere, and `Fixed` contained the line `type Fix is int192`. We found later that: - We had essentially no need for negative `Fix` values, so spending a storage bit on sign, and juggling the possibility of negative values, cost extra gas and harmed the clarity of our code. -- While `solc 0.8.19` allows custom types without any issue, practically all of the other tools we want to use on our Solidity source -- `slither`, `prettier`, `solhint` -- would fail when encountering substantial code using a custom type. +- While `solc 0.8.19` allows custom types without any issue, practically all of the other tools we want to use on our Solidity source -- `slither`, `slitherin`, `prettier`, `solhint` -- would fail when encountering substantial code using a custom type. Reintroducing this custom type should be mostly mechanicanizable, but now that P1 contains a handful of hotspot optimizations that do raw arithmetic internally to eliminate Fixlib calls, it won't be trivial to do so. Still, if and when those tools achieve adequate support for custom types, we will probably do this conversion ourselves, if only to ensure that conversions between the Fix and integer interpretations of uints are carefully type-checked. diff --git a/tools/slither.py b/tools/slither.py index e3e38153a2..d6a26918b8 100644 --- a/tools/slither.py +++ b/tools/slither.py @@ -23,7 +23,7 @@ def proj_root(): if file_orig.exists(): rename(file_orig, file_temp) - # run slither from inside the tools directory + # run slither from inside the tools directory (includes slitherin detectors) args = argv[1:] run(["slither", "../", *args], cwd=project / "tools") From 61d54e4c035d8eb1a547958b6271aae1701d2f2d Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 8 May 2024 21:53:30 -0400 Subject: [PATCH 372/450] README --- README.md | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index bd78452332..26f5b1c67e 100644 --- a/README.md +++ b/README.md @@ -31,30 +31,29 @@ For a much more detailed explanation of the economic design, including an hour-l - [Rebalancing Algorithm](https://github.com/reserve-protocol/protocol/blob/master/docs/recollateralization.md): Description of our trading algorithm during the recollateralization process - [Changelog](https://github.com/reserve-protocol/protocol/blob/master/CHANGELOG.md): Release changelog -## Mainnet Addresses (v3.0.0) +## Mainnet Addresses (v3.4.0) | Implementation Contracts | Address | | ------------------------ | --------------------------------------------------------------------------------------------------------------------- | -| tradingLib | [0xB81a1fa9A497953CEC7f370CACFA5cc364871A73](https://etherscan.io/address/0xB81a1fa9A497953CEC7f370CACFA5cc364871A73) | -| facadeRead | [0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C](https://etherscan.io/address/0x81b9Ae0740CcA7cDc5211b2737de735FBC4BeB3C) | -| facadeAct | [0x801fF27bacc7C00fBef17FC901504c79D59E845C](https://etherscan.io/address/0x801fF27bacc7C00fBef17FC901504c79D59E845C) | -| facadeWriteLib | [0x0776Ad71Ae99D759354B3f06fe17454b94837B0D](https://etherscan.io/address/0x0776Ad71Ae99D759354B3f06fe17454b94837B0D) | -| facadeWrite | [0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c](https://etherscan.io/address/0x41edAFFB50CA1c2FEC86C629F845b8490ced8A2c) | -| deployer | [0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e](https://etherscan.io/address/0x15480f5B5ED98A94e1d36b52Dd20e9a35453A38e) | -| rsrAsset | [0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6](https://etherscan.io/address/0x7edD40933DfdA0ecEe1ad3E61a5044962284e1A6) | -| main | [0xF5366f67FF66A3CefcB18809a762D5b5931FebF8](https://etherscan.io/address/0xF5366f67FF66A3CefcB18809a762D5b5931FebF8) | -| gnosisTrade | [0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630](https://etherscan.io/address/0xe416Db92A1B27c4e28D5560C1EEC03f7c582F630) | -| dutchTrade | [0x2387C22727ACb91519b80A15AEf393ad40dFdb2F](https://etherscan.io/address/0x2387C22727ACb91519b80A15AEf393ad40dFdb2F) | -| assetRegistry | [0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450](https://etherscan.io/address/0x773cf50adCF1730964D4A9b664BaEd4b9FFC2450) | -| backingManager | [0x0A388FC05AA017b31fb084e43e7aEaFdBc043080](https://etherscan.io/address/0x0A388FC05AA017b31fb084e43e7aEaFdBc043080) | -| basketHandler | [0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc](https://etherscan.io/address/0x5ccca36CbB66a4E4033B08b4F6D7bAc96bA55cDc) | -| broker | [0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04](https://etherscan.io/address/0x9A5F8A9bB91a868b7501139eEdB20dC129D28F04) | -| distributor | [0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac](https://etherscan.io/address/0x0e8439a17bA5cBb2D9823c03a02566B9dd5d96Ac) | -| furnace | [0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c](https://etherscan.io/address/0x99580Fc649c02347eBc7750524CAAe5cAcf9d34c) | -| rsrTrader | [0x1cCa3FBB11C4b734183f997679d52DeFA74b613A](https://etherscan.io/address/0x1cCa3FBB11C4b734183f997679d52DeFA74b613A) | -| rTokenTrader | [0x1cCa3FBB11C4b734183f997679d52DeFA74b613A](https://etherscan.io/address/0x1cCa3FBB11C4b734183f997679d52DeFA74b613A) | -| rToken | [0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F](https://etherscan.io/address/0xb6f01Aa21defA4a4DE33Bed16BcC06cfd23b6A6F) | -| stRSR | [0xC98eaFc9F249D90e3E35E729e3679DD75A899c10](https://etherscan.io/address/0xC98eaFc9F249D90e3E35E729e3679DD75A899c10) | +| tradingLib | [0xa54544C6C36C0d776cc4F04EBB847e0BB3A11ea2](https://etherscan.io/address/0xa54544C6C36C0d776cc4F04EBB847e0BB3A11ea2) | +| facade | [0x2C7ca56342177343A2954C250702Fd464f4d0613](https://etherscan.io/address/0x2C7ca56342177343A2954C250702Fd464f4d0613) | +| facadeWriteLib | [0xDf73Cd789422040182b0C24a8b2C97bbCbba3263](https://etherscan.io/address/0xDf73Cd789422040182b0C24a8b2C97bbCbba3263) | +| facadeWrite | [0x1D94290F82D0B417B088d9F5dB316B11C9cf220C](https://etherscan.io/address/0x1D94290F82D0B417B088d9F5dB316B11C9cf220C) | +| deployer | [0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF](https://etherscan.io/address/0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF) | +| rsrAsset | [0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA](https://etherscan.io/address/0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA) | +| main | [0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7](https://etherscan.io/address/0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7) | +| gnosisTrade | [0x030c9B66Ac089cB01aA2058FC8f7d9baddC9ae75](https://etherscan.io/address/0x030c9B66Ac089cB01aA2058FC8f7d9baddC9ae75) | +| dutchTrade | [0x971c890ACb9EeB084f292996Be667bB9A2889AE9](https://etherscan.io/address/0x971c890ACb9EeB084f292996Be667bB9A2889AE9) | +| assetRegistry | [0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463](https://etherscan.io/address/0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463) | +| backingManager | [0x20C801869e578E71F2298649870765Aa81f7DC69](https://etherscan.io/address/0x20C801869e578E71F2298649870765Aa81f7DC69) | +| basketHandler | [0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC](https://etherscan.io/address/0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC) | +| broker | [0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c](https://etherscan.io/address/0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c) | +| distributor | [0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee](https://etherscan.io/address/0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee) | +| furnace | [0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81](https://etherscan.io/address/0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81) | +| rsrTrader | [0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c](https://etherscan.io/address/0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c) | +| rTokenTrader | [0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c](https://etherscan.io/address/0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c) | +| rToken | [0x784955641292b0014BC9eF82321300f0b6C7E36d](https://etherscan.io/address/0x784955641292b0014BC9eF82321300f0b6C7E36d) | +| stRSR | [0xE433673648c94FEC0706E5AC95d4f4097f58B5fb](https://etherscan.io/address/0xE433673648c94FEC0706E5AC95d4f4097f58B5fb) | The DeployerRegistry, which contains a link to all official releases via their Deployer contracts, can be found [here](https://etherscan.io/address/0xD85Fac03804a3e44D29c494f3761D11A2262cBBe). From ebccd3cb9c3f8a718d9940e30c0a7cf4a48ff19e Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 8 May 2024 21:53:43 -0400 Subject: [PATCH 373/450] deployment-variables.md --- docs/deployment-variables.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index 3e73f8e65e..eeef1d6c15 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -15,7 +15,7 @@ The minimum sized trade that can be performed, in terms of the unit of account. Setting this too high will result in auctions happening infrequently or the RToken taking a haircut when it cannot be sure it has enough staked RSR to succeed in rebalancing at par. -Setting this too low may allow griefers to delay important auctions. The variable should be set such that donations of size `minTradeVolume` would be worth delaying trading `batchAuctionLength` seconds. +Setting this too low may allow griefers to delay important auctions. The variable should be set such that donations of size `minTradeVolume` would be worth delaying trading `batchAuctionLength` seconds in the event of urgent recollateralization. This variable should NOT be interpreted to mean that auction sizes above this value will necessarily clear. It could be the case that gas frictions are so high that auctions launched at this size are not worthy of bids. @@ -32,7 +32,7 @@ The maximum sized trade for any trade involving RToken, in terms of the unit of This parameter can be set to zero. -Default value: `1e24` = $1M +Default value: `1e24` = $1m Reasonable range: 1e22 to 1e27. ### `rewardRatio` @@ -150,7 +150,7 @@ Reasonable range: 0 to 25e16 (0 to 25%) In order to restrict the system to organic patterns of behavior, we maintain two supply throttles, one for net issuance and one for net redemption. When a supply change occurs, a check is performed to ensure this does not move the supply more than an acceptable range over a period; a period is fixed to be an hour. The acceptable range (per throttle) is a function of the `amtRate` and `pctRate` variables. **It is the maximum of whichever variable provides the larger rate.** The recommended starting values (amt-rate normalized to $USD) for these parameters are as follows: -|**Parameter**|**Value**| +|**Parameter**|**USD Value**| |-------------|---------| |issuanceThrottle.amtRate|$2m| |issuanceThrottle.pctRate|10%| From d96e0cbf6ed57629ee64c2dbc6ae7159debaf509 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 8 May 2024 21:53:50 -0400 Subject: [PATCH 374/450] plugin-addresses.md --- docs/plugin-addresses.md | 98 ++++++++++++++++++++++------------------ 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/docs/plugin-addresses.md b/docs/plugin-addresses.md index 9d697e3cec..d968a1169d 100644 --- a/docs/plugin-addresses.md +++ b/docs/plugin-addresses.md @@ -4,53 +4,61 @@ Following are the addresses of non-collateral asset plugins. | Plugin | Feed | Underlying | | ---------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | -| [COMP](https://etherscan.io/address/0xCFA67f42A0fDe4F0Fb612ea5e66170B0465B84c1) | [0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5](https://etherscan.io/address/0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5) | [0xc00e94Cb662C3520282E6f5717214004A7f26888](https://etherscan.io/address/0xc00e94Cb662C3520282E6f5717214004A7f26888) | -| [stkAAVE](https://etherscan.io/address/0x6647c880Eb8F57948AF50aB45fca8FE86C154D24) | [0x547a514d5e3769680Ce22B2361c10Ea13619e8a9](https://etherscan.io/address/0x547a514d5e3769680Ce22B2361c10Ea13619e8a9) | [0x4da27a545c0c5B758a6BA100e3a049001de870f5](https://etherscan.io/address/0x4da27a545c0c5B758a6BA100e3a049001de870f5) | -| [CRV](https://etherscan.io/address/0x45B950AF443281c5F67c2c7A1d9bBc325ECb8eEA) | [0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f](https://etherscan.io/address/0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f) | [0xD533a949740bb3306d119CC777fa900bA034cd52](https://etherscan.io/address/0xD533a949740bb3306d119CC777fa900bA034cd52) | -| [CVX](https://etherscan.io/address/0x4024c00bBD0C420E719527D88781bc1543e63dd5) | [0xd962fC30A72A84cE50161031391756Bf2876Af5D](https://etherscan.io/address/0xd962fC30A72A84cE50161031391756Bf2876Af5D) | [0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B](https://etherscan.io/address/0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B) | +| [COMP](https://etherscan.io/address/0x63eDdF26Bc65eDa1D1c0147ce8E23c09BE963596) | [0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5](https://etherscan.io/address/0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5) | [0xc00e94Cb662C3520282E6f5717214004A7f26888](https://etherscan.io/address/0xc00e94Cb662C3520282E6f5717214004A7f26888) | +| [stkAAVE](https://etherscan.io/address/0xF4493581D52671a9E04d693a68ccc61853bceEaE) | [0x547a514d5e3769680Ce22B2361c10Ea13619e8a9](https://etherscan.io/address/0x547a514d5e3769680Ce22B2361c10Ea13619e8a9) | [0x4da27a545c0c5B758a6BA100e3a049001de870f5](https://etherscan.io/address/0x4da27a545c0c5B758a6BA100e3a049001de870f5) | +| [CRV](https://etherscan.io/address/0xc18bF46F178F7e90b9CD8b7A8b00Af026D5ce3D3) | [0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f](https://etherscan.io/address/0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f) | [0xD533a949740bb3306d119CC777fa900bA034cd52](https://etherscan.io/address/0xD533a949740bb3306d119CC777fa900bA034cd52) | +| [CVX](https://etherscan.io/address/0x7ef93b20C10E6662931b32Dd9D4b85861eB2E4b8) | [0xd962fC30A72A84cE50161031391756Bf2876Af5D](https://etherscan.io/address/0xd962fC30A72A84cE50161031391756Bf2876Af5D) | [0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B](https://etherscan.io/address/0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B) | ## Collateral Plugin Addresses Following are the addresses and configuration parameters of collateral plugins deployed to mainnet. -| Plugin | Tolerance | Delay (hrs) | Oracle(s) | Underlying | -| ---------------------------------------------------------------------------------------- | --------- | ----------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | -| [DAI](https://etherscan.io/address/0xf7d1C6eE4C0D84C6B530D53A897daa1E9eB56833) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x6B175474E89094C44Da98b954EedeAC495271d0F](https://etherscan.io/address/0x6B175474E89094C44Da98b954EedeAC495271d0F) | -| [USDC](https://etherscan.io/address/0xBE9D23040fe22E8Bd8A88BF5101061557355cA04) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | -| [USDT](https://etherscan.io/address/0x58D7bF13D3572b08dE5d96373b8097d94B1325ad) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xdAC17F958D2ee523a2206206994597C13D831ec7](https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7) | -| [USDP](https://etherscan.io/address/0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x8E870D67F660D95d5be530380D0eC0bd388289E1](https://etherscan.io/address/0x8E870D67F660D95d5be530380D0eC0bd388289E1) | -| [BUSD](https://etherscan.io/address/0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0x4Fabb145d64652a948d72533023f6E7A623C7C53](https://etherscan.io/address/0x4Fabb145d64652a948d72533023f6E7A623C7C53) | -| [aDAI](https://etherscan.io/address/0x256b89658bD831CC40283F42e85B1fa8973Db0c9) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985](https://etherscan.io/address/0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985) | -| [aUSDC](https://etherscan.io/address/0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x60C384e226b120d93f3e0F4C502957b2B9C32B15](https://etherscan.io/address/0x60C384e226b120d93f3e0F4C502957b2B9C32B15) | -| [aUSDT](https://etherscan.io/address/0xe39188ddd4eb27d1d25f5f58cc6a5fd9228eedef) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9](https://etherscan.io/address/0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9) | -| [aBUSD](https://etherscan.io/address/0xeB1A036E83aD95f0a28d0c8E2F20bf7f1B299F05) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D](https://etherscan.io/address/0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D) | -| [aUSDP](https://etherscan.io/address/0x0d61Ce1801A460eB683b5ed1b6C7965d31b769Fd) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x80A574cC2B369dc496af6655f57a16a4f180BfAF](https://etherscan.io/address/0x80A574cC2B369dc496af6655f57a16a4f180BfAF) | -| [cDAI](https://etherscan.io/address/0x440A634DdcFb890BCF8b0Bf07Ef2AaBB37dd5F8C) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x3043be171e846c33D5f06864Cc045d9Fc799aF52](https://etherscan.io/address/0x3043be171e846c33D5f06864Cc045d9Fc799aF52) | -| [cUSDC](https://etherscan.io/address/0x50a9d529EA175CdE72525Eaa809f5C3c47dAA1bB) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022](https://etherscan.io/address/0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022) | -| [cUSDT](https://etherscan.io/address/0x5757fF814da66a2B4f9D11d48570d742e246CfD9) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x4Be33630F92661afD646081BC29079A38b879aA0](https://etherscan.io/address/0x4Be33630F92661afD646081BC29079A38b879aA0) | -| [cUSDP](https://etherscan.io/address/0x99bD63BF7e2a69822cD73A82d42cF4b5501e5E50) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0xF69c995129CC16d0F577C303091a400cC1879fFa](https://etherscan.io/address/0xF69c995129CC16d0F577C303091a400cC1879fFa) | -| [cWBTC](https://etherscan.io/address/0x688c95461d611Ecfc423A8c87caCE163C6B40384) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0xF2A309bc36A504c772B416a4950d5d0021219745](https://etherscan.io/address/0xF2A309bc36A504c772B416a4950d5d0021219745) | -| [cETH](https://etherscan.io/address/0x357d4dB0c2179886334cC33B8528048F7E1D3Fe3) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F](https://etherscan.io/address/0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F) | -| [WBTC](https://etherscan.io/address/0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599](https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599) | -| [WETH](https://etherscan.io/address/0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2](https://etherscan.io/address/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2) | -| [wstETH](https://etherscan.io/address/0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C) | 2.5% | 24 | [0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8](https://etherscan.io/address/0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8) | [0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0](https://etherscan.io/address/0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0) | -| [rETH](https://etherscan.io/address/0x1103851D1FCDD3f88096fbed812c8FF01949cF9d) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xae78736Cd615f374D3085123A210448E74Fc6393](https://etherscan.io/address/0xae78736Cd615f374D3085123A210448E74Fc6393) | -| [fUSDC](https://etherscan.io/address/0x1FFA5955D64Ee32cB1BF7104167b81bb085b0c8d) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9](https://etherscan.io/address/0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9) | -| [fUSDT](https://etherscan.io/address/0xF73EB45d83AC86f8a6F75a6252ca1a59a9A3aED3) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7](https://etherscan.io/address/0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7) | -| [fDAI](https://etherscan.io/address/0xE1fcCf8e23713Ed0497ED1a0E6Ae2b19ED443eCd) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x714341800AD1913B5FCCBFd5d136553Ad1C314d6](https://etherscan.io/address/0x714341800AD1913B5FCCBFd5d136553Ad1C314d6) | -| [fFRAX](https://etherscan.io/address/0x8b06c065b4b44B310442d4ee98777BF7a1EBC6E3) | 2.0% | 24 | [0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD](https://etherscan.io/address/0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD) | [0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13](https://etherscan.io/address/0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13) | -| [cUSDCv3](https://etherscan.io/address/0x85b256e9051B781A0BC0A987857AD6166C94040a) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab](https://etherscan.io/address/0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab) | -| [cvx3Pool](https://etherscan.io/address/0x62C394620f674e85768a7618a6C202baE7fB8Dd1) | 2.0% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xaBd7E7a5C846eD497681a590feBED99e7157B6a3](https://etherscan.io/address/0xaBd7E7a5C846eD497681a590feBED99e7157B6a3) | -| [cvxeUSDFRAXBP](https://etherscan.io/address/0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122) | 2.0% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5](https://etherscan.io/address/0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5) | -| [cvxMIM3Pool](https://etherscan.io/address/0xCBE084C44e7A2223F76362Dcc4EbDacA5Fb1cbA7) | 6.25% | 24 | [0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) | [0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F](https://etherscan.io/address/0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F) | -| [crv3Pool](https://etherscan.io/address/0x8Af118a89c5023Bb2B03C70f70c8B396aE71963D) | 2.0% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xC9c37FC53682207844B058026024853A9C0b8c7B](https://etherscan.io/address/0xC9c37FC53682207844B058026024853A9C0b8c7B) | -| [crveUSDFRAXBP](https://etherscan.io/address/0xC87CDFFD680D57BF50De4C364BF4277B8A90098E) | 2.0% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A](https://etherscan.io/address/0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A) | -| [crvMIM3Pool](https://etherscan.io/address/0x14c443d8BdbE9A65F3a23FA4e199d8741D5B38Fa) | 6.25% | 24 | [0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) | [0xe8461dB45A7430AA7aB40346E68821284980FdFD](https://etherscan.io/address/0xe8461dB45A7430AA7aB40346E68821284980FdFD) | -| [sDAI](https://etherscan.io/address/0xde0e2f0c9792617d3908d92a024caa846354cea2) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x83F20F44975D03b1b09e64809B757c47f942BEeA](https://etherscan.io/address/0x83F20F44975D03b1b09e64809B757c47f942BEeA) | -| [cbETH](https://etherscan.io/address/0x3962695aCce0Efce11cFf997890f3D1D7467ec40) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xBe9895146f7AF43049ca1c1AE358B0541Ea49704](https://etherscan.io/address/0xBe9895146f7AF43049ca1c1AE358B0541Ea49704) | -| [maUSDT](https://etherscan.io/address/0xd000a79bd2a07eb6d2e02ecad73437de40e52d69) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2](https://etherscan.io/address/0xaA91d24c2F7DBb6487f61869cD8cd8aFd5c5Cab2) | -| [maUSDC](https://etherscan.io/address/0x2304E98cD1E2F0fd3b4E30A1Bc6E9594dE2ea9b7) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x7f7B77e49d5b30445f222764a794AFE14af062eB](https://etherscan.io/address/0x7f7B77e49d5b30445f222764a794AFE14af062eB) | -| [maDAI](https://etherscan.io/address/0x9d38BFF9Af50738DF92a54Ceab2a2C2322BB1FAB) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb](https://etherscan.io/address/0xE2b16e14dB6216e33082D5A8Be1Ef01DF7511bBb) | -| [maWBTC](https://etherscan.io/address/0x49A44d50d3B1E098DAC9402c4aF8D0C0E499F250) | 3.51% | 24 | [0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c](https://etherscan.io/address/0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c) | [0xe0E1d3c6f09DA01399e84699722B11308607BBfC](https://etherscan.io/address/0xe0E1d3c6f09DA01399e84699722B11308607BBfC) | -| [maWETH](https://etherscan.io/address/0x878b995bDD2D9900BEE896Bd78ADd877672e1637) | 0.0% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0x291ed25eB61fcc074156eE79c5Da87e5DA94198F](https://etherscan.io/address/0x291ed25eB61fcc074156eE79c5Da87e5DA94198F) | -| [maStETH](https://etherscan.io/address/0x33E840e5711549358f6d4D11F9Ab2896B36E9822) | 2.0025% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0x97F9d5ed17A0C99B279887caD5254d15fb1B619B](https://etherscan.io/address/0x97F9d5ed17A0C99B279887caD5254d15fb1B619B) | +| Plugin | Tolerance | Delay (hrs) | Oracle(s) | Underlying | +| -------------------------------------------------------------------------------------------- | --------- | ----------- | --------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------- | +| [DAI](https://etherscan.io/address/0xEc375F2984D21D5ddb0D82767FD8a9C4CE8Eec2F) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x6B175474E89094C44Da98b954EedeAC495271d0F](https://etherscan.io/address/0x6B175474E89094C44Da98b954EedeAC495271d0F) | +| [USDC](https://etherscan.io/address/0x442f8fc98e3cc6B3d49a66f9858Ac9B6e70Dad3e) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | +| [USDT](https://etherscan.io/address/0xe7Dcd101A027Ec34860ECb634a2797d0D2dc4d8b) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xdAC17F958D2ee523a2206206994597C13D831ec7](https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7) | +| [USDP](https://etherscan.io/address/0x4C0B21Acb267f1fAE4aeFA977A26c4a63C9B35e6) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x8E870D67F660D95d5be530380D0eC0bd388289E1](https://etherscan.io/address/0x8E870D67F660D95d5be530380D0eC0bd388289E1) | +| [BUSD](https://etherscan.io/address/0x97bb4a995b98b1BfF99046b3c518276f78fA5250) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0x4Fabb145d64652a948d72533023f6E7A623C7C53](https://etherscan.io/address/0x4Fabb145d64652a948d72533023f6E7A623C7C53) | +| [aDAI](https://etherscan.io/address/0x9ca9A9cdcE9E943608c945E7001dC89EB163991E) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985](https://etherscan.io/address/0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985) | +| [aUSDC](https://etherscan.io/address/0xc4240D22FFa144E2712aACF3E2cC302af0339ED0) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x60C384e226b120d93f3e0F4C502957b2B9C32B15](https://etherscan.io/address/0x60C384e226b120d93f3e0F4C502957b2B9C32B15) | +| [aUSDT](https://etherscan.io/address/0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9](https://etherscan.io/address/0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9) | +| [aBUSD](https://etherscan.io/address/0x01F9A6bf339cff820cA503A56FD3705AE35c27F7) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D](https://etherscan.io/address/0xe639d53Aa860757D7fe9cD4ebF9C8b92b8DedE7D) | +| [aUSDP](https://etherscan.io/address/0xda5cc207CCefD116fF167a8ABEBBd52bD67C958E) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x80A574cC2B369dc496af6655f57a16a4f180BfAF](https://etherscan.io/address/0x80A574cC2B369dc496af6655f57a16a4f180BfAF) | +| [cDAI](https://etherscan.io/address/0x337E418b880bDA5860e05D632CF039B7751B907B) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x3043be171e846c33D5f06864Cc045d9Fc799aF52](https://etherscan.io/address/0x3043be171e846c33D5f06864Cc045d9Fc799aF52) | +| [cUSDC](https://etherscan.io/address/0x043be931D9C4422e1cFeA528e19818dcDfdE9Ebc) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022](https://etherscan.io/address/0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022) | +| [cUSDT](https://etherscan.io/address/0x5ceadb6606C5D82FcCd3f9b312C018fE1f8aa6dA) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x4Be33630F92661afD646081BC29079A38b879aA0](https://etherscan.io/address/0x4Be33630F92661afD646081BC29079A38b879aA0) | +| [cUSDP](https://etherscan.io/address/0xa0c02De8FfBb9759b9beBA5e29C82112688A0Ff4) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0xF69c995129CC16d0F577C303091a400cC1879fFa](https://etherscan.io/address/0xF69c995129CC16d0F577C303091a400cC1879fFa) | +| [cWBTC](https://etherscan.io/address/0xC0f89AFcb6F1c4E943aA61FFcdFc41fDcB7D84DD) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0xF2A309bc36A504c772B416a4950d5d0021219745](https://etherscan.io/address/0xF2A309bc36A504c772B416a4950d5d0021219745) | +| [cETH](https://etherscan.io/address/0x4d3A8507a8eb9036895efdD1a462210CE58DE4ad) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F](https://etherscan.io/address/0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F) | +| [WBTC](https://etherscan.io/address/0x832D65735E541c0404a58B741bEF5652c2B7D0Db) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599](https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599) | +| [WETH](https://etherscan.io/address/0xADDca344c92Be84A053C5CBE8e067460767FB816) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2](https://etherscan.io/address/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2) | +| [wstETH](https://etherscan.io/address/0xb7049ee9F533D32C9434101f0645E6Ea5DFe2cdb) | 2.5% | 24 | [0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8](https://etherscan.io/address/0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8) | [0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0](https://etherscan.io/address/0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0) | +| [rETH](https://etherscan.io/address/0x987f5e0f845D46262893e680b652D8aAF1B5bCc0) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xae78736Cd615f374D3085123A210448E74Fc6393](https://etherscan.io/address/0xae78736Cd615f374D3085123A210448E74Fc6393) | +| [fUSDC](https://etherscan.io/address/0xB58D95003Af73CF76Ce349103726a51D4Ec8af17) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9](https://etherscan.io/address/0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9) | +| [fUSDT](https://etherscan.io/address/0xD5254b740FbEF6AAcD674936ea7Fb9f4053781aF) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7](https://etherscan.io/address/0x2837f952c1FD773B3Ce02631A90f95E4b9ce2cF7) | +| [fDAI](https://etherscan.io/address/0xA0a620B94446a7DC8952ECf252FcC495eeC65873) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x714341800AD1913B5FCCBFd5d136553Ad1C314d6](https://etherscan.io/address/0x714341800AD1913B5FCCBFd5d136553Ad1C314d6) | +| [fFRAX](https://etherscan.io/address/0xFd9c32198D3cf3ad3b165918FD78De3654cb22eA) | 2.0% | 24 | [0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD](https://etherscan.io/address/0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD) | [0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13](https://etherscan.io/address/0x55590a1Bf90fbf7352A46c4af652A231AA5CbF13) | +| [cUSDCv3](https://etherscan.io/address/0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab](https://etherscan.io/address/0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab) | +| [cvx3Pool](https://etherscan.io/address/0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2) | 2.0% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xaBd7E7a5C846eD497681a590feBED99e7157B6a3](https://etherscan.io/address/0xaBd7E7a5C846eD497681a590feBED99e7157B6a3) | +| [cvxPayPool](https://etherscan.io/address/0x5315Fbe0CEB299F53aE375f65fd9376767C8224c) | 2.0% | 72 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x383E6b4437b59fff47B619CBA855CA29342A8559](https://etherscan.io/address/0x383E6b4437b59fff47B619CBA855CA29342A8559) | +| [cvxeUSDFRAXBP](https://etherscan.io/address/0xE529B59C1764d6E5a274099Eb660DD9e130A5481) | 2.0% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5](https://etherscan.io/address/0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5) | +| [cvxETHPlusETH](https://etherscan.io/address/0xc4a5Fb266E8081D605D87f0b1290F54B0a5Dc221) | 2.5% | 72 | [0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419](https://etherscan.io/address/0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419) | [0xDbC0cE2321B76D3956412B36e9c0FA9B0fD176E7](https://etherscan.io/address/0xDbC0cE2321B76D3956412B36e9c0FA9B0fD176E7) | +| [cvxMIM3Pool](https://etherscan.io/address/0x3d21f841C0Fb125176C1DBDF0DE196b071323A75) | 6.25% | 24 | [0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) | [0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F](https://etherscan.io/address/0x9FF9c353136e86EFe02ADD177E7c9769f8a5A77F) | +| [crv3Pool](https://etherscan.io/address/0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9) | 2.0% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xC9c37FC53682207844B058026024853A9C0b8c7B](https://etherscan.io/address/0xC9c37FC53682207844B058026024853A9C0b8c7B) | +| [crveUSDFRAXBP](https://etherscan.io/address/0x945b0ad788dD6dB3864AB23876C68C1bf000d237) | 2.0% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A](https://etherscan.io/address/0x27F672aAf061cb0b2640a4DFCCBd799cD1a7309A) | +| [crvMIM3Pool](https://etherscan.io/address/0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62) | 6.25% | 24 | [0x7A364e8770418566e3eb2001A96116E6138Eb32F](https://etherscan.io/address/0x7A364e8770418566e3eb2001A96116E6138Eb32F) | [0xe8461dB45A7430AA7aB40346E68821284980FdFD](https://etherscan.io/address/0xe8461dB45A7430AA7aB40346E68821284980FdFD) | +| [sDAI](https://etherscan.io/address/0x62a9DDC6FF6077E823690118eCc935d16A8de47e) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0x83F20F44975D03b1b09e64809B757c47f942BEeA](https://etherscan.io/address/0x83F20F44975D03b1b09e64809B757c47f942BEeA) | +| [cbETH](https://etherscan.io/address/0xC8b80813cad9139D0eeFe38C711a11b20147aA54) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xBe9895146f7AF43049ca1c1AE358B0541Ea49704](https://etherscan.io/address/0xBe9895146f7AF43049ca1c1AE358B0541Ea49704) | +| [yvCurveUSDCcrvUSD](https://etherscan.io/address/0x1573416df7095F698e37A954D9e951868E526650) | 1.5% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x7cA00559B978CFde81297849be6151d3ccB408A9](https://etherscan.io/address/0x7cA00559B978CFde81297849be6151d3ccB408A9) | +| [yvCurveUSDPcrvUSD](https://etherscan.io/address/0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF) | 2% | 24 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF](https://etherscan.io/address/0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF) | +| [sFRAX](https://etherscan.io/address/0x0b7DcCBceA6f985301506D575E2661bf858CdEcC) | 2% | 24 | [0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD](https://etherscan.io/address/0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD) | [0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32](https://etherscan.io/address/0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32) | +| [saEthUSDC](https://etherscan.io/address/0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x0aDc69041a2B086f8772aCcE2A754f410F211bed](https://etherscan.io/address/0x0aDc69041a2B086f8772aCcE2A754f410F211bed) | +| [saEthPyUSD](https://etherscan.io/address/0x58a41c87f8C65cf21f961b570540b176e408Cf2E) | 1.3% | 24 | [0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1](https://etherscan.io/address/0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1) | [0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b](https://etherscan.io/address/0x1576B2d7ef15a2ebE9C22C8765DD9c1EfeA8797b) | +| [bbUSDT](https://etherscan.io/address/0x01355C7439982c57cF89CA9785d211806f866224) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1](https://etherscan.io/address/0x2C25f6C25770fFEC5959D34B94Bf898865e5D6b1) | +| [steakUSDC](https://etherscan.io/address/0x565CBc99EE04667581c7f3459561fCaf1CF68602) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB](https://etherscan.io/address/0xBEEF01735c132Ada46AA9aA4c54623cAA92A64CB) | +| [steakPYUSD](https://etherscan.io/address/0x23f06D5Fe858B18CD064A5D95054e8ae8536094a) | 1.3% | 24 | [0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1](https://etherscan.io/address/0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1) | [0xbEEF02e5E13584ab96848af90261f0C8Ee04722a](https://etherscan.io/address/0xbEEF02e5E13584ab96848af90261f0C8Ee04722a) | +| [Re7WETH](https://etherscan.io/address/0xa0a6C06e45437d4Ae1D778AaeB4605AC2B62A870) | 0% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0](https://etherscan.io/address/0x78Fc2c2eD1A4cDb5402365934aE5648aDAd094d0) | +| [cvxCrvUSDUSDC](https://etherscan.io/address/0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5) | 2% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8](https://etherscan.io/address/0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8) | +| [cvxCrvUSDUSDT](https://etherscan.io/address/0x69c6597690B8Df61D15F201519C03725bdec40c1) | 2% | 72 | [0x0000000000000000000000000000000000000001](https://etherscan.io/address/0x0000000000000000000000000000000000000001) | [0x5d1B749bA7f689ef9f260EDC54326C48919cA88b](https://etherscan.io/address/0x5d1B749bA7f689ef9f260EDC54326C48919cA88b) | +| [sfrxETH](https://etherscan.io/address/0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67) | 2.1% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xac3E018457B222d93114458476f3E3416Abbe38F](https://etherscan.io/address/0xac3E018457B222d93114458476f3E3416Abbe38F) | From a319f957849d723548ba749f6678a322b72aa06f Mon Sep 17 00:00:00 2001 From: KevinMoll-ls <35275573+KevinMoll-ls@users.noreply.github.com> Date: Thu, 9 May 2024 19:12:20 -0400 Subject: [PATCH 375/450] Solidified Audit Report April 25 2024 (#1138) --- ...port - Reserve Protocol - April 25 2024.pdf | Bin 0 -> 234927 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/Solidified - Audit Report - Reserve Protocol - April 25 2024.pdf diff --git a/audits/Solidified - Audit Report - Reserve Protocol - April 25 2024.pdf b/audits/Solidified - Audit Report - Reserve Protocol - April 25 2024.pdf new file mode 100644 index 0000000000000000000000000000000000000000..008367d53c15bf961e177a49d6cb51c68a0f8d4e GIT binary patch literal 234927 zcmeFZXIPZk)-7s)7NI3bQjjDnK?Egd6qFJrC`b|k$+0LTX9NXQ1VjWRiz1+eBIi^h zIZLL1LdiMjP`d&qq@_vWCE+Io z{{AT=1J-M#e6mWce99<0q=EI{7m56Rk=zZ!MSoqYD93u0luz-_;lG-!*LVf~`cH(E zPf3yW8hoa9gVn*#(d2*qtzv(Ft1_zqDWANBwF8WwPu|+V!Q`fi5y}|;P|?K3%)y+M zUrbn9n$_OH&cpyo>JsburumHv-7X&z^hKbztsY^*KZ9k&d56il9

    3As5APf%wbh(uBLq>RZ0a>lggF83L4h?VCRP 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

    y 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

    =umfvq5|?am{>o< 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 literal 0 HcmV?d00001 From 9c2111c9630bdaa006d4d8d519745f734e05a702 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 10 May 2024 09:12:40 -0300 Subject: [PATCH 376/450] Arbitrum convex stable plugins (#1130) --- .github/workflows/tests.yml | 2 +- common/configuration.ts | 8 +- .../assets/curve/CurveStableCollateral.sol | 10 +- .../assets/curve/L2ConvexStableCollateral.sol | 70 +++++ scripts/deploy.ts | 2 + .../deploy_convex_crvusd_usdc_collateral.ts | 127 +++++--- .../deploy_convex_crvusd_usdt_collateral.ts | 127 +++++--- .../verify_convex_crvusd_usdc.ts | 127 +++++--- .../verify_convex_crvusd_usdt.ts | 132 ++++++++ scripts/verify_etherscan.ts | 5 +- .../curve/collateralTests.ts | 29 +- .../individual-collateral/curve/constants.ts | 60 +++- .../L2_CvxStableTestSuite_crvUSD-USDC.test.ts | 287 ++++++++++++++++++ .../L2_CvxStableTestSuite_crvUSD-USDT.test.ts | 287 ++++++++++++++++++ .../curve/cvx/helpers.ts | 12 + .../curve/pluginTestTypes.ts | 6 +- 16 files changed, 1155 insertions(+), 136 deletions(-) create mode 100644 contracts/plugins/assets/curve/L2ConvexStableCollateral.sol create mode 100644 scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts create mode 100644 test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts create mode 100644 test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 14f39a45b9..cb4093c2fb 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -156,7 +156,7 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: npx hardhat test ./test/plugins/individual-collateral/{aave-v3,compoundv3}/*.test.ts + - run: npx hardhat test ./test/plugins/individual-collateral/{aave-v3,compoundv3,curve/cvx}/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true diff --git a/common/configuration.ts b/common/configuration.ts index a314f24af4..06287d852f 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -525,13 +525,18 @@ export const networkConfig: { [key: string]: INetworkConfig } = { '42161': { name: 'arbitrum', tokens: { - ARB: '0x912ce59144191c1204e64559fe8253a0e49e6548', + ARB: '0x912CE59144191C1204E64559FE8253a0e49E6548', + CRV: '0x11cDb42B0EB46D95f990BeDD4695A6e3fA034978', + CVX: '0xaAFcFD42c9954C6689ef1901e03db742520829c5', + crvUSD: '0x498Bf2B1e120FeD3ad3D42EA2165E9b73f99C1e5', DAI: '0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1', COMP: '0x354A6dA3fcde098F8389cad84b0182725c6C91dE', RSR: '0xCa5Ca9083702c56b481D1eec86F1776FDbd2e594', USDC: '0xaf88d065e77c8cc2239327c5edb3a432268e5831', USDT: '0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9', cUSDCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', + WETH: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1', + WBTC: '0x2f2a2543B76A4166549F7aaB2e75Bef0aefC5B0f', aArbUSDCn: '0x724dc807b04555b71ed48a6896b6f41593b8c637', // aArbUSDCn wraps USDC! saArbUSDCn: '', // TODO our wrapper. remove from deployment script after placing here aArbUSDT: '0x6ab707aca953edaefbc4fd23ba73294241490620', @@ -544,6 +549,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { USDC: '0x50834F3163758fcC1Df9973b6e91f0F0F0434aD3', USDT: '0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7', RSR: '0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488', + crvUSD: '0x0a32255dd4BB6177C994bAAc73E0606fDD568f66', }, GNOSIS_EASY_AUCTION: '0xcD033976a011F41D2AB6ef47984041568F818E73', // our deployment COMET_REWARDS: '0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae', diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index 60d27fd0f7..e7b6ce7507 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -10,6 +10,10 @@ import "contracts/plugins/assets/AppreciatingFiatCollateral.sol"; import "../../../interfaces/IRewardable.sol"; import "../curve/PoolTokens.sol"; +// Note: Needs to be changed if we ever use this contract on something other than mainnet +IERC20 constant CRV = IERC20(0xD533a949740bb3306d119CC777fa900bA034cd52); +IERC20 constant CVX = IERC20(0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B); + /** * @title CurveStableCollateral * This plugin contract is fully general to any number of (fiat) tokens in a Curve stable pool, @@ -30,12 +34,6 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - // I don't love hard-coding these, but I prefer it to dynamically reading from either - // a CurveGaugeWrapper or ConvexStakingWrapper. If we ever use this contract - // on something other than mainnet we'll have to change this. - IERC20 internal constant CRV = IERC20(0xD533a949740bb3306d119CC777fa900bA034cd52); - IERC20 internal constant CVX = IERC20(0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B); - /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout /// @dev config.erc20 should be a CurveGaugeWrapper or ConvexStakingWrapper constructor( diff --git a/contracts/plugins/assets/curve/L2ConvexStableCollateral.sol b/contracts/plugins/assets/curve/L2ConvexStableCollateral.sol new file mode 100644 index 0000000000..b2cf9221e7 --- /dev/null +++ b/contracts/plugins/assets/curve/L2ConvexStableCollateral.sol @@ -0,0 +1,70 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "./CurveStableCollateral.sol"; + +struct RewardType { + // solhint-disable-next-line var-name-mixedcase + address reward_token; + uint128 reward_integral; + uint128 reward_remaining; +} + +interface IConvexRewardPool is IERC20Metadata { + function rewardLength() external view returns (uint256); + + function rewards(uint256 _rewardIndex) external view returns (RewardType memory); + + function getReward(address) external; +} + +/** + * @title L2ConvexStableCollateral + * This plugin is designed for any number of (fiat) tokens in a Convex L2 stable pool. + * Each token in the pool can have between 1 and 2 oracles per each token. + * Stable means only like-kind pools. + * + * tok = Convex Rewards Pool (stablePlainPool) - no wrapper needed in L2 + * ref = stablePlainPool pool invariant + * tar = USD + * UoA = USD + * + * @notice Pools with native ETH or ERC777 should be avoided, + * see docs/collateral.md for information + */ +contract L2ConvexStableCollateral is CurveStableCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout + /// @dev config.erc20 should be the Convex Rewards Pool (no wrapper required) + constructor( + CollateralConfig memory config, + uint192 revenueHiding, + PTConfiguration memory ptConfig + ) CurveStableCollateral(config, revenueHiding, ptConfig) {} + + /// Claim rewards earned by holding a balance of the ERC20 token + /// @custom:delegate-call + function claimRewards() external virtual override(CurveStableCollateral) { + uint256 count = IConvexRewardPool(address(erc20)).rewardLength(); + + // Save initial bals + IERC20Metadata[] memory rewardTokens = new IERC20Metadata[](count); + uint256[] memory bals = new uint256[](count); + for (uint256 i = 0; i < count; i++) { + RewardType memory _reward = IConvexRewardPool(address(erc20)).rewards(i); + rewardTokens[i] = IERC20Metadata(_reward.reward_token); + bals[i] = rewardTokens[i].balanceOf(address(this)); + } + + // Claim rewards + IConvexRewardPool(address(erc20)).getReward(address(this)); + + // Emit balance changes + for (uint256 i = 0; i < rewardTokens.length; i++) { + IERC20Metadata rewardToken = rewardTokens[i]; + emit RewardsClaimed(rewardToken, rewardToken.balanceOf(address(this)) - bals[i]); + } + } +} diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 6c8ee02fb5..07e0b496f2 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -108,6 +108,8 @@ async function main() { 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdt.ts', 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', + 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', + 'phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts', 'phase2-assets/assets/deploy_arb.ts' ) } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts index 7062133c02..2a86a8f1f9 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' +import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration' import { bn } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' @@ -12,7 +12,12 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { CurveStableCollateral } from '../../../../typechain' +import { + ConvexStakingWrapper, + CurveStableCollateral, + L2ConvexStableCollateral, + IConvexRewardPool, +} from '../../../../typechain' import { revenueHiding } from '../../utils' import { CurvePoolType, @@ -28,6 +33,14 @@ import { crvUSD_ORACLE_ERROR, crvUSD_ORACLE_TIMEOUT, crvUSD_USD_FEED, + ARB_crvUSD_USDC, + ARB_Convex_crvUSD_USDC, + ARB_USDC_ORACLE_ERROR, + ARB_USDC_ORACLE_TIMEOUT, + ARB_USDC_USD_FEED, + ARB_crvUSD_ORACLE_ERROR, + ARB_crvUSD_ORACLE_TIMEOUT, + ARB_crvUSD_USD_FEED, } from '../../../../test/plugins/individual-collateral/curve/constants' // Convex Stable Plugin: crvUSD-USDC @@ -58,42 +71,82 @@ async function main() { /******** Deploy Convex Stable Pool for crvUSD-USDC **************************/ - const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') - - const crvUsdUSDCPool = await ConvexStakingWrapperFactory.deploy() - await crvUsdUSDCPool.deployed() - await (await crvUsdUSDCPool.initialize(crvUSD_USDC_POOL_ID)).wait() - - console.log( - `Deployed wrapper for Convex Stable crvUSD-USDC pool on ${hre.network.name} (${chainId}): ${crvUsdUSDCPool.address} ` - ) + let collateral: CurveStableCollateral | L2ConvexStableCollateral + let crvUsdUSDCPool: ConvexStakingWrapper | IConvexRewardPool // no wrapper needed for L2s + + if (!arbitrumL2Chains.includes(hre.network.name)) { + const CurveStableCollateralFactory = await hre.ethers.getContractFactory( + 'CurveStableCollateral' + ) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + + crvUsdUSDCPool = await ConvexStakingWrapperFactory.deploy() + await crvUsdUSDCPool.deployed() + await (await crvUsdUSDCPool.initialize(crvUSD_USDC_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Stable crvUSD-USDC pool on ${hre.network.name} (${chainId}): ${crvUsdUSDCPool.address} ` + ) + + collateral = await CurveStableCollateralFactory.connect(deployer).deploy( + { + erc20: crvUsdUSDCPool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDC, + } + ) + } else if (chainId == '42161' || chainId == '421614') { + const L2ConvexStableCollateralFactory = await hre.ethers.getContractFactory( + 'L2ConvexStableCollateral' + ) + crvUsdUSDCPool = ( + await ethers.getContractAt('IConvexRewardPool', ARB_Convex_crvUSD_USDC) + ) + collateral = await L2ConvexStableCollateralFactory.connect( + deployer + ).deploy( + { + erc20: crvUsdUSDCPool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: ARB_crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[ARB_crvUSD_USD_FEED], [ARB_USDC_USD_FEED]], + oracleTimeouts: [[ARB_crvUSD_ORACLE_TIMEOUT], [ARB_USDC_ORACLE_TIMEOUT]], + oracleErrors: [[ARB_crvUSD_ORACLE_ERROR], [ARB_USDC_ORACLE_ERROR]], + lpToken: ARB_crvUSD_USDC, + } + ) + } else { + throw new Error(`Unsupported chainId: ${chainId}`) + } - const collateral = await CurveStableCollateralFactory.connect( - deployer - ).deploy( - { - erc20: crvUsdUSDCPool.address, - targetName: ethers.utils.formatBytes32String('USD'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 2, - curvePool: crvUSD_USDC, - poolType: CurvePoolType.Plain, - feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], - oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], - oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], - lpToken: crvUSD_USDC, - } - ) await collateral.deployed() await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts index 13d9160760..df1a794993 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts @@ -1,7 +1,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' -import { networkConfig } from '../../../../common/configuration' +import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration' import { bn } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' @@ -12,7 +12,12 @@ import { getDeploymentFilename, fileExists, } from '../../common' -import { CurveStableCollateral } from '../../../../typechain' +import { + ConvexStakingWrapper, + CurveStableCollateral, + L2ConvexStableCollateral, + IConvexRewardPool, +} from '../../../../typechain' import { revenueHiding } from '../../utils' import { CurvePoolType, @@ -28,6 +33,14 @@ import { crvUSD_ORACLE_ERROR, crvUSD_ORACLE_TIMEOUT, crvUSD_USD_FEED, + ARB_crvUSD_USDT, + ARB_Convex_crvUSD_USDT, + ARB_USDT_ORACLE_ERROR, + ARB_USDT_ORACLE_TIMEOUT, + ARB_USDT_USD_FEED, + ARB_crvUSD_ORACLE_ERROR, + ARB_crvUSD_ORACLE_TIMEOUT, + ARB_crvUSD_USD_FEED, } from '../../../../test/plugins/individual-collateral/curve/constants' // Convex Stable Plugin: crvUSD-USDT @@ -58,42 +71,82 @@ async function main() { /******** Deploy Convex Stable Pool for crvUSD-USDT **************************/ - const CurveStableCollateralFactory = await hre.ethers.getContractFactory('CurveStableCollateral') - const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') - - const crvUsdUSDTPool = await ConvexStakingWrapperFactory.deploy() - await crvUsdUSDTPool.deployed() - await (await crvUsdUSDTPool.initialize(crvUSD_USDT_POOL_ID)).wait() - - console.log( - `Deployed wrapper for Convex Stable crvUSD-USDT pool on ${hre.network.name} (${chainId}): ${crvUsdUSDTPool.address} ` - ) + let collateral: CurveStableCollateral | L2ConvexStableCollateral + let crvUsdUSDTPool: ConvexStakingWrapper | IConvexRewardPool // no wrapper needed for L2s + + if (!arbitrumL2Chains.includes(hre.network.name)) { + const CurveStableCollateralFactory = await hre.ethers.getContractFactory( + 'CurveStableCollateral' + ) + const ConvexStakingWrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + + crvUsdUSDTPool = await ConvexStakingWrapperFactory.deploy() + await crvUsdUSDTPool.deployed() + await (await crvUsdUSDTPool.initialize(crvUSD_USDT_POOL_ID)).wait() + + console.log( + `Deployed wrapper for Convex Stable crvUSD-USDT pool on ${hre.network.name} (${chainId}): ${crvUsdUSDTPool.address} ` + ) + + collateral = await CurveStableCollateralFactory.connect(deployer).deploy( + { + erc20: crvUsdUSDTPool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDT_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDT_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDT, + } + ) + } else if (chainId == '42161' || chainId == '421614') { + const L2ConvexStableCollateralFactory = await hre.ethers.getContractFactory( + 'L2ConvexStableCollateral' + ) + crvUsdUSDTPool = ( + await ethers.getContractAt('IConvexRewardPool', ARB_Convex_crvUSD_USDT) + ) + collateral = await L2ConvexStableCollateralFactory.connect( + deployer + ).deploy( + { + erc20: crvUsdUSDTPool.address, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: ARB_crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[ARB_crvUSD_USD_FEED], [ARB_USDT_USD_FEED]], + oracleTimeouts: [[ARB_crvUSD_ORACLE_TIMEOUT], [ARB_USDT_ORACLE_TIMEOUT]], + oracleErrors: [[ARB_crvUSD_ORACLE_ERROR], [ARB_USDT_ORACLE_ERROR]], + lpToken: ARB_crvUSD_USDT, + } + ) + } else { + throw new Error(`Unsupported chainId: ${chainId}`) + } - const collateral = await CurveStableCollateralFactory.connect( - deployer - ).deploy( - { - erc20: crvUsdUSDTPool.address, - targetName: ethers.utils.formatBytes32String('USD'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 2, - curvePool: crvUSD_USDT, - poolType: CurvePoolType.Plain, - feeds: [[USDT_USD_FEED], [crvUSD_USD_FEED]], - oracleTimeouts: [[USDT_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], - oracleErrors: [[USDT_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], - lpToken: crvUSD_USDT, - } - ) await collateral.deployed() await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts index 17ea4877d2..6756c5d6d6 100644 --- a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts @@ -1,6 +1,6 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' -import { developmentChains, networkConfig } from '../../../common/configuration' +import { arbitrumL2Chains, developmentChains, networkConfig } from '../../../common/configuration' import { bn } from '../../../common/numbers' import { ONE_ADDRESS } from '../../../common/constants' import { @@ -23,6 +23,13 @@ import { crvUSD_ORACLE_ERROR, crvUSD_ORACLE_TIMEOUT, crvUSD_USD_FEED, + ARB_crvUSD_USDC, + ARB_crvUSD_ORACLE_ERROR, + ARB_crvUSD_ORACLE_TIMEOUT, + ARB_crvUSD_USD_FEED, + ARB_USDC_ORACLE_ERROR, + ARB_USDC_ORACLE_TIMEOUT, + ARB_USDC_USD_FEED, } from '../../../test/plugins/individual-collateral/curve/constants' let deployments: IAssetCollDeployments @@ -41,49 +48,87 @@ async function main() { const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) deployments = getDeploymentFile(assetCollDeploymentFilename) - const crvUsdUSDCPoolCollateral = await ethers.getContractAt( - 'CurveStableCollateral', - deployments.collateral.cvxCrvUSDUSDC as string - ) + // Perform verification based on network (no wrapper in L2) + if (!arbitrumL2Chains.includes(hre.network.name)) { + const crvUsdUSDCPoolCollateral = await ethers.getContractAt( + 'CurveStableCollateral', + deployments.collateral.cvxCrvUSDUSDC as string + ) - /******** Verify ConvexStakingWrapper **************************/ + /******** Verify ConvexStakingWrapper **************************/ - await verifyContract( - chainId, - await crvUsdUSDCPoolCollateral.erc20(), - [], - 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' - ) + await verifyContract( + chainId, + await crvUsdUSDCPoolCollateral.erc20(), + [], + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + ) - /******** Verify crvUSD-USDC plugin **************************/ - await verifyContract( - chainId, - deployments.collateral.cvxCrvUSDUSDC, - [ - { - erc20: await crvUsdUSDCPoolCollateral.erc20(), - targetName: ethers.utils.formatBytes32String('USD'), - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero - oracleError: bn('1'), // unused but cannot be zero - oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts - maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, - delayUntilDefault: DELAY_UNTIL_DEFAULT, - }, - revenueHiding.toString(), - { - nTokens: 2, - curvePool: crvUSD_USDC, - poolType: CurvePoolType.Plain, - feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], - oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], - oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], - lpToken: crvUSD_USDC, - }, - ], - 'contracts/plugins/assets/curve/CurveStableCollateral.sol:CurveStableCollateral' - ) + /******** Verify crvUSD-USDC plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxCrvUSDUSDC, + [ + { + erc20: await crvUsdUSDCPoolCollateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDC, + }, + ], + 'contracts/plugins/assets/curve/CurveStableCollateral.sol:CurveStableCollateral' + ) + } else if (chainId == '42161' || chainId == '421614') { + const crvUsdUSDCPoolCollateral = await ethers.getContractAt( + 'L2ConvexStableCollateral', + deployments.collateral.cvxCrvUSDUSDC as string + ) + + /******** Verify crvUSD-USDC plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxCrvUSDUSDC, + [ + { + erc20: await crvUsdUSDCPoolCollateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: ARB_crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[ARB_crvUSD_USD_FEED], [ARB_USDC_USD_FEED]], + oracleTimeouts: [[ARB_crvUSD_ORACLE_TIMEOUT], [ARB_USDC_ORACLE_TIMEOUT]], + oracleErrors: [[ARB_crvUSD_ORACLE_ERROR], [ARB_USDC_ORACLE_ERROR]], + lpToken: ARB_crvUSD_USDC, + }, + ], + 'contracts/plugins/assets/curve/L2ConvexStableCollateral.sol:L2ConvexStableCollateral' + ) + } } main().catch((error) => { diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts new file mode 100644 index 0000000000..6cc6c8a5ad --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts @@ -0,0 +1,132 @@ +import hre, { ethers } from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { arbitrumL2Chains, developmentChains, networkConfig } from '../../../common/configuration' +import { bn } from '../../../common/numbers' +import { ONE_ADDRESS } from '../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { revenueHiding } from '../../deployment/utils' +import { + CurvePoolType, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + MAX_TRADE_VOL, + PRICE_TIMEOUT, + crvUSD_USDT, + USDT_ORACLE_ERROR, + USDT_ORACLE_TIMEOUT, + USDT_USD_FEED, + crvUSD_ORACLE_ERROR, + crvUSD_ORACLE_TIMEOUT, + crvUSD_USD_FEED, + ARB_crvUSD_USDT, + ARB_crvUSD_ORACLE_ERROR, + ARB_crvUSD_ORACLE_TIMEOUT, + ARB_crvUSD_USD_FEED, + ARB_USDT_ORACLE_ERROR, + ARB_USDT_ORACLE_TIMEOUT, + ARB_USDT_USD_FEED, +} from '../../../test/plugins/individual-collateral/curve/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + const crvUsdUSDTPoolCollateral = await ethers.getContractAt( + 'CurveStableCollateral', + deployments.collateral.cvxCrvUSDUSDT as string + ) + + // Perform verification based on network (no wrapper in L2) + if (!arbitrumL2Chains.includes(hre.network.name)) { + /******** Verify ConvexStakingWrapper **************************/ + + await verifyContract( + chainId, + await crvUsdUSDTPoolCollateral.erc20(), + [], + 'contracts/plugins/assets/curve/cvx/vendor/ConvexStakingWrapper.sol:ConvexStakingWrapper' + ) + + /******** Verify crvUSD-USDC plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxCrvUSDUSDT, + [ + { + erc20: await crvUsdUSDTPoolCollateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[USDT_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDT_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDT_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], + lpToken: crvUSD_USDT, + }, + ], + 'contracts/plugins/assets/curve/CurveStableCollateral.sol:CurveStableCollateral' + ) + } else if (chainId == '42161' || chainId == '421614') { + /******** Verify crvUSD-USDC plugin **************************/ + await verifyContract( + chainId, + deployments.collateral.cvxCrvUSDUSDT, + [ + { + erc20: await crvUsdUSDTPoolCollateral.erc20(), + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ONE_ADDRESS, // unused but cannot be zero + oracleError: bn('1'), // unused but cannot be zero + oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + revenueHiding.toString(), + { + nTokens: 2, + curvePool: ARB_crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[ARB_crvUSD_USD_FEED], [ARB_USDT_USD_FEED]], + oracleTimeouts: [[ARB_crvUSD_ORACLE_TIMEOUT], [ARB_USDT_ORACLE_TIMEOUT]], + oracleErrors: [[ARB_crvUSD_ORACLE_ERROR], [ARB_USDT_ORACLE_ERROR]], + lpToken: ARB_crvUSD_USDT, + }, + ], + 'contracts/plugins/assets/curve/L2ConvexStableCollateral.sol:L2ConvexStableCollateral' + ) + } +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index d3fed82f61..a5ca75c15b 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -55,6 +55,7 @@ async function main() { if (!baseL2Chains.includes(hre.network.name) && !arbitrumL2Chains.includes(hre.network.name)) { scripts.push( 'collateral-plugins/verify_convex_crvusd_usdc.ts', + 'collateral-plugins/verify_convex_crvusd_usdt.ts', 'collateral-plugins/verify_convex_3pool.ts', 'collateral-plugins/verify_convex_paypool.ts', 'collateral-plugins/verify_convex_stable_metapool.ts', @@ -90,7 +91,9 @@ async function main() { // Arbitrum One scripts.push( 'collateral-plugins/verify_aave_v3_usdc.ts', - 'collateral-plugins/verify_cusdcv3.ts' + 'collateral-plugins/verify_cusdcv3.ts', + 'collateral-plugins/verify_convex_crvusd_usdc.ts', + 'collateral-plugins/verify_convex_crvusd_usdt.ts' ) } diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 572fef573c..7d2f74eb00 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -83,9 +83,10 @@ export default function fn( resetFork, collateralName, itClaimsRewards, + targetNetwork, } = fixtures - describeFork(`Collateral: ${collateralName}`, () => { + getDescribeFork(targetNetwork)(`Collateral: ${collateralName}`, () => { let defaultOpts: CurveCollateralOpts let mockERC20: ERC20Mock let collateral: TestICollateral @@ -780,7 +781,7 @@ export default function fn( // Only run full protocol integration tests on mainnet // Protocol integration fixture not currently set up to deploy onto base - getDescribeFork('mainnet')('integration tests', () => { + getDescribeFork(targetNetwork)('integration tests', () => { before(resetFork) let ctx: X @@ -1057,13 +1058,22 @@ export default function fn( await MockV3AggregatorFactory.deploy(8, bn('1e8')) ) + let chainId = await getChainId(hre) + if (useEnv('FORK_NETWORK').toLowerCase() == 'base') chainId = 8453 + if (useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum') chainId = 42161 + if (target == ethers.utils.formatBytes32String('USD')) { // USD const erc20 = await ethers.getContractAt( 'IERC20Metadata', networkConfig[chainId].tokens.USDC! ) - await whileImpersonating('0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf', async (signer) => { + + const usdcHolder = + chainId == 42161 + ? '0x47c031236e19d024b42f8ae6780e44a573170703' + : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' + await whileImpersonating(usdcHolder, async (signer) => { await erc20 .connect(signer) .transfer(addr1.address, await erc20.balanceOf(signer.address)) @@ -1088,7 +1098,11 @@ export default function fn( 'IERC20Metadata', networkConfig[chainId].tokens.WETH! ) - await whileImpersonating('0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E', async (signer) => { + const wethHolder = + chainId == 42161 + ? '0x70d95587d40a2caf56bd97485ab3eec10bee6336' + : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' + await whileImpersonating(wethHolder, async (signer) => { await erc20 .connect(signer) .transfer(addr1.address, await erc20.balanceOf(signer.address)) @@ -1116,7 +1130,12 @@ export default function fn( 'IERC20Metadata', networkConfig[chainId].tokens.WBTC! ) - await whileImpersonating('0xccf4429db6322d5c611ee964527d42e5d685dd6a', async (signer) => { + const wbtcHolder = + chainId == 42161 + ? '0x47c031236e19d024b42f8ae6780e44a573170703' + : '0xccf4429db6322d5c611ee964527d42e5d685dd6a' + + await whileImpersonating(wbtcHolder, async (signer) => { await erc20 .connect(signer) .transfer(addr1.address, await erc20.balanceOf(signer.address)) diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index 27039b9f5e..00131a8206 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -1,5 +1,21 @@ import { bn, fp } from '../../../../common/numbers' import { networkConfig } from '../../../../common/configuration' +import { useEnv } from '#/utils/env' + +const forkNetwork = useEnv('FORK_NETWORK') ?? 'mainnet' +let chainId + +switch (forkNetwork) { + case 'mainnet': + chainId = '1' + break + case 'arbitrum': + chainId = '42161' + break + default: + chainId = '1' + break +} // Mainnet Addresses @@ -48,7 +64,7 @@ export const MIM_ORACLE_ERROR = fp('0.005') // 0.5% export const MIM_DEFAULT_THRESHOLD = fp('0.055') // 5.5% // crvUSD -export const crvUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.crvUSD! +export const crvUSD_USD_FEED = networkConfig[chainId].chainlinkFeeds.crvUSD! export const crvUSD_ORACLE_TIMEOUT = bn('86400') export const crvUSD_ORACLE_ERROR = fp('0.005') @@ -59,21 +75,22 @@ export const pyUSD_ORACLE_ERROR = fp('0.003') // Tokens export const DAI = networkConfig['1'].tokens.DAI! -export const USDC = networkConfig['1'].tokens.USDC! -export const USDT = networkConfig['1'].tokens.USDT! +export const USDC = networkConfig[chainId].tokens.USDC! +export const USDT = networkConfig[chainId].tokens.USDT! export const SUSD = networkConfig['1'].tokens.sUSD! export const FRAX = networkConfig['1'].tokens.FRAX! export const MIM = networkConfig['1'].tokens.MIM! export const eUSD = networkConfig['1'].tokens.eUSD! export const WETH = networkConfig['1'].tokens.WETH! export const WBTC = networkConfig['1'].tokens.WBTC! -export const crvUSD = networkConfig['1'].tokens.crvUSD! +export const crvUSD = networkConfig[chainId].tokens.crvUSD! export const pyUSD = networkConfig['1'].tokens.pyUSD! export const RSR = networkConfig['1'].tokens.RSR! -export const CRV = networkConfig['1'].tokens.CRV! -export const CVX = networkConfig['1'].tokens.CVX! +export const CRV = networkConfig[chainId].tokens.CRV! +export const CVX = networkConfig[chainId].tokens.CVX! export const SDT = networkConfig['1'].tokens.SDT! +export const ARB = networkConfig[chainId].tokens.ARB! // ETH+ export const ETHPLUS = networkConfig['1'].tokens.ETHPLUS! @@ -161,6 +178,37 @@ export const CURVE_MINTER = '0xd061d61a4d941c39e5453435b6345dc261c2fce0' // RTokenMetapool-specific export const RTOKEN_DELAY_UNTIL_DEFAULT = bn('259200') // 72h +// Arbitrum addresses + +// Arbitrum crvUSD/USDC +export const ARB_crvUSD_USDC = '0xec090cf6DD891D2d014beA6edAda6e05E025D93d' +export const ARB_Convex_crvUSD_USDC = '0xBFEE9F3E015adC754066424AEd535313dc764116' +export const ARB_crvUSD_USDC_POOL_ID = 16 +export const ARB_crvUSD_USDC_HOLDER = '0xccf343eef0c5f2590ee30efc9f564b33aeb3c7e6' + +// Arbitrum crvUSD/USDT +export const ARB_crvUSD_USDT = '0x73af1150f265419ef8a5db41908b700c32d49135' +export const ARB_Convex_crvUSD_USDT = '0xf74d4C9b0F49fb70D8Ff6706ddF39e3a16D61E67' +export const ARB_crvUSD_USDT_POOL_ID = 18 +export const ARB_crvUSD_USDT_HOLDER = '0x171c53d55b1bcb725f660677d9e8bad7fd084282' + +// Arbitrum USDC +export const ARB_USDC_USD_FEED = networkConfig['42161'].chainlinkFeeds.USDC! +export const ARB_USDC_ORACLE_TIMEOUT = bn('86400') +export const ARB_USDC_ORACLE_ERROR = fp('0.001') + +// Arbitrum USDT +export const ARB_USDT_USD_FEED = networkConfig['42161'].chainlinkFeeds.USDT! +export const ARB_USDT_ORACLE_TIMEOUT = bn('86400') +export const ARB_USDT_ORACLE_ERROR = fp('0.001') + +// Arbitrum crvUSD +export const ARB_crvUSD_USD_FEED = networkConfig['42161'].chainlinkFeeds.crvUSD! +export const ARB_crvUSD_ORACLE_TIMEOUT = bn('86400') +export const ARB_crvUSD_ORACLE_ERROR = fp('0.005') + +export const FORK_BLOCK_ARBITRUM = 206398900 + // Common export const FIX_ONE = 1n * 10n ** 18n export const PRICE_TIMEOUT = bn('604800') // 1 week diff --git a/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts new file mode 100644 index 0000000000..6c483e2c3e --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts @@ -0,0 +1,287 @@ +import collateralTests from '../collateralTests' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, + CurveBase, +} from '../pluginTestTypes' + +import { mintL2Pool } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { + CurvePoolMock, + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, + IConvexRewardPool, +} from '../../../../../typechain' +import { expectEvents } from '#/common/events' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + CRV, + CVX, + ARB, + ARB_crvUSD_USD_FEED, + ARB_USDC_USD_FEED, + ARB_Convex_crvUSD_USDC, + ARB_crvUSD_ORACLE_TIMEOUT, + ARB_USDC_ORACLE_TIMEOUT, + ARB_crvUSD_USDC, + ARB_crvUSD_ORACLE_ERROR, + ARB_USDC_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + CurvePoolType, + ARB_crvUSD_USDC_HOLDER, + USDC, + crvUSD, + FORK_BLOCK_ARBITRUM, +} from '../constants' +import { advanceBlocks, advanceToTimestamp, getLatestBlockTimestamp } from '#/test/utils/time' +import { getResetFork } from '../../helpers' + +type Fixture = () => Promise + +export const defaultCvxStableCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ARB_crvUSD_USD_FEED, // unused but cannot be zero + oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: ARB_crvUSD_USDC, + lpToken: ARB_crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[ARB_crvUSD_USD_FEED], [ARB_USDC_USD_FEED]], + oracleTimeouts: [[ARB_crvUSD_ORACLE_TIMEOUT], [ARB_USDC_ORACLE_TIMEOUT]], + oracleErrors: [[ARB_crvUSD_ORACLE_ERROR], [ARB_USDC_ORACLE_ERROR]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + opts.feeds = [[usdcFeed.address], [crvUSDFeed.address]] + opts.erc20 = ARB_Convex_crvUSD_USDC + } + + opts = { ...defaultCvxStableCollateralOpts, ...opts } + + const L2CvxStableCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'L2ConvexStableCollateral' + ) + + const collateral = await L2CvxStableCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxStableCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateralOpts.feeds = [[usdcFeed.address], [crvUSDFeed.address]] + + // Use mock curvePool seeded with initial balances + const CurvePoolMockFactory = await ethers.getContractFactory('CurvePoolMock') + const realCurvePool = ( + await ethers.getContractAt('CurvePoolMock', ARB_crvUSD_USDC) + ) + const curvePool = ( + await CurvePoolMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + const crvUsdUSDCPool = ( + await ethers.getContractAt('IConvexRewardPool', ARB_Convex_crvUSD_USDC) + ) + + collateralOpts.erc20 = crvUsdUSDCPool.address + collateralOpts.curvePool = curvePool.address + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + const arb = await ethers.getContractAt('ERC20Mock', ARB) + + return { + alice, + collateral, + curvePool: curvePool, + wrapper: crvUsdUSDCPool, // no wrapper needed + rewardTokens: [cvx, crv, arb], + poolTokens: [ + await ethers.getContractAt('ERC20Mock', USDC), + await ethers.getContractAt('ERC20Mock', crvUSD), + ], + feeds: [usdcFeed, crvUSDFeed], + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintL2Pool(ctx, amount, recipient, ARB_crvUSD_USDC_HOLDER) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => { + it('Claims rewards', async () => { + // Reward claiming is tested here instead of in the generic suite due to not all 3 + // reward tokens being claimed for positive token balances + + const [collateral] = await deployCollateral() + const amt = bn('20000').mul(bn(10).pow(await collateral.erc20Decimals())) + + // Transfer some tokens to the collateral plugin + const crvUsdUSDCPool = ( + await ethers.getContractAt('IConvexRewardPool', ARB_Convex_crvUSD_USDC) + ) + await mintL2Pool( + { wrapper: crvUsdUSDCPool } as CurveBase, + amt, + collateral.address, + ARB_crvUSD_USDC_HOLDER + ) + + await advanceBlocks(1000) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) + + const rewardTokens = [ + // Only ARB rewards as of the time of this plugin development + await ethers.getContractAt('ERC20Mock', ARB), + ] + + // Expect 4 RewardsClaimed events to be emitted: [CVX, CRV, CRV_USD, ARB] + const before = await Promise.all(rewardTokens.map((t) => t.balanceOf(collateral.address))) + + await expectEvents(collateral.claimRewards(), [ + { + contract: collateral, + name: 'RewardsClaimed', + args: [CRV, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [CVX, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [crvUSD, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [ARB, anyValue], + emitted: true, + }, + ]) + + // Reward token balances should grow + const after = await Promise.all(rewardTokens.map((t) => t.balanceOf(collateral.address))) + for (let i = 0; i < rewardTokens.length; i++) { + expect(after[i]).gt(before[i]) + } + }) +} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itClaimsRewards: it.skip, // in this file + isMetapool: false, + resetFork: getResetFork(FORK_BLOCK_ARBITRUM), + collateralName: 'CurveStableCollateral - Convex L2 (crvUSD/USDC)', + targetNetwork: 'arbitrum', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts new file mode 100644 index 0000000000..03e45cff8f --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts @@ -0,0 +1,287 @@ +import collateralTests from '../collateralTests' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, + CurveBase, +} from '../pluginTestTypes' + +import { mintL2Pool } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { + CurvePoolMock, + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, + IConvexRewardPool, +} from '../../../../../typechain' +import { expectEvents } from '#/common/events' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + CRV, + CVX, + ARB, + ARB_crvUSD_USD_FEED, + ARB_USDT_USD_FEED, + ARB_Convex_crvUSD_USDT, + ARB_crvUSD_ORACLE_TIMEOUT, + ARB_USDT_ORACLE_TIMEOUT, + ARB_crvUSD_USDT, + ARB_crvUSD_ORACLE_ERROR, + ARB_USDT_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + CurvePoolType, + ARB_crvUSD_USDT_HOLDER, + USDT, + crvUSD, + FORK_BLOCK_ARBITRUM, +} from '../constants' +import { advanceBlocks, advanceToTimestamp, getLatestBlockTimestamp } from '#/test/utils/time' +import { getResetFork } from '../../helpers' + +type Fixture = () => Promise + +export const defaultCvxStableCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ARB_crvUSD_USD_FEED, // unused but cannot be zero + oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: ARB_crvUSD_USDT, + lpToken: ARB_crvUSD_USDT, + poolType: CurvePoolType.Plain, + feeds: [[ARB_crvUSD_USD_FEED], [ARB_USDT_USD_FEED]], + oracleTimeouts: [[ARB_crvUSD_ORACLE_TIMEOUT], [ARB_USDT_ORACLE_TIMEOUT]], + oracleErrors: [[ARB_crvUSD_ORACLE_ERROR], [ARB_USDT_ORACLE_ERROR]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + opts.feeds = [[usdcFeed.address], [crvUSDFeed.address]] + opts.erc20 = ARB_Convex_crvUSD_USDT + } + + opts = { ...defaultCvxStableCollateralOpts, ...opts } + + const L2CvxStableCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'L2ConvexStableCollateral' + ) + + const collateral = await L2CvxStableCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxStableCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdtFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateralOpts.feeds = [[usdtFeed.address], [crvUSDFeed.address]] + + // Use mock curvePool seeded with initial balances + const CurvePoolMockFactory = await ethers.getContractFactory('CurvePoolMock') + const realCurvePool = ( + await ethers.getContractAt('CurvePoolMock', ARB_crvUSD_USDT) + ) + const curvePool = ( + await CurvePoolMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + const crvUsdUSDTPool = ( + await ethers.getContractAt('IConvexRewardPool', ARB_Convex_crvUSD_USDT) + ) + + collateralOpts.erc20 = crvUsdUSDTPool.address + collateralOpts.curvePool = curvePool.address + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + const arb = await ethers.getContractAt('ERC20Mock', ARB) + + return { + alice, + collateral, + curvePool: curvePool, + wrapper: crvUsdUSDTPool, // no wrapper needed + rewardTokens: [cvx, crv, arb], + poolTokens: [ + await ethers.getContractAt('ERC20Mock', USDT), + await ethers.getContractAt('ERC20Mock', crvUSD), + ], + feeds: [usdtFeed, crvUSDFeed], + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintL2Pool(ctx, amount, recipient, ARB_crvUSD_USDT_HOLDER) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => { + it('Claims rewards', async () => { + // Reward claiming is tested here instead of in the generic suite due to not all 3 + // reward tokens being claimed for positive token balances + + const [collateral] = await deployCollateral() + const amt = bn('20000').mul(bn(10).pow(await collateral.erc20Decimals())) + + // Transfer some tokens to the collateral plugin + const crvUsdUSDTPool = ( + await ethers.getContractAt('IConvexRewardPool', ARB_Convex_crvUSD_USDT) + ) + await mintL2Pool( + { wrapper: crvUsdUSDTPool } as CurveBase, + amt, + collateral.address, + ARB_crvUSD_USDT_HOLDER + ) + + await advanceBlocks(1000) + await advanceToTimestamp((await getLatestBlockTimestamp()) + 12000) + + const rewardTokens = [ + // Only ARB rewards as of the time of this plugin development + await ethers.getContractAt('ERC20Mock', ARB), + ] + + // Expect 4 RewardsClaimed events to be emitted: [CVX, CRV, CRV_USD, ARB] + const before = await Promise.all(rewardTokens.map((t) => t.balanceOf(collateral.address))) + + await expectEvents(collateral.claimRewards(), [ + { + contract: collateral, + name: 'RewardsClaimed', + args: [CRV, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [CVX, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [crvUSD, anyValue], + emitted: true, + }, + { + contract: collateral, + name: 'RewardsClaimed', + args: [ARB, anyValue], + emitted: true, + }, + ]) + + // Reward token balances should grow + const after = await Promise.all(rewardTokens.map((t) => t.balanceOf(collateral.address))) + for (let i = 0; i < rewardTokens.length; i++) { + expect(after[i]).gt(before[i]) + } + }) +} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itClaimsRewards: it.skip, // in this file + isMetapool: false, + resetFork: getResetFork(FORK_BLOCK_ARBITRUM), + collateralName: 'CurveStableCollateral - Convex L2 (crvUSD/USDT)', + targetNetwork: 'arbitrum', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index f137faa3b9..ee161c1033 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -192,6 +192,18 @@ export const mintWPool = async ( await cvxWrapper.connect(user).deposit(amount, recipient) } +export const mintL2Pool = async ( + ctx: CurveBase, + amount: BigNumberish, + recipient: string, + holder: string +) => { + const cvxLPToken = ctx.wrapper + await whileImpersonating(holder, async (signer) => { + await cvxLPToken.connect(signer).transfer(recipient, amount) + }) +} + export const resetFork = getResetFork(forkBlockNumber['old-curve-plugins']) export type Numeric = number | bigint diff --git a/test/plugins/individual-collateral/curve/pluginTestTypes.ts b/test/plugins/individual-collateral/curve/pluginTestTypes.ts index d3d3257a68..5629888b44 100644 --- a/test/plugins/individual-collateral/curve/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/curve/pluginTestTypes.ts @@ -5,6 +5,7 @@ import { ERC20Mock, MockV3Aggregator, TestICollateral, + IConvexRewardPool, } from '../../../../typechain' import { CollateralOpts } from '../pluginTestTypes' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -14,7 +15,7 @@ type Fixture = () => Promise export interface CurveBase { curvePool: CurvePoolMock - wrapper: ConvexStakingWrapper + wrapper: ConvexStakingWrapper | IConvexRewardPool } // The basic fixture context used in the Curve collateral plugin tests @@ -88,4 +89,7 @@ export interface CurveCollateralTestSuiteFixtures Date: Mon, 13 May 2024 11:47:24 -0400 Subject: [PATCH 377/450] use direct claim_rewards() (#1139) --- .../assets/curve/stakedao/IStakeDAO.sol | 20 ------------------ .../stakedao/StakeDAORecursiveCollateral.sol | 21 +++++++++++++------ 2 files changed, 15 insertions(+), 26 deletions(-) delete mode 100644 contracts/plugins/assets/curve/stakedao/IStakeDAO.sol diff --git a/contracts/plugins/assets/curve/stakedao/IStakeDAO.sol b/contracts/plugins/assets/curve/stakedao/IStakeDAO.sol deleted file mode 100644 index b53ed0dcd4..0000000000 --- a/contracts/plugins/assets/curve/stakedao/IStakeDAO.sol +++ /dev/null @@ -1,20 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity 0.8.19; - -import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; - -interface IStakeDAOGauge is IERC20Metadata { - function deposit(uint256 amount) external; - - function claimer() external view returns (IStakeDAOClaimer); - - // solhint-disable-next-line func-name-mixedcase - function reward_count() external view returns (uint256); - - // solhint-disable-next-line func-name-mixedcase - function reward_tokens(uint256 index) external view returns (IERC20Metadata); -} - -interface IStakeDAOClaimer { - function claimRewards(address[] memory gauges, bool claimVeSDT) external; -} diff --git a/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol index 69bc291bbc..ef311e7e7b 100644 --- a/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol +++ b/contracts/plugins/assets/curve/stakedao/StakeDAORecursiveCollateral.sol @@ -1,8 +1,21 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "../CurveRecursiveCollateral.sol"; -import "./IStakeDAO.sol"; + +interface IStakeDAOGauge is IERC20Metadata { + // solhint-disable-next-line func-name-mixedcase + function claim_rewards() external; + + function deposit(uint256 amount) external; + + // solhint-disable-next-line func-name-mixedcase + function reward_count() external view returns (uint256); + + // solhint-disable-next-line func-name-mixedcase + function reward_tokens(uint256 index) external view returns (IERC20Metadata); +} /** * @title StakeDAORecursiveCollateral @@ -20,7 +33,6 @@ contract StakeDAORecursiveCollateral is CurveRecursiveCollateral { using FixLib for uint192; IStakeDAOGauge internal immutable gauge; // typed erc20 variable - IStakeDAOClaimer internal immutable claimer; /// @param config.erc20 must be of type IStakeDAOGauge /// @param config.chainlinkFeed Feed units: {UoA/ref} @@ -30,7 +42,6 @@ contract StakeDAORecursiveCollateral is CurveRecursiveCollateral { PTConfiguration memory ptConfig ) CurveRecursiveCollateral(config, revenueHiding, ptConfig) { gauge = IStakeDAOGauge(address(config.erc20)); - claimer = gauge.claimer(); } /// @custom:delegate-call @@ -46,9 +57,7 @@ contract StakeDAORecursiveCollateral is CurveRecursiveCollateral { } // Do actual claim - address[] memory gauges = new address[](1); - gauges[0] = address(gauge); - claimer.claimRewards(gauges, false); + gauge.claim_rewards(); // Emit balance changes for (uint256 i = 0; i < rewardTokens.length; i++) { From b185743e576a38a26e7947ceecf30d6fd66095a3 Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Mon, 20 May 2024 10:29:19 -0400 Subject: [PATCH 378/450] Update writing-collateral-plugins.md (#1145) --- docs/writing-collateral-plugins.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/writing-collateral-plugins.md b/docs/writing-collateral-plugins.md index be05b3ec64..1d2fd57f7e 100644 --- a/docs/writing-collateral-plugins.md +++ b/docs/writing-collateral-plugins.md @@ -55,8 +55,8 @@ npx hardhat test test/plugins/individual-collateral// Date: Thu, 23 May 2024 18:34:53 -0300 Subject: [PATCH 379/450] arbitrum crvusd crvusdt deployments (#1142) --- .../arbitrum-3.4.0/42161-tmp-assets-collateral.json | 10 +++++++--- .../arbitrum-3.4.0/42161-tmp-deployments.json | 2 +- .../deploy_convex_crvusd_usdc_collateral.ts | 8 +++++--- .../deploy_convex_crvusd_usdt_collateral.ts | 8 +++++--- .../collateral-plugins/verify_convex_crvusd_usdc.ts | 8 +++++--- .../collateral-plugins/verify_convex_crvusd_usdt.ts | 8 +++++--- 6 files changed, 28 insertions(+), 16 deletions(-) diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json index e9ccea593e..dd71b7f889 100644 --- a/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json +++ b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json @@ -9,7 +9,9 @@ "USDT": "0x3Ac8F000D75a2EA4a9a36c6844410926bc0c32f7", "saArbUSDCn": "0x7be9Bc50734820516693A376238Cc6Bf029BA682", "saArbUSDT": "0x529D7e23Ce63efdcE41dA2a41296Fd7399157F5b", - "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6" + "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6", + "cvxCrvUSDUSDT": "0xf729b03AcbD60c8aF9B449d51444445815a56d0e", + "cvxCrvUSDUSDC": "0x57547D29cf0D5B4d31c6c71Ec73b3A8c8416ade6" }, "erc20s": { "COMP": "0x354A6dA3fcde098F8389cad84b0182725c6C91dE", @@ -19,6 +21,8 @@ "saArbUSDCn": "0x030cDeCBDcA6A34e8De3f49d1798d5f70E3a3414", "saArbUSDT": "0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128", "cUSDCv3": "0xd54804250E9C561AEa9Dee34e9cf2342f767ACC5", - "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548" + "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548", + "cvxCrvUSDUSDT": "0xf74d4C9b0F49fb70D8Ff6706ddF39e3a16D61E67", + "cvxCrvUSDUSDC": "0xBFEE9F3E015adC754066424AEd535313dc764116" } -} \ No newline at end of file +} diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json index d144304069..7c70ad0ba6 100644 --- a/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json +++ b/scripts/addresses/arbitrum-3.4.0/42161-tmp-deployments.json @@ -35,4 +35,4 @@ "stRSR": "0x437b525F96A2Da0A4b165efe27c61bea5c8d3CD4" } } -} \ No newline at end of file +} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts index 2a86a8f1f9..5c743c4184 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts @@ -2,7 +2,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration' -import { bn } from '../../../../common/numbers' +import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' import { @@ -18,7 +18,7 @@ import { L2ConvexStableCollateral, IConvexRewardPool, } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { combinedError, revenueHiding } from '../../utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -129,7 +129,9 @@ async function main() { oracleError: bn('1'), // unused but cannot be zero oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, + defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDC_ORACLE_ERROR) + .add(fp('0.01')) + .toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, revenueHiding.toString(), diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts index df1a794993..0b848757c2 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts @@ -2,7 +2,7 @@ import fs from 'fs' import hre, { ethers } from 'hardhat' import { getChainId } from '../../../../common/blockchain-utils' import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration' -import { bn } from '../../../../common/numbers' +import { bn, fp } from '../../../../common/numbers' import { expect } from 'chai' import { CollateralStatus, ONE_ADDRESS } from '../../../../common/constants' import { @@ -18,7 +18,7 @@ import { L2ConvexStableCollateral, IConvexRewardPool, } from '../../../../typechain' -import { revenueHiding } from '../../utils' +import { combinedError, revenueHiding } from '../../utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -129,7 +129,9 @@ async function main() { oracleError: bn('1'), // unused but cannot be zero oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, + defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDT_ORACLE_ERROR) + .add(fp('0.01')) + .toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, revenueHiding.toString(), diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts index 6756c5d6d6..2f6355865b 100644 --- a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdc.ts @@ -1,7 +1,7 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' import { arbitrumL2Chains, developmentChains, networkConfig } from '../../../common/configuration' -import { bn } from '../../../common/numbers' +import { bn, fp } from '../../../common/numbers' import { ONE_ADDRESS } from '../../../common/constants' import { getDeploymentFile, @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { combinedError, revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -112,7 +112,9 @@ async function main() { oracleError: bn('1'), // unused but cannot be zero oracleTimeout: ARB_USDC_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, + defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDC_ORACLE_ERROR) + .add(fp('0.01')) + .toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, revenueHiding.toString(), diff --git a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts index 6cc6c8a5ad..7c26cc2472 100644 --- a/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts +++ b/scripts/verification/collateral-plugins/verify_convex_crvusd_usdt.ts @@ -1,7 +1,7 @@ import hre, { ethers } from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' import { arbitrumL2Chains, developmentChains, networkConfig } from '../../../common/configuration' -import { bn } from '../../../common/numbers' +import { bn, fp } from '../../../common/numbers' import { ONE_ADDRESS } from '../../../common/constants' import { getDeploymentFile, @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../../deployment/common' import { verifyContract } from '../../deployment/utils' -import { revenueHiding } from '../../deployment/utils' +import { combinedError, revenueHiding } from '../../deployment/utils' import { CurvePoolType, DEFAULT_THRESHOLD, @@ -107,7 +107,9 @@ async function main() { oracleError: bn('1'), // unused but cannot be zero oracleTimeout: ARB_USDT_ORACLE_TIMEOUT, // max of oracleTimeouts maxTradeVolume: MAX_TRADE_VOL, - defaultThreshold: DEFAULT_THRESHOLD, + defaultThreshold: combinedError(ARB_crvUSD_ORACLE_ERROR, ARB_USDT_ORACLE_ERROR) + .add(fp('0.01')) + .toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, revenueHiding.toString(), From 932f8e279dc1828280647f4040e1920ea14f5032 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 29 May 2024 10:31:49 -0400 Subject: [PATCH 380/450] ETH+/ETH collateral feedback (#1141) Co-authored-by: Julian M. Rodriguez <56316686+julianmrodri@users.noreply.github.com> --- .../CurveAppreciatingRTokenFiatCollateral.sol | 47 +++---- ...ciatingRTokenSelfReferentialCollateral.sol | 49 ++----- .../assets/curve/CurveRecursiveCollateral.sol | 39 ++++-- .../CurveStableRTokenMetapoolCollateral.sol | 13 +- contracts/plugins/assets/curve/PoolTokens.sol | 12 +- contracts/plugins/mocks/CurvePoolMock.sol | 9 ++ .../plugins/mocks/CurveReentrantReceiver.sol | 20 +++ .../addresses/1-tmp-assets-collateral.json | 8 +- .../1-tmp-assets-collateral.json | 6 +- .../curve/collateralTests.ts | 126 +++++++++-------- .../individual-collateral/curve/constants.ts | 4 + .../curve/crv/CrvStableMetapoolSuite.test.ts | 1 + .../CrvStableRTokenMetapoolTestSuite.test.ts | 1 + .../curve/crv/CrvStableTestSuite.test.ts | 1 + ...xAppreciatingRTokenSelfReferential.test.ts | 127 ++++++++++++++---- .../curve/cvx/CvxStableMetapoolSuite.test.ts | 1 + .../CvxStableRTokenMetapoolTestSuite.test.ts | 79 ++++++----- .../cvx/CvxStableTestSuite_PayPool.test.ts | 3 - .../CvxStableTestSuite_crvUSD-USDC.test.ts | 1 + .../CvxStableTestSuite_crvUSD-USDT.test.ts | 3 - .../L2_CvxStableTestSuite_crvUSD-USDC.test.ts | 1 + .../L2_CvxStableTestSuite_crvUSD-USDT.test.ts | 1 + .../curve/pluginTestTypes.ts | 3 + .../StakeDAORecursiveCollateral.test.ts | 1 + 24 files changed, 345 insertions(+), 211 deletions(-) create mode 100644 contracts/plugins/mocks/CurveReentrantReceiver.sol diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol index a4ce5e60d2..e74f88aa4c 100644 --- a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol @@ -87,9 +87,16 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { assert(low == 0); } - // Check RToken status + // Check pool status: inner RToken must be both isReady() and + // fullyCollateralized() to prevent injection of bad debt. try pairedBasketHandler.isReady() returns (bool isReady) { - if (!isReady || low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + if ( + !isReady || + low == 0 || + _anyDepeggedInPool() || + _anyDepeggedOutsidePool() || + !pairedBasketHandler.fullyCollateralized() + ) { // If the price is below the default-threshold price, default eventually // uint192(+/-) is the same as Fix.plus/minus markStatus(CollateralStatus.IFFY); @@ -119,6 +126,7 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { } /// @dev Not up-only! The RToken can devalue its exchange rate peg + /// @dev Assumption: The RToken BU is intended to equal the reference token in value /// @return {ref/tok} Quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view virtual override returns (uint192) { // {ref/tok} = quantity of the reference unit token in the pool per LP token @@ -154,34 +162,13 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { function _anyDepeggedInPool() internal view virtual override returns (bool) { // Assumption: token0 is the RToken; token1 is the reference token - // Check RToken price against reference token, accounting for appreciation - try this.tokenPrice(0) returns (uint192 low0, uint192 high0) { - // {UoA/tok} = {UoA/tok} + {UoA/tok} - uint192 mid0 = (low0 + high0) / 2; + // Check reference token price + try this.tokenPrice(1) returns (uint192 low1, uint192 high1) { + // {target/ref} = {UoA/ref} = {UoA/ref} + {UoA/ref} + uint192 mid1 = (low1 + high1) / 2; - // Remove the appreciation portion of the RToken price - // {UoA/ref} = {UoA/tok} * {tok} / {ref} - mid0 = mid0.muluDivu(rToken.totalSupply(), rToken.basketsNeeded()); - - try this.tokenPrice(1) returns (uint192 low1, uint192 high1) { - // {target/ref} = {UoA/ref} = {UoA/ref} + {UoA/ref} - uint192 mid1 = (low1 + high1) / 2; - - // Check price of reference token - if (mid1 < pegBottom || mid1 > pegTop) return true; - - // {target/ref} = {UoA/ref} / {UoA/ref} * {target/ref} - uint192 ratio = mid0.div(mid1); // * targetPerRef(), but we know it's 1 - - // Check price of RToken relative to reference token - if (ratio < pegBottom || ratio > pegTop) return true; - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - // untested: - // pattern validated in other plugins, cost to test is high - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return true; - } + // Check price of reference token + if (mid1 < pegBottom || mid1 > pegTop) return true; } catch (bytes memory errData) { // see: docs/solidity-style.md#Catching-Empty-Data // untested: @@ -190,6 +177,8 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { return true; } + // The RToken does not need to be monitored given more restrictive hard-default checks + return false; } } diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol index b4f89be17b..9077355cd1 100644 --- a/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenSelfReferentialCollateral.sol @@ -19,8 +19,9 @@ import "./CurveAppreciatingRTokenFiatCollateral.sol"; * tar = ETH * UoA = USD * - * @notice Curve pools with native ETH or ERC777 should be avoided, - * see docs/collateral.md for information + * @notice This Curve Pool contains WETH, which can be used to intercept execution by providing + * `use_eth=true` to remove_liquidity()/remove_liquidity_one_coin(). It is guarded against + * by the recommended method of calling `claim_admin_fees()`. */ contract CurveAppreciatingRTokenSelfReferentialCollateral is CurveAppreciatingRTokenFiatCollateral { using OracleLib for AggregatorV3Interface; @@ -36,46 +37,18 @@ contract CurveAppreciatingRTokenSelfReferentialCollateral is CurveAppreciatingRT PTConfiguration memory ptConfig ) CurveAppreciatingRTokenFiatCollateral(config, revenueHiding, ptConfig) {} - // solhint-enable no-empty-blocks + /// Should not revert (unless CurvePool is re-entrant!) + /// Refresh exchange rates and update default status. + function refresh() public virtual override { + curvePool.claim_admin_fees(); // revert if curve pool is re-entrant + super.refresh(); + } // === Internal === function _anyDepeggedInPool() internal view virtual override returns (bool) { - // Assumption: token0 is the RToken; token1 is the reference token - - // Check RToken price against reference token, accounting for appreciation - try this.tokenPrice(0) returns (uint192 low0, uint192 high0) { - // {UoA/tok} = {UoA/tok} + {UoA/tok} - uint192 mid0 = (low0 + high0) / 2; - - // Remove the appreciation portion of the RToken price - // {UoA/ref} = {UoA/tok} * {tok} / {ref} - mid0 = mid0.muluDivu(rToken.totalSupply(), rToken.basketsNeeded()); - - try this.tokenPrice(1) returns (uint192 low1, uint192 high1) { - // {UoA/ref} = {UoA/ref} + {UoA/ref} - uint192 mid1 = (low1 + high1) / 2; - - // {target/ref} = {UoA/ref} / {UoA/ref} * {target/ref} - uint192 ratio = mid0.div(mid1); // * targetPerRef(), but we know it's 1 - - // Check price of RToken relative to reference token - if (ratio < pegBottom || ratio > pegTop) return true; - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - // untested: - // pattern validated in other plugins, cost to test is high - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return true; - } - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - // untested: - // pattern validated in other plugins, cost to test is high - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return true; - } - + // WETH cannot de-peg against ETH (the price feed we have is ETH/USD) + // The RToken does not need to be monitored given more restrictive hard-default checks return false; } } diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol index d07190c57a..c1cf7461c6 100644 --- a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol +++ b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol @@ -18,6 +18,8 @@ import "../OracleLib.sol"; * - The RToken _must_ be the same RToken using this plugin as collateral! * - The RToken SHOULD have an RSR overcollateralization layer. DO NOT USE WITHOUT RSR! * - The LP token should be worth ~2x the reference token. Do not use with 1x lpTokens. + * - Lastly: Do NOT deploy an RToken with this collateral! It can only be swapped + * in at a later date once the RToken has nonzero issuance. * * tok = ConvexStakingWrapper or CurveGaugeWrapper * ref = coins(0) in the pool @@ -30,6 +32,9 @@ contract CurveRecursiveCollateral is CurveStableCollateral { IRToken internal immutable rToken; // token1 + // does not become nonzero until after first refresh() + uint192 internal poolVirtualPrice; // {lpToken@t=0/lpToken} max virtual price sub revenue hiding + /// @param config.erc20 must be of type ConvexStakingWrapper or CurveGaugeWrapper /// @param config.chainlinkFeed Feed units: {UoA/ref} constructor( @@ -38,9 +43,6 @@ contract CurveRecursiveCollateral is CurveStableCollateral { PTConfiguration memory ptConfig ) CurveStableCollateral(config, revenueHiding, ptConfig) { rToken = IRToken(address(token1)); - - // {ref/tok} LP token's virtual price - exposedReferencePrice = _safeWrap(curvePool.get_virtual_price()).mul(revenueShowing); } /// Can revert, used by other contract functions in order to catch errors @@ -83,25 +85,42 @@ contract CurveRecursiveCollateral is CurveStableCollateral { function refresh() public virtual override { CollateralStatus oldStatus = status(); - try this.underlyingRefPerTok() returns (uint192) { + try this.underlyingRefPerTok() returns (uint192 underlyingRefPerTok_) { // Instead of ensuring the underlyingRefPerTok is up-only, solely check // that the pool's virtual price is up-only. Otherwise this collateral - // would create default cascades. + // would create default cascades when basketsNeeded()/totalSupply() falls. + + // === Check for virtualPrice hard default === - // {ref/tok} + // {lpToken@t=0/lpToken} uint192 virtualPrice = _safeWrap(curvePool.get_virtual_price()); - // {ref/tok} = {ref/tok} * {1} - uint192 hiddenReferencePrice = virtualPrice.mul(revenueShowing); + // {lpToken@t=0/lpToken} + uint192 hiddenVirtualPrice = virtualPrice.mul(revenueShowing); // uint192(<) is equivalent to Fix.lt - if (virtualPrice < exposedReferencePrice) { - exposedReferencePrice = virtualPrice; + if (virtualPrice < poolVirtualPrice) { + poolVirtualPrice = virtualPrice; markStatus(CollateralStatus.DISABLED); + } else if (hiddenVirtualPrice > poolVirtualPrice) { + poolVirtualPrice = hiddenVirtualPrice; + } + + // === Update exposedReferencePrice, ignoring default === + + // {ref/tok} = {ref/tok} * {1} + uint192 hiddenReferencePrice = underlyingRefPerTok_.mul(revenueShowing); + + // uint192(<) is equivalent to Fix.lt + if (underlyingRefPerTok_ < exposedReferencePrice) { + exposedReferencePrice = underlyingRefPerTok_; + // markStatus(CollateralStatus.DISABLED); // don't DISABLE } else if (hiddenReferencePrice > exposedReferencePrice) { exposedReferencePrice = hiddenReferencePrice; } + // === Check for soft default === + // Check for soft default + save prices try this.tryPrice() returns (uint192 low, uint192 high, uint192) { // {UoA/tok}, {UoA/tok}, {UoA/tok} diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 36bde1b1e3..50300f0765 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -89,11 +89,16 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { assert(low == 0); } - // Check RToken status + // Check pool status: inner RToken must be both isReady() and + // fullyCollateralized() to prevent injection of bad debt. try pairedBasketHandler.isReady() returns (bool isReady) { - if (!isReady) { - markStatus(CollateralStatus.IFFY); - } else if (low == 0 || _anyDepeggedInPool() || _anyDepeggedOutsidePool()) { + if ( + !isReady || + low == 0 || + _anyDepeggedInPool() || + _anyDepeggedOutsidePool() || + !pairedBasketHandler.fullyCollateralized() + ) { // If the price is below the default-threshold price, default eventually // uint192(+/-) is the same as Fix.plus/minus markStatus(CollateralStatus.IFFY); diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index 554502d233..b99378db00 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -7,8 +7,18 @@ import "@openzeppelin/contracts/utils/math/Math.sol"; import "contracts/plugins/assets/OracleLib.sol"; import "contracts/libraries/Fixed.sol"; -// solhint-disable func-name-mixedcase +// solhint-disable func-param-name-mixedcase, func-name-mixedcase interface ICurvePool { + // reentrancy check -- use with ETH / WETH pools + function claim_admin_fees() external; + + function remove_liquidity( + uint256 _amount, + uint256[2] calldata min_amounts, + bool use_eth, + address receiver + ) external; + // For Curve Plain Pools and V2 Metapools function coins(uint256) external view returns (address); diff --git a/contracts/plugins/mocks/CurvePoolMock.sol b/contracts/plugins/mocks/CurvePoolMock.sol index cd33b7ba19..4298e15a41 100644 --- a/contracts/plugins/mocks/CurvePoolMock.sol +++ b/contracts/plugins/mocks/CurvePoolMock.sol @@ -15,6 +15,15 @@ contract CurvePoolMock is ICurvePool { coins = _coins; } + function claim_admin_fees() external {} + + function remove_liquidity( + uint256 _amount, + uint256[2] calldata min_amounts, + bool use_eth, + address receiver + ) external {} + function setBalances(uint256[] memory newBalances) external { _balances = newBalances; } diff --git a/contracts/plugins/mocks/CurveReentrantReceiver.sol b/contracts/plugins/mocks/CurveReentrantReceiver.sol new file mode 100644 index 0000000000..c56ecd7288 --- /dev/null +++ b/contracts/plugins/mocks/CurveReentrantReceiver.sol @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../interfaces/IAsset.sol"; + +contract CurveReentrantReceiver { + ICollateral curvePlugin; + + constructor(ICollateral curvePlugin_) { + curvePlugin = curvePlugin_; + curvePlugin.refresh(); // should not revert yet + } + + fallback() external payable { + // should revert if re-entrant + try curvePlugin.refresh() {} catch { + revert("refresh() reverted"); + } + } +} diff --git a/scripts/addresses/1-tmp-assets-collateral.json b/scripts/addresses/1-tmp-assets-collateral.json index b7d3762111..e8bb4eddab 100644 --- a/scripts/addresses/1-tmp-assets-collateral.json +++ b/scripts/addresses/1-tmp-assets-collateral.json @@ -33,10 +33,10 @@ "cUSDCv3": "0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0", "cvx3Pool": "0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2", "cvxPayPool": "0x5315Fbe0CEB299F53aE375f65fd9376767C8224c", - "cvxeUSDFRAXBP": "0xE529B59C1764d6E5a274099Eb660DD9e130A5481", + "cvxeUSDFRAXBP": "0x994455cE66Fd984e2A0A0aca453e637810a8f032", "cvxMIM3Pool": "0x3d21f841C0Fb125176C1DBDF0DE196b071323A75", - "cvxETHPlusETH": "0xc4a5Fb266E8081D605D87f0b1290F54B0a5Dc221", - "crveUSDFRAXBP": "0x945b0ad788dD6dB3864AB23876C68C1bf000d237", + "cvxETHPlusETH": "0x05F164E71C46a8f8FB2ba71550a00eeC9FCd85cd", + "crveUSDFRAXBP": "0xCDC5f5E041b49Cad373E94930E2b3bE30be70535", "crvMIM3Pool": "0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62", "crv3Pool": "0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9", "sDAI": "0x62a9DDC6FF6077E823690118eCc935d16A8de47e", @@ -119,4 +119,4 @@ "CRV": "0xD533a949740bb3306d119CC777fa900bA034cd52", "CVX": "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B" } -} +} \ No newline at end of file diff --git a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json index 8fec0d8289..61fc0521a8 100644 --- a/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json +++ b/scripts/addresses/mainnet-3.4.0/1-tmp-assets-collateral.json @@ -33,10 +33,10 @@ "cUSDCv3": "0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0", "cvx3Pool": "0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2", "cvxPayPool": "0x5315Fbe0CEB299F53aE375f65fd9376767C8224c", - "cvxeUSDFRAXBP": "0xE529B59C1764d6E5a274099Eb660DD9e130A5481", + "cvxeUSDFRAXBP": "0x994455cE66Fd984e2A0A0aca453e637810a8f032", "cvxMIM3Pool": "0x3d21f841C0Fb125176C1DBDF0DE196b071323A75", - "cvxETHPlusETH": "0xc4a5Fb266E8081D605D87f0b1290F54B0a5Dc221", - "crveUSDFRAXBP": "0x945b0ad788dD6dB3864AB23876C68C1bf000d237", + "cvxETHPlusETH": "0x05F164E71C46a8f8FB2ba71550a00eeC9FCd85cd", + "crveUSDFRAXBP": "0xCDC5f5E041b49Cad373E94930E2b3bE30be70535", "crvMIM3Pool": "0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62", "crv3Pool": "0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9", "sDAI": "0x62a9DDC6FF6077E823690118eCc935d16A8de47e", diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 7d2f74eb00..fbb35852aa 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -64,8 +64,6 @@ import { IMPLEMENTATION, Implementation, ORACLE_ERROR, PRICE_TIMEOUT } from '../ const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip -const describeFork = useEnv('FORK') ? describe : describe.skip - const getDescribeFork = (targetNetwork = 'mainnet') => { return useEnv('FORK') && useEnv('FORK_NETWORK') === targetNetwork ? describe : describe.skip } @@ -82,6 +80,7 @@ export default function fn( isMetapool, resetFork, collateralName, + itChecksTargetPerRefDefault, itClaimsRewards, targetNetwork, } = fixtures @@ -559,78 +558,87 @@ export default function fn( expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) }) - it('enters IFFY state when reference unit depegs below low threshold', async () => { - const delayUntilDefault = await ctx.collateral.delayUntilDefault() + itChecksTargetPerRefDefault( + 'enters IFFY state when reference unit depegs below low threshold', + async () => { + const delayUntilDefault = await ctx.collateral.delayUntilDefault() - // Check initial state - expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) - expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) + // Check initial state + expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) + expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // Depeg first feed - Reducing price by 20% from 1 to 0.8 - const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) - await updateAnswerTx.wait() + // Depeg first feed - Reducing price by 20% from 1 to 0.8 + const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) + await updateAnswerTx.wait() - // Check status + whenDefault - const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault + // Check status + whenDefault + const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 + const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault - await expect(ctx.collateral.refresh()) - .to.emit(ctx.collateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) - expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) - expect(await ctx.collateral.whenDefault()).to.equal(expectedDefaultTimestamp) - }) + await expect(ctx.collateral.refresh()) + .to.emit(ctx.collateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await ctx.collateral.whenDefault()).to.equal(expectedDefaultTimestamp) + } + ) - it('enters IFFY state when reference unit depegs above high threshold', async () => { - const delayUntilDefault = await ctx.collateral.delayUntilDefault() + itChecksTargetPerRefDefault( + 'enters IFFY state when reference unit depegs above high threshold', + async () => { + const delayUntilDefault = await ctx.collateral.delayUntilDefault() - // Check initial state - expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) - expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) + // Check initial state + expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) + expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // Depeg first feed - Raising price by 20% from 1 to 1.2 - const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('1.2e8')) - await updateAnswerTx.wait() + // Depeg first feed - Raising price by 20% from 1 to 1.2 + const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('1.2e8')) + await updateAnswerTx.wait() - // Check status + whenDefault - const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 - const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault + // Check status + whenDefault + const nextBlockTimestamp = (await getLatestBlockTimestamp()) + 1 + const expectedDefaultTimestamp = nextBlockTimestamp + delayUntilDefault - await expect(ctx.collateral.refresh()) - .to.emit(ctx.collateral, 'CollateralStatusChanged') - .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) - expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) - expect(await ctx.collateral.whenDefault()).to.equal(expectedDefaultTimestamp) - }) + await expect(ctx.collateral.refresh()) + .to.emit(ctx.collateral, 'CollateralStatusChanged') + .withArgs(CollateralStatus.SOUND, CollateralStatus.IFFY) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await ctx.collateral.whenDefault()).to.equal(expectedDefaultTimestamp) + } + ) - it('enters DISABLED state when reference unit depegs for too long', async () => { - const delayUntilDefault = await ctx.collateral.delayUntilDefault() + itChecksTargetPerRefDefault( + 'enters DISABLED state when reference unit depegs for too long', + async () => { + const delayUntilDefault = await ctx.collateral.delayUntilDefault() - // Check initial state - expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) - expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) + // Check initial state + expect(await ctx.collateral.status()).to.equal(CollateralStatus.SOUND) + expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) - // Depeg first feed - Reducing price by 20% from 1 to 0.8 - const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) - await updateAnswerTx.wait() + // Depeg first feed - Reducing price by 20% from 1 to 0.8 + const updateAnswerTx = await ctx.feeds[0].updateAnswer(bn('8e7')) + await updateAnswerTx.wait() - // Check status + whenDefault - await ctx.collateral.refresh() - expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) + // Check status + whenDefault + await ctx.collateral.refresh() + expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) - // Move time forward past delayUntilDefault - await advanceTime(delayUntilDefault) - expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) + // Move time forward past delayUntilDefault + await advanceTime(delayUntilDefault) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) - // Nothing changes if attempt to refresh after default - const prevWhenDefault: bigint = (await ctx.collateral.whenDefault()).toBigInt() - await expect(ctx.collateral.refresh()).to.not.emit( - ctx.collateral, - 'CollateralStatusChanged' - ) - expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) - expect(await ctx.collateral.whenDefault()).to.equal(prevWhenDefault) - }) + // Nothing changes if attempt to refresh after default + const prevWhenDefault: bigint = (await ctx.collateral.whenDefault()).toBigInt() + await expect(ctx.collateral.refresh()).to.not.emit( + ctx.collateral, + 'CollateralStatusChanged' + ) + expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await ctx.collateral.whenDefault()).to.equal(prevWhenDefault) + } + ) it('enters DISABLED state when refPerTok() decreases', async () => { // Check initial state diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index 00131a8206..56b9519cff 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -96,6 +96,7 @@ export const ARB = networkConfig[chainId].tokens.ARB! export const ETHPLUS = networkConfig['1'].tokens.ETHPLUS! export const ETHPLUS_ASSET_REGISTRY = '0xf526f058858E4cD060cFDD775077999562b31bE0' export const ETHPLUS_BASKET_HANDLER = '0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194' +export const ETHPLUS_BACKING_MANAGER = '0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B' export const ETHPLUS_TIMELOCK = '0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B' // USDC+ @@ -135,6 +136,9 @@ export const eUSD_FRAX_BP = '0xAEda92e6A3B1028edc139A4ae56Ec881f3064D4F' export const eUSD_FRAX_BP_POOL_ID = 156 export const eUSD_FRAX_HOLDER = '0x8605dc0C339a2e7e85EEA043bD29d42DA2c6D784' export const eUSD_GAUGE = '0x8605dc0c339a2e7e85eea043bd29d42da2c6d784' +export const EUSD_ASSET_REGISTRY = '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' +export const EUSD_BASKET_HANDLER = '0x6d309297ddDFeA104A6E89a132e2f05ce3828e07' +export const eUSD_BACKING_MANAGER = '0xF014FEF41cCB703975827C8569a3f0940cFD80A4' // ETH+ + ETH export const ETHPLUS_BP_POOL = '0x7fb53345f1b21ab5d9510adb38f7d3590be6364b' diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts index bfb7ed9ddc..3b3e5f365f 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableMetapoolSuite.test.ts @@ -218,6 +218,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it, isMetapool: true, resetFork, diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index b0bb27dd07..79a7f7b030 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -291,6 +291,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it, isMetapool: true, resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts index 22cc0d4eb6..e5a5497c28 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableTestSuite.test.ts @@ -227,6 +227,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it, isMetapool: false, resetFork, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts index fd4df26b5b..809da90715 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxAppreciatingRTokenSelfReferential.test.ts @@ -42,6 +42,7 @@ import { ETHPLUS, ETHPLUS_ASSET_REGISTRY, ETHPLUS_BASKET_HANDLER, + ETHPLUS_BACKING_MANAGER, ETHPLUS_TIMELOCK, } from '../constants' import { whileImpersonating } from '../../../../utils/impersonation' @@ -261,20 +262,27 @@ const collateralSpecificStatusTests = () => { expect(await mockRTokenAsset.stale()).to.be.false }) - it('Regression test -- becomes IFFY when inner RToken is IFFY', async () => { - const [collateral] = await deployCollateral({}) + it('Regression test -- stays IFFY throughout inner RToken default + rebalancing', async () => { + const [collateral, opts] = await deployCollateral({}) const ethplusAssetRegistry = await ethers.getContractAt( 'IAssetRegistry', ETHPLUS_ASSET_REGISTRY ) + const ethplus = await ethers.getContractAt('TestIRToken', ETHPLUS) const ethplusBasketHandler = await ethers.getContractAt( - 'IBasketHandler', + 'TestIBasketHandler', ETHPLUS_BASKET_HANDLER ) const wstETHCollateral = await ethers.getContractAt( 'LidoStakedEthCollateral', await ethplusAssetRegistry.toAsset(networkConfig['1'].tokens.wstETH!) ) + const rethCollateral = await ethers.getContractAt( + 'RethCollateral', + await ethplusAssetRegistry.toAsset(networkConfig['1'].tokens.rETH!) + ) + + const initialRefPerTok = await collateral.refPerTok() const initialPrice = await wstETHCollateral.price() expect(initialPrice[0]).to.be.gt(0) expect(initialPrice[1]).to.be.lt(MAX_UINT192) @@ -285,6 +293,9 @@ const collateralSpecificStatusTests = () => { const targetPerRefOracle = await overrideOracle(targetPerRefFeed) const latestAnswer = await targetPerRefOracle.latestAnswer() await targetPerRefOracle.updateAnswer(latestAnswer.mul(4).div(5)) + const uoaPerRefFeed = await wstETHCollateral.chainlinkFeed() + const uoaPerRefOracle = await overrideOracle(uoaPerRefFeed) + await uoaPerRefOracle.updateAnswer(await uoaPerRefOracle.latestAnswer()) // wstETHCollateral + CurveAppreciatingRTokenSelfReferentialCollateral should // become IFFY through the top-level refresh @@ -310,35 +321,96 @@ const collateralSpecificStatusTests = () => { ]) expect(await wstETHCollateral.status()).to.equal(1) expect(await collateral.status()).to.equal(1) + expect(await ethplusBasketHandler.status()).to.equal(1) expect(await ethplusBasketHandler.isReady()).to.equal(false) + expect(await collateral.refPerTok()).to.equal(initialRefPerTok) // refPerTok does not fall - // Should remain IFFY for the warmupPeriod even after wstETHCollateral is SOUND - await targetPerRefOracle.updateAnswer(latestAnswer) - await expectEvents(collateral.refresh(), [ - { - contract: ethplusBasketHandler, - name: 'BasketStatusChanged', - args: [1, 0], - emitted: true, - }, - { - contract: wstETHCollateral, - name: 'CollateralStatusChanged', - args: [1, 0], - emitted: true, - }, - { - contract: collateral, - name: 'CollateralStatusChanged', - emitted: false, - }, - ]) + // Should remain IFFY while ETH+ is rebalancing + await advanceTime((await wstETHCollateral.delayUntilDefault()) + 1) // 24h + + // prevent oracles from becoming stale + for (const feedAddr of opts.feeds!) { + const feed = await ethers.getContractAt('MockV3Aggregator', feedAddr[0]) + await feed.updateAnswer(await feed.latestAnswer()) + } + const ethOracle = await overrideOracle(WETH_USD_FEED) + await ethOracle.updateAnswer(await ethOracle.latestAnswer()) + await targetPerRefOracle.updateAnswer(await targetPerRefOracle.latestAnswer()) + await uoaPerRefOracle.updateAnswer(await uoaPerRefOracle.latestAnswer()) + const rethOracle = await overrideOracle(await rethCollateral.chainlinkFeed()) + await rethOracle.updateAnswer(await rethOracle.latestAnswer()) + const rethTargetPerTokOracle = await overrideOracle( + await rethCollateral.targetPerTokChainlinkFeed() + ) + await rethTargetPerTokOracle.updateAnswer(await rethTargetPerTokOracle.latestAnswer()) + + // Should remain IFFY + expect(await ethplusBasketHandler.status()).to.equal(2) + expect(await wstETHCollateral.status()).to.equal(2) expect(await collateral.status()).to.equal(1) + await expect(collateral.refresh()).to.not.emit(collateral, 'CollateralStatusChanged') + await ethplusBasketHandler.refreshBasket() // swaps WETH into basket in place of wstETH + expect(await ethplusBasketHandler.status()).to.equal(0) + expect(await ethplusBasketHandler.isReady()).to.equal(false) + expect(await ethplusBasketHandler.fullyCollateralized()).to.equal(false) + expect(await collateral.refPerTok()).to.equal(initialRefPerTok) // refPerTok does not fall - // Goes back to SOUND after warmupPeriod - await advanceTime(1000) - await expect(collateral.refresh()).to.emit(collateral, 'CollateralStatusChanged').withArgs(1, 0) + // Advancing the warmupPeriod should not change anything while rebalancing + await advanceTime((await ethplusBasketHandler.warmupPeriod()) + 1) + expect(await ethplusBasketHandler.isReady()).to.equal(true) + await collateral.refresh() + expect(await ethplusBasketHandler.status()).to.equal(0) + expect(await wstETHCollateral.status()).to.equal(2) + expect(await collateral.status()).to.equal(1) + expect(await collateral.refPerTok()).to.equal(initialRefPerTok) // refPerTok does not fall + + // Should go back to SOUND after fullyCollateralized again -- backs up to WETH + const weth = await ethers.getContractAt('IERC20Metadata', networkConfig['1'].tokens.WETH!) + const whale = '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' + const whaleBal = await weth.balanceOf(whale) + await whileImpersonating(whale, async (whaleSigner) => { + await weth.connect(whaleSigner).transfer(ETHPLUS_BACKING_MANAGER, whaleBal) + }) + expect(await ethplusBasketHandler.fullyCollateralized()).to.equal(true) + await collateral.refresh() + expect(await ethplusBasketHandler.status()).to.equal(0) expect(await collateral.status()).to.equal(0) + expect(await collateral.refPerTok()).to.equal(initialRefPerTok) // refPerTok does not fall + + // refPerTok should finally fall after a 50% haircut + const basketsNeeded = await ethplus.basketsNeeded() + await whileImpersonating(ETHPLUS_BACKING_MANAGER, async (bm) => { + console.log('whale', whaleBal, basketsNeeded, await weth.balanceOf(bm.address)) + await weth.connect(bm).transfer(whale, whaleBal.sub(basketsNeeded.mul(26).div(100))) // leave >25% WETH backing + expect(await ethplusBasketHandler.fullyCollateralized()).to.equal(false) + await ethplus.connect(bm).setBasketsNeeded(basketsNeeded.div(2)) // 50% haircut = WETH backing is sufficient + }) + expect(await ethplusBasketHandler.fullyCollateralized()).to.equal(true) + await collateral.refresh() + expect(await ethplusBasketHandler.status()).to.equal(0) + + // ETH+/ETH collateral should finally become DISABLED once refPerTok falls + expect(await collateral.status()).to.equal(2) + expect(await collateral.refPerTok()).to.be.gt(initialRefPerTok.mul(70).div(100)) + expect(await collateral.refPerTok()).to.be.lt(initialRefPerTok.mul(71).div(100)) + // 70% < refPerTok < 71%, since sqrt(0.5) = 0.707 + }) + + it('Read-only reentrancy', async () => { + const [collateral] = await deployCollateral({}) + const factory = await ethers.getContractFactory('CurveReentrantReceiver') + const reentrantReceiver = await factory.deploy(collateral.address) + + await whileImpersonating(ETHPLUS_ETH_HOLDER, async (whale) => { + const amt = bn('1e18') + const token = await ethers.getContractAt('IERC20Metadata', ETHPLUS_BP_TOKEN) + await token.connect(whale).approve(ETHPLUS_BP_POOL, amt) + const pool = await ethers.getContractAt('ICurvePool', ETHPLUS_BP_POOL) + + await expect( + pool.connect(whale).remove_liquidity(amt, [1, 1], true, reentrantReceiver.address) + ).to.be.revertedWith('refresh() reverted') + }) }) } @@ -352,6 +424,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it.skip, itClaimsRewards: it, isMetapool: false, resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts index fc55ecf11e..16419d9ffa 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableMetapoolSuite.test.ts @@ -226,6 +226,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it, isMetapool: true, resetFork, diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index cd3181a4a2..0e48f9758c 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -34,6 +34,7 @@ import { USDC_USD_FEED, USDC_ORACLE_TIMEOUT, USDC_ORACLE_ERROR, + USDT_USD_FEED, FRAX_USD_FEED, FRAX_ORACLE_TIMEOUT, FRAX_ORACLE_ERROR, @@ -42,14 +43,14 @@ import { RTOKEN_DELAY_UNTIL_DEFAULT, CurvePoolType, CRV, + EUSD_ASSET_REGISTRY, + EUSD_BASKET_HANDLER, + eUSD_BACKING_MANAGER, eUSD_FRAX_HOLDER, eUSD, } from '../constants' import { whileImpersonating } from '../../../../utils/impersonation' -const EUSD_ASSET_REGISTRY = '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' -const EUSD_BASKET_HANDLER = '0x6d309297ddDFeA104A6E89a132e2f05ce3828e07' - type Fixture = () => Promise export const defaultCvxStableCollateralOpts: CurveMetapoolCollateralOpts = { @@ -288,10 +289,10 @@ const collateralSpecificStatusTests = () => { expect(await mockRTokenAsset.stale()).to.be.false }) - it('Regression test -- becomes IFFY when inner RToken is IFFY', async () => { - const [collateral] = await deployCollateral({}) + it('Regression test -- stays IFFY throughout inner RToken default + rebalancing', async () => { + const [collateral, opts] = await deployCollateral({}) const eusdAssetRegistry = await ethers.getContractAt('IAssetRegistry', EUSD_ASSET_REGISTRY) - const eusdBasketHandler = await ethers.getContractAt('IBasketHandler', EUSD_BASKET_HANDLER) + const eusdBasketHandler = await ethers.getContractAt('TestIBasketHandler', EUSD_BASKET_HANDLER) const cUSDTCollateral = await ethers.getContractAt( 'CTokenFiatCollateral', await eusdAssetRegistry.toAsset(networkConfig['1'].tokens.cUSDT!) @@ -331,34 +332,51 @@ const collateralSpecificStatusTests = () => { ]) expect(await cUSDTCollateral.status()).to.equal(1) expect(await collateral.status()).to.equal(1) + expect(await eusdBasketHandler.status()).to.equal(1) expect(await eusdBasketHandler.isReady()).to.equal(false) - // Should remain IFFY for the warmupPeriod even after cUSDTCollateral is SOUND again - await oracle.updateAnswer(latestAnswer) - await expectEvents(collateral.refresh(), [ - { - contract: eusdBasketHandler, - name: 'BasketStatusChanged', - args: [1, 0], - emitted: true, - }, - { - contract: cUSDTCollateral, - name: 'CollateralStatusChanged', - args: [1, 0], - emitted: true, - }, - { - contract: collateral, - name: 'CollateralStatusChanged', - emitted: false, - }, - ]) + // Should remain IFFY while rebalancing + await advanceTime((await cUSDTCollateral.delayUntilDefault()) + 1) // 24h + + // prevent oracles from becoming stale + for (const feedAddr of opts.feeds!) { + const feed = await ethers.getContractAt('MockV3Aggregator', feedAddr[0]) + await feed.updateAnswer(await feed.latestAnswer()) + } + const usdcOracle = await overrideOracle(USDC_USD_FEED) + await usdcOracle.updateAnswer(await usdcOracle.latestAnswer()) + const usdtOracle = await overrideOracle(USDT_USD_FEED) + await usdtOracle.updateAnswer(await usdtOracle.latestAnswer()) + + // Should remain IFFY + expect(await eusdBasketHandler.status()).to.equal(2) + expect(await cUSDTCollateral.status()).to.equal(2) expect(await collateral.status()).to.equal(1) + await expect(collateral.refresh()).to.not.emit(collateral, 'CollateralStatusChanged') + await eusdBasketHandler.refreshBasket() // swaps WETH into basket in place of wstETH + expect(await eusdBasketHandler.status()).to.equal(0) + expect(await eusdBasketHandler.isReady()).to.equal(false) + expect(await eusdBasketHandler.fullyCollateralized()).to.equal(false) - // Goes back to SOUND after warmupPeriod - await advanceTime(1000) - await expect(collateral.refresh()).to.emit(collateral, 'CollateralStatusChanged').withArgs(1, 0) + // Advancing the warmupPeriod should not change anything while rebalancing + await advanceTime((await eusdBasketHandler.warmupPeriod()) + 1) + expect(await eusdBasketHandler.isReady()).to.equal(true) + await collateral.refresh() + expect(await eusdBasketHandler.status()).to.equal(0) + expect(await cUSDTCollateral.status()).to.equal(2) + expect(await collateral.status()).to.equal(1) + + // Should go back to SOUND after fullyCollateralized again -- backs up to USDC + USDT + const usdc = await ethers.getContractAt('IERC20Metadata', networkConfig['1'].tokens.USDC!) + await whileImpersonating('0x4B16c5dE96EB2117bBE5fd171E4d203624B014aa', async (whale) => { + await usdc.connect(whale).transfer(eUSD_BACKING_MANAGER, await usdc.balanceOf(whale.address)) + }) + const usdt = await ethers.getContractAt('IERC20Metadata', networkConfig['1'].tokens.USDT!) + await whileImpersonating('0xF977814e90dA44bFA03b6295A0616a897441aceC', async (whale) => { + await usdt.connect(whale).transfer(eUSD_BACKING_MANAGER, await usdt.balanceOf(whale.address)) + }) + expect(await eusdBasketHandler.fullyCollateralized()).to.equal(true) + await collateral.refresh() expect(await collateral.status()).to.equal(0) }) } @@ -373,6 +391,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it, isMetapool: true, resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts index 2ac9d95df7..d6779fb8a1 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_PayPool.test.ts @@ -210,9 +210,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: false, resetFork: getResetFork(19287000), diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts index bce77c0b38..51dadf4ae9 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts @@ -208,6 +208,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it, isMetapool: false, resetFork: getResetFork(19287000), diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts index 7d603901ba..3d8674266b 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDT.test.ts @@ -209,9 +209,6 @@ const opts = { makeCollateralFixtureContext, mintCollateralTo, itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, itClaimsRewards: it, isMetapool: false, resetFork: getResetFork(19564899), diff --git a/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts index 6c483e2c3e..69775e3bd2 100644 --- a/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDC.test.ts @@ -277,6 +277,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it.skip, // in this file isMetapool: false, resetFork: getResetFork(FORK_BLOCK_ARBITRUM), diff --git a/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts index 03e45cff8f..3348e507fb 100644 --- a/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/L2_CvxStableTestSuite_crvUSD-USDT.test.ts @@ -277,6 +277,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it.skip, // in this file isMetapool: false, resetFork: getResetFork(FORK_BLOCK_ARBITRUM), diff --git a/test/plugins/individual-collateral/curve/pluginTestTypes.ts b/test/plugins/individual-collateral/curve/pluginTestTypes.ts index 5629888b44..d9d34c215b 100644 --- a/test/plugins/individual-collateral/curve/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/curve/pluginTestTypes.ts @@ -76,6 +76,9 @@ export interface CurveCollateralTestSuiteFixtures diff --git a/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts b/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts index 81c98fab5f..e0a64670fd 100644 --- a/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts +++ b/test/plugins/individual-collateral/curve/stakedao/StakeDAORecursiveCollateral.test.ts @@ -302,6 +302,7 @@ const opts = { collateralSpecificStatusTests, makeCollateralFixtureContext, mintCollateralTo, + itChecksTargetPerRefDefault: it, itClaimsRewards: it.skip, // in this file isMetapool: false, resetFork: getResetFork(forkBlockNumber['new-curve-plugins']), From 8045fe63c5e0eb28bb3ac188c853f78b8bf2c821 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Thu, 30 May 2024 00:19:06 +0530 Subject: [PATCH 381/450] Add RPGF Verification --- funding.json | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 funding.json diff --git a/funding.json b/funding.json new file mode 100644 index 0000000000..ee2e566ea0 --- /dev/null +++ b/funding.json @@ -0,0 +1,5 @@ +{ + "opRetro": { + "projectId": "0xab1ddf597f6539acc5ad601c2a6d2899c0475cfd9cc3b837939b1084ba5d7a36" + } +} From 9a65ace93a7878bcf1a6e94feb9a367f5281e829 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Thu, 30 May 2024 13:18:18 -0300 Subject: [PATCH 382/450] deploy facade monitor on arbitrum (#1151) --- .openzeppelin/arbitrum-one.json | 203 +++++++++++++++++- .../deployed-addresses/42161-FacadeMonitor.md | 7 + docs/deployed-addresses/8453-FacadeMonitor.md | 1 - 3 files changed, 200 insertions(+), 11 deletions(-) create mode 100644 docs/deployed-addresses/42161-FacadeMonitor.md diff --git a/.openzeppelin/arbitrum-one.json b/.openzeppelin/arbitrum-one.json index 22373ff1de..351b00b1ac 100644 --- a/.openzeppelin/arbitrum-one.json +++ b/.openzeppelin/arbitrum-one.json @@ -1,6 +1,12 @@ { "manifestVersion": "3.2", - "proxies": [], + "proxies": [ + { + "address": "0xCbBa7E1F29F31d6C83C3814b0E5d0687EC7Df177", + "txHash": "0x7af602fbc5adaf2e4f1876cdec22f79ceb34b39c0bce4cb0863da3d9407f860c", + "kind": "uups" + } + ], "impls": { "7b21ba261eaa32c050f596075a3105499b91bb6fc0858682955d346a59ef20bb": { "address": "0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461", @@ -874,10 +880,7 @@ }, "t_enum(TradeKind)31898": { "label": "enum TradeKind", - "members": [ - "DUTCH_AUCTION", - "BATCH_AUCTION" - ], + "members": ["DUTCH_AUCTION", "BATCH_AUCTION"], "numberOfBytes": "1" }, "t_mapping(t_contract(IERC20)16806,t_contract(ITrade)34075)": { @@ -1190,11 +1193,7 @@ }, "t_enum(CollateralStatus)31279": { "label": "enum CollateralStatus", - "members": [ - "SOUND", - "IFFY", - "DISABLED" - ], + "members": ["SOUND", "IFFY", "DISABLED"], "numberOfBytes": "1" }, "t_mapping(t_bytes32,t_bytes32)": { @@ -3239,6 +3238,190 @@ } } } + }, + "eb8c6dfe183ec285c8cd8b5c8b7137551dfcf70185c34e6e6dbce3ae1b20b853": { + "address": "0xe54cc5F82E217FCBAA579F68eA83385B9716aAC4", + "txHash": "0x4971fa972ec14e55de29307d8413b209c1c9b3381fcb41696594a099735c32c6", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:63", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:68" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:40" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:169" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:111" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } + }, + "d1e021b854c3f6ab5e998969c8df7e648a147f5001337ec8f2bb065c4ea04d6f": { + "address": "0xd9F084E237Ab0c1d56e44A5d550c00B34C7B5aAe", + "txHash": "0x6b88afe1176d18e15929b382611740e66dd3c8dd1d31ca4083f367c69b997116", + "layout": { + "solcVersion": "0.8.19", + "storage": [ + { + "label": "_initialized", + "offset": 0, + "slot": "0", + "type": "t_uint8", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:62", + "retypedFrom": "bool" + }, + { + "label": "_initializing", + "offset": 1, + "slot": "0", + "type": "t_bool", + "contract": "Initializable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol:67" + }, + { + "label": "__gap", + "offset": 0, + "slot": "1", + "type": "t_array(t_uint256)50_storage", + "contract": "ContextUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol:36" + }, + { + "label": "_owner", + "offset": 0, + "slot": "51", + "type": "t_address", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:22" + }, + { + "label": "__gap", + "offset": 0, + "slot": "52", + "type": "t_array(t_uint256)49_storage", + "contract": "OwnableUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol:94" + }, + { + "label": "__gap", + "offset": 0, + "slot": "101", + "type": "t_array(t_uint256)50_storage", + "contract": "ERC1967UpgradeUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/ERC1967/ERC1967UpgradeUpgradeable.sol:211" + }, + { + "label": "__gap", + "offset": 0, + "slot": "151", + "type": "t_array(t_uint256)50_storage", + "contract": "UUPSUpgradeable", + "src": "@openzeppelin/contracts-upgradeable/proxy/utils/UUPSUpgradeable.sol:107" + } + ], + "types": { + "t_address": { + "label": "address", + "numberOfBytes": "20" + }, + "t_array(t_uint256)49_storage": { + "label": "uint256[49]", + "numberOfBytes": "1568" + }, + "t_array(t_uint256)50_storage": { + "label": "uint256[50]", + "numberOfBytes": "1600" + }, + "t_bool": { + "label": "bool", + "numberOfBytes": "1" + }, + "t_uint256": { + "label": "uint256", + "numberOfBytes": "32" + }, + "t_uint8": { + "label": "uint8", + "numberOfBytes": "1" + } + } + } } } } diff --git a/docs/deployed-addresses/42161-FacadeMonitor.md b/docs/deployed-addresses/42161-FacadeMonitor.md new file mode 100644 index 0000000000..623fcc43b7 --- /dev/null +++ b/docs/deployed-addresses/42161-FacadeMonitor.md @@ -0,0 +1,7 @@ +# FacadeMonitor (Arbitrum) + +## Facade Monitor Proxy + +| Contract | Address | +| --------------------- | -------------------------------------------------------------------------------------------------------------------- | +| FacadeMonitor (Proxy) | [0xCbBa7E1F29F31d6C83C3814b0E5d0687EC7Df177](https://arbiscan.io/address/0xCbBa7E1F29F31d6C83C3814b0E5d0687EC7Df177) | diff --git a/docs/deployed-addresses/8453-FacadeMonitor.md b/docs/deployed-addresses/8453-FacadeMonitor.md index 4cba0e181a..8c877d6cc4 100644 --- a/docs/deployed-addresses/8453-FacadeMonitor.md +++ b/docs/deployed-addresses/8453-FacadeMonitor.md @@ -1,4 +1,3 @@ -8453-FacadeMonitor.md # FacadeMonitor (Base) ## Facade Monitor Proxy From a4141838f7165ac22b0619ec24596f90a357ddd4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 30 May 2024 13:59:29 -0400 Subject: [PATCH 383/450] 3.4.0 spell (#1134) Co-authored-by: Patrick McKelvy Co-authored-by: Julian M. Rodriguez <56316686+julianmrodri@users.noreply.github.com> --- .env.example | 6 +- .gitignore | 3 + ...t Security - Reserve Audit 3.4.0 Spell.pdf | Bin 0 -> 537688 bytes common/configuration.ts | 8 +- common/constants.ts | 2 + contracts/interfaces/IBasketHandler.sol | 14 + contracts/interfaces/IDeployer.sol | 9 + contracts/spells/3_4_0.sol | 526 ++++++++++++++++++ .../addresses/1-tmp-assets-collateral.json | 8 +- scripts/verification/6_verify_collateral.ts | 44 +- scripts/whalesConfig.ts | 12 +- .../deployment/deploy-governor-anastasius.ts | 46 +- tasks/deployment/deploy-spell.ts | 58 ++ tasks/deployment/deploy-timelock.ts | 44 ++ tasks/index.ts | 3 + tasks/validation/.DS_Store | Bin 0 -> 6148 bytes tasks/validation/mint-tokens.ts | 13 +- tasks/validation/proposal-validator.ts | 178 ++++-- tasks/validation/proposals/3_4_0.ts | 154 ++--- ...8432860995231621586111571059800714939.json | 14 - ...8997429824418248202790423910218544052.json | 85 --- tasks/validation/spells/3.4.0.ts | 129 +++++ tasks/validation/utils/constants.ts | 67 +++ tasks/validation/utils/governance.ts | 49 +- tasks/validation/utils/logs.ts | 26 + tasks/validation/utils/oracles.ts | 51 +- tasks/validation/utils/rewards.ts | 36 +- tasks/validation/utils/trades.ts | 296 ++++++---- tasks/validation/whales/whales_1.json | 8 +- tasks/validation/whales/whales_8453.json | 18 +- utils/chain.ts | 4 +- utils/env.ts | 4 +- utils/fork.ts | 15 + utils/subgraph.ts | 14 +- 34 files changed, 1481 insertions(+), 463 deletions(-) create mode 100644 audits/Trust Security - Reserve Audit 3.4.0 Spell.pdf create mode 100644 contracts/spells/3_4_0.sol create mode 100644 tasks/deployment/deploy-spell.ts create mode 100644 tasks/deployment/deploy-timelock.ts create mode 100644 tasks/validation/.DS_Store delete mode 100644 tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json delete mode 100644 tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json create mode 100644 tasks/validation/spells/3.4.0.ts diff --git a/.env.example b/.env.example index d5831f5fbf..7494bfa935 100644 --- a/.env.example +++ b/.env.example @@ -52,8 +52,10 @@ PROTO_IMPL=0 # Run gas reporter and specific gas tests, if truthy # REPORT_GAS=1 -# Subgraph url to make queries to The Graph -# SUBGRAPH_URL= +# Subgraph URLs to make queries to The Graph (by network) +# MAINNET_SUBGRAPH_URL= +# BASE_SUBGRAPH_URL= +# ARBITRUM_SUBGRAPH_URL= # RPC URL to interact with a tenderly forked network # TENDERLY_RPC_URL="https://rpc.tenderly.co/fork/15af2920-4719-4e62-a5ea-ab8b9e90a258" diff --git a/.gitignore b/.gitignore index 8751aabb75..94776f6d6f 100644 --- a/.gitignore +++ b/.gitignore @@ -34,6 +34,9 @@ scripts/addresses/31337* scripts/test.ts scripts/playground.ts +# Serialized proposals +tasks/validation/proposals/proposal-*.json + # tenderly deployment/verification artifacts deployments/ backtests/ diff --git a/audits/Trust Security - Reserve Audit 3.4.0 Spell.pdf b/audits/Trust Security - Reserve Audit 3.4.0 Spell.pdf new file mode 100644 index 0000000000000000000000000000000000000000..7e4b8188c5b085653e6940190952f2270a6bbf7d GIT binary patch literal 537688 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%0D#e-W}=!{f3wFET}a+hqgTm&3ai5 zX1Z1@?9&#WV?5?KgN~}F-Hg=d>PNacn14iNEs5Z&9ZqCJ1|fc1g&#cju6$-I4Mp5+ zH>C-0mWN)Ko0M%ak4ut3+=l%8xlC$cm=rqqV62rmQx%w-80n-F(VvsfXnFIykF=JS z)C-~S1mPrLT>6jNM#RBA-CIu_*NEReH8*go0zYs^svdyF(9T6Y%LvcvA-ZUuwh}P; zUPFyP3mi(4TGsll^nc^e$p%Fu+nJIe7W-UU8>*ei>d(zn*2K2YFk)dF@CVhhK#-J z_jM6k=J;8CTB#(CJe@f#+QO}`F~*&O1>u7C!M(-2V($`sTxh@`OuYY8M^axb@q^V*a z3%NZ$wL!K2lYfFmQY2j~ecjWg5NvDxnp(OPD~=dB?-=Fva2 zn9EifPo7aRhma*#an20KoCPGgumi-hlZj}!bbN0A^fYI6yG8%z-7#T)i`T`|cZhvLQ+jBEgwdLXliNard06H*YUSD8 z#>BHRj%5t?7uVV|s*vm6&uIFiO{?;aC6(>@0|x!Ee>=D*v800W)ONB?P%4#Pi-fW z`W8R@`?kLe$1IRH{Qkbr?cT~i_I>`1t>piH7l@OK6Z(I=3-r%>$@^*HNkx3<5(bR1 ztEyWadGGP$vSP2GJ*G$ZJCJ2*Qg|`;f{tVf-WdP9`pEY7!8RHn+RU=_Xrg1h#m$+5 z)F!n&I^!m{S}Z}lwQejy`1AfTLf{&dal>>hX+cHgQ2I^M!tU({Gl*PvT zbmQ0!zi1A*N*YBeAP;5#RrF{-I3+aJ^ldqZ+*p?$ah`>dN4!chQja(QuI7e~9uv{g zo5bb^oWv_zT)HvkK=8@vY4Wz0`G^@614eX-^T<0rIaFuuIYa>P^S({;=y*4gNo);8 zw}q5NU^hDe;u@x?%qroi66ftx8>Ok}2)3iUNLfr6S8>P{AvOA4i&DMJZ*t31-~6CLc=r^g6+_z$;u8pSM@ zf;YlOn{fw;^In;VFkikIZGLDm(IRd!C*dSzG4}@eOX&dqbl-TOf4`Sk5;Nj3nOUWA zZ{IYoZdB^q5@A)c^Jh6+yQ(l~rKq|E!XSb3{dyerWZ(7x7XtO<`OgFIokS0YzP^d2 zJ9Bb;ef?v3P)sgHS|F%;YmizlX4C6v`Q{AKo8U-Fz~Vc}@Pdw)*mU7!3cP|rM{L(tx;p%+&ZN0^eJ!dtXxz+lXH`wQnVHo$)npY zC4QZUa+DSo*kfkINvW)tDyuRv1F4|C?sbPwd=whR=6h-VxW<8fCE|D%2+FhFI1W@n z5I<>a6V&>L;>ocR)%sNQbGyZIC>E;m6Al5XENm4}>|9w3twwx~IsNB|2r@C>t2Boy zNp!?mm-A#Lb#jbK@*b@t=q0OnRuf0X^yF0|K2~Hp(n0T@KInT47f(0gCw+omf+1Z6 zDa0ynIa8jU8Yg=XnTgT5(&}p<97oKB1V5}VxBiLtBzZ5axbaLmgmCOZDr6>2+fl@{ znt2;VA(;%Nr1q?qhs=I-{mG6BGpyJF`xCruj8S1V@_Md4>W?;=n4EHFWaE@}Y+6Ok zuE`n7f_7eZ%G_Wvn{fCfdDS~{dsgM{8IH(2{duw>FB=RyXz9RYU9Q~8{XP#`zh1pcIC(ksVZCdLrIzs8-c zEP)P&KVG8)9bEIRhk)6#zWZ|>37l%l<6hzHq?4LmiEI$b<3^Hv&>5hK;;I?#$a|Zt z*~c0j29Bdsl2orsR-@Ks$qRmp{pEr2)tNaVdS0*rzL7=#3|kD9%VPpSbQSUdS+=N6!4ohhQ6inWPL+n51nD4qOo4g5z9Dd9(#@{x^ zD37KK5`!Jon@X@gK+i?ZjXEfqRLmik!F}>*Tel1qPl3YO;`N91-N{I_{Ky(eTim

    I&<4Ivk9=)g6x1ok@2i3sKLv4sJxtJbv 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

    p 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

    HhCK*akTjOy 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 Ckj0B62 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�VHB1bC>9x=IuA4^VD8DF4W4pZ1n1CU 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

    oRg9;V*!9MjW-h&#VizwoX66|@*g(c@ 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 literal 0 HcmV?d00001 From 915c14f2bdefb3a48af95495da3e96f89b1cfcbd Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 10 Jun 2024 16:04:14 -0400 Subject: [PATCH 388/450] filename change --- ...ied - Audit Report - Reserve Protocol 3.4.0.pdf} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename audits/{Audit Report - Reserve Protocol 3.4.0.pdf => Solidified - Audit Report - Reserve Protocol 3.4.0.pdf} (100%) diff --git a/audits/Audit Report - Reserve Protocol 3.4.0.pdf b/audits/Solidified - Audit Report - Reserve Protocol 3.4.0.pdf similarity index 100% rename from audits/Audit Report - Reserve Protocol 3.4.0.pdf rename to audits/Solidified - Audit Report - Reserve Protocol 3.4.0.pdf From d2f8627aebc611d7c2d78df6e83de958d35a2917 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 12 Jun 2024 21:01:24 +0530 Subject: [PATCH 389/450] Registries Setup (#1140) Co-authored-by: Julian R Co-authored-by: Taylor Brent Co-authored-by: Julian M. Rodriguez <56316686+julianmrodri@users.noreply.github.com> --- .github/workflows/tests.yml | 20 +- .prettierrc | 2 +- CHANGELOG.md | 16 + common/numbers.ts | 2 +- contracts/facade/FacadeWrite.sol | 9 +- contracts/facade/facets/ActFacet.sol | 10 +- contracts/facade/facets/ReadFacet.sol | 8 +- contracts/interfaces/IAssetRegistry.sol | 3 + contracts/interfaces/IBroker.sol | 6 + contracts/interfaces/IDeployer.sol | 11 +- contracts/interfaces/IDistributor.sol | 10 +- contracts/interfaces/IMain.sol | 15 + contracts/mocks/AssetPluginRegistryMock.sol | 8 + contracts/mocks/DeployerMock.sol | 25 + contracts/p0/AssetRegistry.sol | 2 + contracts/p0/Deployer.sol | 3 + contracts/p0/Distributor.sol | 38 +- contracts/p0/Main.sol | 12 + contracts/p1/AssetRegistry.sol | 34 +- contracts/p1/Broker.sol | 26 +- contracts/p1/Deployer.sol | 39 +- contracts/p1/Distributor.sol | 95 +- contracts/p1/Main.sol | 104 +- contracts/p1/mixins/Component.sol | 7 +- contracts/plugins/assets/Asset.sol | 2 +- .../plugins/assets/ERC4626FiatCollateral.sol | 7 +- contracts/plugins/assets/OracleLib.sol | 2 +- contracts/plugins/assets/VersionedAsset.sol | 2 +- .../assets/aave-v3/AaveV3FiatCollateral.sol | 2 +- .../assets/aave/ATokenFiatCollateral.sol | 2 +- .../compoundv2/CTokenFiatCollateral.sol | 2 +- .../CTokenSelfReferentialCollateral.sol | 2 +- .../assets/compoundv3/CTokenV3Collateral.sol | 7 +- .../assets/curve/CurveStableCollateral.sol | 4 +- .../curve/CurveStableMetapoolCollateral.sol | 11 +- contracts/plugins/assets/curve/PoolTokens.sol | 4 +- .../plugins/assets/dsr/SDaiCollateral.sol | 2 +- .../morpho-aave/MorphoFiatCollateral.sol | 5 +- .../MorphoSelfReferentialCollateral.sol | 4 +- .../mocks/AppreciatingMockDecimals.sol | 75 ++ .../AppreciatingMockDecimalsCollateral.sol | 34 + .../plugins/mocks/upgrades/DeployerV2.sol | 24 + contracts/plugins/trading/DutchTrade.sol | 2 +- contracts/plugins/trading/GnosisTrade.sol | 17 +- contracts/registry/AssetPluginRegistry.sol | 94 ++ contracts/registry/DAOFeeRegistry.sol | 72 ++ contracts/registry/VersionRegistry.sol | 79 ++ contracts/spells/3_4_0.sol | 41 +- test/Broker.test.ts | 82 +- test/Facade.test.ts | 41 +- test/FacadeWrite.test.ts | 4 +- test/Main.test.ts | 10 +- test/RTokenExtremes.test.ts | 19 +- test/Recollateralization.test.ts | 27 +- test/Revenues.test.ts | 509 +++++---- test/Upgradeability.test.ts | 1011 +++++++++++------ test/ZTradingExtremes.test.ts | 214 +++- test/fixtures.ts | 4 +- test/integration/EasyAuction.test.ts | 6 +- test/integration/UpgradeToR4.test.ts | 187 +++ .../UpgradeToR4WithRegistries.test.ts | 271 +++++ test/integration/fixtures.ts | 4 +- test/integration/fork-block-numbers.ts | 1 + test/plugins/RewardableERC20.test.ts | 2 +- .../aave/ATokenFiatCollateral.test.ts | 4 +- .../individual-collateral/cbeth/constants.ts | 2 +- .../individual-collateral/collateralTests.ts | 56 +- .../compoundv2/CTokenFiatCollateral.test.ts | 4 +- .../curve/collateralTests.ts | 78 +- .../stargate/constants.ts | 2 +- test/registries/AssetPluginRegistry.test.ts | 402 +++++++ test/registries/DAOFeeRegistry.test.ts | 217 ++++ test/registries/VersionRegistry.test.ts | 134 +++ test/scenario/ComplexBasket.test.ts | 41 +- test/scenario/NestedRTokens.test.ts | 20 +- test/utils/matchers.ts | 4 +- 76 files changed, 3479 insertions(+), 878 deletions(-) create mode 100644 contracts/mocks/AssetPluginRegistryMock.sol create mode 100644 contracts/mocks/DeployerMock.sol create mode 100644 contracts/plugins/mocks/AppreciatingMockDecimals.sol create mode 100644 contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol create mode 100644 contracts/plugins/mocks/upgrades/DeployerV2.sol create mode 100644 contracts/registry/AssetPluginRegistry.sol create mode 100644 contracts/registry/DAOFeeRegistry.sol create mode 100644 contracts/registry/VersionRegistry.sol create mode 100644 test/integration/UpgradeToR4.test.ts create mode 100644 test/integration/UpgradeToR4WithRegistries.test.ts create mode 100644 test/registries/AssetPluginRegistry.test.ts create mode 100644 test/registries/DAOFeeRegistry.test.ts create mode 100644 test/registries/VersionRegistry.test.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cb4093c2fb..92dc1ec4b4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: hardhat-network-fork- - run: yarn hardhat test ./test/plugins/individual-collateral/[A-Ca-c]*/*.test.ts ./test/plugins/individual-collateral/[A-Ca-c]*/*/*.test.ts env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet @@ -103,7 +103,7 @@ jobs: hardhat-network-fork- - run: yarn hardhat test ./test/plugins/individual-collateral/[D-Zd-z]*/*.test.ts env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet @@ -130,7 +130,7 @@ jobs: hardhat-network-fork- - run: npx hardhat test ./test/plugins/individual-collateral/{cbeth,aave-v3,compoundv3,stargate,lido}/*.test.ts env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true BASE_RPC_URL: https://base-mainnet.infura.io/v3/${{ secrets.INFURA_BASE_KEY }} FORK_NETWORK: base @@ -158,7 +158,7 @@ jobs: hardhat-network-fork- - run: npx hardhat test ./test/plugins/individual-collateral/{aave-v3,compoundv3,curve/cvx}/*.test.ts env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true ARBITRUM_RPC_URL: https://arb-mainnet.g.alchemy.com/v2/${{ secrets.ALCHEMY_ARBITRUM_KEY }} FORK_NETWORK: arbitrum @@ -178,7 +178,7 @@ jobs: - run: yarn install --immutable - run: yarn test:p0 env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' p1-tests: name: 'P1 Tests' @@ -192,7 +192,7 @@ jobs: - run: yarn install --immutable - run: yarn test:p1 env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' scenario-tests: name: 'Scenario Tests' @@ -206,7 +206,7 @@ jobs: - run: yarn install --immutable - run: yarn test:scenario env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' extreme-tests: name: 'Extreme Tests' @@ -229,7 +229,7 @@ jobs: hardhat-network-fork- - run: yarn test:extreme:integration env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet @@ -256,7 +256,7 @@ jobs: - run: yarn install --immutable - run: yarn test:integration env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet @@ -281,7 +281,7 @@ jobs: hardhat-network-fork- - run: npx hardhat test ./test/monitor/*.test.ts env: - NODE_OPTIONS: '--max-old-space-size=8192' + NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} FORK_NETWORK: mainnet diff --git a/.prettierrc b/.prettierrc index a5e4e5f36f..c56b893975 100644 --- a/.prettierrc +++ b/.prettierrc @@ -22,4 +22,4 @@ } } ] -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bdac02699..a45c3e58dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,21 @@ # Changelog +# 4.0.0 + +TODO + +## Upgrade Steps + +TODO + +Make sure distributor table sums to >10000. + +## Core Protocol Contracts + +- `Distributor` + - Breaking change: Remove `setDistribution()` in favor of `setDistributions()` + - New Invariant: Table must sum to >=10000 for precision reasons + # 3.4.0 This release adds Arbitrum support by adjusting `Furnace`/`StRSR`/`Governance` to function off of timestamp/timepoints, instead of discrete periods. This changes the interface of the governance voting token StRSR, making this a complicated and nuanced upgrade to get right. diff --git a/common/numbers.ts b/common/numbers.ts index d49a2a6606..487620b66b 100644 --- a/common/numbers.ts +++ b/common/numbers.ts @@ -14,7 +14,7 @@ export const pow10 = (exponent: BigNumberish): BigNumber => { } // Convert `x` to a new BigNumber with decimals = `decimals`. -// Input should have SCALE_DECIMALS (18) decimal places, and `decimals` should be less than 18. +// Input should have SCALE_DECIMALS (18) decimal places. export const toBNDecimals = (x: BigNumberish, decimals: number): BigNumber => { return decimals < SCALE_DECIMALS ? BigNumber.from(x).div(pow10(SCALE_DECIMALS - decimals)) diff --git a/contracts/facade/FacadeWrite.sol b/contracts/facade/FacadeWrite.sol index d76438467b..0f9b3fbcc5 100644 --- a/contracts/facade/FacadeWrite.sol +++ b/contracts/facade/FacadeWrite.sol @@ -104,12 +104,13 @@ contract FacadeWrite is IFacadeWrite { } // Setup revshare beneficiaries + address[] memory beneficiaries = new address[](setup.beneficiaries.length); + RevenueShare[] memory shares = new RevenueShare[](setup.beneficiaries.length); for (uint256 i = 0; i < setup.beneficiaries.length; ++i) { - main.distributor().setDistribution( - setup.beneficiaries[i].beneficiary, - setup.beneficiaries[i].revShare - ); + beneficiaries[i] = setup.beneficiaries[i].beneficiary; + shares[i] = setup.beneficiaries[i].revShare; } + main.distributor().setDistributions(beneficiaries, shares); // Pause until setupGovernance main.grantRole(PAUSER, address(this)); diff --git a/contracts/facade/facets/ActFacet.sol b/contracts/facade/facets/ActFacet.sol index 7294859c2e..ea5cccf37f 100644 --- a/contracts/facade/facets/ActFacet.sol +++ b/contracts/facade/facets/ActFacet.sol @@ -12,7 +12,7 @@ import "../../interfaces/IBackingManager.sol"; * @title ActFacet * @notice * Facet to help batch compound actions that cannot be done from an EOA, solely. - * Compatible with both 2.1.0 and ^3.0.0 RTokens. + * Compatible with 2.1.0, ^3.0.0, and ^4.0.0 RTokens. * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start @@ -214,7 +214,7 @@ contract ActFacet is Multicall { function _settleTrade(ITrading trader, IERC20 toSettle) private { bytes1 majorVersion = bytes(trader.version())[0]; - if (majorVersion == bytes1("3")) { + if (majorVersion == bytes1("3") || majorVersion == bytes1("4")) { // Settle auctions trader.settleTrade(toSettle); } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { @@ -227,7 +227,7 @@ contract ActFacet is Multicall { function _forwardRevenue(IBackingManager bm, IERC20[] memory toStart) private { bytes1 majorVersion = bytes(bm.version())[0]; // Need to use try-catch here in order to still show revenueOverview when basket not ready - if (majorVersion == bytes1("3")) { + if (majorVersion == bytes1("3") || majorVersion == bytes1("4")) { // solhint-disable-next-line no-empty-blocks try bm.forwardRevenue(toStart) {} catch {} } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { @@ -248,7 +248,7 @@ contract ActFacet is Multicall { ) private { bytes1 majorVersion = bytes(revenueTrader.version())[0]; - if (majorVersion == bytes1("3")) { + if (majorVersion == bytes1("3") || majorVersion == bytes1("4")) { revenueTrader.manageTokens(toStart, kinds); } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { for (uint256 i = 0; i < toStart.length; ++i) { @@ -264,7 +264,7 @@ contract ActFacet is Multicall { function _rebalance(IBackingManager bm, TradeKind kind) private { bytes1 majorVersion = bytes(bm.version())[0]; - if (majorVersion == bytes1("3")) { + if (majorVersion == bytes1("3") || majorVersion == bytes1("4")) { // solhint-disable-next-line no-empty-blocks try bm.rebalance(kind) {} catch {} } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index 9924807e8f..f83cb5ed68 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -69,7 +69,9 @@ contract ReadFacet { uint192 mid = (low + high) / 2; // {UoA} = {tok} * {UoA/Tok} - depositsUoA[i] = shiftl_toFix(deposits[i], -int8(asset.erc20Decimals())).mul(mid); + depositsUoA[i] = shiftl_toFix(deposits[i], -int8(asset.erc20Decimals()), FLOOR).mul( + mid + ); } } @@ -195,7 +197,7 @@ contract ReadFacet { uint192 avg = (low + high) / 2; // {UoA/tok} // {UoA} = {qTok} * {tok/qTok} * {UoA/tok} - uoaAmts[i] = shiftl_toFix(deposits[i], -decimals).mul(avg); + uoaAmts[i] = shiftl_toFix(deposits[i], -decimals, FLOOR).mul(avg); uoaSum += uoaAmts[i]; } @@ -346,7 +348,7 @@ contract ReadFacet { IAsset asset = reg.toAsset(IERC20(basketERC20s[i])); // {tok} - uint192 needed = shiftl_toFix(quantities[i], -int8(asset.erc20Decimals())); + uint192 needed = shiftl_toFix(quantities[i], -int8(asset.erc20Decimals()), CEIL); // {UoA/tok} (uint192 low, uint192 high) = asset.price(); diff --git a/contracts/interfaces/IAssetRegistry.sol b/contracts/interfaces/IAssetRegistry.sol index add18d69b5..9a29b0b842 100644 --- a/contracts/interfaces/IAssetRegistry.sol +++ b/contracts/interfaces/IAssetRegistry.sol @@ -71,6 +71,9 @@ interface IAssetRegistry is IComponent { /// @return reg The list of registered ERC20s and Assets, in the same order function getRegistry() external view returns (Registry memory reg); + /// Validate that the current assets in the registry are compatible with the current version + function validateCurrentAssets() external view; + /// @return The number of registered ERC20s function size() external view returns (uint256); } diff --git a/contracts/interfaces/IBroker.sol b/contracts/interfaces/IBroker.sol index f1049ac5c7..369d47ac18 100644 --- a/contracts/interfaces/IBroker.sol +++ b/contracts/interfaces/IBroker.sol @@ -69,6 +69,12 @@ interface IBroker is IComponent { function dutchTradeDisabled(IERC20Metadata erc20) external view returns (bool); } +interface IExtendedBroker is IBroker { + function setBatchTradeImplementation(ITrade newTradeImplementation) external; + + function setDutchTradeImplementation(ITrade newTradeImplementation) external; +} + interface TestIBroker is IBroker { function gnosis() external view returns (IGnosis); diff --git a/contracts/interfaces/IDeployer.sol b/contracts/interfaces/IDeployer.sol index f8732a30bc..0a1e1ff6b5 100644 --- a/contracts/interfaces/IDeployer.sol +++ b/contracts/interfaces/IDeployer.sol @@ -111,6 +111,8 @@ interface IDeployer is IVersioned { /// Deploys a new RTokenAsset instance. Not needed during normal deployment flow /// @param maxTradeVolume {UoA} The maximum trade volume for the RTokenAsset function deployRTokenAsset(IRToken rToken, uint192 maxTradeVolume) external returns (IAsset); + + function implementations() external view returns (Implementations memory); } interface TestIDeployer is IDeployer { @@ -124,12 +126,5 @@ interface TestIDeployer is IDeployer { function rsrAsset() external view returns (IAsset); - function implementations() - external - view - returns ( - IMain, - Components memory, - TradePlugins memory - ); + function implementations() external view returns (Implementations memory); } diff --git a/contracts/interfaces/IDistributor.sol b/contracts/interfaces/IDistributor.sol index 5f5c76c5a2..2a8e751183 100644 --- a/contracts/interfaces/IDistributor.sol +++ b/contracts/interfaces/IDistributor.sol @@ -7,6 +7,9 @@ import "./IComponent.sol"; uint256 constant MAX_DISTRIBUTION = 1e4; // 10,000 uint8 constant MAX_DESTINATIONS = 100; // maximum number of RevenueShare destinations +// === 4.0.0 === +// Invariant: sum across destinations must be at *least* MAX_DISTRIBUTION + struct RevenueShare { uint16 rTokenDist; // {revShare} A value between [0, 10,000] uint16 rsrDist; // {revShare} A value between [0, 10,000] @@ -37,10 +40,13 @@ interface IDistributor is IComponent { event RevenueDistributed(IERC20 indexed erc20, address indexed source, uint256 amount); // Initialization - function init(IMain main_, RevenueShare memory dist) external; + function init(IMain main_, RevenueShare calldata dist) external; + + /// @custom:governance + function setDistribution(address dest, RevenueShare calldata share) external; /// @custom:governance - function setDistribution(address dest, RevenueShare memory share) external; + function setDistributions(address[] calldata dest, RevenueShare[] calldata share) external; /// Distribute the `erc20` token across all revenue destinations /// Only callable by RevenueTraders diff --git a/contracts/interfaces/IMain.sol b/contracts/interfaces/IMain.sol index dcb6ce910a..3c87331391 100644 --- a/contracts/interfaces/IMain.sol +++ b/contracts/interfaces/IMain.sol @@ -3,6 +3,9 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts-upgradeable/access/IAccessControlUpgradeable.sol"; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; +import "../registry/AssetPluginRegistry.sol"; +import "../registry/VersionRegistry.sol"; +import "../registry/DAOFeeRegistry.sol"; import "./IAssetRegistry.sol"; import "./IBasketHandler.sol"; import "./IBackingManager.sol"; @@ -174,9 +177,21 @@ interface IMain is IVersioned, IAuth, IComponentRegistry { ) external; function rsr() external view returns (IERC20); + + function assetPluginRegistry() external view returns (AssetPluginRegistry); + + function versionRegistry() external view returns (VersionRegistry); + + function daoFeeRegistry() external view returns (DAOFeeRegistry); } interface TestIMain is IMain { + function setVersionRegistry(VersionRegistry) external; + + function setAssetPluginRegistry(AssetPluginRegistry) external; + + function setDAOFeeRegistry(DAOFeeRegistry) external; + /// @custom:governance function setShortFreeze(uint48) external; diff --git a/contracts/mocks/AssetPluginRegistryMock.sol b/contracts/mocks/AssetPluginRegistryMock.sol new file mode 100644 index 0000000000..14aede2c95 --- /dev/null +++ b/contracts/mocks/AssetPluginRegistryMock.sol @@ -0,0 +1,8 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +contract AssetPluginRegistryMock { + function isValidAsset(bytes32, address) public view returns (bool) { + return true; + } +} diff --git a/contracts/mocks/DeployerMock.sol b/contracts/mocks/DeployerMock.sol new file mode 100644 index 0000000000..e8beb8b07c --- /dev/null +++ b/contracts/mocks/DeployerMock.sol @@ -0,0 +1,25 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../mixins/Versioned.sol"; +import "../interfaces/IDeployer.sol"; +import "../interfaces/IMain.sol"; + +contract DeployerMock is Versioned { + // Implementation contracts - mock + Implementations private _implementations; + + constructor() { + _implementations.main = IMain(address(1)); // used in test + } + + function implementations() external view returns (Implementations memory) { + return _implementations; + } +} + +contract DeployerMockV2 is DeployerMock { + function version() public pure virtual override returns (string memory) { + return "V2"; + } +} diff --git a/contracts/p0/AssetRegistry.sol b/contracts/p0/AssetRegistry.sol index ebdf5fd8b1..ad4239cd84 100644 --- a/contracts/p0/AssetRegistry.sol +++ b/contracts/p0/AssetRegistry.sol @@ -125,6 +125,8 @@ contract AssetRegistryP0 is ComponentP0, IAssetRegistry { assert(reg.erc20s.length == reg.assets.length); } + function validateCurrentAssets() external view {} + /// @return The number of registered ERC20s function size() external view returns (uint256) { return _erc20s.length(); diff --git a/contracts/p0/Deployer.sol b/contracts/p0/Deployer.sol index b44e11a94d..e26569974a 100644 --- a/contracts/p0/Deployer.sol +++ b/contracts/p0/Deployer.sol @@ -170,4 +170,7 @@ contract DeployerP0 is IDeployer, Versioned { rTokenAsset = new RTokenAsset(rToken, maxTradeVolume); emit RTokenAssetCreated(rToken, rTokenAsset); } + + /// @dev Just to make solc happy. + function implementations() external view returns (Implementations memory) {} } diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 264d7bfe7e..5e4fd609e2 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -25,7 +25,8 @@ contract DistributorP0 is ComponentP0, IDistributor { function init(IMain main_, RevenueShare memory dist) public initializer { __Component_init(main_); - _ensureNonZeroDistribution(dist.rTokenDist, dist.rsrDist); + + _ensureSufficientTotal(dist.rTokenDist, dist.rsrDist); _setDistribution(FURNACE, RevenueShare(dist.rTokenDist, 0)); _setDistribution(ST_RSR, RevenueShare(0, dist.rsrDist)); } @@ -40,7 +41,33 @@ contract DistributorP0 is ComponentP0, IDistributor { _setDistribution(dest, share); RevenueTotals memory revTotals = totals(); - _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); + _ensureSufficientTotal(revTotals.rTokenTotal, revTotals.rsrTotal); + } + + /// Set RevenueShares for destinations. Destinations `FURNACE` and `ST_RSR` refer to + /// main.furnace() and main.stRSR(). + /// @custom:governance + // checks: invariants hold in post-state + // effects: + // destinations' = dests + // distribution' = shares + function setDistributions(address[] calldata dests, RevenueShare[] calldata shares) + external + governance + { + require(dests.length == shares.length, "array length mismatch"); + + // solhint-disable-next-line no-empty-blocks + try main.rsrTrader().distributeTokenToBuy() {} catch {} + // solhint-disable-next-line no-empty-blocks + try main.rTokenTrader().distributeTokenToBuy() {} catch {} + + for (uint256 i = 0; i < dests.length; ++i) { + _setDistribution(dests[i], shares[i]); + } + + RevenueTotals memory revTotals = totals(); + _ensureSufficientTotal(revTotals.rTokenTotal, revTotals.rsrTotal); } /// Distribute revenue, in rsr or rtoken, per the distribution table. @@ -118,6 +145,7 @@ contract DistributorP0 is ComponentP0, IDistributor { dest != address(main.furnace()) && dest != address(main.stRSR()), "destination can not be furnace or strsr directly" ); + require(dest != address(main.daoFeeRegistry()), "destination cannot be daoFeeRegistry"); if (dest == FURNACE) require(share.rsrDist == 0, "Furnace must get 0% of RSR"); if (dest == ST_RSR) require(share.rTokenDist == 0, "StRSR must get 0% of RToken"); require(share.rsrDist <= MAX_DISTRIBUTION, "RSR distribution too high"); @@ -134,8 +162,8 @@ contract DistributorP0 is ComponentP0, IDistributor { emit DistributionSet(dest, share.rTokenDist, share.rsrDist); } - /// Ensures distribution values are non-zero - function _ensureNonZeroDistribution(uint24 rTokenDist, uint24 rsrDist) internal pure { - require(rTokenDist > 0 || rsrDist > 0, "no distribution defined"); + /// Ensures distribution values are large enough + function _ensureSufficientTotal(uint24 rTokenTotal, uint24 rsrTotal) internal pure { + require(rTokenTotal + rsrTotal >= MAX_DISTRIBUTION, "totals too low"); } } diff --git a/contracts/p0/Main.sol b/contracts/p0/Main.sol index 95dd973b56..856df61362 100644 --- a/contracts/p0/Main.sol +++ b/contracts/p0/Main.sol @@ -47,4 +47,16 @@ contract MainP0 is Versioned, Initializable, Auth, ComponentRegistry, IMain { { return super.hasRole(role, account); } + + function assetPluginRegistry() external pure returns (AssetPluginRegistry) { + return AssetPluginRegistry(address(0)); + } + + function versionRegistry() external pure returns (VersionRegistry) { + return VersionRegistry(address(0)); + } + + function daoFeeRegistry() external pure returns (DAOFeeRegistry) { + return DAOFeeRegistry(address(0)); + } } diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 7854d27f5b..883c22cff2 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -156,7 +156,7 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { /// Returns keys(assets), values(assets) as (duplicate-free) lists. // returns: [keys(assets)], [values(assets)] without duplicates. /// @return reg The list of registered ERC20s and Assets, in the same order - function getRegistry() external view returns (Registry memory reg) { + function getRegistry() public view returns (Registry memory reg) { uint256 length = _erc20s.length(); reg.erc20s = new IERC20[](length); reg.assets = new IAsset[](length); @@ -166,6 +166,27 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { } } + /// @inheritdoc IAssetRegistry + function validateCurrentAssets() external view { + Registry memory registry = getRegistry(); + AssetPluginRegistry assetPluginRegistry = main.assetPluginRegistry(); + + if (address(assetPluginRegistry) != address(0)) { + uint256 assetLen = registry.assets.length; + for (uint256 i = 0; i < assetLen; ++i) { + IAsset asset = registry.assets[i]; + + require( + assetPluginRegistry.isValidAsset( + keccak256(abi.encodePacked(this.version())), + address(asset) + ), + "unsupported asset" + ); + } + } + } + /// @return The number of registered ERC20s function size() external view returns (uint256) { return _erc20s.length(); @@ -197,6 +218,17 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { ); } + AssetPluginRegistry assetPluginRegistry = main.assetPluginRegistry(); + if (address(assetPluginRegistry) != address(0)) { + require( + main.assetPluginRegistry().isValidAsset( + keccak256(abi.encodePacked(this.version())), + address(asset) + ), + "unsupported asset" + ); + } + IERC20Metadata erc20 = asset.erc20(); if (_erc20s.contains(address(erc20))) { if (assets[erc20] == asset) return false; diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 29b36e21df..099969a330 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -82,9 +82,23 @@ contract BrokerP1 is ComponentP1, IBroker { cacheComponents(); setGnosis(gnosis_); - setBatchTradeImplementation(batchTradeImplementation_); + + require( + address(batchTradeImplementation_) != address(0), + "invalid batchTradeImplementation address" + ); + require( + address(dutchTradeImplementation_) != address(0), + "invalid dutchTradeImplementation address" + ); + + batchTradeImplementation = batchTradeImplementation_; + dutchTradeImplementation = dutchTradeImplementation_; + + emit BatchTradeImplementationSet(ITrade(address(0)), batchTradeImplementation_); + emit DutchTradeImplementationSet(ITrade(address(0)), dutchTradeImplementation_); + setBatchAuctionLength(batchAuctionLength_); - setDutchTradeImplementation(dutchTradeImplementation_); setDutchAuctionLength(dutchAuctionLength_); } @@ -168,8 +182,8 @@ contract BrokerP1 is ComponentP1, IBroker { gnosis = newGnosis; } - /// @custom:governance - function setBatchTradeImplementation(ITrade newTradeImplementation) public governance { + /// @custom:main + function setBatchTradeImplementation(ITrade newTradeImplementation) public onlyMain { require( address(newTradeImplementation) != address(0), "invalid batchTradeImplementation address" @@ -190,8 +204,8 @@ contract BrokerP1 is ComponentP1, IBroker { batchAuctionLength = newAuctionLength; } - /// @custom:governance - function setDutchTradeImplementation(ITrade newTradeImplementation) public governance { + /// @custom:main + function setDutchTradeImplementation(ITrade newTradeImplementation) public onlyMain { require( address(newTradeImplementation) != address(0), "invalid dutchTradeImplementation address" diff --git a/contracts/p1/Deployer.sol b/contracts/p1/Deployer.sol index a962b2efe8..bf5608a52f 100644 --- a/contracts/p1/Deployer.sol +++ b/contracts/p1/Deployer.sol @@ -35,7 +35,7 @@ contract DeployerP1 is IDeployer, Versioned { IAsset public immutable rsrAsset; // Implementation contracts for Upgradeability - Implementations public implementations; + Implementations private _implementations; // checks: every address in the input is nonzero // effects: post, all contract-state values are set @@ -68,7 +68,11 @@ contract DeployerP1 is IDeployer, Versioned { rsr = rsr_; gnosis = gnosis_; rsrAsset = rsrAsset_; - implementations = implementations_; + _implementations = implementations_; + } + + function implementations() external view override returns (Implementations memory) { + return _implementations; } /// Deploys an instance of the entire system, oriented around some mandate. @@ -111,22 +115,22 @@ contract DeployerP1 is IDeployer, Versioned { // Main - Proxy MainP1 main = MainP1( - address(new ERC1967Proxy(address(implementations.main), new bytes(0))) + address(new ERC1967Proxy(address(_implementations.main), new bytes(0))) ); // Components - Proxies IRToken rToken = IRToken( - address(new ERC1967Proxy(address(implementations.components.rToken), new bytes(0))) + address(new ERC1967Proxy(address(_implementations.components.rToken), new bytes(0))) ); Components memory components = Components({ stRSR: IStRSR( - address(new ERC1967Proxy(address(implementations.components.stRSR), new bytes(0))) + address(new ERC1967Proxy(address(_implementations.components.stRSR), new bytes(0))) ), rToken: rToken, assetRegistry: IAssetRegistry( address( new ERC1967Proxy( - address(implementations.components.assetRegistry), + address(_implementations.components.assetRegistry), new bytes(0) ) ) @@ -134,7 +138,7 @@ contract DeployerP1 is IDeployer, Versioned { basketHandler: IBasketHandler( address( new ERC1967Proxy( - address(implementations.components.basketHandler), + address(_implementations.components.basketHandler), new bytes(0) ) ) @@ -142,31 +146,36 @@ contract DeployerP1 is IDeployer, Versioned { backingManager: IBackingManager( address( new ERC1967Proxy( - address(implementations.components.backingManager), + address(_implementations.components.backingManager), new bytes(0) ) ) ), distributor: IDistributor( address( - new ERC1967Proxy(address(implementations.components.distributor), new bytes(0)) + new ERC1967Proxy(address(_implementations.components.distributor), new bytes(0)) ) ), rsrTrader: IRevenueTrader( address( - new ERC1967Proxy(address(implementations.components.rsrTrader), new bytes(0)) + new ERC1967Proxy(address(_implementations.components.rsrTrader), new bytes(0)) ) ), rTokenTrader: IRevenueTrader( address( - new ERC1967Proxy(address(implementations.components.rTokenTrader), new bytes(0)) + new ERC1967Proxy( + address(_implementations.components.rTokenTrader), + new bytes(0) + ) ) ), furnace: IFurnace( - address(new ERC1967Proxy(address(implementations.components.furnace), new bytes(0))) + address( + new ERC1967Proxy(address(_implementations.components.furnace), new bytes(0)) + ) ), broker: IBroker( - address(new ERC1967Proxy(address(implementations.components.broker), new bytes(0))) + address(new ERC1967Proxy(address(_implementations.components.broker), new bytes(0))) ) }); @@ -203,9 +212,9 @@ contract DeployerP1 is IDeployer, Versioned { components.broker.init( main, gnosis, - implementations.trading.gnosisTrade, + _implementations.trading.gnosisTrade, params.batchAuctionLength, - implementations.trading.dutchTrade, + _implementations.trading.dutchTrade, params.dutchAuctionLength ); diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 75ec383c54..0a1900eb4e 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -24,6 +24,7 @@ contract DistributorP1 is ComponentP1, IDistributor { // distribution[ST_RSR].rTokenDist == 0 // distribution has no more than MAX_DESTINATIONS_ALLOWED key-value entries // all distribution-share values are <= MAX_DISTRIBUTION + // totals().rTokenTotal + totals().rsrTotal >= MAX_DISTRIBUTION // ==== destinations: // distribution[dest] != (0,0) if and only if dest in destinations @@ -44,7 +45,7 @@ contract DistributorP1 is ComponentP1, IDistributor { __Component_init(main_); cacheComponents(); - _ensureNonZeroDistribution(dist.rTokenDist, dist.rsrDist); + _ensureSufficientTotal(dist.rTokenDist, dist.rsrDist); _setDistribution(FURNACE, RevenueShare(dist.rTokenDist, 0)); _setDistribution(ST_RSR, RevenueShare(0, dist.rsrDist)); } @@ -56,15 +57,42 @@ contract DistributorP1 is ComponentP1, IDistributor { // effects: // destinations' = destinations.add(dest) // distribution' = distribution.set(dest, share) - function setDistribution(address dest, RevenueShare memory share) external governance { + function setDistribution(address dest, RevenueShare calldata share) external governance { // solhint-disable-next-line no-empty-blocks try main.rsrTrader().distributeTokenToBuy() {} catch {} // solhint-disable-next-line no-empty-blocks try main.rTokenTrader().distributeTokenToBuy() {} catch {} _setDistribution(dest, share); + + RevenueTotals memory revTotals = totals(); + _ensureSufficientTotal(revTotals.rTokenTotal, revTotals.rsrTotal); + } + + /// Set RevenueShares for destinations. Destinations `FURNACE` and `ST_RSR` refer to + /// main.furnace() and main.stRSR(). + /// @custom:governance + // checks: invariants hold in post-state + // effects: + // destinations' = dests + // distribution' = shares + function setDistributions(address[] calldata dests, RevenueShare[] calldata shares) + external + governance + { + require(dests.length == shares.length, "array length mismatch"); + + // solhint-disable-next-line no-empty-blocks + try main.rsrTrader().distributeTokenToBuy() {} catch {} + // solhint-disable-next-line no-empty-blocks + try main.rTokenTrader().distributeTokenToBuy() {} catch {} + + for (uint256 i = 0; i < dests.length; ++i) { + _setDistribution(dests[i], shares[i]); + } + RevenueTotals memory revTotals = totals(); - _ensureNonZeroDistribution(revTotals.rTokenTotal, revTotals.rsrTotal); + _ensureSufficientTotal(revTotals.rTokenTotal, revTotals.rsrTotal); } struct Transfer { @@ -94,24 +122,23 @@ contract DistributorP1 is ComponentP1, IDistributor { require(caller == rsrTrader || caller == rTokenTrader, "RevenueTraders only"); require(erc20 == rsr || erc20 == rToken, "RSR or RToken"); bool isRSR = erc20 == rsr; // if false: isRToken + uint256 tokensPerShare; + uint256 totalShares; { RevenueTotals memory revTotals = totals(); - uint256 totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; + totalShares = isRSR ? revTotals.rsrTotal : revTotals.rTokenTotal; if (totalShares != 0) tokensPerShare = amount / totalShares; require(tokensPerShare != 0, "nothing to distribute"); } - // Evenly distribute revenue tokens per distribution share. // This rounds "early", and that's deliberate! Transfer[] memory transfers = new Transfer[](destinations.length()); uint256 numTransfers; - address furnaceAddr = address(furnace); // gas-saver - address stRSRAddr = address(stRSR); // gas-saver - bool accountRewards = false; + uint256 paidOutShares; for (uint256 i = 0; i < destinations.length(); ++i) { address addrTo = destinations.at(i); @@ -121,12 +148,13 @@ contract DistributorP1 is ComponentP1, IDistributor { : distribution[addrTo].rTokenDist; if (numberOfShares == 0) continue; uint256 transferAmt = tokensPerShare * numberOfShares; + paidOutShares += numberOfShares; if (addrTo == FURNACE) { - addrTo = furnaceAddr; + addrTo = address(furnace); if (transferAmt != 0) accountRewards = true; } else if (addrTo == ST_RSR) { - addrTo = stRSRAddr; + addrTo = address(stRSR); if (transferAmt != 0) accountRewards = true; } @@ -137,8 +165,27 @@ contract DistributorP1 is ComponentP1, IDistributor { // == Interactions == for (uint256 i = 0; i < numTransfers; ++i) { - Transfer memory t = transfers[i]; - IERC20Upgradeable(address(erc20)).safeTransferFrom(caller, t.addrTo, t.amount); + IERC20Upgradeable(address(erc20)).safeTransferFrom( + caller, + transfers[i].addrTo, + transfers[i].amount + ); + } + + DAOFeeRegistry daoFeeRegistry = main.daoFeeRegistry(); + if (address(daoFeeRegistry) != address(0)) { + // DAO Fee + if (isRSR) { + (address recipient, , ) = main.daoFeeRegistry().getFeeDetails(address(rToken)); + + if (recipient != address(0) && tokensPerShare * (totalShares - paidOutShares) > 0) { + IERC20Upgradeable(address(erc20)).safeTransferFrom( + caller, + recipient, + tokensPerShare * (totalShares - paidOutShares) + ); + } + } } // Perform reward accounting @@ -160,6 +207,21 @@ contract DistributorP1 is ComponentP1, IDistributor { revTotals.rTokenTotal += share.rTokenDist; revTotals.rsrTotal += share.rsrDist; } + + DAOFeeRegistry daoFeeRegistry = main.daoFeeRegistry(); + if (address(daoFeeRegistry) != address(0)) { + // DAO Fee + (address feeRecipient, uint256 feeNumerator, uint256 feeDenominator) = main + .daoFeeRegistry() + .getFeeDetails(address(rToken)); + + if (feeRecipient != address(0) && feeNumerator != 0) { + revTotals.rsrTotal += uint24( + (feeNumerator * uint256(revTotals.rTokenTotal + revTotals.rsrTotal)) / + (feeDenominator - feeNumerator) + ); + } + } } // ==== Internal ==== @@ -179,6 +241,7 @@ contract DistributorP1 is ComponentP1, IDistributor { dest != address(furnace) && dest != address(stRSR), "destination can not be furnace or strsr directly" ); + require(dest != address(main.daoFeeRegistry()), "destination cannot be daoFeeRegistry"); if (dest == FURNACE) require(share.rsrDist == 0, "Furnace must get 0% of RSR"); if (dest == ST_RSR) require(share.rTokenDist == 0, "StRSR must get 0% of RToken"); require(share.rsrDist <= MAX_DISTRIBUTION, "RSR distribution too high"); @@ -195,10 +258,10 @@ contract DistributorP1 is ComponentP1, IDistributor { emit DistributionSet(dest, share.rTokenDist, share.rsrDist); } - /// Ensures distribution values are non-zero - // checks: at least one of its arguments is nonzero - function _ensureNonZeroDistribution(uint24 rTokenDist, uint24 rsrDist) internal pure { - require(rTokenDist != 0 || rsrDist != 0, "no distribution defined"); + /// Ensures distribution values are large enough + // checks: sum exceeds MAX_DISTRIBUTION + function _ensureSufficientTotal(uint24 rTokenTotal, uint24 rsrTotal) internal pure { + require(uint256(rTokenTotal) + uint256(rsrTotal) >= MAX_DISTRIBUTION, "totals too low"); } /// Call after upgrade to >= 3.0.0 diff --git a/contracts/p1/Main.sol b/contracts/p1/Main.sol index 21781ca082..b5749c80fe 100644 --- a/contracts/p1/Main.sol +++ b/contracts/p1/Main.sol @@ -9,6 +9,10 @@ import "../interfaces/IMain.sol"; import "../mixins/ComponentRegistry.sol"; import "../mixins/Auth.sol"; import "../mixins/Versioned.sol"; +import "../registry/VersionRegistry.sol"; +import "../registry/AssetPluginRegistry.sol"; +import "../registry/DAOFeeRegistry.sol"; +import "../interfaces/IBroker.sol"; /** * @title Main @@ -17,6 +21,9 @@ import "../mixins/Versioned.sol"; // solhint-disable max-states-count contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgradeable, IMain { IERC20 public rsr; + VersionRegistry public versionRegistry; + AssetPluginRegistry public assetPluginRegistry; + DAOFeeRegistry public daoFeeRegistry; /// @custom:oz-upgrades-unsafe-allow constructor // solhint-disable-next-line no-empty-blocks @@ -49,6 +56,33 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad stRSR.payoutRewards(); } + /// Set Version Registry + /// @dev Can only be called once. + function setVersionRegistry(VersionRegistry versionRegistry_) external onlyRole(OWNER) { + require(address(versionRegistry_) != address(0), "invalid registry address"); + require(address(versionRegistry) == address(0), "already set"); + + versionRegistry = VersionRegistry(versionRegistry_); + } + + /// Set Asset Plugin Registry + /// @dev Can only be called once. + function setAssetPluginRegistry(AssetPluginRegistry registry_) external onlyRole(OWNER) { + require(address(registry_) != address(0), "invalid registry address"); + require(address(assetPluginRegistry) == address(0), "already set"); + + assetPluginRegistry = AssetPluginRegistry(registry_); + } + + /// Set DAO Fee Registry + /// @dev Can only be called once. + function setDAOFeeRegistry(DAOFeeRegistry feeRegistry_) external onlyRole(OWNER) { + require(address(feeRegistry_) != address(0), "invalid registry address"); + require(address(daoFeeRegistry) == address(0), "already set"); + + daoFeeRegistry = DAOFeeRegistry(feeRegistry_); + } + function hasRole(bytes32 role, address account) public view @@ -58,14 +92,78 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad return super.hasRole(role, account); } + /** + * @dev When upgrading from a prior version to 4.0.0, + * this must happen in the Governance proposal. + */ + function upgradeMainTo(bytes32 versionHash) external onlyRole(OWNER) { + require(address(versionRegistry) != address(0), "no registry"); + require(!versionRegistry.isDeprecated(versionHash), "version deprecated"); + + Implementations memory implementation = versionRegistry.getImplementationForVersion( + versionHash + ); + + _upgradeProxy(address(this), address(implementation.main)); + } + + function upgradeRTokenTo( + bytes32 versionHash, + bool preValidation, + bool postValidation + ) external onlyRole(OWNER) { + require(address(versionRegistry) != address(0), "no registry"); + require(keccak256(abi.encodePacked(this.version())) == versionHash, "upgrade main first"); + + Implementations memory implementation = versionRegistry.getImplementationForVersion( + versionHash + ); + + if (preValidation) { + // Validate before the upgrade. + assetRegistry.validateCurrentAssets(); + } + + _upgradeProxy(address(rToken), address(implementation.components.rToken)); + _upgradeProxy(address(stRSR), address(implementation.components.stRSR)); + _upgradeProxy(address(assetRegistry), address(implementation.components.assetRegistry)); + _upgradeProxy(address(basketHandler), address(implementation.components.basketHandler)); + _upgradeProxy(address(backingManager), address(implementation.components.backingManager)); + _upgradeProxy(address(distributor), address(implementation.components.distributor)); + _upgradeProxy(address(furnace), address(implementation.components.furnace)); + _upgradeProxy(address(broker), address(implementation.components.broker)); + _upgradeProxy(address(rsrTrader), address(implementation.components.rsrTrader)); + _upgradeProxy(address(rTokenTrader), address(implementation.components.rTokenTrader)); + + if (postValidation) { + // ...then validate after the upgrade. + assetRegistry.validateCurrentAssets(); + } + + IExtendedBroker(address(broker)).setBatchTradeImplementation( + implementation.trading.gnosisTrade + ); + IExtendedBroker(address(broker)).setDutchTradeImplementation( + implementation.trading.dutchTrade + ); + } + // === Upgradeability === - // solhint-disable-next-line no-empty-blocks - function _authorizeUpgrade(address newImplementation) internal override onlyRole(OWNER) {} + function _authorizeUpgrade(address) internal view override { + require(msg.sender == address(this), "not self"); + } + + function _upgradeProxy(address proxy, address implementation) internal { + (bool success, ) = proxy.call( + abi.encodeWithSelector(UUPSUpgradeable.upgradeTo.selector, implementation) + ); + require(success, "upgrade failed"); + } /** * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps */ - uint256[49] private __gap; + uint256[46] private __gap; } diff --git a/contracts/p1/mixins/Component.sol b/contracts/p1/mixins/Component.sol index aac70ec217..9fc44c25d5 100644 --- a/contracts/p1/mixins/Component.sol +++ b/contracts/p1/mixins/Component.sol @@ -58,8 +58,13 @@ abstract contract ComponentP1 is _; } + modifier onlyMain() { + require(_msgSender() == address(main), "main only"); + _; + } + // solhint-disable-next-line no-empty-blocks - function _authorizeUpgrade(address newImplementation) internal view override governance {} + function _authorizeUpgrade(address newImplementation) internal view override onlyMain {} /** * @dev This empty reserved space is put in place to allow future versions to add new diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 2a59ebb594..b28cc1bf12 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -176,7 +176,7 @@ contract Asset is IAsset, VersionedAsset { /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view virtual returns (uint192) { - return shiftl_toFix(erc20.balanceOf(account), -int8(erc20Decimals)); + return shiftl_toFix(erc20.balanceOf(account), -int8(erc20Decimals), FLOOR); } /// @return If the asset is an instance of ICollateral or not diff --git a/contracts/plugins/assets/ERC4626FiatCollateral.sol b/contracts/plugins/assets/ERC4626FiatCollateral.sol index b2ce03a4e4..3c5b73c904 100644 --- a/contracts/plugins/assets/ERC4626FiatCollateral.sol +++ b/contracts/plugins/assets/ERC4626FiatCollateral.sol @@ -8,7 +8,7 @@ import { OracleLib } from "./OracleLib.sol"; import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import { IERC4626 } from "@openzeppelin/contracts/token/ERC20/extensions/ERC4626.sol"; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; -import { shiftl_toFix } from "../../libraries/Fixed.sol"; +import { FLOOR, shiftl_toFix } from "../../libraries/Fixed.sol"; /** * @title ERC4626FiatCollateral @@ -33,7 +33,8 @@ contract ERC4626FiatCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { - // already accounts for fees to be taken out - return shiftl_toFix(IERC4626(address(erc20)).convertToAssets(oneShare), -refDecimals); + // already accounts for fees to be taken out -- FLOOR + return + shiftl_toFix(IERC4626(address(erc20)).convertToAssets(oneShare), -refDecimals, FLOOR); } } diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index 06df2abbfb..7e51b9b7be 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -39,7 +39,7 @@ library OracleLib { if (p <= 0) revert InvalidPrice(); // {UoA/tok} - return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals())); + return shiftl_toFix(uint256(p), -int8(chainlinkFeed.decimals()), FLOOR); } catch (bytes memory errData) { // Check if the aggregator was not set: if so, the chainlink feed has been deprecated // and a _specific_ error needs to be raised in order to avoid looking like OOG diff --git a/contracts/plugins/assets/VersionedAsset.sol b/contracts/plugins/assets/VersionedAsset.sol index b9e558d5ff..9d5b828b3a 100644 --- a/contracts/plugins/assets/VersionedAsset.sol +++ b/contracts/plugins/assets/VersionedAsset.sol @@ -4,7 +4,7 @@ pragma solidity 0.8.19; import "../../interfaces/IVersioned.sol"; // This value should be updated on each release -string constant ASSET_VERSION = "3.4.0"; +string constant ASSET_VERSION = "4.0.0"; /** * @title VersionedAsset diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index a4af5a87d0..2201a86970 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -30,7 +30,7 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = StaticATokenV3LM(address(erc20)).rate(); // {ray ref/tok} - return shiftl_toFix(rate, -27); // {ray -> wad} + return shiftl_toFix(rate, -27, FLOOR); // {ray -> wad} } /// Claim rewards earned by holding a balance of the ERC20 token diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index 665830de8c..0950cdb4c7 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -53,7 +53,7 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { uint256 rateInRAYs = IStaticAToken(address(erc20)).rate(); // {ray ref/tok} - return shiftl_toFix(rateInRAYs, -27); + return shiftl_toFix(rateInRAYs, -27, FLOOR); } /// Claim rewards earned by holding a balance of the ERC20 token diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index e1d77aeea0..d679f98140 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -66,7 +66,7 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = ICToken(address(erc20)).exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; - return shiftl_toFix(rate, shiftLeft); + return shiftl_toFix(rate, shiftLeft, FLOOR); } /// Claim rewards earned by holding a balance of the ERC20 token diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index d20e4f44fc..8766be3d71 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -92,7 +92,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { function underlyingRefPerTok() public view override returns (uint192) { uint256 rate = ICToken(address(erc20)).exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; - return shiftl_toFix(rate, shiftLeft); + return shiftl_toFix(rate, shiftLeft, FLOOR); } /// Claim rewards earned by holding a balance of the ERC20 token diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index ed285f5db1..416b5d5f36 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -44,7 +44,12 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { } function underlyingRefPerTok() public view virtual override returns (uint192) { - return shiftl_toFix(ICusdcV3Wrapper(address(erc20)).exchangeRate(), -int8(cometDecimals)); + return + shiftl_toFix( + ICusdcV3Wrapper(address(erc20)).exchangeRate(), + -int8(cometDecimals), + FLOOR + ); } /// Refresh exchange rates and update default status. diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index e7b6ce7507..3971f4019b 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -85,8 +85,8 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); // {tok} - uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); - // We can always assume that the total supply is non-zero + uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals()), FLOOR); + // We can always assume that the total supply is sufficiently non-zero // {UoA/tok} = {UoA} / {tok} low = aumLow.div(supply, FLOOR); diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 61eb351d50..3a49b1bd77 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -107,9 +107,9 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // {UoA} (uint192 aumLow, uint192 aumHigh) = _metapoolBalancesValue(lowPaired, highPaired); - // {tok} + // {tok} -- FLOOR uint192 supply = shiftl_toFix(metapoolToken.totalSupply(), -int8(metapoolToken.decimals())); - // We can always assume that the total supply is non-zero + // We can always assume that the total supply is sufficiently non-zero // {UoA/tok} = {UoA} / {tok} low = aumLow.div(supply, FLOOR); @@ -169,21 +169,22 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // {UoA} (uint192 underlyingAumLow, uint192 underlyingAumHigh) = totalBalancesValue(); - // {tokUnderlying} + // {tokUnderlying} -- FLOOR uint192 underlyingSupply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); + // We can always assume that the underlying supply is sufficiently non-zero // {UoA/tokUnderlying} = {UoA} / {tokUnderlying} uint192 underlyingLow = underlyingAumLow.div(underlyingSupply, FLOOR); uint192 underlyingHigh = underlyingAumHigh.div(underlyingSupply, CEIL); - // {tokUnderlying} + // {tokUnderlying} -- FLOOR uint192 balUnderlying = shiftl_toFix(metapoolToken.balances(1), -int8(lpToken.decimals())); // {UoA} = {UoA/tokUnderlying} * {tokUnderlying} aumLow = underlyingLow.mul(balUnderlying, FLOOR); aumHigh = underlyingHigh.mul(balUnderlying, CEIL); - // {pairedTok} + // {pairedTok} -- FLOOR uint192 pairedBal = shiftl_toFix(metapoolToken.balances(0), -int8(pairedToken.decimals())); // Add-in contribution from pairedTok diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index b99378db00..bc04b35be0 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -296,7 +296,7 @@ contract PoolTokens { function totalBalancesValue() internal view returns (uint192 low, uint192 high) { for (uint8 i = 0; i < nTokens; ++i) { IERC20Metadata token = getToken(i); - uint192 balance = shiftl_toFix(curvePool.balances(i), -int8(token.decimals())); + uint192 balance = shiftl_toFix(curvePool.balances(i), -int8(token.decimals()), FLOOR); (uint192 lowP, uint192 highP) = tokenPrice(i); low += balance.mul(lowP, FLOOR); @@ -310,7 +310,7 @@ contract PoolTokens { for (uint8 i = 0; i < nTokens; ++i) { IERC20Metadata token = getToken(i); - uint192 balance = shiftl_toFix(curvePool.balances(i), -int8(token.decimals())); + uint192 balance = shiftl_toFix(curvePool.balances(i), -int8(token.decimals()), FLOOR); balances[i] = (balance); } diff --git a/contracts/plugins/assets/dsr/SDaiCollateral.sol b/contracts/plugins/assets/dsr/SDaiCollateral.sol index 215d2e7b74..6e0e88c279 100644 --- a/contracts/plugins/assets/dsr/SDaiCollateral.sol +++ b/contracts/plugins/assets/dsr/SDaiCollateral.sol @@ -53,6 +53,6 @@ contract SDaiCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { - return shiftl_toFix(pot.chi(), -27); + return shiftl_toFix(pot.chi(), -27, FLOOR); } } diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index b3429791e7..bf868400a0 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -8,7 +8,7 @@ import { OracleLib } from "../OracleLib.sol"; // solhint-disable-next-line max-line-length import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; -import { shiftl_toFix, FIX_ONE } from "../../../libraries/Fixed.sol"; +import { shiftl_toFix, FIX_ONE, FLOOR } from "../../../libraries/Fixed.sol"; /** * @title MorphoFiatCollateral @@ -41,7 +41,8 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { return shiftl_toFix( MorphoTokenisedDeposit(address(erc20)).convertToAssets(oneShare), - -refDecimals + -refDecimals, + FLOOR ); } diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index c12f2c2547..babea4e816 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -6,7 +6,7 @@ import { Asset, AppreciatingFiatCollateral, CollateralConfig, IRewardable } from import { MorphoTokenisedDeposit } from "./MorphoTokenisedDeposit.sol"; import { OracleLib } from "../OracleLib.sol"; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; -import { shiftl_toFix, FIX_ONE, FixLib, CEIL } from "../../../libraries/Fixed.sol"; +import { shiftl_toFix, FIX_ONE, FLOOR, FixLib, CEIL } from "../../../libraries/Fixed.sol"; // solhint-enable max-line-length @@ -65,7 +65,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { - return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals); + return shiftl_toFix(vault.convertToAssets(oneShare), -refDecimals, FLOOR); } /// Claim rewards earned by holding a balance of the ERC20 token diff --git a/contracts/plugins/mocks/AppreciatingMockDecimals.sol b/contracts/plugins/mocks/AppreciatingMockDecimals.sol new file mode 100644 index 0000000000..3082b56e7e --- /dev/null +++ b/contracts/plugins/mocks/AppreciatingMockDecimals.sol @@ -0,0 +1,75 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../assets/aave/ATokenFiatCollateral.sol"; +import "../../libraries/Fixed.sol"; +import "./ERC20MockDecimals.sol"; + +contract AppreciatingMockDecimals is ERC20MockDecimals { + using FixLib for uint192; + + /// Emitted whenever a reward token balance is claimed + event RewardsClaimed(IERC20 indexed erc20, uint256 indexed amount); + + address internal _underlyingToken; + uint256 internal _exchangeRate; + + ERC20MockDecimals public rewardToken; + mapping(address => uint256) public rewardBalances; + + constructor( + string memory name, + string memory symbol, + uint8 decimals, + address underlyingToken + ) ERC20MockDecimals(name, symbol, decimals) { + _underlyingToken = underlyingToken; + _exchangeRate = _toExchangeRate(FIX_ONE); + require( + decimals == ERC20MockDecimals(address(_underlyingToken)).decimals(), + "invalid decimals" + ); + } + + function underlying() external view returns (address) { + return _underlyingToken; + } + + function rate() external view returns (uint256) { + return _exchangeRate; + } + + function setExchangeRate(uint192 fiatcoinRedemptionRate) external { + _exchangeRate = _toExchangeRate(fiatcoinRedemptionRate); + } + + function _toExchangeRate(uint192 fiatcoinRedemptionRate) internal view returns (uint256) { + /// From Compound Docs: The current exchange rate, scaled by 10^(18 - 8 + Underlying Token Decimals). + if (decimals() <= 18) { + int8 leftShift = 18 - int8(IERC20Metadata(_underlyingToken).decimals()); + return fiatcoinRedemptionRate.shiftl(leftShift); + } else { + return fiatcoinRedemptionRate.mulu_toUint(10**decimals(), ROUND); + } + } + + function setRewardToken(address rewardToken_) external { + rewardToken = ERC20MockDecimals(rewardToken_); + } + + function setRewards(address recipient, uint256 amount) external { + rewardBalances[recipient] = amount; + } + + function claimRewards() external { + uint256 oldBal = rewardToken.balanceOf(msg.sender); + if (address(rewardToken) != address(0) && rewardBalances[msg.sender] != 0) { + rewardToken.mint(msg.sender, rewardBalances[msg.sender]); + rewardBalances[msg.sender] = 0; + } + emit RewardsClaimed( + IERC20(address(rewardToken)), + rewardToken.balanceOf(msg.sender) - oldBal + ); + } +} diff --git a/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol b/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol new file mode 100644 index 0000000000..c4d5ec0b53 --- /dev/null +++ b/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol @@ -0,0 +1,34 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +// solhint-disable-next-line max-line-length +import { Asset, AppreciatingFiatCollateral, CollateralConfig, IRewardable } from "../assets/AppreciatingFiatCollateral.sol"; +import { OracleLib } from "../assets/OracleLib.sol"; +// solhint-disable-next-line max-line-length +import { AppreciatingMockDecimals } from "./AppreciatingMockDecimals.sol"; +import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; +import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { shiftl_toFix } from "../../libraries/Fixed.sol"; + +/** + * AppreciatingMockDecimalsCollateral - Used for extreme tests on large decimals (e.g: 21, 27) + */ +contract AppreciatingMockDecimalsCollateral is AppreciatingFiatCollateral { + int8 private immutable refDecimals; + + /// config.erc20 must be an AppreciatingMockDecimals token + /// @param config.chainlinkFeed Feed units: {UoA/ref} + /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide + constructor(CollateralConfig memory config, uint192 revenueHiding) + AppreciatingFiatCollateral(config, revenueHiding) + { + AppreciatingMockDecimals appToken = AppreciatingMockDecimals(address(config.erc20)); + refDecimals = int8(uint8(IERC20Metadata(appToken.underlying()).decimals())); + require(refDecimals > 18, "only decimals > 18"); + } + + /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens + function underlyingRefPerTok() public view override returns (uint192) { + return shiftl_toFix(AppreciatingMockDecimals(address(erc20)).rate(), -refDecimals); + } +} diff --git a/contracts/plugins/mocks/upgrades/DeployerV2.sol b/contracts/plugins/mocks/upgrades/DeployerV2.sol new file mode 100644 index 0000000000..2269ff86ca --- /dev/null +++ b/contracts/plugins/mocks/upgrades/DeployerV2.sol @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../../p1/Deployer.sol"; + +/// @custom:oz-upgrades-unsafe-allow external-library-linking +contract DeployerP1V2 is DeployerP1 { + uint256 public newValue; + + constructor( + IERC20Metadata rsr_, + IGnosis gnosis_, + IAsset rsrAsset_, + Implementations memory implementations_ + ) DeployerP1(rsr_, gnosis_, rsrAsset_, implementations_) {} + + function setNewValue(uint256 newValue_) external { + newValue = newValue_; + } + + function version() public pure override(Versioned, IVersioned) returns (string memory) { + return "2.0.0"; + } +} diff --git a/contracts/plugins/trading/DutchTrade.sol b/contracts/plugins/trading/DutchTrade.sol index 7c9eb5a046..65004ce613 100644 --- a/contracts/plugins/trading/DutchTrade.sol +++ b/contracts/plugins/trading/DutchTrade.sol @@ -174,7 +174,7 @@ contract DutchTrade is ITrade, Versioned { buy = buy_.erc20(); require(sellAmount_ <= sell.balanceOf(address(this)), "unfunded trade"); - sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals())); // {sellTok} + sellAmount = shiftl_toFix(sellAmount_, -int8(sell.decimals()), FLOOR); // {sellTok} // Track auction end by time, to generalize to all chains uint48 _startTime = uint48(block.timestamp) + 1; // cannot fulfill in current block diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 3c7759cfbd..ca0625e5f2 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -45,7 +45,7 @@ contract GnosisTrade is ITrade, Versioned { IERC20Metadata public sell; // address of token this trade is selling IERC20Metadata public buy; // address of token this trade is buying uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called - uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold; dup with initBal + uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold, != initBal uint48 public endTime; // timestamp after which this trade's auction can be settled uint192 public worstCasePrice; // {buyTok/sellTok}, the worst price we expect to get at Auction // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` @@ -91,10 +91,9 @@ contract GnosisTrade is ITrade, Versioned { sell = req.sell.erc20(); buy = req.buy.erc20(); - initBal = sell.balanceOf(address(this)); // {qSellTok} - sellAmount = shiftl_toFix(initBal, -int8(sell.decimals())); // {sellTok} + sellAmount = shiftl_toFix(req.sellAmount, -int8(sell.decimals())); // {sellTok} - require(initBal <= type(uint96).max, "initBal too large"); + initBal = sell.balanceOf(address(this)); // {qSellTok} require(initBal >= req.sellAmount, "unfunded trade"); assert(origin_ != address(0)); @@ -105,8 +104,9 @@ contract GnosisTrade is ITrade, Versioned { endTime = uint48(block.timestamp) + batchAuctionLength; // {buyTok/sellTok} - worstCasePrice = shiftl_toFix(req.minBuyAmount, -int8(buy.decimals())).div( - shiftl_toFix(req.sellAmount, -int8(sell.decimals())) + worstCasePrice = divuu(req.minBuyAmount, req.sellAmount).shiftl( + int8(sell.decimals()) - int8(buy.decimals()), + FLOOR ); // Downsize our sell amount to adjust for fee @@ -212,8 +212,9 @@ contract GnosisTrade is ITrade, Versioned { uint256 adjustedBuyAmt = boughtAmt + 1; // {buyTok/sellTok} - uint192 clearingPrice = shiftl_toFix(adjustedBuyAmt, -int8(buy.decimals())).div( - shiftl_toFix(adjustedSoldAmt, -int8(sell.decimals())) + uint192 clearingPrice = divuu(adjustedBuyAmt, adjustedSoldAmt).shiftl( + int8(sell.decimals()) - int8(buy.decimals()), + FLOOR ); if (clearingPrice.lt(worstCasePrice)) { diff --git a/contracts/registry/AssetPluginRegistry.sol b/contracts/registry/AssetPluginRegistry.sol new file mode 100644 index 0000000000..253009841f --- /dev/null +++ b/contracts/registry/AssetPluginRegistry.sol @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; +import { VersionRegistry } from "./VersionRegistry.sol"; + +/** + * @title Asset Plugin Registry + * @notice A tiny contract for tracking asset plugins + */ +contract AssetPluginRegistry is Ownable { + VersionRegistry public versionRegistry; + // versionHash => asset => isValid + mapping(bytes32 => mapping(address => bool)) public isValidAsset; + + error AssetPluginRegistry__InvalidAsset(); + error AssetPluginRegistry__InvalidVersion(); + error AssetPluginRegistry__LengthMismatch(); + + event AssetPluginRegistryUpdated(bytes32 versionHash, address asset, bool validity); + + constructor(address _versionRegistry) Ownable() { + versionRegistry = VersionRegistry(_versionRegistry); + + _transferOwnership(versionRegistry.owner()); + } + + function registerAsset(address _asset, bytes32[] calldata validForVersions) external onlyOwner { + if (_asset == address(0)) { + revert AssetPluginRegistry__InvalidAsset(); + } + + for (uint256 i = 0; i < validForVersions.length; ++i) { + bytes32 versionHash = validForVersions[i]; + if (address(versionRegistry.deployments(versionHash)) == address(0)) { + revert AssetPluginRegistry__InvalidVersion(); + } + + isValidAsset[versionHash][_asset] = true; + + emit AssetPluginRegistryUpdated(versionHash, _asset, true); + } + } + + function updateVersionsByAsset( + address _asset, + bytes32[] calldata _versionHashes, + bool[] calldata _validities + ) external onlyOwner { + if (_versionHashes.length != _validities.length) { + revert AssetPluginRegistry__LengthMismatch(); + } + + if (_asset == address(0)) { + revert AssetPluginRegistry__InvalidAsset(); + } + + for (uint256 i = 0; i < _versionHashes.length; ++i) { + bytes32 versionHash = _versionHashes[i]; + if (address(versionRegistry.deployments(versionHash)) == address(0)) { + revert AssetPluginRegistry__InvalidVersion(); + } + + isValidAsset[versionHash][_asset] = _validities[i]; + + emit AssetPluginRegistryUpdated(versionHash, _asset, _validities[i]); + } + } + + function updateAssetsByVersion( + bytes32 _versionHash, + address[] calldata _assets, + bool[] calldata _validities + ) external onlyOwner { + if (_assets.length != _validities.length) { + revert AssetPluginRegistry__LengthMismatch(); + } + + if (address(versionRegistry.deployments(_versionHash)) == address(0)) { + revert AssetPluginRegistry__InvalidVersion(); + } + + for (uint256 i = 0; i < _assets.length; ++i) { + address asset = _assets[i]; + if (asset == address(0)) { + revert AssetPluginRegistry__InvalidAsset(); + } + + isValidAsset[_versionHash][asset] = _validities[i]; + + emit AssetPluginRegistryUpdated(_versionHash, asset, _validities[i]); + } + } +} diff --git a/contracts/registry/DAOFeeRegistry.sol b/contracts/registry/DAOFeeRegistry.sol new file mode 100644 index 0000000000..420b13ddb7 --- /dev/null +++ b/contracts/registry/DAOFeeRegistry.sol @@ -0,0 +1,72 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; + +uint256 constant MAX_FEE_NUMERATOR = 15_00; // max 15% DAO fee +uint256 constant FEE_DENOMINATOR = 100_00; + +contract DAOFeeRegistry is Ownable { + address private feeRecipient; + uint256 private defaultFeeNumerator; // 0% + + mapping(address => uint256) private rTokenFeeNumerator; + mapping(address => bool) private rTokenFeeSet; + + error DAOFeeRegistry__FeeRecipientAlreadySet(); + error DAOFeeRegistry__InvalidFeeRecipient(); + error DAOFeeRegistry__InvalidFeeNumerator(); + + event FeeRecipientSet(address indexed feeRecipient); + event DefaultFeeNumeratorSet(uint256 defaultFeeNumerator); + event RTokenFeeNumeratorSet(address indexed rToken, uint256 feeNumerator, bool isActive); + + constructor(address owner_) Ownable() { + _transferOwnership(owner_); // Ownership to DAO + feeRecipient = owner_; // DAO as initial fee recipient + } + + function setFeeRecipient(address feeRecipient_) external onlyOwner { + if (feeRecipient_ == address(0)) revert DAOFeeRegistry__InvalidFeeRecipient(); + if (feeRecipient_ == feeRecipient) revert DAOFeeRegistry__FeeRecipientAlreadySet(); + + feeRecipient = feeRecipient_; + emit FeeRecipientSet(feeRecipient_); + } + + function setDefaultFeeNumerator(uint256 feeNumerator_) external onlyOwner { + if (feeNumerator_ > MAX_FEE_NUMERATOR) revert DAOFeeRegistry__InvalidFeeNumerator(); + + defaultFeeNumerator = feeNumerator_; + emit DefaultFeeNumeratorSet(defaultFeeNumerator); + } + + function setRTokenFeeNumerator(address rToken, uint256 feeNumerator_) external onlyOwner { + if (feeNumerator_ > MAX_FEE_NUMERATOR) revert DAOFeeRegistry__InvalidFeeNumerator(); + + rTokenFeeNumerator[rToken] = feeNumerator_; + rTokenFeeSet[rToken] = true; + emit RTokenFeeNumeratorSet(rToken, feeNumerator_, true); + } + + function resetRTokenFee(address rToken) external onlyOwner { + rTokenFeeNumerator[rToken] = 0; + rTokenFeeSet[rToken] = false; + + emit RTokenFeeNumeratorSet(rToken, 0, false); + } + + function getFeeDetails(address rToken) + external + view + returns ( + address recipient, + uint256 feeNumerator, + uint256 feeDenominator + ) + { + recipient = feeRecipient; + feeNumerator = rTokenFeeSet[rToken] ? rTokenFeeNumerator[rToken] : defaultFeeNumerator; + feeDenominator = FEE_DENOMINATOR; + } +} diff --git a/contracts/registry/VersionRegistry.sol b/contracts/registry/VersionRegistry.sol new file mode 100644 index 0000000000..b132f5d370 --- /dev/null +++ b/contracts/registry/VersionRegistry.sol @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; +import { IDeployer, Implementations } from "../interfaces/IDeployer.sol"; + +/** + * @title VersionRegistry + * @notice A tiny contract for tracking deployment versions + */ +contract VersionRegistry is Ownable { + mapping(bytes32 => IDeployer) public deployments; + mapping(bytes32 => bool) public isDeprecated; + bytes32 private latestVersion; + + error VersionRegistry__ZeroAddress(); + error VersionRegistry__InvalidRegistration(); + error VersionRegistry__AlreadyDeprecated(); + + event VersionRegistered(bytes32 versionHash, IDeployer deployer); + event VersionDeprecated(bytes32 versionHash); + + constructor(address owner_) Ownable() { + _transferOwnership(owner_); + } + + /// Register a deployer address, keyed by version. + /// @param deployer The deployer contract address for the version to be added. + function registerVersion(IDeployer deployer) external onlyOwner { + if (address(deployer) == address(0)) { + revert VersionRegistry__ZeroAddress(); + } + + string memory version = deployer.version(); + bytes32 versionHash = keccak256(abi.encodePacked(version)); + + if (address(deployments[versionHash]) != address(0)) { + revert VersionRegistry__InvalidRegistration(); + } + + deployments[versionHash] = deployer; + latestVersion = versionHash; + + emit VersionRegistered(versionHash, deployer); + } + + function deprecateVersion(bytes32 versionHash) external onlyOwner { + if (isDeprecated[versionHash]) { + revert VersionRegistry__AlreadyDeprecated(); + } + isDeprecated[versionHash] = true; + + emit VersionDeprecated(versionHash); + } + + function getLatestVersion() + external + view + returns ( + bytes32 versionHash, + string memory version, + IDeployer deployer, + bool deprecated + ) + { + versionHash = latestVersion; + deployer = deployments[versionHash]; + version = deployer.version(); + deprecated = isDeprecated[versionHash]; + } + + function getImplementationForVersion(bytes32 versionHash) + external + view + returns (Implementations memory) + { + return deployments[versionHash].implementations(); + } +} diff --git a/contracts/spells/3_4_0.sol b/contracts/spells/3_4_0.sol index 9fb80238dc..6565fee965 100644 --- a/contracts/spells/3_4_0.sol +++ b/contracts/spells/3_4_0.sol @@ -343,33 +343,38 @@ contract Upgrade3_4_0 { // Proxy Upgrades { - ( - IMain mainImpl, - Components memory compImpls, - TradePlugins memory tradingImpls - ) = deployer.implementations(); - UUPSUpgradeable(address(main)).upgradeTo(address(mainImpl)); + Implementations memory impls = deployer.implementations(); + + UUPSUpgradeable(address(main)).upgradeTo(address(impls.main)); UUPSUpgradeable(address(proxy.assetRegistry)).upgradeTo( - address(compImpls.assetRegistry) + address(impls.components.assetRegistry) ); UUPSUpgradeable(address(proxy.backingManager)).upgradeTo( - address(compImpls.backingManager) + address(impls.components.backingManager) ); UUPSUpgradeable(address(proxy.basketHandler)).upgradeTo( - address(compImpls.basketHandler) + address(impls.components.basketHandler) + ); + UUPSUpgradeable(address(proxy.broker)).upgradeTo(address(impls.components.broker)); + UUPSUpgradeable(address(proxy.distributor)).upgradeTo( + address(impls.components.distributor) ); - UUPSUpgradeable(address(proxy.broker)).upgradeTo(address(compImpls.broker)); - UUPSUpgradeable(address(proxy.distributor)).upgradeTo(address(compImpls.distributor)); - UUPSUpgradeable(address(proxy.furnace)).upgradeTo(address(compImpls.furnace)); - UUPSUpgradeable(address(proxy.rTokenTrader)).upgradeTo(address(compImpls.rTokenTrader)); - UUPSUpgradeable(address(proxy.rsrTrader)).upgradeTo(address(compImpls.rsrTrader)); - UUPSUpgradeable(address(proxy.stRSR)).upgradeTo(address(compImpls.stRSR)); - UUPSUpgradeable(address(proxy.rToken)).upgradeTo(address(compImpls.rToken)); + UUPSUpgradeable(address(proxy.furnace)).upgradeTo(address(impls.components.furnace)); + UUPSUpgradeable(address(proxy.rTokenTrader)).upgradeTo( + address(impls.components.rTokenTrader) + ); + UUPSUpgradeable(address(proxy.rsrTrader)).upgradeTo( + address(impls.components.rsrTrader) + ); + UUPSUpgradeable(address(proxy.stRSR)).upgradeTo(address(impls.components.stRSR)); + UUPSUpgradeable(address(proxy.rToken)).upgradeTo(address(impls.components.rToken)); // Trading plugins - TestIBroker(address(proxy.broker)).setDutchTradeImplementation(tradingImpls.dutchTrade); + TestIBroker(address(proxy.broker)).setDutchTradeImplementation( + impls.trading.dutchTrade + ); TestIBroker(address(proxy.broker)).setBatchTradeImplementation( - tradingImpls.gnosisTrade + impls.trading.gnosisTrade ); // cacheComponents() diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 8192e0b3a4..92a104c404 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -211,14 +211,19 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { }) it('Should allow to update BatchTrade Implementation if Owner and perform validations', async () => { + const upgraderAddr = IMPLEMENTATION == Implementation.P1 ? main.address : owner.address + const errorMsg = IMPLEMENTATION == Implementation.P1 ? 'main only' : 'governance only' + // Create a Trade const TradeFactory: ContractFactory = await ethers.getContractFactory('GnosisTrade') const tradeImpl: GnosisTrade = await TradeFactory.deploy() // Update to a trade implementation to use as baseline for tests - await expect(broker.connect(owner).setBatchTradeImplementation(tradeImpl.address)) - .to.emit(broker, 'BatchTradeImplementationSet') - .withArgs(anyValue, tradeImpl.address) + await whileImpersonating(upgraderAddr, async (upgSigner) => { + await expect(broker.connect(upgSigner).setBatchTradeImplementation(tradeImpl.address)) + .to.emit(broker, 'BatchTradeImplementationSet') + .withArgs(anyValue, tradeImpl.address) + }) // Check existing value expect(await broker.batchTradeImplementation()).to.equal(tradeImpl.address) @@ -226,34 +231,40 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // If not owner cannot update await expect( broker.connect(other).setBatchTradeImplementation(mock.address) - ).to.be.revertedWith('governance only') + ).to.be.revertedWith(errorMsg) // Check value did not change expect(await broker.batchTradeImplementation()).to.equal(tradeImpl.address) // Attempt to update with Owner but zero address - not allowed - await expect( - broker.connect(owner).setBatchTradeImplementation(ZERO_ADDRESS) - ).to.be.revertedWith('invalid batchTradeImplementation address') - - // Update with owner - await expect(broker.connect(owner).setBatchTradeImplementation(mock.address)) - .to.emit(broker, 'BatchTradeImplementationSet') - .withArgs(tradeImpl.address, mock.address) + await whileImpersonating(upgraderAddr, async (upgSigner) => { + await expect( + broker.connect(upgSigner).setBatchTradeImplementation(ZERO_ADDRESS) + ).to.be.revertedWith('invalid batchTradeImplementation address') + // Update with owner + await expect(broker.connect(upgSigner).setBatchTradeImplementation(mock.address)) + .to.emit(broker, 'BatchTradeImplementationSet') + .withArgs(tradeImpl.address, mock.address) + }) // Check value was updated expect(await broker.batchTradeImplementation()).to.equal(mock.address) }) it('Should allow to update DutchTrade Implementation if Owner and perform validations', async () => { + const upgraderAddr = IMPLEMENTATION == Implementation.P1 ? main.address : owner.address + const errorMsg = IMPLEMENTATION == Implementation.P1 ? 'main only' : 'governance only' + // Create a Trade const TradeFactory: ContractFactory = await ethers.getContractFactory('DutchTrade') const tradeImpl: DutchTrade = await TradeFactory.deploy() // Update to a trade implementation to use as baseline for tests - await expect(broker.connect(owner).setDutchTradeImplementation(tradeImpl.address)) - .to.emit(broker, 'DutchTradeImplementationSet') - .withArgs(anyValue, tradeImpl.address) + await whileImpersonating(upgraderAddr, async (upgSigner) => { + await expect(broker.connect(upgSigner).setDutchTradeImplementation(tradeImpl.address)) + .to.emit(broker, 'DutchTradeImplementationSet') + .withArgs(anyValue, tradeImpl.address) + }) // Check existing value expect(await broker.dutchTradeImplementation()).to.equal(tradeImpl.address) @@ -261,20 +272,22 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // If not owner cannot update await expect( broker.connect(other).setDutchTradeImplementation(mock.address) - ).to.be.revertedWith('governance only') + ).to.be.revertedWith(errorMsg) // Check value did not change expect(await broker.dutchTradeImplementation()).to.equal(tradeImpl.address) // Attempt to update with Owner but zero address - not allowed - await expect( - broker.connect(owner).setDutchTradeImplementation(ZERO_ADDRESS) - ).to.be.revertedWith('invalid dutchTradeImplementation address') + await whileImpersonating(upgraderAddr, async (upgSigner) => { + await expect( + broker.connect(upgSigner).setDutchTradeImplementation(ZERO_ADDRESS) + ).to.be.revertedWith('invalid dutchTradeImplementation address') - // Update with owner - await expect(broker.connect(owner).setDutchTradeImplementation(mock.address)) - .to.emit(broker, 'DutchTradeImplementationSet') - .withArgs(tradeImpl.address, mock.address) + // Update with owner + await expect(broker.connect(upgSigner).setDutchTradeImplementation(mock.address)) + .to.emit(broker, 'DutchTradeImplementationSet') + .withArgs(tradeImpl.address, mock.address) + }) // Check value was updated expect(await broker.dutchTradeImplementation()).to.equal(mock.address) @@ -733,7 +746,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // Fund trade with large balance await token0.connect(owner).mint(trade.address, invalidAmount) - // Attempt to initialize + // Will initialize correctly await expect( trade.init( broker.address, @@ -742,7 +755,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { config.batchAuctionLength, tradeRequest ) - ).to.be.revertedWith('initBal too large') + ).to.not.be.reverted }) it('Should not allow to initialize an unfunded trade', async () => { @@ -1424,6 +1437,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const MAX_ERC20_SUPPLY = bn('1e48') // from docs/solidity-style.md + const MAX_BUY_TOKEN_SCALED = toBNDecimals(MAX_ERC20_SUPPLY, Number(buyTokDecimals)) + const MAX_SELL_TOKEN_SCALED = toBNDecimals(MAX_ERC20_SUPPLY, Number(sellTokDecimals)) + // Max out throttles const issuanceThrottleParams = { amtRate: MAX_ERC20_SUPPLY, pctRate: 0 } const redemptionThrottleParams = { amtRate: MAX_ERC20_SUPPLY, pctRate: 0 } @@ -1432,12 +1448,12 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await advanceTime(3600) // Mint coll tokens to addr1 - await buyTok.connect(owner).mint(addr1.address, MAX_ERC20_SUPPLY) - await sellTok.connect(owner).mint(addr1.address, MAX_ERC20_SUPPLY) + await buyTok.connect(owner).mint(addr1.address, MAX_BUY_TOKEN_SCALED) + await sellTok.connect(owner).mint(addr1.address, MAX_SELL_TOKEN_SCALED) // Issue RToken - await buyTok.connect(addr1).approve(rToken.address, MAX_ERC20_SUPPLY) - await sellTok.connect(addr1).approve(rToken.address, MAX_ERC20_SUPPLY) + await buyTok.connect(addr1).approve(rToken.address, MAX_BUY_TOKEN_SCALED) + await sellTok.connect(addr1).approve(rToken.address, MAX_SELL_TOKEN_SCALED) await rToken.connect(addr1).issue(MAX_ERC20_SUPPLY.div(2)) // Burn buyTok from backingManager and send extra sellTok @@ -1446,7 +1462,9 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { bn(10).pow(sellTokDecimals) ) await buyTok.burn(backingManager.address, burnAmount) - await sellTok.connect(addr1).transfer(backingManager.address, auctionSellAmt.mul(10)) + await sellTok + .connect(addr1) + .transfer(backingManager.address, auctionSellAmt.mul(bn(10).pow(sellTokDecimals))) // Rebalance should cause backingManager to trade about auctionSellAmt, though not exactly await backingManager.setMaxTradeSlippage(bn('0')) @@ -1483,7 +1501,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { await buyTok.connect(addr1).approve(router.address, constants.MaxUint256) await router.connect(addr1).bid(trade.address, addr1.address) } else if (bidType.eq(bn(BidType.TRANSFER))) { - await buyTok.connect(addr1).approve(tradeAddr, MAX_ERC20_SUPPLY) + await buyTok.connect(addr1).approve(tradeAddr, MAX_BUY_TOKEN_SCALED) await trade.connect(addr1).bid() } await advanceBlocks(1) @@ -1506,7 +1524,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const bidTypes = [bn(BidType.CALLBACK), bn(BidType.TRANSFER)] // applied to both buy and sell tokens - const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18')] + const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18'), bn('21'), bn('27')] // auction sell amount const auctionSellAmts = [bn('2'), bn('1595439874635'), bn('987321984732198435645846513')] diff --git a/test/Facade.test.ts b/test/Facade.test.ts index e104d87385..e04376a349 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -763,7 +763,10 @@ describe('Facade + FacadeMonitor contracts', () => { ) await expect(facade.callStatic.revenueOverview(rsrTrader.address)).not.to.be.reverted - await backingManager.connect(owner).upgradeTo(bckMgrInvalidVer.address) + + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(bckMgrInvalidVer.address) + }) // Reverts due to invalid version when forwarding revenue await expect(facade.callStatic.revenueOverview(rsrTrader.address)).to.be.revertedWith( @@ -859,7 +862,9 @@ describe('Facade + FacadeMonitor contracts', () => { ) // Upgrade BackingManager to V2 - await backingManager.connect(owner).upgradeTo(backingManagerV2.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerV2.address) + }) // Confirm no auction to run yet - should not revert let [canStart, sell, buy, sellAmount] = @@ -905,7 +910,9 @@ describe('Facade + FacadeMonitor contracts', () => { }) // Upgrade BackingManager to V1 - await backingManager.connect(owner).upgradeTo(backingManagerV1.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerV1.address) + }) // nextRecollateralizationAuction should return false (trade open) ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( @@ -932,7 +939,9 @@ describe('Facade + FacadeMonitor contracts', () => { expect(sellAmount).to.equal(sellAmt) // Invalid versions are also handled - await backingManager.connect(owner).upgradeTo(backingManagerInvalidVer.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerInvalidVer.address) + }) await expect( facade.callStatic.nextRecollateralizationAuction( @@ -953,7 +962,9 @@ describe('Facade + FacadeMonitor contracts', () => { ) // Upgrade BackingManager to Invalid version - await backingManager.connect(owner).upgradeTo(backingManagerInvalidVer.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerInvalidVer.address) + }) // Setup prime basket await basketHandler.connect(owner).setPrimeBasket([usdc.address], [fp('1')]) @@ -1673,8 +1684,10 @@ describe('Facade + FacadeMonitor contracts', () => { await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 13) // Upgrade components to V2 - await backingManager.connect(owner).upgradeTo(backingManagerV2.address) - await rTokenTrader.connect(owner).upgradeTo(revTraderV2.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerV2.address) + await rTokenTrader.connect(signer).upgradeTo(revTraderV2.address) + }) // Settle and start new auction - Will retry await expectEvents( @@ -1701,8 +1714,10 @@ describe('Facade + FacadeMonitor contracts', () => { ) // Upgrade to V1 - await backingManager.connect(owner).upgradeTo(backingManagerV1.address) - await rTokenTrader.connect(owner).upgradeTo(revTraderV1.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerV1.address) + await rTokenTrader.connect(signer).upgradeTo(revTraderV1.address) + }) // Advance time till auction ended await advanceToTimestamp((await getLatestBlockTimestamp()) + auctionLength + 13) @@ -1742,7 +1757,9 @@ describe('Facade + FacadeMonitor contracts', () => { ) // Upgrade RevenueTrader to invalid version - Use RSR as an example - await rsrTrader.connect(owner).upgradeTo(revTraderInvalidVer.address) + await whileImpersonating(main.address, async (signer) => { + await rsrTrader.connect(signer).upgradeTo(revTraderInvalidVer.address) + }) const tokenSurplus = bn('0.5e18') await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) @@ -1752,7 +1769,9 @@ describe('Facade + FacadeMonitor contracts', () => { ).to.be.revertedWith('unrecognized version') // Also set BackingManager to invalid version - await backingManager.connect(owner).upgradeTo(backingManagerInvalidVer.address) + await whileImpersonating(main.address, async (signer) => { + await backingManager.connect(signer).upgradeTo(backingManagerInvalidVer.address) + }) await expect( facade.runRevenueAuctions(rsrTrader.address, [], [token.address], [TradeKind.DUTCH_AUCTION]) diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index cf7c533b60..d44bffcbed 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -164,8 +164,8 @@ describe('FacadeWrite contract', () => { // Decrease revenue splits for nicer rounding const localConfig = cloneDeep(config) - localConfig.dist.rTokenDist = bn('394') - localConfig.dist.rsrDist = bn('591') + localConfig.dist.rTokenDist = bn('4000') + localConfig.dist.rsrDist = bn('6000') // Set parameters rTokenConfig = { diff --git a/test/Main.test.ts b/test/Main.test.ts index c7b6389471..0ae0ae4cdb 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -250,8 +250,8 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Configuration const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rTokenTotal).to.equal(bn(40)) - expect(rsrTotal).to.equal(bn(60)) + expect(rTokenTotal).to.equal(bn(4000)) + expect(rsrTotal).to.equal(bn(6000)) expect(await main.shortFreeze()).to.equal(config.shortFreeze) expect(await main.longFreeze()).to.equal(config.longFreeze) @@ -469,7 +469,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expect( deployer.deploy('RTKN RToken', 'RTKN', 'mandate', owner.address, invalidDistConfig) - ).to.be.revertedWith('no distribution defined') + ).to.be.revertedWith('totals too low') // Create a new instance of Main const MainFactory: ContractFactory = await ethers.getContractFactory(`MainP${IMPLEMENTATION}`) @@ -1167,6 +1167,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('not enough gas to unregister safely') }) + it('Should validate current assets if no Plugin Registry', async () => { + await expect(assetRegistry.validateCurrentAssets()).to.not.be.reverted + }) + it('Should be able to disableBasket during deregistration with basket size of 128', async () => { // Set up backup config await basketHandler.setBackupConfig(await ethers.utils.formatBytes32String('USD'), 1, [ diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index 229960812c..bdf29d52fb 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -6,7 +6,7 @@ import { ethers } from 'hardhat' import { BN_SCALE_FACTOR, CollateralStatus } from '../common/constants' import { bn, fp, shortString } from '../common/numbers' import { - ERC20Mock, + ERC20MockDecimals, FiatCollateral, IAssetRegistry, MockV3Aggregator, @@ -53,9 +53,11 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { describeExtreme(`Extreme Values ${SLOW ? 'slow mode' : 'fast mode'}`, () => { // makeColl: Deploy and register a new constant-price collateral - async function makeColl(index: number | string): Promise { - const ERC20: ContractFactory = await ethers.getContractFactory('ERC20Mock') - const erc20: ERC20Mock = await ERC20.deploy('Token ' + index, 'T' + index) + async function makeColl(index: number | string, decimals: number): Promise { + const ERC20: ContractFactory = await ethers.getContractFactory('ERC20MockDecimals') + const erc20: ERC20MockDecimals = ( + await ERC20.deploy('Token ' + index, 'T' + index, decimals) + ) const OracleFactory: ContractFactory = await ethers.getContractFactory('MockV3Aggregator') const oracle: MockV3Aggregator = await OracleFactory.deploy(8, bn('1e8')) await oracle.deployed() // fix extreme value tests failing @@ -93,6 +95,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { weightRest, // another target amount per asset (weight of second+ assets) issuancePctAmt, // range under test: [.000_001 to 1.0] redemptionPctAmt, // range under test: [.000_001 to 1.0] + collateralDecimals, ]: BigNumber[]) { // skip nonsense cases if ( @@ -106,11 +109,11 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { // ==== Deploy and register basket collateral const N = numBasketAssets.toNumber() - const erc20s: ERC20Mock[] = [] + const erc20s: ERC20MockDecimals[] = [] const weights: BigNumber[] = [] let totalWeight: BigNumber = fp(0) for (let i = 0; i < N; i++) { - const erc20 = await makeColl(i) + const erc20 = await makeColl(i, Number(collateralDecimals)) erc20s.push(erc20) const currWeight = i == 0 ? weightFirst : weightRest weights.push(currWeight) @@ -134,7 +137,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { const toIssue0 = totalSupply.sub(toIssue) const e18 = BN_SCALE_FACTOR for (let i = 0; i < N; i++) { - const erc20: ERC20Mock = erc20s[i] + const erc20: ERC20MockDecimals = erc20s[i] // user owner starts with enough basket assets to issue (totalSupply - toIssue) const toMint0: BigNumber = toIssue0.mul(weights[i]).add(e18.sub(1)).div(e18) await erc20.mint(owner.address, toMint0) @@ -207,6 +210,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { [MIN_WEIGHT, MAX_WEIGHT, fp('0.2')], // weightRest [MIN_ISSUANCE_PCT, fp('1e-2'), fp(1)], // issuanceThrottle.pctRate [MIN_REDEMPTION_PCT, fp('1e-2'), fp(1)], // redemptionThrottle.pctRate + [bn(6), bn(18), bn(21), bn(27)], // collateralDecimals ] paramList = cartesianProduct(...bounds) @@ -220,6 +224,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { [MIN_WEIGHT], // weightRest [MIN_ISSUANCE_PCT, fp(1)], // issuanceThrottle.pctRate [MIN_REDEMPTION_PCT, fp(1)], // redemptionThrottle.pctRate + [bn(6), bn(27)], // collateralDecimals ] paramList = cartesianProduct(...bounds) } diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index ce9c04f586..d448fd2884 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -51,7 +51,7 @@ import { } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' import { expectTrade, getTrade, dutchBuyAmount } from './utils/trades' -import { withinQuad } from './utils/matchers' +import { withinTolerance } from './utils/matchers' import { expectRTokenPrice, expectUnpriced, setOraclePrice } from './utils/oracles' import { useEnv } from '#/utils/env' import { mintCollaterals } from './utils/tokens' @@ -1405,7 +1405,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(true) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.gt(issueAmount) - expect(await token0.balanceOf(backingManager.address)).to.be.closeTo(bn('0'), bn('100')) // up to 100 atto + expect(await token0.balanceOf(backingManager.address)).to.be.closeTo(bn('0'), bn('10000')) expect(await token1.balanceOf(backingManager.address)).to.equal(toBNDecimals(buyAmt, 6)) expect(await rToken.totalSupply()).to.be.gt(issueAmount) // New RToken minting @@ -1531,7 +1531,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { issueAmount, issueAmount.mul(520).div(100000) // 520 parts in 1 miliion ) - expect(await token0.balanceOf(backingManager.address)).to.be.closeTo(0, 10) + expect(await token0.balanceOf(backingManager.address)).to.be.closeTo(0, 1000) expect(await token1.balanceOf(backingManager.address)).to.be.closeTo( 0, toBNDecimals(sellAmt, 6) @@ -1665,7 +1665,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { remainingValue, remainingValue.div(bn('5e3')) ) - expect(await token0.balanceOf(backingManager.address)).to.be.closeTo(0, 10) + expect(await token0.balanceOf(backingManager.address)).to.be.closeTo(0, 1000) expect(await token1.balanceOf(backingManager.address)).to.equal( toBNDecimals(minBuyAmt, 6) ) @@ -2073,7 +2073,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token1.balanceOf(backingManager.address)).to.equal( toBNDecimals(issueAmount, 6).add(1) ) - expect(await aaveToken.balanceOf(backingManager.address)).to.be.closeTo(bn('0'), 100) // distributor leaves some + expect(await aaveToken.balanceOf(backingManager.address)).to.be.closeTo(bn('0'), 10000) // distributor leaves some expect(await rToken.totalSupply()).to.be.closeTo(issueAmount, fp('0.000001')) // we have a bit more // Check price in USD of the current RToken @@ -3172,7 +3172,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await token1.balanceOf(backingManager.address)).to.equal( toBNDecimals(issueAmount, 6).add(1) ) - expect(await aaveToken.balanceOf(backingManager.address)).to.be.closeTo(bn('0'), 100) // distributor leaves some + expect(await aaveToken.balanceOf(backingManager.address)).to.be.closeTo(bn('0'), 10000) // distributor leaves some expect(await rToken.totalSupply()).to.be.closeTo(issueAmount, fp('0.000001')) // we have a bit more // Check price in USD of the current RToken @@ -3184,7 +3184,8 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) }) - context('DutchTrade', () => { + // TODO + context.skip('DutchTrade', () => { const auctionLength = 1800 // 30 minutes beforeEach(async () => { await broker.connect(owner).setDutchAuctionLength(auctionLength) @@ -3541,7 +3542,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { token2.address, backupToken1.address, sellAmt2, - withinQuad(minBuyAmt2), + withinTolerance(minBuyAmt2), ], emitted: true, }, @@ -4907,7 +4908,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Check price in USD of the current RToken - Haircut of ~37.52% taken // The default was for 37.5% of backing, so this is pretty awesome - const exactRTokenPrice = fp('0.6247979797979798') + const exactRTokenPrice = fp('0.62488525484848490000') const totalAssetValue = issueAmount.mul(exactRTokenPrice).div(fp('1')) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( totalAssetValue, @@ -4925,10 +4926,10 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Check quotes - reduced by ~38.15% as well (less collateral is required to match the new price) ;[, quotes] = await facade.connect(addr1).callStatic.issue(rToken.address, bn('1e18')) - const finalQuotes = newQuotes.map((q) => { - return divCeil(q.mul(exactRTokenPrice), fp('1')) - }) - expect(quotes).to.eql(finalQuotes) + for (const q of newQuotes) { + const expected = divCeil(q.mul(exactRTokenPrice), fp('1')) + expect(expected).to.be.closeTo(expected, 100) + } // Check Backup tokens available const expBackup1 = sellAmt0 diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 90d3bb944e..df4294d001 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -57,7 +57,7 @@ import { defaultFixture, } from './fixtures' import { whileImpersonating } from './utils/impersonation' -import { withinQuad } from './utils/matchers' +import { withinTolerance } from './utils/matchers' import { expectRTokenPrice, setOraclePrice } from './utils/oracles' import snapshotGasCost from './utils/snapshotGasCost' import { advanceTime, advanceToTimestamp, getLatestBlockTimestamp } from './utils/time' @@ -67,6 +67,8 @@ import { dutchBuyAmount, expectTrade, getTrade } from './utils/trades' const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip +const itP1 = IMPLEMENTATION == Implementation.P1 ? it : it.skip + describe(`Revenues - P${IMPLEMENTATION}`, () => { let owner: SignerWithAddress let addr1: SignerWithAddress @@ -258,35 +260,43 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should setup initial distribution correctly', async () => { // Configuration const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) + expect(rsrTotal).equal(bn(6000)) + expect(rTokenTotal).equal(bn(4000)) }) it('Should allow to set distribution if owner', async () => { // Check initial status const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) + expect(rsrTotal).equal(bn(6000)) + expect(rTokenTotal).equal(bn(4000)) // Attempt to update with another account await expect( - distributor - .connect(other) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + distributor.connect(other).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) ).to.be.revertedWith('governance only') // Update with owner - Set f = 1 await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) ) .to.emit(distributor, 'DistributionSet') .withArgs(FURNACE_DEST, bn(0), bn(0)) // Check updated status const [newRTokenTotal, newRsrTotal] = await distributor.totals() - expect(newRsrTotal).equal(bn(60)) + expect(newRsrTotal).equal(bn(10000)) expect(newRTokenTotal).equal(bn(0)) }) @@ -295,14 +305,14 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(1) }) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(10000) }) ).to.be.revertedWith('Furnace must get 0% of RSR') // Cannot set RToken > 0 for StRSR await expect( distributor .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + .setDistribution(STRSR_DEST, { rTokenDist: bn(10000), rsrDist: bn(0) }) ).to.be.revertedWith('StRSR must get 0% of RToken') // Cannot set RSR distribution too high @@ -319,15 +329,25 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { .setDistribution(FURNACE_DEST, { rTokenDist: bn(10001), rsrDist: bn(0) }) ).to.be.revertedWith('RToken distribution too high') - // Cannot set both distributions = 0 - await distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + // Cannot set both distributions below MAX_DISTRIBUTION await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ).to.be.revertedWith('no distribution defined') + distributor.connect(owner).setDistributions( + [FURNACE_DEST, STRSR_DEST], + [ + { rTokenDist: bn(1), rsrDist: bn(0) }, + { rTokenDist: bn(0), rsrDist: bn(1) }, + ] + ) + ).to.be.reverted + await expect( + distributor.connect(owner).setDistributions( + [FURNACE_DEST, STRSR_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(0) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) + ).to.be.reverted // Cannot set zero addr beneficiary await expect( @@ -351,6 +371,16 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ).to.be.revertedWith('destination can not be furnace or strsr directly') }) + itP1('Should not allow to set Dao fee explicitly', async () => { + // Cannot set DAO fee explicitly + await main.connect(owner).setDAOFeeRegistry(other.address) + await expect( + distributor + .connect(owner) + .setDistribution(other.address, { rTokenDist: bn(10000), rsrDist: bn(0) }) + ).to.be.revertedWith('destination cannot be daoFeeRegistry') + }) + it('Should validate number of destinations', async () => { // Cannot set more than Max (100) const maxDestinations = 100 @@ -359,14 +389,14 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const usr: Wallet = await ethers.Wallet.createRandom() await distributor .connect(owner) - .setDistribution(usr.address, { rTokenDist: bn(40), rsrDist: bn(60) }) + .setDistribution(usr.address, { rTokenDist: bn(4000), rsrDist: bn(6000) }) } // Attempt to add an additional destination will revert await expect( distributor .connect(owner) - .setDistribution(other.address, { rTokenDist: bn(40), rsrDist: bn(60) }) + .setDistribution(other.address, { rTokenDist: bn(4000), rsrDist: bn(6000) }) ).to.be.revertedWith('Too many destinations') }) }) @@ -449,7 +479,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const minBuyAmt = await toMinBuyAmt(issueAmount, fp('0.7'), realRtokenPrice) await expect(rTokenTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])) .to.emit(rTokenTrader, 'TradeStarted') - .withArgs(anyValue, token0.address, rToken.address, issueAmount, withinQuad(minBuyAmt)) + .withArgs( + anyValue, + token0.address, + rToken.address, + issueAmount, + withinTolerance(minBuyAmt) + ) }) it('Should forward revenue to traders', async () => { @@ -465,8 +501,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { 'Transfer' ) expect(await aaveToken.balanceOf(backingManager.address)).to.equal(0) - expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal(rewardAmt.mul(60).div(100)) - expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal(rewardAmt.mul(40).div(100)) + expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal( + rewardAmt.mul(6000).div(10000) + ) + expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal( + rewardAmt.mul(4000).div(10000) + ) }) it('Should not forward revenue if basket not ready', async () => { @@ -512,8 +552,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { 'Transfer' ) expect(await aaveToken.balanceOf(backingManager.address)).to.equal(0) - expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal(rewardAmt.mul(60).div(100)) - expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal(rewardAmt.mul(40).div(100)) + expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal( + rewardAmt.mul(6000).div(10000) + ) + expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal( + rewardAmt.mul(4000).div(10000) + ) }) it('Should not forward revenue if paused', async () => { @@ -620,7 +664,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rsr.connect(owner).mint(rsrTrader.address, issueAmount) await rsrTrader.distributeTokenToBuy() const expectedAmount = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 10000) }) it('Should distribute tokenToBuy - manageTokens()', async () => { @@ -629,7 +673,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rsr.connect(owner).mint(rsrTrader.address, issueAmount) await rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) const expectedAmount = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 10000) }) it('Should not distribute tokenToBuy if frozen or trading paused', async () => { @@ -660,14 +704,14 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Can distribute now await rsrTrader.distributeTokenToBuy() const expectedAmount = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 100) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmount, 10000) }) it('Should distribute tokenToBuy before updating distribution', async () => { // Check initial status const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) + expect(rsrTotal).equal(bn(6000)) + expect(rTokenTotal).equal(bn(4000)) // Set some balance of token-to-buy in traders const issueAmount = bn('100e18') @@ -681,22 +725,26 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await rToken.connect(addr1).issueTo(rTokenTrader.address, issueAmount) // Update distributions with owner - Set f = 1 - await distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + await distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) // Check tokens were transferred from Traders const expectedAmountRSR = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountRSR, 100) - expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(bn(0), 100) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountRSR, 10000) + expect(await rsr.balanceOf(rsrTrader.address)).to.be.closeTo(bn(0), 10000) const expectedAmountRToken = rTokenBal.add(issueAmount) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expectedAmountRToken, 100) - expect(await rsr.balanceOf(rTokenTrader.address)).to.be.closeTo(bn(0), 100) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(expectedAmountRToken, 10000) + expect(await rsr.balanceOf(rTokenTrader.address)).to.be.closeTo(bn(0), 10000) // Check updated distributions const [newRTokenTotal, newRsrTotal] = await distributor.totals() - expect(newRsrTotal).equal(bn(60)) + expect(newRsrTotal).equal(bn(10000)) expect(newRTokenTotal).equal(bn(0)) }) @@ -718,7 +766,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await advanceTime(Number(ONE_PERIOD)) await expect(rsrTrader.distributeTokenToBuy()).to.emit(stRSR, 'RewardsPaid') const expectedAmountStRSR = stRSRBal.add(issueAmount) - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountStRSR, 100) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(expectedAmountStRSR, 10000) // 2. Furnace.melt() // Transfer RTokens to Furnace (to trigger melting later) @@ -741,8 +789,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should update distribution even if distributeTokenToBuy() reverts', async () => { // Check initial status const [rTokenTotal, rsrTotal] = await distributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) + expect(rsrTotal).equal(bn(6000)) + expect(rTokenTotal).equal(bn(4000)) // Set some balance of token-to-buy in RSR trader const issueAmount = bn('100e18') @@ -754,9 +802,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect(rsrTrader.distributeTokenToBuy()).to.be.reverted // Update distributions with owner - Set f = 1 - await distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + await distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) // Check no tokens were transferred expect(await rsr.balanceOf(stRSR.address)).to.equal(stRSRBal) @@ -764,7 +816,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Check updated distributions const [newRTokenTotal, newRsrTotal] = await distributor.totals() - expect(newRsrTotal).equal(bn(60)) + expect(newRsrTotal).equal(bn(10000)) expect(newRTokenTotal).equal(bn(0)) }) @@ -790,7 +842,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( rsrTrader.returnTokens([rsr.address, token0.address, token1.address]) ).to.be.revertedWith('rsrTotal > 0') - await distributor.setDistribution(STRSR_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) + await distributor.setDistributions( + [FURNACE_DEST, STRSR_DEST], + [ + { rTokenDist: bn(10000), rsrDist: bn(0) }, + { rTokenDist: bn('0'), rsrDist: bn('0') }, + ] + ) // Mint RSR await rsr.connect(owner).mint(rsrTrader.address, issueAmount) @@ -846,7 +904,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( rTokenTrader.returnTokens([rsr.address, token0.address, token1.address]) ).to.be.revertedWith('rTokenTotal > 0') - await distributor.setDistribution(FURNACE_DEST, { rTokenDist: bn('0'), rsrDist: bn('0') }) + await distributor.setDistributions( + [FURNACE_DEST, STRSR_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(0) }, + { rTokenDist: bn(0), rsrDist: bn(10000) }, + ] + ) // Should fail for unregistered token await assetRegistry.connect(owner).unregister(collateral1.address) @@ -964,7 +1028,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountCOMP.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder @@ -993,7 +1057,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, compToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -1004,7 +1068,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { compToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -1092,12 +1156,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // StRSR expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( minBuyAmt, - minBuyAmt.div(bn('1e15')) + minBuyAmt.div(bn('1e13')) ) // Furnace expect(await rToken.balanceOf(furnace.address)).to.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e15')) + minBuyAmtRToken.div(bn('1e13')) ) }) @@ -1191,9 +1255,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should handle properly an asset with low maxTradeVolume', async () => { // Set f = 1 await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) ) .to.emit(distributor, 'DistributionSet') .withArgs(FURNACE_DEST, bn(0), bn(0)) @@ -1202,10 +1270,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(1) }) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(10000) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(1)) + .withArgs(STRSR_DEST, bn(0), bn(10000)) // Set AAVE tokens as reward rewardAmountAAVE = bn('1000e18') @@ -1344,7 +1412,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder @@ -1375,7 +1443,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -1386,7 +1454,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -1459,12 +1527,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // StRSR expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( minBuyAmt, - minBuyAmt.div(bn('1e15')) + minBuyAmt.div(bn('1e13')) ) // Furnace expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e15')) + minBuyAmtRToken.div(bn('1e13')) ) }) @@ -1490,9 +1558,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set f = 1 await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) ) .to.emit(distributor, 'DistributionSet') .withArgs(FURNACE_DEST, bn(0), bn(0)) @@ -1501,10 +1573,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(1) }) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(10000) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(1)) + .withArgs(STRSR_DEST, bn(0), bn(10000)) // Set AAVE tokens as reward rewardAmountAAVE = fp('1.9') @@ -1539,7 +1611,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -1607,7 +1679,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rsr.address, remainderSellAmt, - withinQuad(remainderMinBuyAmt), + withinTolerance(remainderMinBuyAmt), ], emitted: true, }, @@ -1663,7 +1735,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ]) // Check balances sent to corresponding destinations - expect(await rsr.balanceOf(stRSR.address)).to.equal(minBuyAmt.add(remainderMinBuyAmt)) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( + minBuyAmt.add(remainderMinBuyAmt), + 10000 + ) expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) @@ -1692,10 +1767,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(10000), rsrDist: bn(0) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) + .withArgs(FURNACE_DEST, bn(10000), bn(0)) await expect( distributor @@ -1741,7 +1816,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rTokenTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rToken.address, sellAmt, withinQuad(minBuyAmt)], + args: [ + anyValue, + aaveToken.address, + rToken.address, + sellAmt, + withinTolerance(minBuyAmt), + ], emitted: true, }, { @@ -1797,7 +1878,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRemainder, - withinQuad(minBuyAmtRemainder), + withinTolerance(minBuyAmtRemainder), ], emitted: true, }, @@ -1888,19 +1969,16 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set f = 0.8 (0.2 for Rtoken) await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(4) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(4)) - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(8000) }, + { rTokenDist: bn(2000), rsrDist: bn(0) }, + ] + ) ) .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) + .withArgs(FURNACE_DEST, bn(2000), bn(0)) // Set AAVE tokens as reward // Based on current f -> 1.6e18 to RSR and 0.4e18 to Rtoken @@ -1941,7 +2019,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -1952,7 +2030,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -2026,7 +2104,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rsr.address, sellAmtRemainder, - withinQuad(minBuyAmtRemainder), + withinTolerance(minBuyAmtRemainder), ], emitted: true, }, @@ -2039,9 +2117,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Check destinations at this stage // StRSR - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt, 15) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt, 10000) // Furnace - expect(await rToken.balanceOf(furnace.address)).to.equal(minBuyAmtRToken) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken, 10000) // Run final auction until all funds are converted // Advance time till auction ended @@ -2078,11 +2156,11 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // StRSR expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( minBuyAmt.add(minBuyAmtRemainder), - 15 + 10000 ) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e2')) // melting + minBuyAmtRToken.div(bn('1e2')) ) }) @@ -2091,9 +2169,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set f = 1 await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) ) .to.emit(distributor, 'DistributionSet') .withArgs(FURNACE_DEST, bn(0), bn(0)) @@ -2101,10 +2183,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(1) }) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(10000) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(1)) + .withArgs(STRSR_DEST, bn(0), bn(10000)) // Transfer some RSR to RevenueTraders await rsr.connect(addr1).transfer(rTokenTrader.address, distAmount) @@ -2152,10 +2234,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(10000), rsrDist: bn(0) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) + .withArgs(FURNACE_DEST, bn(10000), bn(0)) await expect( distributor .connect(owner) @@ -2176,38 +2258,6 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) - it('Should not start trades if no distribution defined', async () => { - // Check funds in Backing Manager and destinations - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - - // Set f = 0, avoid dropping tokens - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - - await expect( - rsrTrader.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) - ).to.be.revertedWith('zero distribution') - - // Check funds, nothing changed - expect(await rsr.balanceOf(backingManager.address)).to.equal(0) - expect(await rsr.balanceOf(stRSR.address)).to.equal(0) - expect(await rToken.balanceOf(furnace.address)).to.equal(0) - }) - it('Should handle no distribution defined when settling trade', async () => { // Set COMP tokens as reward rewardAmountCOMP = bn('0.8e18') @@ -2217,7 +2267,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountCOMP.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder @@ -2246,7 +2296,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, compToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -2257,7 +2307,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { compToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -2307,10 +2357,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(10000), rsrDist: bn(0) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(1), bn(0)) + .withArgs(FURNACE_DEST, bn(10000), bn(0)) await expect( distributor .connect(owner) @@ -2351,10 +2401,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rsr.balanceOf(stRSR.address)).to.equal(bn(0)) // Furnace - RTokens transferred to destination - expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(rTokenTrader.address)).to.closeTo(bn(0), 10000) expect(await rToken.balanceOf(furnace.address)).to.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e15')) + minBuyAmtRToken.div(bn('1e13')) ) }) @@ -2367,7 +2417,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between COMP and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountCOMP.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountCOMP.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountCOMP.sub(sellAmt) // Remainder @@ -2396,7 +2446,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, compToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, compToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -2407,7 +2457,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { compToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -2515,7 +2565,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await aaveToken.balanceOf(backingManager.address)).to.equal(rewardAmountAAVE) // Set expected values, based on f = 0.6 - const expectedToTrader = rewardAmountAAVE.mul(60).div(100) + const expectedToTrader = rewardAmountAAVE.mul(6000).div(10000) const expectedToFurnace = rewardAmountAAVE.sub(expectedToTrader) // Check status of traders at this point @@ -2552,7 +2602,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder @@ -2584,7 +2634,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -2595,7 +2645,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -2681,8 +2731,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await broker.batchTradeDisabled()).to.equal(true) // Check funds at destinations - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt.sub(10), 50) - expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 50) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt.sub(10), 5000) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo(minBuyAmtRToken.sub(10), 5000) }) it('Should report violation even if paused or frozen', async () => { @@ -2696,7 +2746,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder @@ -2714,7 +2764,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -2725,7 +2775,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -2817,7 +2867,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder @@ -2851,7 +2901,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -2862,7 +2912,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -2934,7 +2984,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder @@ -2968,7 +3018,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -2979,7 +3029,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -3068,7 +3118,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await disableBatchTrade() // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder // Attempt to run auctions @@ -3133,10 +3183,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(other.address, { rTokenDist: bn(40), rsrDist: bn(60) }) + .setDistribution(other.address, { rTokenDist: bn(4000), rsrDist: bn(6000) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(other.address, bn(40), bn(60)) + .withArgs(other.address, bn(4000), bn(6000)) // Set AAVE tokens as reward rewardAmountAAVE = bn('1e18') @@ -3146,7 +3196,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = rewardAmountAAVE.mul(60).div(100) // due to f = 60% + const sellAmt: BigNumber = rewardAmountAAVE.mul(6000).div(10000) // due to f = 6000% const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.sub(sellAmt) // Remainder @@ -3178,7 +3228,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, aaveToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -3189,7 +3239,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { aaveToken.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -3264,21 +3314,21 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // StRSR - 50% to StRSR, 50% to other expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( minBuyAmt.div(2), - minBuyAmt.div(2).div(bn('1e15')) + minBuyAmt.div(2).div(bn('1e13')) ) expect(await rsr.balanceOf(other.address)).to.be.closeTo( minBuyAmt.div(2), - minBuyAmt.div(2).div(bn('1e15')) + minBuyAmt.div(2).div(bn('1e13')) ) // Furnace - 50% to Furnace, 50% to other expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmtRToken.div(2), - minBuyAmtRToken.div(2).div(bn('1e15')) + minBuyAmtRToken.div(2).div(bn('1e13')) ) expect(await rToken.balanceOf(other.address)).to.be.closeTo( minBuyAmtRToken.div(2), - minBuyAmtRToken.div(2).div(bn('1e15')) + minBuyAmtRToken.div(2).div(bn('1e13')) ) }) @@ -3287,33 +3337,30 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(other.address, { rTokenDist: bn(0), rsrDist: bn(1) }) + .setDistribution(other.address, { rTokenDist: bn(0), rsrDist: bn(10000) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(other.address, bn(0), bn(1)) + .withArgs(other.address, bn(0), bn(10000)) // No distribution to Furnace or StRSR await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [other.address, STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: bn(10000) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + { rTokenDist: bn(0), rsrDist: bn(0) }, + ] + ) ) .to.emit(distributor, 'DistributionSet') .withArgs(FURNACE_DEST, bn(0), bn(0)) - await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(0)) - const rsrBalInDestination = await rsr.balanceOf(other.address) await rsr.connect(owner).mint(rsrTrader.address, issueAmount) await rsrTrader.distributeTokenToBuy() const expectedAmount = rsrBalInDestination.add(issueAmount) - expect(await rsr.balanceOf(other.address)).to.be.closeTo(expectedAmount, 100) + expect(await rsr.balanceOf(other.address)).to.be.closeTo(expectedAmount, 10000) }) it('Should claim but not sweep rewards to BackingManager from the Revenue Traders', async () => { @@ -3686,7 +3733,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { issueAmount, config.maxTradeSlippage ) - expect(actual).to.be.closeTo(expected, expected.div(bn('1e15'))) + expect(actual).to.be.closeTo(expected, expected.div(bn('1e13'))) const staticResult = await router .connect(addr1) @@ -3777,7 +3824,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { config.maxTradeSlippage ) expect(await rTokenTrader.tradesOpen()).to.equal(0) - expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo(0, 100) + expect(await rToken.balanceOf(rTokenTrader.address)).to.be.closeTo(0, 10000) expect(await rToken.balanceOf(furnace.address)).to.equal(expected) }) }) @@ -3867,7 +3914,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Expected values const currentTotalSupply: BigNumber = await rToken.totalSupply() - const expectedToTrader = excessQuantity.mul(60).div(100) + const expectedToTrader = excessQuantity.mul(6000).div(10000) const expectedToFurnace = excessQuantity.sub(expectedToTrader) const sellAmt: BigNumber = expectedToTrader // everything is auctioned, below max auction @@ -3880,7 +3927,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, token2.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, token2.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, { @@ -3891,7 +3938,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { token2.address, rToken.address, sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -3983,11 +4030,11 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( minBuyAmt, - minBuyAmt.div(bn('1e15')) + minBuyAmt.div(bn('1e13')) ) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( minBuyAmtRToken, - minBuyAmtRToken.div(bn('1e15')) + minBuyAmtRToken.div(bn('1e13')) ) // Check no more funds in Market and Traders @@ -4021,8 +4068,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Expected values const currentTotalSupply: BigNumber = await rToken.totalSupply() - const expectedToTrader = divCeil(excessQuantity.mul(60), bn(100)).sub(60) - const expectedToFurnace = divCeil(excessQuantity.mul(40), bn(100)).sub(40) // excessQuantity.sub(expectedToTrader) + const expectedToTrader = divCeil(excessQuantity.mul(6000), bn(10000)).sub(6000) + const expectedToFurnace = divCeil(excessQuantity.mul(4000), bn(10000)).sub(4000) // excessQuantity.sub(expectedToTrader) const sellAmt: BigNumber = expectedToTrader const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1.02'), fp('1')) @@ -4035,7 +4082,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, token2.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [ + anyValue, + token2.address, + rsr.address, + withinTolerance(sellAmt), + withinTolerance(minBuyAmt), + ], emitted: true, }, { @@ -4045,8 +4098,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { anyValue, token2.address, rToken.address, - sellAmtRToken, - withinQuad(minBuyAmtRToken), + withinTolerance(sellAmtRToken), + withinTolerance(minBuyAmtRToken), ], emitted: true, }, @@ -4055,7 +4108,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Check Price (unchanged) and Assets value (restored) - Supply remains constant await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) expect( - near(await facadeTest.callStatic.totalAssetValue(rToken.address), issueAmount, 100) + near(await facadeTest.callStatic.totalAssetValue(rToken.address), issueAmount, 10000) ).to.equal(true) expect( (await facadeTest.callStatic.totalAssetValue(rToken.address)).gt(issueAmount) @@ -4086,8 +4139,11 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { }) // Check funds in Market and Traders - expect(near(await token2.balanceOf(gnosis.address), excessQuantity, 100)).to.equal(true) - expect(await token2.balanceOf(gnosis.address)).to.equal(sellAmt.add(sellAmtRToken)) + expect(near(await token2.balanceOf(gnosis.address), excessQuantity, 10000)).to.equal(true) + expect(await token2.balanceOf(gnosis.address)).to.be.closeTo( + sellAmt.add(sellAmtRToken), + 10000 + ) expect(await token2.balanceOf(rsrTrader.address)).to.equal(expectedToTrader.sub(sellAmt)) expect(await token2.balanceOf(rsrTrader.address)).to.equal(0) expect(await token2.balanceOf(rTokenTrader.address)).to.equal( @@ -4126,22 +4182,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { args: [anyValue, token2.address, rToken.address, sellAmtRToken, minBuyAmtRToken], emitted: true, }, - { - contract: rsrTrader, - name: 'TradeStarted', - emitted: false, - }, - { - contract: rTokenTrader, - name: 'TradeStarted', - emitted: false, - }, ]) // Check Price (unchanged) and Assets value (unchanged) await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) expect( - near(await facadeTest.callStatic.totalAssetValue(rToken.address), issueAmount, 100) + near(await facadeTest.callStatic.totalAssetValue(rToken.address), issueAmount, 10000) ).to.equal(true) expect( (await facadeTest.callStatic.totalAssetValue(rToken.address)).gt(issueAmount) @@ -4150,9 +4196,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Check balances sent to corresponding destinations // StRSR - expect(near(await rsr.balanceOf(stRSR.address), minBuyAmt, 100)).to.equal(true) + expect(near(await rsr.balanceOf(stRSR.address), minBuyAmt, 10000)).to.equal(true) // Furnace - expect(near(await rToken.balanceOf(furnace.address), minBuyAmtRToken, 100)).to.equal(true) + expect(near(await rToken.balanceOf(furnace.address), minBuyAmtRToken, 10000)).to.equal(true) }) it('Should not oversend if backingManager.forwardRevenue() is called with duplicate tokens', async () => { @@ -4227,7 +4273,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) // Set expected minting, based on f = 0.6 - const expectedToTrader = issueAmount.mul(60).div(100) + const expectedToTrader = issueAmount.mul(6000).div(10000) const expectedToFurnace = issueAmount.sub(expectedToTrader) // Set expected auction values @@ -4247,7 +4293,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeStarted', - args: [anyValue, rToken.address, rsr.address, sellAmt, withinQuad(minBuyAmt)], + args: [anyValue, rToken.address, rsr.address, sellAmt, withinTolerance(minBuyAmt)], emitted: true, }, ]) @@ -4317,7 +4363,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(gnosis.address)).to.equal(0) // Check destinations after newly minted tokens - expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt, 1000) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt, 100000) expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) }) @@ -4350,18 +4396,18 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set expected values based on f=0.6 const currentTotalSupply: BigNumber = await rToken.totalSupply() - const excessRToken: BigNumber = issueAmount.mul(60).div(100) + const excessRToken: BigNumber = issueAmount.mul(6000).div(10000) const excessCollateralValue: BigNumber = excessTotalValue.sub(excessRToken) const excessCollateralQty: BigNumber = excessCollateralValue.div(2) // each unit of this collateral is worth now $2 - const expectedToTraderFromRToken = divCeil(excessRToken.mul(60), bn(100)) + const expectedToTraderFromRToken = divCeil(excessRToken.mul(6000), bn(10000)) const expectedToFurnaceFromRToken = excessRToken.sub(expectedToTraderFromRToken) - const expectedToRSRTraderFromCollateral = divCeil(excessCollateralQty.mul(60), bn(100)) + const expectedToRSRTraderFromCollateral = divCeil(excessCollateralQty.mul(6000), bn(10000)) const expectedToRTokenTraderFromCollateral = excessCollateralQty.sub( expectedToRSRTraderFromCollateral ) // Set expected auction values - const newTotalSupply: BigNumber = currentTotalSupply.mul(160).div(100) + const newTotalSupply: BigNumber = currentTotalSupply.mul(16000).div(10000) const sellAmtFromRToken: BigNumber = expectedToTraderFromRToken // all will be processed at once, due to max trade volume of 50% const minBuyAmtFromRToken: BigNumber = await toMinBuyAmt( sellAmtFromRToken, @@ -4397,7 +4443,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rToken.address, rsr.address, sellAmtFromRToken, - withinQuad(minBuyAmtFromRToken), + withinTolerance(minBuyAmtFromRToken), ], emitted: true, }, @@ -4409,7 +4455,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { token2.address, rsr.address, sellAmtRSRFromCollateral, - withinQuad(minBuyAmtRSRFromCollateral.mul(2)), + withinTolerance(minBuyAmtRSRFromCollateral.mul(2)), ], emitted: true, }, @@ -4421,7 +4467,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { token2.address, rToken.address, sellAmtRTokenFromCollateral, - withinQuad(minBuyAmtRTokenFromCollateral.mul(2)), + withinTolerance(minBuyAmtRTokenFromCollateral.mul(2)), ], emitted: true, }, @@ -4568,7 +4614,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { const expectedRSR = minBuyAmtFromRToken.add(minBuyAmtRSRFromCollateral) expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( expectedRSR, - expectedRSR.div(bn('1e15')) + expectedRSR.div(bn('1e13')) ) expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) expect(await token2.balanceOf(rsrTrader.address)).to.equal(0) @@ -4579,7 +4625,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set distribution for RToken only (f=0) await distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(10000), rsrDist: bn(0) }) await distributor .connect(owner) @@ -4637,7 +4683,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { { contract: rToken, name: 'Transfer', - args: [ZERO_ADDRESS, backingManager.address, withinQuad(excessRevenue)], + args: [ZERO_ADDRESS, backingManager.address, withinTolerance(excessRevenue)], emitted: true, }, { @@ -4744,8 +4790,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { 'Transfer' ) expect(await aaveToken.balanceOf(backingManager.address)).to.equal(0) - expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal(rewardAmt.mul(60).div(100)) - expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal(rewardAmt.mul(40).div(100)) + expect(await aaveToken.balanceOf(rsrTrader.address)).to.equal( + rewardAmt.mul(6000).div(10000) + ) + expect(await aaveToken.balanceOf(rTokenTrader.address)).to.equal( + rewardAmt.mul(4000).div(10000) + ) }) }) }) @@ -4825,11 +4875,10 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Set f = 0.8 (0.2 for Rtoken) await distributor .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(4) }) - + .setDistribution(FURNACE_DEST, { rTokenDist: bn(10000), rsrDist: bn(0) }) await distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(1), rsrDist: bn(0) }) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(4) }) // Set COMP tokens as reward rewardAmountCOMP = bn('2e18') diff --git a/test/Upgradeability.test.ts b/test/Upgradeability.test.ts index bacd80f602..0e4e24bd0d 100644 --- a/test/Upgradeability.test.ts +++ b/test/Upgradeability.test.ts @@ -1,10 +1,11 @@ import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' -import { ContractFactory, Wallet } from 'ethers' +import { ContractFactory } from 'ethers' import { ethers, upgrades } from 'hardhat' -import { IComponents, IConfig } from '../common/configuration' +import { IComponents, IConfig, IImplementations } from '../common/configuration' import { OWNER, SHORT_FREEZER, LONG_FREEZER, PAUSER } from '../common/constants' +import { whileImpersonating } from './utils/impersonation' import { bn } from '../common/numbers' import { Asset, @@ -17,6 +18,7 @@ import { BasketLibP1, BrokerP1, BrokerP1V2, + DeployerP1, DistributorP1, DistributorP1V2, DutchTrade, @@ -45,13 +47,24 @@ import { TestIRToken, TestIStRSR, RecollateralizationLibP1, + VersionRegistry, + DeployerP1V2, + AssetPluginRegistry, } from '../typechain' import { defaultFixture, Implementation, IMPLEMENTATION } from './fixtures' const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip +const MAIN_OWNER_ROLE = '0x4f574e4552000000000000000000000000000000000000000000000000000000' + +// Helper function to calculate hash for a specific version +const toHash = (version: string): string => { + return ethers.utils.keccak256(ethers.utils.toUtf8Bytes(version)) +} + describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { let owner: SignerWithAddress + let other: SignerWithAddress // Config let config: IConfig @@ -78,6 +91,7 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { let rTokenTrader: TestIRevenueTrader let tradingLib: RecollateralizationLibP1 let basketLib: BasketLibP1 + let deployer: DeployerP1 // Factories let MainFactory: ContractFactory @@ -93,17 +107,12 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { let DutchTradeFactory: ContractFactory let StRSRFactory: ContractFactory - let notWallet: Wallet - - before('create fixture loader', async () => { - ;[, notWallet] = (await ethers.getSigners()) as unknown as Wallet[] - }) - beforeEach(async () => { - ;[owner] = await ethers.getSigners() + ;[owner, other] = await ethers.getSigners() // Deploy fixture ;({ + deployer, rsr, rsrAsset, config, @@ -302,8 +311,8 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { await newDistributor.deployed() const [rTokenTotal, rsrTotal] = await newDistributor.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) + expect(rsrTotal).equal(bn(6000)) + expect(rTokenTotal).equal(bn(4000)) expect(await newDistributor.main()).to.equal(main.address) }) @@ -394,332 +403,700 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { }) describe('Upgrades', () => { - it('Should only allow OWNER to upgrade - Main', async () => { - const MainV2Factory: ContractFactory = await ethers.getContractFactory('MainP1V2', notWallet) - await expect(upgrades.upgradeProxy(main.address, MainV2Factory)).revertedWith( - `AccessControl: account ${notWallet.address.toLowerCase()} is missing role 0x4f574e4552000000000000000000000000000000000000000000000000000000` - ) - }) - - it('Should only allow governance to upgrade - Component', async () => { - const AssetRegV2Factory: ContractFactory = await ethers.getContractFactory( - 'AssetRegistryP1V2', - notWallet - ) - await expect(upgrades.upgradeProxy(assetRegistry.address, AssetRegV2Factory)).revertedWith( - 'governance only' - ) - }) - - it('Should upgrade correctly - Main', async () => { - // Upgrading + it('Should only allow Main to upgrade itself', async () => { const MainV2Factory: ContractFactory = await ethers.getContractFactory('MainP1V2') - const mainV2: MainP1V2 = await upgrades.upgradeProxy(main.address, MainV2Factory) - - // Check address is maintained - expect(mainV2.address).to.equal(main.address) - - // Check state is preserved - expect(await mainV2.tradingPaused()).to.equal(false) - expect(await mainV2.issuancePaused()).to.equal(false) - expect(await mainV2.frozen()).to.equal(false) - expect(await mainV2.tradingPausedOrFrozen()).to.equal(false) - expect(await mainV2.issuancePausedOrFrozen()).to.equal(false) - expect(await mainV2.hasRole(OWNER, owner.address)).to.equal(true) - expect(await mainV2.hasRole(OWNER, main.address)).to.equal(false) - expect(await mainV2.hasRole(SHORT_FREEZER, owner.address)).to.equal(true) - expect(await mainV2.hasRole(SHORT_FREEZER, main.address)).to.equal(false) - expect(await mainV2.hasRole(LONG_FREEZER, owner.address)).to.equal(true) - expect(await mainV2.hasRole(LONG_FREEZER, main.address)).to.equal(false) - expect(await mainV2.hasRole(PAUSER, owner.address)).to.equal(true) - expect(await mainV2.hasRole(PAUSER, main.address)).to.equal(false) + const mainV2ImplAddr = (await upgrades.prepareUpgrade(main.address, MainV2Factory, { + kind: 'uups', + })) as string - // Components - expect(await mainV2.stRSR()).to.equal(stRSR.address) - expect(await mainV2.rToken()).to.equal(rToken.address) - expect(await mainV2.assetRegistry()).to.equal(assetRegistry.address) - expect(await mainV2.basketHandler()).to.equal(basketHandler.address) - expect(await mainV2.backingManager()).to.equal(backingManager.address) - expect(await mainV2.distributor()).to.equal(distributor.address) - expect(await mainV2.furnace()).to.equal(furnace.address) - expect(await mainV2.broker()).to.equal(broker.address) - expect(await mainV2.rsrTrader()).to.equal(rsrTrader.address) - expect(await mainV2.rTokenTrader()).to.equal(rTokenTrader.address) - - // Check new version is implemented - expect(await mainV2.version()).to.equal('2.0.0') - - expect(await mainV2.newValue()).to.equal(0) - await mainV2.connect(owner).setNewValue(bn(1000)) - expect(await mainV2.newValue()).to.equal(bn(1000)) + const upgMain = await ethers.getContractAt('MainP1', main.address) + await expect(upgMain.connect(owner).upgradeTo(mainV2ImplAddr)).revertedWith('not self') }) - it('Should upgrade correctly - AssetRegistry', async () => { - // Upgrading + it('Should only allow Main to upgrade - Component', async () => { const AssetRegV2Factory: ContractFactory = await ethers.getContractFactory( 'AssetRegistryP1V2' ) - const assetRegV2: AssetRegistryP1V2 = ( - await upgrades.upgradeProxy(assetRegistry.address, AssetRegV2Factory) - ) - - // Check address is maintained - expect(assetRegV2.address).to.equal(assetRegistry.address) - - // Check state is preserved - expect(await assetRegV2.isRegistered(rsr.address)).to.equal(true) - expect(await assetRegV2.isRegistered(rToken.address)).to.equal(true) - expect(await assetRegV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await assetRegV2.version()).to.equal('2.0.0') - - expect(await assetRegV2.newValue()).to.equal(0) - await assetRegV2.connect(owner).setNewValue(bn(1000)) - expect(await assetRegV2.newValue()).to.equal(bn(1000)) - }) - - it('Should upgrade correctly - BackingManager', async () => { - // Upgrading - const BackingMgrV2Factory: ContractFactory = await ethers.getContractFactory( - 'BackingManagerP1V2', - { - libraries: { - RecollateralizationLibP1: tradingLib.address, - }, - } - ) - const backingMgrV2: BackingManagerP1V2 = await upgrades.upgradeProxy( - backingManager.address, - BackingMgrV2Factory, - { - unsafeAllow: ['external-library-linking', 'delegatecall'], // TradingLib - } - ) - - // Check address is maintained - expect(backingMgrV2.address).to.equal(backingManager.address) - - // Check state is preserved - expect(await backingMgrV2.tradingDelay()).to.equal(config.tradingDelay) - expect(await backingMgrV2.backingBuffer()).to.equal(config.backingBuffer) - expect(await backingMgrV2.maxTradeSlippage()).to.equal(config.maxTradeSlippage) - expect(await backingMgrV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await backingMgrV2.version()).to.equal('2.0.0') - - expect(await backingMgrV2.newValue()).to.equal(0) - await backingMgrV2.connect(owner).setNewValue(bn(1000)) - expect(await backingMgrV2.newValue()).to.equal(bn(1000)) - }) - it('Should upgrade correctly - BasketHandler', async () => { - // Upgrading - const BasketHandlerV2Factory: ContractFactory = await ethers.getContractFactory( - 'BasketHandlerP1V2', - { libraries: { BasketLibP1: basketLib.address } } - ) - const bskHndlrV2: BasketHandlerP1V2 = await upgrades.upgradeProxy( - basketHandler.address, - BasketHandlerV2Factory, + const assetRegV2ImplAddr = (await upgrades.prepareUpgrade( + assetRegistry.address, + AssetRegV2Factory, { - unsafeAllow: ['external-library-linking'], // BasketLibP1 - } - ) - - // Check address is maintained - expect(bskHndlrV2.address).to.equal(basketHandler.address) - - // Check state is preserved - expect(await bskHndlrV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await bskHndlrV2.version()).to.equal('2.0.0') - - expect(await bskHndlrV2.newValue()).to.equal(0) - await bskHndlrV2.connect(owner).setNewValue(bn(1000)) - expect(await bskHndlrV2.newValue()).to.equal(bn(1000)) - }) - - it('Should upgrade correctly - Broker', async () => { - // Upgrading - const BrokerV2Factory: ContractFactory = await ethers.getContractFactory('BrokerP1V2') - const brokerV2: BrokerP1V2 = ( - await upgrades.upgradeProxy(broker.address, BrokerV2Factory) - ) - - // Check address is maintained - expect(brokerV2.address).to.equal(broker.address) - - // Check state is preserved - expect(await brokerV2.gnosis()).to.equal(gnosis.address) - expect(await brokerV2.batchAuctionLength()).to.equal(config.batchAuctionLength) - expect(await brokerV2.batchTradeDisabled()).to.equal(false) - expect(await brokerV2.dutchTradeDisabled(rToken.address)).to.equal(false) - expect(await brokerV2.dutchTradeDisabled(rsr.address)).to.equal(false) - expect(await brokerV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await brokerV2.version()).to.equal('2.0.0') - - expect(await brokerV2.newValue()).to.equal(0) - await brokerV2.connect(owner).setNewValue(bn(1000)) - expect(await brokerV2.newValue()).to.equal(bn(1000)) - }) - - it('Should upgrade correctly - Distributor', async () => { - // Upgrading - const DistributorV2Factory: ContractFactory = await ethers.getContractFactory( - 'DistributorP1V2' - ) - const distributorV2: DistributorP1V2 = ( - await upgrades.upgradeProxy(distributor.address, DistributorV2Factory) - ) - - // Check address is maintained - expect(distributorV2.address).to.equal(distributor.address) - - // Check state is preserved - const [rTokenTotal, rsrTotal] = await distributorV2.totals() - expect(rsrTotal).equal(bn(60)) - expect(rTokenTotal).equal(bn(40)) - expect(await distributorV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await distributorV2.version()).to.equal('2.0.0') - - expect(await distributorV2.newValue()).to.equal(0) - await distributorV2.connect(owner).setNewValue(bn(1000)) - expect(await distributorV2.newValue()).to.equal(bn(1000)) - }) - - it('Should upgrade correctly - Furnace', async () => { - // Upgrading - const FurnaceV2Factory: ContractFactory = await ethers.getContractFactory('FurnaceP1V2') - const furnaceV2: FurnaceP1V2 = ( - await upgrades.upgradeProxy(furnace.address, FurnaceV2Factory) - ) - - // Check address is maintained - expect(furnaceV2.address).to.equal(furnace.address) - - // Check state is preserved - expect(await furnaceV2.ratio()).to.equal(config.rewardRatio) - expect(await furnaceV2.lastPayout()).to.be.gt(0) // A timestamp is set - expect(await furnaceV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await furnaceV2.version()).to.equal('2.0.0') - - expect(await furnaceV2.newValue()).to.equal(0) - await furnaceV2.connect(owner).setNewValue(bn(1000)) - expect(await furnaceV2.newValue()).to.equal(bn(1000)) - }) - - it('Should upgrade correctly - RevenueTrader', async () => { - // Upgrading - const RevTraderV2Factory: ContractFactory = await ethers.getContractFactory( - 'RevenueTraderP1V2' - ) - const rsrTraderV2: RevenueTraderP1V2 = await upgrades.upgradeProxy( - rsrTrader.address, - RevTraderV2Factory, - { - unsafeAllow: ['delegatecall'], // Multicall + kind: 'uups', } - ) + )) as string - const rTokenTraderV2: RevenueTraderP1V2 = await upgrades.upgradeProxy( - rTokenTrader.address, - RevTraderV2Factory, - { - unsafeAllow: ['delegatecall'], // Multicall - } + const upgAR = ( + await ethers.getContractAt('AssetRegistryP1', assetRegistry.address) ) - - // Check addresses are maintained - expect(rsrTraderV2.address).to.equal(rsrTrader.address) - expect(rTokenTraderV2.address).to.equal(rTokenTrader.address) - - // Check state is preserved - expect(await rsrTraderV2.tokenToBuy()).to.equal(rsr.address) - expect(await rsrTraderV2.maxTradeSlippage()).to.equal(config.maxTradeSlippage) - expect(await rsrTraderV2.main()).to.equal(main.address) - - expect(await rTokenTraderV2.tokenToBuy()).to.equal(rToken.address) - expect(await rTokenTraderV2.maxTradeSlippage()).to.equal(config.maxTradeSlippage) - expect(await rTokenTraderV2.main()).to.equal(main.address) - - // Check new version is implemented - expect(await rsrTraderV2.version()).to.equal('2.0.0') - expect(await rTokenTraderV2.version()).to.equal('2.0.0') - - expect(await rsrTraderV2.newValue()).to.equal(0) - await rsrTraderV2.connect(owner).setNewValue(bn(1000)) - expect(await rsrTraderV2.newValue()).to.equal(bn(1000)) - - expect(await rTokenTraderV2.newValue()).to.equal(0) - await rTokenTraderV2.connect(owner).setNewValue(bn(500)) - expect(await rTokenTraderV2.newValue()).to.equal(bn(500)) + await expect(upgAR.connect(owner).upgradeTo(assetRegV2ImplAddr)).revertedWith('main only') }) - it('Should upgrade correctly - RToken', async () => { - // Upgrading - const RTokenV2Factory: ContractFactory = await ethers.getContractFactory('RTokenP1V2') - const rTokenV2: RTokenP1V2 = ( - await upgrades.upgradeProxy(rToken.address, RTokenV2Factory) - ) + context('With deployed implementations', function () { + let MainV2Factory: ContractFactory + let AssetRegV2Factory: ContractFactory + let BackingMgrV2Factory: ContractFactory + let BasketHandlerV2Factory: ContractFactory + let BrokerV2Factory: ContractFactory + let DistributorV2Factory: ContractFactory + let FurnaceV2Factory: ContractFactory + let RevTraderV2Factory: ContractFactory + let RTokenV2Factory: ContractFactory + let StRSRV2Factory: ContractFactory + + let mainV2ImplAddr: string + let assetRegV2ImplAddr: string + let backingMgrV2ImplAddr: string + let bskHndlrV2ImplAddr: string + let brokerV2ImplAddr: string + let distributorV2ImplAddr: string + let furnaceV2ImplAddr: string + let rsrTraderV2ImplAddr: string + let rTokenTraderV2ImplAddr: string + let rTokenV2ImplAddr: string + let stRSRV2ImplAddr: string + + beforeEach(async () => { + MainV2Factory = await ethers.getContractFactory('MainP1V2') + AssetRegV2Factory = await ethers.getContractFactory('AssetRegistryP1V2') + BackingMgrV2Factory = await ethers.getContractFactory('BackingManagerP1V2', { + libraries: { + RecollateralizationLibP1: tradingLib.address, + }, + }) - // Check address is maintained - expect(rTokenV2.address).to.equal(rToken.address) - - // Check state is preserved - expect(await rTokenV2.name()).to.equal('RTKN RToken') - expect(await rTokenV2.symbol()).to.equal('RTKN') - expect(await rTokenV2.decimals()).to.equal(18) - expect(await rTokenV2.totalSupply()).to.equal(bn(0)) - expect(await rTokenV2.main()).to.equal(main.address) - const issThrottle = await rToken.issuanceThrottleParams() - expect(issThrottle.amtRate).to.equal(config.issuanceThrottle.amtRate) - expect(issThrottle.pctRate).to.equal(config.issuanceThrottle.pctRate) - const redemptionThrottle = await rToken.redemptionThrottleParams() - expect(redemptionThrottle.amtRate).to.equal(config.redemptionThrottle.amtRate) - expect(redemptionThrottle.pctRate).to.equal(config.redemptionThrottle.pctRate) - - // Check new version is implemented - expect(await rTokenV2.version()).to.equal('2.0.0') - - expect(await rTokenV2.newValue()).to.equal(0) - await rTokenV2.connect(owner).setNewValue(bn(1000)) - expect(await rTokenV2.newValue()).to.equal(bn(1000)) - }) + BasketHandlerV2Factory = await ethers.getContractFactory('BasketHandlerP1V2', { + libraries: { BasketLibP1: basketLib.address }, + }) - it('Should upgrade correctly - StRSR', async () => { - // Upgrading - const StRSRV2Factory: ContractFactory = await ethers.getContractFactory('StRSRP1VotesV2') - const stRSRV2: StRSRP1VotesV2 = ( - await upgrades.upgradeProxy(stRSR.address, StRSRV2Factory) - ) + BrokerV2Factory = await ethers.getContractFactory('BrokerP1V2') + DistributorV2Factory = await ethers.getContractFactory('DistributorP1V2') + FurnaceV2Factory = await ethers.getContractFactory('FurnaceP1V2') + RevTraderV2Factory = await ethers.getContractFactory('RevenueTraderP1V2') + RTokenV2Factory = await ethers.getContractFactory('RTokenP1V2') + StRSRV2Factory = await ethers.getContractFactory('StRSRP1VotesV2') - // Check address is maintained - expect(stRSRV2.address).to.equal(stRSR.address) + mainV2ImplAddr = (await upgrades.prepareUpgrade(main.address, MainV2Factory, { + kind: 'uups', + })) as string + + assetRegV2ImplAddr = (await upgrades.prepareUpgrade( + assetRegistry.address, + AssetRegV2Factory, + { + kind: 'uups', + } + )) as string + + backingMgrV2ImplAddr = (await upgrades.prepareUpgrade( + backingManager.address, + BackingMgrV2Factory, + { + kind: 'uups', + unsafeAllow: ['external-library-linking', 'delegatecall'], // TradingLib + } + )) as string + + bskHndlrV2ImplAddr = (await upgrades.prepareUpgrade( + basketHandler.address, + BasketHandlerV2Factory, + { + kind: 'uups', + unsafeAllow: ['external-library-linking'], // BasketLibP1 + } + )) as string + + brokerV2ImplAddr = (await upgrades.prepareUpgrade(broker.address, BrokerV2Factory, { + kind: 'uups', + })) as string - // Check state is preserved - expect(await stRSRV2.name()).to.equal('rtknRSR Token') - expect(await stRSRV2.symbol()).to.equal('rtknRSR') - expect(await stRSRV2.decimals()).to.equal(18) - expect(await stRSRV2.totalSupply()).to.equal(0) - expect(await stRSRV2.unstakingDelay()).to.equal(config.unstakingDelay) - expect(await stRSRV2.rewardRatio()).to.equal(config.rewardRatio) - expect(await stRSRV2.main()).to.equal(main.address) + distributorV2ImplAddr = (await upgrades.prepareUpgrade( + distributor.address, + DistributorV2Factory, + { + kind: 'uups', + } + )) as string - // Check new version is implemented - expect(await stRSRV2.version()).to.equal('2.0.0') + furnaceV2ImplAddr = (await upgrades.prepareUpgrade(furnace.address, FurnaceV2Factory, { + kind: 'uups', + })) as string + + rsrTraderV2ImplAddr = (await upgrades.prepareUpgrade( + rsrTrader.address, + RevTraderV2Factory, + { + kind: 'uups', + unsafeAllow: ['delegatecall'], // Multicall + } + )) as string + + rTokenTraderV2ImplAddr = (await upgrades.prepareUpgrade( + rTokenTrader.address, + RevTraderV2Factory, + { + kind: 'uups', + unsafeAllow: ['delegatecall'], // Multicall + } + )) as string + + rTokenV2ImplAddr = (await upgrades.prepareUpgrade(rToken.address, RTokenV2Factory, { + kind: 'uups', + })) as string - expect(await stRSRV2.newValue()).to.equal(0) - await stRSRV2.connect(owner).setNewValue(bn(1000)) - expect(await stRSRV2.newValue()).to.equal(bn(1000)) + stRSRV2ImplAddr = (await upgrades.prepareUpgrade(stRSR.address, StRSRV2Factory, { + kind: 'uups', + })) as string + }) + + it('Should upgrade correctly - Main', async () => { + const upgMain = await ethers.getContractAt('MainP1', main.address) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgMain.connect(upgSigner).upgradeTo(mainV2ImplAddr) + }) + + const mainV2: MainP1V2 = await ethers.getContractAt('MainP1V2', main.address) + + // Check address is maintained + expect(mainV2.address).to.equal(main.address) + + // Check state is preserved + expect(await mainV2.tradingPaused()).to.equal(false) + expect(await mainV2.issuancePaused()).to.equal(false) + expect(await mainV2.frozen()).to.equal(false) + expect(await mainV2.tradingPausedOrFrozen()).to.equal(false) + expect(await mainV2.issuancePausedOrFrozen()).to.equal(false) + expect(await mainV2.hasRole(OWNER, owner.address)).to.equal(true) + expect(await mainV2.hasRole(OWNER, main.address)).to.equal(false) + expect(await mainV2.hasRole(SHORT_FREEZER, owner.address)).to.equal(true) + expect(await mainV2.hasRole(SHORT_FREEZER, main.address)).to.equal(false) + expect(await mainV2.hasRole(LONG_FREEZER, owner.address)).to.equal(true) + expect(await mainV2.hasRole(LONG_FREEZER, main.address)).to.equal(false) + expect(await mainV2.hasRole(PAUSER, owner.address)).to.equal(true) + expect(await mainV2.hasRole(PAUSER, main.address)).to.equal(false) + + // Components + expect(await mainV2.stRSR()).to.equal(stRSR.address) + expect(await mainV2.rToken()).to.equal(rToken.address) + expect(await mainV2.assetRegistry()).to.equal(assetRegistry.address) + expect(await mainV2.basketHandler()).to.equal(basketHandler.address) + expect(await mainV2.backingManager()).to.equal(backingManager.address) + expect(await mainV2.distributor()).to.equal(distributor.address) + expect(await mainV2.furnace()).to.equal(furnace.address) + expect(await mainV2.broker()).to.equal(broker.address) + expect(await mainV2.rsrTrader()).to.equal(rsrTrader.address) + expect(await mainV2.rTokenTrader()).to.equal(rTokenTrader.address) + + // Check new version is implemented + expect(await mainV2.version()).to.equal('2.0.0') + + expect(await mainV2.newValue()).to.equal(0) + await mainV2.connect(owner).setNewValue(bn(1000)) + expect(await mainV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - AssetRegistry', async () => { + const upgAR = ( + await ethers.getContractAt('AssetRegistryP1', assetRegistry.address) + ) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgAR.connect(upgSigner).upgradeTo(assetRegV2ImplAddr) + }) + + const assetRegV2: AssetRegistryP1V2 = ( + await ethers.getContractAt('AssetRegistryP1V2', assetRegistry.address) + ) + + // Check address is maintained + expect(assetRegV2.address).to.equal(assetRegistry.address) + + // Check state is preserved + expect(await assetRegV2.isRegistered(rsr.address)).to.equal(true) + expect(await assetRegV2.isRegistered(rToken.address)).to.equal(true) + expect(await assetRegV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await assetRegV2.version()).to.equal('2.0.0') + + expect(await assetRegV2.newValue()).to.equal(0) + await assetRegV2.connect(owner).setNewValue(bn(1000)) + expect(await assetRegV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - BackingManager', async () => { + const upgBM = ( + await ethers.getContractAt('BackingManagerP1', backingManager.address) + ) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgBM.connect(upgSigner).upgradeTo(backingMgrV2ImplAddr) + }) + + const backingMgrV2: BackingManagerP1V2 = ( + await ethers.getContractAt('BackingManagerP1V2', backingManager.address) + ) + + // Check address is maintained + expect(backingMgrV2.address).to.equal(backingManager.address) + + // Check state is preserved + expect(await backingMgrV2.tradingDelay()).to.equal(config.tradingDelay) + expect(await backingMgrV2.backingBuffer()).to.equal(config.backingBuffer) + expect(await backingMgrV2.maxTradeSlippage()).to.equal(config.maxTradeSlippage) + expect(await backingMgrV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await backingMgrV2.version()).to.equal('2.0.0') + + expect(await backingMgrV2.newValue()).to.equal(0) + await backingMgrV2.connect(owner).setNewValue(bn(1000)) + expect(await backingMgrV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - BasketHandler', async () => { + const upgBH = ( + await ethers.getContractAt('BasketHandlerP1', basketHandler.address) + ) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgBH.connect(upgSigner).upgradeTo(bskHndlrV2ImplAddr) + }) + + const bskHndlrV2: BasketHandlerP1V2 = ( + await ethers.getContractAt('BasketHandlerP1V2', basketHandler.address) + ) + + // Check address is maintained + expect(bskHndlrV2.address).to.equal(basketHandler.address) + + // Check state is preserved + expect(await bskHndlrV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await bskHndlrV2.version()).to.equal('2.0.0') + + expect(await bskHndlrV2.newValue()).to.equal(0) + await bskHndlrV2.connect(owner).setNewValue(bn(1000)) + expect(await bskHndlrV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - Broker', async () => { + const upgBroker = await ethers.getContractAt('BrokerP1', broker.address) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgBroker.connect(upgSigner).upgradeTo(brokerV2ImplAddr) + }) + + const brokerV2: BrokerP1V2 = ( + await ethers.getContractAt('BrokerP1V2', broker.address) + ) + + // Check address is maintained + expect(brokerV2.address).to.equal(broker.address) + + // Check state is preserved + expect(await brokerV2.gnosis()).to.equal(gnosis.address) + expect(await brokerV2.batchAuctionLength()).to.equal(config.batchAuctionLength) + expect(await brokerV2.batchTradeDisabled()).to.equal(false) + expect(await brokerV2.dutchTradeDisabled(rToken.address)).to.equal(false) + expect(await brokerV2.dutchTradeDisabled(rsr.address)).to.equal(false) + expect(await brokerV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await brokerV2.version()).to.equal('2.0.0') + + expect(await brokerV2.newValue()).to.equal(0) + await brokerV2.connect(owner).setNewValue(bn(1000)) + expect(await brokerV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - Distributor', async () => { + const upgDist = ( + await ethers.getContractAt('DistributorP1', distributor.address) + ) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgDist.connect(upgSigner).upgradeTo(distributorV2ImplAddr) + }) + + const distributorV2: DistributorP1V2 = ( + await ethers.getContractAt('DistributorP1V2', distributor.address) + ) + + // Check address is maintained + expect(distributorV2.address).to.equal(distributor.address) + + // Check state is preserved + const [rTokenTotal, rsrTotal] = await distributorV2.totals() + expect(rsrTotal).equal(bn(6000)) + expect(rTokenTotal).equal(bn(4000)) + expect(await distributorV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await distributorV2.version()).to.equal('2.0.0') + + expect(await distributorV2.newValue()).to.equal(0) + await distributorV2.connect(owner).setNewValue(bn(1000)) + expect(await distributorV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - Furnace', async () => { + const upgFur = await ethers.getContractAt('FurnaceP1', furnace.address) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgFur.connect(upgSigner).upgradeTo(furnaceV2ImplAddr) + }) + + const furnaceV2: FurnaceP1V2 = ( + await ethers.getContractAt('FurnaceP1V2', furnace.address) + ) + + // Check address is maintained + expect(furnaceV2.address).to.equal(furnace.address) + + // Check state is preserved + expect(await furnaceV2.ratio()).to.equal(config.rewardRatio) + expect(await furnaceV2.lastPayout()).to.be.gt(0) // A timestamp is set + expect(await furnaceV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await furnaceV2.version()).to.equal('2.0.0') + + expect(await furnaceV2.newValue()).to.equal(0) + await furnaceV2.connect(owner).setNewValue(bn(1000)) + expect(await furnaceV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - RevenueTrader', async () => { + const upgRSRRevTrader = ( + await ethers.getContractAt('RevenueTraderP1', rsrTrader.address) + ) + const upgRTokRevTrader = ( + await ethers.getContractAt('RevenueTraderP1', rTokenTrader.address) + ) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgRSRRevTrader.connect(upgSigner).upgradeTo(rsrTraderV2ImplAddr) + }) + await whileImpersonating(main.address, async (upgSigner) => { + await upgRTokRevTrader.connect(upgSigner).upgradeTo(rTokenTraderV2ImplAddr) + }) + + const rsrTraderV2: RevenueTraderP1V2 = ( + await ethers.getContractAt('RevenueTraderP1V2', rsrTrader.address) + ) + + const rTokenTraderV2: RevenueTraderP1V2 = ( + await ethers.getContractAt('RevenueTraderP1V2', rTokenTrader.address) + ) + + // Check addresses are maintained + expect(rsrTraderV2.address).to.equal(rsrTrader.address) + expect(rTokenTraderV2.address).to.equal(rTokenTrader.address) + + // Check state is preserved + expect(await rsrTraderV2.tokenToBuy()).to.equal(rsr.address) + expect(await rsrTraderV2.maxTradeSlippage()).to.equal(config.maxTradeSlippage) + expect(await rsrTraderV2.main()).to.equal(main.address) + + expect(await rTokenTraderV2.tokenToBuy()).to.equal(rToken.address) + expect(await rTokenTraderV2.maxTradeSlippage()).to.equal(config.maxTradeSlippage) + expect(await rTokenTraderV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await rsrTraderV2.version()).to.equal('2.0.0') + expect(await rTokenTraderV2.version()).to.equal('2.0.0') + + expect(await rsrTraderV2.newValue()).to.equal(0) + await rsrTraderV2.connect(owner).setNewValue(bn(1000)) + expect(await rsrTraderV2.newValue()).to.equal(bn(1000)) + + expect(await rTokenTraderV2.newValue()).to.equal(0) + await rTokenTraderV2.connect(owner).setNewValue(bn(500)) + expect(await rTokenTraderV2.newValue()).to.equal(bn(500)) + }) + + it('Should upgrade correctly - RToken', async () => { + const upgRToken = await ethers.getContractAt('RTokenP1', rToken.address) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgRToken.connect(upgSigner).upgradeTo(rTokenV2ImplAddr) + }) + + const rTokenV2: RTokenP1V2 = ( + await ethers.getContractAt('RTokenP1V2', rToken.address) + ) + + // Check address is maintained + expect(rTokenV2.address).to.equal(rToken.address) + + // Check state is preserved + expect(await rTokenV2.name()).to.equal('RTKN RToken') + expect(await rTokenV2.symbol()).to.equal('RTKN') + expect(await rTokenV2.decimals()).to.equal(18) + expect(await rTokenV2.totalSupply()).to.equal(bn(0)) + expect(await rTokenV2.main()).to.equal(main.address) + const issThrottle = await rToken.issuanceThrottleParams() + expect(issThrottle.amtRate).to.equal(config.issuanceThrottle.amtRate) + expect(issThrottle.pctRate).to.equal(config.issuanceThrottle.pctRate) + const redemptionThrottle = await rToken.redemptionThrottleParams() + expect(redemptionThrottle.amtRate).to.equal(config.redemptionThrottle.amtRate) + expect(redemptionThrottle.pctRate).to.equal(config.redemptionThrottle.pctRate) + + // Check new version is implemented + expect(await rTokenV2.version()).to.equal('2.0.0') + + expect(await rTokenV2.newValue()).to.equal(0) + await rTokenV2.connect(owner).setNewValue(bn(1000)) + expect(await rTokenV2.newValue()).to.equal(bn(1000)) + }) + + it('Should upgrade correctly - StRSR', async () => { + const upgStRSR = await ethers.getContractAt('StRSRP1Votes', stRSR.address) + + // Upgrade via Main + await whileImpersonating(main.address, async (upgSigner) => { + await upgStRSR.connect(upgSigner).upgradeTo(stRSRV2ImplAddr) + }) + + const stRSRV2: StRSRP1VotesV2 = ( + await ethers.getContractAt('StRSRP1VotesV2', stRSR.address) + ) + + // Check address is maintained + expect(stRSRV2.address).to.equal(stRSR.address) + + // Check state is preserved + expect(await stRSRV2.name()).to.equal('rtknRSR Token') + expect(await stRSRV2.symbol()).to.equal('rtknRSR') + expect(await stRSRV2.decimals()).to.equal(18) + expect(await stRSRV2.totalSupply()).to.equal(0) + expect(await stRSRV2.unstakingDelay()).to.equal(config.unstakingDelay) + expect(await stRSRV2.rewardRatio()).to.equal(config.rewardRatio) + expect(await stRSRV2.main()).to.equal(main.address) + + // Check new version is implemented + expect(await stRSRV2.version()).to.equal('2.0.0') + + expect(await stRSRV2.newValue()).to.equal(0) + await stRSRV2.connect(owner).setNewValue(bn(1000)) + expect(await stRSRV2.newValue()).to.equal(bn(1000)) + }) + + context('Using Registries', function () { + let versionRegistry: VersionRegistry + let assetPluginRegistry: AssetPluginRegistry + + let implementationsV2: IImplementations + let deployerV2: DeployerP1V2 + + beforeEach(async () => { + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') + versionRegistry = await versionRegistryFactory.deploy(owner.address) + + const assetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') + assetPluginRegistry = await assetPluginRegistryFactory.deploy(versionRegistry.address) + + // Prepare V2 Deployer and register new version + implementationsV2 = { + main: mainV2ImplAddr, + components: { + assetRegistry: assetRegV2ImplAddr, + basketHandler: bskHndlrV2ImplAddr, + distributor: distributorV2ImplAddr, + broker: brokerV2ImplAddr, + backingManager: backingMgrV2ImplAddr, + furnace: furnaceV2ImplAddr, + rToken: rTokenV2ImplAddr, + rsrTrader: rsrTraderV2ImplAddr, + rTokenTrader: rTokenTraderV2ImplAddr, + stRSR: stRSRV2ImplAddr, + }, + trading: { + gnosisTrade: await broker.batchTradeImplementation(), + dutchTrade: await broker.dutchTradeImplementation(), + }, + } + + const DeployerV2Factory = await ethers.getContractFactory('DeployerP1V2') + deployerV2 = await DeployerV2Factory.deploy( + rsr.address, + gnosis.address, + rsrAsset.address, + implementationsV2 + ) + }) + it('Should upgrade all contracts at once - Using Registries', async () => { + // Register current deployment + await versionRegistry.connect(owner).registerVersion(deployer.address) + + // Register new deployment + await versionRegistry.connect(owner).registerVersion(deployerV2.address) + + // Update Main to new version + const versionV1Hash = toHash(await deployer.version()) + const versionV2Hash = toHash(await deployerV2.version()) + const upgMain = await ethers.getContractAt('MainP1', main.address) + + // Update Main to have a Registry + await main.connect(owner).setVersionRegistry(versionRegistry.address) + + // Upgrade Main + expect(toHash(await main.version())).to.equal(versionV1Hash) + await upgMain.connect(owner).upgradeMainTo(versionV2Hash) + expect(toHash(await main.version())).to.equal(versionV2Hash) + + // Components still in original version + expect(toHash(await assetRegistry.version())).to.equal(versionV1Hash) + expect(toHash(await backingManager.version())).to.equal(versionV1Hash) + expect(toHash(await basketHandler.version())).to.equal(versionV1Hash) + expect(toHash(await broker.version())).to.equal(versionV1Hash) + expect(toHash(await distributor.version())).to.equal(versionV1Hash) + expect(toHash(await furnace.version())).to.equal(versionV1Hash) + expect(toHash(await rsrTrader.version())).to.equal(versionV1Hash) + expect(toHash(await rTokenTrader.version())).to.equal(versionV1Hash) + expect(toHash(await rToken.version())).to.equal(versionV1Hash) + expect(toHash(await stRSR.version())).to.equal(versionV1Hash) + + // Upgrade RToken + expect(toHash(await rToken.version())).to.equal(versionV1Hash) + await upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, false, false) + expect(toHash(await rToken.version())).to.equal(versionV2Hash) + + // All components updated + expect(toHash(await assetRegistry.version())).to.equal(versionV2Hash) + expect(toHash(await backingManager.version())).to.equal(versionV2Hash) + expect(toHash(await basketHandler.version())).to.equal(versionV2Hash) + expect(toHash(await broker.version())).to.equal(versionV2Hash) + expect(toHash(await distributor.version())).to.equal(versionV2Hash) + expect(toHash(await furnace.version())).to.equal(versionV2Hash) + expect(toHash(await rsrTrader.version())).to.equal(versionV2Hash) + expect(toHash(await rTokenTrader.version())).to.equal(versionV2Hash) + expect(toHash(await rToken.version())).to.equal(versionV2Hash) + expect(toHash(await stRSR.version())).to.equal(versionV2Hash) + }) + + it('Should perform pre and post validations on Assets- Using Registries', async () => { + // Register deployments + await versionRegistry.connect(owner).registerVersion(deployer.address) + await versionRegistry.connect(owner).registerVersion(deployerV2.address) + + // Update Main to have both registries + await main.connect(owner).setVersionRegistry(versionRegistry.address) + await main.connect(owner).setAssetPluginRegistry(assetPluginRegistry.address) + + // Update Main to new version + const versionV1Hash = toHash(await deployer.version()) + const versionV2Hash = toHash(await deployerV2.version()) + const upgMain = await ethers.getContractAt('MainP1', main.address) + await upgMain.connect(owner).upgradeMainTo(versionV2Hash) + + // Upgrade to RToken fails if not assets registered + await expect( + upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, true, true) + ).to.be.revertedWith('unsupported asset') + + // Register Assets in the Registry for current version + const currentAssetRegistry = await assetRegistry.getRegistry() + const currentAssetPlugins = currentAssetRegistry.assets + + await assetPluginRegistry.connect(owner).updateAssetsByVersion( + versionV1Hash, + currentAssetPlugins, + currentAssetPlugins.map(() => true) + ) + + // Upgrade to RToken fails, still not registered for the new version + await expect( + upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, true, true) + ).to.be.revertedWith('unsupported asset') + + // Register Assets in the Registry for new version + await assetPluginRegistry.connect(owner).updateAssetsByVersion( + versionV2Hash, + currentAssetPlugins, + currentAssetPlugins.map(() => true) + ) + + // Upgrade RToken + expect(toHash(await rToken.version())).to.equal(versionV1Hash) + await upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, true, true) + expect(toHash(await rToken.version())).to.equal(versionV2Hash) + + // All components updated + expect(toHash(await assetRegistry.version())).to.equal(versionV2Hash) + expect(toHash(await backingManager.version())).to.equal(versionV2Hash) + expect(toHash(await basketHandler.version())).to.equal(versionV2Hash) + expect(toHash(await broker.version())).to.equal(versionV2Hash) + expect(toHash(await distributor.version())).to.equal(versionV2Hash) + expect(toHash(await furnace.version())).to.equal(versionV2Hash) + expect(toHash(await rsrTrader.version())).to.equal(versionV2Hash) + expect(toHash(await rTokenTrader.version())).to.equal(versionV2Hash) + expect(toHash(await rToken.version())).to.equal(versionV2Hash) + expect(toHash(await stRSR.version())).to.equal(versionV2Hash) + }) + + it('Should perform validation in the upgrade process - Using Registries', async () => { + // Register current deployment + await versionRegistry.connect(owner).registerVersion(deployer.address) + + // Get V2 version + const versionV2Hash = toHash(await deployerV2.version()) + + const upgMain = await ethers.getContractAt('MainP1', main.address) + + // Cannot upgrade if no registry in Main + await expect(upgMain.connect(owner).upgradeMainTo(versionV2Hash)).to.be.revertedWith( + 'no registry' + ) + await expect( + upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, false, false) + ).to.be.revertedWith('no registry') + + // Update Main to have a Registry + await main.connect(owner).setVersionRegistry(versionRegistry.address) + + // If not governance cannot upgrade + await expect(upgMain.connect(other).upgradeMainTo(versionV2Hash)).to.be.revertedWith( + `AccessControl: account ${other.address.toLowerCase()} is missing role ${MAIN_OWNER_ROLE}` + ) + await expect( + upgMain.connect(other).upgradeRTokenTo(versionV2Hash, false, false) + ).to.be.revertedWith( + `AccessControl: account ${other.address.toLowerCase()} is missing role ${MAIN_OWNER_ROLE}` + ) + + // Cannot upgrade if version not registered + await expect(upgMain.connect(owner).upgradeMainTo(versionV2Hash)).to.be.reverted + await expect(upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, false, false)).to.be + .reverted + + // Register new deployment + await versionRegistry.connect(owner).registerVersion(deployerV2.address) + + // Cannot upgrade RToken before main + await expect( + upgMain.connect(owner).upgradeRTokenTo(versionV2Hash, false, false) + ).to.be.revertedWith('upgrade main first') + + // Cannot upgrade to deprecated version + await versionRegistry.connect(owner).deprecateVersion(versionV2Hash) + await expect(upgMain.connect(owner).upgradeMainTo(versionV2Hash)).to.be.revertedWith( + 'version deprecated' + ) + }) + }) }) }) }) diff --git a/test/ZTradingExtremes.test.ts b/test/ZTradingExtremes.test.ts index e394a2105d..8ff6b8cc30 100644 --- a/test/ZTradingExtremes.test.ts +++ b/test/ZTradingExtremes.test.ts @@ -13,12 +13,15 @@ import { import { FURNACE_DEST, STRSR_DEST, MAX_UINT256, ZERO_ADDRESS } from '../common/constants' import { bn, fp, shortString, toBNDecimals, divCeil } from '../common/numbers' import { + AppreciatingMockDecimals, + AppreciatingMockDecimalsCollateral, Asset, ATokenFiatCollateral, ComptrollerMock, CTokenFiatCollateral, CTokenMock, ERC20Mock, + ERC20MockDecimals, FacadeTest, FiatCollateral, GnosisMock, @@ -60,10 +63,14 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, let compToken: ERC20Mock let compoundMock: ComptrollerMock let aaveToken: ERC20Mock + let rewardToken21: ERC20MockDecimals + let rewardToken27: ERC20MockDecimals let rsrAsset: Asset let aaveAsset: Asset let compAsset: Asset + let rewardTokensLargeDecimals: { [key: number]: ERC20MockDecimals } + // Trading let rsrTrader: TestIRevenueTrader let rTokenTrader: TestIRevenueTrader @@ -81,10 +88,13 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, let distributor: TestIDistributor let ERC20Mock: ContractFactory + let ERC20MockDecimals: ContractFactory + let AppreciatingMockDecimalsFactory: ContractFactory let ATokenMockFactory: ContractFactory let CTokenMockFactory: ContractFactory let ATokenCollateralFactory: ContractFactory let CTokenCollateralFactory: ContractFactory + let AppreciatingMockDecimalsCollateralFactory: ContractFactory const DEFAULT_THRESHOLD = fp('0.01') // 1% const DELAY_UNTIL_DEFAULT = bn('86400') // 24h @@ -115,10 +125,28 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, } = await loadFixture(defaultFixtureNoBasket)) ERC20Mock = await ethers.getContractFactory('ERC20Mock') + ERC20MockDecimals = await ethers.getContractFactory('ERC20MockDecimals') + AppreciatingMockDecimalsFactory = await ethers.getContractFactory('AppreciatingMockDecimals') ATokenMockFactory = await ethers.getContractFactory('StaticATokenMock') CTokenMockFactory = await ethers.getContractFactory('CTokenMock') ATokenCollateralFactory = await ethers.getContractFactory('ATokenFiatCollateral') CTokenCollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') + AppreciatingMockDecimalsCollateralFactory = await ethers.getContractFactory( + 'AppreciatingMockDecimalsCollateral' + ) + + // Setup rewards tokens with 21 and 27 decimals (for large decimal extreme test) + rewardToken21 = ( + await ERC20MockDecimals.deploy(`ERC20_REWARD_21`, `ERC20_SYM_REWARD_21`, 21) + ) + rewardToken27 = ( + await ERC20MockDecimals.deploy(`ERC20_REWARD_27`, `ERC20_SYM_REWARD_27`, 27) + ) + + rewardTokensLargeDecimals = { + 21: rewardToken21, + 27: rewardToken27, + } // Set backingBuffer and minTradeVolume to 0, to make math easy and always trade await backingManager.connect(owner).setBackingBuffer(0) @@ -198,25 +226,64 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, return erc20 } + const prepLargeDecimalToken = async ( + index: number, + decimals: number + ): Promise => { + const underlying: ERC20MockDecimals = ( + await ERC20MockDecimals.deploy(`ERC20_NAME:${index}`, `ERC20_SYM:${index}`, decimals) + ) + const erc20: AppreciatingMockDecimals = ( + await AppreciatingMockDecimalsFactory.deploy( + `AppreciatingToken_NAME:${index}`, + `AppreciatingToken_SYM:${index}`, + decimals, + underlying.address + ) + ) + + await erc20.setExchangeRate(fp('1')) + + await erc20.setRewardToken(rewardTokensLargeDecimals[decimals].address) + + const chainlinkFeed = ( + await (await ethers.getContractFactory('MockV3Aggregator')).deploy(8, bn('1e8')) + ) + const collateral = ( + await AppreciatingMockDecimalsCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: erc20.address, + maxTradeVolume: MAX_UOA, + oracleTimeout: MAX_ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ) + + await assetRegistry.connect(owner).register(collateral.address) + return erc20 + } + const setupTrading = async (stRSRCut: BigNumber) => { // Configure Distributor - const rsrDist = bn(5).mul(stRSRCut).div(fp('1')) - const rTokenDist = bn(5).mul(fp('1').sub(stRSRCut)).div(fp('1')) - expect(rsrDist.add(rTokenDist)).to.equal(5) + const rsrDist = bn(10000).mul(stRSRCut).div(fp('1')) + const rTokenDist = bn(10000).sub(rsrDist) + expect(rsrDist.add(rTokenDist)).to.equal(10000) await expect( - distributor - .connect(owner) - .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: rsrDist }) - ) - .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), rsrDist) - await expect( - distributor - .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: rTokenDist, rsrDist: bn(0) }) + distributor.connect(owner).setDistributions( + [STRSR_DEST, FURNACE_DEST], + [ + { rTokenDist: bn(0), rsrDist: rsrDist }, + { rTokenDist: rTokenDist, rsrDist: bn(0) }, + ] + ) ) - .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, rTokenDist, bn(0)) // Set prices await setOraclePrice(rsrAsset.address, bn('1e8')) @@ -327,8 +394,26 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, const primeBasket = [] const targetAmts = [] for (let i = 0; i < basketSize; i++) { - expect(collateralDecimals == 8 || collateralDecimals == 18).to.equal(true) - const token = collateralDecimals == 8 ? await prepCToken(i) : await prepAToken(i) + expect( + collateralDecimals == 8 || + collateralDecimals == 18 || + collateralDecimals == 21 || + collateralDecimals == 27 + ).to.equal(true) + let token: CTokenMock | StaticATokenMock | AppreciatingMockDecimals + switch (collateralDecimals) { + case 8: + token = await prepCToken(i) + break + case 21: + case 27: + token = await prepLargeDecimalToken(i, collateralDecimals) + break + default: + token = await prepAToken(i) // 18 decimals + break + } + primeBasket.push(token) targetAmts.push(divCeil(primeWeight, bn(basketSize))) // might sum to slightly over, is ok await token.connect(owner).mint(addr1.address, MAX_UINT256) @@ -373,7 +458,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, [fp('1e-6'), fp('1e30')], // RToken supply [1, MAX_BASKET_SIZE], // basket size [fp('1e-6'), fp('1e3'), fp('1')], // prime basket weights - [8, 18], // collateral decimals + [8, 18, 21, 27], // collateral decimals [fp('1e9'), fp('1').add(fp('1e-9'))], // exchange rate at appreciation [1, MAX_BASKET_SIZE], // how many collateral assets appreciate (up to) [fp('0'), fp('1'), fp('0.6')], // StRSR cut (f) @@ -383,7 +468,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, [fp('1e-6'), fp('1e30')], // RToken supply [7], // basket size [fp('1e-6'), fp('1e3')], // prime basket weights - [8, 18], // collateral decimals + [8, 18, 21, 27], // collateral decimals [fp('1e9')], // exchange rate at appreciation [1], // how many collateral assets appreciate (up to) [fp('0.6')], // StRSR cut (f) @@ -419,7 +504,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, // // 1. RToken supply (including this in order to check 0 supply case) // 2. Size of reward-earning basket tokens - // 3. Number of reward tokens (1 or 2) + // 3. Number of reward tokens (1, 2, 3, or 4) // 4. Size of reward // 5. StRSR cut (previously: f) @@ -458,17 +543,58 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, await assetRegistry.connect(owner).swapRegistered(newAaveAsset.address) await assetRegistry.connect(owner).swapRegistered(newCompAsset.address) + // Create new reward assets with large decimals (21 and 27) + + const newRewardAsset21: Asset = await AssetFactory.deploy( + PRICE_TIMEOUT, + await aaveAsset.chainlinkFeed(), // reuse + ORACLE_ERROR, + rewardToken21.address, + MAX_UOA, + MAX_ORACLE_TIMEOUT + ) + + const newRewardAsset27: Asset = await AssetFactory.deploy( + PRICE_TIMEOUT, + await aaveAsset.chainlinkFeed(), // reuse + ORACLE_ERROR, + rewardToken27.address, + MAX_UOA, + MAX_ORACLE_TIMEOUT + ) + + await assetRegistry.connect(owner).register(newRewardAsset21.address) + await assetRegistry.connect(owner).register(newRewardAsset27.address) + // Set up prime basket const primeBasket = [] const targetAmts = [] for (let i = 0; i < basketSize; i++) { - expect(numRewardTokens == 1 || numRewardTokens == 2).to.equal(true) + expect(numRewardTokens <= 4).to.equal(true) let token if (numRewardTokens == 1) { token = await prepCToken(i) - } else { - token = i % 2 == 0 ? await prepCToken(i) : await prepAToken(i) + } else if (numRewardTokens > 1) { + const which = i % numRewardTokens + switch (which) { + case 0: + token = await prepCToken(i) + break + case 1: + token = await prepAToken(i) + break + case 2: + token = await prepLargeDecimalToken(i, 21) + break + case 3: + token = await prepLargeDecimalToken(i, 27) + break + default: + token = await prepAToken(i) // 18 decimals + break + } } + primeBasket.push(token) targetAmts.push(fp('1').div(basketSize)) await token.connect(owner).mint(addr1.address, MAX_UINT256) @@ -498,7 +624,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, // Grant rewards for (let i = 0; i < primeBasket.length; i++) { const decimals = await primeBasket[i].decimals() - expect(decimals == 8 || decimals == 18).to.equal(true) + expect(decimals == 8 || decimals == 18 || decimals == 21 || decimals == 27).to.equal(true) if (decimals == 8) { // cToken const oldRewards = await compoundMock.compBalances(backingManager.address) @@ -510,6 +636,16 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, const aToken = primeBasket[i] const rewards = rewardTok.mul(bn('1e18')).div(numRewardTokens) await aToken.setRewards(backingManager.address, rewards) + } else if (decimals == 21) { + // large decimal appreciating collateral + const appMockDecimals = primeBasket[i] + const rewards = rewardTok.mul(bn('1e21')).div(numRewardTokens) + await appMockDecimals.setRewards(backingManager.address, rewards) + } else if (decimals == 27) { + // large decimal appreciating collateral + const appMockDecimals = primeBasket[i] + const rewards = rewardTok.mul(bn('1e27')).div(numRewardTokens) + await appMockDecimals.setRewards(backingManager.address, rewards) } } @@ -522,7 +658,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, dimensions = [ [fp('1e-6'), fp('1e30')], // RToken supply [1, MAX_BASKET_SIZE], // basket size - [1, 2], // num reward tokens + [1, 2, 3, 4], // num reward tokens [bn('0'), bn('1e11'), bn('1e6')], // reward amount (whole tokens), up to 100B supply tokens [fp('0'), fp('1'), fp('0.6')], // StRSR cut (f) ] @@ -530,7 +666,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, dimensions = [ [fp('1e-6'), fp('1e30')], // RToken supply [1, 7], // basket size - [2], // num reward tokens + [2, 4], // num reward tokens [bn('1e11')], // reward amount (whole tokens), up to 100B supply tokens [fp('0.6')], // StRSR cut (f) ] @@ -631,8 +767,26 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, const primeBasket = [] const targetAmts = [] for (let i = 0; i < basketSize; i++) { - expect(collateralDecimals == 8 || collateralDecimals == 18).to.equal(true) - const token = collateralDecimals == 8 ? await prepCToken(i) : await prepAToken(i) + expect( + collateralDecimals == 8 || + collateralDecimals == 18 || + collateralDecimals == 21 || + collateralDecimals == 27 + ).to.equal(true) + let token: CTokenMock | StaticATokenMock | AppreciatingMockDecimals + switch (collateralDecimals) { + case 8: + token = await prepCToken(i) + break + case 21: + case 27: + token = await prepLargeDecimalToken(i, collateralDecimals) + break + default: + token = await prepAToken(i) // 18 decimals + break + } + primeBasket.push(token) targetAmts.push(primeWeight.div(basketSize).add(1)) await token.connect(owner).mint(addr1.address, MAX_UINT256) @@ -691,7 +845,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, [fp('1e-6'), fp('1e30')], // RToken supply [2, MAX_BASKET_SIZE], // basket size [fp('1e-6'), fp('1e3'), fp('1')], // prime basket weights - [8, 18], // collateral decimals + [8, 18, 21, 27], // collateral decimals [1, MAX_BASKET_SIZE - 1], // how many collateral assets default (up to) ] } else { @@ -699,7 +853,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, [fp('1e-6'), fp('1e30')], // RToken supply [7], // basket size [fp('1e-6'), fp('1e3')], // prime basket weights - [8, 18], // collateral decimals + [8, 18, 21, 27], // collateral decimals [1], // how many collateral assets default (up to) ] } diff --git a/test/fixtures.ts b/test/fixtures.ts index c7ce3d9314..cf52748cba 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -441,8 +441,8 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const { gnosis, easyAuction } = await gnosisFixture() const gnosisAddr = useEnv('FORK') ? easyAuction.address : gnosis.address const dist: IRevenueShare = { - rTokenDist: bn(40), // 2/5 RToken - rsrDist: bn(60), // 3/5 RSR + rTokenDist: bn(4000), // 2/5 RToken + rsrDist: bn(6000), // 3/5 RSR } // Setup Config diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 5a298c4533..5674ba344c 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -33,7 +33,7 @@ import { setOraclePrice } from '../utils/oracles' import { getChainId } from '../../common/blockchain-utils' import { whileImpersonating } from '../utils/impersonation' import { expectRTokenPrice } from '../utils/oracles' -import { withinQuad } from '../utils/matchers' +import { withinTolerance } from '../utils/matchers' import { cartesianProduct } from '../utils/cases' import { EasyAuction, @@ -154,7 +154,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function // Create auction await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)) .to.emit(backingManager, 'TradeStarted') - .withArgs(anyValue, rsr.address, token0.address, anyValue, withinQuad(buyAmt)) + .withArgs(anyValue, rsr.address, token0.address, anyValue, withinTolerance(buyAmt)) const t = await getTrade(backingManager, rsr.address) sellAmt = await t.initBal() @@ -840,7 +840,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function // ==== Generate the tests ==== // applied to both buy and sell tokens - const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18')] + const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18'), bn('21'), bn('27')] // auction sell amount const auctionSellAmts = [bn('1'), bn('1595439874635'), bn('987321984732198435645846513')] diff --git a/test/integration/UpgradeToR4.test.ts b/test/integration/UpgradeToR4.test.ts new file mode 100644 index 0000000000..b5e6215c90 --- /dev/null +++ b/test/integration/UpgradeToR4.test.ts @@ -0,0 +1,187 @@ +import hre, { ethers } from 'hardhat' +import { reset } from '@nomicfoundation/hardhat-network-helpers' +import { VersionRegistry } from '@typechain/VersionRegistry' +import { expect } from 'chai' +import { forkRpcs } from '#/utils/fork' +import { IImplementations } from '#/common/configuration' +import { DeployerP1 } from '@typechain/DeployerP1' +import { AssetPluginRegistry } from '@typechain/AssetPluginRegistry' +import { whileImpersonating } from '#/utils/impersonation' +import { DAOFeeRegistry } from '@typechain/DAOFeeRegistry' + +interface RTokenParams { + name: string + mainAddress: string + timelockAddress: string +} + +// These RTokens must be on 3.4.0 as the target block +const rTokensToTest: RTokenParams[] = [ + { + name: 'dgnETH', + mainAddress: '0xC376168c8470C6e0F4854A7d450874C30A0973d7', + timelockAddress: '0x98D7C5230C46b671dB0CeBb25B17d1E183B23B97', + }, +] + +const v4VersionHash = '0x81ed76178093786cbe0cb79744f6e7ca3336fbb9fe7d1ddff1f0157b63e09813' + +async function _confirmVersion(address: string, target: string) { + const versionedTarget = await ethers.getContractAt('Versioned', address) + expect(await versionedTarget.version()).to.eq(target) +} + +// NOTE: This is an explicit test! +describe('Upgrade from 3.4.0 to 4.0.0 (Mainnet Fork)', () => { + let implementations: IImplementations + let deployer: DeployerP1 + let versionRegistry: VersionRegistry + let assetPluginRegistry: AssetPluginRegistry + let daoFeeRegistry: DAOFeeRegistry + + before(async () => { + await reset(forkRpcs.mainnet, 19991614) + const [owner] = await ethers.getSigners() + + const TradingLibFactory = await ethers.getContractFactory('RecollateralizationLibP1') + const BasketLibFactory = await ethers.getContractFactory('BasketLibP1') + const tradingLib = await TradingLibFactory.deploy() + const basketLib = await BasketLibFactory.deploy() + + const MainFactory = await ethers.getContractFactory('MainP1') + const RTokenFactory = await ethers.getContractFactory('RTokenP1') + const FurnaceFactory = await ethers.getContractFactory('FurnaceP1') + const RevenueTraderFactory = await ethers.getContractFactory('RevenueTraderP1') + const BackingManagerFactory = await ethers.getContractFactory('BackingManagerP1', { + libraries: { + RecollateralizationLibP1: tradingLib.address, + }, + }) + const AssetRegistryFactory = await ethers.getContractFactory('AssetRegistryP1') + const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1', { + libraries: { BasketLibP1: basketLib.address }, + }) + const DistributorFactory = await ethers.getContractFactory('DistributorP1') + const BrokerFactory = await ethers.getContractFactory('BrokerP1') + const GnosisTradeFactory = await ethers.getContractFactory('GnosisTrade') + const DutchTradeFactory = await ethers.getContractFactory('DutchTrade') + const StRSRFactory = await ethers.getContractFactory('StRSRP1Votes') + + const RevenueTrader = await RevenueTraderFactory.deploy() + + implementations = { + main: (await MainFactory.deploy()).address, + components: { + assetRegistry: (await AssetRegistryFactory.deploy()).address, + basketHandler: (await BasketHandlerFactory.deploy()).address, + distributor: (await DistributorFactory.deploy()).address, + broker: (await BrokerFactory.deploy()).address, + backingManager: (await BackingManagerFactory.deploy()).address, + furnace: (await FurnaceFactory.deploy()).address, + rToken: (await RTokenFactory.deploy()).address, + rsrTrader: RevenueTrader.address, + rTokenTrader: RevenueTrader.address, + stRSR: (await StRSRFactory.deploy()).address, + }, + trading: { + gnosisTrade: (await GnosisTradeFactory.deploy()).address, + dutchTrade: (await DutchTradeFactory.deploy()).address, + }, + } + + const DeployerFactory = await ethers.getContractFactory('DeployerP1') + deployer = await DeployerFactory.deploy( + '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', + '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', + '0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA', + implementations + ) + + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') + versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + + await versionRegistry.registerVersion(deployer.address) + + const AssetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistryMock') + assetPluginRegistry = + (await AssetPluginRegistryFactory.deploy()) as unknown as AssetPluginRegistry + + const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') + daoFeeRegistry = await DAOFeeRegistryFactory.deploy(await owner.getAddress()) + }) + + describe('The Upgrade', () => { + for (let i = 0; i < rTokensToTest.length; i++) { + const TIMELOCK_ADDRESS = rTokensToTest[i].timelockAddress + const MAIN_ADDRESS = rTokensToTest[i].mainAddress + + it(`Double Upgrade Check: ${rTokensToTest[i].name}`, async () => { + const RTokenMain = await ethers.getContractAt('MainP1', MAIN_ADDRESS) + const TimelockController = await ethers.getContractAt( + 'TimelockController', + TIMELOCK_ADDRESS + ) + + await whileImpersonating(hre, TimelockController.address, async (signer) => { + // Upgrade Main to 4.0.0's Main + await RTokenMain.connect(signer).upgradeTo(implementations.main) + + // Set registries + await RTokenMain.connect(signer).setVersionRegistry(versionRegistry.address) + await RTokenMain.connect(signer).setAssetPluginRegistry(assetPluginRegistry.address) + await RTokenMain.connect(signer).setDAOFeeRegistry(daoFeeRegistry.address) + + // Grant OWNER to Main + await RTokenMain.connect(signer).grantRole( + await RTokenMain.OWNER_ROLE(), + RTokenMain.address + ) + + // Upgrade RToken + await RTokenMain.connect(signer).upgradeRTokenTo(v4VersionHash, false, false) + + // Revoke OWNER from Main + await RTokenMain.connect(signer).revokeRole( + await RTokenMain.OWNER_ROLE(), + RTokenMain.address + ) + }) + + const targetsToVerify = [ + RTokenMain.address, + await RTokenMain.rToken(), + await RTokenMain.assetRegistry(), + await RTokenMain.basketHandler(), + await RTokenMain.distributor(), + await RTokenMain.broker(), + await RTokenMain.backingManager(), + await RTokenMain.furnace(), + await RTokenMain.rsrTrader(), + await RTokenMain.rTokenTrader(), + await RTokenMain.stRSR(), + ] + + for (let j = 0; j < targetsToVerify.length; j++) { + await _confirmVersion(targetsToVerify[j], '4.0.0') + } + + const broker = await ethers.getContractAt('BrokerP1', await RTokenMain.broker()) + expect(await broker.batchTradeImplementation()).to.equal( + implementations.trading.gnosisTrade + ) + expect(await broker.dutchTradeImplementation()).to.equal(implementations.trading.dutchTrade) + + // So, let's upgrade the RToken _again_ to verify the process flow works. + await whileImpersonating(hre, TimelockController.address, async (signer) => { + // Upgrade Main to 4.0.0's Main + await RTokenMain.connect(signer).upgradeMainTo(v4VersionHash) + + // Upgrade RToken + await RTokenMain.connect(signer).upgradeRTokenTo(v4VersionHash, true, true) + + // ^^ This is how the upgrade would look like for future versions. + }) + }) + } + }) +}) diff --git a/test/integration/UpgradeToR4WithRegistries.test.ts b/test/integration/UpgradeToR4WithRegistries.test.ts new file mode 100644 index 0000000000..b0b12a7334 --- /dev/null +++ b/test/integration/UpgradeToR4WithRegistries.test.ts @@ -0,0 +1,271 @@ +import hre, { ethers } from 'hardhat' +import { reset } from '@nomicfoundation/hardhat-network-helpers' +import { VersionRegistry } from '@typechain/VersionRegistry' +import { expect } from 'chai' +import { forkRpcs } from '#/utils/fork' +import { IImplementations } from '#/common/configuration' +import { AssetPluginRegistry } from '@typechain/AssetPluginRegistry' +import { whileImpersonating } from '#/utils/impersonation' +import { DAOFeeRegistry } from '@typechain/DAOFeeRegistry' + +interface RTokenParams { + name: string + mainAddress: string + timelockAddress: string +} + +// These RTokens must be on 3.4.0 as the target block +const rTokensToTest: RTokenParams[] = [ + { + name: 'dgnETH', + mainAddress: '0xC376168c8470C6e0F4854A7d450874C30A0973d7', + timelockAddress: '0x98D7C5230C46b671dB0CeBb25B17d1E183B23B97', + }, +] + +const v4VersionHash = '0x81ed76178093786cbe0cb79744f6e7ca3336fbb9fe7d1ddff1f0157b63e09813' +const v2VersionHash = '0xb4bcb154e38601c389396fa918314da42d4626f13ef6d0ceb07e5f5d26b2fbc3' + +async function _confirmVersion(address: string, target: string) { + const versionedTarget = await ethers.getContractAt('Versioned', address) + expect(await versionedTarget.version()).to.eq(target) +} + +// NOTE: This is an explicit test! +describe('Upgrade from 4.0.0 to New Version with all Registries Enabled', () => { + let versionRegistry: VersionRegistry + let assetPluginRegistry: AssetPluginRegistry + let daoFeeRegistry: DAOFeeRegistry + + let implementationsR4: IImplementations + let implementationsR2: IImplementations + + before(async () => { + await reset(forkRpcs.mainnet, 19991614) + const [owner] = await ethers.getSigners() + + // Setup Registries + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') + versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + + const AssetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') + assetPluginRegistry = await AssetPluginRegistryFactory.deploy(versionRegistry.address) + + const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') + daoFeeRegistry = await DAOFeeRegistryFactory.deploy(await owner.getAddress()) + + // Setup Common Dependencies + const TradingLibFactory = await ethers.getContractFactory('RecollateralizationLibP1') + const BasketLibFactory = await ethers.getContractFactory('BasketLibP1') + const tradingLib = await TradingLibFactory.deploy() + const basketLib = await BasketLibFactory.deploy() + + // Setup R4 Implementations & Deployer + { + const MainFactory = await ethers.getContractFactory('MainP1') + const RTokenFactory = await ethers.getContractFactory('RTokenP1') + const FurnaceFactory = await ethers.getContractFactory('FurnaceP1') + const RevenueTraderFactory = await ethers.getContractFactory('RevenueTraderP1') + const BackingManagerFactory = await ethers.getContractFactory('BackingManagerP1', { + libraries: { + RecollateralizationLibP1: tradingLib.address, + }, + }) + const AssetRegistryFactory = await ethers.getContractFactory('AssetRegistryP1') + const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1', { + libraries: { BasketLibP1: basketLib.address }, + }) + const DistributorFactory = await ethers.getContractFactory('DistributorP1') + const BrokerFactory = await ethers.getContractFactory('BrokerP1') + const GnosisTradeFactory = await ethers.getContractFactory('GnosisTrade') + const DutchTradeFactory = await ethers.getContractFactory('DutchTrade') + const StRSRFactory = await ethers.getContractFactory('StRSRP1Votes') + + const RevenueTrader = await RevenueTraderFactory.deploy() + + implementationsR4 = { + main: (await MainFactory.deploy()).address, + components: { + assetRegistry: (await AssetRegistryFactory.deploy()).address, + basketHandler: (await BasketHandlerFactory.deploy()).address, + distributor: (await DistributorFactory.deploy()).address, + broker: (await BrokerFactory.deploy()).address, + backingManager: (await BackingManagerFactory.deploy()).address, + furnace: (await FurnaceFactory.deploy()).address, + rToken: (await RTokenFactory.deploy()).address, + rsrTrader: RevenueTrader.address, + rTokenTrader: RevenueTrader.address, + stRSR: (await StRSRFactory.deploy()).address, + }, + trading: { + gnosisTrade: (await GnosisTradeFactory.deploy()).address, + dutchTrade: (await DutchTradeFactory.deploy()).address, + }, + } + + const DeployerFactory = await ethers.getContractFactory('DeployerP1') + const deployerR4 = await DeployerFactory.deploy( + '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', + '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', + '0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA', + implementationsR4 + ) + await versionRegistry.registerVersion(deployerR4.address) + } + + // Setup R2 Implementations & Deployer + { + const MainFactory = await ethers.getContractFactory('MainP1V2') + const RTokenFactory = await ethers.getContractFactory('RTokenP1V2') + const FurnaceFactory = await ethers.getContractFactory('FurnaceP1V2') + const RevenueTraderFactory = await ethers.getContractFactory('RevenueTraderP1V2') + const BackingManagerFactory = await ethers.getContractFactory('BackingManagerP1V2', { + libraries: { + RecollateralizationLibP1: tradingLib.address, + }, + }) + const AssetRegistryFactory = await ethers.getContractFactory('AssetRegistryP1V2') + const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1V2', { + libraries: { BasketLibP1: basketLib.address }, + }) + const DistributorFactory = await ethers.getContractFactory('DistributorP1V2') + const BrokerFactory = await ethers.getContractFactory('BrokerP1V2') + const GnosisTradeFactory = await ethers.getContractFactory('GnosisTrade') + const DutchTradeFactory = await ethers.getContractFactory('DutchTrade') + const StRSRFactory = await ethers.getContractFactory('StRSRP1VotesV2') + + const RevenueTrader = await RevenueTraderFactory.deploy() + + implementationsR2 = { + main: (await MainFactory.deploy()).address, + components: { + assetRegistry: (await AssetRegistryFactory.deploy()).address, + basketHandler: (await BasketHandlerFactory.deploy()).address, + distributor: (await DistributorFactory.deploy()).address, + broker: (await BrokerFactory.deploy()).address, + backingManager: (await BackingManagerFactory.deploy()).address, + furnace: (await FurnaceFactory.deploy()).address, + rToken: (await RTokenFactory.deploy()).address, + rsrTrader: RevenueTrader.address, + rTokenTrader: RevenueTrader.address, + stRSR: (await StRSRFactory.deploy()).address, + }, + trading: { + gnosisTrade: (await GnosisTradeFactory.deploy()).address, + dutchTrade: (await DutchTradeFactory.deploy()).address, + }, + } + + const DeployerFactory = await ethers.getContractFactory('DeployerP1V2') + const deployerR2 = await DeployerFactory.deploy( + '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', + '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', + '0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA', + implementationsR2 + ) + await versionRegistry.registerVersion(deployerR2.address) + } + }) + + describe('Upgrade Check', () => { + for (let i = 0; i < rTokensToTest.length; i++) { + const TIMELOCK_ADDRESS = rTokensToTest[i].timelockAddress + const MAIN_ADDRESS = rTokensToTest[i].mainAddress + + it(`Progressive Upgrade Check - ${rTokensToTest[i].name}`, async () => { + const RTokenMain = await ethers.getContractAt('MainP1', MAIN_ADDRESS) + const RTokenAssetRegistry = await ethers.getContractAt( + 'AssetRegistryP1', + await RTokenMain.assetRegistry() + ) + const TimelockController = await ethers.getContractAt( + 'TimelockController', + TIMELOCK_ADDRESS + ) + + await whileImpersonating(hre, TimelockController.address, async (signer) => { + // Upgrade Main to 4.0.0's Main + await RTokenMain.connect(signer).upgradeTo(implementationsR4.main) + + // Set registries + await RTokenMain.connect(signer).setVersionRegistry(versionRegistry.address) + await RTokenMain.connect(signer).setAssetPluginRegistry(assetPluginRegistry.address) + await RTokenMain.connect(signer).setDAOFeeRegistry(daoFeeRegistry.address) + + // Grant OWNER to Main + await RTokenMain.connect(signer).grantRole( + await RTokenMain.OWNER_ROLE(), + RTokenMain.address + ) + + // Upgrade RToken + await RTokenMain.connect(signer).upgradeRTokenTo(v4VersionHash, false, false) + + // Revoke OWNER from Main + await RTokenMain.connect(signer).revokeRole( + await RTokenMain.OWNER_ROLE(), + RTokenMain.address + ) + }) + + const targetsToVerify = [ + RTokenMain.address, + await RTokenMain.rToken(), + RTokenAssetRegistry.address, + await RTokenMain.basketHandler(), + await RTokenMain.distributor(), + await RTokenMain.broker(), + await RTokenMain.backingManager(), + await RTokenMain.furnace(), + await RTokenMain.rsrTrader(), + await RTokenMain.rTokenTrader(), + await RTokenMain.stRSR(), + ] + + for (let j = 0; j < targetsToVerify.length; j++) { + await _confirmVersion(targetsToVerify[j], '4.0.0') + } + + const currentAssetRegistry = await RTokenAssetRegistry.getRegistry() + const currentAssetPlugins = currentAssetRegistry.assets + + // We don't have all the assets in the registry, so this should fail + await expect(RTokenAssetRegistry.validateCurrentAssets()).to.be.revertedWith( + 'unsupported asset' + ) + + // So, let's upgrade the RToken to a new version now. + await whileImpersonating(hre, TimelockController.address, async (signer) => { + // Upgrade Main to 4.0.0's Main + await RTokenMain.connect(signer).upgradeMainTo(v2VersionHash) + + // Registry does not have assets yet. + await expect( + RTokenMain.connect(signer).upgradeRTokenTo(v2VersionHash, true, true) + ).to.be.revertedWith('unsupported asset') + }) + + // Register Assets in the Registry + await assetPluginRegistry.updateAssetsByVersion( + v4VersionHash, + currentAssetPlugins, + currentAssetPlugins.map(() => true) + ) + await assetPluginRegistry.updateAssetsByVersion( + v2VersionHash, + currentAssetPlugins, + currentAssetPlugins.map(() => true) + ) + + // Finish upgrade, with asset validation + await whileImpersonating(hre, TimelockController.address, async (signer) => { + // Upgrade Main to 4.0.0's Main + await RTokenMain.connect(signer).upgradeMainTo(v2VersionHash) + + // Upgrade RToken, without validating assets + await RTokenMain.connect(signer).upgradeRTokenTo(v2VersionHash, true, true) + }) + }) + } + }) +}) diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index fec57dbc26..97630e1ba6 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -623,8 +623,8 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const { weth, compToken, compoundMock, aaveToken, aaveMock } = await compAaveFixture() const { easyAuction } = await gnosisFixture() const dist: IRevenueShare = { - rTokenDist: bn(40), // 2/5 RToken - rsrDist: bn(60), // 3/5 RSR + rTokenDist: bn(4000), // 2/5 RToken + rsrDist: bn(6000), // 3/5 RSR } const chainId = await getChainId(hre) diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index e0adbbffc9..bd346d05a5 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -8,6 +8,7 @@ const forkBlockNumber = { 'facade-monitor': 18742016, // Ethereum 'old-curve-plugins': 16915576, // Ethereum 'new-curve-plugins': 19626711, // Ethereum + // TODO add all the block numbers we fork from to benefit from caching default: 19742528, // Ethereum } diff --git a/test/plugins/RewardableERC20.test.ts b/test/plugins/RewardableERC20.test.ts index 2b10d1847b..c6f932801a 100644 --- a/test/plugins/RewardableERC20.test.ts +++ b/test/plugins/RewardableERC20.test.ts @@ -788,7 +788,7 @@ for (const wrapperName of wrapperNames) { }) } - const decimalSeeds = [6, 8, 18] + const decimalSeeds = [6, 8, 18, 21, 27] const cases = cartesianProduct(decimalSeeds, decimalSeeds) cases.forEach((params) => { const wrapperStr = wrapperName.replace('Test', '') diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index b906eac08c..ad632a8d07 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -132,8 +132,8 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // RToken Configuration const dist: IRevenueShare = { - rTokenDist: bn(40), // 2/5 RToken - rsrDist: bn(60), // 3/5 RSR + rTokenDist: bn(4000), // 2/5 RToken + rsrDist: bn(6000), // 3/5 RSR } const config: IConfig = { dist: dist, diff --git a/test/plugins/individual-collateral/cbeth/constants.ts b/test/plugins/individual-collateral/cbeth/constants.ts index 19324775f7..9af8e7f78c 100644 --- a/test/plugins/individual-collateral/cbeth/constants.ts +++ b/test/plugins/individual-collateral/cbeth/constants.ts @@ -25,4 +25,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000) export const FORK_BLOCK = 17479312 -export const FORK_BLOCK_BASE = 4446300 +export const FORK_BLOCK_BASE = 5374534 diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 5a1cc4692a..45b6a11713 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -630,6 +630,9 @@ export default function fn( }) describe('integration tests', () => { + const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' + const onArbitrum = useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum' + before(resetFork) let ctx: X @@ -654,7 +657,8 @@ export default function fn( let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager let basketHandler: TestIBasketHandler - let rTokenTrader: TestIRevenueTrader + let rsrTrader: TestIRevenueTrader + let rsr: ERC20Mock let deployer: TestIDeployer let facadeWrite: FacadeWrite @@ -663,8 +667,8 @@ export default function fn( const config = { dist: { - rTokenDist: bn(100), // 100% RToken - rsrDist: bn(0), // 0% RSR + rTokenDist: bn(0), // 0% RToken + rsrDist: bn(10000), // 100% RSR }, minTradeVolume: bn('0'), // $0 rTokenMaxTradeVolume: MAX_UINT192, // +inf @@ -720,7 +724,7 @@ export default function fn( let protocol: DefaultFixture ;({ ctx, protocol } = await loadFixture(integrationFixture)) ;({ collateral } = ctx) - ;({ deployer, facadeWrite, govParams } = protocol) + ;({ deployer, facadeWrite, govParams, rsr } = protocol) supply = fp('1') @@ -777,8 +781,8 @@ export default function fn( await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) ) rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) - rTokenTrader = ( - await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) + rsrTrader = ( + await ethers.getContractAt('TestIRevenueTrader', await main.rsrTrader()) ) // Set initial governance roles @@ -862,43 +866,53 @@ export default function fn( }) it('forwards revenue and sells in a revenue auction', async () => { + expect(await collateralERC20.balanceOf(rsrTrader.address)).to.be.eq(0) const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await rToken.connect(addr1).approve(router.address, MAX_UINT256) + await rsr.connect(addr1).approve(router.address, MAX_UINT256) // Send excess collateral to the RToken trader via forwardRevenue() let mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) - mintAmt = mintAmt.gt('150') ? mintAmt : bn('150') + mintAmt = mintAmt.gt('100000') ? mintAmt : bn('100000') // fewest tokens distributor will transfer await mintCollateralTo(ctx, mintAmt, addr1, backingManager.address) await backingManager.forwardRevenue([collateralERC20.address]) - expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) + expect(await collateralERC20.balanceOf(rsrTrader.address)).to.be.gt(0) // Run revenue auction - await expect( - rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) - ) - .to.emit(rTokenTrader, 'TradeStarted') - .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) - const tradeAddr = await rTokenTrader.trades(collateralERC20.address) + await expect(rsrTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION])) + .to.emit(rsrTrader, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, rsr.address, anyValue, anyValue) + const tradeAddr = await rsrTrader.trades(collateralERC20.address) expect(tradeAddr).to.not.equal(ZERO_ADDRESS) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) expect(await trade.sell()).to.equal(collateralERC20.address) - expect(await trade.buy()).to.equal(rToken.address) + expect(await trade.buy()).to.equal(rsr.address) const buyAmt = await trade.bidAmount(await trade.endTime()) - await rToken.connect(addr1).approve(trade.address, buyAmt) + + // The base whale below is hyUSDStRSR. This is bad, and generally we don't want to do this. But there + // are no RSR holders on Base in size that hold their balance consistently across blocks, since + // everyone is farming. Since the individual tests each have their own block they use, + // this was the easiest way to make everything work. I'm not worried about this in this case + // because hyUSDStRSR is _not_ the RToken we are testing here, so it should have no impact. + const whale = onBase + ? '0x796d2367AF69deB3319B8E10712b8B65957371c3' + : onArbitrum + ? '0xBe81e75C579b090428CC5495540541231FD3c0bD' + : '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1' + await whileImpersonating(whale, async (signer) => { + await rsr.connect(signer).transfer(addr1.address, buyAmt) + }) await advanceToTimestamp((await trade.endTime()) - 1) // Bid await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( - rTokenTrader, + rsrTrader, 'TradeSettled' ) - expect(await rTokenTrader.tradesOpen()).to.equal(0) + expect(await rsrTrader.tradesOpen()).to.equal(0) }) // === Integration Test Helpers === const makePairedCollateral = async (target: string): Promise => { - const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' - const onArbitrum = useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum' const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( 'MockV3Aggregator' ) diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 5be2bff89d..3e282cdbff 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -130,8 +130,8 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // RToken Configuration const dist: IRevenueShare = { - rTokenDist: bn(40), // 2/5 RToken - rsrDist: bn(60), // 3/5 RSR + rTokenDist: bn(4000), // 2/5 RToken + rsrDist: bn(6000), // 3/5 RSR } const config: IConfig = { dist: dist, diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index fbb35852aa..48c28790d6 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -790,6 +790,9 @@ export default function fn( // Only run full protocol integration tests on mainnet // Protocol integration fixture not currently set up to deploy onto base getDescribeFork(targetNetwork)('integration tests', () => { + const onBase = useEnv('FORK_NETWORK').toLowerCase() == 'base' + const onArbitrum = useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum' + before(resetFork) let ctx: X @@ -814,7 +817,8 @@ export default function fn( let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager let basketHandler: TestIBasketHandler - let rTokenTrader: TestIRevenueTrader + let rsrTrader: TestIRevenueTrader + let rsr: ERC20Mock let deployer: TestIDeployer let facadeWrite: FacadeWrite @@ -823,8 +827,8 @@ export default function fn( const config = { dist: { - rTokenDist: bn(100), // 100% RToken - rsrDist: bn(0), // 0% RSR + rTokenDist: bn(0), // 0% RToken + rsrDist: bn(10000), // 100% RSR }, minTradeVolume: bn('0'), // $0 rTokenMaxTradeVolume: MAX_UINT192, // +inf @@ -878,7 +882,7 @@ export default function fn( let protocol: DefaultFixture ;({ ctx, protocol } = await loadFixture(integrationFixture)) ;({ collateral } = ctx) - ;({ deployer, facadeWrite, govParams } = protocol) + ;({ deployer, facadeWrite, govParams, rsr } = protocol) supply = fp('1') @@ -935,8 +939,8 @@ export default function fn( await ethers.getContractAt('TestIBasketHandler', await main.basketHandler()) ) rToken = await ethers.getContractAt('TestIRToken', await main.rToken()) - rTokenTrader = ( - await ethers.getContractAt('TestIRevenueTrader', await main.rTokenTrader()) + rsrTrader = ( + await ethers.getContractAt('TestIRevenueTrader', await main.rsrTrader()) ) // Set initial governance roles @@ -1021,39 +1025,50 @@ export default function fn( it('forwards revenue and sells in a revenue auction', async () => { const router = await (await ethers.getContractFactory('DutchTradeRouter')).deploy() - await rToken.connect(addr1).approve(router.address, MAX_UINT256) + await rsr.connect(addr1).approve(router.address, MAX_UINT256) // Send excess collateral to the RToken trader via forwardRevenue() const mintAmt = toBNDecimals(fp('1e-6'), await collateralERC20.decimals()) await mintCollateralTo( ctx, - mintAmt.gt('150') ? mintAmt : bn('150'), + mintAmt.gt('10000') ? mintAmt : bn('10000'), addr1, backingManager.address ) await backingManager.forwardRevenue([collateralERC20.address]) - expect(await collateralERC20.balanceOf(rTokenTrader.address)).to.be.gt(0) + expect(await collateralERC20.balanceOf(rsrTrader.address)).to.be.gt(0) // Run revenue auction - await expect( - rTokenTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION]) - ) - .to.emit(rTokenTrader, 'TradeStarted') - .withArgs(anyValue, collateralERC20.address, rToken.address, anyValue, anyValue) - const tradeAddr = await rTokenTrader.trades(collateralERC20.address) + await expect(rsrTrader.manageTokens([collateralERC20.address], [TradeKind.DUTCH_AUCTION])) + .to.emit(rsrTrader, 'TradeStarted') + .withArgs(anyValue, collateralERC20.address, rsr.address, anyValue, anyValue) + const tradeAddr = await rsrTrader.trades(collateralERC20.address) expect(tradeAddr).to.not.equal(ZERO_ADDRESS) const trade = await ethers.getContractAt('DutchTrade', tradeAddr) expect(await trade.sell()).to.equal(collateralERC20.address) - expect(await trade.buy()).to.equal(rToken.address) + expect(await trade.buy()).to.equal(rsr.address) const buyAmt = await trade.bidAmount(await trade.endTime()) - await rToken.connect(addr1).approve(trade.address, buyAmt) + + // The base whale below is hyUSDStRSR. This is bad, and generally we don't want to do this. But there + // are no RSR holders on Base in size that hold their balance consistently across blocks, since + // everyone is farming. Since the individual tests each have their own block they use, + // this was the easiest way to make everything work. I'm not worried about this in this case + // because hyUSDStRSR is _not_ the RToken we are testing here, so it should have no impact. + const whale = onBase + ? '0x796d2367AF69deB3319B8E10712b8B65957371c3' + : onArbitrum + ? '0xBe81e75C579b090428CC5495540541231FD3c0bD' + : '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1' + await whileImpersonating(whale, async (signer) => { + await rsr.connect(signer).transfer(addr1.address, buyAmt) + }) await advanceToTimestamp((await trade.endTime()) - 1) await expect(router.connect(addr1).bid(trade.address, addr1.address)).to.emit( - rTokenTrader, + rsrTrader, 'TradeSettled' ) - expect(await rTokenTrader.tradesOpen()).to.equal(0) + expect(await rsrTrader.tradesOpen()).to.equal(0) }) // === Integration Test Helpers === @@ -1067,8 +1082,8 @@ export default function fn( ) let chainId = await getChainId(hre) - if (useEnv('FORK_NETWORK').toLowerCase() == 'base') chainId = 8453 - if (useEnv('FORK_NETWORK').toLowerCase() == 'arbitrum') chainId = 42161 + if (onBase) chainId = 8453 + if (onArbitrum) chainId = 42161 if (target == ethers.utils.formatBytes32String('USD')) { // USD @@ -1077,10 +1092,9 @@ export default function fn( networkConfig[chainId].tokens.USDC! ) - const usdcHolder = - chainId == 42161 - ? '0x47c031236e19d024b42f8ae6780e44a573170703' - : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' + const usdcHolder = onArbitrum + ? '0x47c031236e19d024b42f8ae6780e44a573170703' + : '0x40ec5b33f54e0e8a33a975908c5ba1c14e5bbbdf' await whileImpersonating(usdcHolder, async (signer) => { await erc20 .connect(signer) @@ -1106,10 +1120,9 @@ export default function fn( 'IERC20Metadata', networkConfig[chainId].tokens.WETH! ) - const wethHolder = - chainId == 42161 - ? '0x70d95587d40a2caf56bd97485ab3eec10bee6336' - : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' + const wethHolder = onArbitrum + ? '0x70d95587d40a2caf56bd97485ab3eec10bee6336' + : '0xF04a5cC80B1E94C69B48f5ee68a08CD2F09A7c3E' await whileImpersonating(wethHolder, async (signer) => { await erc20 .connect(signer) @@ -1138,10 +1151,9 @@ export default function fn( 'IERC20Metadata', networkConfig[chainId].tokens.WBTC! ) - const wbtcHolder = - chainId == 42161 - ? '0x47c031236e19d024b42f8ae6780e44a573170703' - : '0xccf4429db6322d5c611ee964527d42e5d685dd6a' + const wbtcHolder = onArbitrum + ? '0x47c031236e19d024b42f8ae6780e44a573170703' + : '0xccf4429db6322d5c611ee964527d42e5d685dd6a' await whileImpersonating(wbtcHolder, async (signer) => { await erc20 diff --git a/test/plugins/individual-collateral/stargate/constants.ts b/test/plugins/individual-collateral/stargate/constants.ts index fa88507d3e..69eb5ca910 100644 --- a/test/plugins/individual-collateral/stargate/constants.ts +++ b/test/plugins/individual-collateral/stargate/constants.ts @@ -53,4 +53,4 @@ export const DELAY_UNTIL_DEFAULT = bn(86400) export const MAX_TRADE_VOL = bn(1000000) export const USDC_DECIMALS = bn(6) -export const FORK_BLOCK = chainId == '8453' ? 4873094 : 17289300 +export const FORK_BLOCK = chainId == '8453' ? 5374534 : 17289300 diff --git a/test/registries/AssetPluginRegistry.test.ts b/test/registries/AssetPluginRegistry.test.ts new file mode 100644 index 0000000000..0c727afb9e --- /dev/null +++ b/test/registries/AssetPluginRegistry.test.ts @@ -0,0 +1,402 @@ +import { ethers } from 'hardhat' +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { expect } from 'chai' +import { ZERO_ADDRESS } from '#/common/constants' +import { Collateral, Implementation, IMPLEMENTATION, defaultFixture } from '../fixtures' +import { AssetPluginRegistry, TestIDeployer, VersionRegistry, DeployerMock } from '../../typechain' + +const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip + +describeP1('Asset Plugin Registry', () => { + let owner: SignerWithAddress + let other: SignerWithAddress + + // Assets + let tokenAsset: Collateral + let usdcAsset: Collateral + let basket: Collateral[] + + // Deployers + let deployer: TestIDeployer + let deployerMockV1: DeployerMock + let deployerMockV2: DeployerMock + + // Registries + let versionRegistry: VersionRegistry + let assetPluginRegistry: AssetPluginRegistry + + beforeEach(async () => { + ;[owner, other] = await ethers.getSigners() + + // Deploy fixture + ;({ deployer, basket } = await loadFixture(defaultFixture)) + + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') + versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + + const assetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') + assetPluginRegistry = await assetPluginRegistryFactory.deploy(versionRegistry.address) + + // Get assets and tokens + ;[tokenAsset, usdcAsset] = basket + + const DeployerMockFactoryV1 = await ethers.getContractFactory('DeployerMock') + deployerMockV1 = await DeployerMockFactoryV1.deploy() + + const DeployerMockFactoryV2 = await ethers.getContractFactory('DeployerMockV2') + deployerMockV2 = (await DeployerMockFactoryV2.deploy()) as DeployerMock + }) + + describe('Deployment', () => { + it('should set the owner/version registry correctly', async () => { + expect(await assetPluginRegistry.owner()).to.eq(await owner.getAddress()) + expect(await assetPluginRegistry.versionRegistry()).to.eq(versionRegistry.address) + }) + }) + + describe('Asset Plugin Management', () => { + it('Register Asset', async () => { + const versionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await tokenAsset.version()) + ) + + // Register deployment + await versionRegistry.connect(owner).registerVersion(deployer.address) + + // Register assets + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal( + false + ) + await expect( + assetPluginRegistry.connect(owner).registerAsset(tokenAsset.address, [versionHash]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, tokenAsset.address, true) + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal(true) + + // Registering again overrides status and enables it again (if it was disabled) + await expect( + assetPluginRegistry.connect(owner).registerAsset(tokenAsset.address, [versionHash]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, tokenAsset.address, true) + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal(true) // remains true + + // Can register multiple versions + await versionRegistry.connect(owner).registerVersion(deployerMockV1.address) + await versionRegistry.connect(owner).registerVersion(deployerMockV2.address) + const versionV1Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV1.version()) + ) + const versionV2Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV2.version()) + ) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + false + ) + expect(await assetPluginRegistry.isValidAsset(versionV2Hash, tokenAsset.address)).to.equal( + false + ) + await expect( + assetPluginRegistry + .connect(owner) + .registerAsset(tokenAsset.address, [versionV1Hash, versionV2Hash]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV1Hash, tokenAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV2Hash, tokenAsset.address, true) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + true + ) + expect(await assetPluginRegistry.isValidAsset(versionV2Hash, tokenAsset.address)).to.equal( + true + ) + }) + + it('Denies invalid registrations', async () => { + const versionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await tokenAsset.version()) + ) + // Fails if deployment not registered + await expect( + assetPluginRegistry.connect(owner).registerAsset(tokenAsset.address, [versionHash]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidVersion') + + // Register deployment + await versionRegistry.connect(owner).registerVersion(deployer.address) + + // If not owner cannot register asset + await expect( + assetPluginRegistry.connect(other).registerAsset(tokenAsset.address, [versionHash]) + ).to.be.revertedWith('Ownable: caller is not the owner') + + // Invalid registration with zero address is also rejected + await expect( + assetPluginRegistry.connect(owner).registerAsset(ZERO_ADDRESS, [versionHash]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidAsset') + + // Fails if any of the versions is not registered + const versionV1Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV1.version()) + ) + await expect( + assetPluginRegistry + .connect(owner) + .registerAsset(tokenAsset.address, [versionHash, versionV1Hash]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidVersion') + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal( + false + ) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + false + ) + }) + + it('Updates versions by asset', async () => { + const versionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await tokenAsset.version()) + ) + const versionV1Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV1.version()) + ) + + // Register deployments + await versionRegistry.connect(owner).registerVersion(deployer.address) + await versionRegistry.connect(owner).registerVersion(deployerMockV1.address) + + // Register assets + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal( + false + ) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + false + ) + + await expect( + assetPluginRegistry + .connect(owner) + .updateVersionsByAsset(tokenAsset.address, [versionHash, versionV1Hash], [true, true]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, tokenAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV1Hash, tokenAsset.address, true) + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal(true) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + true + ) + + // Allows to override and unregister + await expect( + assetPluginRegistry + .connect(owner) + .updateVersionsByAsset(tokenAsset.address, [versionHash, versionV1Hash], [true, false]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, tokenAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV1Hash, tokenAsset.address, false) + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal(true) // remains true + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + false + ) // unregistered + + // Set another asset + expect(await assetPluginRegistry.isValidAsset(versionHash, usdcAsset.address)).to.equal(false) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, usdcAsset.address)).to.equal( + false + ) + + await expect( + assetPluginRegistry + .connect(owner) + .updateVersionsByAsset(usdcAsset.address, [versionHash, versionV1Hash], [true, true]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, usdcAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV1Hash, usdcAsset.address, true) + + expect(await assetPluginRegistry.isValidAsset(versionHash, usdcAsset.address)).to.equal(true) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, usdcAsset.address)).to.equal( + true + ) + }) + + it('Denies invalid updates (version by asset)', async () => { + const versionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await tokenAsset.version()) + ) + + // Checks valid lengths + await expect( + assetPluginRegistry.updateVersionsByAsset(tokenAsset.address, [versionHash], [true, true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__LengthMismatch') + + // Invalid registration with zero address is also rejected + await expect( + assetPluginRegistry + .connect(owner) + .updateVersionsByAsset(ZERO_ADDRESS, [versionHash], [true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidAsset') + + // Fails if deployment not registered + await expect( + assetPluginRegistry + .connect(owner) + .updateVersionsByAsset(tokenAsset.address, [versionHash], [true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidVersion') + + // Register deployment + await versionRegistry.connect(owner).registerVersion(deployer.address) + + // If not owner cannot update + await expect( + assetPluginRegistry + .connect(other) + .updateVersionsByAsset(tokenAsset.address, [versionHash], [true]) + ).to.be.revertedWith('Ownable: caller is not the owner') + + // Fails if any of the versions is not registered + const versionV1Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV1.version()) + ) + await expect( + assetPluginRegistry + .connect(owner) + .updateVersionsByAsset(tokenAsset.address, [versionHash, versionV1Hash], [true, true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidVersion') + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal( + false + ) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + false + ) + }) + + it('Update assets by version', async () => { + const versionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await tokenAsset.version()) + ) + + // Register deployments + await versionRegistry.connect(owner).registerVersion(deployer.address) + await versionRegistry.connect(owner).registerVersion(deployerMockV1.address) + + // Register assets + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal( + false + ) + expect(await assetPluginRegistry.isValidAsset(versionHash, usdcAsset.address)).to.equal(false) + + await expect( + assetPluginRegistry + .connect(owner) + .updateAssetsByVersion(versionHash, [tokenAsset.address, usdcAsset.address], [true, true]) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, tokenAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, usdcAsset.address, true) + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal(true) + expect(await assetPluginRegistry.isValidAsset(versionHash, usdcAsset.address)).to.equal(true) + + // Allows to override and unregister + await expect( + assetPluginRegistry + .connect(owner) + .updateAssetsByVersion( + versionHash, + [tokenAsset.address, usdcAsset.address], + [true, false] + ) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, tokenAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionHash, usdcAsset.address, false) + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal(true) // remains true + expect(await assetPluginRegistry.isValidAsset(versionHash, usdcAsset.address)).to.equal(false) // unregistered + + // Set another version + const versionV1Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV1.version()) + ) + + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + false + ) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, usdcAsset.address)).to.equal( + false + ) + + await expect( + assetPluginRegistry + .connect(owner) + .updateAssetsByVersion( + versionV1Hash, + [tokenAsset.address, usdcAsset.address], + [true, true] + ) + ) + .to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV1Hash, tokenAsset.address, true) + .and.to.emit(assetPluginRegistry, 'AssetPluginRegistryUpdated') + .withArgs(versionV1Hash, usdcAsset.address, true) + + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, tokenAsset.address)).to.equal( + true + ) + expect(await assetPluginRegistry.isValidAsset(versionV1Hash, usdcAsset.address)).to.equal( + true + ) + }) + + it('Denies invalid updates (asset by version)', async () => { + const versionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await tokenAsset.version()) + ) + + // Checks valid lengths + await expect( + assetPluginRegistry.updateAssetsByVersion(versionHash, [tokenAsset.address], [true, true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__LengthMismatch') + + // Fails if deployment not registered + await expect( + assetPluginRegistry + .connect(owner) + .updateAssetsByVersion(versionHash, [tokenAsset.address], [true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidVersion') + + // Register deployment + await versionRegistry.connect(owner).registerVersion(deployer.address) + + // If not owner cannot update + await expect( + assetPluginRegistry + .connect(other) + .updateAssetsByVersion(versionHash, [tokenAsset.address], [true]) + ).to.be.revertedWith('Ownable: caller is not the owner') + + // Fails if any of the assets is zero address + await expect( + assetPluginRegistry + .connect(owner) + .updateAssetsByVersion(versionHash, [tokenAsset.address, ZERO_ADDRESS], [true, true]) + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidAsset') + + expect(await assetPluginRegistry.isValidAsset(versionHash, tokenAsset.address)).to.equal( + false + ) + }) + }) +}) diff --git a/test/registries/DAOFeeRegistry.test.ts b/test/registries/DAOFeeRegistry.test.ts new file mode 100644 index 0000000000..4a75c0c77c --- /dev/null +++ b/test/registries/DAOFeeRegistry.test.ts @@ -0,0 +1,217 @@ +import { ethers } from 'hardhat' +import { bn } from '#/common/numbers' +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { expect } from 'chai' +import { ZERO_ADDRESS } from '#/common/constants' +import { Implementation, IMPLEMENTATION, defaultFixture } from '../fixtures' +import { whileImpersonating } from '../utils/impersonation' +import { + DAOFeeRegistry, + ERC20Mock, + TestIDistributor, + TestIRevenueTrader, + TestIMain, + IRToken, +} from '../../typechain' + +const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip + +describeP1('DAO Fee Registry', () => { + let owner: SignerWithAddress + let other: SignerWithAddress + + let distributor: TestIDistributor + let main: TestIMain + let rToken: IRToken + let rsr: ERC20Mock + let rsrTrader: TestIRevenueTrader + + let feeRegistry: DAOFeeRegistry + + beforeEach(async () => { + ;[owner, other] = await ethers.getSigners() + + // Deploy fixture + ;({ distributor, main, rToken, rsr, rsrTrader } = await loadFixture(defaultFixture)) + + const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') + feeRegistry = await DAOFeeRegistryFactory.connect(owner).deploy(await owner.getAddress()) + await main.connect(owner).setDAOFeeRegistry(feeRegistry.address) + }) + + describe('Deployment', () => { + it('should set the owner correctly', async () => { + expect(await feeRegistry.owner()).to.eq(await owner.getAddress()) + }) + it('fee should begin zero and assigned to owner', async () => { + const feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(owner.address) + expect(feeDetails.feeNumerator).to.equal(0) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + }) + }) + + describe('Ownership', () => { + it('Should be able to change owner', async () => { + expect(await feeRegistry.owner()).to.eq(await owner.getAddress()) + await feeRegistry.connect(owner).transferOwnership(other.address) + expect(await feeRegistry.owner()).to.eq(await other.getAddress()) + await expect(feeRegistry.connect(owner).setFeeRecipient(owner.address)).to.be.revertedWith( + 'Ownable: caller is not the owner' + ) + await expect(feeRegistry.connect(owner).setDefaultFeeNumerator(bn('100'))).to.be.revertedWith( + 'Ownable: caller is not the owner' + ) + await expect( + feeRegistry.connect(owner).setRTokenFeeNumerator(rToken.address, bn('100')) + ).to.be.revertedWith('Ownable: caller is not the owner') + }) + }) + + describe('Negative cases', () => { + it('Should not allow calling setters by anyone other than owner', async () => { + await expect(feeRegistry.connect(other).setFeeRecipient(owner.address)).to.be.revertedWith( + 'Ownable: caller is not the owner' + ) + await expect(feeRegistry.connect(other).setDefaultFeeNumerator(bn('100'))).to.be.revertedWith( + 'Ownable: caller is not the owner' + ) + await expect( + feeRegistry.connect(other).setRTokenFeeNumerator(rToken.address, bn('100')) + ).to.be.revertedWith('Ownable: caller is not the owner') + await expect(feeRegistry.connect(other).resetRTokenFee(rToken.address)).to.be.revertedWith( + 'Ownable: caller is not the owner' + ) + }) + + it('Should not allow setting fee recipient to zero address', async () => { + await expect( + feeRegistry.connect(owner).setFeeRecipient(ZERO_ADDRESS) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidFeeRecipient') + }) + + it('Should not allow setting fee recipient twice', async () => { + await expect( + feeRegistry.connect(owner).setFeeRecipient(owner.address) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__FeeRecipientAlreadySet') + }) + + it('Should not allow fee numerator above max fee numerator', async () => { + await expect( + feeRegistry.connect(owner).setDefaultFeeNumerator(bn('15e2').add(1)) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidFeeNumerator') + await expect( + feeRegistry.connect(owner).setDefaultFeeNumerator(bn('2').pow(256).sub(1)) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidFeeNumerator') + }) + }) + + describe('Fee Management', () => { + const defaultFees = [bn('0'), bn('1e3'), bn('15e2')] // test 3 fees: 0%, 10%, 15% + for (const defaultFee of defaultFees) { + context(`Default Fee: ${defaultFee.div(100).toString()}%`, () => { + beforeEach(async () => { + await expect(feeRegistry.connect(owner).setDefaultFeeNumerator(defaultFee)) + .to.emit(feeRegistry, 'DefaultFeeNumeratorSet') + .withArgs(defaultFee) + }) + + it('Should handle complex sequence of fee setting and unsetting', async () => { + // Should start out as expected + let feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(owner.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + feeDetails = await feeRegistry.getFeeDetails(other.address) + expect(feeDetails.recipient).to.equal(owner.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + + // Should be able to set precise fee for specific rToken while keeping recipient + await expect(feeRegistry.connect(owner).setRTokenFeeNumerator(rToken.address, bn('1e3'))) + .to.emit(feeRegistry, 'RTokenFeeNumeratorSet') + .withArgs(rToken.address, bn('1e3'), true) + feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(owner.address) + expect(feeDetails.feeNumerator).to.equal(bn('1e3')) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + feeDetails = await feeRegistry.getFeeDetails(other.address) + expect(feeDetails.recipient).to.equal(owner.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + + // Should be able to change fee recipient while keeping precise fee + await feeRegistry.setFeeRecipient(other.address) + feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(bn('1e3')) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + feeDetails = await feeRegistry.getFeeDetails(other.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + + // Should be able to set fee to 0 + await feeRegistry.setRTokenFeeNumerator(rToken.address, 0) + feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(0) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + feeDetails = await feeRegistry.getFeeDetails(other.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + + // Should be able to resetFee to use default fee + await expect(feeRegistry.resetRTokenFee(rToken.address)) + .to.emit(feeRegistry, 'RTokenFeeNumeratorSet') + .withArgs(rToken.address, 0, false) + feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + feeDetails = await feeRegistry.getFeeDetails(other.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + + // Should be able to change default fee and update everyone + await feeRegistry.setDefaultFeeNumerator(bn('5e2')) // 5% + feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(bn('5e2')) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + feeDetails = await feeRegistry.getFeeDetails(other.address) + expect(feeDetails.recipient).to.equal(other.address) + expect(feeDetails.feeNumerator).to.equal(bn('5e2')) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + }) + + if (defaultFee.gt(0)) { + it('Distributor distributions should reflect the fee', async () => { + // Check setup + const feeDetails = await feeRegistry.getFeeDetails(rToken.address) + expect(feeDetails.recipient).to.equal(owner.address) + expect(feeDetails.feeNumerator).to.equal(defaultFee) + expect(feeDetails.feeDenominator).to.equal(bn('1e4')) + expect(await rsr.balanceOf(rsrTrader.address)).to.equal(0) + + // Distribute 1m RSR + const amt = bn('1e24') + await rsr.mint(rsrTrader.address, amt) + await whileImpersonating(rsrTrader.address, async (signer) => { + await rsr.connect(signer).approve(distributor.address, amt) + expect(await rsr.balanceOf(owner.address)).to.equal(0) + await distributor.connect(signer).distribute(rsr.address, amt) + + // Expected returned amount is for the fee times 5/3 to account for rev share split + const expectedAmt = amt.mul(defaultFee).div(bn('1e4')).mul(5).div(3) + expect(await rsr.balanceOf(owner.address)).to.equal(expectedAmt) + }) + }) + } + }) + } + }) +}) diff --git a/test/registries/VersionRegistry.test.ts b/test/registries/VersionRegistry.test.ts new file mode 100644 index 0000000000..9edfc493d7 --- /dev/null +++ b/test/registries/VersionRegistry.test.ts @@ -0,0 +1,134 @@ +import { ethers } from 'hardhat' +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { expect } from 'chai' +import { ONE_ADDRESS, ZERO_ADDRESS, ZERO_BYTES } from '#/common/constants' +import { IImplementations } from '#/common/configuration' +import { DeployerMock, TestIDeployer, VersionRegistry } from '../../typechain' +import { Implementation, IMPLEMENTATION, defaultFixture } from '../fixtures' + +const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip + +describeP1('Version Registry', () => { + let versionRegistry: VersionRegistry + let deployer: TestIDeployer + let deployerMockV1: DeployerMock + let deployerMockV2: DeployerMock + let owner: SignerWithAddress + let other: SignerWithAddress + + beforeEach(async () => { + ;[owner, other] = await ethers.getSigners() + ;({ deployer } = await loadFixture(defaultFixture)) + + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') + versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + + const DeployerMockFactoryV1 = await ethers.getContractFactory('DeployerMock') + deployerMockV1 = await DeployerMockFactoryV1.deploy() + + const DeployerMockFactoryV2 = await ethers.getContractFactory('DeployerMockV2') + deployerMockV2 = await DeployerMockFactoryV2.deploy() + }) + + describe('Deployment', () => { + it('should set the owner to the specified address', async () => { + expect(await versionRegistry.owner()).to.eq(await owner.getAddress()) + }) + }) + + describe('Version Management', () => { + beforeEach(async () => { + await versionRegistry.connect(owner).registerVersion(deployerMockV1.address) + }) + + it('Registered version correctly', async () => { + const versionData = await versionRegistry.getLatestVersion() + + expect(versionData.versionHash).not.be.eq(ZERO_BYTES) + expect(versionData.deprecated).be.eq(false) + + const expectedVersionHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('V1')) + expect(versionData.versionHash).to.eq(expectedVersionHash) + expect(await versionRegistry.deployments(expectedVersionHash)).to.not.equal(ZERO_ADDRESS) + expect(await versionRegistry.deployments(expectedVersionHash)).to.equal( + deployerMockV1.address + ) + }) + + it('Denies Duplicate and Invalid Registration', async () => { + // If not owner, should be rejected + await expect( + versionRegistry.connect(other).registerVersion(deployer.address) + ).to.be.revertedWith('Ownable: caller is not the owner') + + // Same version, different deployer, should be rejected. + const DeployerMockFactory = await ethers.getContractFactory('DeployerMock') + const deployerMockDup = await DeployerMockFactory.deploy() + await expect( + versionRegistry.connect(owner).registerVersion(deployerMockDup.address) + ).to.be.revertedWithCustomError(versionRegistry, 'VersionRegistry__InvalidRegistration') + + // Invalid registration with zero address is also rejected + await expect( + versionRegistry.connect(owner).registerVersion(ZERO_ADDRESS) + ).to.be.revertedWithCustomError(versionRegistry, 'VersionRegistry__ZeroAddress') + }) + + it('Handles multiple versions', async () => { + const initialVersionData = await versionRegistry.getLatestVersion() + + // Register new version + const expectedV2Hash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('V2')) + await expect(versionRegistry.connect(owner).registerVersion(deployerMockV2.address)) + .to.emit(versionRegistry, 'VersionRegistered') + .withArgs(expectedV2Hash, deployerMockV2.address) + + // Check V2 properly registered + const v2VersionData = await versionRegistry.getLatestVersion() + expect(v2VersionData.versionHash).to.eq(expectedV2Hash) + expect(v2VersionData.versionHash).not.be.eq(ZERO_BYTES) + expect(v2VersionData.deprecated).be.eq(false) + expect(await versionRegistry.deployments(expectedV2Hash)).to.not.equal(ZERO_ADDRESS) + expect(await versionRegistry.deployments(expectedV2Hash)).to.equal(deployerMockV2.address) + + // Original deployment still registered + expect(await versionRegistry.deployments(initialVersionData.versionHash)).to.equal( + deployerMockV1.address + ) + + // Can also register the fixture version (4.0.0 or later for example) + const expectedDeployerFixtureHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployer.version()) + ) + await expect(versionRegistry.connect(owner).registerVersion(deployer.address)) + .to.emit(versionRegistry, 'VersionRegistered') + .withArgs(expectedDeployerFixtureHash, deployer.address) + }) + + it('Deprecate Version', async () => { + let versionData = await versionRegistry.getLatestVersion() + + await expect(versionRegistry.connect(owner).deprecateVersion(versionData.versionHash)) + .to.emit(versionRegistry, 'VersionDeprecated') + .withArgs(versionData.versionHash) + versionData = await versionRegistry.getLatestVersion() + + expect(versionData.versionHash).not.be.eq(ZERO_BYTES) + expect(versionData.deprecated).be.eq(true) + + // Cannot deprecate again + await expect( + versionRegistry.connect(owner).deprecateVersion(versionData.versionHash) + ).to.be.revertedWithCustomError(versionRegistry, 'VersionRegistry__AlreadyDeprecated') + }) + + it('Returns implementations correctly', async () => { + const versionData = await versionRegistry.getLatestVersion() + const implementations: IImplementations = await versionRegistry.getImplementationForVersion( + versionData.versionHash + ) + expect(implementations.main).to.eq(ONE_ADDRESS) + }) + }) +}) diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index a14028e444..f3924355e7 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -27,7 +27,7 @@ import { TestIStRSR, TestIDistributor, } from '../../typechain' -import { withinQuad } from '../utils/matchers' +import { withinTolerance } from '../utils/matchers' import { advanceTime, getLatestBlockTimestamp } from '../utils/time' import { Collateral, @@ -535,17 +535,18 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { await expect( distributor .connect(owner) - .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(10000) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(FURNACE_DEST, bn(0), bn(0)) + .withArgs(STRSR_DEST, bn(0), bn(10000)) - // Avoid dropping qCOMP by making there be exactly 1 distribution share. await expect( - distributor.connect(owner).setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(1) }) + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) ) .to.emit(distributor, 'DistributionSet') - .withArgs(STRSR_DEST, bn(0), bn(1)) + .withArgs(FURNACE_DEST, bn(0), bn(0)) // COMP Rewards await compoundMock.setRewards(backingManager.address, rewardAmount) @@ -642,7 +643,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Check balances sent to corresponding destinations // StRSR - expect(await rsr.balanceOf(stRSR.address)).to.equal(minBuyAmt) + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt, 10000) // Furnace expect(await rToken.balanceOf(furnace.address)).to.equal(0) }) @@ -1146,7 +1147,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( auctionbuyAmt2.add(auctionbuyAmt5), - bn('50') + bn('10000') ) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( auctionbuyAmtRToken2.add(auctionbuyAmtRToken5), @@ -1266,7 +1267,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( auctionbuyAmt2.add(auctionbuyAmt5).add(auctionbuyAmt7), - bn('10') + bn('10000') ) expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( auctionbuyAmtRToken2.add(auctionbuyAmtRToken5).add(auctionbuyAmtRToken7), @@ -1423,8 +1424,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { anyValue, rsr.address, wbtc.address, - withinQuad(sellAmtRSR), - withinQuad(buyAmtBidRSR), + withinTolerance(sellAmtRSR), + withinTolerance(buyAmtBidRSR), ], emitted: true, }, @@ -1481,7 +1482,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { rsr.address, wbtc.address, auctionSellAmtRSR, - withinQuad(auctionBuyAmtRSR), + withinTolerance(auctionBuyAmtRSR), ], emitted: true, }, @@ -1593,7 +1594,13 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: backingManager, name: 'TradeStarted', - args: [anyValue, cETH.address, weth.address, withinQuad(sellAmt), withinQuad(minBuyAmt)], + args: [ + anyValue, + cETH.address, + weth.address, + withinTolerance(sellAmt), + withinTolerance(minBuyAmt), + ], emitted: true, }, ]) @@ -1656,8 +1663,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { anyValue, cETH.address, weth.address, - withinQuad(sellAmtRemainder), - withinQuad(minBuyAmtRemainder), + withinTolerance(sellAmtRemainder), + withinTolerance(minBuyAmtRemainder), ], emitted: true, }, @@ -1821,8 +1828,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { anyValue, rsr.address, weth.address, - withinQuad(sellAmtRSR2), - withinQuad(buyAmtRSR2), + withinTolerance(sellAmtRSR2), + withinTolerance(buyAmtRSR2), ], emitted: true, }, diff --git a/test/scenario/NestedRTokens.test.ts b/test/scenario/NestedRTokens.test.ts index 6386b158fd..eff96b200d 100644 --- a/test/scenario/NestedRTokens.test.ts +++ b/test/scenario/NestedRTokens.test.ts @@ -6,7 +6,7 @@ import { ethers } from 'hardhat' import { BigNumber } from 'ethers' import { ONE_PERIOD, ZERO_ADDRESS, CollateralStatus, TradeKind } from '../../common/constants' import { bn, fp } from '../../common/numbers' -import { withinQuad } from '../utils/matchers' +import { withinTolerance } from '../utils/matchers' import { toSellAmt, toMinBuyAmt } from '../utils/trades' import { expectRTokenPrice, setOraclePrice } from '../utils/oracles' import { advanceTime } from '../utils/time' @@ -232,8 +232,8 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { anyValue, one.rsr.address, staticATokenERC20.address, - withinQuad(sellAmt), - withinQuad(buyAmt) + withinTolerance(sellAmt), + withinTolerance(buyAmt) ) // Verify outer RToken isn't panicking @@ -358,15 +358,15 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { await one.assetRegistry.refresh() await two.assetRegistry.refresh() - const rTokSellAmt = issueAmt.div(2).mul(2).div(5).sub(40) - const rsrSellAmt = issueAmt.div(2).mul(3).div(5).sub(60) + const rTokSellAmt = issueAmt.div(2).mul(2).div(5).sub(4000) + const rsrSellAmt = issueAmt.div(2).mul(3).div(5).sub(6000) const rsrMinBuyAmt = toMinBuyAmt( rsrSellAmt, fp('1'), fp('1'), ORACLE_ERROR, await one.backingManager.maxTradeSlippage() - ).add(1) + ) expect(await staticATokenERC20.balanceOf(one.backingManager.address)).to.equal(issueAmt) // Note the inner RToken mints internally since it has excess backing @@ -386,13 +386,7 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { { contract: one.rsrTrader, name: 'TradeStarted', - args: [ - anyValue, - one.rToken.address, - one.rsr.address, - rsrSellAmt, - rsrMinBuyAmt, //rsrSellAmt.mul(99).div(100).add(31), - ], + args: [anyValue, one.rToken.address, one.rsr.address, rsrSellAmt, rsrMinBuyAmt], emitted: true, }, ]) diff --git a/test/utils/matchers.ts b/test/utils/matchers.ts index 51fe4a97e8..5e2a11f901 100644 --- a/test/utils/matchers.ts +++ b/test/utils/matchers.ts @@ -3,9 +3,9 @@ import { expect } from 'chai' import { bn } from '../../common/numbers' // Creates a chai matcher that returns true if y is within a quadrillion of x -export const withinQuad = (x: BigNumber): ((y: BigNumber) => boolean) => { +export const withinTolerance = (x: BigNumber): ((y: BigNumber) => boolean) => { return (y: BigNumber) => { - const tolerance = x.div(bn('1e15')) + const tolerance = x.div(bn('1e13')) const lower = x.sub(tolerance) const higher = x.add(tolerance) return y.gte(lower) && y.lte(higher) From e135fabf699a44b2898d9555149521e121a2a645 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 12 Jun 2024 13:41:29 -0300 Subject: [PATCH 390/450] Reset fork on every plugin test (#1155) Co-authored-by: Akshat Mittal Co-authored-by: Taylor Brent --- .github/workflows/tests.yml | 33 +++++++++++++++++-- test/Broker.test.ts | 7 ++-- .../individual-collateral/collateralTests.ts | 7 ++-- ...> StargateETHTestSuite.test.ts_DEPRECATED} | 2 -- ... StargateUSDCTestSuite.test.ts_DEPRECATED} | 3 +- 5 files changed, 38 insertions(+), 14 deletions(-) rename test/plugins/individual-collateral/stargate/{StargateETHTestSuite.test.ts => StargateETHTestSuite.test.ts_DEPRECATED} (98%) rename test/plugins/individual-collateral/stargate/{StargateUSDCTestSuite.test.ts => StargateUSDCTestSuite.test.ts_DEPRECATED} (99%) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 92dc1ec4b4..5479cbbec9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -57,7 +57,7 @@ jobs: - run: yarn test:plugins plugin-tests-mainnet-1: - name: 'Plugin Integration Tests (Mainnet) - 1/2' + name: 'Plugin Integration Tests (Mainnet) - 1/3' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -84,7 +84,7 @@ jobs: FORK: 1 plugin-tests-mainnet-2: - name: 'Plugin Integration Tests (Mainnet) - 2/2' + name: 'Plugin Integration Tests (Mainnet) - 2/3' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -101,7 +101,34 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: yarn hardhat test ./test/plugins/individual-collateral/[D-Zd-z]*/*.test.ts + - run: yarn hardhat test ./test/plugins/individual-collateral/[D-Ld-l]*/*.test.ts + env: + NODE_OPTIONS: '--max-old-space-size=32768' + TS_NODE_SKIP_IGNORE: true + MAINNET_RPC_URL: https://eth-mainnet.alchemyapi.io/v2/${{ secrets.ALCHEMY_MAINNET_KEY }} + FORK_NETWORK: mainnet + PROTO_IMPL: 1 + FORK: 1 + + plugin-tests-mainnet-3: + name: 'Plugin Integration Tests (Mainnet) - 3/3' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - name: 'Cache hardhat network fork' + uses: actions/cache@v3 + with: + path: cache/hardhat-network-fork + key: hardhat-network-fork-${{ runner.os }}-${{ hashFiles('test/integration/fork-block-numbers.ts') }} + restore-keys: | + hardhat-network-fork-${{ runner.os }}- + hardhat-network-fork- + - run: yarn hardhat test ./test/plugins/individual-collateral/[M-Zm-z]*/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=32768' TS_NODE_SKIP_IGNORE: true diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 92a104c404..9ebcd98888 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -1524,7 +1524,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { const bidTypes = [bn(BidType.CALLBACK), bn(BidType.TRANSFER)] // applied to both buy and sell tokens - const decimals = [bn('1'), bn('6'), bn('8'), bn('9'), bn('18'), bn('21'), bn('27')] + const decimals = [bn('1'), bn('6'), bn('18'), bn('27')] // auction sell amount const auctionSellAmts = [bn('2'), bn('1595439874635'), bn('987321984732198435645846513')] @@ -1532,12 +1532,13 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { // auction progression %: these will get rounded to blocks later const progression = [fp('0'), fp('0.321698432589749813'), fp('0.798138321987329646'), fp('1')] - // total cases is 5 * 5 * 3 * 4 = 300 + // total cases is 2 * 4 * 4 * 3 * 4 = 384 if (SLOW) { + decimals.push(bn('8'), bn('9'), bn('21')) progression.push(fp('0.176334768961354965'), fp('0.523449931646439834')) - // total cases is 5 * 5 * 3 * 6 = 450 + // total cases is 2 * 7 * 7 * 3 * 6 = 1764 } const paramList = cartesianProduct(bidTypes, decimals, decimals, auctionSellAmts, progression) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 45b6a11713..8dbce3ee93 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -163,6 +163,7 @@ export default function fn( }) beforeEach(async () => { + await resetFork() ;[, alice] = await ethers.getSigners() ctx = await loadFixture(makeCollateralFixtureContext(alice, {})) ;({ chainlinkFeed, collateral } = ctx) @@ -211,8 +212,6 @@ export default function fn( }) describe('prices', () => { - before(resetFork) // important for getting prices/refPerToks to behave predictably - it('enters IFFY state when price becomes stale', async () => { const decayDelay = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER await advanceToTimestamp((await getLatestBlockTimestamp()) + decayDelay) @@ -360,7 +359,7 @@ export default function fn( itHasRevenueHiding('does revenue hiding correctly', async () => { const tempCtx = await makeCollateralFixtureContext(alice, { erc20: ctx.tok.address, - revenueHiding: fp('0.01'), + revenueHiding: fp('0.0101'), })() // ctx.collateral = await deployCollateral() @@ -448,8 +447,6 @@ export default function fn( }) describe('status', () => { - before(resetFork) - it('maintains status in normal situations', async () => { // Check initial state expect(await collateral.status()).to.equal(CollateralStatus.SOUND) diff --git a/test/plugins/individual-collateral/stargate/StargateETHTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateETHTestSuite.test.ts_DEPRECATED similarity index 98% rename from test/plugins/individual-collateral/stargate/StargateETHTestSuite.test.ts rename to test/plugins/individual-collateral/stargate/StargateETHTestSuite.test.ts_DEPRECATED index dfe30a4deb..b06b686bf5 100644 --- a/test/plugins/individual-collateral/stargate/StargateETHTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateETHTestSuite.test.ts_DEPRECATED @@ -1,4 +1,3 @@ -/** DEPRECATED import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import collateralTests from '../collateralTests' import { ETH_USD_PRICE_FEED } from './constants' @@ -27,4 +26,3 @@ const volatileOpts = { } collateralTests(volatileOpts) -*/ diff --git a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts_DEPRECATED similarity index 99% rename from test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts rename to test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts_DEPRECATED index 1968edfe85..009ffdf1a8 100644 --- a/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts +++ b/test/plugins/individual-collateral/stargate/StargateUSDCTestSuite.test.ts_DEPRECATED @@ -201,6 +201,7 @@ const mintCollateralTo: MintCollateralFunc = a await ctx.pool.connect(router).mint(user.address, amount) }) await ctx.pool.connect(user).approve(ctx.wpool.address, ethers.constants.MaxUint256) + await ctx.wpool.connect(user).deposit(amount, user.address) await ctx.wpool.connect(user).transfer(recipient, amount) if (ctx.pool.address != SUSDC) { @@ -259,7 +260,7 @@ const increaseTargetPerRef = async ( } const beforeEachRewardsTest = async (ctx: StargateCollateralFixtureContext) => { - // switch to propoer network rewards setup + // switch to proper network rewards setup const stargate = await ethers.getContractAt('ERC20Mock', STARGATE) const stakingContract = ( From 718b22de0ab7b94bd2e11f89282d38a84334c3c5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 12 Jun 2024 14:46:47 -0400 Subject: [PATCH 391/450] CHANGELOG --- CHANGELOG.md | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a45c3e58dc..62146ba19e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,9 @@ # 4.0.0 -TODO +This release prepares the core protocol for veRSR through the introduction of 3 registries (`DAOFeeRegistry`, `AssetPluginRegistry`, and `VersionRegistry`) and through restricting component upgrades to be handled by `Main`, where upgrade constraints can be enforced. + +The release also expands collateral decimal support from 18 to 27. ## Upgrade Steps @@ -12,9 +14,37 @@ Make sure distributor table sums to >10000. ## Core Protocol Contracts +- `AssetRegistry` + - Prevent registering assets that are not in the `AssetPluginRegistry` + - Add `validateCurrentAssets() view` +- `Broker` + - Make setters only callable by `Main` - `Distributor` - - Breaking change: Remove `setDistribution()` in favor of `setDistributions()` - - New Invariant: Table must sum to >=10000 for precision reasons + - Add `setDistributions()` function to parallel `setDistribution()` + - Take DAO fee out account in `distribute()` and `totals()` + - Add new revenue share table invariant: must sum to >=10000 (for precision reasons) +- `Main` + - Add `versionRegistry()`/`assetPluginRegistry()`/`daoFeeRegistry()` getters + - Add `setVersionRegistry()`/`setAssetPluginRegistry()`/`setDaoFeeRegistry()` setters + - Add `upgradeMainTo()` + `upgradeRTokenTo()` functions to handle upgrade of Main + Components + - Make Main the only caller that can upgrade Main + +## Plugins + +### Assets + +No functional change. FLOOR rounding added explicitly to `shiftl_toFix` + +### Trading + +Small bugfix to `GnosisTrade`. Should prevent donated tokens from causing the trade to revert. + +### Facades + +- `ActFacet` + - Expand to handle 4.0 version numbers +- `ReadFacet` + - Make `shiftl_toFix` rounding in L349 CEIL # 3.4.0 From dd288e72ff7a0b96642b3a21e811ee0fbf372aea Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 14 Jun 2024 12:14:22 -0300 Subject: [PATCH 392/450] Fix Rtoken Exteme test (#1157) --- test/RTokenExtremes.test.ts | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index bdf29d52fb..af09e357d9 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -4,7 +4,7 @@ import { expect } from 'chai' import { BigNumber, ContractFactory } from 'ethers' import { ethers } from 'hardhat' import { BN_SCALE_FACTOR, CollateralStatus } from '../common/constants' -import { bn, fp, shortString } from '../common/numbers' +import { bn, fp, shortString, toBNDecimals } from '../common/numbers' import { ERC20MockDecimals, FiatCollateral, @@ -139,12 +139,14 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { for (let i = 0; i < N; i++) { const erc20: ERC20MockDecimals = erc20s[i] // user owner starts with enough basket assets to issue (totalSupply - toIssue) - const toMint0: BigNumber = toIssue0.mul(weights[i]).add(e18.sub(1)).div(e18) + const toIssue0Scaled: BigNumber = toBNDecimals(toIssue0, Number(collateralDecimals)) + const toMint0: BigNumber = toIssue0Scaled.mul(weights[i]).add(e18.sub(1)).div(e18) await erc20.mint(owner.address, toMint0) await erc20.connect(owner).increaseAllowance(rToken.address, toMint0) // user addr1 starts with enough basket assets to issue (toIssue) - const toMint: BigNumber = toIssue.mul(weights[i]).add(e18.sub(1)).div(e18) + const toIssueScaled: BigNumber = toBNDecimals(toIssue, Number(collateralDecimals)) + const toMint: BigNumber = toIssueScaled.mul(weights[i]).add(e18.sub(1)).div(e18) await erc20.mint(addr1.address, toMint) await erc20.connect(addr1).increaseAllowance(rToken.address, toMint) } @@ -219,12 +221,12 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { [MIN_RTOKENS, MAX_RTOKENS], // toIssue [MIN_RTOKENS, MAX_RTOKENS], // toRedeem [MAX_RTOKENS], // totalSupply - [bn(1)], // numAssets + [bn(1), bn(3)], // numAssets [MIN_WEIGHT, MAX_WEIGHT], // weightFirst [MIN_WEIGHT], // weightRest [MIN_ISSUANCE_PCT, fp(1)], // issuanceThrottle.pctRate [MIN_REDEMPTION_PCT, fp(1)], // redemptionThrottle.pctRate - [bn(6), bn(27)], // collateralDecimals + [bn(6), bn(18), bn(27)], // collateralDecimals ] paramList = cartesianProduct(...bounds) } From 35057d795ed9ed284aed91301bb5e82f525e855f Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Mon, 17 Jun 2024 14:39:58 +0530 Subject: [PATCH 393/450] Tweaks --- contracts/interfaces/IDistributor.sol | 2 +- contracts/registry/DAOFeeRegistry.sol | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contracts/interfaces/IDistributor.sol b/contracts/interfaces/IDistributor.sol index 2a8e751183..32de4b401e 100644 --- a/contracts/interfaces/IDistributor.sol +++ b/contracts/interfaces/IDistributor.sol @@ -46,7 +46,7 @@ interface IDistributor is IComponent { function setDistribution(address dest, RevenueShare calldata share) external; /// @custom:governance - function setDistributions(address[] calldata dest, RevenueShare[] calldata share) external; + function setDistributions(address[] calldata dests, RevenueShare[] calldata shares) external; /// Distribute the `erc20` token across all revenue destinations /// Only callable by RevenueTraders diff --git a/contracts/registry/DAOFeeRegistry.sol b/contracts/registry/DAOFeeRegistry.sol index 420b13ddb7..a80b8018ba 100644 --- a/contracts/registry/DAOFeeRegistry.sol +++ b/contracts/registry/DAOFeeRegistry.sol @@ -16,12 +16,17 @@ contract DAOFeeRegistry is Ownable { error DAOFeeRegistry__FeeRecipientAlreadySet(); error DAOFeeRegistry__InvalidFeeRecipient(); error DAOFeeRegistry__InvalidFeeNumerator(); + error DAOFeeRegistry__InvalidOwner(); event FeeRecipientSet(address indexed feeRecipient); event DefaultFeeNumeratorSet(uint256 defaultFeeNumerator); event RTokenFeeNumeratorSet(address indexed rToken, uint256 feeNumerator, bool isActive); constructor(address owner_) Ownable() { + if (owner_ == address(0)) { + revert DAOFeeRegistry__InvalidOwner(); + } + _transferOwnership(owner_); // Ownership to DAO feeRecipient = owner_; // DAO as initial fee recipient } From 80a9feaeccfd36a846b1dbcb4f834b87dc5b0b8f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 17 Jun 2024 16:10:35 -0400 Subject: [PATCH 394/450] fix comment --- contracts/p0/Distributor.sol | 4 ---- contracts/p1/Distributor.sol | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/contracts/p0/Distributor.sol b/contracts/p0/Distributor.sol index 5e4fd609e2..ade5d11df2 100644 --- a/contracts/p0/Distributor.sol +++ b/contracts/p0/Distributor.sol @@ -47,10 +47,6 @@ contract DistributorP0 is ComponentP0, IDistributor { /// Set RevenueShares for destinations. Destinations `FURNACE` and `ST_RSR` refer to /// main.furnace() and main.stRSR(). /// @custom:governance - // checks: invariants hold in post-state - // effects: - // destinations' = dests - // distribution' = shares function setDistributions(address[] calldata dests, RevenueShare[] calldata shares) external governance diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 0a1900eb4e..f022c54f8d 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -74,8 +74,8 @@ contract DistributorP1 is ComponentP1, IDistributor { /// @custom:governance // checks: invariants hold in post-state // effects: - // destinations' = dests - // distribution' = shares + // destinations' = destinations.add(dests[i]) for i < dests.length + // distribution' = distribution.set(dests[i], shares[i]) for i < dests.length function setDistributions(address[] calldata dests, RevenueShare[] calldata shares) external governance From 448b6333217dc2e648a1b3f55e96e4121f52abe3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 17 Jun 2024 16:13:54 -0400 Subject: [PATCH 395/450] distributor small simplification --- contracts/p1/Distributor.sol | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index f022c54f8d..179f865ead 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -174,11 +174,10 @@ contract DistributorP1 is ComponentP1, IDistributor { DAOFeeRegistry daoFeeRegistry = main.daoFeeRegistry(); if (address(daoFeeRegistry) != address(0)) { - // DAO Fee - if (isRSR) { + if (totalShares > paidOutShares) { (address recipient, , ) = main.daoFeeRegistry().getFeeDetails(address(rToken)); - if (recipient != address(0) && tokensPerShare * (totalShares - paidOutShares) > 0) { + if (recipient != address(0)) { IERC20Upgradeable(address(erc20)).safeTransferFrom( caller, recipient, From 9972e7e761c3280efe0590d468f5fc65dcb7dc73 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 17 Jun 2024 16:19:06 -0400 Subject: [PATCH 396/450] change name of priceNotDecayed function --- contracts/p0/Broker.sol | 6 +++--- contracts/p1/Broker.sol | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 1a6345cfee..9009f857a9 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -235,7 +235,7 @@ contract BrokerP0 is ComponentP0, IBroker { ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); require( - priceNotDecayed(req.sell) && priceNotDecayed(req.buy), + pricedInBlock(req.sell) && pricedInBlock(req.buy), "dutch auctions require live prices" ); @@ -252,8 +252,8 @@ contract BrokerP0 is ComponentP0, IBroker { return trade; } - /// @return true iff the price is not decayed, or it's the RTokenAsset - function priceNotDecayed(IAsset asset) private view returns (bool) { + /// @return true iff the price was last priced in this block, or it's the RTokenAsset + function pricedInBlock(IAsset asset) private view returns (bool) { return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(main.rToken()); } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index 099969a330..f0eba681e8 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -276,7 +276,7 @@ contract BrokerP1 is ComponentP1, IBroker { ); require(dutchAuctionLength != 0, "dutch auctions not enabled"); require( - priceNotDecayed(req.sell) && priceNotDecayed(req.buy), + pricedInBlock(req.sell) && pricedInBlock(req.buy), "dutch auctions require live prices" ); @@ -294,8 +294,8 @@ contract BrokerP1 is ComponentP1, IBroker { return trade; } - /// @return true iff the price is not decayed, or it's the RTokenAsset - function priceNotDecayed(IAsset asset) private view returns (bool) { + /// @return true iff the price was last priced in this block, or it's the RTokenAsset + function pricedInBlock(IAsset asset) private view returns (bool) { return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(rToken); } From 62542ec9065460b774419d9e2dd4da523ebcc9e8 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 18 Jun 2024 14:06:17 -0400 Subject: [PATCH 397/450] document DAO fee rounding --- contracts/p1/Distributor.sol | 1 + contracts/registry/DAOFeeRegistry.sol | 1 + 2 files changed, 2 insertions(+) diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 179f865ead..8c4e14cd63 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -214,6 +214,7 @@ contract DistributorP1 is ComponentP1, IDistributor { .daoFeeRegistry() .getFeeDetails(address(rToken)); + // Small DAO fees <1% not recommended; ~10% precision due to rounding at 0.1% fee if (feeRecipient != address(0) && feeNumerator != 0) { revTotals.rsrTotal += uint24( (feeNumerator * uint256(revTotals.rTokenTotal + revTotals.rsrTotal)) / diff --git a/contracts/registry/DAOFeeRegistry.sol b/contracts/registry/DAOFeeRegistry.sol index a80b8018ba..a8e1fd60e5 100644 --- a/contracts/registry/DAOFeeRegistry.sol +++ b/contracts/registry/DAOFeeRegistry.sol @@ -46,6 +46,7 @@ contract DAOFeeRegistry is Ownable { emit DefaultFeeNumeratorSet(defaultFeeNumerator); } + /// @dev A fee below 1% not recommended due to poor precision in the Distributor function setRTokenFeeNumerator(address rToken, uint256 feeNumerator_) external onlyOwner { if (feeNumerator_ > MAX_FEE_NUMERATOR) revert DAOFeeRegistry__InvalidFeeNumerator(); From 9571eb8f8dbaf72176decf3839e58dade8076b14 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 18 Jun 2024 14:24:07 -0400 Subject: [PATCH 398/450] rename to pricedAtTimestamp --- contracts/p0/Broker.sol | 6 +++--- contracts/p1/Broker.sol | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contracts/p0/Broker.sol b/contracts/p0/Broker.sol index 9009f857a9..fffc341f16 100644 --- a/contracts/p0/Broker.sol +++ b/contracts/p0/Broker.sol @@ -235,7 +235,7 @@ contract BrokerP0 is ComponentP0, IBroker { ); require(dutchAuctionLength > 0, "dutch auctions not enabled"); require( - pricedInBlock(req.sell) && pricedInBlock(req.buy), + pricedAtTimestamp(req.sell) && pricedAtTimestamp(req.buy), "dutch auctions require live prices" ); @@ -252,8 +252,8 @@ contract BrokerP0 is ComponentP0, IBroker { return trade; } - /// @return true iff the price was last priced in this block, or it's the RTokenAsset - function pricedInBlock(IAsset asset) private view returns (bool) { + /// @return true iff the asset has been priced at this timestamp, or it's the RTokenAsset + function pricedAtTimestamp(IAsset asset) private view returns (bool) { return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(main.rToken()); } diff --git a/contracts/p1/Broker.sol b/contracts/p1/Broker.sol index f0eba681e8..001f8419cd 100644 --- a/contracts/p1/Broker.sol +++ b/contracts/p1/Broker.sol @@ -276,7 +276,7 @@ contract BrokerP1 is ComponentP1, IBroker { ); require(dutchAuctionLength != 0, "dutch auctions not enabled"); require( - pricedInBlock(req.sell) && pricedInBlock(req.buy), + pricedAtTimestamp(req.sell) && pricedAtTimestamp(req.buy), "dutch auctions require live prices" ); @@ -294,8 +294,8 @@ contract BrokerP1 is ComponentP1, IBroker { return trade; } - /// @return true iff the price was last priced in this block, or it's the RTokenAsset - function pricedInBlock(IAsset asset) private view returns (bool) { + /// @return true iff the asset has been priced at this timestamp, or it's the RTokenAsset + function pricedAtTimestamp(IAsset asset) private view returns (bool) { return asset.lastSave() == block.timestamp || address(asset.erc20()) == address(rToken); } From 94ef4764391c930f2ce61b9a99135254d5f1e810 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 18 Jun 2024 19:00:54 -0400 Subject: [PATCH 399/450] uncomment .skip --- test/Recollateralization.test.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index d448fd2884..7d63f9c4bd 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -3184,8 +3184,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) }) - // TODO - context.skip('DutchTrade', () => { + context('DutchTrade', () => { const auctionLength = 1800 // 30 minutes beforeEach(async () => { await broker.connect(owner).setDutchAuctionLength(auctionLength) From 4c1be60ffd6234301dfd0b30bb4e976f430bc6ec Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 18 Jun 2024 19:01:08 -0400 Subject: [PATCH 400/450] add test cases for >uint96 amounts in Broker.openTrade --- test/Broker.test.ts | 36 +++++++++++++++++++++++++++++++++++- 1 file changed, 35 insertions(+), 1 deletion(-) diff --git a/test/Broker.test.ts b/test/Broker.test.ts index 9ebcd98888..58d0ec73db 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -56,7 +56,7 @@ import { getLatestBlockTimestamp, setNextBlockTimestamp, } from './utils/time' -import { ITradeRequest, disableBatchTrade, disableDutchTrade } from './utils/trades' +import { ITradeRequest, disableBatchTrade, disableDutchTrade, getTrade } from './utils/trades' import { useEnv } from '#/utils/env' import { parseUnits } from 'ethers/lib/utils' @@ -1102,6 +1102,40 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { expect(await token0.balanceOf(backingManager.address)).to.equal(amount.add(newFunds)) }) + it('Should downsize trades above uint96 - sell side', async () => { + const tradeRequest: ITradeRequest = { + sell: collateral0.address, + buy: collateral1.address, + sellAmount: MAX_UINT96.add(1), + minBuyAmount: amount, + } + + // Should open trade JUST on MAX_UINT96 approval, not MAX_UINT96 + 1 + await whileImpersonating(backingManager.address, async (bmSigner) => { + await token0.mint(backingManager.address, MAX_UINT96) + await token0.connect(bmSigner).approve(broker.address, MAX_UINT96) + await broker.connect(bmSigner).openTrade(TradeKind.BATCH_AUCTION, tradeRequest, prices) + // should not revert + }) + }) + + it('Should downsize trades above uint96 - buy side', async () => { + const tradeRequest: ITradeRequest = { + sell: collateral0.address, + buy: collateral1.address, + sellAmount: amount, + minBuyAmount: MAX_UINT96.add(1), + } + + // Should open trade JUST on amount - 1 approval, not amount + await whileImpersonating(backingManager.address, async (bmSigner) => { + await token0.mint(backingManager.address, amount.sub(1)) + await token0.connect(bmSigner).approve(broker.address, amount.sub(1)) + await broker.connect(bmSigner).openTrade(TradeKind.BATCH_AUCTION, tradeRequest, prices) + // should not revert + }) + }) + // There is no test here for the reportViolation case; that is in Revenues.test.ts }) From edc464aceb8128cc67270361308071423c8da103 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 18 Jun 2024 19:21:43 -0400 Subject: [PATCH 401/450] switch to better approach of tracking worst case price at qTok level --- CHANGELOG.md | 4 +++- contracts/plugins/trading/GnosisTrade.sol | 21 +++++++-------------- tasks/validation/utils/trades.ts | 17 +++++++++++------ test/Revenues.test.ts | 2 +- test/scenario/BadCollateralPlugin.test.ts | 2 +- test/scenario/RevenueHiding.test.ts | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62146ba19e..2192cd1c13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,7 +37,9 @@ No functional change. FLOOR rounding added explicitly to `shiftl_toFix` ### Trading -Small bugfix to `GnosisTrade`. Should prevent donated tokens from causing the trade to revert. +- `GnosisTrade` + - Change units of `worstCasePrice()` from {buyTok/sellTok} to {qBuyTok/qSellTok} + - Small fix to prevent donated tokens from being able to cause the trade to revert ### Facades diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index ca0625e5f2..e02a83ef6e 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -47,7 +47,7 @@ contract GnosisTrade is ITrade, Versioned { uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold, != initBal uint48 public endTime; // timestamp after which this trade's auction can be settled - uint192 public worstCasePrice; // {buyTok/sellTok}, the worst price we expect to get at Auction + uint192 public worstCasePrice; // {qBuyTok/qSellTok}, the worst price we expect to get at Auction // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` // tokens. If we actually *get* a worse clearing that worstCasePrice, we consider it an error in // our trading scheme and call broker.reportViolation() @@ -103,11 +103,8 @@ contract GnosisTrade is ITrade, Versioned { gnosis = gnosis_; endTime = uint48(block.timestamp) + batchAuctionLength; - // {buyTok/sellTok} - worstCasePrice = divuu(req.minBuyAmount, req.sellAmount).shiftl( - int8(sell.decimals()) - int8(buy.decimals()), - FLOOR - ); + // {qBuyTok/qSellTok} + worstCasePrice = divuu(req.minBuyAmount, req.sellAmount); // FLOOR // Downsize our sell amount to adjust for fee // {qSellTok} = {qSellTok} * {1} / {1} @@ -157,6 +154,7 @@ contract GnosisTrade is ITrade, Versioned { } /// Settle trade, transfer tokens to trader, and report bad trade if needed + /// @dev boughtAmt can be manipulated upwards; soldAmt upwards /// @custom:interaction reentrancy-safe b/c state-locking // checks: // state is OPEN @@ -203,6 +201,7 @@ contract GnosisTrade is ITrade, Versioned { if (sellBal != 0) IERC20Upgradeable(address(sell)).safeTransfer(origin, sellBal); if (boughtAmt != 0) IERC20Upgradeable(address(buy)).safeTransfer(origin, boughtAmt); + // Check clearing prices if (sellBal < initBal) { soldAmt = initBal - sellBal; @@ -212,14 +211,8 @@ contract GnosisTrade is ITrade, Versioned { uint256 adjustedBuyAmt = boughtAmt + 1; // {buyTok/sellTok} - uint192 clearingPrice = divuu(adjustedBuyAmt, adjustedSoldAmt).shiftl( - int8(sell.decimals()) - int8(buy.decimals()), - FLOOR - ); - - if (clearingPrice.lt(worstCasePrice)) { - broker.reportViolation(); - } + uint192 clearingPrice = divuu(adjustedBuyAmt, adjustedSoldAmt); // FLOOR + if (clearingPrice.lt(worstCasePrice)) broker.reportViolation(); } } diff --git a/tasks/validation/utils/trades.ts b/tasks/validation/utils/trades.ts index b06d1cc0ea..c37bf03284 100644 --- a/tasks/validation/utils/trades.ts +++ b/tasks/validation/utils/trades.ts @@ -1,5 +1,5 @@ import { MAX_UINT256, QUEUE_START, TradeKind, TradeStatus } from '#/common/constants' -import { bn, fp } from '#/common/numbers' +import { bn, fp, pow10 } from '#/common/numbers' import { whileImpersonating } from '#/utils/impersonation' import { networkConfig } from '../../../common/configuration' import { advanceTime, getLatestBlockTimestamp } from '#/utils/time' @@ -38,7 +38,7 @@ export const runBatchTrade = async ( `Running batch trade: sell ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...` ) const endTime = await trade.endTime() - const worstPrice = await trade.worstCasePrice() // trade.buy() per trade.sell() + const worstPrice = await trade.worstCasePrice() // trade.buy() per trade.sell(), qTok const auctionId = await trade.auctionId() const sellAmount = await trade.initBal() @@ -46,13 +46,18 @@ export const runBatchTrade = async ( const sellDecimals = await sellToken.decimals() const buytoken = await hre.ethers.getContractAt('ERC20Mock', await buyTokenAddress) const buyDecimals = await buytoken.decimals() - let buyAmount = bidExact ? sellAmount : sellAmount.mul(worstPrice).div(fp('1')) + let buyAmount = bidExact + ? sellAmount + : sellAmount + .mul(worstPrice) + .mul(pow10(buyDecimals - sellDecimals)) + .div(fp('1')) if (buyDecimals > sellDecimals) { - buyAmount = buyAmount.mul(bn(10 ** (buyDecimals - sellDecimals))) + buyAmount = buyAmount.mul(pow10(buyDecimals - sellDecimals)) } else if (sellDecimals > buyDecimals) { - buyAmount = buyAmount.div(bn(10 ** (sellDecimals - buyDecimals))) + buyAmount = buyAmount.div(pow10(sellDecimals - buyDecimals)) } - buyAmount = buyAmount.add(fp('1').div(bn(10 ** (18 - buyDecimals)))) + buyAmount = buyAmount.add(fp('1').div(pow10(18 - buyDecimals))) const gnosis = await hre.ethers.getContractAt('EasyAuction', await trade.gnosis()) const whaleAddr = whales[buyTokenAddress.toLowerCase()] diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index df4294d001..e1a572d1e7 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1016,7 +1016,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Trade should have extremely nonzero worst-case price const trade = await getTrade(rTokenTrader, token0.address) expect(await trade.initBal()).to.equal(issueAmount) - expect(await trade.worstCasePrice()).to.be.gte(fp('0.775')) + expect(await trade.worstCasePrice()).to.be.gte(fp('0.775')) // both tokens have 18 decimals }) it('Should claim COMP and handle revenue auction correctly - small amount processed in single auction', async () => { diff --git a/test/scenario/BadCollateralPlugin.test.ts b/test/scenario/BadCollateralPlugin.test.ts index ec2e04c0ee..383589f1df 100644 --- a/test/scenario/BadCollateralPlugin.test.ts +++ b/test/scenario/BadCollateralPlugin.test.ts @@ -223,7 +223,7 @@ describe(`Bad Collateral Plugin - P${IMPLEMENTATION}`, () => { const lowSellPrice = fp('1').sub(fp('1').mul(ORACLE_ERROR).div(fp('1'))) const highBuyPrice = fp('1').add(fp('1').mul(ORACLE_ERROR).div(fp('1'))) const worstCasePrice = divCeil(unslippedPrice.mul(lowSellPrice), highBuyPrice).sub(1) - expect(await trade.worstCasePrice()).to.equal(worstCasePrice) + expect(await trade.worstCasePrice()).to.equal(worstCasePrice) // both tokens have 18 decimals }) }) diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 32b26a024e..2942ac99c3 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -265,7 +265,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME const t = await getTrade(rsrTrader, cDAI.address) const sellAmt = await t.initBal() const minBuyAmt = await toMinBuyAmt(sellAmt, fp('2').div(50), fp('1')) - const expectedPrice = minBuyAmt.mul(fp('1')).div(sellAmt) + const expectedPrice = minBuyAmt.mul(fp('1')).div(sellAmt).mul(bn('1e10')) // shift 10 decimals for cDAI which has 8 // price should be within 1 part in a 1 trillion of our discounted rate expect(await t.worstCasePrice()).to.be.closeTo(expectedPrice, expectedPrice.div(bn('1e9'))) }) From 80c2344a0b7d3c5021e49f437dccf57d475d210f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 18 Jun 2024 19:24:47 -0400 Subject: [PATCH 402/450] lint clean --- contracts/plugins/trading/GnosisTrade.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index e02a83ef6e..4350ce1e8f 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -47,7 +47,7 @@ contract GnosisTrade is ITrade, Versioned { uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold, != initBal uint48 public endTime; // timestamp after which this trade's auction can be settled - uint192 public worstCasePrice; // {qBuyTok/qSellTok}, the worst price we expect to get at Auction + uint192 public worstCasePrice; // {qBuyTok/qSellTok}, the worst price we expect to get // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` // tokens. If we actually *get* a worse clearing that worstCasePrice, we consider it an error in // our trading scheme and call broker.reportViolation() From f486bdcf23b85b3263c15df5ab6be86e68998636 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 19 Jun 2024 13:32:58 +0530 Subject: [PATCH 403/450] Role Registry --- contracts/registry/AssetPluginRegistry.sol | 50 +++++++++++++++++----- contracts/registry/RoleRegistry.sol | 28 ++++++++++++ contracts/registry/VersionRegistry.sol | 27 +++++++++--- 3 files changed, 88 insertions(+), 17 deletions(-) create mode 100644 contracts/registry/RoleRegistry.sol diff --git a/contracts/registry/AssetPluginRegistry.sol b/contracts/registry/AssetPluginRegistry.sol index 253009841f..6967e17dd6 100644 --- a/contracts/registry/AssetPluginRegistry.sol +++ b/contracts/registry/AssetPluginRegistry.sol @@ -3,29 +3,35 @@ pragma solidity 0.8.19; import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; import { VersionRegistry } from "./VersionRegistry.sol"; +import { RoleRegistry } from "./RoleRegistry.sol"; /** * @title Asset Plugin Registry * @notice A tiny contract for tracking asset plugins */ -contract AssetPluginRegistry is Ownable { +contract AssetPluginRegistry { VersionRegistry public versionRegistry; + RoleRegistry public roleRegistry; // versionHash => asset => isValid - mapping(bytes32 => mapping(address => bool)) public isValidAsset; + mapping(bytes32 => mapping(address => bool)) private _isValidAsset; + mapping(address => bool) public isDeprecated; error AssetPluginRegistry__InvalidAsset(); + error AssetPluginRegistry__InvalidCaller(); error AssetPluginRegistry__InvalidVersion(); error AssetPluginRegistry__LengthMismatch(); event AssetPluginRegistryUpdated(bytes32 versionHash, address asset, bool validity); - constructor(address _versionRegistry) Ownable() { + constructor(address _versionRegistry) { versionRegistry = VersionRegistry(_versionRegistry); - - _transferOwnership(versionRegistry.owner()); + roleRegistry = versionRegistry.roleRegistry(); } - function registerAsset(address _asset, bytes32[] calldata validForVersions) external onlyOwner { + function registerAsset(address _asset, bytes32[] calldata validForVersions) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } if (_asset == address(0)) { revert AssetPluginRegistry__InvalidAsset(); } @@ -36,7 +42,7 @@ contract AssetPluginRegistry is Ownable { revert AssetPluginRegistry__InvalidVersion(); } - isValidAsset[versionHash][_asset] = true; + _isValidAsset[versionHash][_asset] = true; emit AssetPluginRegistryUpdated(versionHash, _asset, true); } @@ -46,7 +52,10 @@ contract AssetPluginRegistry is Ownable { address _asset, bytes32[] calldata _versionHashes, bool[] calldata _validities - ) external onlyOwner { + ) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } if (_versionHashes.length != _validities.length) { revert AssetPluginRegistry__LengthMismatch(); } @@ -61,7 +70,7 @@ contract AssetPluginRegistry is Ownable { revert AssetPluginRegistry__InvalidVersion(); } - isValidAsset[versionHash][_asset] = _validities[i]; + _isValidAsset[versionHash][_asset] = _validities[i]; emit AssetPluginRegistryUpdated(versionHash, _asset, _validities[i]); } @@ -71,7 +80,10 @@ contract AssetPluginRegistry is Ownable { bytes32 _versionHash, address[] calldata _assets, bool[] calldata _validities - ) external onlyOwner { + ) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } if (_assets.length != _validities.length) { revert AssetPluginRegistry__LengthMismatch(); } @@ -86,9 +98,25 @@ contract AssetPluginRegistry is Ownable { revert AssetPluginRegistry__InvalidAsset(); } - isValidAsset[_versionHash][asset] = _validities[i]; + _isValidAsset[_versionHash][asset] = _validities[i]; emit AssetPluginRegistryUpdated(_versionHash, asset, _validities[i]); } } + + function deprecateAsset(address _asset) external { + if (!roleRegistry.isOwnerOrEmergencyCouncil(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } + + isDeprecated[_asset] = true; + } + + function isValidAsset(bytes32 _versionHash, address _asset) external view returns (bool) { + if (!isDeprecated[_asset]) { + return _isValidAsset[_versionHash][_asset]; + } + + return false; + } } diff --git a/contracts/registry/RoleRegistry.sol b/contracts/registry/RoleRegistry.sol new file mode 100644 index 0000000000..4bc7a21cba --- /dev/null +++ b/contracts/registry/RoleRegistry.sol @@ -0,0 +1,28 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import { AccessControlEnumerable } from "@openzeppelin/contracts/access/AccessControlEnumerable.sol"; + +/** + * @title RoleRegistry + * @notice Contract to manage roles for RToken <> DAO interactions + */ +contract RoleRegistry is AccessControlEnumerable { + bytes32 public constant EMERGENCY_COUNCIL = keccak256("EMERGENCY_COUNCIL"); + + constructor() { + _setupRole(DEFAULT_ADMIN_ROLE, msg.sender); + } + + function isOwner(address account) public view returns (bool) { + return hasRole(DEFAULT_ADMIN_ROLE, account); + } + + function isEmergencyCouncil(address account) public view returns (bool) { + return hasRole(EMERGENCY_COUNCIL, account); + } + + function isOwnerOrEmergencyCouncil(address account) public view returns (bool) { + return hasRole(DEFAULT_ADMIN_ROLE, account) || hasRole(EMERGENCY_COUNCIL, account); + } +} diff --git a/contracts/registry/VersionRegistry.sol b/contracts/registry/VersionRegistry.sol index b132f5d370..2fa954fa9e 100644 --- a/contracts/registry/VersionRegistry.sol +++ b/contracts/registry/VersionRegistry.sol @@ -1,32 +1,43 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; import { IDeployer, Implementations } from "../interfaces/IDeployer.sol"; +import { RoleRegistry } from "./RoleRegistry.sol"; /** * @title VersionRegistry * @notice A tiny contract for tracking deployment versions */ -contract VersionRegistry is Ownable { +contract VersionRegistry { mapping(bytes32 => IDeployer) public deployments; mapping(bytes32 => bool) public isDeprecated; bytes32 private latestVersion; + RoleRegistry public roleRegistry; error VersionRegistry__ZeroAddress(); error VersionRegistry__InvalidRegistration(); error VersionRegistry__AlreadyDeprecated(); + error VersionRegistry__InvalidRoleRegistry(); + error VersionRegistry__InvalidCaller(); event VersionRegistered(bytes32 versionHash, IDeployer deployer); event VersionDeprecated(bytes32 versionHash); - constructor(address owner_) Ownable() { - _transferOwnership(owner_); + constructor(RoleRegistry _roleRegistry) { + if (address(_roleRegistry) == address(0)) { + revert VersionRegistry__ZeroAddress(); + } + + roleRegistry = _roleRegistry; } /// Register a deployer address, keyed by version. /// @param deployer The deployer contract address for the version to be added. - function registerVersion(IDeployer deployer) external onlyOwner { + function registerVersion(IDeployer deployer) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert VersionRegistry__InvalidCaller(); + } + if (address(deployer) == address(0)) { revert VersionRegistry__ZeroAddress(); } @@ -44,7 +55,11 @@ contract VersionRegistry is Ownable { emit VersionRegistered(versionHash, deployer); } - function deprecateVersion(bytes32 versionHash) external onlyOwner { + function deprecateVersion(bytes32 versionHash) external { + if (!roleRegistry.isOwnerOrEmergencyCouncil(msg.sender)) { + revert VersionRegistry__InvalidCaller(); + } + if (isDeprecated[versionHash]) { revert VersionRegistry__AlreadyDeprecated(); } From 84440a03dafe6f668f50e7cc5cd05345daae6607 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 19 Jun 2024 14:40:40 +0530 Subject: [PATCH 404/450] Fix tests --- contracts/plugins/mocks/MockRoleRegistry.sol | 16 ++++++++++++++++ test/Upgradeability.test.ts | 4 +++- test/integration/UpgradeToR4.test.ts | 4 +++- .../UpgradeToR4WithRegistries.test.ts | 4 +++- 4 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 contracts/plugins/mocks/MockRoleRegistry.sol diff --git a/contracts/plugins/mocks/MockRoleRegistry.sol b/contracts/plugins/mocks/MockRoleRegistry.sol new file mode 100644 index 0000000000..976128f495 --- /dev/null +++ b/contracts/plugins/mocks/MockRoleRegistry.sol @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +contract MockRoleRegistry { + function isOwner(address) public pure returns (bool) { + return true; + } + + function isEmergencyCouncil(address) public pure returns (bool) { + return true; + } + + function isOwnerOrEmergencyCouncil(address) public pure returns (bool) { + return true; + } +} diff --git a/test/Upgradeability.test.ts b/test/Upgradeability.test.ts index 0e4e24bd0d..d44697281f 100644 --- a/test/Upgradeability.test.ts +++ b/test/Upgradeability.test.ts @@ -903,7 +903,9 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { beforeEach(async () => { const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(owner.address) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + versionRegistry = await versionRegistryFactory.deploy(mockRoleRegistry.address) const assetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') assetPluginRegistry = await assetPluginRegistryFactory.deploy(versionRegistry.address) diff --git a/test/integration/UpgradeToR4.test.ts b/test/integration/UpgradeToR4.test.ts index b5e6215c90..ce7a9673d2 100644 --- a/test/integration/UpgradeToR4.test.ts +++ b/test/integration/UpgradeToR4.test.ts @@ -98,7 +98,9 @@ describe('Upgrade from 3.4.0 to 4.0.0 (Mainnet Fork)', () => { ) const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + versionRegistry = await versionRegistryFactory.deploy(mockRoleRegistry.address) await versionRegistry.registerVersion(deployer.address) diff --git a/test/integration/UpgradeToR4WithRegistries.test.ts b/test/integration/UpgradeToR4WithRegistries.test.ts index b0b12a7334..40b103f666 100644 --- a/test/integration/UpgradeToR4WithRegistries.test.ts +++ b/test/integration/UpgradeToR4WithRegistries.test.ts @@ -46,7 +46,9 @@ describe('Upgrade from 4.0.0 to New Version with all Registries Enabled', () => // Setup Registries const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + versionRegistry = await versionRegistryFactory.deploy(mockRoleRegistry.address) const AssetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') assetPluginRegistry = await AssetPluginRegistryFactory.deploy(versionRegistry.address) From e4c3ed8a360c586d91c39bf6572ade0ebe98b06a Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Wed, 19 Jun 2024 22:46:08 +0530 Subject: [PATCH 405/450] Role Registry (#1158) Co-authored-by: Taylor Brent --- contracts/plugins/mocks/MockRoleRegistry.sol | 16 ++++++ contracts/registry/AssetPluginRegistry.sol | 50 +++++++++++++++---- contracts/registry/RoleRegistry.sol | 29 +++++++++++ contracts/registry/VersionRegistry.sol | 27 +++++++--- test/Upgradeability.test.ts | 4 +- test/integration/UpgradeToR4.test.ts | 4 +- .../UpgradeToR4WithRegistries.test.ts | 4 +- 7 files changed, 114 insertions(+), 20 deletions(-) create mode 100644 contracts/plugins/mocks/MockRoleRegistry.sol create mode 100644 contracts/registry/RoleRegistry.sol diff --git a/contracts/plugins/mocks/MockRoleRegistry.sol b/contracts/plugins/mocks/MockRoleRegistry.sol new file mode 100644 index 0000000000..976128f495 --- /dev/null +++ b/contracts/plugins/mocks/MockRoleRegistry.sol @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +contract MockRoleRegistry { + function isOwner(address) public pure returns (bool) { + return true; + } + + function isEmergencyCouncil(address) public pure returns (bool) { + return true; + } + + function isOwnerOrEmergencyCouncil(address) public pure returns (bool) { + return true; + } +} diff --git a/contracts/registry/AssetPluginRegistry.sol b/contracts/registry/AssetPluginRegistry.sol index 253009841f..6967e17dd6 100644 --- a/contracts/registry/AssetPluginRegistry.sol +++ b/contracts/registry/AssetPluginRegistry.sol @@ -3,29 +3,35 @@ pragma solidity 0.8.19; import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; import { VersionRegistry } from "./VersionRegistry.sol"; +import { RoleRegistry } from "./RoleRegistry.sol"; /** * @title Asset Plugin Registry * @notice A tiny contract for tracking asset plugins */ -contract AssetPluginRegistry is Ownable { +contract AssetPluginRegistry { VersionRegistry public versionRegistry; + RoleRegistry public roleRegistry; // versionHash => asset => isValid - mapping(bytes32 => mapping(address => bool)) public isValidAsset; + mapping(bytes32 => mapping(address => bool)) private _isValidAsset; + mapping(address => bool) public isDeprecated; error AssetPluginRegistry__InvalidAsset(); + error AssetPluginRegistry__InvalidCaller(); error AssetPluginRegistry__InvalidVersion(); error AssetPluginRegistry__LengthMismatch(); event AssetPluginRegistryUpdated(bytes32 versionHash, address asset, bool validity); - constructor(address _versionRegistry) Ownable() { + constructor(address _versionRegistry) { versionRegistry = VersionRegistry(_versionRegistry); - - _transferOwnership(versionRegistry.owner()); + roleRegistry = versionRegistry.roleRegistry(); } - function registerAsset(address _asset, bytes32[] calldata validForVersions) external onlyOwner { + function registerAsset(address _asset, bytes32[] calldata validForVersions) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } if (_asset == address(0)) { revert AssetPluginRegistry__InvalidAsset(); } @@ -36,7 +42,7 @@ contract AssetPluginRegistry is Ownable { revert AssetPluginRegistry__InvalidVersion(); } - isValidAsset[versionHash][_asset] = true; + _isValidAsset[versionHash][_asset] = true; emit AssetPluginRegistryUpdated(versionHash, _asset, true); } @@ -46,7 +52,10 @@ contract AssetPluginRegistry is Ownable { address _asset, bytes32[] calldata _versionHashes, bool[] calldata _validities - ) external onlyOwner { + ) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } if (_versionHashes.length != _validities.length) { revert AssetPluginRegistry__LengthMismatch(); } @@ -61,7 +70,7 @@ contract AssetPluginRegistry is Ownable { revert AssetPluginRegistry__InvalidVersion(); } - isValidAsset[versionHash][_asset] = _validities[i]; + _isValidAsset[versionHash][_asset] = _validities[i]; emit AssetPluginRegistryUpdated(versionHash, _asset, _validities[i]); } @@ -71,7 +80,10 @@ contract AssetPluginRegistry is Ownable { bytes32 _versionHash, address[] calldata _assets, bool[] calldata _validities - ) external onlyOwner { + ) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } if (_assets.length != _validities.length) { revert AssetPluginRegistry__LengthMismatch(); } @@ -86,9 +98,25 @@ contract AssetPluginRegistry is Ownable { revert AssetPluginRegistry__InvalidAsset(); } - isValidAsset[_versionHash][asset] = _validities[i]; + _isValidAsset[_versionHash][asset] = _validities[i]; emit AssetPluginRegistryUpdated(_versionHash, asset, _validities[i]); } } + + function deprecateAsset(address _asset) external { + if (!roleRegistry.isOwnerOrEmergencyCouncil(msg.sender)) { + revert AssetPluginRegistry__InvalidCaller(); + } + + isDeprecated[_asset] = true; + } + + function isValidAsset(bytes32 _versionHash, address _asset) external view returns (bool) { + if (!isDeprecated[_asset]) { + return _isValidAsset[_versionHash][_asset]; + } + + return false; + } } diff --git a/contracts/registry/RoleRegistry.sol b/contracts/registry/RoleRegistry.sol new file mode 100644 index 0000000000..305eae49c0 --- /dev/null +++ b/contracts/registry/RoleRegistry.sol @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +// solhint-disable-next-line max-line-length +import { AccessControlEnumerable } from "@openzeppelin/contracts/access/AccessControlEnumerable.sol"; + +/** + * @title RoleRegistry + * @notice Contract to manage roles for RToken <> DAO interactions + */ +contract RoleRegistry is AccessControlEnumerable { + bytes32 public constant EMERGENCY_COUNCIL = keccak256("EMERGENCY_COUNCIL"); + + constructor() { + _setupRole(DEFAULT_ADMIN_ROLE, msg.sender); + } + + function isOwner(address account) public view returns (bool) { + return hasRole(DEFAULT_ADMIN_ROLE, account); + } + + function isEmergencyCouncil(address account) public view returns (bool) { + return hasRole(EMERGENCY_COUNCIL, account); + } + + function isOwnerOrEmergencyCouncil(address account) public view returns (bool) { + return hasRole(DEFAULT_ADMIN_ROLE, account) || hasRole(EMERGENCY_COUNCIL, account); + } +} diff --git a/contracts/registry/VersionRegistry.sol b/contracts/registry/VersionRegistry.sol index b132f5d370..2fa954fa9e 100644 --- a/contracts/registry/VersionRegistry.sol +++ b/contracts/registry/VersionRegistry.sol @@ -1,32 +1,43 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; import { IDeployer, Implementations } from "../interfaces/IDeployer.sol"; +import { RoleRegistry } from "./RoleRegistry.sol"; /** * @title VersionRegistry * @notice A tiny contract for tracking deployment versions */ -contract VersionRegistry is Ownable { +contract VersionRegistry { mapping(bytes32 => IDeployer) public deployments; mapping(bytes32 => bool) public isDeprecated; bytes32 private latestVersion; + RoleRegistry public roleRegistry; error VersionRegistry__ZeroAddress(); error VersionRegistry__InvalidRegistration(); error VersionRegistry__AlreadyDeprecated(); + error VersionRegistry__InvalidRoleRegistry(); + error VersionRegistry__InvalidCaller(); event VersionRegistered(bytes32 versionHash, IDeployer deployer); event VersionDeprecated(bytes32 versionHash); - constructor(address owner_) Ownable() { - _transferOwnership(owner_); + constructor(RoleRegistry _roleRegistry) { + if (address(_roleRegistry) == address(0)) { + revert VersionRegistry__ZeroAddress(); + } + + roleRegistry = _roleRegistry; } /// Register a deployer address, keyed by version. /// @param deployer The deployer contract address for the version to be added. - function registerVersion(IDeployer deployer) external onlyOwner { + function registerVersion(IDeployer deployer) external { + if (!roleRegistry.isOwner(msg.sender)) { + revert VersionRegistry__InvalidCaller(); + } + if (address(deployer) == address(0)) { revert VersionRegistry__ZeroAddress(); } @@ -44,7 +55,11 @@ contract VersionRegistry is Ownable { emit VersionRegistered(versionHash, deployer); } - function deprecateVersion(bytes32 versionHash) external onlyOwner { + function deprecateVersion(bytes32 versionHash) external { + if (!roleRegistry.isOwnerOrEmergencyCouncil(msg.sender)) { + revert VersionRegistry__InvalidCaller(); + } + if (isDeprecated[versionHash]) { revert VersionRegistry__AlreadyDeprecated(); } diff --git a/test/Upgradeability.test.ts b/test/Upgradeability.test.ts index 0e4e24bd0d..d44697281f 100644 --- a/test/Upgradeability.test.ts +++ b/test/Upgradeability.test.ts @@ -903,7 +903,9 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { beforeEach(async () => { const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(owner.address) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + versionRegistry = await versionRegistryFactory.deploy(mockRoleRegistry.address) const assetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') assetPluginRegistry = await assetPluginRegistryFactory.deploy(versionRegistry.address) diff --git a/test/integration/UpgradeToR4.test.ts b/test/integration/UpgradeToR4.test.ts index b5e6215c90..ce7a9673d2 100644 --- a/test/integration/UpgradeToR4.test.ts +++ b/test/integration/UpgradeToR4.test.ts @@ -98,7 +98,9 @@ describe('Upgrade from 3.4.0 to 4.0.0 (Mainnet Fork)', () => { ) const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + versionRegistry = await versionRegistryFactory.deploy(mockRoleRegistry.address) await versionRegistry.registerVersion(deployer.address) diff --git a/test/integration/UpgradeToR4WithRegistries.test.ts b/test/integration/UpgradeToR4WithRegistries.test.ts index b0b12a7334..40b103f666 100644 --- a/test/integration/UpgradeToR4WithRegistries.test.ts +++ b/test/integration/UpgradeToR4WithRegistries.test.ts @@ -46,7 +46,9 @@ describe('Upgrade from 4.0.0 to New Version with all Registries Enabled', () => // Setup Registries const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + versionRegistry = await versionRegistryFactory.deploy(mockRoleRegistry.address) const AssetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') assetPluginRegistry = await AssetPluginRegistryFactory.deploy(versionRegistry.address) From 93d2831b2c5885ad69a27403de7436f7c4ca04b8 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 19 Jun 2024 14:59:22 -0300 Subject: [PATCH 406/450] Scenario test large decimals (#1159) --- .../AppreciatingMockDecimalsCollateral.sol | 12 + test/scenario/LargeDecimals.test.ts | 791 ++++++++++++++++++ 2 files changed, 803 insertions(+) create mode 100644 test/scenario/LargeDecimals.test.ts diff --git a/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol b/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol index c4d5ec0b53..7c8c56d577 100644 --- a/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol +++ b/contracts/plugins/mocks/AppreciatingMockDecimalsCollateral.sol @@ -8,6 +8,7 @@ import { OracleLib } from "../assets/OracleLib.sol"; import { AppreciatingMockDecimals } from "./AppreciatingMockDecimals.sol"; import { AggregatorV3Interface } from "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { shiftl_toFix } from "../../libraries/Fixed.sol"; /** @@ -16,6 +17,8 @@ import { shiftl_toFix } from "../../libraries/Fixed.sol"; contract AppreciatingMockDecimalsCollateral is AppreciatingFiatCollateral { int8 private immutable refDecimals; + IERC20 private immutable rewardToken; + /// config.erc20 must be an AppreciatingMockDecimals token /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide @@ -25,10 +28,19 @@ contract AppreciatingMockDecimalsCollateral is AppreciatingFiatCollateral { AppreciatingMockDecimals appToken = AppreciatingMockDecimals(address(config.erc20)); refDecimals = int8(uint8(IERC20Metadata(appToken.underlying()).decimals())); require(refDecimals > 18, "only decimals > 18"); + rewardToken = IERC20(address(AppreciatingMockDecimals(address(erc20)).rewardToken())); } /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { return shiftl_toFix(AppreciatingMockDecimals(address(erc20)).rate(), -refDecimals); } + + /// Claim rewards earned by holding a balance of the ERC20 token + /// @custom:delegate-call + function claimRewards() external virtual override(Asset, IRewardable) { + uint256 _bal = rewardToken.balanceOf(address(this)); + IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(rewardToken, rewardToken.balanceOf(address(this)) - _bal); + } } diff --git a/test/scenario/LargeDecimals.test.ts b/test/scenario/LargeDecimals.test.ts new file mode 100644 index 0000000000..c3900bfeb7 --- /dev/null +++ b/test/scenario/LargeDecimals.test.ts @@ -0,0 +1,791 @@ +import { loadFixture } from '@nomicfoundation/hardhat-network-helpers' +import { anyValue } from '@nomicfoundation/hardhat-chai-matchers/withArgs' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { expect } from 'chai' +import { BigNumber, ContractFactory } from 'ethers' +import { ethers } from 'hardhat' +import { IConfig } from '../../common/configuration' +import { bn, fp, pow10, toBNDecimals } from '../../common/numbers' +import { + Asset, + ERC20Mock, + FacadeTest, + GnosisMock, + IAssetRegistry, + MockV3Aggregator, + RTokenAsset, + TestIBackingManager, + TestIBasketHandler, + TestIFacade, + TestIRevenueTrader, + TestIRToken, + TestIFurnace, + TestIStRSR, + TestIDistributor, + AppreciatingMockDecimals, + AppreciatingMockDecimalsCollateral, + ERC20MockDecimals, +} from '../../typechain' +import { advanceTime, getLatestBlockTimestamp } from '../utils/time' +import { + defaultFixtureNoBasket, + IMPLEMENTATION, + ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, + REVENUE_HIDING, +} from '../fixtures' +import { BN_SCALE_FACTOR, CollateralStatus, FURNACE_DEST, STRSR_DEST } from '../../common/constants' +import { expectTrade, getTrade, toMinBuyAmt } from '../utils/trades' +import { expectPrice, expectRTokenPrice, setOraclePrice } from '../utils/oracles' +import { expectEvents } from '../../common/events' + +const DEFAULT_THRESHOLD = fp('0.01') // 1% +const DELAY_UNTIL_DEFAULT = bn('86400') // 24h +const MAX_TRADE_VOLUME = fp('1e7') // $10M + +const point5Pct = (value: BigNumber): BigNumber => { + return value.mul(5).div(1000) +} + +describe(`Large Decimals Basket - P${IMPLEMENTATION}`, () => { + let owner: SignerWithAddress + let addr1: SignerWithAddress + + // Non-backing assets + let rsr: ERC20Mock + let underlying: ERC20MockDecimals + let rewardToken: ERC20MockDecimals + let token: AppreciatingMockDecimals + + let erc20s: ERC20Mock[] + + let rsrAsset: Asset + let rewardAsset: Asset + let rTokenAsset: RTokenAsset + + // Trading + let gnosis: GnosisMock + let rsrTrader: TestIRevenueTrader + let rTokenTrader: TestIRevenueTrader + + // Tokens and Assets + let initialBal: BigNumber + let rewardAmount: BigNumber + + let collateral: AppreciatingMockDecimalsCollateral + let targetAmt: BigNumber + + let usdToken: ERC20Mock + + // Config values + let config: IConfig + + // Contracts to retrieve after deploy + let distributor: TestIDistributor + let furnace: TestIFurnace + let rToken: TestIRToken + let stRSR: TestIStRSR + let assetRegistry: IAssetRegistry + let basketHandler: TestIBasketHandler + let facade: TestIFacade + let facadeTest: FacadeTest + let backingManager: TestIBackingManager + + // Perform tests for each of these decimal variations (> 18) + const optDecimals = [21, 27] + optDecimals.forEach((decimals) => { + describe(`With decimals: ${decimals}`, () => { + beforeEach(async () => { + ;[owner, addr1] = await ethers.getSigners() + + // Deploy fixture + ;({ + erc20s, + config, + rToken, + assetRegistry, + backingManager, + basketHandler, + facade, + facadeTest, + rsr, + rsrAsset, + furnace, + distributor, + stRSR, + rTokenTrader, + rsrTrader, + gnosis, + rTokenAsset, + } = await loadFixture(defaultFixtureNoBasket)) + + // Mint initial balances + initialBal = bn('100000000').mul(pow10(decimals)) + + usdToken = erc20s[0] // DAI Token + + // Setup Factories + const ERC20MockDecimalsFactory: ContractFactory = await ethers.getContractFactory( + 'ERC20MockDecimals' + ) + const AppreciatingMockDecimalsFactory: ContractFactory = await ethers.getContractFactory( + 'AppreciatingMockDecimals' + ) + const AppreciatingMockDecimalsCollateralFactory: ContractFactory = + await ethers.getContractFactory('AppreciatingMockDecimalsCollateral') + const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( + 'MockV3Aggregator' + ) + + // Replace RSRAsset + const AssetFactory = await ethers.getContractFactory('Asset') + const newRSRAsset: Asset = ( + await AssetFactory.deploy( + PRICE_TIMEOUT, + await rsrAsset.chainlinkFeed(), + ORACLE_ERROR, + rsr.address, + MAX_TRADE_VOLUME, + ORACLE_TIMEOUT + ) + ) + await assetRegistry.connect(owner).swapRegistered(newRSRAsset.address) + rsrAsset = newRSRAsset + + // Setup reward asset + rewardToken = ( + await ERC20MockDecimalsFactory.deploy( + `Reward Token ${decimals}`, + `REWARD_TKN${decimals}`, + decimals + ) + ) + const rewardChainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, bn('1e8')) + ) + rewardAsset = ( + await AssetFactory.deploy( + PRICE_TIMEOUT, + rewardChainlinkFeed.address, + ORACLE_ERROR, + rewardToken.address, + MAX_TRADE_VOLUME, + ORACLE_TIMEOUT + ) + ) + await assetRegistry.connect(owner).register(rewardAsset.address) + + /***** Setup Basket, Appreciating collateral with large decimals ***********/ + underlying = ( + await ERC20MockDecimalsFactory.deploy(`Token ${decimals}`, `TKN${decimals}`, decimals) + ) + + token = ( + await AppreciatingMockDecimalsFactory.deploy( + `AppreciatingToken_${decimals}`, + `AppreciatingToken_SYM_:${decimals}`, + decimals, + underlying.address + ) + ) + await token.setExchangeRate(fp('1')) + await token.setRewardToken(rewardToken.address) + + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateral = ( + await AppreciatingMockDecimalsCollateralFactory.deploy( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: chainlinkFeed.address, + oracleError: ORACLE_ERROR, + erc20: token.address, + maxTradeVolume: MAX_TRADE_VOLUME, + oracleTimeout: ORACLE_TIMEOUT, + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + }, + REVENUE_HIDING + ) + ) + await assetRegistry.connect(owner).register(collateral.address) + + targetAmt = fp('1') + + // Set basket + await basketHandler.setPrimeBasket([token.address], [targetAmt]) + await basketHandler.connect(owner).refreshBasket() + + // Advance time post warmup period + await advanceTime(Number(config.warmupPeriod) + 1) + + // Mint and approve initial balances + await token.mint(addr1.address, initialBal) + await token.connect(addr1).approve(rToken.address, initialBal) + + // Mint backup token + await usdToken.mint(addr1.address, initialBal) + + // Grant allowances + await backingManager.grantRTokenAllowance(token.address) + }) + + it('Should Issue/Redeem correctly', async () => { + // Basket + expect(await basketHandler.fullyCollateralized()).to.equal(true) + + // Check other values + expect(await basketHandler.timestamp()).to.be.gt(bn(0)) + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal(0) + await expectPrice(basketHandler.address, fp('1'), ORACLE_ERROR, true) + + const issueAmt = bn('10e18') + + // Get quotes + const [, quotes] = await facade.connect(addr1).callStatic.issue(rToken.address, issueAmt) + + // Issue + await rToken.connect(addr1).issue(issueAmt) + expect(await rToken.balanceOf(addr1.address)).to.equal(issueAmt) + expect(await rToken.totalSupply()).to.equal(issueAmt) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + issueAmt, + fp('0.5') + ) + + await expectPrice(basketHandler.address, fp('1'), ORACLE_ERROR, true) + + // Set expected quotes + const expectedTkn: BigNumber = toBNDecimals( + issueAmt.mul(targetAmt).div(await collateral.refPerTok()), + decimals + ) + + // Check balances + expect(await token.balanceOf(backingManager.address)).to.equal(expectedTkn) + expect(await token.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn)) + expect(expectedTkn).to.equal(quotes[0]) + + // Redeem + await rToken.connect(addr1).redeem(issueAmt) + expect(await rToken.balanceOf(addr1.address)).to.equal(0) + expect(await rToken.totalSupply()).to.equal(0) + + // Check balances - Back to initial status + expect(await token.balanceOf(backingManager.address)).to.equal(0) + expect(await token.balanceOf(addr1.address)).to.equal(initialBal) + }) + + it('Should claim rewards correctly - All RSR', async () => { + // Set RSR price + const rsrPrice = fp('0.005') // 0.005 usd + await setOraclePrice(rsrAsset.address, toBNDecimals(rsrPrice, 8)) + + // Set reward token price + const rewardPrice = fp('50') // 50 usd + await setOraclePrice(rewardAsset.address, toBNDecimals(rewardPrice, 8)) + + // Set Reward amount = approx 5 usd + rewardAmount = bn('1').mul(pow10(decimals - 1)) + + // Mint some RSR (arbitrary) + await rsr.connect(owner).mint(addr1.address, initialBal) + + // Set f=1 // All revenues to RSR + await expect( + distributor + .connect(owner) + .setDistribution(STRSR_DEST, { rTokenDist: bn(0), rsrDist: bn(10000) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(STRSR_DEST, bn(0), bn(10000)) + + await expect( + distributor + .connect(owner) + .setDistribution(FURNACE_DEST, { rTokenDist: bn(0), rsrDist: bn(0) }) + ) + .to.emit(distributor, 'DistributionSet') + .withArgs(FURNACE_DEST, bn(0), bn(0)) + + // Set Rewards + await token.setRewards(backingManager.address, rewardAmount) + + // Collect revenue - Called via poke + const sellAmt: BigNumber = rewardAmount // all will be sold + const minBuyAmt = toMinBuyAmt( + sellAmt.div(pow10(decimals - 18)), // scale to 18 decimals (to obtain RSR amount) + rewardPrice, + rsrPrice, + ORACLE_ERROR, + config.maxTradeSlippage + ) + + await expectEvents(backingManager.claimRewards(), [ + { + contract: backingManager, + name: 'RewardsClaimed', + args: [rewardToken.address, rewardAmount], + emitted: true, + }, + ]) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Run auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + args: [anyValue, rewardToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auctions registered + // RewardToken -> RSR Auction + await expectTrade(rsrTrader, { + sell: rewardToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // Check funds in Market + expect(await rewardToken.balanceOf(gnosis.address)).to.equal(rewardAmount) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Perform Mock Bids for RSR and RToken (addr1 has balance) + await rsr.connect(addr1).approve(gnosis.address, minBuyAmt) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + + // Close auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, rewardToken.address, rsr.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check balances sent to corresponding destinations + // StRSR + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo(minBuyAmt, 10000) + // Furnace + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + }) + + it('Should sell collateral as it appreciates and handle revenue auction correctly', async () => { + // Set RSR price + const rsrPrice = fp('0.005') // 0.005 usd + await setOraclePrice(rsrAsset.address, toBNDecimals(rsrPrice, 8)) + + // Mint some RSR (arbitrary) + await rsr.connect(owner).mint(addr1.address, initialBal) + + // Issue 1 RToken + const issueAmount = bn('1e18') + + // Get quotes for RToken + const [, quotes] = await facade.connect(addr1).callStatic.issue(rToken.address, issueAmount) + + // Issue 1 RToken + await rToken.connect(addr1).issue(issueAmount) + + const origAssetValue = issueAmount + await expectRTokenPrice( + rTokenAsset.address, + fp('1'), + ORACLE_ERROR, + await backingManager.maxTradeSlippage(), + config.minTradeVolume.mul((await assetRegistry.erc20s()).length) + ) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + origAssetValue, + fp('0.5') + ) + expect(await rToken.balanceOf(addr1.address)).to.equal(issueAmount) + expect(await rToken.totalSupply()).to.equal(issueAmount) + + // Increase redemption rate to double + await token.setExchangeRate(fp('2')) + + // Get updated quotes + const [, newQuotes] = await facade + .connect(addr1) + .callStatic.issue(rToken.address, issueAmount) + + await assetRegistry.refresh() // refresh to update refPerTok() + const expectedNewTkn: BigNumber = toBNDecimals( + issueAmount.mul(targetAmt).div(await collateral.refPerTok()), + decimals + ) + + expect(expectedNewTkn).to.equal(newQuotes[0]) + expect(newQuotes[0]).to.equal(quotes[0].div(2)) // requires half the tokens now + + // Check Price and assets value + // Excess token = 0.5 tok (50% of issued amount) + const excessQuantity: BigNumber = quotes[0].sub(newQuotes[0]) + const excessQuantity18: BigNumber = excessQuantity.div(pow10(decimals - 18)) + + const [lowPrice, highPrice] = await collateral.price() + const excessValueLow: BigNumber = excessQuantity18.mul(lowPrice).div(BN_SCALE_FACTOR) + const excessValueHigh: BigNumber = excessQuantity18.mul(highPrice).div(BN_SCALE_FACTOR) + + expect(excessQuantity).to.equal(toBNDecimals(issueAmount.div(2), decimals)) + await expectPrice(collateral.address, fp('2'), ORACLE_ERROR, true) // price doubled + expect(excessValueLow).to.be.lt(fp('1')) + expect(excessValueHigh).to.be.gt(fp('1')) + + // RToken price remains the same + await expectRTokenPrice( + rTokenAsset.address, + fp('1'), + ORACLE_ERROR, + await backingManager.maxTradeSlippage(), + config.minTradeVolume.mul((await assetRegistry.erc20s()).length) + ) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.lt( + origAssetValue.add(excessValueHigh) + ) + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.gt( + origAssetValue.add(excessValueLow) + ) + + // Check status of destinations at this point + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.equal(0) + + // Expected values + const currentTotalSupply: BigNumber = await rToken.totalSupply() + + // Excess Token will be minted into a full RToken + const excessInRToken = issueAmount + const expectedToTrader = excessInRToken.mul(60).div(100) // 60% of 1 RToken (0.6 RTokens) + const expectedToFurnace = excessInRToken.sub(expectedToTrader) // Remainder (0.4 RTokens) + expect(expectedToTrader).to.equal(fp('0.6')) + expect(expectedToFurnace).to.equal(fp('0.4')) + + // Set expected values for first auction + const sellAmt: BigNumber = expectedToTrader // everything is auctioned, below max auction + const minBuyAmt = toMinBuyAmt( + sellAmt, + fp('1'), + rsrPrice, + ORACLE_ERROR, + config.maxTradeSlippage + ) + + await expectRTokenPrice( + rTokenAsset.address, + fp('1'), + ORACLE_ERROR, + await backingManager.maxTradeSlippage(), + config.minTradeVolume.mul((await assetRegistry.erc20s()).length) + ) + + // Run auctions - Will detect excess (all will be minted in RToken, so no RToken auction) + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + const auctionTimestamp: number = await getLatestBlockTimestamp() + + // Check auction registered + // RToken -> RSR Auction + await expectTrade(rsrTrader, { + sell: rToken.address, + buy: rsr.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // Check trades + const trade = await getTrade(rsrTrader, rToken.address) + const auctionId = await trade.auctionId() + const [, , , auctionSellAmt, auctionbuyAmt] = await gnosis.auctions(auctionId) + expect(sellAmt).to.be.closeTo(auctionSellAmt, point5Pct(auctionSellAmt)) + expect(minBuyAmt).to.be.closeTo(auctionbuyAmt, point5Pct(auctionbuyAmt)) + + // Check Price (unchanged) and Assets value + await expectRTokenPrice( + rTokenAsset.address, + fp('1'), + ORACLE_ERROR, + await backingManager.maxTradeSlippage(), + config.minTradeVolume.mul((await assetRegistry.erc20s()).length) + ) + + // Value of backing doubled + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + origAssetValue.mul(2), + point5Pct(origAssetValue.mul(2)) + ) + + // Supply now doubled + expect(await rToken.totalSupply()).to.be.closeTo( + currentTotalSupply.mul(2), + point5Pct(currentTotalSupply.mul(2)) + ) + + // Check destinations at this stage (RToken already sent to furnace) + expect(await rsr.balanceOf(stRSR.address)).to.equal(0) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( + expectedToFurnace, + point5Pct(expectedToFurnace) + ) + + // Check funds in Market and Traders + expect(await rToken.balanceOf(gnosis.address)).to.be.closeTo(sellAmt, point5Pct(sellAmt)) + + expect(await rToken.balanceOf(rsrTrader.address)).to.equal(bn(0)) + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(bn(0)) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Mock auctions + await rsr.connect(addr1).approve(gnosis.address, auctionbuyAmt) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: auctionSellAmt, + buyAmount: auctionbuyAmt, + }) + + // Close auctions - Will not open another auction + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: rsrTrader, + name: 'TradeSettled', + args: [anyValue, rToken.address, rsr.address, auctionSellAmt, auctionbuyAmt], + emitted: true, + }, + { + contract: rTokenTrader, + name: 'TradeSettled', + emitted: false, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check Price (unchanged) and Assets value (unchanged) + await expectRTokenPrice( + rTokenAsset.address, + fp('1'), + ORACLE_ERROR, + await backingManager.maxTradeSlippage(), + config.minTradeVolume.mul((await assetRegistry.erc20s()).length) + ) + + expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( + origAssetValue.mul(2), + point5Pct(origAssetValue.mul(2)) + ) + + expect(await rToken.totalSupply()).to.be.closeTo( + currentTotalSupply.mul(2), + point5Pct(currentTotalSupply.mul(2)) + ) + + // Check destinations at this stage - RSR and RTokens already in StRSR and Furnace + expect(await rsr.balanceOf(stRSR.address)).to.be.closeTo( + auctionbuyAmt, + point5Pct(auctionbuyAmt) + ) + expect(await rToken.balanceOf(furnace.address)).to.be.closeTo( + expectedToFurnace, + point5Pct(expectedToFurnace) + ) + + // Check no more funds in Market and Traders + expect(await rToken.balanceOf(gnosis.address)).to.equal(0) + expect(await rToken.balanceOf(rsrTrader.address)).to.equal(0) + expect(await rToken.balanceOf(rTokenTrader.address)).to.equal(0) + }) + + it('Should recollateralize basket correctly', async () => { + // Set RSR price to 25 cts for less auctions + const rsrPrice = fp('0.25') // 0.25 usd + await setOraclePrice(rsrAsset.address, toBNDecimals(rsrPrice, 8)) + + // Stake some RSR + await rsr.connect(owner).mint(addr1.address, initialBal) + await rsr.connect(addr1).approve(stRSR.address, initialBal) + await stRSR.connect(addr1).stake(initialBal) + + // Issue + const issueAmount = bn('1e18') + + await rToken.connect(addr1).issue(issueAmount) + + expect(await basketHandler.fullyCollateralized()).to.equal(true) + + // Get quotes for RToken + const [, quotes] = await facade.connect(addr1).callStatic.issue(rToken.address, issueAmount) + const expectedTkn: BigNumber = toBNDecimals( + issueAmount.mul(targetAmt).div(await collateral.refPerTok()), + decimals + ) + + expect(quotes[0]).to.equal(toBNDecimals(fp('1'), decimals)) + expect(expectedTkn).to.equal(quotes[0]) + + // Set Backup to DAI + await basketHandler + .connect(owner) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), [usdToken.address]) + + // Basket Swapping - Default token - should be replaced by DAI + // Decrease rate to cause default + await token.setExchangeRate(fp('0.8')) + + // Mark Collateral as Defaulted + await collateral.refresh() + + expect(await collateral.status()).to.equal(CollateralStatus.DISABLED) + + // Ensure valid basket + await basketHandler.refreshBasket() + + // Advance time post warmup period + await advanceTime(Number(config.warmupPeriod) + 1) + + const [, newQuotes] = await facade + .connect(addr1) + .callStatic.issue(rToken.address, issueAmount) + expect(newQuotes[0]).to.equal(fp('1')) + + // Check new basket status + expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + + // Running auctions will trigger recollateralization - All balance of invalid tokens will be redeemed + const sellAmt: BigNumber = await token.balanceOf(backingManager.address) + const minBuyAmt = toMinBuyAmt( + sellAmt.div(pow10(decimals - 18)), // scale down to 18 decimals + fp('0.8'), // decrease 20% + fp('1'), + ORACLE_ERROR, + config.maxTradeSlippage + ) + + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: backingManager, + name: 'TradeStarted', + args: [anyValue, token.address, usdToken.address, sellAmt, minBuyAmt], + emitted: true, + }, + ]) + + const auctionTimestamp = await getLatestBlockTimestamp() + + // Token (Defaulted) -> DAI (only valid backup token for that target) + await expectTrade(backingManager, { + sell: token.address, + buy: usdToken.address, + endTime: auctionTimestamp + Number(config.batchAuctionLength), + externalId: bn('0'), + }) + + // Check trade + const trade = await getTrade(backingManager, token.address) + const auctionId = await trade.auctionId() + const [, , , auctionSellAmt] = await gnosis.auctions(auctionId) + expect(sellAmt).to.be.closeTo(auctionSellAmt, point5Pct(auctionSellAmt)) + + // Check funds in Market and Traders + expect(await token.balanceOf(gnosis.address)).to.be.closeTo(sellAmt, point5Pct(sellAmt)) + expect(await token.balanceOf(backingManager.address)).to.equal(bn(0)) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Mock auction - Get 100% of value + const auctionbuyAmt = fp('1') + await usdToken.connect(addr1).approve(gnosis.address, auctionbuyAmt) + await gnosis.placeBid(0, { + bidder: addr1.address, + sellAmount: auctionSellAmt, + buyAmount: auctionbuyAmt, + }) + + // Close auctions - Will not open new auctions + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: backingManager, + name: 'TradeSettled', + args: [anyValue, token.address, usdToken.address, auctionSellAmt, auctionbuyAmt], + emitted: true, + }, + { + contract: backingManager, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rsrTrader, + name: 'TradeStarted', + emitted: false, + }, + { + contract: rTokenTrader, + name: 'TradeStarted', + emitted: false, + }, + ]) + + // Check new status + expect(await basketHandler.fullyCollateralized()).to.equal(true) + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + }) + }) + }) +}) From e17a559c6baeba30737b4cfd5a9c5bdc2f5dc9c3 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 20 Jun 2024 23:06:38 -0400 Subject: [PATCH 407/450] reserveGas() --- contracts/p0/AssetRegistry.sol | 4 ++-- contracts/p1/AssetRegistry.sol | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/contracts/p0/AssetRegistry.sol b/contracts/p0/AssetRegistry.sol index ad4239cd84..a0e8bded18 100644 --- a/contracts/p0/AssetRegistry.sol +++ b/contracts/p0/AssetRegistry.sol @@ -176,9 +176,9 @@ contract AssetRegistryP0 is ComponentP0, IAssetRegistry { function _reserveGas() private view returns (uint256) { uint256 gas = gasleft(); require( - gas > GAS_FOR_DISABLE_BASKET + GAS_FOR_BH_QTY, + gas > (64 * GAS_FOR_BH_QTY) / 63 + GAS_FOR_DISABLE_BASKET, "not enough gas to unregister safely" ); - return gas - GAS_FOR_DISABLE_BASKET; + return GAS_FOR_BH_QTY; } } diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 883c22cff2..3918990b47 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -252,11 +252,15 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { function _reserveGas() private view returns (uint256) { uint256 gas = gasleft(); + // Call to quantity() restricts gas that is passed along to 63 / 64 of gasleft(). + // Therefore gasleft() must be greater than 64 * GAS_FOR_BH_QTY / 63 + // GAS_FOR_DISABLE_BASKET is a buffer which can be considerably lower without + // security implications. require( - gas > GAS_FOR_DISABLE_BASKET + GAS_FOR_BH_QTY, + gas > (64 * GAS_FOR_BH_QTY) / 63 + GAS_FOR_DISABLE_BASKET, "not enough gas to unregister safely" ); - return gas - GAS_FOR_DISABLE_BASKET; + return GAS_FOR_BH_QTY; } /** From 8c9aa679b6963eb55f9614884e8d8a11330c7ade Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 21 Jun 2024 14:33:46 -0400 Subject: [PATCH 408/450] update mev docs with issuance/redemption instructions --- docs/mev.md | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/docs/mev.md b/docs/mev.md index 1b7587cfe6..6f2d561f6c 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -11,7 +11,28 @@ Like any protocol, the Reserve Protocol causes some amount of MEV. While the ful ### 1. Issuance/Redemption -MEV searchers can arb an RToken's issuance/redemption price against the broader market, whether that be AMM pools or CEX prices. This is a fairly standard MEV opportunity and it works the way an MEV searcher would expect. All that one needs to be able to do to participate is execute `issue()` or `redeem()` on the `RToken.sol` contract. The issuance requires approvals in advance, while the `redeem()` does not. You can find more documentation elsewhere in the repo about the properties of our `issue()`/`redeem()`/`redeemCustom()` functions. In short, they are atomic and work the way a searcher would expect, with the caveat that `redeem()` will revert during rebalancing (`redeemCustom()` does not). +MEV searchers can arb an RToken's issuance/redemption price against the broader market, whether that be AMM pools or CEX prices. This is a fairly standard MEV opportunity and it works the way an MEV searcher would expect. All that one needs to be able to do to participate is execute `issue()` or `redeem()` on the `RToken.sol` contract. The issuance requires approvals in advance, while the `redeem()` does not. The challenge is in knowing the precise quantities of tokens that will be required in advance. + +A challenge that anyone building on top of the protocol will face is that underlying rates move between the time the tx is constructed and when it is executed on-chain. To get the tightest possible quote, you can execute a static call against the Facade address for your chain using the below interface: + +- Mainnet: https://etherscan.io/address/0x2C7ca56342177343A2954C250702Fd464f4d0613 +- Base: https://basescan.org/address/0x387A0C36681A22F728ab54426356F4CAa6bB48a9 +- Arbitrum: https://arbiscan.io/address/0x387A0C36681A22F728ab54426356F4CAa6bB48a9 + +```solidity +function issue(address rToken, uint256 amount) external returns (uint256); + +function redeem(address rToken, uint256 amount) external returns (uint256); + +``` + +For issuance, the rates will move in favor of the issuer such that fewer collateral are required than first initially quoted. + +For redemption, the rates will move against the redeemer such that they receive less collateral than first initially quoted. + +These calls do not need to be made from an account with any prerequisite token balances or approvals. It will simulate refreshing all the underlying collateral in the current block and return a quote. + +We do not suggest executing these functions live on-chain, though it is possible. The gas cost is quite high. ### 2. Auctions From 25a3525e94a51bcf5223cc4841bfccc590c261e5 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 22 Jun 2024 00:55:12 +0530 Subject: [PATCH 409/450] Update DAO Fee Registry --- contracts/registry/DAOFeeRegistry.sol | 44 +++++++++++++++++++-------- docs/aggregator-guide.md | 5 +++ 2 files changed, 36 insertions(+), 13 deletions(-) create mode 100644 docs/aggregator-guide.md diff --git a/contracts/registry/DAOFeeRegistry.sol b/contracts/registry/DAOFeeRegistry.sol index a8e1fd60e5..8e7b9adeb9 100644 --- a/contracts/registry/DAOFeeRegistry.sol +++ b/contracts/registry/DAOFeeRegistry.sol @@ -1,12 +1,14 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; -import { Ownable } from "@openzeppelin/contracts/access/Ownable.sol"; +import { RoleRegistry } from "./RoleRegistry.sol"; -uint256 constant MAX_FEE_NUMERATOR = 15_00; // max 15% DAO fee +uint256 constant MAX_FEE_NUMERATOR = 15_00; // Max DAO Fee: 15% uint256 constant FEE_DENOMINATOR = 100_00; -contract DAOFeeRegistry is Ownable { +contract DAOFeeRegistry { + RoleRegistry public roleRegistry; + address private feeRecipient; uint256 private defaultFeeNumerator; // 0% @@ -16,31 +18,45 @@ contract DAOFeeRegistry is Ownable { error DAOFeeRegistry__FeeRecipientAlreadySet(); error DAOFeeRegistry__InvalidFeeRecipient(); error DAOFeeRegistry__InvalidFeeNumerator(); - error DAOFeeRegistry__InvalidOwner(); + error DAOFeeRegistry__InvalidRoleRegistry(); + error DAOFeeRegistry__InvalidCaller(); event FeeRecipientSet(address indexed feeRecipient); event DefaultFeeNumeratorSet(uint256 defaultFeeNumerator); event RTokenFeeNumeratorSet(address indexed rToken, uint256 feeNumerator, bool isActive); - constructor(address owner_) Ownable() { - if (owner_ == address(0)) { - revert DAOFeeRegistry__InvalidOwner(); + modifier onlyOwner() { + if (!roleRegistry.isOwner(msg.sender)) { + revert DAOFeeRegistry__InvalidCaller(); + } + _; + } + + constructor(RoleRegistry _roleRegistry, address _feeRecipient) { + if (address(_roleRegistry) == address(0)) { + revert DAOFeeRegistry__InvalidRoleRegistry(); } - _transferOwnership(owner_); // Ownership to DAO - feeRecipient = owner_; // DAO as initial fee recipient + roleRegistry = _roleRegistry; + feeRecipient = _feeRecipient; } function setFeeRecipient(address feeRecipient_) external onlyOwner { - if (feeRecipient_ == address(0)) revert DAOFeeRegistry__InvalidFeeRecipient(); - if (feeRecipient_ == feeRecipient) revert DAOFeeRegistry__FeeRecipientAlreadySet(); + if (feeRecipient_ == address(0)) { + revert DAOFeeRegistry__InvalidFeeRecipient(); + } + if (feeRecipient_ == feeRecipient) { + revert DAOFeeRegistry__FeeRecipientAlreadySet(); + } feeRecipient = feeRecipient_; emit FeeRecipientSet(feeRecipient_); } function setDefaultFeeNumerator(uint256 feeNumerator_) external onlyOwner { - if (feeNumerator_ > MAX_FEE_NUMERATOR) revert DAOFeeRegistry__InvalidFeeNumerator(); + if (feeNumerator_ > MAX_FEE_NUMERATOR) { + revert DAOFeeRegistry__InvalidFeeNumerator(); + } defaultFeeNumerator = feeNumerator_; emit DefaultFeeNumeratorSet(defaultFeeNumerator); @@ -48,7 +64,9 @@ contract DAOFeeRegistry is Ownable { /// @dev A fee below 1% not recommended due to poor precision in the Distributor function setRTokenFeeNumerator(address rToken, uint256 feeNumerator_) external onlyOwner { - if (feeNumerator_ > MAX_FEE_NUMERATOR) revert DAOFeeRegistry__InvalidFeeNumerator(); + if (feeNumerator_ > MAX_FEE_NUMERATOR) { + revert DAOFeeRegistry__InvalidFeeNumerator(); + } rTokenFeeNumerator[rToken] = feeNumerator_; rTokenFeeSet[rToken] = true; diff --git a/docs/aggregator-guide.md b/docs/aggregator-guide.md new file mode 100644 index 0000000000..57ff726d4e --- /dev/null +++ b/docs/aggregator-guide.md @@ -0,0 +1,5 @@ +# Aggregator Integration Guide + +This guide is intended for aggregators looking to natively integrate RToken Minting and Redemptions into their platform. The Reserve Protocol provides a set of smart contracts that allow users to mint and redeem RTokens, which are backed by a basket of assets. + +## Minting From 349c9229076035100908132dc4fead2fecf72a82 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 22 Jun 2024 01:42:48 +0530 Subject: [PATCH 410/450] upgrade mismatch check --- contracts/p1/Main.sol | 2 ++ docs/aggregator-guide.md | 5 ----- 2 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 docs/aggregator-guide.md diff --git a/contracts/p1/Main.sol b/contracts/p1/Main.sol index b5749c80fe..e3cbec87da 100644 --- a/contracts/p1/Main.sol +++ b/contracts/p1/Main.sol @@ -105,6 +105,7 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad ); _upgradeProxy(address(this), address(implementation.main)); + require(keccak256(abi.encodePacked(this.version())) == versionHash, "upgrade mismatch"); } function upgradeRTokenTo( @@ -157,6 +158,7 @@ contract MainP1 is Versioned, Initializable, Auth, ComponentRegistry, UUPSUpgrad (bool success, ) = proxy.call( abi.encodeWithSelector(UUPSUpgradeable.upgradeTo.selector, implementation) ); + require(success, "upgrade failed"); } diff --git a/docs/aggregator-guide.md b/docs/aggregator-guide.md deleted file mode 100644 index 57ff726d4e..0000000000 --- a/docs/aggregator-guide.md +++ /dev/null @@ -1,5 +0,0 @@ -# Aggregator Integration Guide - -This guide is intended for aggregators looking to natively integrate RToken Minting and Redemptions into their platform. The Reserve Protocol provides a set of smart contracts that allow users to mint and redeem RTokens, which are backed by a basket of assets. - -## Minting From 6c1740c58858280ccc942909a8aac2df664439c6 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Sat, 22 Jun 2024 01:54:48 +0530 Subject: [PATCH 411/450] Fix test --- test/integration/UpgradeToR4.test.ts | 5 +++- .../UpgradeToR4WithRegistries.test.ts | 5 +++- test/registries/DAOFeeRegistry.test.ts | 29 +++++-------------- 3 files changed, 16 insertions(+), 23 deletions(-) diff --git a/test/integration/UpgradeToR4.test.ts b/test/integration/UpgradeToR4.test.ts index ce7a9673d2..3d6d24db09 100644 --- a/test/integration/UpgradeToR4.test.ts +++ b/test/integration/UpgradeToR4.test.ts @@ -109,7 +109,10 @@ describe('Upgrade from 3.4.0 to 4.0.0 (Mainnet Fork)', () => { (await AssetPluginRegistryFactory.deploy()) as unknown as AssetPluginRegistry const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') - daoFeeRegistry = await DAOFeeRegistryFactory.deploy(await owner.getAddress()) + daoFeeRegistry = await DAOFeeRegistryFactory.deploy( + mockRoleRegistry.address, + await owner.getAddress() + ) }) describe('The Upgrade', () => { diff --git a/test/integration/UpgradeToR4WithRegistries.test.ts b/test/integration/UpgradeToR4WithRegistries.test.ts index 40b103f666..632a4d37ee 100644 --- a/test/integration/UpgradeToR4WithRegistries.test.ts +++ b/test/integration/UpgradeToR4WithRegistries.test.ts @@ -54,7 +54,10 @@ describe('Upgrade from 4.0.0 to New Version with all Registries Enabled', () => assetPluginRegistry = await AssetPluginRegistryFactory.deploy(versionRegistry.address) const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') - daoFeeRegistry = await DAOFeeRegistryFactory.deploy(await owner.getAddress()) + daoFeeRegistry = await DAOFeeRegistryFactory.deploy( + mockRoleRegistry.address, + await owner.getAddress() + ) // Setup Common Dependencies const TradingLibFactory = await ethers.getContractFactory('RecollateralizationLibP1') diff --git a/test/registries/DAOFeeRegistry.test.ts b/test/registries/DAOFeeRegistry.test.ts index 4a75c0c77c..6872be6118 100644 --- a/test/registries/DAOFeeRegistry.test.ts +++ b/test/registries/DAOFeeRegistry.test.ts @@ -35,15 +35,19 @@ describeP1('DAO Fee Registry', () => { // Deploy fixture ;({ distributor, main, rToken, rsr, rsrTrader } = await loadFixture(defaultFixture)) + const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') + const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') - feeRegistry = await DAOFeeRegistryFactory.connect(owner).deploy(await owner.getAddress()) + feeRegistry = await DAOFeeRegistryFactory.connect(owner).deploy( + mockRoleRegistry.address, + await owner.getAddress() + ) + await main.connect(owner).setDAOFeeRegistry(feeRegistry.address) }) describe('Deployment', () => { - it('should set the owner correctly', async () => { - expect(await feeRegistry.owner()).to.eq(await owner.getAddress()) - }) it('fee should begin zero and assigned to owner', async () => { const feeDetails = await feeRegistry.getFeeDetails(rToken.address) expect(feeDetails.recipient).to.equal(owner.address) @@ -52,23 +56,6 @@ describeP1('DAO Fee Registry', () => { }) }) - describe('Ownership', () => { - it('Should be able to change owner', async () => { - expect(await feeRegistry.owner()).to.eq(await owner.getAddress()) - await feeRegistry.connect(owner).transferOwnership(other.address) - expect(await feeRegistry.owner()).to.eq(await other.getAddress()) - await expect(feeRegistry.connect(owner).setFeeRecipient(owner.address)).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) - await expect(feeRegistry.connect(owner).setDefaultFeeNumerator(bn('100'))).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) - await expect( - feeRegistry.connect(owner).setRTokenFeeNumerator(rToken.address, bn('100')) - ).to.be.revertedWith('Ownable: caller is not the owner') - }) - }) - describe('Negative cases', () => { it('Should not allow calling setters by anyone other than owner', async () => { await expect(feeRegistry.connect(other).setFeeRecipient(owner.address)).to.be.revertedWith( From 2683d0d296b50abc09f1c1ec9d42009b8e3f21f4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 21 Jun 2024 16:47:32 -0400 Subject: [PATCH 412/450] fix issue/redeem interface --- docs/mev.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/docs/mev.md b/docs/mev.md index 6f2d561f6c..23327c8cbe 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -20,9 +20,28 @@ A challenge that anyone building on top of the protocol will face is that underl - Arbitrum: https://arbiscan.io/address/0x387A0C36681A22F728ab54426356F4CAa6bB48a9 ```solidity -function issue(address rToken, uint256 amount) external returns (uint256); - -function redeem(address rToken, uint256 amount) external returns (uint256); +function issue(address rToken, uint256 amount) + external + returns ( + address[] memory tokens, + uint256[] memory deposits, + uint192[] memory depositsUoA + ); + +function redeem(address rToken, uint256 amount) + external + returns ( + address[] memory tokens, + uint256[] memory withdrawals, + uint256[] memory available + ); + +function redeemCustom( + IRToken rToken, + uint256 amount, + uint48[] memory basketNonces, + uint192[] memory portions +) external returns (address[] memory tokens, uint256[] memory withdrawals); ``` From 49e4d01b10227cb0922e667f6d8dd6baaec8882e Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 21 Jun 2024 16:51:54 -0400 Subject: [PATCH 413/450] fix base address --- docs/mev.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/mev.md b/docs/mev.md index 23327c8cbe..19668622b7 100644 --- a/docs/mev.md +++ b/docs/mev.md @@ -16,7 +16,7 @@ MEV searchers can arb an RToken's issuance/redemption price against the broader A challenge that anyone building on top of the protocol will face is that underlying rates move between the time the tx is constructed and when it is executed on-chain. To get the tightest possible quote, you can execute a static call against the Facade address for your chain using the below interface: - Mainnet: https://etherscan.io/address/0x2C7ca56342177343A2954C250702Fd464f4d0613 -- Base: https://basescan.org/address/0x387A0C36681A22F728ab54426356F4CAa6bB48a9 +- Base: https://basescan.org/address/0xEb2071e9B542555E90E6e4E1F83fa17423583991 - Arbitrum: https://arbiscan.io/address/0x387A0C36681A22F728ab54426356F4CAa6bB48a9 ```solidity From aaae97178c9e03f235dc2b5dac53e0ff1e054a66 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Sun, 23 Jun 2024 11:44:58 -0400 Subject: [PATCH 414/450] make proposal validator able to simulate proposal to execution from any point in governance process --- tasks/validation/utils/governance.ts | 73 ++++++++++++++++++---------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/tasks/validation/utils/governance.ts b/tasks/validation/utils/governance.ts index ac315df9cc..c891b028f8 100644 --- a/tasks/validation/utils/governance.ts +++ b/tasks/validation/utils/governance.ts @@ -35,15 +35,14 @@ export const moveProposalToActive = async ( const version = await rToken.version() if (version == '3.0.0' || version == '3.0.1') await advanceBlocks(hre, votingDelay.add(2)) else await advanceTime(hre, votingDelay.add(2).toNumber()) - } else { - if (propState == ProposalState.Active) { - console.log(`Proposal is already ${ProposalState[ProposalState.Active]}... skipping step.`) - } else { - throw Error(`Proposal should be ${ProposalState[ProposalState.Pending]} at this step.`) - } + } else if (propState == ProposalState.Active) { + console.log(`Proposal is already ${ProposalState[ProposalState.Active]}... skipping step.`) } - await validatePropState(await governor.state(proposalId), ProposalState.Active) + const state = await governor.state(proposalId) + if (![ProposalState.Active, ProposalState.Succeeded, ProposalState.Queued].includes(state)) { + throw new Error(`Proposal is in unexpected state ${ProposalState[propState]}`) + } } export const voteProposal = async ( @@ -96,7 +95,10 @@ export const voteProposal = async ( } } - await validatePropState(await governor.state(proposalId), ProposalState.Active) + const state = await governor.state(proposalId) + if (![ProposalState.Active, ProposalState.Succeeded, ProposalState.Queued].includes(state)) { + throw new Error(`Proposal is in unexpected state ${ProposalState[propState]}`) + } } export const passProposal = async ( @@ -115,7 +117,10 @@ export const passProposal = async ( await advanceBlocks(hre, votingPeriod.add(1)) } - await validatePropState(await governor.state(proposalId), ProposalState.Succeeded) + const state = await governor.state(proposalId) + if (![ProposalState.Succeeded, ProposalState.Queued].includes(state)) { + throw new Error(`Proposal is in unexpected state ${ProposalState[propState]}`) + } } export const executeProposal = async ( @@ -263,35 +268,49 @@ export const proposeUpgrade = async ( const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) const amount = (await stRSR.getStakeRSR()).div(100) // 1% increase in staked RSR - - // Stake and delegate - await hre.run('give-rsr', { address: tester.address, amount: amount.toString() }) - await stakeAndDelegateRsr(hre, rTokenAddress, tester.address) - const governor = await hre.ethers.getContractAt('Governance', governorAddress) - const call = await governor.populateTransaction.propose( + let proposalId = await governor.hashProposal( proposal.targets, proposal.values, proposal.calldatas, - proposal.description + await hre.ethers.utils.keccak256(hre.ethers.utils.toUtf8Bytes(proposal.description)) ) - console.log(`Proposal Transaction:\n`, call.data) + // Only propose if not already proposed + if ((await governor.proposalSnapshot(proposalId)).eq(0)) { + await hre.run('give-rsr', { address: tester.address, amount: amount.toString() }) + await stakeAndDelegateRsr(hre, rTokenAddress, tester.address) - const r = await governor.propose( - proposal.targets, - proposal.values, - proposal.calldatas, - proposal.description - ) - const resp = await r.wait() + const call = await governor.populateTransaction.propose( + proposal.targets, + proposal.values, + proposal.calldatas, + proposal.description + ) + + console.log(`Proposal Transaction:\n`, call.data) + + await validatePropState(await governor.state(proposalId), ProposalState.Active) + + const r = await governor.propose( + proposal.targets, + proposal.values, + proposal.calldatas, + proposal.description + ) + const resp = await r.wait() + proposalId = bn(resp.events![0].args!.proposalId) + + console.log('\nSuccessfully proposed!') + } else { + console.log('\nAlready proposed!') + } - console.log('\nSuccessfully proposed!') - console.log(`Proposal ID: ${resp.events![0].args!.proposalId}`) + console.log(`Proposal ID: ${proposalId}`) return { ...proposal, - proposalId: resp.events![0].args!.proposalId as string, + proposalId: proposalId.toString(), } } From de7b0fe9199efb655edb55aa2e0d1e86224b2335 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Sun, 23 Jun 2024 12:13:30 -0400 Subject: [PATCH 415/450] spell pt 2 validation --- tasks/validation/proposal-validator.ts | 43 +++++++++++++++++--------- tasks/validation/utils/governance.ts | 3 +- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/tasks/validation/proposal-validator.ts b/tasks/validation/proposal-validator.ts index 908ac9a8b0..56ec7452aa 100644 --- a/tasks/validation/proposal-validator.ts +++ b/tasks/validation/proposal-validator.ts @@ -21,7 +21,6 @@ import { } from './utils/governance' import { advanceTime, getLatestBlockNumber } from '#/utils/time' import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { resetFork } from '#/utils/chain' import fs from 'fs' import { BigNumber } from 'ethers' import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' @@ -30,7 +29,7 @@ import { RTokenP1 } from '@typechain/RTokenP1' import { StRSRP1Votes } from '@typechain/StRSRP1Votes' import { IMain } from '@typechain/IMain' import { Whales, getWhalesFile } from '#/scripts/whalesConfig' -import { proposal_3_4_0_step_1, proposal_3_4_0_step_2 } from './proposals/3_4_0' +import { proposal_3_4_0_step_2 } from './proposals/3_4_0' import { validateSubgraphURL, Network } from '#/utils/fork' interface Params { @@ -362,19 +361,31 @@ const runCheck_mint = async ( console.log('Successfully minted RTokens') } -task('print-proposal') +task('save-proposal-pt-2') .addParam('rtoken', 'the address of the RToken being upgraded') .addParam('gov', 'the address of the OWNER of the RToken being upgraded') .addParam('time', 'the address of the timelock') .setAction(async (params, hre) => { - const proposal = await proposal_3_4_0_step_2(hre, params.rtoken, params.gov, params.time) + const chainId = await getChainId(hre) - console.log(`\nGenerating and proposing proposal...`) - const [tester] = await hre.ethers.getSigners() + // make sure config exists + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } - await hre.run('give-rsr', { address: tester.address }) - await stakeAndDelegateRsr(hre, params.rtoken, tester.address) + const spellAddr = + chainId == '1' + ? '0xb1df3a104d73ff86f9aaab60b491a5c44b090391' + : '0x1744c9933feb8e76563fce63d5c95a4e7f967c2a' + const proposal = await proposal_3_4_0_step_2( + hre, + params.rtoken, + params.gov, + params.time, + spellAddr + ) + console.log(`\nGenerating and hashing proposal...`) const governor = await hre.ethers.getContractAt('Governance', params.gov) const call = await governor.populateTransaction.propose( @@ -386,21 +397,23 @@ task('print-proposal') console.log(`Proposal Transaction:\n`, call.data) - const r = await governor.propose( + const proposalId = await governor.hashProposal( proposal.targets, proposal.values, proposal.calldatas, - proposal.description + hre.ethers.utils.keccak256(hre.ethers.utils.toUtf8Bytes(proposal.description)) ) - const resp = await r.wait() - console.log('\nSuccessfully proposed!') - console.log(`Proposal ID: ${resp.events![0].args!.proposalId}`) - - proposal.proposalId = resp.events![0].args!.proposalId.toString() + console.log(`Proposal ID: ${proposalId}`) + proposal.proposalId = proposalId.toString() + proposal.governor = params.gov + proposal.timelock = params.time + proposal.rtoken = params.rtoken fs.writeFileSync( `./tasks/validation/proposals/proposal-${proposal.proposalId}.json`, JSON.stringify(proposal, null, 2) ) + + console.log("Saved to proposals folder. Don't forget to run `proposal-validator`!") }) diff --git a/tasks/validation/utils/governance.ts b/tasks/validation/utils/governance.ts index c891b028f8..b49e548f79 100644 --- a/tasks/validation/utils/governance.ts +++ b/tasks/validation/utils/governance.ts @@ -291,8 +291,6 @@ export const proposeUpgrade = async ( console.log(`Proposal Transaction:\n`, call.data) - await validatePropState(await governor.state(proposalId), ProposalState.Active) - const r = await governor.propose( proposal.targets, proposal.values, @@ -302,6 +300,7 @@ export const proposeUpgrade = async ( const resp = await r.wait() proposalId = bn(resp.events![0].args!.proposalId) + await validatePropState(await governor.state(proposalId), ProposalState.Pending) console.log('\nSuccessfully proposed!') } else { console.log('\nAlready proposed!') From 2f0e735d8333ad01036f9637a7fe29008b2bc248 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 24 Jun 2024 16:06:07 -0400 Subject: [PATCH 416/450] add 1e9 precision to GnosisTrade price calculations --- contracts/plugins/trading/GnosisTrade.sol | 11 ++++++----- test/Revenues.test.ts | 2 +- test/scenario/BadCollateralPlugin.test.ts | 4 ++-- test/scenario/RevenueHiding.test.ts | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 4350ce1e8f..d6557b5991 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -47,7 +47,7 @@ contract GnosisTrade is ITrade, Versioned { uint256 public initBal; // {qSellTok}, this trade's balance of `sell` when init() was called uint192 public sellAmount; // {sellTok}, quantity of whole tokens being sold, != initBal uint48 public endTime; // timestamp after which this trade's auction can be settled - uint192 public worstCasePrice; // {qBuyTok/qSellTok}, the worst price we expect to get + uint192 public worstCasePrice; // D27{qBuyTok/qSellTok}, the worst price we expect to get // We expect Gnosis Auction either to meet or beat worstCasePrice, or to return the `sell` // tokens. If we actually *get* a worse clearing that worstCasePrice, we consider it an error in // our trading scheme and call broker.reportViolation() @@ -103,8 +103,9 @@ contract GnosisTrade is ITrade, Versioned { gnosis = gnosis_; endTime = uint48(block.timestamp) + batchAuctionLength; - // {qBuyTok/qSellTok} - worstCasePrice = divuu(req.minBuyAmount, req.sellAmount); // FLOOR + // D27{qBuyTok/qSellTok} + worstCasePrice = shiftl_toFix(req.minBuyAmount, 9).divu(req.sellAmount, FLOOR); + // cannot overflow; cannot round to 0 unless minBuyAmount is itself 0 // Downsize our sell amount to adjust for fee // {qSellTok} = {qSellTok} * {1} / {1} @@ -210,8 +211,8 @@ contract GnosisTrade is ITrade, Versioned { uint256 adjustedSoldAmt = Math.max(soldAmt, 1); uint256 adjustedBuyAmt = boughtAmt + 1; - // {buyTok/sellTok} - uint192 clearingPrice = divuu(adjustedBuyAmt, adjustedSoldAmt); // FLOOR + // D27{buyTok/sellTok} + uint192 clearingPrice = shiftl_toFix(adjustedBuyAmt, 9).divu(adjustedSoldAmt, FLOOR); if (clearingPrice.lt(worstCasePrice)) broker.reportViolation(); } } diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index e1a572d1e7..94ca1d4730 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1016,7 +1016,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Trade should have extremely nonzero worst-case price const trade = await getTrade(rTokenTrader, token0.address) expect(await trade.initBal()).to.equal(issueAmount) - expect(await trade.worstCasePrice()).to.be.gte(fp('0.775')) // both tokens have 18 decimals + expect(await trade.worstCasePrice()).to.be.gte(fp('0.775').mul(bn('1e9'))) // D27 precision }) it('Should claim COMP and handle revenue auction correctly - small amount processed in single auction', async () => { diff --git a/test/scenario/BadCollateralPlugin.test.ts b/test/scenario/BadCollateralPlugin.test.ts index 383589f1df..17a043be1c 100644 --- a/test/scenario/BadCollateralPlugin.test.ts +++ b/test/scenario/BadCollateralPlugin.test.ts @@ -222,8 +222,8 @@ describe(`Bad Collateral Plugin - P${IMPLEMENTATION}`, () => { const unslippedPrice = fp('1.1') const lowSellPrice = fp('1').sub(fp('1').mul(ORACLE_ERROR).div(fp('1'))) const highBuyPrice = fp('1').add(fp('1').mul(ORACLE_ERROR).div(fp('1'))) - const worstCasePrice = divCeil(unslippedPrice.mul(lowSellPrice), highBuyPrice).sub(1) - expect(await trade.worstCasePrice()).to.equal(worstCasePrice) // both tokens have 18 decimals + const worstCasePrice = divCeil(unslippedPrice.mul(bn('1e9')).mul(lowSellPrice), highBuyPrice) // D27 + expect(await trade.worstCasePrice()).to.be.closeTo(worstCasePrice, bn('1e9')) }) }) diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 2942ac99c3..fe079bd4f4 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -265,7 +265,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME const t = await getTrade(rsrTrader, cDAI.address) const sellAmt = await t.initBal() const minBuyAmt = await toMinBuyAmt(sellAmt, fp('2').div(50), fp('1')) - const expectedPrice = minBuyAmt.mul(fp('1')).div(sellAmt).mul(bn('1e10')) // shift 10 decimals for cDAI which has 8 + const expectedPrice = minBuyAmt.mul(fp('1')).div(sellAmt).mul(bn('1e10')).mul(bn('1e9')) // shift 10 decimals for cDAI; D27 precision // price should be within 1 part in a 1 trillion of our discounted rate expect(await t.worstCasePrice()).to.be.closeTo(expectedPrice, expectedPrice.div(bn('1e9'))) }) From 95986587040d70cbf26faad2b8a7985cd7ec3842 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:51:38 -0300 Subject: [PATCH 417/450] Usdm plugin and scripts (#1146) Co-authored-by: Taylor Brent --- .github/workflows/tests.yml | 2 +- common/configuration.ts | 7 + contracts/plugins/assets/mountain/README.md | 31 ++ .../assets/mountain/USDMCollateral.sol | 59 ++++ .../assets/mountain/vendor/IChronicle.sol | 59 ++++ .../42161-tmp-assets-collateral.json | 30 ++ scripts/addresses/42161-tmp-deployments.json | 38 +++ .../42161-tmp-assets-collateral.json | 8 +- scripts/deploy.ts | 1 + .../phase2-assets/collaterals/deploy_usdm.ts | 106 ++++++ .../collateral-plugins/verify_usdm.ts | 60 ++++ scripts/verify_etherscan.ts | 3 +- test/plugins/OracleDeprecation.test.ts | 22 +- .../mountain/USDMCollateral.test.ts | 322 ++++++++++++++++++ .../mountain/constants.ts | 18 + .../individual-collateral/mountain/helpers.ts | 30 ++ 16 files changed, 790 insertions(+), 6 deletions(-) create mode 100644 contracts/plugins/assets/mountain/README.md create mode 100644 contracts/plugins/assets/mountain/USDMCollateral.sol create mode 100644 contracts/plugins/assets/mountain/vendor/IChronicle.sol create mode 100644 scripts/addresses/42161-tmp-assets-collateral.json create mode 100644 scripts/addresses/42161-tmp-deployments.json create mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_usdm.ts create mode 100644 scripts/verification/collateral-plugins/verify_usdm.ts create mode 100644 test/plugins/individual-collateral/mountain/USDMCollateral.test.ts create mode 100644 test/plugins/individual-collateral/mountain/constants.ts create mode 100644 test/plugins/individual-collateral/mountain/helpers.ts diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cb4093c2fb..a33308486e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -156,7 +156,7 @@ jobs: restore-keys: | hardhat-network-fork-${{ runner.os }}- hardhat-network-fork- - - run: npx hardhat test ./test/plugins/individual-collateral/{aave-v3,compoundv3,curve/cvx}/*.test.ts + - run: npx hardhat test ./test/plugins/individual-collateral/{aave-v3,compoundv3,curve/cvx,mountain}/*.test.ts env: NODE_OPTIONS: '--max-old-space-size=8192' TS_NODE_SKIP_IGNORE: true diff --git a/common/configuration.ts b/common/configuration.ts index 34bd87fbd4..febedecbe3 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -104,6 +104,10 @@ export interface ITokens { bbUSDT?: string steakPYUSD?: string Re7WETH?: string + + // Mountain + USDM?: string + wUSDM?: string } export type ITokensKeys = Array @@ -541,6 +545,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { saArbUSDCn: '', // TODO our wrapper. remove from deployment script after placing here aArbUSDT: '0x6ab707aca953edaefbc4fd23ba73294241490620', saArbUSDT: '', // TODO our wrapper. remove from deployment script after placing here + USDM: '0x59d9356e565ab3a36dd77763fc0d87feaf85508c', + wUSDM: '0x57f5e098cad7a3d1eed53991d4d66c45c9af7812', }, chainlinkFeeds: { ARB: '0xb2A824043730FE05F3DA2efaFa1CBbe83fa548D6', @@ -550,6 +556,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { USDT: '0x3f3f5dF88dC9F13eac63DF89EC16ef6e7E25DdE7', RSR: '0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488', crvUSD: '0x0a32255dd4BB6177C994bAAc73E0606fDD568f66', + wUSDM: '0xdC6720c996Fad27256c7fd6E0a271e2A4687eF18', }, GNOSIS_EASY_AUCTION: '0xcD033976a011F41D2AB6ef47984041568F818E73', // our deployment COMET_REWARDS: '0x88730d254A2f7e6AC8388c3198aFd694bA9f7fae', diff --git a/contracts/plugins/assets/mountain/README.md b/contracts/plugins/assets/mountain/README.md new file mode 100644 index 0000000000..03ebfc35f0 --- /dev/null +++ b/contracts/plugins/assets/mountain/README.md @@ -0,0 +1,31 @@ +# Mountain USDM Collateral Plugin + +## Summary + +This plugin allows `wUSDM` holders to use their tokens as collateral in the Reserve Protocol. + +`wUSDM` is an unowned, immutable, ERC4626-wrapper around the USDM token. + +Since it is ERC4626, the redeemable USDM amount can be obtained by dividing `wUSDM.totalAssets()` by `wUSDM.totalSupply()`. + +`USDM` contract: + +`wUSDM` contract: + +## Oracles - Important! + +A Chronicle oracle is available for `wUSDM`, Even though Chronicle oracles provide a compatible interface for reading prices, they require the reading contract to be **whitelisted** by Chronicle. It is important to provide the Chronicle team the collateral plugin address as soon as it is deployed to the network so they can whitelist it. This has to be done **before** the plugin is used by any RToken. + +## Implementation + +### Units + +| tok | ref | target | UoA | +| ----- | ---- | ------ | --- | +| wUSDM | USDM | USD | USD | + +### Functions + +#### refPerTok {ref/tok} + +`return shiftl_toFix(erc4626.convertToAssets(oneShare), -refDecimals)` diff --git a/contracts/plugins/assets/mountain/USDMCollateral.sol b/contracts/plugins/assets/mountain/USDMCollateral.sol new file mode 100644 index 0000000000..d2f318c751 --- /dev/null +++ b/contracts/plugins/assets/mountain/USDMCollateral.sol @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "../../../libraries/Fixed.sol"; +import "../ERC4626FiatCollateral.sol"; + +/** + * @title USDM Collateral + * @notice Collateral plugin for USDM (Mountain Protocol) + * tok = wUSDM (ERC4626 vault) + * ref = USDM + * tar = USD + * UoA = USD + * + * Note: Uses a Chronicle Oracle, which requires the plugin address to be whitelisted + */ + +contract USDMCollateral is ERC4626FiatCollateral { + using OracleLib for AggregatorV3Interface; + using FixLib for uint192; + + // solhint-disable no-empty-blocks + + /// @param config.chainlinkFeed - {UoA/tok} - Chronicle oracle - Requires whitelisting! + constructor(CollateralConfig memory config, uint192 revenueHiding) + ERC4626FiatCollateral(config, revenueHiding) + { + require(config.defaultThreshold != 0, "defaultThreshold zero"); + } + + /// Can revert, used by other contract functions in order to catch errors + /// Should not return FIX_MAX for low + /// Should only return FIX_MAX for high if low is 0 + /// @return low {UoA/tok} The low price estimate + /// @return high {UoA/tok} The high price estimate + /// @return pegPrice {target/ref} The actual price observed in the peg + function tryPrice() + external + view + virtual + override + returns ( + uint192 low, + uint192 high, + uint192 pegPrice + ) + { + // {UoA/tok} + uint192 p = chainlinkFeed.price(oracleTimeout); + uint192 err = p.mul(oracleError, CEIL); + + low = p - err; + high = p + err; + // assert(low <= high); obviously true just by inspection + + // {target/ref} = {UoA/ref} = {UoA/tok} / {ref/tok} + pegPrice = p.div(underlyingRefPerTok()); + } +} diff --git a/contracts/plugins/assets/mountain/vendor/IChronicle.sol b/contracts/plugins/assets/mountain/vendor/IChronicle.sol new file mode 100644 index 0000000000..66989bd7b6 --- /dev/null +++ b/contracts/plugins/assets/mountain/vendor/IChronicle.sol @@ -0,0 +1,59 @@ +// SPDX-License-Identifier: MIT +pragma solidity ^0.8.19; + +/// Toll (whitelist) +interface IToll { + /// @notice Thrown by protected function if caller not tolled. + /// @param caller The caller's address. + error NotTolled(address caller); + + /// @notice Emitted when toll granted to address. + /// @param caller The caller's address. + /// @param who The address toll got granted to. + event TollGranted(address indexed caller, address indexed who); + + /// @notice Grants address `who` toll. + /// @dev Only callable by auth'ed address. + /// @param who The address to grant toll. + function kiss(address who) external; + + /// @notice Renounces address `who`'s toll. + /// @dev Only callable by auth'ed address. + /// @param who The address to renounce toll. + function diss(address who) external; + + /// @notice Returns whether address `who` is tolled. + /// @param who The address to check. + /// @return True if `who` is tolled, false otherwise. + function tolled(address who) external view returns (bool); +} + +/** + * @title IChronicle + * + * @notice Interface for Chronicle Protocol's oracle products + */ +interface IChronicle is IToll { + /// @notice Returns the oracle's current value. + /// @dev Reverts if no value set. + /// @return value The oracle's current value. + function read() external view returns (uint256 value); + + /// @notice Returns the oracle's current value and its age. + /// @dev Reverts if no value set. + /// @return value The oracle's current value. + /// @return age The value's age. + function readWithAge() external view returns (uint256 value, uint256 age); + + /// Chainlink compatibility + function latestRoundData() + external + view + returns ( + uint80 roundId, + int256 answer, + uint256 startedAt, + uint256 updatedAt, + uint80 answeredInRound + ); +} diff --git a/scripts/addresses/42161-tmp-assets-collateral.json b/scripts/addresses/42161-tmp-assets-collateral.json new file mode 100644 index 0000000000..2c8f59431c --- /dev/null +++ b/scripts/addresses/42161-tmp-assets-collateral.json @@ -0,0 +1,30 @@ +{ + "assets": { + "COMP": "0x6882560A919714A742afd2A2a0af6b4D8d20cF22", + "ARB": "0x21fBa52dA03e1F964fa521532f8B8951fC212055" + }, + "collateral": { + "DAI": "0x6FE56A3EEa3fEc93601a94D26bEa1876bD48192F", + "USDC": "0xa96aE05dFa869F4FCC4142E8D4E4F2706FEe2B57", + "USDT": "0x3Ac8F000D75a2EA4a9a36c6844410926bc0c32f7", + "saArbUSDCn": "0x7be9Bc50734820516693A376238Cc6Bf029BA682", + "saArbUSDT": "0x529D7e23Ce63efdcE41dA2a41296Fd7399157F5b", + "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6", + "cvxCrvUSDUSDT": "0xf729b03AcbD60c8aF9B449d51444445815a56d0e", + "cvxCrvUSDUSDC": "0x57547D29cf0D5B4d31c6c71Ec73b3A8c8416ade6", + "wUSDM": "0xA185a9fd314b61f33F740760a59cc46b31297e30" + }, + "erc20s": { + "COMP": "0x354A6dA3fcde098F8389cad84b0182725c6C91dE", + "DAI": "0xDA10009cBd5D07dd0CeCc66161FC93D7c9000da1", + "USDC": "0xaf88d065e77c8cc2239327c5edb3a432268e5831", + "USDT": "0xfd086bc7cd5c481dcc9c85ebe478a1c0b69fcbb9", + "saArbUSDCn": "0x030cDeCBDcA6A34e8De3f49d1798d5f70E3a3414", + "saArbUSDT": "0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128", + "cUSDCv3": "0xd54804250E9C561AEa9Dee34e9cf2342f767ACC5", + "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548", + "cvxCrvUSDUSDT": "0xf74d4C9b0F49fb70D8Ff6706ddF39e3a16D61E67", + "cvxCrvUSDUSDC": "0xBFEE9F3E015adC754066424AEd535313dc764116", + "wUSDM": "0x57f5e098cad7a3d1eed53991d4d66c45c9af7812" + } +} \ No newline at end of file diff --git a/scripts/addresses/42161-tmp-deployments.json b/scripts/addresses/42161-tmp-deployments.json new file mode 100644 index 0000000000..7c70ad0ba6 --- /dev/null +++ b/scripts/addresses/42161-tmp-deployments.json @@ -0,0 +1,38 @@ +{ + "prerequisites": { + "RSR": "0xCa5Ca9083702c56b481D1eec86F1776FDbd2e594", + "RSR_FEED": "0xcfF9349ec6d027f20fC9360117fef4a1Ad38B488", + "GNOSIS_EASY_AUCTION": "0xcD033976a011F41D2AB6ef47984041568F818E73" + }, + "tradingLib": "0x348644F24FA34c40a8E3C4Cf9aF14f8a96aD63fC", + "cvxMiningLib": "", + "facade": "0x387A0C36681A22F728ab54426356F4CAa6bB48a9", + "facets": { + "actFacet": "0xE774CCF1431c3DEe7Fa4c20f67534b61289CAa45", + "readFacet": "0x15175d35F3d88548B49600B4ee8067253A2e4e66" + }, + "facadeWriteLib": "0x042D85e9eb1F4372ffA362240E0630229CaA1904", + "basketLib": "0x53f1Df4E5591Ae35Bf738742981669c3767241FA", + "facadeWrite": "0xe2B652E538543d02f985A5E422645A704633956d", + "deployer": "0xfd7eb6B208E1fa7B14E26A1fb10fFC17Cf695d68", + "rsrAsset": "0x7182e3A6E29936C8B14c4fa6f63a62D0b1D0f767", + "implementations": { + "main": "0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461", + "trading": { + "gnosisTrade": "0xD42620d04fCe65B1F5E8Facc894a2e34D764FEc9", + "dutchTrade": "0x8b4374005291B8FCD14C4E947604b2FB3C660A73" + }, + "components": { + "assetRegistry": "0xA9df960Af018178C0138CD5780c768A0a0A7e61f", + "backingManager": "0xD85Fac03804a3e44D29c494f3761D11A2262cBBe", + "basketHandler": "0x157b0C032192F5714BD68bf33dF96C122EA5e1d6", + "broker": "0xa24E0D3E77Ec4849A288C72F9d9bC4dF84B26558", + "distributor": "0x5Ef74A083Ac932b5f050bf41cDe1F67c659b4b88", + "furnace": "0x8A11D590B32186E1236B5E75F2d8D72c280dc880", + "rsrTrader": "0xaeCa35F0cB9d12D68adC4d734D4383593F109654", + "rTokenTrader": "0xaeCa35F0cB9d12D68adC4d734D4383593F109654", + "rToken": "0xC8f487B34251Eb76761168B70Dc10fA38B0Bd90b", + "stRSR": "0x437b525F96A2Da0A4b165efe27c61bea5c8d3CD4" + } + } +} diff --git a/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json index dd71b7f889..2c8f59431c 100644 --- a/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json +++ b/scripts/addresses/arbitrum-3.4.0/42161-tmp-assets-collateral.json @@ -11,7 +11,8 @@ "saArbUSDT": "0x529D7e23Ce63efdcE41dA2a41296Fd7399157F5b", "cUSDCv3": "0x8a5DfEa5cdA35AB374ac558951A3dF1437A6FcA6", "cvxCrvUSDUSDT": "0xf729b03AcbD60c8aF9B449d51444445815a56d0e", - "cvxCrvUSDUSDC": "0x57547D29cf0D5B4d31c6c71Ec73b3A8c8416ade6" + "cvxCrvUSDUSDC": "0x57547D29cf0D5B4d31c6c71Ec73b3A8c8416ade6", + "wUSDM": "0xA185a9fd314b61f33F740760a59cc46b31297e30" }, "erc20s": { "COMP": "0x354A6dA3fcde098F8389cad84b0182725c6C91dE", @@ -23,6 +24,7 @@ "cUSDCv3": "0xd54804250E9C561AEa9Dee34e9cf2342f767ACC5", "ARB": "0x912ce59144191c1204e64559fe8253a0e49e6548", "cvxCrvUSDUSDT": "0xf74d4C9b0F49fb70D8Ff6706ddF39e3a16D61E67", - "cvxCrvUSDUSDC": "0xBFEE9F3E015adC754066424AEd535313dc764116" + "cvxCrvUSDUSDC": "0xBFEE9F3E015adC754066424AEd535313dc764116", + "wUSDM": "0x57f5e098cad7a3d1eed53991d4d66c45c9af7812" } -} +} \ No newline at end of file diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 07e0b496f2..65f82bd7c0 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -110,6 +110,7 @@ async function main() { 'phase2-assets/collaterals/deploy_ctokenv3_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_crvusd_usdc_collateral.ts', 'phase2-assets/collaterals/deploy_convex_crvusd_usdt_collateral.ts', + 'phase2-assets/collaterals/deploy_usdm.ts', 'phase2-assets/assets/deploy_arb.ts' ) } diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_usdm.ts b/scripts/deployment/phase2-assets/collaterals/deploy_usdm.ts new file mode 100644 index 0000000000..a485083117 --- /dev/null +++ b/scripts/deployment/phase2-assets/collaterals/deploy_usdm.ts @@ -0,0 +1,106 @@ +import fs from 'fs' +import hre from 'hardhat' +import { getChainId } from '../../../../common/blockchain-utils' +import { arbitrumL2Chains, networkConfig } from '../../../../common/configuration' +import { fp } from '../../../../common/numbers' +import { expect } from 'chai' +import { CollateralStatus } from '../../../../common/constants' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, + getDeploymentFilename, + fileExists, +} from '../../common' +import { USDMCollateral } from '../../../../typechain' +import { ContractFactory } from 'ethers' +import { + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + PRICE_TIMEOUT, + ORACLE_TIMEOUT, + ORACLE_ERROR, +} from '../../../../test/plugins/individual-collateral/mountain/constants' + +async function main() { + // ==== Read Configuration ==== + const [deployer] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + + console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) + with burner account: ${deployer.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + // Get phase1 deployment + const phase1File = getDeploymentFilename(chainId) + if (!fileExists(phase1File)) { + throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) + } + // Check previous step completed + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) + + const deployedCollateral: string[] = [] + + /******** Deploy USDM Collateral - wUSDM **************************/ + let collateral: USDMCollateral + + // Only on Arbitrum for now + if (arbitrumL2Chains.includes(hre.network.name)) { + const USDMCollateralFactory: ContractFactory = await hre.ethers.getContractFactory( + 'USDMCollateral' + ) + + collateral = await USDMCollateralFactory.connect(deployer).deploy( + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.wUSDM, + oracleError: ORACLE_ERROR.toString(), // 1% + erc20: networkConfig[chainId].tokens.wUSDM, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: ORACLE_TIMEOUT.toString(), // 24 hr + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD.toString(), + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), // 24h + }, + fp('1e-6') + ) + } else { + throw new Error(`Unsupported chainId: ${chainId}`) + } + + await collateral.deployed() + + console.log( + `Deployed USDM (wUSDM) Collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + // await (await collateral.refresh()).wait() + // expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + console.log( + '🚨 The wUSDM collateral requires chronicle to whitelist the collateral plugin after deployment 🚨' + ) + + console.log( + '🚨 After that, we need to return to this plugin and refresh() it and confirm it is SOUND 🚨' + ) + + assetCollDeployments.collateral.wUSDM = collateral.address + assetCollDeployments.erc20s.wUSDM = networkConfig[chainId].tokens.wUSDM + deployedCollateral.push(collateral.address.toString()) + + fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) + + console.log(`Deployed collateral to ${hre.network.name} (${chainId}) + New deployments: ${deployedCollateral} + Deployment file: ${assetCollDeploymentFilename}`) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verification/collateral-plugins/verify_usdm.ts b/scripts/verification/collateral-plugins/verify_usdm.ts new file mode 100644 index 0000000000..f67ec64603 --- /dev/null +++ b/scripts/verification/collateral-plugins/verify_usdm.ts @@ -0,0 +1,60 @@ +import hre from 'hardhat' +import { getChainId } from '../../../common/blockchain-utils' +import { developmentChains, networkConfig } from '../../../common/configuration' +import { fp } from '../../../common/numbers' +import { + getDeploymentFile, + getAssetCollDeploymentFilename, + IAssetCollDeployments, +} from '../../deployment/common' +import { verifyContract } from '../../deployment/utils' +import { + PRICE_TIMEOUT, + ORACLE_ERROR, + ORACLE_TIMEOUT, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, +} from '../../../test/plugins/individual-collateral/mountain/constants' + +let deployments: IAssetCollDeployments + +async function main() { + // ********** Read config ********** + const chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + if (developmentChains.includes(hre.network.name)) { + throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) + } + + const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) + deployments = getDeploymentFile(assetCollDeploymentFilename) + + /******** Verify wUSDM COllateral **************************/ + await verifyContract( + chainId, + deployments.collateral.wUSDM, + [ + { + priceTimeout: PRICE_TIMEOUT.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.wUSDM, + oracleError: ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.wUSDM, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: DEFAULT_THRESHOLD.toString(), + delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), + }, + fp('1e-6'), + ], + 'contracts/plugins/assets/mountain/USDMCollateral.sol:USDMCollateral' + ) +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index a5ca75c15b..811916c60c 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -93,7 +93,8 @@ async function main() { 'collateral-plugins/verify_aave_v3_usdc.ts', 'collateral-plugins/verify_cusdcv3.ts', 'collateral-plugins/verify_convex_crvusd_usdc.ts', - 'collateral-plugins/verify_convex_crvusd_usdt.ts' + 'collateral-plugins/verify_convex_crvusd_usdt.ts', + 'collateral-plugins/verify_usdm.ts' ) } diff --git a/test/plugins/OracleDeprecation.test.ts b/test/plugins/OracleDeprecation.test.ts index d76d16df0e..d3cb321335 100644 --- a/test/plugins/OracleDeprecation.test.ts +++ b/test/plugins/OracleDeprecation.test.ts @@ -44,7 +44,11 @@ describe('Chainlink Oracle', () => { await rToken.connect(wallet).issue(amt) }) - describe('Chainlink deprecates an asset', () => { + // Expected behavior on deprecation + // - Chainlink: latestRoundData() reverts and aggregator == address(0) + // - Redstone: latestRoundData() does not revert, only signal is outdated price + // - Chronicle: latestRoundData() does not revert, but price is set to 0 + describe('Chainlink/Chronicle deprecates an asset', () => { it('Refresh should mark the asset as IFFY', async () => { const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') const [, aUSDCCollateral] = fixture.bySymbol.ausdc @@ -60,5 +64,21 @@ describe('Chainlink Oracle', () => { 'StalePrice' ) }) + + it('Price = 0 should mark the asset as IFFY (Chronicle)', async () => { + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const [, aUSDCCollateral] = fixture.bySymbol.ausdc + const chainLinkOracle = MockV3AggregatorFactory.attach(await aUSDCCollateral.chainlinkFeed()) + await aUSDCCollateral.refresh() + await aUSDCCollateral.tryPrice() + expect(await aUSDCCollateral.status()).to.equal(0) + await chainLinkOracle.updateAnswer(0) + await aUSDCCollateral.refresh() + expect(await aUSDCCollateral.status()).to.equal(1) + await expect(aUSDCCollateral.tryPrice()).to.be.revertedWithCustomError( + aUSDCCollateral, + 'InvalidPrice' + ) + }) }) }) diff --git a/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts b/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts new file mode 100644 index 0000000000..49205edd0e --- /dev/null +++ b/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts @@ -0,0 +1,322 @@ +import collateralTests from '../collateralTests' +import { CollateralFixtureContext, CollateralOpts, MintCollateralFunc } from '../pluginTestTypes' +import { resetFork, mintWUSDM, mintUSDM } from './helpers' +import { ethers } from 'hardhat' +import { expect } from 'chai' +import { ContractFactory, BigNumberish, BigNumber } from 'ethers' +import { + ERC20Mock, + IERC20Metadata, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../typechain' +import { expectUnpriced, pushOracleForward } from '../../../utils/oracles' +import { bn, fp, toBNDecimals } from '../../../../common/numbers' +import { + BN_SCALE_FACTOR, + ONE_ADDRESS, + ZERO_ADDRESS, + CollateralStatus, +} from '../../../../common/constants' +import { whileImpersonating } from '../../../utils/impersonation' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + ARB_USDM, + ARB_WUSDM, + ARB_WUSDM_USD_PRICE_FEED, + ORACLE_ERROR, + ORACLE_TIMEOUT, + PRICE_TIMEOUT, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + ARB_CHRONICLE_FEED_AUTH, +} from './constants' + +/* + Define deployment functions +*/ + +export const defaultUSDMCollateralOpts: CollateralOpts = { + erc20: ARB_WUSDM, + targetName: ethers.utils.formatBytes32String('USD'), + rewardERC20: ZERO_ADDRESS, + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: ARB_WUSDM_USD_PRICE_FEED, + oracleTimeout: ORACLE_TIMEOUT, + oracleError: ORACLE_ERROR, + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: fp('0'), +} + +export const deployCollateral = async (opts: CollateralOpts = {}): Promise => { + opts = { ...defaultUSDMCollateralOpts, ...opts } + + const USDMCollateralFactory: ContractFactory = await ethers.getContractFactory('USDMCollateral') + const collateral = await USDMCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { gasLimit: 2000000000 } + ) + await collateral.deployed() + + // It might revert if using real Chronicle oracle and not whitelisted (skip refresh()) + try { + // Push forward feed + await pushOracleForward(opts.chainlinkFeed!) + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + } catch { + expect(await collateral.chainlinkFeed()).to.equal(ARB_WUSDM_USD_PRICE_FEED) + } + + return collateral +} + +const chainlinkDefaultAnswer = bn('1.03e8') + +type Fixture = () => Promise + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultUSDMCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + const chainlinkFeed = ( + await MockV3AggregatorFactory.deploy(8, chainlinkDefaultAnswer) + ) + collateralOpts.chainlinkFeed = chainlinkFeed.address + + const wusdm = (await ethers.getContractAt('IERC20Metadata', ARB_WUSDM)) as IERC20Metadata + const rewardToken = (await ethers.getContractAt('ERC20Mock', ZERO_ADDRESS)) as ERC20Mock + const collateral = await deployCollateral(collateralOpts) + const tok = await ethers.getContractAt('IERC20Metadata', await collateral.erc20()) + + return { + alice, + collateral, + chainlinkFeed, + tok, + wusdm, + rewardToken, + } + } + + return makeCollateralFixtureContext +} + +const mintCollateralTo: MintCollateralFunc = async ( + ctx: CollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintWUSDM(ctx.tok, user, amount, recipient) +} + +const reduceTargetPerRef = async (ctx: CollateralFixtureContext, pctDecrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +const increaseTargetPerRef = async (ctx: CollateralFixtureContext, pctIncrease: BigNumberish) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +// prettier-ignore +const reduceRefPerTok = async ( + ctx: CollateralFixtureContext, + pctDecrease: BigNumberish +) => { + const usdm = await ethers.getContractAt("IERC20Metadata", ARB_USDM) + const currentBal = await usdm.balanceOf(ctx.tok.address) + const removeBal = currentBal.mul(pctDecrease).div(100) + await whileImpersonating(ctx.tok.address, async (wusdmSigner) => { + await usdm.connect(wusdmSigner).transfer(ONE_ADDRESS, removeBal) + }) + + // push chainlink oracle forward so that tryPrice() still works and keeps peg + const latestRoundData = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = latestRoundData.answer.sub(latestRoundData.answer.mul(pctDecrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +// prettier-ignore +const increaseRefPerTok = async ( + ctx: CollateralFixtureContext, + pctIncrease: BigNumberish + +) => { + + const usdm = await ethers.getContractAt("IERC20Metadata", ARB_USDM) + + const currentBal = await usdm.balanceOf(ctx.tok.address) + const addBal = currentBal.mul(pctIncrease).div(100) + await mintUSDM(usdm, ctx.alice!, addBal, ctx.tok.address) + + // push chainlink oracle forward so that tryPrice() still works and keeps peg + const latestRoundData = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = latestRoundData.answer.add(latestRoundData.answer.mul(pctIncrease).div(100)) + await ctx.chainlinkFeed.updateAnswer(nextAnswer) +} + +const getExpectedPrice = async (ctx: CollateralFixtureContext): Promise => { + const clData = await ctx.chainlinkFeed.latestRoundData() + const clDecimals = await ctx.chainlinkFeed.decimals() + + return clData.answer.mul(bn(10).pow(18 - clDecimals)) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => { + it('does revenue hiding correctly', async () => { + const [, alice] = await ethers.getSigners() + const tempCtx = await makeCollateralFixtureContext(alice, { + erc20: ARB_WUSDM, + revenueHiding: fp('0.01'), + })() + + // Set correct price to maintain peg + const newPrice = fp('1') + .mul(await tempCtx.collateral.underlyingRefPerTok()) + .div(BN_SCALE_FACTOR) + await tempCtx.chainlinkFeed.updateAnswer(toBNDecimals(newPrice, 8)) + await tempCtx.collateral.refresh() + expect(await tempCtx.collateral.status()).to.equal(CollateralStatus.SOUND) + + // Should remain SOUND after a 1% decrease + let refPerTok = await tempCtx.collateral.refPerTok() + await reduceRefPerTok(tempCtx, 1) + await tempCtx.collateral.refresh() + expect(await tempCtx.collateral.status()).to.equal(CollateralStatus.SOUND) + + // refPerTok should be unchanged + expect(await tempCtx.collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand + + // Should become DISABLED if drops another 1% + refPerTok = await tempCtx.collateral.refPerTok() + await reduceRefPerTok(tempCtx, bn(1)) + await tempCtx.collateral.refresh() + expect(await tempCtx.collateral.status()).to.equal(CollateralStatus.DISABLED) + + // refPerTok should have fallen 1% + refPerTok = refPerTok.sub(refPerTok.div(100)) + expect(await tempCtx.collateral.refPerTok()).to.be.closeTo(refPerTok, refPerTok.div(bn('1e3'))) // within 1-part-in-1-thousand + }) + + it('whitelisted Chronicle oracle works correctly', async () => { + await resetFork() // need fresh refPerTok() to maintain peg + + const collateral = await deployCollateral(defaultUSDMCollateralOpts) // using real Chronicle oracle + const chronicleFeed = await ethers.getContractAt('IChronicle', await collateral.chainlinkFeed()) + + // Oracle reverts when attempting to read price from Plugin (specific error - non-empty) + await whileImpersonating(collateral.address, async (pluginSigner) => { + await expect(chronicleFeed.connect(pluginSigner).read()).to.be.revertedWithCustomError( + chronicleFeed, + 'NotTolled' + ) + await expect( + chronicleFeed.connect(pluginSigner).latestRoundData() + ).to.be.revertedWithCustomError(chronicleFeed, 'NotTolled') + }) + + // Plugin is unpriced if not whitelisted + await expectUnpriced(collateral.address) + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + + // Refresh sets collateral to IFFY if not whitelisted + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + + // Whitelist plugin in Chronicle oracle + await whileImpersonating(ARB_CHRONICLE_FEED_AUTH, async (authSigner) => { + await expect(chronicleFeed.connect(authSigner).kiss(collateral.address)).to.emit( + chronicleFeed, + 'TollGranted' + ) + }) + + // Plugin can now read + await whileImpersonating(collateral.address, async (pluginSigner) => { + await expect(chronicleFeed.connect(pluginSigner).read()).to.not.be.reverted + await expect(chronicleFeed.connect(pluginSigner).latestRoundData()).to.not.be.reverted + }) + + // Should have a price now + const [low, high] = await collateral.price() + expect(low).to.be.closeTo(fp('1.02'), fp('0.01')) // close to $1.03 (chainlink answer in this block) + expect(high).to.be.closeTo(fp('1.04'), fp('0.01')) + expect(high).to.be.gt(low) + + // Refresh sets it back to SOUND now that it's whitelisted + await collateral.refresh() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) + }) +} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const beforeEachRewardsTest = async () => {} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + beforeEachRewardsTest, + makeCollateralFixtureContext, + mintCollateralTo, + reduceTargetPerRef, + increaseTargetPerRef, + reduceRefPerTok, + increaseRefPerTok, + getExpectedPrice, + itClaimsRewards: it.skip, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itChecksPriceChanges: it, + itChecksNonZeroDefaultThreshold: it, + itHasRevenueHiding: it.skip, // implemented in this file + collateralName: 'USDM Collateral', + chainlinkDefaultAnswer, + itIsPricedByPeg: true, + resetFork, + targetNetwork: 'arbitrum', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/mountain/constants.ts b/test/plugins/individual-collateral/mountain/constants.ts new file mode 100644 index 0000000000..240a6414f9 --- /dev/null +++ b/test/plugins/individual-collateral/mountain/constants.ts @@ -0,0 +1,18 @@ +import { bn, fp } from '../../../../common/numbers' +import { networkConfig } from '../../../../common/configuration' + +// Mainnet Addresses +export const ARB_USDM = networkConfig['42161'].tokens.USDM as string +export const ARB_WUSDM = networkConfig['42161'].tokens.wUSDM as string +export const ARB_WUSDM_USD_PRICE_FEED = networkConfig['42161'].chainlinkFeeds.wUSDM as string +export const ARB_CHRONICLE_FEED_AUTH = '0x39aBD7819E5632Fa06D2ECBba45Dca5c90687EE3' +export const ARB_WUSDM_HOLDER = '0x8c60248a6ca9b6c5620279d40c12eb81e03cd667' +export const ARB_USDM_HOLDER = '0x4bd135524897333bec344e50ddd85126554e58b4' +export const PRICE_TIMEOUT = bn('604800') // 1 week +export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds +export const ORACLE_ERROR = fp('0.01') // 1% +export const DEFAULT_THRESHOLD = ORACLE_ERROR.add(fp('0.01')) // 1% + ORACLE_ERROR +export const DELAY_UNTIL_DEFAULT = bn(86400) +export const MAX_TRADE_VOL = bn(1000) + +export const FORK_BLOCK_ARBITRUM = 213549300 diff --git a/test/plugins/individual-collateral/mountain/helpers.ts b/test/plugins/individual-collateral/mountain/helpers.ts new file mode 100644 index 0000000000..bb08c8ae38 --- /dev/null +++ b/test/plugins/individual-collateral/mountain/helpers.ts @@ -0,0 +1,30 @@ +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { IERC20Metadata } from '../../../../typechain' +import { whileImpersonating } from '../../../utils/impersonation' +import { BigNumberish } from 'ethers' +import { FORK_BLOCK_ARBITRUM, ARB_WUSDM_HOLDER, ARB_USDM_HOLDER } from './constants' +import { getResetFork } from '../helpers' + +export const mintWUSDM = async ( + wusdm: IERC20Metadata, + account: SignerWithAddress, + amount: BigNumberish, + recipient: string +) => { + await whileImpersonating(ARB_WUSDM_HOLDER, async (whale) => { + await wusdm.connect(whale).transfer(recipient, amount) + }) +} + +export const mintUSDM = async ( + usdm: IERC20Metadata, + account: SignerWithAddress, + amount: BigNumberish, + recipient: string +) => { + await whileImpersonating(ARB_USDM_HOLDER, async (whale) => { + await usdm.connect(whale).transfer(recipient, amount) + }) +} + +export const resetFork = getResetFork(FORK_BLOCK_ARBITRUM) From 1a434f3d232a2f4beb3d6062dbe865a638f09b3c Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:42:39 -0300 Subject: [PATCH 418/450] Deployed addresses - Docs (#1160) --- docs/deployed-addresses/1-assets-3.3.0.md | 23 +++++++ docs/deployed-addresses/1-assets-3.4.0.md | 66 +++++++++++++++++++ docs/deployed-addresses/1-components-3.3.0.md | 14 ++++ docs/deployed-addresses/1-components-3.4.0.md | 31 +++++++++ docs/deployed-addresses/1-eUSD.md | 26 ++++---- docs/deployed-addresses/1-hyUSD.md | 26 ++++---- docs/deployed-addresses/8453-assets-3.3.0.md | 13 ++++ docs/deployed-addresses/8453-assets-3.4.0.md | 19 ++++++ docs/deployed-addresses/8453-bsdETH.md | 24 +++++++ .../8453-components-3.3.0.md | 9 +++ .../8453-components-3.4.0.md | 31 +++++++++ docs/deployed-addresses/8453-hyUSD.md | 26 ++++---- docs/deployed-addresses/index.json | 19 ++++-- scripts/compile-addresses.sh | 15 +++-- 14 files changed, 294 insertions(+), 48 deletions(-) create mode 100644 docs/deployed-addresses/1-assets-3.3.0.md create mode 100644 docs/deployed-addresses/1-assets-3.4.0.md create mode 100644 docs/deployed-addresses/1-components-3.3.0.md create mode 100644 docs/deployed-addresses/1-components-3.4.0.md create mode 100644 docs/deployed-addresses/8453-assets-3.3.0.md create mode 100644 docs/deployed-addresses/8453-assets-3.4.0.md create mode 100644 docs/deployed-addresses/8453-bsdETH.md create mode 100644 docs/deployed-addresses/8453-components-3.3.0.md create mode 100644 docs/deployed-addresses/8453-components-3.4.0.md diff --git a/docs/deployed-addresses/1-assets-3.3.0.md b/docs/deployed-addresses/1-assets-3.3.0.md new file mode 100644 index 0000000000..207b0b7be9 --- /dev/null +++ b/docs/deployed-addresses/1-assets-3.3.0.md @@ -0,0 +1,23 @@ +# Assets (Mainnet 3.3.0) +## Assets +| Contract | Address | +| --- | --- | +| COMP | [0x29dc6F79750020d77c6391629101BDC0F0D16ECB](https://etherscan.io/address/0x29dc6F79750020d77c6391629101BDC0F0D16ECB) | +| CRV | [0x9257a1307a72603B7916d0c97fCABC6351C3482E](https://etherscan.io/address/0x9257a1307a72603B7916d0c97fCABC6351C3482E) | +| CVX | [0x4dA79d89482737381E90d2A7005b21cd11eAeE5C](https://etherscan.io/address/0x4dA79d89482737381E90d2A7005b21cd11eAeE5C) | + +## Collaterals +| Contract | Address | +| --- | --- | +| aUSDC | [0x6E14943224d6E4F7607943512ba17DbBA9524B8e](https://etherscan.io/address/0x6E14943224d6E4F7607943512ba17DbBA9524B8e) | +| aUSDT | [0x8AD3055286f4E59B399616Bd6BEfE24F64573928](https://etherscan.io/address/0x8AD3055286f4E59B399616Bd6BEfE24F64573928) | +| wstETH | [0x3519918E2918b59f3b29bed16dC77174DEC6707b](https://etherscan.io/address/0x3519918E2918b59f3b29bed16dC77174DEC6707b) | +| rETH | [0xEdd8d4Cc0d0358a12f232fd72821d25d4EbE7704](https://etherscan.io/address/0xEdd8d4Cc0d0358a12f232fd72821d25d4EbE7704) | +| cUSDCv3 | [0xf0Fb23485057Fd88C80B9CEc8b433FdA47e0a07A](https://etherscan.io/address/0xf0Fb23485057Fd88C80B9CEc8b433FdA47e0a07A) | +| cvxeUSDFRAXBP | [0x5cD176b58a6FdBAa1aEFD0921935a730C62f03Ac](https://etherscan.io/address/0x5cD176b58a6FdBAa1aEFD0921935a730C62f03Ac) | +| sDAI | [0x29EDbbbE7415cb8637e0F62D5d19dcB3A5bC3229](https://etherscan.io/address/0x29EDbbbE7415cb8637e0F62D5d19dcB3A5bC3229) | +| saEthUSDC | [0x05beee046A5C28844804E679aD5587046dBffbc0](https://etherscan.io/address/0x05beee046A5C28844804E679aD5587046dBffbc0) | +| cUSDT | [0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8](https://etherscan.io/address/0x1269BFa56EcaE9D6d5003810D4a35bf8479376b8) | +| saEthPyUSD | [0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7](https://etherscan.io/address/0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7) | +| cvxPayPool | [0x426Ad39C7ccF2f3872aBB16c0291Eb40c0F44D23](https://etherscan.io/address/0x426Ad39C7ccF2f3872aBB16c0291Eb40c0F44D23) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-assets-3.4.0.md b/docs/deployed-addresses/1-assets-3.4.0.md new file mode 100644 index 0000000000..551975aa52 --- /dev/null +++ b/docs/deployed-addresses/1-assets-3.4.0.md @@ -0,0 +1,66 @@ +# Assets (Mainnet 3.4.0) +## Assets +| Contract | Address | +| --- | --- | +| stkAAVE | [0xF4493581D52671a9E04d693a68ccc61853bceEaE](https://etherscan.io/address/0xF4493581D52671a9E04d693a68ccc61853bceEaE) | +| COMP | [0x63eDdF26Bc65eDa1D1c0147ce8E23c09BE963596](https://etherscan.io/address/0x63eDdF26Bc65eDa1D1c0147ce8E23c09BE963596) | +| CRV | [0xc18bF46F178F7e90b9CD8b7A8b00Af026D5ce3D3](https://etherscan.io/address/0xc18bF46F178F7e90b9CD8b7A8b00Af026D5ce3D3) | +| CVX | [0x7ef93b20C10E6662931b32Dd9D4b85861eB2E4b8](https://etherscan.io/address/0x7ef93b20C10E6662931b32Dd9D4b85861eB2E4b8) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0xEc375F2984D21D5ddb0D82767FD8a9C4CE8Eec2F](https://etherscan.io/address/0xEc375F2984D21D5ddb0D82767FD8a9C4CE8Eec2F) | +| USDC | [0x442f8fc98e3cc6B3d49a66f9858Ac9B6e70Dad3e](https://etherscan.io/address/0x442f8fc98e3cc6B3d49a66f9858Ac9B6e70Dad3e) | +| USDT | [0xe7Dcd101A027Ec34860ECb634a2797d0D2dc4d8b](https://etherscan.io/address/0xe7Dcd101A027Ec34860ECb634a2797d0D2dc4d8b) | +| USDP | [0x4C0B21Acb267f1fAE4aeFA977A26c4a63C9B35e6](https://etherscan.io/address/0x4C0B21Acb267f1fAE4aeFA977A26c4a63C9B35e6) | +| BUSD | [0x97bb4a995b98b1BfF99046b3c518276f78fA5250](https://etherscan.io/address/0x97bb4a995b98b1BfF99046b3c518276f78fA5250) | +| aDAI | [0x9ca9A9cdcE9E943608c945E7001dC89EB163991E](https://etherscan.io/address/0x9ca9A9cdcE9E943608c945E7001dC89EB163991E) | +| aUSDC | [0xc4240D22FFa144E2712aACF3E2cC302af0339ED0](https://etherscan.io/address/0xc4240D22FFa144E2712aACF3E2cC302af0339ED0) | +| aUSDT | [0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333](https://etherscan.io/address/0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333) | +| aBUSD | [0x01F9A6bf339cff820cA503A56FD3705AE35c27F7](https://etherscan.io/address/0x01F9A6bf339cff820cA503A56FD3705AE35c27F7) | +| aUSDP | [0xda5cc207CCefD116fF167a8ABEBBd52bD67C958E](https://etherscan.io/address/0xda5cc207CCefD116fF167a8ABEBBd52bD67C958E) | +| cDAI | [0x337E418b880bDA5860e05D632CF039B7751B907B](https://etherscan.io/address/0x337E418b880bDA5860e05D632CF039B7751B907B) | +| cUSDC | [0x043be931D9C4422e1cFeA528e19818dcDfdE9Ebc](https://etherscan.io/address/0x043be931D9C4422e1cFeA528e19818dcDfdE9Ebc) | +| cUSDT | [0x5ceadb6606C5D82FcCd3f9b312C018fE1f8aa6dA](https://etherscan.io/address/0x5ceadb6606C5D82FcCd3f9b312C018fE1f8aa6dA) | +| cUSDP | [0xa0c02De8FfBb9759b9beBA5e29C82112688A0Ff4](https://etherscan.io/address/0xa0c02De8FfBb9759b9beBA5e29C82112688A0Ff4) | +| cWBTC | [0xC0f89AFcb6F1c4E943aA61FFcdFc41fDcB7D84DD](https://etherscan.io/address/0xC0f89AFcb6F1c4E943aA61FFcdFc41fDcB7D84DD) | +| cETH | [0x4d3A8507a8eb9036895efdD1a462210CE58DE4ad](https://etherscan.io/address/0x4d3A8507a8eb9036895efdD1a462210CE58DE4ad) | +| WBTC | [0x832D65735E541c0404a58B741bEF5652c2B7D0Db](https://etherscan.io/address/0x832D65735E541c0404a58B741bEF5652c2B7D0Db) | +| WETH | [0xADDca344c92Be84A053C5CBE8e067460767FB816](https://etherscan.io/address/0xADDca344c92Be84A053C5CBE8e067460767FB816) | +| wstETH | [0xb7049ee9F533D32C9434101f0645E6Ea5DFe2cdb](https://etherscan.io/address/0xb7049ee9F533D32C9434101f0645E6Ea5DFe2cdb) | +| rETH | [0x987f5e0f845D46262893e680b652D8aAF1B5bCc0](https://etherscan.io/address/0x987f5e0f845D46262893e680b652D8aAF1B5bCc0) | +| fUSDC | [0xB58D95003Af73CF76Ce349103726a51D4Ec8af17](https://etherscan.io/address/0xB58D95003Af73CF76Ce349103726a51D4Ec8af17) | +| fUSDT | [0xD5254b740FbEF6AAcD674936ea7Fb9f4053781aF](https://etherscan.io/address/0xD5254b740FbEF6AAcD674936ea7Fb9f4053781aF) | +| fDAI | [0xA0a620B94446a7DC8952ECf252FcC495eeC65873](https://etherscan.io/address/0xA0a620B94446a7DC8952ECf252FcC495eeC65873) | +| fFRAX | [0xFd9c32198D3cf3ad3b165918FD78De3654cb22eA](https://etherscan.io/address/0xFd9c32198D3cf3ad3b165918FD78De3654cb22eA) | +| cUSDCv3 | [0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0](https://etherscan.io/address/0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0) | +| cvx3Pool | [0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2](https://etherscan.io/address/0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2) | +| cvxPayPool | [0x5315Fbe0CEB299F53aE375f65fd9376767C8224c](https://etherscan.io/address/0x5315Fbe0CEB299F53aE375f65fd9376767C8224c) | +| cvxeUSDFRAXBP | [0x994455cE66Fd984e2A0A0aca453e637810a8f032](https://etherscan.io/address/0x994455cE66Fd984e2A0A0aca453e637810a8f032) | +| cvxMIM3Pool | [0x3d21f841C0Fb125176C1DBDF0DE196b071323A75](https://etherscan.io/address/0x3d21f841C0Fb125176C1DBDF0DE196b071323A75) | +| cvxETHPlusETH | [0x05F164E71C46a8f8FB2ba71550a00eeC9FCd85cd](https://etherscan.io/address/0x05F164E71C46a8f8FB2ba71550a00eeC9FCd85cd) | +| crveUSDFRAXBP | [0xCDC5f5E041b49Cad373E94930E2b3bE30be70535](https://etherscan.io/address/0xCDC5f5E041b49Cad373E94930E2b3bE30be70535) | +| crvMIM3Pool | [0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62](https://etherscan.io/address/0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62) | +| crv3Pool | [0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9](https://etherscan.io/address/0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9) | +| sDAI | [0x62a9DDC6FF6077E823690118eCc935d16A8de47e](https://etherscan.io/address/0x62a9DDC6FF6077E823690118eCc935d16A8de47e) | +| cbETH | [0xC8b80813cad9139D0eeFe38C711a11b20147aA54](https://etherscan.io/address/0xC8b80813cad9139D0eeFe38C711a11b20147aA54) | +| maUSDT | [0x2F8F8Ac64ECbAC38f212b05115836120784a29F7](https://etherscan.io/address/0x2F8F8Ac64ECbAC38f212b05115836120784a29F7) | +| maUSDC | [0xC5d03FB7A38E6025D9A32C7444cfbBfa18B7D656](https://etherscan.io/address/0xC5d03FB7A38E6025D9A32C7444cfbBfa18B7D656) | +| maDAI | [0x7be70371e7ECd9af5A5b49015EC8F8C336B52D81](https://etherscan.io/address/0x7be70371e7ECd9af5A5b49015EC8F8C336B52D81) | +| maWBTC | [0x75B6921925e8BD632380706e722035752ffF175d](https://etherscan.io/address/0x75B6921925e8BD632380706e722035752ffF175d) | +| maWETH | [0xA402078f0A2e077Ea2b1Fb3b6ab74F0cBA10E508](https://etherscan.io/address/0xA402078f0A2e077Ea2b1Fb3b6ab74F0cBA10E508) | +| maStETH | [0x4a139215D9E696c0e7618a441eD3CFd12bbD8CD6](https://etherscan.io/address/0x4a139215D9E696c0e7618a441eD3CFd12bbD8CD6) | +| yvCurveUSDCcrvUSD | [0x1573416df7095F698e37A954D9e951868E526650](https://etherscan.io/address/0x1573416df7095F698e37A954D9e951868E526650) | +| yvCurveUSDPcrvUSD | [0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF](https://etherscan.io/address/0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF) | +| sFRAX | [0x0b7DcCBceA6f985301506D575E2661bf858CdEcC](https://etherscan.io/address/0x0b7DcCBceA6f985301506D575E2661bf858CdEcC) | +| saEthUSDC | [0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB](https://etherscan.io/address/0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB) | +| saEthPyUSD | [0x58a41c87f8C65cf21f961b570540b176e408Cf2E](https://etherscan.io/address/0x58a41c87f8C65cf21f961b570540b176e408Cf2E) | +| bbUSDT | [0x01355C7439982c57cF89CA9785d211806f866224](https://etherscan.io/address/0x01355C7439982c57cF89CA9785d211806f866224) | +| steakUSDC | [0x565CBc99EE04667581c7f3459561fCaf1CF68602](https://etherscan.io/address/0x565CBc99EE04667581c7f3459561fCaf1CF68602) | +| steakPYUSD | [0x23f06D5Fe858B18CD064A5D95054e8ae8536094a](https://etherscan.io/address/0x23f06D5Fe858B18CD064A5D95054e8ae8536094a) | +| Re7WETH | [0xa0a6C06e45437d4Ae1D778AaeB4605AC2B62A870](https://etherscan.io/address/0xa0a6C06e45437d4Ae1D778AaeB4605AC2B62A870) | +| cvxCrvUSDUSDC | [0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5](https://etherscan.io/address/0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5) | +| cvxCrvUSDUSDT | [0x69c6597690B8Df61D15F201519C03725bdec40c1](https://etherscan.io/address/0x69c6597690B8Df61D15F201519C03725bdec40c1) | +| sfrxETH | [0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67](https://etherscan.io/address/0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67) | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-3.3.0.md b/docs/deployed-addresses/1-components-3.3.0.md new file mode 100644 index 0000000000..8c63281216 --- /dev/null +++ b/docs/deployed-addresses/1-components-3.3.0.md @@ -0,0 +1,14 @@ +# Component Implementations (Mainnet 3.3.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| ActFacet | [0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB](https://etherscan.io/address/0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB) | N/A | +| DutchTrade | [0x4eDEb80Ce684A890Dd58Ae0d9762C38731b11b99](https://etherscan.io/address/0x4eDEb80Ce684A890Dd58Ae0d9762C38731b11b99) | 3.3.0 | +| Facade | [0x2C7ca56342177343A2954C250702Fd464f4d0613](https://etherscan.io/address/0x2C7ca56342177343A2954C250702Fd464f4d0613) | N/A | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | N/A | +| GnosisTrade | [0x803a52c5DAB69B78419bb160051071eF2F9Fd227](https://etherscan.io/address/0x803a52c5DAB69B78419bb160051071eF2F9Fd227) | 3.3.0 | +| MaxIssuableFacet | [0x5771d976696AA180Fed276FB6571fE2f41D0b849](https://etherscan.io/address/0x5771d976696AA180Fed276FB6571fE2f41D0b849) | N/A | +| ReadFacet | [0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526](https://etherscan.io/address/0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526) | N/A | +| RSR | [0x320623b8e4ff03373931769a31fc52a4e78b5d70](https://etherscan.io/address/0x320623b8e4ff03373931769a31fc52a4e78b5d70) | N/A | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-components-3.4.0.md b/docs/deployed-addresses/1-components-3.4.0.md new file mode 100644 index 0000000000..3be2335209 --- /dev/null +++ b/docs/deployed-addresses/1-components-3.4.0.md @@ -0,0 +1,31 @@ +# Component Implementations (Mainnet 3.4.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| ActFacet | [0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB](https://etherscan.io/address/0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB) | N/A | +| AssetRegistry | [0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463](https://etherscan.io/address/0xbF1C0206de440b2cF76Ea4405e1DbF2fC227a463) | 3.4.0 | +| BackingManager | [0x20C801869e578E71F2298649870765Aa81f7DC69](https://etherscan.io/address/0x20C801869e578E71F2298649870765Aa81f7DC69) | 3.4.0 | +| BasketHandler | [0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC](https://etherscan.io/address/0xeE7FC703f84AE2CE30475333c57E56d3A7D3AdBC) | 3.4.0 | +| BasketLib | [0xf383dC60D29A5B9ba461F40A0606870d80d1EA88](https://etherscan.io/address/0xf383dC60D29A5B9ba461F40A0606870d80d1EA88) | N/A | +| Broker | [0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c](https://etherscan.io/address/0x62BD44b05542bfF1E59A01Bf7151F533e1c9C12c) | 3.4.0 | +| Deployer | [0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF](https://etherscan.io/address/0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF) | 3.4.0 | +| Distributor | [0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee](https://etherscan.io/address/0x44a42A0F14128E81a21c5fc4322a9f91fF83b4Ee) | 3.4.0 | +| DutchTrade | [0x971c890ACb9EeB084f292996Be667bB9A2889AE9](https://etherscan.io/address/0x971c890ACb9EeB084f292996Be667bB9A2889AE9) | 3.4.0 | +| Facade | [0x2C7ca56342177343A2954C250702Fd464f4d0613](https://etherscan.io/address/0x2C7ca56342177343A2954C250702Fd464f4d0613) | N/A | +| FacadeWrite | [0x1D94290F82D0B417B088d9F5dB316B11C9cf220C](https://etherscan.io/address/0x1D94290F82D0B417B088d9F5dB316B11C9cf220C) | N/A | +| FacadeWriteLib | [0xDf73Cd789422040182b0C24a8b2C97bbCbba3263](https://etherscan.io/address/0xDf73Cd789422040182b0C24a8b2C97bbCbba3263) | N/A | +| Furnace | [0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81](https://etherscan.io/address/0x845B8b0a1c6DB8318414d708Da25fA28d4a0dc81) | 3.4.0 | +| GNOSIS_EASY_AUCTION | [0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101](https://etherscan.io/address/0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101) | N/A | +| GnosisTrade | [0x030c9B66Ac089cB01aA2058FC8f7d9baddC9ae75](https://etherscan.io/address/0x030c9B66Ac089cB01aA2058FC8f7d9baddC9ae75) | 3.4.0 | +| Main | [0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7](https://etherscan.io/address/0x24a4B37F9c40fB0E80ec436Df2e9989FBAFa8bB7) | 3.4.0 | +| MaxIssuableFacet | [0x5771d976696AA180Fed276FB6571fE2f41D0b849](https://etherscan.io/address/0x5771d976696AA180Fed276FB6571fE2f41D0b849) | N/A | +| ReadFacet | [0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526](https://etherscan.io/address/0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526) | N/A | +| RSR | [0x320623b8E4fF03373931769A31Fc52A4E78B5d70](https://etherscan.io/address/0x320623b8E4fF03373931769A31Fc52A4E78B5d70) | N/A | +| RSR_FEED | [0x759bBC1be8F90eE6457C44abc7d443842a976d02](https://etherscan.io/address/0x759bBC1be8F90eE6457C44abc7d443842a976d02) | N/A | +| RsrAsset | [0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA](https://etherscan.io/address/0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA) | 3.4.0 | +| RsrTrader | [0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c](https://etherscan.io/address/0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c) | 3.4.0 | +| RToken | [0x784955641292b0014BC9eF82321300f0b6C7E36d](https://etherscan.io/address/0x784955641292b0014BC9eF82321300f0b6C7E36d) | 3.4.0 | +| RTokenTrader | [0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c](https://etherscan.io/address/0xc60a7Cd6fce24d0c3637A1dCBC8B0f9A9BFF6a7c) | 3.4.0 | +| StRSR | [0xE433673648c94FEC0706E5AC95d4f4097f58B5fb](https://etherscan.io/address/0xE433673648c94FEC0706E5AC95d4f4097f58B5fb) | 3.4.0 | +| TradingLib | [0xa54544C6C36C0d776cc4F04EBB847e0BB3A11ea2](https://etherscan.io/address/0xa54544C6C36C0d776cc4F04EBB847e0BB3A11ea2) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/1-eUSD.md b/docs/deployed-addresses/1-eUSD.md index c55496ec44..b9c18bfba8 100644 --- a/docs/deployed-addresses/1-eUSD.md +++ b/docs/deployed-addresses/1-eUSD.md @@ -2,23 +2,23 @@ ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | -| Main | [0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a](https://etherscan.io/address/0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | -| AssetRegistry | [0x9B85aC04A09c8C813c37de9B3d563C2D3F936162](https://etherscan.io/address/0x9B85aC04A09c8C813c37de9B3d563C2D3F936162) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | -| BackingManager | [0xF014FEF41cCB703975827C8569a3f0940cFD80A4](https://etherscan.io/address/0xF014FEF41cCB703975827C8569a3f0940cFD80A4) |[0xbbc532a80dd141449330c1232c953da6801aed01](https://etherscan.io/address/0xbbc532a80dd141449330c1232c953da6801aed01#code) | 3.0.1 | -| BasketHandler | [0x6d309297ddDFeA104A6E89a132e2f05ce3828e07](https://etherscan.io/address/0x6d309297ddDFeA104A6E89a132e2f05ce3828e07) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | -| Broker | [0x90EB22A31b69C29C34162E0E9278cc0617aA2B50](https://etherscan.io/address/0x90EB22A31b69C29C34162E0E9278cc0617aA2B50) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | -| RSRTrader | [0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f](https://etherscan.io/address/0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | -| RTokenTrader | [0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A](https://etherscan.io/address/0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | -| Distributor | [0x8a77980f82A1d537600891D782BCd8bd41B85472](https://etherscan.io/address/0x8a77980f82A1d537600891D782BCd8bd41B85472) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | -| Furnace | [0x57084b3a6317bea01bA8f7c582eD033d9345c2B2](https://etherscan.io/address/0x57084b3a6317bea01bA8f7c582eD033d9345c2B2) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | -| StRSR | [0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8](https://etherscan.io/address/0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | +| RToken | [0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F](https://etherscan.io/address/0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F) |[0x784955641292b0014bc9ef82321300f0b6c7e36d](https://etherscan.io/address/0x784955641292b0014bc9ef82321300f0b6c7e36d#code) | 3.4.0 | +| Main | [0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a](https://etherscan.io/address/0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a) |[0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7](https://etherscan.io/address/0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7#code) | 3.4.0 | +| AssetRegistry | [0x9B85aC04A09c8C813c37de9B3d563C2D3F936162](https://etherscan.io/address/0x9B85aC04A09c8C813c37de9B3d563C2D3F936162) |[0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463](https://etherscan.io/address/0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463#code) | 3.4.0 | +| BackingManager | [0xF014FEF41cCB703975827C8569a3f0940cFD80A4](https://etherscan.io/address/0xF014FEF41cCB703975827C8569a3f0940cFD80A4) |[0x20c801869e578e71f2298649870765aa81f7dc69](https://etherscan.io/address/0x20c801869e578e71f2298649870765aa81f7dc69#code) | 3.4.0 | +| BasketHandler | [0x6d309297ddDFeA104A6E89a132e2f05ce3828e07](https://etherscan.io/address/0x6d309297ddDFeA104A6E89a132e2f05ce3828e07) |[0xee7fc703f84ae2ce30475333c57e56d3a7d3adbc](https://etherscan.io/address/0xee7fc703f84ae2ce30475333c57e56d3a7d3adbc#code) | 3.4.0 | +| Broker | [0x90EB22A31b69C29C34162E0E9278cc0617aA2B50](https://etherscan.io/address/0x90EB22A31b69C29C34162E0E9278cc0617aA2B50) |[0x62bd44b05542bff1e59a01bf7151f533e1c9c12c](https://etherscan.io/address/0x62bd44b05542bff1e59a01bf7151f533e1c9c12c#code) | 3.4.0 | +| RSRTrader | [0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f](https://etherscan.io/address/0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.4.0 | +| RTokenTrader | [0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A](https://etherscan.io/address/0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.4.0 | +| Distributor | [0x8a77980f82A1d537600891D782BCd8bd41B85472](https://etherscan.io/address/0x8a77980f82A1d537600891D782BCd8bd41B85472) |[0x44a42a0f14128e81a21c5fc4322a9f91ff83b4ee](https://etherscan.io/address/0x44a42a0f14128e81a21c5fc4322a9f91ff83b4ee#code) | 3.4.0 | +| Furnace | [0x57084b3a6317bea01bA8f7c582eD033d9345c2B2](https://etherscan.io/address/0x57084b3a6317bea01bA8f7c582eD033d9345c2B2) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.4.0 | +| StRSR | [0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8](https://etherscan.io/address/0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8) |[0xe433673648c94fec0706e5ac95d4f4097f58b5fb](https://etherscan.io/address/0xe433673648c94fec0706e5ac95d4f4097f58b5fb#code) | 3.4.0 | ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6](https://etherscan.io/address/0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6) | -| Timelock | [0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c](https://etherscan.io/address/0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c) | +| Governor Alexios | [0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8](https://etherscan.io/address/0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8) | +| Timelock | [0x7BEa807798313fE8F557780dBD6b829c1E3aD560](https://etherscan.io/address/0x7BEa807798313fE8F557780dBD6b829c1E3aD560) | \ No newline at end of file diff --git a/docs/deployed-addresses/1-hyUSD.md b/docs/deployed-addresses/1-hyUSD.md index b3323a833a..91c465e3f6 100644 --- a/docs/deployed-addresses/1-hyUSD.md +++ b/docs/deployed-addresses/1-hyUSD.md @@ -2,23 +2,23 @@ ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xaCdf0DBA4B9839b96221a8487e9ca660a48212be](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | -| Main | [0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37](https://etherscan.io/address/0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | -| AssetRegistry | [0xaCacddeE9b900b7535B13Cd8662df130265b8c78](https://etherscan.io/address/0xaCacddeE9b900b7535B13Cd8662df130265b8c78) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | -| BackingManager | [0x61691c4181F876Dd7e19D6742B367B48AA280ed3](https://etherscan.io/address/0x61691c4181F876Dd7e19D6742B367B48AA280ed3) |[0xbbc532a80dd141449330c1232c953da6801aed01](https://etherscan.io/address/0xbbc532a80dd141449330c1232c953da6801aed01#code) | 3.0.1 | -| BasketHandler | [0x9119DB28432bd97aBF4c3D81B929849e0490c7A6](https://etherscan.io/address/0x9119DB28432bd97aBF4c3D81B929849e0490c7A6) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | -| Broker | [0x44344ca9014BE4bB622037224d107493586f35ed](https://etherscan.io/address/0x44344ca9014BE4bB622037224d107493586f35ed) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | -| RSRTrader | [0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7](https://etherscan.io/address/0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | -| RTokenTrader | [0x4886f5549d3b25adCFaC68E40062c735faf81378](https://etherscan.io/address/0x4886f5549d3b25adCFaC68E40062c735faf81378) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | -| Distributor | [0x0297941cCB71f5595072C4fA34CE443b6C5b47A0](https://etherscan.io/address/0x0297941cCB71f5595072C4fA34CE443b6C5b47A0) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | -| Furnace | [0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8](https://etherscan.io/address/0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | -| StRSR | [0x7Db3C57001c80644208fb8AA81bA1200C7B0731d](https://etherscan.io/address/0x7Db3C57001c80644208fb8AA81bA1200C7B0731d) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | +| RToken | [0xaCdf0DBA4B9839b96221a8487e9ca660a48212be](https://etherscan.io/address/0xaCdf0DBA4B9839b96221a8487e9ca660a48212be) |[0x784955641292b0014bc9ef82321300f0b6c7e36d](https://etherscan.io/address/0x784955641292b0014bc9ef82321300f0b6c7e36d#code) | 3.4.0 | +| Main | [0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37](https://etherscan.io/address/0x2cabaa8010b3fbbDEeBe4a2D0fEffC2ed155bf37) |[0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7](https://etherscan.io/address/0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7#code) | 3.4.0 | +| AssetRegistry | [0xaCacddeE9b900b7535B13Cd8662df130265b8c78](https://etherscan.io/address/0xaCacddeE9b900b7535B13Cd8662df130265b8c78) |[0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463](https://etherscan.io/address/0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463#code) | 3.4.0 | +| BackingManager | [0x61691c4181F876Dd7e19D6742B367B48AA280ed3](https://etherscan.io/address/0x61691c4181F876Dd7e19D6742B367B48AA280ed3) |[0x20c801869e578e71f2298649870765aa81f7dc69](https://etherscan.io/address/0x20c801869e578e71f2298649870765aa81f7dc69#code) | 3.4.0 | +| BasketHandler | [0x9119DB28432bd97aBF4c3D81B929849e0490c7A6](https://etherscan.io/address/0x9119DB28432bd97aBF4c3D81B929849e0490c7A6) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.4.0 | +| Broker | [0x44344ca9014BE4bB622037224d107493586f35ed](https://etherscan.io/address/0x44344ca9014BE4bB622037224d107493586f35ed) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.4.0 | +| RSRTrader | [0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7](https://etherscan.io/address/0x0771301d56Eb734a5F61d275Da1b6c2459a00dc7) |[0xc60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c](https://etherscan.io/address/0xc60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c#code) | 3.4.0 | +| RTokenTrader | [0x4886f5549d3b25adCFaC68E40062c735faf81378](https://etherscan.io/address/0x4886f5549d3b25adCFaC68E40062c735faf81378) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.4.0 | +| Distributor | [0x0297941cCB71f5595072C4fA34CE443b6C5b47A0](https://etherscan.io/address/0x0297941cCB71f5595072C4fA34CE443b6C5b47A0) |[0x44a42a0f14128e81a21c5fc4322a9f91ff83b4ee](https://etherscan.io/address/0x44a42a0f14128e81a21c5fc4322a9f91ff83b4ee#code) | 3.4.0 | +| Furnace | [0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8](https://etherscan.io/address/0x43D806BB6cDfA1dde1D1754c5F2Ea28adC3bc0E8) |[0x845b8b0a1c6db8318414d708da25fa28d4a0dc81](https://etherscan.io/address/0x845b8b0a1c6db8318414d708da25fa28d4a0dc81#code) | 3.4.0 | +| StRSR | [0x7Db3C57001c80644208fb8AA81bA1200C7B0731d](https://etherscan.io/address/0x7Db3C57001c80644208fb8AA81bA1200C7B0731d) |[0xe433673648c94fec0706e5ac95d4f4097f58b5fb](https://etherscan.io/address/0xe433673648c94fec0706e5ac95d4f4097f58b5fb#code) | 3.4.0 | ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1](https://etherscan.io/address/0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1) | -| Timelock | [0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C](https://etherscan.io/address/0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C) | +| Governor Alexios | [0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe](https://etherscan.io/address/0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe) | +| Timelock | [0x788Fd297B4d497e44e4BF25d642fbecA3018B5d2](https://etherscan.io/address/0x788Fd297B4d497e44e4BF25d642fbecA3018B5d2) | \ No newline at end of file diff --git a/docs/deployed-addresses/8453-assets-3.3.0.md b/docs/deployed-addresses/8453-assets-3.3.0.md new file mode 100644 index 0000000000..009c00521c --- /dev/null +++ b/docs/deployed-addresses/8453-assets-3.3.0.md @@ -0,0 +1,13 @@ +# Assets (Base 3.3.0) +## Assets +| Contract | Address | +| --- | --- | + + +## Collaterals +| Contract | Address | +| --- | --- | +| saBasUSDC | [0xAe9795115c7E5Bee7d2017b92c41DECa66d81dcf](https://basescan.org/address/0xAe9795115c7E5Bee7d2017b92c41DECa66d81dcf) | +| cUSDCv3 | [0x36A43E13f0c8d8612AE3978A8E7A58BB58000923](https://basescan.org/address/0x36A43E13f0c8d8612AE3978A8E7A58BB58000923) | +| USDC | [0x8b906361048D277452506d3f791020A1cA798aF3](https://basescan.org/address/0x8b906361048D277452506d3f791020A1cA798aF3) | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-assets-3.4.0.md b/docs/deployed-addresses/8453-assets-3.4.0.md new file mode 100644 index 0000000000..9ac5e09d97 --- /dev/null +++ b/docs/deployed-addresses/8453-assets-3.4.0.md @@ -0,0 +1,19 @@ +# Assets (Base 3.4.0) +## Assets +| Contract | Address | +| --- | --- | +| COMP | [0xB8794Fb1CCd62bFe631293163F4A3fC2d22e37e0](https://basescan.org/address/0xB8794Fb1CCd62bFe631293163F4A3fC2d22e37e0) | +| STG | [0xEE527CC63122732532d0f1ad33Ec035D30f3050f](https://basescan.org/address/0xEE527CC63122732532d0f1ad33Ec035D30f3050f) | + +## Collaterals +| Contract | Address | +| --- | --- | +| DAI | [0x3E40840d0282C9F9cC7d17094b5239f87fcf18e5](https://basescan.org/address/0x3E40840d0282C9F9cC7d17094b5239f87fcf18e5) | +| USDC | [0xaa85216187F92a781D8F9Bcb40825E356ee2635a](https://basescan.org/address/0xaa85216187F92a781D8F9Bcb40825E356ee2635a) | +| USDbC | [0xD126741474B0348D9B0F4911573d8f543c01C2c4](https://basescan.org/address/0xD126741474B0348D9B0F4911573d8f543c01C2c4) | +| WETH | [0x073BD162BBD05Cd2CF631B90D44239B8a367276e](https://basescan.org/address/0x073BD162BBD05Cd2CF631B90D44239B8a367276e) | +| cbETH | [0x851B461a9744f4c9E996C03072cAB6f44Fa04d0D](https://basescan.org/address/0x851B461a9744f4c9E996C03072cAB6f44Fa04d0D) | +| saBasUSDC | [0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50](https://basescan.org/address/0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50) | +| cUSDCv3 | [0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461](https://basescan.org/address/0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461) | +| wstETH | [0x8b4374005291B8FCD14C4E947604b2FB3C660A73](https://basescan.org/address/0x8b4374005291B8FCD14C4E947604b2FB3C660A73) | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-bsdETH.md b/docs/deployed-addresses/8453-bsdETH.md new file mode 100644 index 0000000000..00e7620fd2 --- /dev/null +++ b/docs/deployed-addresses/8453-bsdETH.md @@ -0,0 +1,24 @@ +# [bsdETH (Based ETH) - Base](https://basescan.org/address/0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff](https://basescan.org/address/0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff) | +| Main | [0x5f835eA13721B11A7543C8f9C94aA840c1f2Da52](https://basescan.org/address/0x5f835eA13721B11A7543C8f9C94aA840c1f2Da52) | +| AssetRegistry | [0xAd7272CCd23108922c34B0BeCdcA228671208EfE](https://basescan.org/address/0xAd7272CCd23108922c34B0BeCdcA228671208EfE) | +| BackingManager | [0x6969343c4938b4ca79B1237C94f825df23A9905d](https://basescan.org/address/0x6969343c4938b4ca79B1237C94f825df23A9905d) | +| BasketHandler | [0x2b79Ebb020E4F374a44c5eeAD609e2703Fb3DDc4](https://basescan.org/address/0x2b79Ebb020E4F374a44c5eeAD609e2703Fb3DDc4) | +| Broker | [0x564A533004a8356BC6571a76fE83935F38C23b1E](https://basescan.org/address/0x564A533004a8356BC6571a76fE83935F38C23b1E) | +| RSRTrader | [0x07F58c529170645f3dF1C277BEDC176ecEB97A0E](https://basescan.org/address/0x07F58c529170645f3dF1C277BEDC176ecEB97A0E) | +| RTokenTrader | [0x8C46348552BdAb72dD163928fd8460257089F8F9](https://basescan.org/address/0x8C46348552BdAb72dD163928fd8460257089F8F9) | +| Distributor | [0x9CFB9c16358296F4a3CF8Adc6E4B5b9937c9359f](https://basescan.org/address/0x9CFB9c16358296F4a3CF8Adc6E4B5b9937c9359f) | +| Furnace | [0x8e987a41e7C4e8D0290FEAF7102EB301Db1540A8](https://basescan.org/address/0x8e987a41e7C4e8D0290FEAF7102EB301Db1540A8) | +| StRSR | [0x3D190D968a8985673285B3B9cD5f5BDC12c9b368](https://basescan.org/address/0x3D190D968a8985673285B3B9cD5f5BDC12c9b368) | + + +## Governance Addresses +| Contract | Address | +| --- | --- | +| Governor Alexios | [0x21fBa52dA03e1F964fa521532f8B8951fC212055](https://basescan.org/address/0x21fBa52dA03e1F964fa521532f8B8951fC212055) | +| Timelock | [0xe664d294824C2A8C952A10c4034e1105d2907F46](https://basescan.org/address/0xe664d294824C2A8C952A10c4034e1105d2907F46) | + + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-components-3.3.0.md b/docs/deployed-addresses/8453-components-3.3.0.md new file mode 100644 index 0000000000..c0c8fb341f --- /dev/null +++ b/docs/deployed-addresses/8453-components-3.3.0.md @@ -0,0 +1,9 @@ +# Component Implementations (Base 3.3.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| DutchTrade | [0xd0Ff3aa130A34Eac0C448950CA8fe662330cB065](https://basescan.org/address/0xd0Ff3aa130A34Eac0C448950CA8fe662330cB065) | 3.3.0 | +| GNOSIS_EASY_AUCTION | [0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02](https://basescan.org/address/0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02) | N/A | +| RSR | [0xaB36452DbAC151bE02b16Ca17d8919826072f64a](https://basescan.org/address/0xaB36452DbAC151bE02b16Ca17d8919826072f64a) | 1.0.3 | +| RSR_FEED | [0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1](https://basescan.org/address/0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-components-3.4.0.md b/docs/deployed-addresses/8453-components-3.4.0.md new file mode 100644 index 0000000000..806909e9e5 --- /dev/null +++ b/docs/deployed-addresses/8453-components-3.4.0.md @@ -0,0 +1,31 @@ +# Component Implementations (Base 3.4.0) +## Component Addresses +| Contract | Address | Version | +| --- | --- | --- | +| ActFacet | [0x0eac15B9Fe585432E48Cf175571D75D111861F43](https://basescan.org/address/0x0eac15B9Fe585432E48Cf175571D75D111861F43) | N/A | +| AssetRegistry | [0x3DDe17cfd36e740CB7452cb2F59FC925eACb91aB](https://basescan.org/address/0x3DDe17cfd36e740CB7452cb2F59FC925eACb91aB) | 3.4.0 | +| BackingManager | [0xb5bDFF1FB47635383ABf13b78a79C8a21aA1b23E](https://basescan.org/address/0xb5bDFF1FB47635383ABf13b78a79C8a21aA1b23E) | 3.4.0 | +| BasketHandler | [0xA4f1Fc88eFF9a72bCc278a2D3B79cafCc1551fb5](https://basescan.org/address/0xA4f1Fc88eFF9a72bCc278a2D3B79cafCc1551fb5) | 3.4.0 | +| BasketLib | [0x182e86ad4a6139ced4f9fa4ed3f1cd9e4f7449e7](https://basescan.org/address/0x182e86ad4a6139ced4f9fa4ed3f1cd9e4f7449e7) | N/A | +| Broker | [0x1cddc45cb390C3b4a739861155E8ee95b7321eD6](https://basescan.org/address/0x1cddc45cb390C3b4a739861155E8ee95b7321eD6) | 3.4.0 | +| Deployer | [0xFD18bA9B2f9241Ce40CDE14079c1cDA1502A8D0A](https://basescan.org/address/0xFD18bA9B2f9241Ce40CDE14079c1cDA1502A8D0A) | 3.4.0 | +| Distributor | [0xba748FAF1a94B5C8De5C8Ca8D87A0906C5B0300c](https://basescan.org/address/0xba748FAF1a94B5C8De5C8Ca8D87A0906C5B0300c) | 3.4.0 | +| DutchTrade | [0x270284ecb6aF0dc521D2c8f9D77b03EEd2aace90](https://basescan.org/address/0x270284ecb6aF0dc521D2c8f9D77b03EEd2aace90) | 3.4.0 | +| Facade | [0xEb2071e9B542555E90E6e4E1F83fa17423583991](https://basescan.org/address/0xEb2071e9B542555E90E6e4E1F83fa17423583991) | N/A | +| FacadeWrite | [0x43E205A805c4be5A62C71d49de68dF60200548A0](https://basescan.org/address/0x43E205A805c4be5A62C71d49de68dF60200548A0) | N/A | +| FacadeWriteLib | [0x186d05580E6B7195323b5dC8c3ee9179Ad086d4C](https://basescan.org/address/0x186d05580E6B7195323b5dC8c3ee9179Ad086d4C) | N/A | +| Furnace | [0xE0B810bD674132b553770064Fc90440c5A5f518d](https://basescan.org/address/0xE0B810bD674132b553770064Fc90440c5A5f518d) | 3.4.0 | +| GNOSIS_EASY_AUCTION | [0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02](https://basescan.org/address/0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02) | N/A | +| GnosisTrade | [0x93de153Ba104D15785c8d8af01AE9425960de49e](https://basescan.org/address/0x93de153Ba104D15785c8d8af01AE9425960de49e) | 3.4.0 | +| Main | [0x2a2A842Dda2Da2170a531dfF4bD4A821321e4485](https://basescan.org/address/0x2a2A842Dda2Da2170a531dfF4bD4A821321e4485) | 3.4.0 | +| MaxIssuableFacet | [0x63FDcB1E8Ee5C4B64A5c4ce0FB97597917920cb6](https://basescan.org/address/0x63FDcB1E8Ee5C4B64A5c4ce0FB97597917920cb6) | N/A | +| ReadFacet | [0x5Af543D6F95a98200Dd770f39A902Fe793BAeB27](https://basescan.org/address/0x5Af543D6F95a98200Dd770f39A902Fe793BAeB27) | N/A | +| RSR | [0xaB36452DbAC151bE02b16Ca17d8919826072f64a](https://basescan.org/address/0xaB36452DbAC151bE02b16Ca17d8919826072f64a) | 1.0.3 | +| RSR_FEED | [0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1](https://basescan.org/address/0xAa98aE504658766Dfe11F31c5D95a0bdcABDe0b1) | N/A | +| RsrAsset | [0x02062c16c28A169D1f2F5EfA7eEDc42c3311ec23](https://basescan.org/address/0x02062c16c28A169D1f2F5EfA7eEDc42c3311ec23) | 3.4.0 | +| RsrTrader | [0x3c2460ACa70bedf096f71Cf91fFBc0789F08503f](https://basescan.org/address/0x3c2460ACa70bedf096f71Cf91fFBc0789F08503f) | 3.4.0 | +| RToken | [0x02Ab5B6dF2c17d060EE3e95D08225Ff3A42504a5](https://basescan.org/address/0x02Ab5B6dF2c17d060EE3e95D08225Ff3A42504a5) | 3.4.0 | +| RTokenTrader | [0x3c2460ACa70bedf096f71Cf91fFBc0789F08503f](https://basescan.org/address/0x3c2460ACa70bedf096f71Cf91fFBc0789F08503f) | 3.4.0 | +| StRSR | [0x4Cf200D7fA568611DD8B4BD85053ba9419982C7D](https://basescan.org/address/0x4Cf200D7fA568611DD8B4BD85053ba9419982C7D) | 3.4.0 | +| TradingLib | [0x6419fe6cf428150e2d8ed38a3316b1bb468f79a7](https://basescan.org/address/0x6419fe6cf428150e2d8ed38a3316b1bb468f79a7) | N/A | + \ No newline at end of file diff --git a/docs/deployed-addresses/8453-hyUSD.md b/docs/deployed-addresses/8453-hyUSD.md index 881629127d..afd96d98b8 100644 --- a/docs/deployed-addresses/8453-hyUSD.md +++ b/docs/deployed-addresses/8453-hyUSD.md @@ -2,23 +2,23 @@ ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xCc7FF230365bD730eE4B352cC2492CEdAC49383e](https://basescan.org/address/0xCc7FF230365bD730eE4B352cC2492CEdAC49383e) |[0xa42850a760151bb3acf17e7f8643eb4d864bf7a6](https://basescan.org/address/0xa42850a760151bb3acf17e7f8643eb4d864bf7a6#code) | 3.0.0 | -| Main | [0xA582985c68ED30a052Ff0b07D74931140bd5a00F](https://basescan.org/address/0xA582985c68ED30a052Ff0b07D74931140bd5a00F) |[0x1d6d0b74e7a701ae5c2e11967b242e9861275143](https://basescan.org/address/0x1d6d0b74e7a701ae5c2e11967b242e9861275143#code) | 3.0.0 | -| AssetRegistry | [0xe8209777E3bE69E0f379AE5b2204D301c4FFC9B3](https://basescan.org/address/0xe8209777E3bE69E0f379AE5b2204D301c4FFC9B3) |[0x9c387fc258061bd3e02c851f36ae227db03a396c](https://basescan.org/address/0x9c387fc258061bd3e02c851f36ae227db03a396c#code) | 3.0.0 | -| BackingManager | [0xA1E1A94977ec3159DB546bf01d7a8d17DD3EbBeD](https://basescan.org/address/0xA1E1A94977ec3159DB546bf01d7a8d17DD3EbBeD) |[0x8569d60df34354cdd1115b90de832845b31c28d2](https://basescan.org/address/0x8569d60df34354cdd1115b90de832845b31c28d2#code) | 3.0.1 | -| BasketHandler | [0x9306587db04E35981e57013f6E1D867eCa89e2ec](https://basescan.org/address/0x9306587db04E35981e57013f6E1D867eCa89e2ec) |[0x25e92785c1ac01b397224e0534f3d626868a1cbf](https://basescan.org/address/0x25e92785c1ac01b397224e0534f3d626868a1cbf#code) | 3.0.0 | -| Broker | [0x0E05139662e0C8752a100DB08DA0C7E435B8aC94](https://basescan.org/address/0x0E05139662e0C8752a100DB08DA0C7E435B8aC94) |[0x12c3bb1b0da85fdae0137ae8fde901f7d0e106ba](https://basescan.org/address/0x12c3bb1b0da85fdae0137ae8fde901f7d0e106ba#code) | 3.0.0 | -| RSRTrader | [0xef34C651F1AE9593cfb2CDf02da800A4AAd612bd](https://basescan.org/address/0xef34C651F1AE9593cfb2CDf02da800A4AAd612bd) |[0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16](https://basescan.org/address/0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16#code) | 3.0.1 | -| RTokenTrader | [0xcc03e97F6e2e4eFb50ab95c89BB4b27911105736](https://basescan.org/address/0xcc03e97F6e2e4eFb50ab95c89BB4b27911105736) |[0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16](https://basescan.org/address/0xf4c5d33dabb9d4681ed9b83618d629ba1006ae16#code) | 3.0.1 | -| Distributor | [0xf0a83bC73E9bAeb69b2fBB1e48bCdabf9C1012ca](https://basescan.org/address/0xf0a83bC73E9bAeb69b2fBB1e48bCdabf9C1012ca) |[0xd31de64957b79435bfc702044590ac417e02c19b](https://basescan.org/address/0xd31de64957b79435bfc702044590ac417e02c19b#code) | 3.0.0 | -| Furnace | [0x8532B667150F53f209F71FdF4Ca2173805D16680](https://basescan.org/address/0x8532B667150F53f209F71FdF4Ca2173805D16680) |[0x45d7dfe976cdf80962d863a66918346a457b87bd](https://basescan.org/address/0x45d7dfe976cdf80962d863a66918346a457b87bd#code) | 3.0.0 | -| StRSR | [0x796d2367AF69deB3319B8E10712b8B65957371c3](https://basescan.org/address/0x796d2367AF69deB3319B8E10712b8B65957371c3) |[0x53321f03a7cce52413515dfd0527e0163ec69a46](https://basescan.org/address/0x53321f03a7cce52413515dfd0527e0163ec69a46#code) | 3.0.0 | +| RToken | [0xCc7FF230365bD730eE4B352cC2492CEdAC49383e](https://basescan.org/address/0xCc7FF230365bD730eE4B352cC2492CEdAC49383e) | +| Main | [0xA582985c68ED30a052Ff0b07D74931140bd5a00F](https://basescan.org/address/0xA582985c68ED30a052Ff0b07D74931140bd5a00F) | +| AssetRegistry | [0xe8209777E3bE69E0f379AE5b2204D301c4FFC9B3](https://basescan.org/address/0xe8209777E3bE69E0f379AE5b2204D301c4FFC9B3) | +| BackingManager | [0xA1E1A94977ec3159DB546bf01d7a8d17DD3EbBeD](https://basescan.org/address/0xA1E1A94977ec3159DB546bf01d7a8d17DD3EbBeD) | +| BasketHandler | [0x9306587db04E35981e57013f6E1D867eCa89e2ec](https://basescan.org/address/0x9306587db04E35981e57013f6E1D867eCa89e2ec) | +| Broker | [0x0E05139662e0C8752a100DB08DA0C7E435B8aC94](https://basescan.org/address/0x0E05139662e0C8752a100DB08DA0C7E435B8aC94) | +| RSRTrader | [0xef34C651F1AE9593cfb2CDf02da800A4AAd612bd](https://basescan.org/address/0xef34C651F1AE9593cfb2CDf02da800A4AAd612bd) | +| RTokenTrader | [0xcc03e97F6e2e4eFb50ab95c89BB4b27911105736](https://basescan.org/address/0xcc03e97F6e2e4eFb50ab95c89BB4b27911105736) | +| Distributor | [0xf0a83bC73E9bAeb69b2fBB1e48bCdabf9C1012ca](https://basescan.org/address/0xf0a83bC73E9bAeb69b2fBB1e48bCdabf9C1012ca) | +| Furnace | [0x8532B667150F53f209F71FdF4Ca2173805D16680](https://basescan.org/address/0x8532B667150F53f209F71FdF4Ca2173805D16680) | +| StRSR | [0x796d2367AF69deB3319B8E10712b8B65957371c3](https://basescan.org/address/0x796d2367AF69deB3319B8E10712b8B65957371c3) | ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb](https://basescan.org/address/0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb) | -| Timelock | [0xf093d7f00f3dCe6d415Be564f41Cb4bc032fb367](https://basescan.org/address/0xf093d7f00f3dCe6d415Be564f41Cb4bc032fb367) | +| Governor Alexios | [0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128](https://basescan.org/address/0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128) | +| Timelock | [0x4284D76a03F9B398FF7aEc58C9dEc94b289070CF](https://basescan.org/address/0x4284D76a03F9B398FF7aEc58C9dEc94b289070CF) | \ No newline at end of file diff --git a/docs/deployed-addresses/index.json b/docs/deployed-addresses/index.json index 41ee236cd2..421a48105a 100644 --- a/docs/deployed-addresses/index.json +++ b/docs/deployed-addresses/index.json @@ -4,13 +4,17 @@ "components-2.0.0", "components-2.1.0", "components-3.0.0", - "components-3.0.1" + "components-3.0.1", + "components-3.3.0", + "components-3.4.0" ], "assets": [ "assets-2.0.0", "assets-2.1.0", "assets-3.0.0", - "assets-3.0.1" + "assets-3.0.1", + "assets-3.3.0", + "assets-3.4.0" ], "rtokens": [ "eUSD", @@ -22,15 +26,20 @@ "base": { "components": [ "components-3.0.0", - "components-3.0.1" + "components-3.0.1", + "components-3.3.0", + "components-3.4.0" ], "assets": [ "assets-3.0.0", - "assets-3.0.1" + "assets-3.0.1", + "assets-3.3.0", + "assets-3.4.0" ], "rtokens": [ "hyUSD", - "Vaya" + "Vaya", + "bsdETH" ] } } \ No newline at end of file diff --git a/scripts/compile-addresses.sh b/scripts/compile-addresses.sh index 98e3d69343..f22a437718 100755 --- a/scripts/compile-addresses.sh +++ b/scripts/compile-addresses.sh @@ -4,13 +4,13 @@ # *** Ethereum Mainnet *** # eUSD -npx hardhat get-addys --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --gov 0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6 --network mainnet +npx hardhat get-addys --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --gov 0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8 --network mainnet # ETH+ npx hardhat get-addys --rtoken 0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8 --gov 0x239cDcBE174B4728c870A24F77540dAB3dC5F981 --network mainnet # hyUSD -npx hardhat get-addys --rtoken 0xaCdf0DBA4B9839b96221a8487e9ca660a48212be --gov 0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1 --network mainnet +npx hardhat get-addys --rtoken 0xaCdf0DBA4B9839b96221a8487e9ca660a48212be --gov 0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe --network mainnet # USDC+ npx hardhat get-addys --rtoken 0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b --gov 0xc837C557071D604bCb1058c8c4891ddBe8FDD630 --network mainnet @@ -19,11 +19,14 @@ npx hardhat get-addys --rtoken 0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b --gov # *** Base L2 *** # hyUSD -npx hardhat get-addys --rtoken 0xCc7FF230365bD730eE4B352cC2492CEdAC49383e --gov 0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb --network base +npx hardhat get-addys --rtoken 0xCc7FF230365bD730eE4B352cC2492CEdAC49383e --gov 0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128 --network base # VAYA npx hardhat get-addys --rtoken 0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d --gov 0xEb583EA06501f92E994C353aD2741A35582987aA --network base +# bsdETH +npx hardhat get-addys --rtoken 0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff --gov 0x21fBa52dA03e1F964fa521532f8B8951fC212055 --network base + # Components # *** Ethereum Mainnet *** @@ -31,7 +34,11 @@ npx hardhat get-addys --ver "2.0.0" --network mainnet npx hardhat get-addys --ver "2.1.0" --network mainnet npx hardhat get-addys --ver "3.0.0" --network mainnet npx hardhat get-addys --ver "3.0.1" --network mainnet +npx hardhat get-addys --ver "3.3.0" --network mainnet +npx hardhat get-addys --ver "3.4.0" --network mainnet # *** Base L2 *** npx hardhat get-addys --ver "3.0.0" --network base -npx hardhat get-addys --ver "3.0.1" --network base \ No newline at end of file +npx hardhat get-addys --ver "3.0.1" --network base +npx hardhat get-addys --ver "3.3.0" --network base +npx hardhat get-addys --ver "3.4.0" --network base \ No newline at end of file From 8702fed3fe5a4c62720e54c398ae69491cef4856 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Wed, 26 Jun 2024 16:03:50 -0300 Subject: [PATCH 419/450] Document up to 21 decimals supported (#1162) Co-authored-by: Taylor Brent --- contracts/plugins/trading/GnosisTrade.sol | 3 +++ docs/collateral.md | 9 +++++++++ docs/solidity-style.md | 8 ++++++++ docs/system-design.md | 6 ++++++ 4 files changed, 26 insertions(+) diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index d6557b5991..391cc2ee2d 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -14,6 +14,9 @@ import "../../mixins/Versioned.sol"; // Modifications to this contract's state must only ever be made when status=PENDING! /// Trade contract against the Gnosis EasyAuction mechanism +/// Limitations on decimals due to Gnosis Auction limitations: +/// - 27 decimal tokens are not supported in practice: max auction size is ~8e1 whole tokens +/// - 21 decimal tokens are supported, with caveats: max auction size is ~8e7 whole tokens contract GnosisTrade is ITrade, Versioned { using FixLib for uint192; using SafeERC20Upgradeable for IERC20Upgradeable; diff --git a/docs/collateral.md b/docs/collateral.md index 9a98938c24..e1848332ff 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -250,6 +250,15 @@ To use a rebasing token as collateral backing, the rebasing ERC20 needs to be re There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20Wrapper.sol](../contracts/plugins/assets/erc20/RewardableERC20Wrapper.sol). You may add additional logic by extending `_afterDeposit()` or `_beforeWithdraw()`. +### Token decimals should be <= 21 + +The protocol currently supports collateral tokens with up to 21 decimals. There are some caveats to know about: + +- For a token with 21 decimals, batch auctions can only process up to ~8e7 whole tokens in a single auction. Dollar-pegged tokens thus fit nicely within this constraint, but 21 decimal tokens that are worth <$0.1 per whole token may not. Therefore, the protocol should not be used with **low-value 21-decimal tokens**. +- For a token with 18 decimals, batch auctions can only process up to ~8e10 whole tokens in a single auction. + +Dutch auctions do not have this constraint. As long as they remain enabled they can process a larger number of tokens. + ### `refresh()` should never revert Because it’s called at the beginning of many transactions, `refresh()` should never revert. If `refresh()` encounters a critical error, it should change the Collateral contract’s state so that `status()` becomes `DISABLED`. diff --git a/docs/solidity-style.md b/docs/solidity-style.md index 4bec58a300..05a35b8aea 100644 --- a/docs/solidity-style.md +++ b/docs/solidity-style.md @@ -135,6 +135,14 @@ That is, we expect timestamps to be any uint48 value. This should work without change for around 9M years, which is more than enough. +### Collateral decimals + +`{decimals}`: [6, 21] + +The protocol only supports collateral tokens up to 21 decimals, and for these cases only supports balances up to `~8e28`. Exceeding this could end up overflowing restrictions in GnosisTrade / EasyAuction, and end up in rounding issues accross the protocol. + +21 decimal tokens must also be sufficiently valued, where that is defined as a whole token worth >$0.1. + ## Function annotations All core functions that can be called from outside our system are classified into one of the following 3 categories: diff --git a/docs/system-design.md b/docs/system-design.md index 22128c989f..127907e211 100644 --- a/docs/system-design.md +++ b/docs/system-design.md @@ -170,6 +170,12 @@ The `dutchAuctionLength` can be configured to be any value. The suggested defaul The "best plausible price" is equal to the exchange rate at the high price of the sell token and the low price of the buy token. The "worst-case price" is equal to the exchange rate at the low price of the sell token and the high price of the sell token, plus an additional discount equal to `maxTradeSlippage`. +### Collateral decimals restriction + +The protocol only supports collateral tokens with up to 21 decimals, and for these cases only supports balances up to `~8e28`. Exceeding this could end up overflowing the `uint96` restrictions in GnosisTrade / EasyAuction. We expect `~70e6` whole tokens (for 21 decimals) to always be worth more than the `minTradeVolume`. Note that even when this assumption breaks, the protocol behaves gracefully and downsizes the GnosisTrade to be within the limits. + +In terms of rounding, with a 21 decimals token, we lose 3 decimal places when rounding down to our 18 decimal fixed point numbers (up to 999 wei). Even if one whole token is worth 1 billion USD, `1e3` wei will only be worth `1e-9` USD in that case. This is an acceptable loss. + #### Trade violation fallback Dutch auctions become disabled for an asset being traded if a trade clears in the geometric phase. The rationale is that a trade that clears in this range (multiples above the plausible price) only does so because either 1) the auctioned asset's price was manipulated downwards, or 2) the bidding asset was manipulated upwards, such that the protocol accepts an unfavorable trade. All subsequent trades for that particular trading pair will be forced to use the batch auctions as a result. Dutch auctions for disabled assets must be manually re-enabled by governance. From 5e0717b9804ec7f596b1bf3a0259d85b53b313ff Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 3 Jul 2024 12:34:01 -0400 Subject: [PATCH 420/450] upload metamorpho audit --- .../Reserve_MetaMorpho_plugins_v2.pdf | Bin 0 -> 442901 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/individual-plugins/Reserve_MetaMorpho_plugins_v2.pdf diff --git a/audits/individual-plugins/Reserve_MetaMorpho_plugins_v2.pdf b/audits/individual-plugins/Reserve_MetaMorpho_plugins_v2.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f0541de3e926137689a0b7e6216af595ca771f73 GIT binary patch literal 442901 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ƴiWC5qF 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

    3{n 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 z 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%0AQ*L*ag=N3G_uO;+C?NIgXSa}zfS=Qtg1Nr~u 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

    N=84Z%G;4O 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 z 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 GLj4 Date: Wed, 3 Jul 2024 13:41:22 -0400 Subject: [PATCH 421/450] upload ETH+/ETH LP audit --- .../individual-plugins/Reserve_ETH_Plus_v1.pdf | Bin 0 -> 456409 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/individual-plugins/Reserve_ETH_Plus_v1.pdf diff --git a/audits/individual-plugins/Reserve_ETH_Plus_v1.pdf b/audits/individual-plugins/Reserve_ETH_Plus_v1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..56fd12f3208014f1e6c9b219b84c750b06c25e60 GIT binary patch literal 456409 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 z%0A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

    {+`?ov{4nX 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⁣Xm($G0+)o

    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%0DM|m3 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 R73CG!SXQsrM;oxQ{1597U@ZUu literal 0 HcmV?d00001 From 6c654f6fc5793356278312be9d4bff24a62cb0ea Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 3 Jul 2024 13:42:55 -0400 Subject: [PATCH 422/450] rename --- ...e_ETH_Plus_v1.pdf => Reserve_ETH_Plus_LP_v1.pdf} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename audits/individual-plugins/{Reserve_ETH_Plus_v1.pdf => Reserve_ETH_Plus_LP_v1.pdf} (100%) diff --git a/audits/individual-plugins/Reserve_ETH_Plus_v1.pdf b/audits/individual-plugins/Reserve_ETH_Plus_LP_v1.pdf similarity index 100% rename from audits/individual-plugins/Reserve_ETH_Plus_v1.pdf rename to audits/individual-plugins/Reserve_ETH_Plus_LP_v1.pdf From 16b615d4e911a6634e3c4f232611ca1921d471c4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 3 Jul 2024 21:57:22 -0400 Subject: [PATCH 423/450] add rounding to _quantity() --- contracts/p0/BasketHandler.sol | 21 +++++++++++++-------- contracts/p1/BasketHandler.sol | 16 ++++++++++------ 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 2b8e9e7439..e860a1dfc9 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -384,7 +384,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) function quantity(IERC20 erc20) public view returns (uint192) { try main.assetRegistry().toColl(erc20) returns (ICollateral coll) { - return _quantity(erc20, coll); + return _quantity(erc20, coll, CEIL); } catch { return FIX_ZERO; } @@ -399,7 +399,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) function quantityUnsafe(IERC20 erc20, IAsset asset) public view returns (uint192) { if (!asset.isCollateral()) return FIX_ZERO; - return _quantity(erc20, ICollateral(address(asset))); + return _quantity(erc20, ICollateral(address(asset)), CEIL); } /// @param erc20 The token contract @@ -408,12 +408,16 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // Returns 0 if coll is not in the basket // Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) - function _quantity(IERC20 erc20, ICollateral coll) internal view returns (uint192) { + function _quantity( + IERC20 erc20, + ICollateral coll, + RoundingMode rounding + ) internal view returns (uint192) { uint192 refPerTok = coll.refPerTok(); if (refPerTok == 0) return FIX_MAX; // {tok/BU} = {ref/BU} / {ref/tok} - return basket.refAmts[erc20].div(refPerTok, CEIL); + return basket.refAmts[erc20].div(refPerTok, rounding); } /// Should not revert @@ -477,17 +481,18 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { view returns (address[] memory erc20s, uint256[] memory quantities) { + IAssetRegistry assetRegistry = main.assetRegistry(); erc20s = new address[](basket.erc20s.length); quantities = new uint256[](basket.erc20s.length); for (uint256 i = 0; i < basket.erc20s.length; ++i) { erc20s[i] = address(basket.erc20s[i]); + ICollateral coll = assetRegistry.toColl(IERC20(erc20s[i])); // {qTok} = {tok/BU} * {BU} * {tok} * {qTok/tok} - quantities[i] = quantity(basket.erc20s[i]).safeMul(amount, rounding).shiftl_toUint( - int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), - rounding - ); + quantities[i] = _quantity(basket.erc20s[i], coll, rounding) + .safeMul(amount, rounding) + .shiftl_toUint(int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), rounding); } } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 4c4d76535b..3408f04028 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -345,7 +345,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) function quantity(IERC20 erc20) public view returns (uint192) { try assetRegistry.toColl(erc20) returns (ICollateral coll) { - return _quantity(erc20, coll); + return _quantity(erc20, coll, CEIL); } catch { return FIX_ZERO; } @@ -360,7 +360,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) function quantityUnsafe(IERC20 erc20, IAsset asset) public view returns (uint192) { if (!asset.isCollateral()) return FIX_ZERO; - return _quantity(erc20, ICollateral(address(asset))); + return _quantity(erc20, ICollateral(address(asset)), CEIL); } /// @param erc20 The token contract @@ -369,12 +369,16 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // Returns 0 if coll is not in the basket // Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) - function _quantity(IERC20 erc20, ICollateral coll) internal view returns (uint192) { + function _quantity( + IERC20 erc20, + ICollateral coll, + RoundingMode rounding + ) internal view returns (uint192) { uint192 refPerTok = coll.refPerTok(); if (refPerTok == 0) return FIX_MAX; // {tok/BU} = {ref/BU} / {ref/tok} - return basket.refAmts[erc20].div(refPerTok, CEIL); + return basket.refAmts[erc20].div(refPerTok, rounding); } /// Should not revert @@ -405,7 +409,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint256 len = basket.erc20s.length; for (uint256 i = 0; i < len; ++i) { - uint192 qty = quantity(basket.erc20s[i]); + uint192 qty = quantity(basket.erc20s[i]); // CEIL rounding if (qty == 0) continue; (uint192 lowP, uint192 highP) = useLotPrice @@ -449,7 +453,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { ICollateral coll = assetRegistry.toColl(IERC20(erc20s[i])); // {qTok} = {tok/BU} * {BU} * {tok} * {qTok/tok} - quantities[i] = _quantity(basket.erc20s[i], coll) + quantities[i] = _quantity(basket.erc20s[i], coll, rounding) .safeMul(amount, rounding) .shiftl_toUint(int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), rounding); } From 321a21688879bd05eca93e971f8130fbf1bdd7f1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 5 Jul 2024 13:41:08 -0400 Subject: [PATCH 424/450] remove comment --- contracts/p0/BasketHandler.sol | 2 -- contracts/p1/BasketHandler.sol | 2 -- 2 files changed, 4 deletions(-) diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index e860a1dfc9..f267727fa2 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -576,8 +576,6 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { quantities[i] = amount .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR) .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR); - // marginally more penalizing than its sibling calculation that uses _quantity() - // because does not intermediately CEIL as part of the division } } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 3408f04028..f21367f6ce 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -545,8 +545,6 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { quantities[i] = amount .safeMulDiv(refAmtsAll[i], collsAll[i].refPerTok(), FLOOR) .shiftl_toUint(int8(collsAll[i].erc20Decimals()), FLOOR); - // marginally more penalizing than its sibling calculation that uses _quantity() - // because does not intermediately CEIL as part of the division } } From 841d92762541796b3d2d474a0eec4f7490491f40 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 5 Jul 2024 14:33:41 -0400 Subject: [PATCH 425/450] add clarifying trackStatus() comments --- contracts/p1/BasketHandler.sol | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index f21367f6ce..d65a3c667c 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -136,7 +136,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { emit BasketSet(nonce, basket.erc20s, refAmts, true); disabled = true; - trackStatus(); + trackStatus(); // does NOT interact with collateral plugins or tokens } /// Switch the basket, only callable directly by governance or after a default @@ -163,6 +163,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { /// Track basket status and collateralization changes // effects: lastStatus' = status(), and lastStatusTimestamp' = current timestamp + /// @dev Does NOT interact with collateral plugins or tokens when basket is disabled /// @custom:refresher function trackStatus() public { // Historical context: This is not the ideal naming for this function but it allowed From 49e83341c916cca5c2c6c48e14db7c3a642bc9d1 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 5 Jul 2024 14:47:01 -0400 Subject: [PATCH 426/450] add comment --- contracts/p1/Distributor.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index 8c4e14cd63..8040eeb03f 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -52,6 +52,7 @@ contract DistributorP1 is ComponentP1, IDistributor { /// Set the RevenueShare for destination `dest`. Destinations `FURNACE` and `ST_RSR` refer to /// main.furnace() and main.stRSR(). + /// Consider calling `BackingManager.forwardRevenue()` before to ensure fair past distribution /// @custom:governance // checks: invariants hold in post-state // effects: @@ -71,6 +72,7 @@ contract DistributorP1 is ComponentP1, IDistributor { /// Set RevenueShares for destinations. Destinations `FURNACE` and `ST_RSR` refer to /// main.furnace() and main.stRSR(). + /// Consider calling `BackingManager.forwardRevenue()` before to ensure fair past distribution /// @custom:governance // checks: invariants hold in post-state // effects: From 0e3fd42431068d95544d66e2ad6e14ac0188fedf Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:47:44 -0300 Subject: [PATCH 427/450] Add comment in version registry (#1170) --- contracts/registry/VersionRegistry.sol | 1 + 1 file changed, 1 insertion(+) diff --git a/contracts/registry/VersionRegistry.sol b/contracts/registry/VersionRegistry.sol index 2fa954fa9e..dad73d302b 100644 --- a/contracts/registry/VersionRegistry.sol +++ b/contracts/registry/VersionRegistry.sol @@ -7,6 +7,7 @@ import { RoleRegistry } from "./RoleRegistry.sol"; /** * @title VersionRegistry * @notice A tiny contract for tracking deployment versions + * All versions registered are expected to include veRSR, so effectively 4.0.0+. */ contract VersionRegistry { mapping(bytes32 => IDeployer) public deployments; From f4cb39a5c5073ed03311086cd71a460c2118c3cd Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:48:19 -0300 Subject: [PATCH 428/450] Add new deployed addrs (#1169) --- docs/deployed-addresses/1-ETH+.md | 26 +++++++++++++------------- docs/deployed-addresses/1-USD3.md | 24 ++++++++++++++++++++++++ docs/deployed-addresses/1-USDC+.md | 2 +- docs/deployed-addresses/1-eUSD.md | 2 +- docs/deployed-addresses/1-hyUSD.md | 2 +- docs/deployed-addresses/8453-Vaya.md | 2 +- docs/deployed-addresses/8453-bsdETH.md | 2 +- docs/deployed-addresses/8453-hyUSD.md | 2 +- docs/deployed-addresses/index.json | 3 ++- scripts/compile-addresses.sh | 4 +++- tasks/deployment/get-addresses.ts | 2 +- 11 files changed, 49 insertions(+), 22 deletions(-) create mode 100644 docs/deployed-addresses/1-USD3.md diff --git a/docs/deployed-addresses/1-ETH+.md b/docs/deployed-addresses/1-ETH+.md index 0445b0a03b..1d22c25ab1 100644 --- a/docs/deployed-addresses/1-ETH+.md +++ b/docs/deployed-addresses/1-ETH+.md @@ -2,23 +2,23 @@ ## Component Addresses | Contract | Address | Implementation | Version | | --- | --- | --- | --- | -| RToken | [0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) |[0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f](https://etherscan.io/address/0xb6f01aa21defa4a4de33bed16bcc06cfd23b6a6f#code) | 3.0.0 | -| Main | [0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2](https://etherscan.io/address/0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2) |[0xf5366f67ff66a3cefcb18809a762d5b5931febf8](https://etherscan.io/address/0xf5366f67ff66a3cefcb18809a762d5b5931febf8#code) | 3.0.0 | -| AssetRegistry | [0xf526f058858E4cD060cFDD775077999562b31bE0](https://etherscan.io/address/0xf526f058858E4cD060cFDD775077999562b31bE0) |[0x773cf50adcf1730964d4a9b664baed4b9ffc2450](https://etherscan.io/address/0x773cf50adcf1730964d4a9b664baed4b9ffc2450#code) | 3.0.0 | -| BackingManager | [0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B](https://etherscan.io/address/0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B) |[0xbbc532a80dd141449330c1232c953da6801aed01](https://etherscan.io/address/0xbbc532a80dd141449330c1232c953da6801aed01#code) | 3.0.1 | -| BasketHandler | [0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194](https://etherscan.io/address/0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194) |[0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc](https://etherscan.io/address/0x5ccca36cbb66a4e4033b08b4f6d7bac96ba55cdc#code) | 3.0.0 | -| Broker | [0x6ca42ce37e5ece334066C504ba37144b4f14D50a](https://etherscan.io/address/0x6ca42ce37e5ece334066C504ba37144b4f14D50a) |[0x9a5f8a9bb91a868b7501139eedb20dc129d28f04](https://etherscan.io/address/0x9a5f8a9bb91a868b7501139eedb20dc129d28f04#code) | 3.0.0 | -| RSRTrader | [0x6E20823cA50aA026b99789c8D468a01f8aA3581C](https://etherscan.io/address/0x6E20823cA50aA026b99789c8D468a01f8aA3581C) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | -| RTokenTrader | [0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9](https://etherscan.io/address/0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9) |[0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af](https://etherscan.io/address/0x5e3e13d3d2a0adfe16f8ef5e7a2992a88e9e65af#code) | 3.0.1 | -| Distributor | [0x954B4770462e8894BcD2451543482F11DC160e1e](https://etherscan.io/address/0x954B4770462e8894BcD2451543482F11DC160e1e) |[0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac](https://etherscan.io/address/0x0e8439a17ba5cbb2d9823c03a02566b9dd5d96ac#code) | 3.0.0 | -| Furnace | [0x9862efAB36F81524B24F787e07C97e2F5A6c206e](https://etherscan.io/address/0x9862efAB36F81524B24F787e07C97e2F5A6c206e) |[0x99580fc649c02347ebc7750524caae5cacf9d34c](https://etherscan.io/address/0x99580fc649c02347ebc7750524caae5cacf9d34c#code) | 3.0.0 | -| StRSR | [0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd](https://etherscan.io/address/0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd) |[0xc98eafc9f249d90e3e35e729e3679dd75a899c10](https://etherscan.io/address/0xc98eafc9f249d90e3e35e729e3679dd75a899c10#code) | 3.0.0 | +| RToken | [0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8](https://etherscan.io/address/0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8) |[0x784955641292b0014bc9ef82321300f0b6c7e36d](https://etherscan.io/address/0x784955641292b0014bc9ef82321300f0b6c7e36d#code) | 3.4.0 | +| Main | [0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2](https://etherscan.io/address/0xb6A7d481719E97e142114e905E86a39a2Fa0dfD2) |[0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7](https://etherscan.io/address/0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7#code) | 3.4.0 | +| AssetRegistry | [0xf526f058858E4cD060cFDD775077999562b31bE0](https://etherscan.io/address/0xf526f058858E4cD060cFDD775077999562b31bE0) |[0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463](https://etherscan.io/address/0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463#code) | 3.4.0 | +| BackingManager | [0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B](https://etherscan.io/address/0x608e1e01EF072c15E5Da7235ce793f4d24eCa67B) |[0x20c801869e578e71f2298649870765aa81f7dc69](https://etherscan.io/address/0x20c801869e578e71f2298649870765aa81f7dc69#code) | 3.4.0 | +| BasketHandler | [0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194](https://etherscan.io/address/0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194) |[0xee7fc703f84ae2ce30475333c57e56d3a7d3adbc](https://etherscan.io/address/0xee7fc703f84ae2ce30475333c57e56d3a7d3adbc#code) | 3.4.0 | +| Broker | [0x6ca42ce37e5ece334066C504ba37144b4f14D50a](https://etherscan.io/address/0x6ca42ce37e5ece334066C504ba37144b4f14D50a) |[0x62bd44b05542bff1e59a01bf7151f533e1c9c12c](https://etherscan.io/address/0x62bd44b05542bff1e59a01bf7151f533e1c9c12c#code) | 3.4.0 | +| RSRTrader | [0x6E20823cA50aA026b99789c8D468a01f8aA3581C](https://etherscan.io/address/0x6E20823cA50aA026b99789c8D468a01f8aA3581C) |[0xc60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c](https://etherscan.io/address/0xc60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c#code) | 3.4.0 | +| RTokenTrader | [0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9](https://etherscan.io/address/0x977cb0e300a58978f597fc65ED5a2D2784D2DCF9) |[0xc60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c](https://etherscan.io/address/0xc60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c#code) | 3.4.0 | +| Distributor | [0x954B4770462e8894BcD2451543482F11DC160e1e](https://etherscan.io/address/0x954B4770462e8894BcD2451543482F11DC160e1e) |[0x44a42a0f14128e81a21c5fc4322a9f91ff83b4ee](https://etherscan.io/address/0x44a42a0f14128e81a21c5fc4322a9f91ff83b4ee#code) | 3.4.0 | +| Furnace | [0x9862efAB36F81524B24F787e07C97e2F5A6c206e](https://etherscan.io/address/0x9862efAB36F81524B24F787e07C97e2F5A6c206e) |[0x845b8b0a1c6db8318414d708da25fa28d4a0dc81](https://etherscan.io/address/0x845b8b0a1c6db8318414d708da25fa28d4a0dc81#code) | 3.4.0 | +| StRSR | [0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd](https://etherscan.io/address/0xffa151Ad0A0e2e40F39f9e5E9F87cF9E45e819dd) |[0xe433673648c94fec0706e5ac95d4f4097f58b5fb](https://etherscan.io/address/0xe433673648c94fec0706e5ac95d4f4097f58b5fb#code) | 3.4.0 | ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0x239cDcBE174B4728c870A24F77540dAB3dC5F981](https://etherscan.io/address/0x239cDcBE174B4728c870A24F77540dAB3dC5F981) | -| Timelock | [0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B](https://etherscan.io/address/0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B) | +| Governor | [0x868Fe81C276d730A1995Dc84b642E795dFb8F753](https://etherscan.io/address/0x868Fe81C276d730A1995Dc84b642E795dFb8F753) | +| Timelock | [0x5d8A7DC9405F08F14541BA918c1Bf7eb2dACE556](https://etherscan.io/address/0x5d8A7DC9405F08F14541BA918c1Bf7eb2dACE556) | \ No newline at end of file diff --git a/docs/deployed-addresses/1-USD3.md b/docs/deployed-addresses/1-USD3.md new file mode 100644 index 0000000000..ab245fea85 --- /dev/null +++ b/docs/deployed-addresses/1-USD3.md @@ -0,0 +1,24 @@ +# [USD3 (Web 3 Dollar) - Mainnet](https://etherscan.io/address/0x0d86883FAf4FfD7aEb116390af37746F45b6f378) +## Component Addresses +| Contract | Address | Implementation | Version | +| --- | --- | --- | --- | +| RToken | [0x0d86883FAf4FfD7aEb116390af37746F45b6f378](https://etherscan.io/address/0x0d86883FAf4FfD7aEb116390af37746F45b6f378) |[0x784955641292b0014bc9ef82321300f0b6c7e36d](https://etherscan.io/address/0x784955641292b0014bc9ef82321300f0b6c7e36d#code) | 3.4.0 | +| Main | [0x81117e3e98910C3dCF956b5Fc97a7212E047AcF4](https://etherscan.io/address/0x81117e3e98910C3dCF956b5Fc97a7212E047AcF4) |[0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7](https://etherscan.io/address/0x24a4b37f9c40fb0e80ec436df2e9989fbafa8bb7#code) | 3.4.0 | +| AssetRegistry | [0xd75C9768c8EC003B792AFAC35d0bBacB44B5e500](https://etherscan.io/address/0xd75C9768c8EC003B792AFAC35d0bBacB44B5e500) |[0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463](https://etherscan.io/address/0xbf1c0206de440b2cf76ea4405e1dbf2fc227a463#code) | 3.4.0 | +| BackingManager | [0x4B0b3d40b0623f3a9eac09d2E01F592710ee59F0](https://etherscan.io/address/0x4B0b3d40b0623f3a9eac09d2E01F592710ee59F0) |[0x20c801869e578e71f2298649870765aa81f7dc69](https://etherscan.io/address/0x20c801869e578e71f2298649870765aa81f7dc69#code) | 3.4.0 | +| BasketHandler | [0x19835E5817A6fDC944100E86da2FCe86327457B8](https://etherscan.io/address/0x19835E5817A6fDC944100E86da2FCe86327457B8) |[0xee7fc703f84ae2ce30475333c57e56d3a7d3adbc](https://etherscan.io/address/0xee7fc703f84ae2ce30475333c57e56d3a7d3adbc#code) | 3.4.0 | +| Broker | [0x06d6d1d71761Eb101448574728ECB30deFf4B95d](https://etherscan.io/address/0x06d6d1d71761Eb101448574728ECB30deFf4B95d) | +| RSRTrader | [0x1Ae6D94992e87056A92bA2e9Eb54cf3ad3EF55D6](https://etherscan.io/address/0x1Ae6D94992e87056A92bA2e9Eb54cf3ad3EF55D6) | +| RTokenTrader | [0x52D307A4ee4E42a799B3354ad54564A5b4CfC260](https://etherscan.io/address/0x52D307A4ee4E42a799B3354ad54564A5b4CfC260) | +| Distributor | [0xcE08baB702CC1B041eEb151281Ac01Da3F8698c8](https://etherscan.io/address/0xcE08baB702CC1B041eEb151281Ac01Da3F8698c8) | +| Furnace | [0xfE52b7a53AcA0e2D155434E2c613F766D140fea8](https://etherscan.io/address/0xfE52b7a53AcA0e2D155434E2c613F766D140fea8) |[0x845b8b0a1c6db8318414d708da25fa28d4a0dc81](https://etherscan.io/address/0x845b8b0a1c6db8318414d708da25fa28d4a0dc81#code) | 3.4.0 | +| StRSR | [0x55230B05d4c1F4a0B4f804dc52919F06355DfBF8](https://etherscan.io/address/0x55230B05d4c1F4a0B4f804dc52919F06355DfBF8) |[0xe433673648c94fec0706e5ac95d4f4097f58b5fb](https://etherscan.io/address/0xe433673648c94fec0706e5ac95d4f4097f58b5fb#code) | 3.4.0 | + + +## Governance Addresses +| Contract | Address | +| --- | --- | +| Governor | [0x441808e20E625e0094b01B40F84af89436229279](https://etherscan.io/address/0x441808e20E625e0094b01B40F84af89436229279) | +| Timelock | [0x12e4F043c6464984A45173E0444105058b6C3c7B](https://etherscan.io/address/0x12e4F043c6464984A45173E0444105058b6C3c7B) | + + \ No newline at end of file diff --git a/docs/deployed-addresses/1-USDC+.md b/docs/deployed-addresses/1-USDC+.md index ace1aba0ab..b2a1e67802 100644 --- a/docs/deployed-addresses/1-USDC+.md +++ b/docs/deployed-addresses/1-USDC+.md @@ -18,7 +18,7 @@ ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0xc837C557071D604bCb1058c8c4891ddBe8FDD630](https://etherscan.io/address/0xc837C557071D604bCb1058c8c4891ddBe8FDD630) | +| Governor | [0xc837C557071D604bCb1058c8c4891ddBe8FDD630](https://etherscan.io/address/0xc837C557071D604bCb1058c8c4891ddBe8FDD630) | | Timelock | [0x6C957417cB6DF6e821eec8555DEE8b116C291999](https://etherscan.io/address/0x6C957417cB6DF6e821eec8555DEE8b116C291999) | \ No newline at end of file diff --git a/docs/deployed-addresses/1-eUSD.md b/docs/deployed-addresses/1-eUSD.md index b9c18bfba8..d9c2444d41 100644 --- a/docs/deployed-addresses/1-eUSD.md +++ b/docs/deployed-addresses/1-eUSD.md @@ -18,7 +18,7 @@ ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8](https://etherscan.io/address/0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8) | +| Governor | [0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8](https://etherscan.io/address/0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8) | | Timelock | [0x7BEa807798313fE8F557780dBD6b829c1E3aD560](https://etherscan.io/address/0x7BEa807798313fE8F557780dBD6b829c1E3aD560) | \ No newline at end of file diff --git a/docs/deployed-addresses/1-hyUSD.md b/docs/deployed-addresses/1-hyUSD.md index 91c465e3f6..44959a599e 100644 --- a/docs/deployed-addresses/1-hyUSD.md +++ b/docs/deployed-addresses/1-hyUSD.md @@ -18,7 +18,7 @@ ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe](https://etherscan.io/address/0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe) | +| Governor | [0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe](https://etherscan.io/address/0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe) | | Timelock | [0x788Fd297B4d497e44e4BF25d642fbecA3018B5d2](https://etherscan.io/address/0x788Fd297B4d497e44e4BF25d642fbecA3018B5d2) | \ No newline at end of file diff --git a/docs/deployed-addresses/8453-Vaya.md b/docs/deployed-addresses/8453-Vaya.md index 04ae8fc6f6..1e72f836be 100644 --- a/docs/deployed-addresses/8453-Vaya.md +++ b/docs/deployed-addresses/8453-Vaya.md @@ -18,7 +18,7 @@ ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0xEb583EA06501f92E994C353aD2741A35582987aA](https://basescan.org/address/0xEb583EA06501f92E994C353aD2741A35582987aA) | +| Governor | [0xEb583EA06501f92E994C353aD2741A35582987aA](https://basescan.org/address/0xEb583EA06501f92E994C353aD2741A35582987aA) | | Timelock | [0xeE3eC997A37e661a42673D7A489Fbf0E5ed0C223](https://basescan.org/address/0xeE3eC997A37e661a42673D7A489Fbf0E5ed0C223) | \ No newline at end of file diff --git a/docs/deployed-addresses/8453-bsdETH.md b/docs/deployed-addresses/8453-bsdETH.md index 00e7620fd2..9aa3ad000b 100644 --- a/docs/deployed-addresses/8453-bsdETH.md +++ b/docs/deployed-addresses/8453-bsdETH.md @@ -18,7 +18,7 @@ ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0x21fBa52dA03e1F964fa521532f8B8951fC212055](https://basescan.org/address/0x21fBa52dA03e1F964fa521532f8B8951fC212055) | +| Governor | [0x21fBa52dA03e1F964fa521532f8B8951fC212055](https://basescan.org/address/0x21fBa52dA03e1F964fa521532f8B8951fC212055) | | Timelock | [0xe664d294824C2A8C952A10c4034e1105d2907F46](https://basescan.org/address/0xe664d294824C2A8C952A10c4034e1105d2907F46) | \ No newline at end of file diff --git a/docs/deployed-addresses/8453-hyUSD.md b/docs/deployed-addresses/8453-hyUSD.md index afd96d98b8..08f1a85804 100644 --- a/docs/deployed-addresses/8453-hyUSD.md +++ b/docs/deployed-addresses/8453-hyUSD.md @@ -18,7 +18,7 @@ ## Governance Addresses | Contract | Address | | --- | --- | -| Governor Alexios | [0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128](https://basescan.org/address/0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128) | +| Governor | [0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128](https://basescan.org/address/0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128) | | Timelock | [0x4284D76a03F9B398FF7aEc58C9dEc94b289070CF](https://basescan.org/address/0x4284D76a03F9B398FF7aEc58C9dEc94b289070CF) | \ No newline at end of file diff --git a/docs/deployed-addresses/index.json b/docs/deployed-addresses/index.json index 421a48105a..ce55f2667d 100644 --- a/docs/deployed-addresses/index.json +++ b/docs/deployed-addresses/index.json @@ -20,7 +20,8 @@ "eUSD", "ETH+", "hyUSD", - "USDC+" + "USDC+", + "USD3" ] }, "base": { diff --git a/scripts/compile-addresses.sh b/scripts/compile-addresses.sh index f22a437718..1a9e9f2891 100755 --- a/scripts/compile-addresses.sh +++ b/scripts/compile-addresses.sh @@ -7,7 +7,7 @@ npx hardhat get-addys --rtoken 0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F --gov 0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8 --network mainnet # ETH+ -npx hardhat get-addys --rtoken 0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8 --gov 0x239cDcBE174B4728c870A24F77540dAB3dC5F981 --network mainnet +npx hardhat get-addys --rtoken 0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8 --gov 0x868Fe81C276d730A1995Dc84b642E795dFb8F753 --network mainnet # hyUSD npx hardhat get-addys --rtoken 0xaCdf0DBA4B9839b96221a8487e9ca660a48212be --gov 0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe --network mainnet @@ -15,6 +15,8 @@ npx hardhat get-addys --rtoken 0xaCdf0DBA4B9839b96221a8487e9ca660a48212be --gov # USDC+ npx hardhat get-addys --rtoken 0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b --gov 0xc837C557071D604bCb1058c8c4891ddBe8FDD630 --network mainnet +# USD3 +npx hardhat get-addys --rtoken 0x0d86883FAf4FfD7aEb116390af37746F45b6f378 --gov 0x441808e20E625e0094b01B40F84af89436229279 --network mainnet # *** Base L2 *** diff --git a/tasks/deployment/get-addresses.ts b/tasks/deployment/get-addresses.ts index f8433460d4..6adbfd0a87 100644 --- a/tasks/deployment/get-addresses.ts +++ b/tasks/deployment/get-addresses.ts @@ -221,7 +221,7 @@ ${collaterals} } const govComponents = [ - { name: 'Governor Alexios', address: params.gov }, + { name: 'Governor', address: params.gov }, { name: 'Timelock', address: timelock }, ] From dc42b06aa34045203c3cf3a81e26064401b0f505 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:49:24 -0300 Subject: [PATCH 429/450] Run prettier (#1168) --- common/blockchain-utils.ts | 6 +- contracts/plugins/mocks/CTokenMock.sol | 2 +- contracts/plugins/mocks/ChainlinkMock.sol | 7 +- .../plugins/mocks/InvalidChainlinkMock.sol | 7 +- contracts/plugins/mocks/UnpricedPlugins.sol | 30 +++-- .../addresses/1-tmp-assets-collateral.json | 2 +- .../421614-tmp-deployments.json | 2 +- .../8453-tmp-assets-collateral.json | 2 +- .../8453-tmp-assets-collateral.json | 2 +- .../base-3.0.1/8453-tmp-deployments.json | 2 +- .../8453-tmp-assets-collateral.json | 2 +- .../1-tmp-assets-collateral.json | 2 +- .../1-tmp-assets-collateral.json | 2 +- .../mainnet-3.0.1/1-tmp-deployments.json | 2 +- .../1-tmp-assets-collateral.json | 2 +- .../mainnet-3.3.0/1-tmp-deployments.json | 2 +- .../deploy_stargate_usdt_collateral.ts | 4 +- scripts/refresh-whales.ts | 108 ++++++++++-------- scripts/verification/assets/verify_stg.ts | 8 +- .../verify_stargate_usdc.ts | 70 ++++++------ tasks/deployment/get-addresses.ts | 42 +++---- tasks/validation/whales/whales_31337.json | 2 +- 22 files changed, 176 insertions(+), 132 deletions(-) diff --git a/common/blockchain-utils.ts b/common/blockchain-utils.ts index bf34e006b4..a5440f8147 100644 --- a/common/blockchain-utils.ts +++ b/common/blockchain-utils.ts @@ -23,13 +23,13 @@ export const getChainId = async (hre: HardhatRuntimeEnvironment): Promise { @@ -51,61 +51,66 @@ async function main() { const isGoodWhale = (whale: string) => { return !stRSRs.includes(whale) } - + const getBigWhale = async (token: string) => { const ethUrl = `https://${SCANNER_URLS[FORK_NETWORK]}/token/generic-tokenholders2?m=light&a=${token}&p=1` // const response = await axios.get(ethUrl); if (FORK_NETWORK === 'mainnet') { - const response = await axios.get(ethUrl); - const selector = cheerio.load(response.data); - let found = false; - let i = 0; - let whale = ""; + const response = await axios.get(ethUrl) + const selector = cheerio.load(response.data) + let found = false + let i = 0 + let whale = '' while (!found) { - whale = selector(selector("tbody > tr")[i]).find("td > div > .link-secondary")[0].attribs['data-clipboard-text']; + whale = selector(selector('tbody > tr')[i]).find('td > div > .link-secondary')[0].attribs[ + 'data-clipboard-text' + ] if (isGoodWhale(whale)) { - found = true; - break; + found = true + break } - i++; + i++ } return whale } else if (FORK_NETWORK === 'base') { const response = await fetch(ethUrl, { - "headers": { - "accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7", - "accept-language": "en-US,en;q=0.9", - "cache-control": "max-age=0", - "priority": "u=0, i", - "sec-ch-ua": "\"Chromium\";v=\"124\", \"Google Chrome\";v=\"124\", \"Not-A.Brand\";v=\"99\"", - "sec-ch-ua-mobile": "?0", - "sec-ch-ua-platform": "\"macOS\"", - "sec-fetch-dest": "document", - "sec-fetch-mode": "navigate", - "sec-fetch-site": "none", - "sec-fetch-user": "?1", - "upgrade-insecure-requests": "1" + headers: { + accept: + 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7', + 'accept-language': 'en-US,en;q=0.9', + 'cache-control': 'max-age=0', + priority: 'u=0, i', + 'sec-ch-ua': '"Chromium";v="124", "Google Chrome";v="124", "Not-A.Brand";v="99"', + 'sec-ch-ua-mobile': '?0', + 'sec-ch-ua-platform': '"macOS"', + 'sec-fetch-dest': 'document', + 'sec-fetch-mode': 'navigate', + 'sec-fetch-site': 'none', + 'sec-fetch-user': '?1', + 'upgrade-insecure-requests': '1', }, - "referrerPolicy": "strict-origin-when-cross-origin", - "body": null, - "method": "GET", - "mode": "cors", - "credentials": "include" - }); - const selector = cheerio.load(await response.text()); - let found = false; - let i = 0; - let whale = ""; + referrerPolicy: 'strict-origin-when-cross-origin', + body: null, + method: 'GET', + mode: 'cors', + credentials: 'include', + }) + const selector = cheerio.load(await response.text()) + let found = false + let i = 0 + let whale = '' while (!found) { - whale = selector(selector("tbody > tr")[i]).find("td > span > a")[0].attribs['href'].split('?a=')[1]; + whale = selector(selector('tbody > tr')[i]) + .find('td > span > a')[0] + .attribs['href'].split('?a=')[1] if (isGoodWhale(whale)) { - found = true; - break; + found = true + break } - i++; + i++ } - return whale; + return whale } else { throw new Error('Invalid network') } @@ -117,7 +122,12 @@ async function main() { let tokenWhale = whales.tokens[tokenAddress] let lastUpdated = whales.lastUpdated[tokenAddress] // only get a big whale if the whale is not already set or if it was last updated more than 1 day ago - if (!FORCE_REFRESH && tokenWhale && lastUpdated && new Date().getTime() - new Date(lastUpdated).getTime() < 86400000) { + if ( + !FORCE_REFRESH && + tokenWhale && + lastUpdated && + new Date().getTime() - new Date(lastUpdated).getTime() < 86400000 + ) { console.log('Whale already set for', tokenAddress, 'skipping...') return } @@ -133,7 +143,7 @@ async function main() { console.error('Error getting whale for', tokenAddress, error) } } - + // ERC20 Collaterals const tokens: ITokensKeys = Object.keys(networkConfig[chainId].tokens) as ITokensKeys for (let i = 0; i < tokens.length; i++) { @@ -155,4 +165,4 @@ main() .catch((error) => { console.error(error) process.exit(1) - }) \ No newline at end of file + }) diff --git a/scripts/verification/assets/verify_stg.ts b/scripts/verification/assets/verify_stg.ts index 794d417834..874254e465 100644 --- a/scripts/verification/assets/verify_stg.ts +++ b/scripts/verification/assets/verify_stg.ts @@ -2,7 +2,13 @@ import hre from 'hardhat' import { getChainId } from '../../../common/blockchain-utils' import { developmentChains, networkConfig } from '../../../common/configuration' -import { getAssetCollDeploymentFilename, getDeploymentFile, getDeploymentFilename, IAssetCollDeployments, IDeployments } from '../../deployment/common' +import { + getAssetCollDeploymentFilename, + getDeploymentFile, + getDeploymentFilename, + IAssetCollDeployments, + IDeployments, +} from '../../deployment/common' import { verifyContract } from '../../deployment/utils' import { fp } from '../../../common/numbers' diff --git a/scripts/verification/collateral-plugins/verify_stargate_usdc.ts b/scripts/verification/collateral-plugins/verify_stargate_usdc.ts index 3973a5ee55..56ab328ffa 100644 --- a/scripts/verification/collateral-plugins/verify_stargate_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_stargate_usdc.ts @@ -7,7 +7,13 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { priceTimeout, oracleTimeout, verifyContract, combinedError, revenueHiding } from '../../deployment/utils' +import { + priceTimeout, + oracleTimeout, + verifyContract, + combinedError, + revenueHiding, +} from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -33,16 +39,16 @@ async function main() { const sUSDC = networkConfig[chainId].tokens.sUSDC await verifyContract( - chainId, - deployments.erc20s.wsgUSDC, - [ - name, - symbol, - networkConfig[chainId].tokens.STG, - networkConfig[chainId].STARGATE_STAKING_CONTRACT, - sUSDC - ], - 'contracts/plugins/assets/stargate/StargateRewardableWrapper.sol:StargateRewardableWrapper' + chainId, + deployments.erc20s.wsgUSDC, + [ + name, + symbol, + networkConfig[chainId].tokens.STG, + networkConfig[chainId].STARGATE_STAKING_CONTRACT, + sUSDC, + ], + 'contracts/plugins/assets/stargate/StargateRewardableWrapper.sol:StargateRewardableWrapper' ) const oracleError = fp('0.0025') // 0.25% @@ -62,7 +68,7 @@ async function main() { defaultThreshold: fp('0.01').add(oracleError).toString(), delayUntilDefault: bn('86400').toString(), // 24h }, - revenueHiding.toString() + revenueHiding.toString(), ], 'contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol:StargatePoolFiatCollateral' ) @@ -72,16 +78,16 @@ async function main() { const sUSDC = networkConfig[chainId].tokens.sUSDbC await verifyContract( - chainId, - deployments.erc20s.wsgUSDbC, - [ - name, - symbol, - networkConfig[chainId].tokens.STG, - networkConfig[chainId].STARGATE_STAKING_CONTRACT, - sUSDC - ], - 'contracts/plugins/assets/stargate/StargateRewardableWrapper.sol:StargateRewardableWrapper' + chainId, + deployments.erc20s.wsgUSDbC, + [ + name, + symbol, + networkConfig[chainId].tokens.STG, + networkConfig[chainId].STARGATE_STAKING_CONTRACT, + sUSDC, + ], + 'contracts/plugins/assets/stargate/StargateRewardableWrapper.sol:StargateRewardableWrapper' ) const oracleError = fp('0.003') // 0.3% @@ -91,17 +97,17 @@ async function main() { deployments.collateral.wsgUSDbC, [ { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig['8453'].chainlinkFeeds.USDC!, - oracleError: oracleError.toString(), - erc20: deployments.erc20s.wsgUSDbC!, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: oracleTimeout('8453', '86400').toString(), // 24h hr, - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(oracleError).toString(), // ~2.5% - delayUntilDefault: bn('86400').toString(), // 24h + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig['8453'].chainlinkFeeds.USDC!, + oracleError: oracleError.toString(), + erc20: deployments.erc20s.wsgUSDbC!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: oracleTimeout('8453', '86400').toString(), // 24h hr, + targetName: hre.ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h }, - revenueHiding.toString() + revenueHiding.toString(), ], 'contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol:StargatePoolFiatCollateral' ) diff --git a/tasks/deployment/get-addresses.ts b/tasks/deployment/get-addresses.ts index f8433460d4..f230a33ec1 100644 --- a/tasks/deployment/get-addresses.ts +++ b/tasks/deployment/get-addresses.ts @@ -23,19 +23,19 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') /* Helper functions */ - - // hacky api throttler, basescan has rate limits 5req/sec - const delay = async (ms: number) => { - return new Promise( resolve => setTimeout(resolve, ms) ); + + // hacky api throttler, basescan has rate limits 5req/sec + const delay = async (ms: number) => { + return new Promise((resolve) => setTimeout(resolve, ms)) } - + const capitalize = (s: string) => s && s[0].toUpperCase() + s.slice(1) - + const chainId = await getChainId(hre) const network: Network = hre.network.name as Network - let scannerUrl: string; - let scannerApiUrl: string; - switch(network) { + let scannerUrl: string + let scannerApiUrl: string + switch (network) { case 'mainnet': scannerUrl = 'https://etherscan.io/address/' scannerApiUrl = `https://api.etherscan.io/api` @@ -65,7 +65,9 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') const component = await hre.ethers.getContractAt('ComponentP1', address) let row = `| ${name} | [${address}](${scannerUrl}${address}) |` if (!!implementation) { - row += `[${implementation}](${scannerUrl}${implementation}#code) | ${await getVersion(component)} |` + row += `[${implementation}](${scannerUrl}${implementation}#code) | ${await getVersion( + component + )} |` } return row } @@ -95,8 +97,8 @@ task('get-addys', 'Compile the deployed addresses of an RToken deployment') isRToken ? rows.push(await createRTokenTableRow(component.name, component.address)) : isComponent - ? rows.push(await createComponentTableRow(component.name, component.address)) - : rows.push(await createAssetTableRow(component.name, component.address)) + ? rows.push(await createComponentTableRow(component.name, component.address)) + : rows.push(await createAssetTableRow(component.name, component.address)) } return rows.join('\n') } @@ -125,10 +127,7 @@ ${govRows} ` } - const createComponentMarkdown = async ( - name: string, - rows: string - ) => { + const createComponentMarkdown = async (name: string, rows: string) => { return `# ${name} ## Component Addresses | Contract | Address | Version | @@ -181,7 +180,7 @@ ${collaterals} if (params.rtoken && params.gov) { // if rtoken address is provided, print component addresses - + const rToken = await hre.ethers.getContractAt('IRToken', params.rtoken) const symbol = await rToken.symbol() console.log(`Collecting addresses for RToken: ${symbol} (${params.rtoken}))`) @@ -239,11 +238,11 @@ ${collaterals} const rTokenFileName = await getRTokenFileName(params.rtoken) fs.writeFileSync(rTokenFileName, markdown) console.log(`Wrote ${rTokenFileName}`) - - toc[network]['rtokens'].indexOf(rTokenSymbol) === -1 && toc[network]['rtokens'].push(rTokenSymbol) + + toc[network]['rtokens'].indexOf(rTokenSymbol) === -1 && + toc[network]['rtokens'].push(rTokenSymbol) fs.writeFileSync(tocFilename, JSON.stringify(toc, null, 2)) console.log(`Updated table of contents`) - } else if (params.ver) { console.log(`Collecting addresses for Version: ${params.ver} (${hre.network.name})`) // if version is provided, print implementation addresses @@ -306,7 +305,8 @@ ${collaterals} fs.writeFileSync(componentFileName, componentMarkdown) console.log(`Wrote ${componentFileName}`) - toc[network]['components'].indexOf(componentFileId) === -1 && toc[network]['components'].push(componentFileId) + toc[network]['components'].indexOf(componentFileId) === -1 && + toc[network]['components'].push(componentFileId) toc[network]['assets'].indexOf(assetFileId) === -1 && toc[network]['assets'].push(assetFileId) fs.writeFileSync(tocFilename, JSON.stringify(toc, null, 2)) console.log(`Updated table of contents`) diff --git a/tasks/validation/whales/whales_31337.json b/tasks/validation/whales/whales_31337.json index 808ba0a19b..65eb040129 100644 --- a/tasks/validation/whales/whales_31337.json +++ b/tasks/validation/whales/whales_31337.json @@ -137,4 +137,4 @@ "0x0d86883faf4ffd7aeb116390af37746f45b6f378": "2024-05-01T16:12:40.659Z", "0x78da5799cf427fee11e9996982f4150ece7a99a7": "2024-05-01T16:12:40.776Z" } -} \ No newline at end of file +} From 297d06e5d75c5211dd3097d907d4fbf647d49e21 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Fri, 5 Jul 2024 18:49:55 -0300 Subject: [PATCH 430/450] Add explicit rounding direction (#1167) --- contracts/facade/facets/ReadFacet.sol | 4 +--- .../curve/CurveStableMetapoolCollateral.sol | 24 +++++++++++++++---- .../yearnv2/YearnV2CurveFiatCollateral.sol | 2 +- contracts/plugins/trading/GnosisTrade.sol | 2 +- 4 files changed, 23 insertions(+), 9 deletions(-) diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index f83cb5ed68..98b1be2f47 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -69,9 +69,7 @@ contract ReadFacet { uint192 mid = (low + high) / 2; // {UoA} = {tok} * {UoA/Tok} - depositsUoA[i] = shiftl_toFix(deposits[i], -int8(asset.erc20Decimals()), FLOOR).mul( - mid - ); + depositsUoA[i] = shiftl_toFix(deposits[i], -int8(asset.erc20Decimals()), CEIL).mul(mid); } } diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 3a49b1bd77..3519301e67 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -108,7 +108,11 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { (uint192 aumLow, uint192 aumHigh) = _metapoolBalancesValue(lowPaired, highPaired); // {tok} -- FLOOR - uint192 supply = shiftl_toFix(metapoolToken.totalSupply(), -int8(metapoolToken.decimals())); + uint192 supply = shiftl_toFix( + metapoolToken.totalSupply(), + -int8(metapoolToken.decimals()), + FLOOR + ); // We can always assume that the total supply is sufficiently non-zero // {UoA/tok} = {UoA} / {tok} @@ -170,7 +174,11 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { (uint192 underlyingAumLow, uint192 underlyingAumHigh) = totalBalancesValue(); // {tokUnderlying} -- FLOOR - uint192 underlyingSupply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); + uint192 underlyingSupply = shiftl_toFix( + lpToken.totalSupply(), + -int8(lpToken.decimals()), + FLOOR + ); // We can always assume that the underlying supply is sufficiently non-zero // {UoA/tokUnderlying} = {UoA} / {tokUnderlying} @@ -178,14 +186,22 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { uint192 underlyingHigh = underlyingAumHigh.div(underlyingSupply, CEIL); // {tokUnderlying} -- FLOOR - uint192 balUnderlying = shiftl_toFix(metapoolToken.balances(1), -int8(lpToken.decimals())); + uint192 balUnderlying = shiftl_toFix( + metapoolToken.balances(1), + -int8(lpToken.decimals()), + FLOOR + ); // {UoA} = {UoA/tokUnderlying} * {tokUnderlying} aumLow = underlyingLow.mul(balUnderlying, FLOOR); aumHigh = underlyingHigh.mul(balUnderlying, CEIL); // {pairedTok} -- FLOOR - uint192 pairedBal = shiftl_toFix(metapoolToken.balances(0), -int8(pairedToken.decimals())); + uint192 pairedBal = shiftl_toFix( + metapoolToken.balances(0), + -int8(pairedToken.decimals()), + FLOOR + ); // Add-in contribution from pairedTok // {UoA} = {UoA} + {UoA/pairedTok} * {pairedTok} diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 7644f58759..2bb8d26340 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -64,7 +64,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); // {LP token} - uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals())); + uint192 supply = shiftl_toFix(lpToken.totalSupply(), -int8(lpToken.decimals()), FLOOR); // We can always assume that the total supply is non-zero // {UoA/LP token} = {UoA} / {LP token} diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 391cc2ee2d..3d67a33d02 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -94,7 +94,7 @@ contract GnosisTrade is ITrade, Versioned { sell = req.sell.erc20(); buy = req.buy.erc20(); - sellAmount = shiftl_toFix(req.sellAmount, -int8(sell.decimals())); // {sellTok} + sellAmount = shiftl_toFix(req.sellAmount, -int8(sell.decimals()), FLOOR); // {sellTok} initBal = sell.balanceOf(address(this)); // {qSellTok} require(initBal >= req.sellAmount, "unfunded trade"); From f25f6c35a032fb91d91dccd04a79469813e76fe4 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 9 Jul 2024 12:38:14 -0300 Subject: [PATCH 431/450] fix revenue hiding test (#1171) --- .../individual-collateral/mountain/USDMCollateral.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts b/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts index 49205edd0e..570c60345f 100644 --- a/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts +++ b/test/plugins/individual-collateral/mountain/USDMCollateral.test.ts @@ -204,7 +204,7 @@ const collateralSpecificStatusTests = () => { const [, alice] = await ethers.getSigners() const tempCtx = await makeCollateralFixtureContext(alice, { erc20: ARB_WUSDM, - revenueHiding: fp('0.01'), + revenueHiding: fp('0.0101'), })() // Set correct price to maintain peg From d47d99678d471c541968b5d7860d40b263681a40 Mon Sep 17 00:00:00 2001 From: Julian R Date: Tue, 9 Jul 2024 14:10:47 -0300 Subject: [PATCH 432/450] easy auction test case --- test/integration/EasyAuction.test.ts | 74 ++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 5674ba344c..0a352269bc 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -23,9 +23,11 @@ import { TradeKind, QUEUE_START, MAX_UINT48, + MAX_UINT96, MAX_UINT192, ONE_ADDRESS, PAUSER, + ZERO_ADDRESS, } from '../../common/constants' import { advanceTime, getLatestBlockTimestamp } from '../utils/time' import { expectTrade, getAuctionId, getTrade } from '../utils/trades' @@ -689,6 +691,78 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function }) }) + describe(`Trading limitations`, () => { + it('EasyAuction reverts when sum of bids > type(uint96).max', async () => { + const sellAmount = fp('1') + const endTime = (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength) + const minBuyAmount = MAX_UINT96.sub(1) + + // Mints tokens + await token0.connect(owner).mint(owner.address, sellAmount) + await token1.connect(owner).mint(addr1.address, MAX_UINT96) + await token1.connect(owner).mint(addr2.address, MAX_UINT96) + + // Start auction + await token0.connect(owner).approve(easyAuction.address, sellAmount) + + // Get auction Id + const auctionId = await easyAuction.callStatic.initiateAuction( + token0.address, + token1.address, + endTime, + endTime, + sellAmount, + minBuyAmount, + 1, + 0, + false, + ZERO_ADDRESS, + new Uint8Array(0) + ) + + // Initiate auction + await easyAuction.initiateAuction( + token0.address, + token1.address, + endTime, + endTime, + sellAmount, + minBuyAmount, + 1, + 0, + false, + ZERO_ADDRESS, + new Uint8Array(0) + ) + + // Perform first bid + await token1.connect(addr1).approve(easyAuction.address, minBuyAmount.sub(1)) + await easyAuction.connect(addr1).placeSellOrders( + auctionId, + [1], + [minBuyAmount.sub(1)], // falls short + [QUEUE_START], + ethers.constants.HashZero + ) + + // Perform second bid + await token1.connect(addr2).approve(easyAuction.address, minBuyAmount) + await easyAuction.connect(addr2).placeSellOrders( + auctionId, + [1], + [minBuyAmount.sub(1)], // Sum will exceed uint96.MAX + [QUEUE_START], + ethers.constants.HashZero + ) + + // Attempt to settle - should revert + await advanceTime(config.batchAuctionLength.add(100).toString()) + await expect(easyAuction.settleAuction(auctionId)).to.be.revertedWith( + "SafeCast: value doesn't fit in 96 bits" + ) + }) + }) + describeExtreme(`Extreme Values ${SLOW ? 'slow mode' : 'fast mode'}`, () => { if (!(Implementation.P1 && useEnv('EXTREME') && useEnv('FORK'))) return // prevents bunch of skipped tests From d9283c67a3bc1d0d775cce420423f430a382021f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Jul 2024 15:05:41 -0400 Subject: [PATCH 433/450] document 21 decimals with caveats --- CHANGELOG.md | 6 ++++-- docs/solidity-style.md | 18 ++++++++++++++++-- docs/writing-collateral-plugins.md | 19 ++++++++++--------- 3 files changed, 30 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2192cd1c13..27d34ad715 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ This release prepares the core protocol for veRSR through the introduction of 3 registries (`DAOFeeRegistry`, `AssetPluginRegistry`, and `VersionRegistry`) and through restricting component upgrades to be handled by `Main`, where upgrade constraints can be enforced. -The release also expands collateral decimal support from 18 to 27. +The release also expands collateral decimal support from 18 to 21, with some caveats about minimum token value. See [docs/solidity-style.md](./docs/solidity-style.md#Collateral-decimals) for more details. ## Upgrade Steps @@ -33,7 +33,9 @@ Make sure distributor table sums to >10000. ### Assets -No functional change. FLOOR rounding added explicitly to `shiftl_toFix` +No functional change. FLOOR rounding added explicitly to `shiftl_toFix`. + +Support expanded from 18 to 21 decimals, with minimum collateral token value requirement of `$0.001` at-peg. ### Trading diff --git a/docs/solidity-style.md b/docs/solidity-style.md index 05a35b8aea..35bbf87698 100644 --- a/docs/solidity-style.md +++ b/docs/solidity-style.md @@ -139,9 +139,23 @@ This should work without change for around 9M years, which is more than enough. `{decimals}`: [6, 21] -The protocol only supports collateral tokens up to 21 decimals, and for these cases only supports balances up to `~8e28`. Exceeding this could end up overflowing restrictions in GnosisTrade / EasyAuction, and end up in rounding issues accross the protocol. +The protocol only supports collateral tokens up to 21 decimals, and they must be sufficiently valuable. -21 decimal tokens must also be sufficiently valued, where that is defined as a whole token worth >$0.1. +At 21 decimals one whole collateral token must be worth `>= $1` when _at-peg_. This range enables support for `$1` tokens that have been deposited into 3 decimal offset vaults. Note that the protocol does not rely on this property for the _sale_ of collateral, only the _purchase_; therefore it is acceptable for a backing collateral to lose its peg and be worth less than `$1`, as long as its collateral plugin puts it into an IFFY state and begins the default process. + +minimum whole token value requirement (at common decimals): + +- 21 decimals: `>= $1` +- 18 decimals: `>= $0.001` +- 6 decimals: `>= $0.000000000000001` + +### Minimum RToken price + +Whole RTokens should be worth `>= $0.001` at-peg, since they must be purchasable in revenue auctions. + +### Minimum RSR price + +The protocol functions best when whole RSR is worth `>= $0.001`. This constraint is less strong than in the case of backing collateral tokens, however. The core functionality of the protocol functions properly even even below this boundary. ## Function annotations diff --git a/docs/writing-collateral-plugins.md b/docs/writing-collateral-plugins.md index 1d2fd57f7e..a323e9ac6f 100644 --- a/docs/writing-collateral-plugins.md +++ b/docs/writing-collateral-plugins.md @@ -8,26 +8,27 @@ For details of what collateral plugins are and how they function, see [collatera Here are some basic questions to answer before beginning to write a new collateral plugin. Think of the answers like an outline for an essay: they will help gauge how much work is required to write the plugin, they will guide the final implementation, and they will contain all of the human-readable details that can then be directly translated into code. +1. **Is this collateral sufficiently valuable? At-peg it must be worth at least $0.001 if it has 18 decimals, and $1 if it has 21 decimals.** 1. **How will this plugin define the different units?** - {tok}: - {ref}: - {target}: - {UoA}: -2. **Does the target collateral require a wrapper?** (eg. aTokens require the StaticAToken wrapper, to stabilize their rebasing nature) -3. **How will the 3 internal prices be defined?** (eg. chainlink feeds, exchange rate view functions, calculations involving multiple sources) For [chainlink feeds](https://data.chain.link/ethereum/mainnet), include the address, error (deviation threshold), and timeout (heartbeat). For on-chain exchange rates, include the function calls and/or github links to examples. +1. **Does the target collateral require a wrapper?** (eg. aTokens require the StaticAToken wrapper, to stabilize their rebasing nature) +1. **How will the 3 internal prices be defined?** (eg. chainlink feeds, exchange rate view functions, calculations involving multiple sources) For [chainlink feeds](https://data.chain.link/ethereum/mainnet), include the address, error (deviation threshold), and timeout (heartbeat). For on-chain exchange rates, include the function calls and/or github links to examples. - {ref/tok}: - {target/ref}: - {UoA/target}: -4. **For each of these prices, what are the critical trust assumptions? Can any of these be manipulated within the course of a transaction?** +1. **For each of these prices, what are the critical trust assumptions? Can any of these be manipulated within the course of a transaction?** - eg. chainlink feeds require trusting the chainlink protocol and the individual oracles for that price feed - eg. the frxETH/ETH exchange rate requires trusting the FRAX multisig to correctly push timely updates - eg. yearn vaults can have their `pricePerShare` increased via direct vault donations -5. **Are there any protocol-specific metrics that should be monitored to signal a default in the underlying collateral?** -6. **If this plugin requires unique unit & price abstractions, what do they look like?** -7. **What amount of revenue should this plugin hide? (a minimum of `1e-6`% is recommended, but some collateral may require higher thresholds, and, in rare cases, `0` can be used)** -8. **Are there rewards that can be claimed by holding this collateral? If so, how are they claimed?** Include a github link to the callable function or an example of how to claim. -9. **Does the collateral need to be "refreshed" in order to update its internal state before refreshing the plugin?** Include a github link to the callable function. -10. **Can the `price()` range be kept <5%? What is the largest possible % difference (while priced) between `price().high` and `price().low`?** See [RTokenAsset.tryPrice()](../contracts/plugins/assets/RTokenAsset.sol) and [docs/collateral.md](./collateral.md#price) for additional context. +1. **Are there any protocol-specific metrics that should be monitored to signal a default in the underlying collateral?** +1. **If this plugin requires unique unit & price abstractions, what do they look like?** +1. **What amount of revenue should this plugin hide? (a minimum of `1e-6`% is recommended, but some collateral may require higher thresholds, and, in rare cases, `0` can be used)** +1. **Are there rewards that can be claimed by holding this collateral? If so, how are they claimed?** Include a github link to the callable function or an example of how to claim. +1. **Does the collateral need to be "refreshed" in order to update its internal state before refreshing the plugin?** Include a github link to the callable function. +1. **Can the `price()` range be kept <5%? What is the largest possible % difference (while priced) between `price().high` and `price().low`?** See [RTokenAsset.tryPrice()](../contracts/plugins/assets/RTokenAsset.sol) and [docs/collateral.md](./collateral.md#price) for additional context. ## Implementation From 792e1936115f3f84b1a2f27afc958e05c13b1696 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 9 Jul 2024 15:19:32 -0400 Subject: [PATCH 434/450] document non-manipulable price --- .../plugins/assets/AppreciatingFiatCollateral.sol | 1 + contracts/plugins/assets/Asset.sol | 1 + contracts/plugins/assets/EURFiatCollateral.sol | 1 + contracts/plugins/assets/FiatCollateral.sol | 1 + contracts/plugins/assets/NonFiatCollateral.sol | 1 + contracts/plugins/assets/SelfReferentialCollateral.sol | 1 + .../plugins/assets/ankr/AnkrStakedEthCollateral.sol | 1 + contracts/plugins/assets/cbeth/CBETHCollateral.sol | 1 + contracts/plugins/assets/cbeth/CBETHCollateralL2.sol | 1 + .../assets/compoundv2/CTokenNonFiatCollateral.sol | 1 + .../compoundv2/CTokenSelfReferentialCollateral.sol | 1 + .../plugins/assets/curve/CurveRecursiveCollateral.sol | 1 + .../plugins/assets/curve/CurveStableCollateral.sol | 1 + .../assets/curve/CurveStableMetapoolCollateral.sol | 2 ++ .../plugins/assets/frax-eth/SFraxEthCollateral.sol | 1 + .../plugins/assets/lido/L2LidoStakedEthCollateral.sol | 1 + .../plugins/assets/lido/LidoStakedEthCollateral.sol | 1 + .../MetaMorphoSelfReferentialCollateral.sol | 1 + .../assets/morpho-aave/MorphoNonFiatCollateral.sol | 1 + .../morpho-aave/MorphoSelfReferentialCollateral.sol | 1 + contracts/plugins/assets/mountain/USDMCollateral.sol | 1 + contracts/plugins/assets/rocket-eth/RethCollateral.sol | 1 + .../assets/yearnv2/YearnV2CurveFiatCollateral.sol | 1 + docs/collateral.md | 10 +++++++--- docs/writing-collateral-plugins.md | 2 +- 25 files changed, 32 insertions(+), 4 deletions(-) diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 85822345ae..96fb0a5008 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -45,6 +45,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @dev Override this when pricing is more complicated than just a single oracle /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index b28cc1bf12..5c29ac48b1 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -69,6 +69,7 @@ contract Asset is IAsset, VersionedAsset { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @dev The third (unused) variable is only here for compatibility with Collateral /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index f3a9e0e966..b21ee6c63d 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -36,6 +36,7 @@ contract EURFiatCollateral is FiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index 136021febf..5e0c5936c1 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -94,6 +94,7 @@ contract FiatCollateral is ICollateral, Asset { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @dev Override this when pricing is more complicated than just a single oracle /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate diff --git a/contracts/plugins/assets/NonFiatCollateral.sol b/contracts/plugins/assets/NonFiatCollateral.sol index b43750ab5a..bc5ccf0d3d 100644 --- a/contracts/plugins/assets/NonFiatCollateral.sol +++ b/contracts/plugins/assets/NonFiatCollateral.sol @@ -36,6 +36,7 @@ contract NonFiatCollateral is FiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/SelfReferentialCollateral.sol b/contracts/plugins/assets/SelfReferentialCollateral.sol index fb3eb2b92b..06007e07cb 100644 --- a/contracts/plugins/assets/SelfReferentialCollateral.sol +++ b/contracts/plugins/assets/SelfReferentialCollateral.sol @@ -20,6 +20,7 @@ contract SelfReferentialCollateral is FiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index ccce6ef615..871d0e248e 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -41,6 +41,7 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index 74e96eb1fa..87cf8e4d24 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -41,6 +41,7 @@ contract CBEthCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index d384766941..e2e3eec971 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -49,6 +49,7 @@ contract CBEthCollateralL2 is L2LSDCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 0cb59703c3..38b7e95e61 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -37,6 +37,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index 8766be3d71..7a358abf46 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -41,6 +41,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol index c1cf7461c6..966894f620 100644 --- a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol +++ b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol @@ -48,6 +48,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return {target/ref} Unused. Always 0 diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index 3971f4019b..e5b874a429 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -48,6 +48,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @dev Override this when pricing is more complicated than just a single pool /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 3519301e67..f8f2af5e1e 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -68,6 +68,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg @@ -126,6 +127,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { /// Can revert, used by `_anyDepeggedOutsidePool()` /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @return lowPaired {UoA/pairedTok} The low price estimate of the paired token /// @return highPaired {UoA/pairedTok} The high price estimate of the paired token function tryPairedPrice() public view virtual returns (uint192 lowPaired, uint192 highPaired) { diff --git a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol index 6247a7e6bd..5c37fcd7d3 100644 --- a/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol +++ b/contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol @@ -47,6 +47,7 @@ contract SFraxEthCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol index d66bcb8e86..ee3b9d533a 100644 --- a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol @@ -68,6 +68,7 @@ contract L2LidoStakedEthCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index 08e465790d..e25cef35b2 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -44,6 +44,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol index 8db21fd6fe..d691d5d885 100644 --- a/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/meta-morpho/MetaMorphoSelfReferentialCollateral.sol @@ -29,6 +29,7 @@ contract MetaMorphoSelfReferentialCollateral is ERC4626FiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 658309b15a..1710441b05 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -39,6 +39,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol index babea4e816..0a75dc6afb 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoSelfReferentialCollateral.sol @@ -39,6 +39,7 @@ contract MorphoSelfReferentialCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} diff --git a/contracts/plugins/assets/mountain/USDMCollateral.sol b/contracts/plugins/assets/mountain/USDMCollateral.sol index d2f318c751..b49b93cbb7 100644 --- a/contracts/plugins/assets/mountain/USDMCollateral.sol +++ b/contracts/plugins/assets/mountain/USDMCollateral.sol @@ -31,6 +31,7 @@ contract USDMCollateral is ERC4626FiatCollateral { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index 76074559fc..11cb1d1af9 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -40,6 +40,7 @@ contract RethCollateral is AppreciatingFiatCollateral { } /// Can revert, used by other contract functions in order to catch errors + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index 2bb8d26340..3443c68b80 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -46,6 +46,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 + /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return {target/ref} Unused. Always 0 diff --git a/docs/collateral.md b/docs/collateral.md index e1848332ff..2bb3486947 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -225,6 +225,10 @@ When implementing Revenue Hiding, the `price` function should NOT hide revenue; ## Important Properties for Collateral Plugins +### Oracles must not be plausibly manipulable + +It must not be possible to manipulate the oracles a collateral relies on, cheaply. In particular (though not limited to): it should not be possible to manipulate price within the block. + ### Reuse of Collateral Plugins Collateral plugins should be safe to reuse by many different Reserve Protocol instances. So: @@ -254,10 +258,10 @@ There is a simple ERC20 wrapper that can be easily extended at [RewardableERC20W The protocol currently supports collateral tokens with up to 21 decimals. There are some caveats to know about: -- For a token with 21 decimals, batch auctions can only process up to ~8e7 whole tokens in a single auction. Dollar-pegged tokens thus fit nicely within this constraint, but 21 decimal tokens that are worth <$0.1 per whole token may not. Therefore, the protocol should not be used with **low-value 21-decimal tokens**. -- For a token with 18 decimals, batch auctions can only process up to ~8e10 whole tokens in a single auction. +- Tokens with 21 decimals must be worth at least `$1` at-peg +- Tokens with 18 decimals must be worth at least `$0.001` at-peg -Dutch auctions do not have this constraint. As long as they remain enabled they can process a larger number of tokens. +These constraints only apply to pricing when the collateral is SOUND; when the collateral status is IFFY or DISABLED the price is allowed to fall below these thresholds. ### `refresh()` should never revert diff --git a/docs/writing-collateral-plugins.md b/docs/writing-collateral-plugins.md index a323e9ac6f..3e40dda8b2 100644 --- a/docs/writing-collateral-plugins.md +++ b/docs/writing-collateral-plugins.md @@ -21,8 +21,8 @@ Here are some basic questions to answer before beginning to write a new collater - {UoA/target}: 1. **For each of these prices, what are the critical trust assumptions? Can any of these be manipulated within the course of a transaction?** - eg. chainlink feeds require trusting the chainlink protocol and the individual oracles for that price feed - - eg. the frxETH/ETH exchange rate requires trusting the FRAX multisig to correctly push timely updates - eg. yearn vaults can have their `pricePerShare` increased via direct vault donations + - eg. is pricing manipuable or subject to MEV? oracle sources _must_ be manipulation resistant such as Chainlink or AMM EMA 1. **Are there any protocol-specific metrics that should be monitored to signal a default in the underlying collateral?** 1. **If this plugin requires unique unit & price abstractions, what do they look like?** 1. **What amount of revenue should this plugin hide? (a minimum of `1e-6`% is recommended, but some collateral may require higher thresholds, and, in rare cases, `0` can be used)** From 70509794359ba79a7f7ddd4c3694459e3c706aa2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 11 Jul 2024 12:27:01 -0400 Subject: [PATCH 435/450] high price for trade sizing (#1172) --- CHANGELOG.md | 4 ++ contracts/p0/mixins/TradingLib.sol | 13 +++-- contracts/p1/mixins/TradeLib.sol | 13 +++-- test/Recollateralization.test.ts | 81 +++++++++++++++++++++++++---- test/Revenues.test.ts | 10 ++-- test/scenario/ComplexBasket.test.ts | 8 +-- 6 files changed, 104 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d34ad715..5ade2ced66 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,8 @@ Make sure distributor table sums to >10000. - `AssetRegistry` - Prevent registering assets that are not in the `AssetPluginRegistry` - Add `validateCurrentAssets() view` +- `BackingManager` + - Switch from sizing trades using the low price to the high price - `Broker` - Make setters only callable by `Main` - `Distributor` @@ -28,6 +30,8 @@ Make sure distributor table sums to >10000. - Add `setVersionRegistry()`/`setAssetPluginRegistry()`/`setDaoFeeRegistry()` setters - Add `upgradeMainTo()` + `upgradeRTokenTo()` functions to handle upgrade of Main + Components - Make Main the only caller that can upgrade Main +- `RevenueTrader` + - Switch from sizing trades using the low price to the high price ## Plugins diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index 6fe87988d1..317c98c2e2 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -59,9 +59,16 @@ library TradingLibP0 { minTradeVolume ); - // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} - uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} + // Cap sell amount using the high price + // Under price decay trade.prices.sellHigh can become up to 3x the savedHighPrice before + // becoming FIX_MAX after the full price timeout + uint192 s = trade.sellAmount; + if (trade.prices.sellHigh != FIX_MAX) { + // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); + if (maxSell > 1 && s > maxSell) s = maxSell; + // if the high price is so high that the most we can sell is 1, sell all of it + } // Calculate equivalent buyAmount within [0, FIX_MAX] // {buyTok} = {sellTok} * {1} * {UoA/sellTok} / {UoA/buyTok} diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index f02c14f5d0..e86d6dd7ad 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -58,9 +58,16 @@ library TradeLib { minTradeVolume ); - // Cap sell amount - uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellLow); // {sellTok} - uint192 s = trade.sellAmount > maxSell ? maxSell : trade.sellAmount; // {sellTok} + // Cap sell amount using the high price + // Under price decay trade.prices.sellHigh can become up to 3x the savedHighPrice before + // becoming FIX_MAX after the full price timeout + uint192 s = trade.sellAmount; + if (trade.prices.sellHigh != FIX_MAX) { + // {sellTok} + uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); + if (maxSell > 1 && s > maxSell) s = maxSell; + // if the high price is so high that the most we can sell is 1, sell all of it + } // Calculate equivalent buyAmount within [0, FIX_MAX] // {buyTok} = {sellTok} * {1} * {UoA/sellTok} / {UoA/buyTok} diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 7d63f9c4bd..d2d32b059f 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -2217,7 +2217,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ).div(2) const sellAmt = sellAmtBeforeSlippage .mul(BN_SCALE_FACTOR) - .div(BN_SCALE_FACTOR.sub(ORACLE_ERROR)) + .div(BN_SCALE_FACTOR.add(ORACLE_ERROR)) const minBuyAmt = await toMinBuyAmt(sellAmt, fp('0.5'), fp('1')) await expect(facadeTest.runAuctionsForAllTraders(rToken.address)) @@ -2260,7 +2260,63 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await advanceTime(config.batchAuctionLength.add(100).toString()) // Run auctions - will end current, and will open a new auction for the same amount - const leftoverSellAmt = issueAmount.sub(sellAmt) + await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ + { + contract: backingManager, + name: 'TradeSettled', + args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], + emitted: true, + }, + { + contract: backingManager, + name: 'TradeStarted', + args: [anyValue, token0.address, backupToken1.address, sellAmt, minBuyAmt], + emitted: true, + }, + ]) + + // Check new auction + // Token0 -> Backup Token Auction + await expectTrade(backingManager, { + sell: token0.address, + buy: backupToken1.address, + endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), + externalId: bn('1'), + }) + + // Check state + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + expect(await basketHandler.fullyCollateralized()).to.equal(false) + expect(await token0.balanceOf(backingManager.address)).to.equal( + issueAmount.sub(sellAmt.mul(2)) + ) + expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) + expect(await rToken.totalSupply()).to.equal(issueAmount) + + // Check price in USD of the current RToken + await expectRTokenPrice(rTokenAsset.address, fp('1'), ORACLE_ERROR) + + // Perform Mock Bids (addr1 has balance) + // Pay at worst-case price + await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) + await gnosis.placeBid(1, { + bidder: addr1.address, + sellAmount: sellAmt, + buyAmount: minBuyAmt, + }) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Check staking situation remains unchanged + expect(await rsr.balanceOf(stRSR.address)).to.equal(stakeAmount) + expect(await stRSR.balanceOf(addr1.address)).to.equal(stakeAmount) + + // Advance time till auction ended + await advanceTime(config.batchAuctionLength.add(100).toString()) + + // Run auctions - will end current, and will open a new auction for the remaining amount + const leftoverSellAmt = issueAmount.sub(sellAmt.mul(2)) const leftoverMinBuyAmt = await toMinBuyAmt(leftoverSellAmt, fp('0.5'), fp('1')) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { @@ -2289,14 +2345,14 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: token0.address, buy: backupToken1.address, endTime: (await getLatestBlockTimestamp()) + Number(config.batchAuctionLength), - externalId: bn('1'), + externalId: bn('2'), }) // Check state expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) expect(await token0.balanceOf(backingManager.address)).to.equal(0) - expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt) + expect(await backupToken1.balanceOf(backingManager.address)).to.equal(minBuyAmt.mul(2)) expect(await rToken.totalSupply()).to.equal(issueAmount) // Check price in USD of the current RToken @@ -2305,7 +2361,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, minBuyAmt) - await gnosis.placeBid(1, { + await gnosis.placeBid(2, { bidder: addr1.address, sellAmount: leftoverSellAmt, buyAmount: leftoverMinBuyAmt, @@ -2321,8 +2377,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Advance time till auction ended await advanceTime(config.batchAuctionLength.add(100).toString()) - // Run auctions - will end current, and will open a new auction for the same amount - const buyAmtBidRSR: BigNumber = issueAmount.sub(minBuyAmt.add(leftoverMinBuyAmt)).add(1) + // End current auction, should start a new one to sell RSR for collateral + // ~51e18 Tokens left to buy - Sets Buy amount as independent value + const buyAmtBidRSR: BigNumber = issueAmount + .sub(minBuyAmt.mul(2).add(leftoverMinBuyAmt)) + .add(1) await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: backingManager, @@ -2352,7 +2411,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { sell: rsr.address, buy: backupToken1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), - externalId: bn('2'), + externalId: bn('3'), }) const t = await getTrade(backingManager, rsr.address) @@ -2363,11 +2422,11 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) expect(await basketHandler.fullyCollateralized()).to.equal(false) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal( - minBuyAmt.add(leftoverMinBuyAmt) + minBuyAmt.mul(2).add(leftoverMinBuyAmt) ) expect(await token0.balanceOf(backingManager.address)).to.equal(0) expect(await backupToken1.balanceOf(backingManager.address)).to.equal( - minBuyAmt.add(leftoverMinBuyAmt) + minBuyAmt.mul(2).add(leftoverMinBuyAmt) ) expect(await rToken.totalSupply()).to.equal(issueAmount) @@ -2380,7 +2439,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Perform Mock Bids for RSR (addr1 has balance) // Pay at worst-case price await backupToken1.connect(addr1).approve(gnosis.address, buyAmtBidRSR) - await gnosis.placeBid(2, { + await gnosis.placeBid(3, { bidder: addr1.address, sellAmount: sellAmtRSR, buyAmount: buyAmtBidRSR, diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 94ca1d4730..eca91f4979 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -1217,7 +1217,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ).to.emit(rTokenTrader, 'TradeStarted') }) - it('Should only be able to start a dust auction BATCH_AUCTION (and not DUTCH_AUCTION) if oracle has failed', async () => { + it('Should be able to force through a dust BATCH auction but not DUTCH, if oracle has failed', async () => { const minTrade = bn('1e18') await rsrTrader.connect(owner).setMinTradeVolume(minTrade) @@ -1240,6 +1240,8 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { rsrTrader, 'TradeStarted' ) + + expect(await token0.balanceOf(rsrTrader.address)).to.equal(0) // should sell entire balance }) it('Should not launch an auction for 1 qTok', async () => { @@ -1603,7 +1605,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) // Expected values based on Prices between AAVE and RSR = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to oracle error + const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) // Run auctions @@ -1788,7 +1790,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RToken = 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) await expectEvents(backingManager.claimRewards(), [ @@ -1989,7 +1991,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue // Expected values based on Prices between AAVE and RSR/RToken = 1 to 1 (for simplification) - const sellAmt: BigNumber = fp('1').mul(100).div(99) // due to high price setting trade size + const sellAmt: BigNumber = fp('1').mul(100).div(101) // due to high price setting trade size const minBuyAmt: BigNumber = await toMinBuyAmt(sellAmt, fp('1'), fp('1')) const sellAmtRToken: BigNumber = rewardAmountAAVE.mul(20).div(100) // All Rtokens can be sold - 20% of total comp based on f diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index f3924355e7..450cdb9460 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -1577,8 +1577,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - cETH partial sale for weth // Will sell about 841K of cETH, expect to receive 8167 wETH (minimum) // We would still have about 438K to sell of cETH - let [low] = await cETHCollateral.price() - const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) + let [, high] = await cETHCollateral.price() + const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(high) const sellAmt = toBNDecimals(sellAmtUnscaled, 8) const sellAmtRemainder = (await cETH.balanceOf(backingManager.address)).sub(sellAmt) // Price for cETH = 1200 / 50 = $24 at rate 50% = $12 @@ -1723,8 +1723,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // 13K wETH @ 1200 = 15,600,000 USD of value, in RSR ~= 156,000 RSR (@100 usd) // We exceed maxTradeVolume so we need two auctions - Will first sell 10M in value // Sells about 101K RSR, for 8167 WETH minimum - ;[low] = await rsrAsset.price() - const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) + ;[, high] = await rsrAsset.price() + const sellAmtRSR1 = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(high) const buyAmtBidRSR1 = toMinBuyAmt( sellAmtRSR1, rsrPrice, From e59253697fb1ecb9017b723c77c25d57141b4135 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 11 Jul 2024 12:55:15 -0400 Subject: [PATCH 436/450] upload june plugin audit --- audits/Reserve_June_Plugins_v1.pdf | Bin 0 -> 447368 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/Reserve_June_Plugins_v1.pdf diff --git a/audits/Reserve_June_Plugins_v1.pdf b/audits/Reserve_June_Plugins_v1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..fc48a7a3795e42b793234cadc37b3260a0feac70 GIT binary patch literal 447368 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⩔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%0AC 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

    R*skK^Ex8r$L5}bHJq{h7%rZp{D_I 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 _eBE73@|U+3YsEr_70adaPAs=zbHjSHutZzXJMp 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

    }{{ETGSm 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 z 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%0Ay6y=8(XD8 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 literal 0 HcmV?d00001 From 2b4a529e3ff96df9445fcb0eacc8ddd7c9cb3c2e Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 11 Jul 2024 21:34:00 -0400 Subject: [PATCH 437/450] few additional comments --- contracts/plugins/assets/curve/CurveStableCollateral.sol | 1 + .../plugins/assets/curve/CurveStableMetapoolCollateral.sol | 1 + contracts/plugins/trading/GnosisTrade.sol | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index e5b874a429..c757ba4fdf 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -81,6 +81,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { // 1. A moving average metric (unavailable in the cases we care about) // 2. Mapping oracle prices to expected pool balances using precise knowledge about // the shape of the trading curve. (maybe we can do this in the future) + // TODO update this approach to be MEV-resistant // {UoA} (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index f8f2af5e1e..73ad6754f7 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -100,6 +100,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { // 1. A moving average metric (unavailable in the cases we care about) // 2. Mapping oracle prices to expected pool balances using precise knowledge about // the shape of the trading curve. (maybe we can do this in the future) + // TODO update this approach to be MEV-resistant // {UoA/pairedTok} (uint192 lowPaired, uint192 highPaired) = tryPairedPrice(); diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index 3d67a33d02..794f5ff2b6 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -15,8 +15,7 @@ import "../../mixins/Versioned.sol"; /// Trade contract against the Gnosis EasyAuction mechanism /// Limitations on decimals due to Gnosis Auction limitations: -/// - 27 decimal tokens are not supported in practice: max auction size is ~8e1 whole tokens -/// - 21 decimal tokens are supported, with caveats: max auction size is ~8e7 whole tokens +/// - At 21 decimals the amount of buy tokens cannot exceed ~8e7 else the trade will not settle contract GnosisTrade is ITrade, Versioned { using FixLib for uint192; using SafeERC20Upgradeable for IERC20Upgradeable; From 72d9278656685f1de0a3a09aa211fab842fac1d2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Jul 2024 15:11:49 -0400 Subject: [PATCH 438/450] revert over selling large lot --- contracts/p0/mixins/TradingLib.sol | 4 ++-- contracts/p1/mixins/TradeLib.sol | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index 317c98c2e2..820177da2a 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -66,8 +66,8 @@ library TradingLibP0 { if (trade.prices.sellHigh != FIX_MAX) { // {sellTok} uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); - if (maxSell > 1 && s > maxSell) s = maxSell; - // if the high price is so high that the most we can sell is 1, sell all of it + require(maxSell > 1, "trade size error"); + if (s > maxSell) s = maxSell; } // Calculate equivalent buyAmount within [0, FIX_MAX] diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index e86d6dd7ad..142af093c5 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -65,8 +65,8 @@ library TradeLib { if (trade.prices.sellHigh != FIX_MAX) { // {sellTok} uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); - if (maxSell > 1 && s > maxSell) s = maxSell; - // if the high price is so high that the most we can sell is 1, sell all of it + require(maxSell > 1, "trade size error"); + if (s > maxSell) s = maxSell; } // Calculate equivalent buyAmount within [0, FIX_MAX] From a2f9eba8cc57d788725aff87e0ddcda82b4b65f9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Jul 2024 15:24:02 -0400 Subject: [PATCH 439/450] document bm should not sell unpriced assets --- contracts/p1/mixins/RecollateralizationLib.sol | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index a152a5ccbb..1b1f355ef6 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -269,6 +269,8 @@ library RecollateralizationLibP1 { // Prefer selling assets in this order: DISABLED -> SOUND -> IFFY. // Sell IFFY last because it may recover value in the future. // All collateral in the basket have already been guaranteed to be SOUND by upstream checks. + // Warning: If the trading algorithm is changed to trade unpriced (0, FIX_MAX) assets it can + // result in losses in GnosisTrade. Unpriced assets should not be sold in rebalancing. function nextTradePair( TradingContext memory ctx, Registry memory reg, From a44bbb4b33ab61b95cd86365ae0669f2f630137b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Jul 2024 15:36:26 -0400 Subject: [PATCH 440/450] add revert for [>0, FIX_MAX] case --- contracts/p0/mixins/TradingLib.sol | 4 +++- contracts/p1/mixins/TradeLib.sol | 4 +++- docs/collateral.md | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index 820177da2a..a0e0df2638 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -66,8 +66,10 @@ library TradingLibP0 { if (trade.prices.sellHigh != FIX_MAX) { // {sellTok} uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); - require(maxSell > 1, "trade size error"); + require(maxSell > 1, "trade sizing error"); if (s > maxSell) s = maxSell; + } else { + require(trade.prices.sellLow == 0, "trade pricing error"); } // Calculate equivalent buyAmount within [0, FIX_MAX] diff --git a/contracts/p1/mixins/TradeLib.sol b/contracts/p1/mixins/TradeLib.sol index 142af093c5..e989ea81e9 100644 --- a/contracts/p1/mixins/TradeLib.sol +++ b/contracts/p1/mixins/TradeLib.sol @@ -65,8 +65,10 @@ library TradeLib { if (trade.prices.sellHigh != FIX_MAX) { // {sellTok} uint192 maxSell = maxTradeSize(trade.sell, trade.buy, trade.prices.sellHigh); - require(maxSell > 1, "trade size error"); + require(maxSell > 1, "trade sizing error"); if (s > maxSell) s = maxSell; + } else { + require(trade.prices.sellLow == 0, "trade pricing error"); } // Calculate equivalent buyAmount within [0, FIX_MAX] diff --git a/docs/collateral.md b/docs/collateral.md index 2bb3486947..c00560d59f 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -385,6 +385,8 @@ Under no price data, the low estimate shoulddecay downwards and high estimate up Should return `(0, FIX_MAX)` if pricing data is _completely_ unavailable or stale. +Should NOT return `(>0, FIX_MAX)`: if the high price FIX_MAX then the low price must be 0. + Should be gas-efficient. ### lotPrice() `{UoA/tok}` From d0315e719b984406a3eea143d163f346a9b9942c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 15 Jul 2024 15:37:55 -0400 Subject: [PATCH 441/450] nit --- docs/collateral.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/collateral.md b/docs/collateral.md index c00560d59f..41fa09f053 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -385,7 +385,7 @@ Under no price data, the low estimate shoulddecay downwards and high estimate up Should return `(0, FIX_MAX)` if pricing data is _completely_ unavailable or stale. -Should NOT return `(>0, FIX_MAX)`: if the high price FIX_MAX then the low price must be 0. +Should NOT return `(>0, FIX_MAX)`: if the high price is FIX_MAX then the low price must be 0. Should be gas-efficient. From 6f682402b1ea3bb8cc166d2e18e39cdfd30efad0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 16 Jul 2024 12:56:21 -0400 Subject: [PATCH 442/450] fix sDAI whale --- tasks/validation/whales/whales_1.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/validation/whales/whales_1.json b/tasks/validation/whales/whales_1.json index 537bc44460..2c05e7cdd9 100644 --- a/tasks/validation/whales/whales_1.json +++ b/tasks/validation/whales/whales_1.json @@ -50,7 +50,7 @@ "0xc3d688b66703497daa19211eedff47f25384cdc3": "0x7f714b13249BeD8fdE2ef3FBDfB18Ed525544B03", "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": "0x677FD4Ed8aE623f2f625DEB2D64F2070E46cA1A1", "0xa663b02cf0a4b149d2ad41910cb81e23e1c41c32": "0x6A7efa964Cf6D9Ab3BC3c47eBdDB853A8853C502", - "0x83f20f44975d03b1b09e64809b757c47f942beea": "0xDdE0d6e90bfB74f1dC8ea070cFd0c0180C03Ad16", + "0x83f20f44975d03b1b09e64809b757c47f942beea": "0x4aa42145Aa6Ebf72e164C9bBC74fbD3788045016", "0xbe9895146f7af43049ca1c1ae358b0541ea49704": "0xED1F7bb04D2BA2b6EbE087026F03C96Ea2c357A8", "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6": "0x65bb797c2B9830d891D87288F029ed8dACc19705", "0xdf0770df86a8034b3efef0a1bb3c889b8332ff56": "0xB0D502E938ed5f4df2E681fE6E419ff29631d62b", @@ -129,7 +129,7 @@ "0xc3d688b66703497daa19211eedff47f25384cdc3": "2024-05-02T02:11:46.235Z", "0xfaba6f8e4a5e8ab82f62fe7c39859fa577269be3": "2024-05-02T02:11:46.579Z", "0xa663b02cf0a4b149d2ad41910cb81e23e1c41c32": "2024-05-02T02:11:46.677Z", - "0x83f20f44975d03b1b09e64809b757c47f942beea": "2024-05-02T02:11:46.802Z", + "0x83f20f44975d03b1b09e64809b757c47f942beea": "2024-07-16T02:11:46.802Z", "0xbe9895146f7af43049ca1c1ae358b0541ea49704": "2024-05-02T02:11:47.091Z", "0xaf5191b0de278c7286d6c7cc6ab6bb8a73ba2cd6": "2024-05-02T02:11:47.333Z", "0xdf0770df86a8034b3efef0a1bb3c889b8332ff56": "2024-05-02T02:11:47.488Z", From 63bdb51a362c9028b1db111e74104ced07bf352d Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 24 Jul 2024 16:31:02 -0700 Subject: [PATCH 443/450] update backing buffer description --- docs/deployment-variables.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index eeef1d6c15..83ccba188f 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -102,10 +102,16 @@ Reasonable range: 100 to 3600 Dimension: `{1}` -The backing buffer is a percentage value that describes how much overcollateralization to hold in the form of RToken. This buffer allows collateral tokens to be converted into RToken, which is a more efficient form of revenue production than trading each individual collateral for the desired RToken, and also adds a small buffer that can prevent RSR from being seized when there are small losses due to slippage during rebalancing. +The backing buffer is a percentage value that describes how much extra collateral to hold in the BackingManager. This can be important for preventing RSR seizure during normal rebalancing as a result of trading slippage. + +However, too large a backing buffer (as a function of the blended collateral yield) can cause RToken and RSR staker yields to become too sensitive to supply changes; new issuance creates a hole that must be filled in before revenue handout can resume, while new redemptions cause the excess capital to be immediately realized as revenue. + +If the backing buffer is set too low, it's possible to get into a situation where RSR stakers begin individually unstaking before rebalancing proposals in order to avoid being slashed. The backing buffer should be high enough to prevent this outcome for expected rebalances. + +It is not important to consider the backing buffer for _default_ scenarios, only governance-led rebalances. Default value: `1e15` = 0.1% -Reasonable range: 1e12 to 1e18 +Reasonable range: 1e13 to 1e17 ### `maxTradeSlippage` From a743a0559f320e1a64a41fc5ecbee9760576e4df Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 25 Jul 2024 13:19:48 -0400 Subject: [PATCH 444/450] Issuance Premium v2 (#1175) --- CHANGELOG.md | 33 +- common/configuration.ts | 1 + contracts/facade/facets/MaxIssuableFacet.sol | 6 +- contracts/facade/facets/ReadFacet.sol | 18 +- contracts/interfaces/IAsset.sol | 12 +- contracts/interfaces/IBasketHandler.sol | 46 +- contracts/interfaces/IDeployer.sol | 1 + contracts/p0/BasketHandler.sol | 216 +++++----- contracts/p0/Deployer.sol | 7 +- contracts/p0/RToken.sol | 7 +- contracts/p0/mixins/TradingLib.sol | 2 +- contracts/p1/BackingManager.sol | 2 + contracts/p1/BasketHandler.sol | 193 ++++++--- contracts/p1/Deployer.sol | 7 +- contracts/p1/RToken.sol | 8 +- contracts/p1/mixins/BasketLib.sol | 1 + .../p1/mixins/RecollateralizationLib.sol | 2 +- .../assets/AppreciatingFiatCollateral.sol | 1 + contracts/plugins/assets/FiatCollateral.sol | 3 + contracts/plugins/assets/L2LSDCollateral.sol | 1 + contracts/plugins/assets/RTokenAsset.sol | 14 +- .../assets/compoundv3/CTokenV3Collateral.sol | 1 + .../CurveAppreciatingRTokenFiatCollateral.sol | 3 +- .../assets/curve/CurveRecursiveCollateral.sol | 9 +- .../assets/curve/CurveStableCollateral.sol | 10 +- .../curve/CurveStableMetapoolCollateral.sol | 3 +- .../CurveStableRTokenMetapoolCollateral.sol | 3 +- .../plugins/mocks/BadCollateralPlugin.sol | 1 + contracts/plugins/mocks/FraxAggregator.sol | 9 + .../mocks/InvalidRefPerTokCollateral.sol | 3 +- contracts/plugins/mocks/RTokenCollateral.sol | 2 + docs/collateral.md | 26 +- docs/deployment-variables.md | 18 + tasks/validation/utils/rtokens.ts | 6 +- test/Facade.test.ts | 2 +- test/Main.test.ts | 290 +++++++------ test/RToken.test.ts | 4 +- test/Revenues.test.ts | 13 +- test/Upgradeability.test.ts | 2 +- test/fixtures.ts | 1 + test/integration/AssetPlugins.test.ts | 17 +- test/integration/fixtures.ts | 1 + test/integration/fork-block-numbers.ts | 1 + .../mainnet-test/IssuancePremium.test.ts | 402 ++++++++++++++++++ test/plugins/Collateral.test.ts | 1 + test/scenario/NestedRTokens.test.ts | 16 +- test/scenario/RevenueHiding.test.ts | 4 +- test/scenario/cETH.test.ts | 2 +- test/scenario/cWBTC.test.ts | 2 +- test/utils/oracles.ts | 20 +- 50 files changed, 1035 insertions(+), 418 deletions(-) create mode 100644 test/integration/mainnet-test/IssuancePremium.test.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ade2ced66..68e35e97f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,24 +6,40 @@ This release prepares the core protocol for veRSR through the introduction of 3 The release also expands collateral decimal support from 18 to 21, with some caveats about minimum token value. See [docs/solidity-style.md](./docs/solidity-style.md#Collateral-decimals) for more details. +Finally, it adds resistance to toxic issuance by charging more when the collateral is under peg. + ## Upgrade Steps -TODO +Upgrade to 4.0.0 is expected to occur by spell. This section is still TODO, but some important notes for steps that should be hit: -Make sure distributor table sums to >10000. +- Distributor table must sum to >=10000 +- Opt RTokens into the issuance premium by default +- Upgrade all collateral plugins and RTokenAsset +- ... ## Core Protocol Contracts +All components: make Main the only component that can call `upgradeTo()` + - `AssetRegistry` - Prevent registering assets that are not in the `AssetPluginRegistry` - Add `validateCurrentAssets() view` - `BackingManager` - Switch from sizing trades using the low price to the high price -- `Broker` - - Make setters only callable by `Main` +- `BasketHandler` + - Add `issuancePremium() view returns (uint192)` + - Add `setIssuancePremiumEnabled(bool)`, callable by governance. Begins disabled by default for upgraded RTokens + - Add `quote(uint192 amount, bool applyIssuancePremium, RoundingMode rounding)` + - Modify `quote(uint192 amount, RoundingMode rounding)` to include the issuance premium + - Add `price(bool applyIssuancePremium)` + - Modify `price()` to include the issuance premium + - Remove `lotPrice()` + - Minor changes to require error strings +- `Deployer` + - Add `enableIssuancePremium` parameter to `IDeployer.DeploymentParams` - `Distributor` - Add `setDistributions()` function to parallel `setDistribution()` - - Take DAO fee out account in `distribute()` and `totals()` + - Take DAO fee into account in `distribute()` and `totals()` - Add new revenue share table invariant: must sum to >=10000 (for precision reasons) - `Main` - Add `versionRegistry()`/`assetPluginRegistry()`/`daoFeeRegistry()` getters @@ -37,9 +53,12 @@ Make sure distributor table sums to >10000. ### Assets -No functional change. FLOOR rounding added explicitly to `shiftl_toFix`. +- Support expanded from 18 to 21 decimals, with minimum collateral token value requirement of `$0.001` at-peg. +- FLOOR rounding added explicitly to `shiftl_toFix` everywhere + +#### Collateral -Support expanded from 18 to 21 decimals, with minimum collateral token value requirement of `$0.001` at-peg. +Add `savedPegPrice` to `ICollateral` interface ### Trading diff --git a/common/configuration.ts b/common/configuration.ts index febedecbe3..f793d3c0d8 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -599,6 +599,7 @@ export interface IConfig { withdrawalLeak: BigNumber warmupPeriod: BigNumber reweightable: boolean + enableIssuancePremium: boolean tradingDelay: BigNumber batchAuctionLength: BigNumber dutchAuctionLength: BigNumber diff --git a/contracts/facade/facets/MaxIssuableFacet.sol b/contracts/facade/facets/MaxIssuableFacet.sol index c385f021a9..7581b617c3 100644 --- a/contracts/facade/facets/MaxIssuableFacet.sol +++ b/contracts/facade/facets/MaxIssuableFacet.sol @@ -5,6 +5,7 @@ import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "../../interfaces/IBasketHandler.sol"; import "../../interfaces/IRToken.sol"; import "../../libraries/Fixed.sol"; +import "../../p1/BasketHandler.sol"; /** * @title MaxIssuableFacet @@ -21,7 +22,8 @@ contract MaxIssuableFacet { /// @return {qRTok} How many RToken `account` can issue given current holdings /// @custom:static-call function maxIssuable(IRToken rToken, address account) external returns (uint256) { - (address[] memory erc20s, ) = rToken.main().basketHandler().quote(FIX_ONE, FLOOR); + BasketHandlerP1 bh = BasketHandlerP1(address(rToken.main().basketHandler())); + (address[] memory erc20s, ) = bh.quote(FIX_ONE, FLOOR); uint256[] memory balances = new uint256[](erc20s.length); for (uint256 i = 0; i < erc20s.length; ++i) { balances[i] = IERC20(erc20s[i]).balanceOf(account); @@ -45,7 +47,7 @@ contract MaxIssuableFacet { main.assetRegistry().refresh(); // Get basket ERC20s - IBasketHandler bh = main.basketHandler(); + BasketHandlerP1 bh = BasketHandlerP1(address(main.basketHandler())); (address[] memory erc20s, uint256[] memory quantities) = bh.quote(FIX_ONE, CEIL); // Compute how many baskets we can mint with the collateral amounts diff --git a/contracts/facade/facets/ReadFacet.sol b/contracts/facade/facets/ReadFacet.sol index 98b1be2f47..aee240ab4f 100644 --- a/contracts/facade/facets/ReadFacet.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -45,7 +45,7 @@ contract ReadFacet { // Cache components IRToken rTok = rToken; - IBasketHandler bh = main.basketHandler(); + BasketHandlerP1 bh = BasketHandlerP1(address(main.basketHandler())); IAssetRegistry reg = main.assetRegistry(); // Poke Main @@ -91,7 +91,7 @@ contract ReadFacet { // Cache Components IRToken rTok = rToken; - IBasketHandler bh = main.basketHandler(); + BasketHandlerP1 bh = BasketHandlerP1(address(main.basketHandler())); // Poke Main main.assetRegistry().refresh(); @@ -173,7 +173,7 @@ contract ReadFacet { { uint256[] memory deposits; IAssetRegistry assetRegistry = rToken.main().assetRegistry(); - IBasketHandler basketHandler = rToken.main().basketHandler(); + BasketHandlerP1 basketHandler = BasketHandlerP1(address(rToken.main().basketHandler())); // solhint-disable-next-line no-empty-blocks try rToken.main().furnace().melt() {} catch {} // <3.1.0 RTokens may revert while frozen @@ -299,7 +299,8 @@ contract ReadFacet { /// @return tokens The ERC20s backing the RToken function basketTokens(IRToken rToken) external view returns (address[] memory tokens) { - (tokens, ) = rToken.main().basketHandler().quote(FIX_ONE, RoundingMode.FLOOR); + BasketHandlerP1 bh = BasketHandlerP1(address(rToken.main().basketHandler())); + (tokens, ) = bh.quote(FIX_ONE, RoundingMode.FLOOR); } /// Returns the backup configuration for a given targetName @@ -335,10 +336,11 @@ contract ReadFacet { uint192 uoaNeeded; // {UoA} uint192 uoaHeldInBaskets; // {UoA} { - (address[] memory basketERC20s, uint256[] memory quantities) = rToken - .main() - .basketHandler() - .quote(basketsNeeded, FLOOR); + BasketHandlerP1 bh = BasketHandlerP1(address(rToken.main().basketHandler())); + (address[] memory basketERC20s, uint256[] memory quantities) = bh.quote( + basketsNeeded, + FLOOR + ); IAssetRegistry reg = rToken.main().assetRegistry(); IBackingManager bm = rToken.main().backingManager(); diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index 3196f9ce6e..4cc223a63d 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -32,13 +32,6 @@ interface IAsset is IRewardable { /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192); @@ -114,7 +107,7 @@ interface ICollateral is IAsset { /// @dev refresh() /// Refresh exchange rates and update default status. - /// VERY IMPORTANT: In any valid implemntation, status() MUST become DISABLED in refresh() if + /// VERY IMPORTANT: In any valid implementation, status() MUST become DISABLED in refresh() if /// refPerTok() has ever decreased since last call. /// @return The canonical name of this collateral's target unit. @@ -130,6 +123,9 @@ interface ICollateral is IAsset { /// @return {target/ref} Quantity of whole target units per whole reference unit in the peg function targetPerRef() external view returns (uint192); + + /// @return {target/ref} The peg price of the token during the last update + function savedPegPrice() external view returns (uint192); } // Used only in Testing. Strictly speaking a Collateral does not need to adhere to this interface diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index 44aeace135..315790554e 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -43,6 +43,11 @@ interface IBasketHandler is IComponent { /// @param newVal The new warmup period event WarmupPeriodSet(uint48 oldVal, uint48 newVal); + /// Emitted when the issuance premium logic is changed + /// @param oldVal The old value of enableIssuancePremium + /// @param newVal The new value of enableIssuancePremium + event EnableIssuancePremiumSet(bool oldVal, bool newVal); + /// Emitted when the status of a basket has changed /// @param oldStatus The previous basket status /// @param newStatus The new basket status @@ -57,19 +62,20 @@ interface IBasketHandler is IComponent { function init( IMain main_, uint48 warmupPeriod_, - bool reweightable_ + bool reweightable_, + bool enableIssuancePremium_ ) external; - /// Set the prime basket - /// For an index RToken (reweightable = true), use forceSetPrimeBasket to skip normalization + /// Set the prime basket, checking target amounts are constant /// @param erc20s The collateral tokens for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// required range: 1e9 values; absolute range irrelevant. /// @custom:governance function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external; - /// Set the prime basket without normalizing targetAmts by the UoA of the current basket - /// Works the same as setPrimeBasket for non-index RTokens (reweightable = false) + /// Set the prime basket, skipping any constant target amount checks if RToken is reweightable + /// Warning: Reweightable RTokens SHOULD use a spell to execute this function to avoid + /// accidentally changing the UoA value of the RToken. /// @param erc20s The collateral tokens for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// required range: 1e9 values; absolute range irrelevant. @@ -110,29 +116,33 @@ interface IBasketHandler is IComponent { /// @return If the basket is ready to issue and trade function isReady() external view returns (bool); + /// Returns basket quantity rounded up, wihout any issuance premium /// @param erc20 The ERC20 token contract for the asset - /// @return {tok/BU} The whole token quantity of token in the reference basket + /// @return {tok/BU} The redemption quantity of token in the reference basket, rounded up /// Returns 0 if erc20 is not registered or not in the basket /// Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. /// Otherwise, returns (token's basket.refAmts / token's Collateral.refPerTok()) function quantity(IERC20 erc20) external view returns (uint192); + /// Returns basket quantity rounded up, wihout any issuance premium /// Like quantity(), but unsafe because it DOES NOT CONFIRM THAT THE ASSET IS CORRECT /// @param erc20 The ERC20 token contract for the asset /// @param asset The registered asset plugin contract for the erc20 - /// @return {tok/BU} The whole token quantity of token in the reference basket + /// @return {tok/BU} The redemption quantity of token in the reference basket, rounded up /// Returns 0 if erc20 is not registered or not in the basket /// Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. /// Otherwise, returns (token's basket.refAmts / token's Collateral.refPerTok()) function quantityUnsafe(IERC20 erc20, IAsset asset) external view returns (uint192); /// @param amount {BU} + /// @param applyIssuancePremium Whether to apply the issuance premium /// @return erc20s The addresses of the ERC20 tokens in the reference basket /// @return quantities {qTok} The quantity of each ERC20 token to issue `amount` baskets - function quote(uint192 amount, RoundingMode rounding) - external - view - returns (address[] memory erc20s, uint256[] memory quantities); + function quote( + uint192 amount, + bool applyIssuancePremium, + RoundingMode rounding + ) external view returns (address[] memory erc20s, uint256[] memory quantities); /// Return the redemption value of `amount` BUs for a linear combination of historical baskets /// @param basketNonces An array of basket nonces to do redemption from @@ -152,16 +162,10 @@ interface IBasketHandler is IComponent { /// Should not revert /// low should be nonzero when BUs are worth selling + /// @param applyIssuancePremium Whether to apply the issuance premium to the high price /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate - function price() external view returns (uint192 low, uint192 high); - - /// Should not revert - /// lotLow should be nonzero if a BU could be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); + function price(bool applyIssuancePremium) external view returns (uint192 low, uint192 high); /// @return timestamp The timestamp at which the basket was last set function timestamp() external view returns (uint48); @@ -190,4 +194,8 @@ interface TestIBasketHandler is IBasketHandler { function warmupPeriod() external view returns (uint48); function setWarmupPeriod(uint48 val) external; + + function enableIssuancePremium() external view returns (bool); + + function setIssuancePremiumEnabled(bool val) external; } diff --git a/contracts/interfaces/IDeployer.sol b/contracts/interfaces/IDeployer.sol index 0a1e1ff6b5..149394fc39 100644 --- a/contracts/interfaces/IDeployer.sol +++ b/contracts/interfaces/IDeployer.sol @@ -39,6 +39,7 @@ struct DeploymentParams { // === BasketHandler === uint48 warmupPeriod; // {s} how long to wait until issuance/trading after regaining SOUND bool reweightable; // whether the target amounts in the prime basket can change + bool enableIssuancePremium; // whether to enable the issuance premium // // === BackingManager === uint48 tradingDelay; // {s} how long to wait until starting auctions after switching basket diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index f267727fa2..e7c132acd2 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -153,6 +153,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // Whether the total weights of the target basket can be changed bool public reweightable; // immutable after init + bool public enableIssuancePremium; + // ==== Invariants ==== // basket is a valid Basket: // basket.erc20s is a valid collateral array and basket.erc20s == keys(basket.refAmts) @@ -166,12 +168,14 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { function init( IMain main_, uint48 warmupPeriod_, - bool reweightable_ + bool reweightable_, + bool enableIssuancePremium_ ) external initializer { __Component_init(main_); setWarmupPeriod(warmupPeriod_); reweightable = reweightable_; // immutable thereafter + enableIssuancePremium = enableIssuancePremium_; // Set last status to DISABLED (default) lastStatus = CollateralStatus.DISABLED; @@ -237,7 +241,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } } - /// Set the prime basket + /// Set the prime basket, checking target amounts are constant /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// @custom:governance @@ -245,10 +249,12 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { external governance { - _setPrimeBasket(erc20s, targetAmts, true); + _setPrimeBasket(erc20s, targetAmts, false); } - /// Set the prime basket without reweighting targetAmts by UoA of the current basket + /// Set the prime basket, skipping any constant target amount checks if RToken is reweightable + /// Warning: Reweightable RTokens SHOULD use a spell to execute this function to avoid + /// accidentally changing the UoA value of the RToken. /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// @custom:governance @@ -256,13 +262,13 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { external governance { - _setPrimeBasket(erc20s, targetAmts, false); + _setPrimeBasket(erc20s, targetAmts, true); } /// Set the prime basket in the basket configuration, in terms of erc20s and target amounts /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket - /// @param normalize True iff targetAmts should be normalized by UoA to the reference basket + /// @param disableTargetAmountCheck If true, skips the `requireConstantConfigTargets()` check /// @custom:governance // checks: // caller is OWNER @@ -278,18 +284,18 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { function _setPrimeBasket( IERC20[] calldata erc20s, uint192[] memory targetAmts, - bool normalize + bool disableTargetAmountCheck ) internal { - require(erc20s.length > 0, "empty basket"); - require(erc20s.length == targetAmts.length, "len mismatch"); + require(erc20s.length > 0, "invalid lengths"); + require(erc20s.length == targetAmts.length, "invalid lengths"); requireValidCollArray(erc20s); - if (!reweightable && config.erc20s.length > 0) { + if ( + (!reweightable || (reweightable && !disableTargetAmountCheck)) && + config.erc20s.length != 0 + ) { // Require targets remain constant requireConstantConfigTargets(erc20s, targetAmts); - } else if (normalize && config.erc20s.length > 0) { - // Normalize targetAmts based on UoA value of reference basket - targetAmts = normalizeByPrice(erc20s, targetAmts); } // Clean up previous basket config @@ -307,8 +313,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { // This is a nice catch to have, but in general it is possible for // an ERC20 in the prime basket to have its asset unregistered. require(reg.toAsset(erc20s[i]).isCollateral(), "erc20 is not collateral"); - require(0 < targetAmts[i], "invalid target amount; must be nonzero"); - require(targetAmts[i] <= MAX_TARGET_AMT, "invalid target amount; too large"); + require(0 < targetAmts[i], "invalid target amount"); + require(targetAmts[i] <= MAX_TARGET_AMT, "invalid target amount"); config.erc20s.push(erc20s[i]); config.targetAmts[erc20s[i]] = targetAmts[i]; @@ -333,8 +339,8 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint256 max, IERC20[] calldata erc20s ) external governance { - require(max <= MAX_BACKUP_ERC20S, "max too large"); - require(erc20s.length <= MAX_BACKUP_ERC20S, "erc20s too large"); + require(max <= MAX_BACKUP_ERC20S, "too large"); + require(erc20s.length <= MAX_BACKUP_ERC20S, "too large"); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; @@ -377,8 +383,9 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { (block.timestamp >= lastStatusTimestamp + warmupPeriod); } + /// Basket quantity rounded up, without any issuance premium /// @param erc20 The token contract to check for quantity for - /// @return {tok/BU} The token-quantity of an ERC20 token in the basket. + /// @return {tok/BU} The redemption token-quantity of an ERC20 token in the basket. // Returns 0 if erc20 is not registered or not in the basket // Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) @@ -390,6 +397,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { } } + /// Basket quantity rounded up, without any issuance premium /// Like quantity(), but unsafe because it DOES NOT CONFIRM THAT THE ASSET IS CORRECT /// @param erc20 The ERC20 token contract for the asset /// @param asset The registered asset plugin contract for the erc20 @@ -402,9 +410,27 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { return _quantity(erc20, ICollateral(address(asset)), CEIL); } + /// @param coll A collateral that has had refresh() called on it this timestamp + /// @return {1} The multiplier to charge on issuance quantities for a collateral + function issuancePremium(ICollateral coll) public view returns (uint192) { + if (!enableIssuancePremium || coll.lastSave() != block.timestamp) return FIX_ONE; + + try coll.savedPegPrice() returns (uint192 pegPrice) { + uint192 targetPerRef = coll.targetPerRef(); // {target/ref} + if (pegPrice == 0 || pegPrice >= targetPerRef) return FIX_ONE; + + // {1} = {target/ref} / {target/ref} + return targetPerRef.safeDiv(pegPrice, CEIL); + } catch { + // if savedPegPrice() does not exist on the collateral the error bytes are 0 len + return FIX_ONE; + } + } + + /// Returns the quantity of collateral token in a BU /// @param erc20 The token contract /// @param coll The registered collateral plugin contract - /// @return {tok/BU} The token-quantity of an ERC20 token in the basket. + /// @return q {tok/BU} The token-quantity of an ERC20 token in the basket // Returns 0 if coll is not in the basket // Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) @@ -420,49 +446,55 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { return basket.refAmts[erc20].div(refPerTok, rounding); } + /// Returns the price of a BU (including issuance premium) + /// Included for backwards compatibility with <4.0.0 /// Should not revert /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) function price() external view returns (uint192 low, uint192 high) { - return _price(false); + return price(true); } /// Should not revert - /// lowLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility - /// @return lotLow {UoA/BU} The lower end of the lot price estimate - /// @return lotHigh {UoA/BU} The upper end of the lot price estimate - // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - return _price(true); - } - - /// Returns the price of a BU, using the lot prices if `useLotPrice` is true - /// @return low {UoA/BU} The lower end of the lot price estimate - /// @return high {UoA/BU} The upper end of the lot price estimate - function _price(bool useLotPrice) internal view returns (uint192 low, uint192 high) { + /// @param applyIssuancePremium Whether to apply the issuance premium to the high price + /// @return low {UoA/BU} The lower end of the price estimate + /// @return high {UoA/BU} The upper end of the price estimate + // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) + function price(bool applyIssuancePremium) public view returns (uint192 low, uint192 high) { IAssetRegistry reg = main.assetRegistry(); uint256 low256; uint256 high256; for (uint256 i = 0; i < basket.erc20s.length; i++) { - uint192 qty = quantity(basket.erc20s[i]); - if (qty == 0) continue; + try main.assetRegistry().toColl(basket.erc20s[i]) returns (ICollateral coll) { + uint192 qty = _quantity(basket.erc20s[i], coll, CEIL); + if (qty == 0) continue; - (uint192 lowP, uint192 highP) = useLotPrice - ? reg.toAsset(basket.erc20s[i]).lotPrice() - : reg.toAsset(basket.erc20s[i]).price(); + (uint192 lowP, uint192 highP) = reg.toAsset(basket.erc20s[i]).price(); - low256 += qty.safeMul(lowP, RoundingMode.FLOOR); + low256 += qty.safeMul(lowP, FLOOR); - if (high256 < FIX_MAX) { - if (highP == FIX_MAX) { - high256 = FIX_MAX; - } else { - high256 += qty.safeMul(highP, RoundingMode.CEIL); + if (high256 < FIX_MAX) { + if (highP == FIX_MAX) { + high256 = FIX_MAX; + continue; + } + + if (applyIssuancePremium) { + uint192 premium = issuancePremium(coll); // {1} always CEIL + + // {tok} = {tok} * {1} + if (premium > FIX_ONE) qty = qty.safeMul(premium, CEIL); + } + + high256 += qty.safeMul(highP, CEIL); } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + continue; } } @@ -471,8 +503,10 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { high = high256 >= FIX_MAX ? FIX_MAX : uint192(high256); } - /// Return the current issuance/redemption value of `amount` BUs + /// Return the current issuance/redemption quantities for `amount` BUs + /// Included for backwards compatibility with <4.0.0 /// @param amount {BU} + /// @param rounding If CEIL, apply issuance premium /// @return erc20s The backing collateral erc20s /// @return quantities {qTok} ERC20 token quantities equal to `amount` BUs // Returns (erc20s, [quantity(e) * amount {as qTok} for e in erc20s]) @@ -481,6 +515,19 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { view returns (address[] memory erc20s, uint256[] memory quantities) { + return quote(amount, rounding == CEIL, rounding); + } + + /// @param amount {BU} + /// @param applyIssuancePremium Whether to apply the issuance premium + /// @return erc20s The backing collateral erc20s + /// @return quantities {qTok} ERC20 token quantities equal to `amount` BUs + // Returns (erc20s, [quantity(e) * amount {as qTok} for e in erc20s]) + function quote( + uint192 amount, + bool applyIssuancePremium, + RoundingMode rounding + ) public view returns (address[] memory erc20s, uint256[] memory quantities) { IAssetRegistry assetRegistry = main.assetRegistry(); erc20s = new address[](basket.erc20s.length); quantities = new uint256[](basket.erc20s.length); @@ -489,10 +536,22 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { erc20s[i] = address(basket.erc20s[i]); ICollateral coll = assetRegistry.toColl(IERC20(erc20s[i])); - // {qTok} = {tok/BU} * {BU} * {tok} * {qTok/tok} - quantities[i] = _quantity(basket.erc20s[i], coll, rounding) - .safeMul(amount, rounding) - .shiftl_toUint(int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), rounding); + // {tok} = {tok/BU} * {BU} + uint192 q = _quantity(basket.erc20s[i], coll, rounding).safeMul(amount, rounding); + + // Prevent toxic issuance by charging more when collateral is under peg + if (applyIssuancePremium) { + uint192 premium = issuancePremium(coll); // {1} always CEIL + + // {tok} = {tok} * {1} + if (premium > FIX_ONE) q = q.safeMul(premium, rounding); + } + + // {qTok} = {tok} * {qTok/tok} + quantities[i] = q.shiftl_toUint( + int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), + rounding + ); } } @@ -508,7 +567,7 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { uint192[] memory portions, uint192 amount ) external view returns (address[] memory erc20s, uint256[] memory quantities) { - require(basketNonces.length == portions.length, "bad portions len"); + require(basketNonces.length == portions.length, "invalid lengths"); IERC20[] memory erc20sAll = new IERC20[](main.assetRegistry().size()); ICollateral[] memory collsAll = new ICollateral[](erc20sAll.length); @@ -594,14 +653,9 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { ICollateral coll = main.assetRegistry().toColl(basket.erc20s[i]); if (coll.status() == CollateralStatus.DISABLED) return BasketRange(FIX_ZERO, FIX_MAX); - uint192 refPerTok = coll.refPerTok(); - // If refPerTok is 0, then we have zero of coll's reference unit. - // We know that basket.refAmts[basket.erc20s[i]] > 0, so we have no baskets. - if (refPerTok == 0) return BasketRange(FIX_ZERO, FIX_MAX); - - // {tok/BU} = {ref/BU} / {ref/tok}. 0-division averted by condition above. - uint192 q = basket.refAmts[basket.erc20s[i]].div(refPerTok, CEIL); - // q > 0 because q = (n).div(_, CEIL) and n > 0 + // {tok/BU} + uint192 q = _quantity(basket.erc20s[i], coll, CEIL); + if (q == FIX_MAX) return BasketRange(FIX_ZERO, FIX_MAX); // {BU} = {tok} / {tok/BU} uint192 inBUs = coll.bal(account).div(q); @@ -619,6 +673,12 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { warmupPeriod = val; } + /// @custom:governance + function setIssuancePremiumEnabled(bool val) public governance { + emit EnableIssuancePremiumSet(enableIssuancePremium, val); + enableIssuancePremium = val; + } + /* _switchBasket computes basket' from three inputs: - the basket configuration (config: BasketConfig) - the function (isGood: erc20 -> bool), implemented here by goodCollateral() @@ -842,46 +902,6 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { require(_targetAmts.length() == 0, "missing target weights"); } - /// Normalize the target amounts to maintain constant UoA value with the current config - /// @return newTargetAmts {target/BU} The new target amounts for the normalized basket - function normalizeByPrice(IERC20[] calldata erc20s, uint192[] memory targetAmts) - private - returns (uint192[] memory newTargetAmts) - { - main.poke(); - require(status() == CollateralStatus.SOUND, "unsound basket"); - uint256 len = erc20s.length; // assumes erc20s.length == targetAmts.length - - // Compute current basket price - (uint192 low, uint192 high) = _price(false); // {UoA/BU} - assert(low > 0 && high < FIX_MAX); // implied by SOUND status - uint192 p = low.plus(high).divu(2, FLOOR); // {UoA/BU} - - // Compute would-be new price - uint192 newP; // {UoA/BU} - for (uint256 i = 0; i < len; ++i) { - ICollateral coll = main.assetRegistry().toColl(erc20s[i]); // reverts if unregistered - require(coll.status() == CollateralStatus.SOUND, "unsound new collateral"); - - (low, high) = coll.price(); // {UoA/tok} - require(low > 0 && high < FIX_MAX, "invalid price"); - - // {UoA/BU} += {target/BU} * {UoA/tok} / ({target/ref} * {ref/tok}) - newP += targetAmts[i].mulDiv( - low.plus(high).divu(2, FLOOR), - coll.targetPerRef().mul(coll.refPerTok(), CEIL), - FLOOR - ); - } - - // Scale targetAmts by the price ratio - newTargetAmts = new uint192[](len); - for (uint256 i = 0; i < len; ++i) { - // {target/BU} = {target/BU} * {UoA/BU} / {UoA/BU} - newTargetAmts[i] = targetAmts[i].mulDiv(p, newP, CEIL); - } - } - /// Good collateral is registered, collateral, SOUND, has the expected targetName, /// and not a system token or 0 addr function goodCollateral(bytes32 targetName, IERC20 erc20) private view returns (bool) { diff --git a/contracts/p0/Deployer.sol b/contracts/p0/Deployer.sol index e26569974a..f812830044 100644 --- a/contracts/p0/Deployer.sol +++ b/contracts/p0/Deployer.sol @@ -95,7 +95,12 @@ contract DeployerP0 is IDeployer, Versioned { ); // Init Basket Handler - main.basketHandler().init(main, params.warmupPeriod, params.reweightable); + main.basketHandler().init( + main, + params.warmupPeriod, + params.reweightable, + params.enableIssuancePremium + ); // Init Revenue Traders main.rsrTrader().init(main, rsr, params.maxTradeSlippage, params.minTradeVolume); diff --git a/contracts/p0/RToken.sol b/contracts/p0/RToken.sol index 3a4b476aff..c30757f96b 100644 --- a/contracts/p0/RToken.sol +++ b/contracts/p0/RToken.sol @@ -109,7 +109,11 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { ? basketsNeeded.muluDivu(amount, totalSupply(), CEIL) // {BU * qRTok / qRTok} : shiftl_toFix(amount, -int8(decimals())); // {qRTok / qRTok} - (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote(baskets, CEIL); + (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote( + baskets, + true, + CEIL + ); address issuer = _msgSender(); for (uint256 i = 0; i < erc20s.length; i++) { @@ -150,6 +154,7 @@ contract RTokenP0 is ComponentP0, ERC20PermitUpgradeable, IRToken { (address[] memory erc20s, uint256[] memory amounts) = main.basketHandler().quote( baskets, + false, FLOOR ); diff --git a/contracts/p0/mixins/TradingLib.sol b/contracts/p0/mixins/TradingLib.sol index a0e0df2638..ab4232dbd8 100644 --- a/contracts/p0/mixins/TradingLib.sol +++ b/contracts/p0/mixins/TradingLib.sol @@ -278,7 +278,7 @@ library TradingLibP0 { view returns (BasketRange memory range) { - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(false); // {UoA/BU} // Cap ctx.basketsHeld.top if (ctx.basketsHeld.top > ctx.rToken.basketsNeeded()) { diff --git a/contracts/p1/BackingManager.sol b/contracts/p1/BackingManager.sol index ce477745dc..6f8c8b2ff6 100644 --- a/contracts/p1/BackingManager.sol +++ b/contracts/p1/BackingManager.sol @@ -236,6 +236,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { for (uint256 i = 0; i < length; ++i) { IAsset asset = assetRegistry.toAsset(erc20s[i]); + // Use same quantity-rounding as BasketHandler.basketsHeldBy() // {tok} = {BU} * {tok/BU} uint192 req = needed.mul(basketHandler.quantity(erc20s[i]), CEIL); uint192 bal = asset.bal(address(this)); @@ -287,6 +288,7 @@ contract BackingManagerP1 is TradingP1, IBackingManager { ctx.quantities = new uint192[](reg.erc20s.length); for (uint256 i = 0; i < reg.erc20s.length; ++i) { ctx.quantities[i] = basketHandler.quantityUnsafe(reg.erc20s[i], reg.assets[i]); + // quantities round up, without any issuance premium } ctx.bals = new uint192[](reg.erc20s.length); for (uint256 i = 0; i < reg.erc20s.length; ++i) { diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index d65a3c667c..4a07a81024 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -13,6 +13,8 @@ import "../libraries/Fixed.sol"; import "./mixins/BasketLib.sol"; import "./mixins/Component.sol"; +// solhint-disable max-states-count + /** * @title BasketHandler * @notice Handles the basket configuration, definition, and evolution over time. @@ -89,6 +91,9 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint48 public lastCollateralized; // {basketNonce} most recent full collateralization // === + // Added in 4.0.0 + + bool public enableIssuancePremium; // ==== Invariants ==== // basket is a valid Basket: @@ -103,7 +108,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { function init( IMain main_, uint48 warmupPeriod_, - bool reweightable_ + bool reweightable_, + bool enableIssuancePremium_ ) external initializer { __Component_init(main_); @@ -115,6 +121,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { setWarmupPeriod(warmupPeriod_); reweightable = reweightable_; // immutable thereafter + enableIssuancePremium = enableIssuancePremium_; // Set last status to DISABLED (default) lastStatus = CollateralStatus.DISABLED; @@ -183,26 +190,28 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } } - /// Set the prime basket + /// Set the prime basket, checking target amounts are constant /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// @custom:governance function setPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external { - _setPrimeBasket(erc20s, targetAmts, true); + _setPrimeBasket(erc20s, targetAmts, false); } - /// Set the prime basket without reweighting targetAmts by UoA of the current basket + /// Set the prime basket, skipping any constant target amount checks if RToken is reweightable + /// Warning: Reweightable RTokens SHOULD use a spell to execute this function to avoid + /// accidentally changing the UoA value of the RToken. /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket /// @custom:governance function forceSetPrimeBasket(IERC20[] calldata erc20s, uint192[] calldata targetAmts) external { - _setPrimeBasket(erc20s, targetAmts, false); + _setPrimeBasket(erc20s, targetAmts, true); } /// Set the prime basket in the basket configuration, in terms of erc20s and target amounts /// @param erc20s The collateral for the new prime basket /// @param targetAmts The target amounts (in) {target/BU} for the new prime basket - /// @param normalize True iff targetAmts should be normalized by UoA to the reference basket + /// @param disableTargetAmountCheck If true, skips the `requireConstantConfigTargets()` check /// @custom:governance // checks: // caller is OWNER @@ -218,14 +227,16 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { function _setPrimeBasket( IERC20[] calldata erc20s, uint192[] memory targetAmts, - bool normalize + bool disableTargetAmountCheck ) internal { requireGovernanceOnly(); - require(erc20s.length != 0, "empty basket"); - require(erc20s.length == targetAmts.length, "len mismatch"); + require(erc20s.length != 0 && erc20s.length == targetAmts.length, "invalid lengths"); requireValidCollArray(erc20s); - if (!reweightable && config.erc20s.length != 0) { + if ( + (!reweightable || (reweightable && !disableTargetAmountCheck)) && + config.erc20s.length != 0 + ) { // Require targets remain constant BasketLibP1.requireConstantConfigTargets( assetRegistry, @@ -234,20 +245,6 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { erc20s, targetAmts ); - } else if (normalize && config.erc20s.length != 0) { - // Confirm reference basket is SOUND - assetRegistry.refresh(); // will set lastStatus - require(lastStatus == CollateralStatus.SOUND, "unsound basket"); - - // Normalize targetAmts based on UoA value of reference basket - (uint192 low, uint192 high) = _price(false); - assert(low != 0 && high != FIX_MAX); // implied by SOUND status - targetAmts = BasketLibP1.normalizeByPrice( - assetRegistry, - erc20s, - targetAmts, - (low + high + 1) / 2 - ); } // Clean up previous basket config @@ -264,8 +261,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { // This is a nice catch to have, but in general it is possible for // an ERC20 in the prime basket to have its asset unregistered. require(assetRegistry.toAsset(erc20s[i]).isCollateral(), "erc20 is not collateral"); - require(0 < targetAmts[i], "invalid target amount; must be nonzero"); - require(targetAmts[i] <= MAX_TARGET_AMT, "invalid target amount; too large"); + require(0 < targetAmts[i] && targetAmts[i] <= MAX_TARGET_AMT, "invalid target amount"); config.erc20s.push(erc20s[i]); config.targetAmts[erc20s[i]] = targetAmts[i]; @@ -291,8 +287,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { IERC20[] calldata erc20s ) external { requireGovernanceOnly(); - require(max <= MAX_BACKUP_ERC20S, "max too large"); - require(erc20s.length <= MAX_BACKUP_ERC20S, "erc20s too large"); + require(max <= MAX_BACKUP_ERC20S && erc20s.length <= MAX_BACKUP_ERC20S, "too large"); requireValidCollArray(erc20s); BackupConfig storage conf = config.backups[targetName]; conf.max = max; @@ -301,7 +296,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { for (uint256 i = 0; i < erc20s.length; ++i) { // This is a nice catch to have, but in general it is possible for // an ERC20 in the backup config to have its asset altered. - require(assetRegistry.toAsset(erc20s[i]).isCollateral(), "erc20 is not collateral"); + assetRegistry.toColl(erc20s[i]); // reverts if not collateral conf.erc20s.push(erc20s[i]); } emit BackupConfigSet(targetName, max, erc20s); @@ -339,6 +334,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { (block.timestamp >= lastStatusTimestamp + warmupPeriod); } + /// Basket quantity rounded up, without any issuance premium /// @param erc20 The token contract to check for quantity for /// @return {tok/BU} The token-quantity of an ERC20 token in the basket. // Returns 0 if erc20 is not registered or not in the basket @@ -352,6 +348,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { } } + /// Basket quantity rounded up, without any issuance premium /// Like quantity(), but unsafe because it DOES NOT CONFIRM THAT THE ASSET IS CORRECT /// @param erc20 The ERC20 token contract for the asset /// @param asset The registered asset plugin contract for the erc20 @@ -364,9 +361,30 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { return _quantity(erc20, ICollateral(address(asset)), CEIL); } + /// @param coll A collateral that has had refresh() called on it this timestamp + /// @return {1} The multiplier to charge on issuance quantities for a collateral + function issuancePremium(ICollateral coll) public view returns (uint192) { + // `coll` does not need validation + if (!enableIssuancePremium || coll.lastSave() != block.timestamp) return FIX_ONE; + + // Use try-catch for safety since `savedPegPrice()` was only added in 4.0.0 to ICollateral + try coll.savedPegPrice() returns (uint192 pegPrice) { + if (pegPrice == 0) return FIX_ONE; + uint192 targetPerRef = coll.targetPerRef(); // {target/ref} + if (pegPrice >= targetPerRef) return FIX_ONE; + + // {1} = {target/ref} / {target/ref} + return targetPerRef.safeDiv(pegPrice, CEIL); + } catch { + // if savedPegPrice() does not exist on the collateral the error bytes are 0 len + return FIX_ONE; + } + } + + /// Returns the quantity of collateral token in a BU /// @param erc20 The token contract /// @param coll The registered collateral plugin contract - /// @return {tok/BU} The token-quantity of an ERC20 token in the basket. + /// @return {tok/BU} The token-quantity of an ERC20 token in the basket // Returns 0 if coll is not in the basket // Returns FIX_MAX (in lieu of +infinity) if Collateral.refPerTok() is 0. // Otherwise returns (token's basket.refAmts / token's Collateral.refPerTok()) @@ -382,49 +400,55 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { return basket.refAmts[erc20].div(refPerTok, rounding); } + /// Returns the price of a BU (including issuance premium) + /// Included for backwards compatibility with <4.0.0 /// Should not revert /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) function price() external view returns (uint192 low, uint192 high) { - return _price(false); + return price(true); } + /// Returns the price of a BU /// Should not revert - /// lowLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility - /// @return lotLow {UoA/BU} The lower end of the lot price estimate - /// @return lotHigh {UoA/BU} The upper end of the lot price estimate - // returns sum(quantity(erc20) * lotPrice(erc20) for erc20 in basket.erc20s) - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh) { - return _price(true); - } - - /// Returns the price of a BU, using the lot prices if `useLotPrice` is true - /// @param useLotPrice Whether to use lotPrice() or price() + /// @param applyIssuancePremium Whether to apply the issuance premium to the high price /// @return low {UoA/BU} The lower end of the price estimate /// @return high {UoA/BU} The upper end of the price estimate - function _price(bool useLotPrice) internal view returns (uint192 low, uint192 high) { + // returns sum(quantity(erc20) * price(erc20) for erc20 in basket.erc20s) + function price(bool applyIssuancePremium) public view returns (uint192 low, uint192 high) { uint256 low256; uint256 high256; uint256 len = basket.erc20s.length; for (uint256 i = 0; i < len; ++i) { - uint192 qty = quantity(basket.erc20s[i]); // CEIL rounding - if (qty == 0) continue; + try assetRegistry.toColl(basket.erc20s[i]) returns (ICollateral coll) { + uint192 qty = _quantity(basket.erc20s[i], coll, CEIL); + if (qty == 0) continue; - (uint192 lowP, uint192 highP) = useLotPrice - ? assetRegistry.toAsset(basket.erc20s[i]).lotPrice() - : assetRegistry.toAsset(basket.erc20s[i]).price(); + (uint192 lowP, uint192 highP) = coll.price(); - low256 += qty.safeMul(lowP, RoundingMode.FLOOR); + low256 += qty.safeMul(lowP, FLOOR); - if (high256 < FIX_MAX) { - if (highP == FIX_MAX) { - high256 = FIX_MAX; - } else { - high256 += qty.safeMul(highP, RoundingMode.CEIL); + if (high256 < FIX_MAX) { + if (highP == FIX_MAX) { + high256 = FIX_MAX; + continue; + } + + if (applyIssuancePremium) { + uint192 premium = issuancePremium(coll); // {1} always CEIL + + // {tok} = {tok} * {1} + if (premium > FIX_ONE) qty = qty.safeMul(premium, CEIL); + } + + high256 += qty.safeMul(highP, CEIL); } + } catch (bytes memory errData) { + // see: docs/solidity-style.md#Catching-Empty-Data + if (errData.length == 0) revert(); // solhint-disable-line reason-string + continue; } } @@ -433,9 +457,9 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { high = high256 >= FIX_MAX ? FIX_MAX : uint192(high256); } - /// Return the current issuance/redemption value of `amount` BUs - /// Any approvals needed to issue RTokens should be set to the values returned by this function - /// @dev Subset of logic of quoteCustomRedemption; more gas efficient for current nonce + /// Return the current issuance/redemption quantities for `amount` BUs + /// Included for backwards compatibility with <4.0.0 + /// @param rounding If CEIL, apply issuance premium /// @param amount {BU} /// @return erc20s The backing collateral erc20s /// @return quantities {qTok} ERC20 token quantities equal to `amount` BUs @@ -445,6 +469,21 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { view returns (address[] memory erc20s, uint256[] memory quantities) { + return quote(amount, rounding == CEIL, rounding); + } + + /// Return the current issuance/redemption quantities for `amount` BUs + /// @dev Subset of logic of quoteCustomRedemption; more gas efficient for current nonce + /// @param amount {BU} + /// @param applyIssuancePremium Whether to apply the issuance premium + /// @return erc20s The backing collateral erc20s + /// @return quantities {qTok} ERC20 token quantities equal to `amount` BUs + // Returns (erc20s, [quantity(e) * amount {as qTok} for e in erc20s]) + function quote( + uint192 amount, + bool applyIssuancePremium, + RoundingMode rounding + ) public view returns (address[] memory erc20s, uint256[] memory quantities) { uint256 length = basket.erc20s.length; erc20s = new address[](length); quantities = new uint256[](length); @@ -453,10 +492,22 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { erc20s[i] = address(basket.erc20s[i]); ICollateral coll = assetRegistry.toColl(IERC20(erc20s[i])); - // {qTok} = {tok/BU} * {BU} * {tok} * {qTok/tok} - quantities[i] = _quantity(basket.erc20s[i], coll, rounding) - .safeMul(amount, rounding) - .shiftl_toUint(int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), rounding); + // {tok} = {tok/BU} * {BU} + uint192 q = _quantity(basket.erc20s[i], coll, rounding).safeMul(amount, rounding); + + // Prevent toxic issuance by charging more when collateral is under peg + if (applyIssuancePremium) { + uint192 premium = issuancePremium(coll); // {1} always CEIL by definition + + // {tok} = {tok} * {1} + if (premium > FIX_ONE) q = q.safeMul(premium, rounding); + } + + // {qTok} = {tok} * {qTok/tok} + quantities[i] = q.shiftl_toUint( + int8(IERC20Metadata(address(basket.erc20s[i])).decimals()), + rounding + ); } } @@ -472,7 +523,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { uint192[] memory portions, uint192 amount ) external view returns (address[] memory erc20s, uint256[] memory quantities) { - require(basketNonces.length == portions.length, "bad portions len"); + require(basketNonces.length == portions.length, "invalid lengths"); IERC20[] memory erc20sAll = new IERC20[](assetRegistry.size()); ICollateral[] memory collsAll = new ICollateral[](erc20sAll.length); @@ -565,14 +616,9 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { ICollateral coll = assetRegistry.toColl(basket.erc20s[i]); if (coll.status() == CollateralStatus.DISABLED) return BasketRange(FIX_ZERO, FIX_MAX); - uint192 refPerTok = coll.refPerTok(); - // If refPerTok is 0, then we have zero of coll's reference unit. - // We know that basket.refAmts[basket.erc20s[i]] > 0, so we have no baskets. - if (refPerTok == 0) return BasketRange(FIX_ZERO, FIX_MAX); - - // {tok/BU} = {ref/BU} / {ref/tok}. 0-division averted by condition above. - uint192 q = basket.refAmts[basket.erc20s[i]].div(refPerTok, CEIL); - // q > 0 because q = (n).div(_, CEIL) and n > 0 + // {tok/BU} + uint192 q = _quantity(basket.erc20s[i], coll, CEIL); + if (q == FIX_MAX) return BasketRange(FIX_ZERO, FIX_MAX); // {BU} = {tok} / {tok/BU} uint192 inBUs = coll.bal(account).div(q); @@ -591,6 +637,13 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { warmupPeriod = val; } + /// @custom:governance + function setIssuancePremiumEnabled(bool val) public { + requireGovernanceOnly(); + emit EnableIssuancePremiumSet(enableIssuancePremium, val); + enableIssuancePremium = val; + } + // === Private === // contract-size-saver diff --git a/contracts/p1/Deployer.sol b/contracts/p1/Deployer.sol index bf5608a52f..073c7c19e4 100644 --- a/contracts/p1/Deployer.sol +++ b/contracts/p1/Deployer.sol @@ -192,7 +192,12 @@ contract DeployerP1 is IDeployer, Versioned { ); // Init Basket Handler - components.basketHandler.init(main, params.warmupPeriod, params.reweightable); + components.basketHandler.init( + main, + params.warmupPeriod, + params.reweightable, + params.enableIssuancePremium + ); // Init Revenue Traders components.rsrTrader.init(main, rsr, params.maxTradeSlippage, params.minTradeVolume); diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 16033d664e..e6350c81ad 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -135,8 +135,10 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { : _safeWrap(amount); emit Issuance(issuer, recipient, amount, amtBaskets); + // Get quote from BasketHandler including issuance premium (address[] memory erc20s, uint256[] memory deposits) = basketHandler.quote( amtBaskets, + true, CEIL ); @@ -201,7 +203,11 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { uint192 baskets = _scaleDown(caller, amount); emit Redemption(caller, recipient, amount, baskets); - (address[] memory erc20s, uint256[] memory amounts) = basketHandler.quote(baskets, FLOOR); + (address[] memory erc20s, uint256[] memory amounts) = basketHandler.quote( + baskets, + false, + FLOOR + ); // === Interactions === diff --git a/contracts/p1/mixins/BasketLib.sol b/contracts/p1/mixins/BasketLib.sol index e8e96ad4ac..3e5c3eb02a 100644 --- a/contracts/p1/mixins/BasketLib.sol +++ b/contracts/p1/mixins/BasketLib.sol @@ -345,6 +345,7 @@ library BasketLibP1 { } /// Normalize the target amounts to maintain constant UoA value with the current config + /// @dev Unused; left in for future use in reweightable RToken forceSetPrimeBasket() spell /// @param price {UoA/BU} Price of the reference basket (point estimate) /// @return newTargetAmts {target/BU} The new target amounts for the normalized basket function normalizeByPrice( diff --git a/contracts/p1/mixins/RecollateralizationLib.sol b/contracts/p1/mixins/RecollateralizationLib.sol index 1b1f355ef6..402aabc2be 100644 --- a/contracts/p1/mixins/RecollateralizationLib.sol +++ b/contracts/p1/mixins/RecollateralizationLib.sol @@ -113,7 +113,7 @@ library RecollateralizationLibP1 { // tradesOpen will be 0 when called by prepareRecollateralizationTrade() // tradesOpen can be > 0 when called by RTokenAsset.basketRange() - (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(); // {UoA/BU} + (uint192 buPriceLow, uint192 buPriceHigh) = ctx.bh.price(false); // {UoA/BU} require(buPriceLow != 0 && buPriceHigh != FIX_MAX, "BUs unpriced"); uint192 basketsNeeded = ctx.rToken.basketsNeeded(); // {BU} diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 96fb0a5008..4c6b9b76b8 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -104,6 +104,7 @@ abstract contract AppreciatingFiatCollateral is FiatCollateral { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/FiatCollateral.sol b/contracts/plugins/assets/FiatCollateral.sol index 5e0c5936c1..ff043fa9f5 100644 --- a/contracts/plugins/assets/FiatCollateral.sol +++ b/contracts/plugins/assets/FiatCollateral.sol @@ -58,6 +58,8 @@ contract FiatCollateral is ICollateral, Asset { uint192 public immutable pegTop; // {target/ref} The top of the peg + uint192 public savedPegPrice; // {target/ref} The peg price of the token during the last update + /// @param config.chainlinkFeed Feed units: {UoA/ref} constructor(CollateralConfig memory config) Asset( @@ -136,6 +138,7 @@ contract FiatCollateral is ICollateral, Asset { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index 81047c456d..4167bea7cd 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -70,6 +70,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index 4dd8e47e9f..18eb3b4f3a 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -54,10 +54,16 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { /// less RSR overcollateralization in % terms than the average (weighted) oracleError. /// This arises from the use of oracleErrors inside of `basketRange()` and inside /// `basketHandler.price()`. When `range.bottom == range.top` then there is no compounding. + /// @dev This method should not be relied upon to provide precise bounds for secondary market + /// prices. It is a "reasonable" estimate of the range the RToken is expected to trade in + /// given what the protocol knows about its internal state, but strictly speaking RTokens + /// can trade outside this range for periods of time (ie increased demand during IFFY state) + /// It is therefore NOT recommended to rely on this pricing method to price RTokens + /// in lending markets or anywhere where secondary market price is the central concern. /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate function tryPrice() external view virtual returns (uint192 low, uint192 high) { - (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(); // {UoA/BU} + (uint192 lowBUPrice, uint192 highBUPrice) = basketHandler.price(true); // {UoA/BU} require(lowBUPrice != 0 && highBUPrice != FIX_MAX, "invalid price"); assert(lowBUPrice <= highBUPrice); // not obviously true just by inspection @@ -67,8 +73,8 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { if (supply == 0) return (lowBUPrice, highBUPrice); - // The RToken's price is not symmetric like other assets! - // range.bottom is lower because of the slippage from the shortfall + // The RToken's basket range is not symmetric! + // range.bottom is additionally lower because of the slippage from the shortfall BasketRange memory range = basketRange(); // {BU} // {UoA/tok} = {BU} * {UoA/BU} / {tok} @@ -88,7 +94,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { } /// Should not revert - /// @dev See `tryPrice` caveat about possible compounding error in calculating price + /// @dev See `tryPrice` caveats /// @return {UoA/tok} The lower end of the price estimate /// @return {UoA/tok} The upper end of the price estimate function price() public view virtual returns (uint192, uint192) { diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 416b5d5f36..42784057f5 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -84,6 +84,7 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol index e74f88aa4c..887371ee0c 100644 --- a/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol +++ b/contracts/plugins/assets/curve/CurveAppreciatingRTokenFiatCollateral.sol @@ -71,7 +71,7 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { } // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {UoA/tok} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced @@ -79,6 +79,7 @@ contract CurveAppreciatingRTokenFiatCollateral is CurveStableCollateral { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol index 966894f620..3e593e2c15 100644 --- a/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol +++ b/contracts/plugins/assets/curve/CurveRecursiveCollateral.sol @@ -51,7 +51,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { /// Should NOT be manipulable by MEV /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return {target/ref} Unused. Always 0 + /// @return pegPrice {target/ref} The actual price observed in the peg function tryPrice() external view @@ -60,7 +60,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { returns ( uint192 low, uint192 high, - uint192 + uint192 pegPrice ) { // This pricing method is MEV-resistant, but only gives a lower-bound @@ -70,6 +70,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { // Get reference token price (uint192 refLow, uint192 refHigh) = this.tokenPrice(0); // reference token + pegPrice = refLow.plus(refHigh).divu(2, FLOOR); // Multiply by the underlyingRefPerTok() uint192 rate = underlyingRefPerTok(); @@ -77,7 +78,6 @@ contract CurveRecursiveCollateral is CurveStableCollateral { high = refHigh.mul(rate, CEIL); assert(low <= high); // not obviously true by inspection - return (low, high, 0); } /// Should not revert @@ -123,7 +123,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { // === Check for soft default === // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {UoA/tok} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced @@ -131,6 +131,7 @@ contract CurveRecursiveCollateral is CurveStableCollateral { if (high < FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index c757ba4fdf..2ba1ada96b 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -52,7 +52,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { /// @dev Override this when pricing is more complicated than just a single pool /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate - /// @return {target/ref} Unused. Always 0 + /// @return pegPrice {target/ref} The actual price observed in the peg function tryPrice() external view @@ -61,7 +61,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { returns ( uint192 low, uint192 high, - uint192 + uint192 pegPrice ) { // Assumption: the pool is balanced @@ -95,7 +95,8 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { high = aumHigh.div(supply, CEIL); assert(low <= high); // not obviously true just by inspection - return (low, high, 0); + pegPrice = 0; // can't deduce from MEV-manipulable pricing unfortunately + // no issuance premium! more dangerous to be used inside RTokens as a result } /// Should not revert @@ -121,7 +122,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { } // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {UoA/tok} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced @@ -129,6 +130,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 73ad6754f7..fa5d3b9a1d 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -122,7 +122,8 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { high = aumHigh.div(supply, CEIL); assert(low <= high); // not obviously true just by inspection - return (low, high, 0); + pegPrice = 0; // can't deduce from MEV-manipulable pricing unfortunately + // no issuance premium! more dangerous to be used inside RTokens as a result } /// Can revert, used by `_anyDepeggedOutsidePool()` diff --git a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol index 50300f0765..63c5024b52 100644 --- a/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableRTokenMetapoolCollateral.sol @@ -73,7 +73,7 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { } // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {UoA/tok} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced @@ -81,6 +81,7 @@ contract CurveStableRTokenMetapoolCollateral is CurveStableMetapoolCollateral { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } else { // must be unpriced diff --git a/contracts/plugins/mocks/BadCollateralPlugin.sol b/contracts/plugins/mocks/BadCollateralPlugin.sol index b6038eab2b..954484f888 100644 --- a/contracts/plugins/mocks/BadCollateralPlugin.sol +++ b/contracts/plugins/mocks/BadCollateralPlugin.sol @@ -55,6 +55,7 @@ contract BadCollateralPlugin is ATokenFiatCollateral { // Save prices savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } diff --git a/contracts/plugins/mocks/FraxAggregator.sol b/contracts/plugins/mocks/FraxAggregator.sol index e3b867dd49..9bb33bc2d3 100644 --- a/contracts/plugins/mocks/FraxAggregator.sol +++ b/contracts/plugins/mocks/FraxAggregator.sol @@ -6,6 +6,15 @@ import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; interface FraxAggregatorV3Interface is AggregatorV3Interface { function priceSource() external view returns (address); + function getPrices() + external + view + returns ( + bool _isBadData, + uint256 _priceLow, + uint256 _priceHigh + ); + function addRoundData( bool _isBadData, uint104 _priceLow, diff --git a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol index 7861f6aeff..8c41902248 100644 --- a/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol +++ b/contracts/plugins/mocks/InvalidRefPerTokCollateral.sol @@ -33,7 +33,7 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { exposedReferencePrice = hiddenReferencePrice; // Check for soft default + save prices - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { + try this.tryPrice() returns (uint192 low, uint192 high, uint192 pegPrice) { // {UoA/tok}, {UoA/tok}, {target/ref} // (0, 0) is a valid price; (0, FIX_MAX) is unpriced @@ -41,6 +41,7 @@ contract InvalidRefPerTokCollateralMock is AppreciatingFiatCollateral { if (high != FIX_MAX) { savedLowPrice = low; savedHighPrice = high; + savedPegPrice = pegPrice; lastSave = uint48(block.timestamp); } } catch (bytes memory errData) { diff --git a/contracts/plugins/mocks/RTokenCollateral.sol b/contracts/plugins/mocks/RTokenCollateral.sol index 0e5cca0eca..f10f01287a 100644 --- a/contracts/plugins/mocks/RTokenCollateral.sol +++ b/contracts/plugins/mocks/RTokenCollateral.sol @@ -34,6 +34,8 @@ contract RTokenCollateral is RTokenAsset, ICollateral { // targetName: The canonical name of this collateral's target unit. bytes32 public immutable targetName; + uint192 public savedPegPrice; // {target/ref} The peg price of the token during the last update + /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA constructor( IRToken erc20_, diff --git a/docs/collateral.md b/docs/collateral.md index 41fa09f053..d72e63010c 100644 --- a/docs/collateral.md +++ b/docs/collateral.md @@ -42,18 +42,11 @@ interface IAsset is IRewardable { function refresh() external; /// Should not revert - /// low should be nonzero when the asset might be worth selling + /// low should be nonzero if the asset could be worth selling /// @return low {UoA/tok} The lower end of the price estimate /// @return high {UoA/tok} The upper end of the price estimate function price() external view returns (uint192 low, uint192 high); - /// Should not revert - /// lotLow should be nonzero when the asset might be worth selling - /// @dev Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility - /// @return lotLow {UoA/tok} The lower end of the lot price estimate - /// @return lotHigh {UoA/tok} The upper end of the lot price estimate - function lotPrice() external view returns (uint192 lotLow, uint192 lotHigh); - /// @return {tok} The balance of the ERC20 in whole tokens function bal(address account) external view returns (uint192); @@ -113,6 +106,9 @@ interface ICollateral is IAsset { /// @return {target/ref} Quantity of whole target units per whole reference unit in the peg function targetPerRef() external view returns (uint192); + + /// @return {target/ref} The peg price of the token during the last update + function savedPegPrice() external view returns (uint192); } ``` @@ -389,12 +385,6 @@ Should NOT return `(>0, FIX_MAX)`: if the high price is FIX_MAX then the low pri Should be gas-efficient. -### lotPrice() `{UoA/tok}` - -Deprecated. Phased out in 3.1.0, but left on interface for backwards compatibility. - -Recommend implement `lotPrice()` by calling `price()`. If you are inheriting from any of our existing collateral plugins, this is already done for you. See [Asset.sol](../contracts/plugins/Asset.sol) for the implementation. - ### refPerTok() `{ref/tok}` Should never revert. @@ -424,6 +414,14 @@ The target name is just a bytes32 serialization of the target unit string. Here For a collateral plugin that uses a novel target unit, get the targetName with `ethers.utils.formatBytes32String(unitName)`. +### savedPegPrice() `{target/ref}` + +A return value of 0 indicates _no_ issuance premium should be applied to this collateral during de-peg. Collateral that return 0 are more dangerous to be used inside RTokens as a result. + +Should never revert. + +Should be gas-efficient. + ## Practical Advice from Previous Work In most cases [Fiat Collateral](../contracts/plugins/assets/FiatCollateral.sol) or [AppreciatingFiatCollateral.sol](../contracts/plugins/assets/AppreciatingFiatCollateral.sol) can be extended, pretty easily, to support a new collateral type. This allows the collateral developer to limit their attention to the overriding of three functions: `tryPrice()`, `refPerTok()`, `targetPerRef()`. diff --git a/docs/deployment-variables.md b/docs/deployment-variables.md index eeef1d6c15..c1a66a799f 100644 --- a/docs/deployment-variables.md +++ b/docs/deployment-variables.md @@ -78,6 +78,24 @@ The warmup period is how many seconds should pass after the basket regained the Default value: `900` = 15 minutes Reasonable range: 0 to 604800 +### `reweightable` + +Dimension: `{bool}` + +A reweightable RToken can have its target amounts changed by governance via `forceSetPrimeBasket()`. In general RTokens should be non-reweightable, unless their usecase requires it. The work required to change the target amounts of a reweightable RToken responsibly is non-trivial, and should be done by a spell. + +Default value: `false` + +### `enableIssuancePremium` + +Dimension: `{bool}` + +An RToken with issuance premium enabled will increase issuance costs to compensate for any (partial) de-pegs observed in the underlying collateral. This protects RToken holders and RSR stakers from toxic issuance that may occur on the way to a default, or simply when a collateral reliably trades below its peg, such as frxETH. + +This also creates an additional revenue stream for the RToken that scales with issuance velocity. + +Default value: `true` + ### `batchAuctionLength` Dimension: `{seconds}` diff --git a/tasks/validation/utils/rtokens.ts b/tasks/validation/utils/rtokens.ts index 933eb46ade..1d0417e0d1 100644 --- a/tasks/validation/utils/rtokens.ts +++ b/tasks/validation/utils/rtokens.ts @@ -53,7 +53,11 @@ export const redeemRTokens = async ( await assetRegistry.refresh() const basketsNeeded = await rToken.basketsNeeded() const totalSupply = await rToken.totalSupply() - const redeemQuote = await basketHandler.quote(redeemAmount.mul(basketsNeeded).div(totalSupply), 0) + const redeemQuote = await basketHandler.quote( + redeemAmount.mul(basketsNeeded).div(totalSupply), + false, + 0 + ) const expectedTokens = redeemQuote.erc20s const expectedBalances: Balances = {} let log = '' diff --git a/test/Facade.test.ts b/test/Facade.test.ts index e04376a349..981a64911f 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -283,7 +283,7 @@ describe('Facade + FacadeMonitor contracts', () => { }) it('Should return maxIssuableByAmounts correctly', async () => { - const [erc20Addrs] = await basketHandler.quote(fp('1'), 0) + const [erc20Addrs] = await basketHandler.quote(fp('1'), false, 0) const erc20s = await Promise.all(erc20Addrs.map((a) => ethers.getContractAt('ERC20Mock', a))) const addr1Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr1.address))) const addr2Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr2.address))) diff --git a/test/Main.test.ts b/test/Main.test.ts index 0ae0ae4cdb..3d77877a26 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -89,6 +89,11 @@ const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.ski const describeGas = IMPLEMENTATION == Implementation.P1 && useEnv('REPORT_GAS') ? describe.only : describe.skip +const oldBHInterface = [ + 'function quote(uint192,uint8) view returns (address[] erc20s,uint256[] quantities)', + 'function price() view returns (uint192 low,uint192 high)', +] + describe(`MainP${IMPLEMENTATION} contract`, () => { let owner: SignerWithAddress let addr1: SignerWithAddress @@ -380,7 +385,12 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Attempt to reinitialize - Basket Handler await expect( - basketHandler.init(main.address, config.warmupPeriod, config.reweightable) + basketHandler.init( + main.address, + config.warmupPeriod, + config.reweightable, + config.enableIssuancePremium + ) ).to.be.revertedWith('Initializable: contract is already initialized') // Attempt to reinitialize - Distributor @@ -963,6 +973,25 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('invalid warmupPeriod') }) + it('Should allow to update enableIssuancePremium if OWNER', async () => { + // Check existing value + expect(await basketHandler.enableIssuancePremium()).to.equal(true) + + // If not owner cannot update + await expect(basketHandler.connect(other).setIssuancePremiumEnabled(false)).to.be.reverted + + // Check value did not change + expect(await basketHandler.enableIssuancePremium()).to.equal(true) + + // Update with owner + await expect(basketHandler.connect(owner).setIssuancePremiumEnabled(false)) + .to.emit(basketHandler, 'EnableIssuancePremiumSet') + .withArgs(true, false) + + // Check value was updated + expect(await basketHandler.enableIssuancePremium()).to.equal(false) + }) + it('Should allow to update tradingDelay if OWNER and perform validations', async () => { const newValue: BigNumber = bn('360') @@ -1232,7 +1261,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await basketHandler.setPrimeBasket(erc20s, targetAmts) await basketHandler.refreshBasket() expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - const [quoteERC20s, tokAmts] = await basketHandler.quote(fp('1'), 0) + const [quoteERC20s, tokAmts] = await basketHandler.quote(fp('1'), false, 0) expect(quoteERC20s.length).to.equal(128) expect(tokAmts.length).to.equal(128) @@ -1708,16 +1737,18 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const newBasketHandler = async (): Promise => { if (IMPLEMENTATION == Implementation.P0) { const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP0') - return ((await BasketHandlerFactory.deploy()) as unknown) + const bh = await BasketHandlerFactory.deploy() + return await ethers.getContractAt('TestIBasketHandler', bh.address) } else if (IMPLEMENTATION == Implementation.P1) { const basketLib = await (await ethers.getContractFactory('BasketLibP1')).deploy() const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1', { libraries: { BasketLibP1: basketLib.address }, }) - return await upgrades.deployProxy(BasketHandlerFactory, [], { + const bh = await upgrades.deployProxy(BasketHandlerFactory, [], { kind: 'uups', unsafeAllow: ['external-library-linking'], // BasketLibP1 }) + return await ethers.getContractAt('TestIBasketHandler', bh.address) } else { throw new Error('PROTO_IMPL must be set to either `0` or `1`') } @@ -1725,7 +1756,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { beforeEach(async () => { indexBH = await newBasketHandler() - await indexBH.init(main.address, config.warmupPeriod, true) + await indexBH.init(main.address, config.warmupPeriod, true, config.enableIssuancePremium) eurToken = await (await ethers.getContractFactory('ERC20Mock')).deploy('EURO Token', 'EUR') const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory( @@ -1762,10 +1793,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with invalid length', async () => { await expect( basketHandler.connect(owner).setPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') + ).to.be.revertedWith('invalid lengths') await expect( basketHandler.connect(owner).forceSetPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') + ).to.be.revertedWith('invalid lengths') }) it('Should not allow to set prime Basket with non-collateral tokens', async () => { @@ -1830,10 +1861,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with an empty basket', async () => { await expect(basketHandler.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' + 'invalid lengths' ) await expect(basketHandler.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' + 'invalid lengths' ) }) @@ -1847,13 +1878,13 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // for non-reweightable baskets, also try setting a zero amount as the *original* basket const newBH = await newBasketHandler() - await newBH.init(main.address, config.warmupPeriod, false) + await newBH.init(main.address, config.warmupPeriod, false, config.enableIssuancePremium) await expect(newBH.connect(owner).setPrimeBasket([token0.address], [0])).to.be.revertedWith( - 'invalid target amount; must be nonzero' + 'invalid target amount' ) await expect( newBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('invalid target amount; must be nonzero') + ).to.be.revertedWith('invalid target amount') }) it('Should be able to set exactly same basket', async () => { @@ -2046,6 +2077,22 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ) ).to.be.revertedWith('new target weights') }) + + it('Should retain backwards-compatible quote() -- FLOOR', async () => { + const bh = new ethers.Contract(basketHandler.address, oldBHInterface, owner) + const quote = await basketHandler.quote(fp('1'), false, RoundingMode.FLOOR) + const quote2 = await bh.quote(fp('1'), RoundingMode.FLOOR) + expectEqualArrays(quote.erc20s, quote2.erc20s) + expectEqualArrays(quote.quantities, quote2.quantities) + }) + + it('Should retain backwards-compatible quote() -- CEIL', async () => { + const bh = new ethers.Contract(basketHandler.address, oldBHInterface, owner) + const quote = await basketHandler.quote(fp('1'), true, RoundingMode.CEIL) + const quote2 = await bh.quote(fp('1'), RoundingMode.CEIL) + expectEqualArrays(quote.erc20s, quote2.erc20s) + expectEqualArrays(quote.quantities, quote2.quantities) + }) }) context('Index BasketHandler', () => { @@ -2065,10 +2112,10 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { it('Should not allow to set prime Basket with invalid length', async () => { await expect( indexBH.connect(owner).setPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') + ).to.be.revertedWith('invalid lengths') await expect( indexBH.connect(owner).forceSetPrimeBasket([token0.address], []) - ).to.be.revertedWith('len mismatch') + ).to.be.revertedWith('invalid lengths') }) it('Should not allow to set prime Basket with non-collateral tokens', async () => { @@ -2115,28 +2162,28 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // not possible on non-fresh basketHandler await expect( indexBH.connect(owner).setPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) - ).to.be.revertedWith('invalid target amount; too large') + ).to.be.revertedWith('invalid target amount') await expect( indexBH.connect(owner).forceSetPrimeBasket([token0.address], [MAX_TARGET_AMT.add(1)]) - ).to.be.revertedWith('invalid target amount; too large') + ).to.be.revertedWith('invalid target amount') }) it('Should not allow to set prime Basket with an empty basket', async () => { await expect(indexBH.connect(owner).setPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' + 'invalid lengths' ) await expect(indexBH.connect(owner).forceSetPrimeBasket([], [])).to.be.revertedWith( - 'empty basket' + 'invalid lengths' ) }) it('Should not allow to set prime Basket with a zero amount', async () => { await expect( indexBH.connect(owner).setPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('invalid target amount; must be nonzero') + ).to.be.revertedWith('invalid target amount') await expect( indexBH.connect(owner).forceSetPrimeBasket([token0.address], [0]) - ).to.be.revertedWith('invalid target amount; must be nonzero') + ).to.be.revertedWith('invalid target amount') }) it('Should be able to set exactly same basket', async () => { @@ -2210,102 +2257,20 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { ).to.be.revertedWith('invalid collateral') }) - it('Should normalize by price for index RTokens', async () => { - // Throughout this test the $ value of the RToken should remain - - // Set initial basket - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - let [erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(tokAmts[0]).to.equal(fp('1')) - - // Add EURO into the basket as a pure addition, changing price to $0.80 in USD and $0.20 in EURO - await indexBH - .connect(owner) - .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) - await indexBH.connect(owner).refreshBasket() - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(2) - expect(erc20s[0]).to.equal(token0.address) - expect(erc20s[1]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('0.8')) - expect(tokAmts[1]).to.equal(fp('0.2')) - - // Remove USD from the basket entirely, changing price to $1 in EURO - await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('1000')]) - await indexBH.connect(owner).refreshBasket() - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(erc20s[0]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('1')) // still $1! - - // No change by simply resizing the basket - await indexBH.connect(owner).setPrimeBasket([eurToken.address], [fp('0.000001')]) - await indexBH.connect(owner).refreshBasket() - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(erc20s[0]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('1')) // still $1! - - // Not refreshing the basket in between should still allow a consecutive setPrimeBasket - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(1) - expect(erc20s[0]).to.equal(eurToken.address) // not token0 yet - expect(tokAmts[0]).to.equal(fp('1')) - await indexBH - .connect(owner) - .setPrimeBasket([token0.address, eurToken.address], [fp('0.25'), fp('0.25')]) - await indexBH.connect(owner).refreshBasket() - - // $0.50 USD / $0.50 EURO by the end - ;[erc20s, tokAmts] = await indexBH.quote(fp('1'), 0) - expect(erc20s.length).to.equal(2) - expect(erc20s[0]).to.equal(token0.address) - expect(erc20s[1]).to.equal(eurToken.address) - expect(tokAmts[0]).to.equal(fp('0.5')) - expect(tokAmts[1]).to.equal(fp('0.5')) + it('Should retain backwards-compatible quote() -- FLOOR', async () => { + const bh = new ethers.Contract(indexBH.address, oldBHInterface, owner) + const quote = await indexBH.quote(fp('1'), false, RoundingMode.FLOOR) + const quote2 = await bh.quote(fp('1'), RoundingMode.FLOOR) + expectEqualArrays(quote.erc20s, quote2.erc20s) + expectEqualArrays(quote.quantities, quote2.quantities) }) - it('Should not normalize by price when the current basket is unpriced', async () => { - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - - // Set Token0 to unpriced - stale oracle - await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) - await expectUnpriced(collateral0.address) - - // Attempt to add EURO, basket is not SOUND - await expect( - indexBH - .connect(owner) - .setPrimeBasket([token0.address, eurToken.address], [fp('1'), fp('0.25')]) - ).to.be.revertedWith('unsound basket') - }) - - it('Should not normalize by price when the current basket is unsound', async () => { - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - await setOraclePrice(collateral0.address, fp('0.5')) - await assetRegistry.refresh() - expect(await collateral0.status()).to.equal(CollateralStatus.IFFY) - expect(await collateral1.status()).to.equal(CollateralStatus.SOUND) - await expect( - indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) - ).to.be.revertedWith('unsound basket') - }) - - it('Should not normalize by price if the new collateral is unsound', async () => { - await indexBH.connect(owner).setPrimeBasket([token0.address], [fp('1')]) - await indexBH.connect(owner).refreshBasket() - await setOraclePrice(collateral1.address, fp('0.5')) - await assetRegistry.refresh() - expect(await collateral0.status()).to.equal(CollateralStatus.SOUND) - expect(await collateral1.status()).to.equal(CollateralStatus.IFFY) - await expect( - indexBH.connect(owner).setPrimeBasket([token1.address], [fp('1')]) - ).to.be.revertedWith('unsound new collateral') + it('Should retain backwards-compatible quote() -- CEIL', async () => { + const bh = new ethers.Contract(indexBH.address, oldBHInterface, owner) + const quote = await indexBH.quote(fp('1'), true, RoundingMode.CEIL) + const quote2 = await bh.quote(fp('1'), RoundingMode.CEIL) + expectEqualArrays(quote.erc20s, quote2.erc20s) + expectEqualArrays(quote.quantities, quote2.quantities) }) }) @@ -2370,7 +2335,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const amount = fp('10000') await expect( indexBH.quoteCustomRedemption(basketNonces, portions, amount) - ).to.be.revertedWith('bad portions len') + ).to.be.revertedWith('invalid lengths') }) it('Should correctly quote the current basket, same as quote()', async () => { @@ -2380,7 +2345,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const basketNonces = [1] const portions = [fp('1')] const amount = fp('10000') - const baseline = await indexBH.quote(amount, RoundingMode.FLOOR) + const baseline = await indexBH.quote(amount, false, RoundingMode.FLOOR) const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expectEqualArrays(quote.erc20s, baseline.erc20s) expectEqualArrays(quote.quantities, baseline.quantities) @@ -2532,7 +2497,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { fp('0.1'), ] const amount = fp('10000') - const baseline = await indexBH.quote(amount, RoundingMode.FLOOR) + const baseline = await indexBH.quote(amount, false, RoundingMode.FLOOR) const quote = await indexBH.quoteCustomRedemption(basketNonces, portions, amount) expectEqualArrays(quote.erc20s, baseline.erc20s) expectEqualArrays(quote.quantities, baseline.quantities) @@ -2957,7 +2922,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), erc20s) - ).to.not.be.revertedWith('erc20s too large') + ).to.not.be.revertedWith('too large') // Should fail at 65 erc20s.push(ONE_ADDRESS) @@ -2965,21 +2930,21 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), erc20s) - ).to.be.revertedWith('erc20s too large') + ).to.be.revertedWith('too large') // Should succeed at 64 await expect( basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(64), []) - ).to.not.be.revertedWith('max too large') + ).to.not.be.revertedWith('too large') // Should fail at 65 await expect( basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(65), []) - ).to.be.revertedWith('max too large') + ).to.be.revertedWith('too large') }) it('Should allow to set backup Config if OWNER', async () => { @@ -3122,7 +3087,68 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // expect(toks.length).to.equal(0) }) - it('Should include value of defaulted collateral when checking basket price', async () => { + it('Should include value of defaulted collateral when checking basket price -- /w premium', async () => { + // Check status and price + expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) + await expectPrice(basketHandler.address, fp('1'), ORACLE_ERROR, true) + + // Default one of the collaterals + // Set Token1 to default - 50% price reduction + await setOraclePrice(collateral1.address, bn('0.5e8')) + + // Mark default as probable + await collateral1.refresh() + + // Advance time post delayUntilDefault + await advanceTime((await collateral1.delayUntilDefault()).toString()) + + // Mark default as confirmed + await collateral1.refresh() + + // Check status and price again + expect(await basketHandler.status()).to.equal(CollateralStatus.DISABLED) + + // Check BU price -- 1/4 of the basket has lost half its value + const avgPrice = fp('0.875') + let [lowPrice, highPrice] = await basketHandler.price(true) + const expectedLow = avgPrice.sub(avgPrice.mul(ORACLE_ERROR).div(fp('1'))) + const expectedHigh = fp('1').add(fp('1').mul(ORACLE_ERROR).div(fp('1'))) // at-peg! + + const tolerance = avgPrice.div(bn('1e15')) + expect(lowPrice).to.be.closeTo(expectedLow, tolerance) + expect(lowPrice).to.be.gte(expectedLow) + expect(highPrice).to.be.closeTo(expectedHigh, tolerance) + expect(highPrice).to.be.lte(expectedHigh) + + // Set collateral1 price to [0, FIX_MAX] + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) + await setOraclePrice(collateral0.address, bn('1e8')) + await assetRegistry.refresh() + + // Check BU price -- 1/4 of the basket has lost all its value + ;[lowPrice, highPrice] = await basketHandler.price(true) + expect(lowPrice).to.be.closeTo(fp('0.75'), fp('0.75').div(100)) // within 1% + expect(highPrice).to.equal(MAX_UINT192) + + // Set basket config + await expect( + basketHandler + .connect(owner) + .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(1), [ + token0.address, + token2.address, + token3.address, + ]) + ).to.emit(basketHandler, 'BackupConfigSet') + + // After basket refresh, price should increase + await basketHandler.refreshBasket() + + // Check BU price + await expectPrice(basketHandler.address, fp('1'), ORACLE_ERROR, true) + }) + + it('Should include value of defaulted collateral when checking basket price -- w/o premium', async () => { // Check status and price expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) await expectPrice(basketHandler.address, fp('1'), ORACLE_ERROR, true) @@ -3152,8 +3178,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await assetRegistry.refresh() // Check BU price -- 1/4 of the basket has lost all its value - const asset = await ethers.getContractAt('Asset', basketHandler.address) - const [lowPrice, highPrice] = await asset.price() + const [lowPrice, highPrice] = await basketHandler.price(false) expect(lowPrice).to.be.closeTo(fp('0.75'), fp('0.75').div(100)) // within 1% expect(highPrice).to.equal(MAX_UINT192) @@ -3208,7 +3233,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await setOraclePrice(collateral1.address, bn('1e8')) // Check status and price again - const p = await basketHandler.price() + const p = await basketHandler.price(false) expect(p[0]).to.be.closeTo(fp('1').div(4), fp('1').div(4).div(100)) // within 1% expect(p[0]).to.be.lt(fp('1').div(4)) expect(p[1]).to.equal(MAX_UINT192) @@ -3275,7 +3300,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const newPrice: BigNumber = MAX_UINT192.div(bn('1e10')) await setOraclePrice(collateral2.address, newPrice.sub(newPrice.div(100))) // oracle error - const [lowPrice, highPrice] = await indexBH.price() + const [lowPrice, highPrice] = await indexBH.price(false) expect(lowPrice).to.equal(MAX_UINT192) expect(highPrice).to.equal(MAX_UINT192) }) @@ -3288,7 +3313,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { const newPrice: BigNumber = MAX_UINT192.div(bn('1e10')) await setOraclePrice(collateral0.address, newPrice.sub(newPrice.div(100))) // oracle error - const [lowPrice, highPrice] = await indexBH.price() + const [lowPrice, highPrice] = await indexBH.price(false) expect(lowPrice).to.equal(MAX_UINT192) expect(highPrice).to.equal(MAX_UINT192) }) @@ -3538,15 +3563,6 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expectPrice(basketHandler.address, fp('0.75'), ORACLE_ERROR, true) }) - it('lotPrice (deprecated) is equal to price()', async () => { - const lotPrice = await basketHandler.lotPrice() - const price = await basketHandler.price() - expect(price.length).to.equal(2) - expect(lotPrice.length).to.equal(price.length) - expect(lotPrice[0]).to.equal(price[0]) - expect(lotPrice[1]).to.equal(price[1]) - }) - it('Should not put backup tokens with different targetName in the basket', async () => { // Swap out collateral for bad target name const CollFactory = await ethers.getContractFactory('FiatCollateral') @@ -3611,7 +3627,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.IFFY) await basketHandler.connect(owner).refreshBasket() expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - const [tokens] = await basketHandler.quote(fp('1'), 0) + const [tokens] = await basketHandler.quote(fp('1'), false, 0) expect(tokens.length).to.equal(3) expect(tokens[0]).to.not.equal(collateral1.address) expect(tokens[1]).to.not.equal(collateral1.address) diff --git a/test/RToken.test.ts b/test/RToken.test.ts index aadd8e62f1..6d5f2a54db 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -305,7 +305,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { }) it('Should return a price of 0 if the assets become unregistered', async () => { - const startPrice = await basketHandler.price() + const startPrice = await basketHandler.price(false) expect(startPrice[0]).to.gt(0) expect(startPrice[1]).to.gt(0) @@ -314,7 +314,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { await assetRegistry.connect(owner).unregister(basket[i].address) } - const endPrice = await basketHandler.price() + const endPrice = await basketHandler.price(false) expect(endPrice[0]).to.eq(0) expect(endPrice[1]).to.eq(0) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index eca91f4979..0babf9da13 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -474,18 +474,9 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await setOraclePrice(collateral0.address, bn('7e7')) await collateral0.refresh() await token0.connect(addr1).transfer(rTokenTrader.address, issueAmount) - const rtokenPrice = await basketHandler.price() - const realRtokenPrice = rtokenPrice.low.add(rtokenPrice.high).div(2) - const minBuyAmt = await toMinBuyAmt(issueAmount, fp('0.7'), realRtokenPrice) await expect(rTokenTrader.manageTokens([token0.address], [TradeKind.BATCH_AUCTION])) .to.emit(rTokenTrader, 'TradeStarted') - .withArgs( - anyValue, - token0.address, - rToken.address, - issueAmount, - withinTolerance(minBuyAmt) - ) + .withArgs(anyValue, token0.address, rToken.address, issueAmount, anyValue) }) it('Should forward revenue to traders', async () => { @@ -1016,7 +1007,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Trade should have extremely nonzero worst-case price const trade = await getTrade(rTokenTrader, token0.address) expect(await trade.initBal()).to.equal(issueAmount) - expect(await trade.worstCasePrice()).to.be.gte(fp('0.775').mul(bn('1e9'))) // D27 precision + expect(await trade.worstCasePrice()).to.be.gte(fp('0.485').mul(bn('1e9'))) // D27 precision }) it('Should claim COMP and handle revenue auction correctly - small amount processed in single auction', async () => { diff --git a/test/Upgradeability.test.ts b/test/Upgradeability.test.ts index d44697281f..8a610f7c4a 100644 --- a/test/Upgradeability.test.ts +++ b/test/Upgradeability.test.ts @@ -257,7 +257,7 @@ describeP1(`Upgradeability - P${IMPLEMENTATION}`, () => { it('Should deploy valid implementation - BasketHandler', async () => { const newBasketHandler: BasketHandlerP1 = await upgrades.deployProxy( BasketHandlerFactory, - [main.address, config.warmupPeriod, config.reweightable], + [main.address, config.warmupPeriod, config.reweightable, config.enableIssuancePremium], { initializer: 'init', kind: 'uups', diff --git a/test/fixtures.ts b/test/fixtures.ts index cf52748cba..d916eaa2fe 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -457,6 +457,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) reweightable: false, + enableIssuancePremium: true, tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) batchAuctionLength: bn('900'), // 15 minutes dutchAuctionLength: bn('1800'), // 30 minutes diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 91187af0ff..b35cf5f5e6 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -2425,11 +2425,16 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expect(rToken.connect(addr1).issue(issueAmount)).to.emit(rToken, 'Issuance') // Check Balances after - expect(await usdt.balanceOf(backingManager.address)).to.equal(toBNDecimals(issueAmount, 6)) //1 full unit + const usdtBal = toBNDecimals(issueAmount, 6) + expect(await usdt.balanceOf(backingManager.address)).to.be.gt(usdtBal) + expect(await usdt.balanceOf(backingManager.address)).to.be.closeTo(usdtBal, 1000) //1 full unit + // Balances for user - expect(await usdt.balanceOf(addr1.address)).to.equal( - toBNDecimals(initialBal.sub(issueAmount), 6) + const expected = toBNDecimals( + initialBal.sub(await usdt.balanceOf(backingManager.address)), + 6 ) + expect(await usdt.balanceOf(addr1.address)).to.be.closeTo(expected, point1Pct(expected)) // Check RTokens issued to user expect(await rToken.balanceOf(addr1.address)).to.equal(issueAmount) @@ -2449,11 +2454,11 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await rToken.balanceOf(addr1.address)).to.equal(0) expect(await rToken.totalSupply()).to.equal(0) - // Check balances after - Backing Manager is empty - expect(await usdt.balanceOf(backingManager.address)).to.equal(0) + // Check balances after - Backing Manager is basically empty + expect(await usdt.balanceOf(backingManager.address)).to.be.closeTo(0, 1000) // Check funds returned to user - expect(await usdt.balanceOf(addr1.address)).to.equal(toBNDecimals(initialBal, 6)) + expect(await usdt.balanceOf(addr1.address)).to.be.closeTo(toBNDecimals(initialBal, 6), 1000) // Check asset value left expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 97630e1ba6..49ff961a8d 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -644,6 +644,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = withdrawalLeak: fp('0'), // 0%; always refresh warmupPeriod: bn('60'), // (the delay _after_ SOUND was regained) reweightable: false, + enableIssuancePremium: true, tradingDelay: bn('0'), // (the delay _after_ default has been confirmed) batchAuctionLength: bn('900'), // 15 minutes dutchAuctionLength: bn('1800'), // 30 minutes diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index bd346d05a5..70b563090c 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -8,6 +8,7 @@ const forkBlockNumber = { 'facade-monitor': 18742016, // Ethereum 'old-curve-plugins': 16915576, // Ethereum 'new-curve-plugins': 19626711, // Ethereum + 'mainnet-3.4.0': 20328530, // Ethereum // TODO add all the block numbers we fork from to benefit from caching default: 19742528, // Ethereum diff --git a/test/integration/mainnet-test/IssuancePremium.test.ts b/test/integration/mainnet-test/IssuancePremium.test.ts new file mode 100644 index 0000000000..7c014d2428 --- /dev/null +++ b/test/integration/mainnet-test/IssuancePremium.test.ts @@ -0,0 +1,402 @@ +import { expect } from 'chai' +import { BigNumber } from 'ethers' +import hre, { ethers } from 'hardhat' +import { evmRevert, evmSnapshot } from '../utils' +import { bn, fp } from '../../../common/numbers' +import { IMPLEMENTATION } from '../../fixtures' +import { getChainId } from '../../../common/blockchain-utils' +import { networkConfig } from '../../../common/configuration' +import forkBlockNumber from '../fork-block-numbers' +import { whileImpersonating } from '../../utils/impersonation' +import { + AssetRegistryP1, + EmaPriceOracleStableSwapMock, + LidoStakedEthCollateral, + RTokenAsset, + SFraxEthCollateral, + TestIBasketHandler, + RethCollateral, +} from '../../../typechain' +import { useEnv } from '#/utils/env' +import { combinedError } from '#/scripts/deployment/utils' + +const describeFork = useEnv('FORK') ? describe : describe.skip + +const ASSET_REGISTRY_ADDR = '0xf526f058858E4cD060cFDD775077999562b31bE0' // ETH+ asset registry +const BASKET_HANDLER_ADDR = '0x56f40A33e3a3fE2F1614bf82CBeb35987ac10194' // ETH+ basket handler +const BASKET_LIB_ADDR = '0xf383dC60D29A5B9ba461F40A0606870d80d1EA88' // BasketLibP1 +const RTOKEN_ASSET_ADDR = '0x3f11C47E7ed54b24D7EFC222FD406d8E1F49Fb69' // ETH+ RTokenAsset +const OWNER = '0x5d8A7DC9405F08F14541BA918c1Bf7eb2dACE556' // ETH+ timelock + +// run on mainnet only + +describeFork(`ETH+ Issuance Premium - Mainnet Forking P${IMPLEMENTATION}`, function () { + let assetRegistry: AssetRegistryP1 + let basketHandler: TestIBasketHandler + let rTokenAsset: RTokenAsset + let chainId: string + + let snap: string + + let oldRTokenPrice: BigNumber[] // <4.0.0 + let newRTokenPrice: BigNumber[] // >= <4.0.0 + let oldPrice: BigNumber[] // <4.0.0 + let newPriceF: BigNumber[] // >= 4.0.0 price(false) + let newPriceT: BigNumber[] // >= 4.0.0 price(true) + let oldQs: BigNumber[] // <4.0.0 quantities + let newQs: BigNumber[] // >= 4.0.0 quantities + + let sfrxETH: SFraxEthCollateral + let sfraxEmaOracle: EmaPriceOracleStableSwapMock + + // Setup test environment + const setup = async (blockNumber: number) => { + // Use Mainnet fork + await hre.network.provider.request({ + method: 'hardhat_reset', + params: [ + { + forking: { + jsonRpcUrl: useEnv('MAINNET_RPC_URL'), + blockNumber: blockNumber, + }, + }, + ], + }) + } + + before(async () => { + await setup(forkBlockNumber['mainnet-3.4.0']) + + chainId = await getChainId(hre) + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + assetRegistry = ( + await ethers.getContractAt('AssetRegistryP1', ASSET_REGISTRY_ADDR) + ) + basketHandler = ( + await ethers.getContractAt('TestIBasketHandler', BASKET_HANDLER_ADDR) + ) + rTokenAsset = await ethers.getContractAt('RTokenAsset', RTOKEN_ASSET_ADDR) + + const oldBasketHandler = await ethers.getContractAt('BasketHandlerP1', BASKET_HANDLER_ADDR) + oldRTokenPrice = await rTokenAsset.price() + oldPrice = await oldBasketHandler['price()']() + oldQs = (await oldBasketHandler['quote(uint192,uint8)'](fp('1'), 2)).quantities + + // frxETH/ETH EMA oracle + const currentEmaOracle = await ethers.getContractAt( + 'contracts/plugins/assets/frax-eth/SFraxEthCollateral.sol:IEmaPriceOracleStableSwap', + networkConfig[chainId].CURVE_POOL_WETH_FRXETH! + ) + const EmaPriceOracleStableSwapMockFactory = await ethers.getContractFactory( + 'EmaPriceOracleStableSwapMock' + ) + sfraxEmaOracle = ( + await EmaPriceOracleStableSwapMockFactory.deploy(await currentEmaOracle.price_oracle()) + ) + + // === Upgrade to 4.0.0 (minimally)=== + + // RTokenAsset + const RTokenAssetFactory = await ethers.getContractFactory('RTokenAsset') + rTokenAsset = await RTokenAssetFactory.deploy( + await rTokenAsset.erc20(), + await rTokenAsset.maxTradeVolume() + ) + + // BasketHandler + const BasketHandlerFactory = await ethers.getContractFactory('BasketHandlerP1', { + libraries: { + BasketLibP1: BASKET_LIB_ADDR, + }, + }) + const newBasketHandlerImpl = await BasketHandlerFactory.deploy() + + // SFraxEthCollateral + const SFraxEthCollateralFactory = await hre.ethers.getContractFactory('SFraxEthCollateral') + let oracleError = combinedError(fp('0.005'), fp('0.0002')) // 0.5% & 0.02% + const newSfrxETH = await SFraxEthCollateralFactory.deploy( + { + priceTimeout: '604800', + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + oracleError: oracleError.toString(), + erc20: networkConfig[chainId].tokens.sfrxETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~2.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + sfraxEmaOracle.address + ) + sfrxETH = newSfrxETH + await sfrxETH.refresh() + + // LidoStakedEthCollateral + const WSTETHCollateralFactory = await hre.ethers.getContractFactory('LidoStakedEthCollateral') + const newWstETH = await WSTETHCollateralFactory.deploy( + { + priceTimeout: '604800', + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.stETHUSD!, + oracleError: fp('0.01').toString(), // 1%: only for stETHUSD feed + erc20: networkConfig[chainId].tokens.wstETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.stETHETH!, // targetPerRefChainlinkFeed + '86400' // targetPerRefChainlinkTimeout + ) + await newWstETH.refresh() + + // RethCollateral + const RethCollateralFactory = await hre.ethers.getContractFactory('RethCollateral') + oracleError = combinedError(fp('0.005'), fp('0.02')) // 0.5% & 2% + const newRETH = await RethCollateralFactory.deploy( + { + priceTimeout: '604800', + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH!, + oracleError: oracleError.toString(), // 1%: only for rETH feed + erc20: networkConfig[chainId].tokens.rETH!, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: '3600', // 1 hr, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: fp('0.02').add(oracleError).toString(), // ~4.5% + delayUntilDefault: bn('86400').toString(), // 24h + }, + fp('1e-4').toString(), // revenueHiding = 0.01% + networkConfig[chainId].chainlinkFeeds.rETH!, + '86400' // refPerTokChainlinkTimeout + ) + await newRETH.refresh() + + // Putting it all together... + await whileImpersonating(OWNER, async (timelockSigner) => { + const bh = await ethers.getContractAt('BasketHandlerP1', BASKET_HANDLER_ADDR) + await bh.connect(timelockSigner).upgradeTo(newBasketHandlerImpl.address) + await assetRegistry.connect(timelockSigner).swapRegistered(newSfrxETH.address) + await assetRegistry.connect(timelockSigner).swapRegistered(newWstETH.address) + await assetRegistry.connect(timelockSigner).swapRegistered(newRETH.address) + await assetRegistry.connect(timelockSigner).swapRegistered(rTokenAsset.address) + await basketHandler.connect(timelockSigner).setIssuancePremiumEnabled(true) + }) + await basketHandler.refreshBasket() + expect(await basketHandler.status()).to.equal(0) + expect(await basketHandler.fullyCollateralized()).to.equal(true) + + newRTokenPrice = await rTokenAsset.price() + newPriceF = await basketHandler.price(false) + newPriceT = await basketHandler.price(true) + newQs = (await basketHandler.quote(fp('1'), true, 2)).quantities + + snap = await evmSnapshot() // what are testing frameworks for if not this in all its glory + }) + + beforeEach(async () => { + await evmRevert(snap) + snap = await evmSnapshot() + }) + + after(async () => { + await evmRevert(snap) + }) + + it('from 3.4.0 to 4.0.0', async () => { + // this test case compares the state before the 4.0.0 upgrade to the state after the 4.0.0 upgrade + // USD issuance costs rise ~0.04% due to sfrxETH's ~0.12% premium, as given by basketHandler.price(true) + + // rTokenAsset.price() + const lowRTokenPriceChange = newRTokenPrice[0] + .sub(oldRTokenPrice[0]) + .mul(fp('1')) + .div(oldRTokenPrice[0]) + const highRTokenPriceChange = newRTokenPrice[1] + .sub(oldRTokenPrice[1]) + .mul(fp('1')) + .div(oldRTokenPrice[1]) + expect(lowRTokenPriceChange).to.be.closeTo(fp('0'), fp('1e-4')) // low RToken price no change + expect(highRTokenPriceChange).to.be.closeTo(fp('0.0004'), fp('1e-4')) // high RToken price +0.04% + + // basketHandler.price(false) + const lowPriceChangeF = newPriceF[0].sub(oldPrice[0]).mul(fp('1')).div(oldPrice[0]) + const highPriceChangeF = newPriceF[1].sub(oldPrice[1]).mul(fp('1')).div(oldPrice[1]) + expect(lowPriceChangeF).to.be.closeTo(fp('0'), fp('1e-4')) // low price no change + expect(highPriceChangeF).to.be.closeTo(fp('0'), fp('1e-4')) // high price no change + + // basketHandler.price(true) + const lowPriceChangeT = newPriceT[0].sub(oldPrice[0]).mul(fp('1')).div(oldPrice[0]) + const highPriceChangeT = newPriceT[1].sub(oldPrice[1]).mul(fp('1')).div(oldPrice[1]) + expect(lowPriceChangeT).to.be.closeTo(fp('0'), fp('1e-4')) // low price no change + expect(highPriceChangeT).to.be.closeTo(fp('0.0004'), fp('1e-4')) // high price +0.04% + + // basketHandler.quote() + const sfrxETHChange = newQs[0].sub(oldQs[0]).mul(fp('1')).div(oldQs[0]) + const wstETHChange = newQs[1].sub(oldQs[1]).mul(fp('1')).div(oldQs[1]) + const rETHChange = newQs[2].sub(oldQs[2]).mul(fp('1')).div(oldQs[2]) + expect(sfrxETHChange).to.be.closeTo(fp('0.0012'), fp('1e-4')) // sFraxETH +0.12% + expect(wstETHChange).to.be.closeTo(fp('0.0001'), fp('1e-4')) // wstETH +0.01% + expect(rETHChange).to.be.equal(0) // rETH no change + }) + + it('from 4.0.0 to 4.0.0 at-peg', async () => { + // this test case compares the state after the 4.0.0 upgrade to the state when frxETH is at peg + // as given by basketHandler.price(true), USD issuance costs do not change since the premium compensates completely + + await sfraxEmaOracle.setPrice(fp('1')) + + const parRTokenPrice = await rTokenAsset.price() + const parPriceF = await basketHandler.price(false) + const parPriceT = await basketHandler.price(true) + const parQs = (await basketHandler.quote(fp('1'), true, 2)).quantities + + // rTokenAsset.price() + const lowRTokenPriceChange = parRTokenPrice[0] + .sub(newRTokenPrice[0]) + .mul(fp('1')) + .div(newRTokenPrice[0]) + const highRTokenPriceChange = parRTokenPrice[1] + .sub(newRTokenPrice[1]) + .mul(fp('1')) + .div(newRTokenPrice[1]) + expect(lowRTokenPriceChange).to.be.closeTo(fp('0.0004'), fp('1e-4')) // low price +0.04% + expect(highRTokenPriceChange).to.be.closeTo(fp('0'), fp('1e-4')) // high price no change + + // basketHandler.price(false) + const lowPriceChangeF = parPriceF[0].sub(newPriceF[0]).mul(fp('1')).div(newPriceF[0]) + const highPriceChangeF = parPriceF[1].sub(newPriceF[1]).mul(fp('1')).div(newPriceF[1]) + expect(lowPriceChangeF).to.be.closeTo(fp('0.0004'), fp('1e-4')) // low price +0.04% + expect(highPriceChangeF).to.be.closeTo(fp('0.0004'), fp('1e-4')) // high price +0.04%% + + // basketHandler.price(true) + const lowPriceChangeT = parPriceT[0].sub(newPriceT[0]).mul(fp('1')).div(newPriceT[0]) + const highPriceChangeT = parPriceT[1].sub(newPriceT[1]).mul(fp('1')).div(newPriceT[1]) + expect(lowPriceChangeT).to.be.closeTo(fp('0.0004'), fp('1e-4')) // low price +0.04% + expect(highPriceChangeT).to.be.closeTo(fp('0'), fp('1e-4')) // high price no change + + // basketHandler.quote() + const sfrxETHChange = parQs[0].sub(newQs[0]).mul(fp('1')).div(newQs[0]) + const wstETHChange = parQs[1].sub(newQs[1]).mul(fp('1')).div(newQs[1]) + const rETHChange = parQs[2].sub(newQs[2]).mul(fp('1')).div(newQs[2]) + expect(sfrxETHChange).to.be.closeTo(fp('-0.0012'), fp('1e-4')) // sFraxETH -0.12%% + expect(wstETHChange).to.be.closeTo(fp('-0.0001'), fp('1e-4')) // wstETH -0.01% + expect(rETHChange).to.be.equal(0) // rETH no change + }) + + it('from 4.0.0 at-peg to 2% below peg', async () => { + // this test case compares the state from at-peg to the state after a 2% de-peg of frxETH + // which is well within the default threshold. + // as given by basketHandler.price(true), USD issuance costs do not change since the premium compensates completely + + await sfraxEmaOracle.setPrice(fp('1')) + + const parRTokenPrice = await rTokenAsset.price() + const parPriceF = await basketHandler.price(false) + const parPriceT = await basketHandler.price(true) + const parQs = (await basketHandler.quote(fp('1'), true, 2)).quantities + + // de-peg by 2% + + await sfraxEmaOracle.setPrice(fp('0.98')) + const depeggedRTokenPrice = await rTokenAsset.price() + await sfrxETH.refresh() + expect(await sfrxETH.savedPegPrice()).to.equal(fp('0.98')) + + const depeggedPriceF = await basketHandler.price(false) + const depeggedPriceT = await basketHandler.price(true) + const depeggedQs = (await basketHandler.quote(fp('1'), true, 2)).quantities + + // rTokenAsset.price() + const lowRTokenPriceChange = depeggedRTokenPrice[0] + .sub(parRTokenPrice[0]) + .mul(fp('1')) + .div(parRTokenPrice[0]) + const highRTokenPriceChange = depeggedRTokenPrice[1] + .sub(parRTokenPrice[1]) + .mul(fp('1')) + .div(parRTokenPrice[1]) + expect(lowRTokenPriceChange).to.be.closeTo(fp('-0.0067'), fp('1e-4')) // low RToken price -0.67% + expect(highRTokenPriceChange).be.closeTo(fp('-0.0065'), fp('1e-4')) // high RToken -0.66% + + // basketHandler.price(false) + const lowPriceChangeF = depeggedPriceF[0].sub(parPriceF[0]).mul(fp('1')).div(parPriceF[0]) + const highPriceChangeF = depeggedPriceF[1].sub(parPriceF[1]).mul(fp('1')).div(parPriceF[1]) + expect(lowPriceChangeF).to.be.closeTo(fp('-0.0067'), fp('1e-4')) // low price -0.67% + expect(highPriceChangeF).be.closeTo(fp('-0.0065'), fp('1e-4')) // high price -0.66% + + // basketHandler.price(true) + const lowPriceChangeT = depeggedPriceT[0].sub(parPriceT[0]).mul(fp('1')).div(parPriceT[0]) + const highPriceChangeT = depeggedPriceT[1].sub(parPriceT[1]).mul(fp('1')).div(parPriceT[1]) + expect(lowPriceChangeT).to.be.closeTo(fp('-0.0067'), fp('1e-4')) // low price -0.67% + expect(highPriceChangeT).be.closeTo(0, fp('1e-4')) // high price no change + + // basketHandler.quote() + const sfrxETHChange = depeggedQs[0].sub(parQs[0]).mul(fp('1')).div(parQs[0]) + const wstETHChange = depeggedQs[1].sub(parQs[1]).mul(fp('1')).div(parQs[1]) + const rETHChange = depeggedQs[2].sub(parQs[2]).mul(fp('1')).div(parQs[2]) + expect(sfrxETHChange).to.be.closeTo(fp('0.0204'), fp('1e-4')) // sFraxETH +2.04 + expect(wstETHChange).to.be.closeTo(0, fp('1e-4')) // wstETH no change + expect(rETHChange).to.be.equal(0) // rETH no change + }) + + it('from 4.0.0 at-peg to 50% below peg', async () => { + // this test case compares the state from at-peg to the state after a 50% de-peg of frxETH + // as given by basketHandler.price(true), USD issuance costs do not change since the premium compensates completely + + await sfraxEmaOracle.setPrice(fp('1')) + + const parRTokenPrice = await rTokenAsset.price() + const parPriceF = await basketHandler.price(false) + const parPriceT = await basketHandler.price(true) + const parQs = (await basketHandler.quote(fp('1'), true, 2)).quantities + + // de-peg by 50% + + await sfraxEmaOracle.setPrice(fp('0.5')) + const depeggedRTokenPrice = await rTokenAsset.price() + await sfrxETH.refresh() + expect(await sfrxETH.savedPegPrice()).to.equal(fp('0.5')) + + const depeggedPriceF = await basketHandler.price(false) + const depeggedPriceT = await basketHandler.price(true) + const depeggedQs = (await basketHandler.quote(fp('1'), true, 2)).quantities + + // rTokenAsset.price() + const lowRTokenPriceChange = depeggedRTokenPrice[0] + .sub(parRTokenPrice[0]) + .mul(fp('1')) + .div(parRTokenPrice[0]) + const highRTokenPriceChange = depeggedRTokenPrice[1] + .sub(parRTokenPrice[1]) + .mul(fp('1')) + .div(parRTokenPrice[1]) + expect(lowRTokenPriceChange).to.be.closeTo(fp('-0.1676'), fp('1e-4')) // low RToken price -16.76% + expect(highRTokenPriceChange).to.be.closeTo(fp('-0.1649'), fp('1e-4')) // high RToken price -16.49% + + // basketHandler.price(false) + const lowPriceChangeF = depeggedPriceF[0].sub(parPriceF[0]).mul(fp('1')).div(parPriceF[0]) + const highPriceChangeF = depeggedPriceF[1].sub(parPriceF[1]).mul(fp('1')).div(parPriceF[1]) + expect(lowPriceChangeF).to.be.closeTo(fp('-0.1676'), fp('1e-4')) // low price -16.76% + expect(highPriceChangeF).be.closeTo(fp('-0.1649'), fp('1e-4')) // high price -16.49% + + // basketHandler.price(true) + const lowPriceChangeT = depeggedPriceT[0].sub(parPriceT[0]).mul(fp('1')).div(parPriceT[0]) + const highPriceChangeT = depeggedPriceT[1].sub(parPriceT[1]).mul(fp('1')).div(parPriceT[1]) + expect(lowPriceChangeT).to.be.closeTo(fp('-0.1676'), fp('1e-4')) // low price -16.76% + expect(highPriceChangeT).be.closeTo(0, fp('1e-4')) // high price no change + + // basketHandler.quote() + const sfrxETHChange = depeggedQs[0].sub(parQs[0]).mul(fp('1')).div(parQs[0]) + const wstETHChange = depeggedQs[1].sub(parQs[1]).mul(fp('1')).div(parQs[1]) + const rETHChange = depeggedQs[2].sub(parQs[2]).mul(fp('1')).div(parQs[2]) + expect(sfrxETHChange).to.be.closeTo(fp('1'), fp('1e-4')) // sFraxETH +100% + expect(wstETHChange).to.be.closeTo(0, fp('1e-4')) // wstETH no change + expect(rETHChange).to.be.equal(0) // rETH no change + }) +}) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index b07978fb52..833cc4e225 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -28,6 +28,7 @@ import { TestIBackingManager, TestIRToken, UnpricedAppreciatingFiatCollateralMock, + UnpricedFiatCollateralMock, USDCMock, WETH9, } from '../../typechain' diff --git a/test/scenario/NestedRTokens.test.ts b/test/scenario/NestedRTokens.test.ts index eff96b200d..446aca601d 100644 --- a/test/scenario/NestedRTokens.test.ts +++ b/test/scenario/NestedRTokens.test.ts @@ -374,19 +374,29 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { { contract: one.rToken, name: 'Transfer', - args: [ZERO_ADDRESS, one.backingManager.address, issueAmt.div(2).sub(75)], + args: [ + ZERO_ADDRESS, + one.backingManager.address, + withinTolerance(issueAmt.div(2).sub(75)), + ], emitted: true, }, { contract: one.rToken, name: 'Transfer', - args: [one.rTokenTrader.address, one.furnace.address, rTokSellAmt], + args: [one.rTokenTrader.address, one.furnace.address, withinTolerance(rTokSellAmt)], emitted: true, }, { contract: one.rsrTrader, name: 'TradeStarted', - args: [anyValue, one.rToken.address, one.rsr.address, rsrSellAmt, rsrMinBuyAmt], + args: [ + anyValue, + one.rToken.address, + one.rsr.address, + withinTolerance(rsrSellAmt), + withinTolerance(rsrMinBuyAmt), + ], emitted: true, }, ]) diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index fe079bd4f4..fb04851245 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -229,7 +229,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME expect(high).to.equal(mid.add(mid.mul(ORACLE_ERROR).div(fp('1')))) // BasketHandler BU price - should overprice at the high end - const [lowBaskets, highBaskets] = await basketHandler.price() + const [lowBaskets, highBaskets] = await basketHandler.price(false) mid = fp('2') // because DAI collateral const delta = mid.mul(ORACLE_ERROR).div(fp('1')) @@ -241,7 +241,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME expect(highBaskets).to.be.closeTo(mid.add(delta), mid.add(delta).div(bn('1e6'))) // Same goes for RToken price - const [lowRToken, highRToken] = await basketHandler.price() + const [lowRToken, highRToken] = await basketHandler.price(false) expect(lowRToken).to.be.gt(mid.sub(delta)) expect(lowRToken).to.be.closeTo(mid.sub(delta), mid.sub(delta).div(bn('1e6'))) expect(highRToken).to.be.gt(mid.add(delta)) // should be above expected diff --git a/test/scenario/cETH.test.ts b/test/scenario/cETH.test.ts index 590623d245..7c862d7b1b 100644 --- a/test/scenario/cETH.test.ts +++ b/test/scenario/cETH.test.ts @@ -325,7 +325,7 @@ describe(`CToken of self-referential collateral (eg cETH) - P${IMPLEMENTATION}`, await advanceTime(Number(config.warmupPeriod) + 1) // Should swap WETH in for cETH - const [tokens] = await basketHandler.quote(fp('1'), 2) + const [tokens] = await basketHandler.quote(fp('1'), true, 2) expect(tokens[0]).to.equal(token0.address) expect(tokens[1]).to.equal(weth.address) diff --git a/test/scenario/cWBTC.test.ts b/test/scenario/cWBTC.test.ts index df5478210c..963d909e0e 100644 --- a/test/scenario/cWBTC.test.ts +++ b/test/scenario/cWBTC.test.ts @@ -350,7 +350,7 @@ describe(`CToken of non-fiat collateral (eg cWBTC) - P${IMPLEMENTATION}`, () => await advanceTime(Number(config.warmupPeriod) + 1) // Should swap WBTC in for cWBTC - const [tokens] = await basketHandler.quote(fp('1'), 2) + const [tokens] = await basketHandler.quote(fp('1'), false, 2) expect(tokens[0]).to.equal(token0.address) expect(tokens[1]).to.equal(wbtc.address) diff --git a/test/utils/oracles.ts b/test/utils/oracles.ts index 6dde6dec02..6498315c3d 100644 --- a/test/utils/oracles.ts +++ b/test/utils/oracles.ts @@ -26,8 +26,14 @@ export const expectPrice = async ( near: boolean, overrideToleranceDiv?: BigNumber ) => { - const asset = await ethers.getContractAt('Asset', assetAddr) - const [lowPrice, highPrice] = await asset.price() + let lowPrice, highPrice + try { + const bh = await ethers.getContractAt('IBasketHandler', assetAddr) + ;[lowPrice, highPrice] = await bh.price(false) // without issuance premium + } catch { + const asset = await ethers.getContractAt('Asset', assetAddr) + ;[lowPrice, highPrice] = await asset.price() + } const delta = avgPrice.mul(oracleError).div(fp('1')) const expectedLow = avgPrice.sub(delta) const expectedHigh = avgPrice.add(delta) @@ -106,8 +112,14 @@ export const expectDecayedPrice = async (assetAddr: string) => { // Expects an unpriced asset with low = 0 and high = FIX_MAX export const expectUnpriced = async (assetAddr: string) => { - const asset = await ethers.getContractAt('Asset', assetAddr) - const [lowPrice, highPrice] = await asset.price() + let lowPrice, highPrice + try { + const asset = await ethers.getContractAt('Asset', assetAddr) + ;[lowPrice, highPrice] = await asset.price() + } catch (e) { + const bh = await ethers.getContractAt('IBasketHandler', assetAddr) + ;[lowPrice, highPrice] = await bh.price(false) // without issuance premium + } expect(lowPrice).to.equal(0) expect(highPrice).to.equal(MAX_UINT192) } From 1c961c93c0452e770d124559e9a4cdcb7e9e0c6d Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 26 Jul 2024 12:00:06 -0700 Subject: [PATCH 445/450] upload 4.0.0 audit --- audits/Reserve_PR_4_0_0_v1.pdf | Bin 0 -> 547401 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/Reserve_PR_4_0_0_v1.pdf diff --git a/audits/Reserve_PR_4_0_0_v1.pdf b/audits/Reserve_PR_4_0_0_v1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c22c9db747097d9eb60374bbf1b2670fe19420e8 GIT binary patch literal 547401 zcmeFabyOeCnl6fy;10pv-QAtw?(QzZ-5r8EL4vzG!QCymySu~rC3}B&_T0PAzH?^g zpIIlpdadsAx1Oqcs`~Bfeo5qnMQIpl*G5q1EMTFyx#?uTI9Zw7 z7(3!KFtN}B{1xZ~3>|DmZ5^xuK1{5?edP2_0TCE~-zz#fd@*!VaxgYlu(fr(s$CgvNffX)_1U!uraa42NeD5-q;8q zkfAXzFWqN-8&h&)8wxsUV<&whK=fY{{gPCHmlqbw*v9C$#J{rqOZ2~qBBu{1(8&>> zo=(Bo(e{hOud)G|%jr8g89UhgzGYy*2b{liqEnMKurM}s`sFWS4X76*J3iq2Rqx+U z1~z=a`EO1}e1_i@1PCbN>LjME3KF!11mn@{1sD7kp-XS@7c>a*cvJtJ89AZ zFsD;8c6It&wt|1V2>tCMp-m@hYx7$MQGjU7zjF}<6vgqkJ0^U_zxy%cGyX1v7jOW8 zF*4T|v~|_|)lMuNEVN9F`0UIKv>c4ubV7jqe#7v$gnt9&?@ji*0e-b1oszzRBb_3h zn1k&XyI-{sQlt|$b~ZOORuB^e_$xW++c?_&!qd==?sux+F@F{QZ!PevfWKPcv$2h- zlNmk-8#|q-xfK9!I#DYCK*Gj`wnl(9b#!tt*0+X*a?Pk$Tesa3Mer8e@<|bMR7lEP z%udP`Z{KlmDIxprR{}4Ohj2R;4^kIgcjU94+Q(rRMZrk=6^VQN?0&5Ad2Ae_KgQ03 z>&^515cp;lr_HA+gfArEav&_AFPM*eykR+4tIHE~TTJ-psA`X&J=Bn2*f5x#k+Ks) zn<6$<#OB6G>*hw`rtg09l;lWq*a5zmDB+l)Lm`YnU6F&Np|=|(cQp|a@Ys64xyV-^ z3frz7`MwX=Bur0r88lGDu4V3=9R$sV3oz|9&DGMmm zdqABRMqcuOsHb>;f}{T`5ZZjj%^s^7yiUD4M))y^mm=uGp51j^?}qBL4+b3X=XeOz z_Vz)gDT%x&7D@#6Y*Otr5F-VA2v>apEjW3s-C}oztY$NX=45^^5V)5P#ZF*LO11C| z?w=S+#J~xrTl+;;Z^7uf<=a7Klx<5F$aZ(Iw5Hx=EXd9To4fg*^4$DLYiJm@X{aZWUwANo0SrB5}ne3ELS;fl~!c##LP0*XuvRZ~k@K8zt$ zbqS;HXSfKzC2%V0v$)mwJ`8u$g2I+mT5zGYFT&P(eFYe+aw=~uSL(nqyY8)7QhKk` zbkGhm95ekOv>5szp(@rGT%UCW&Y11tn z<=k@XGpUcrfqLjBv!F~P*2fGQycQHvf)PWBKiUoWp?wzAWu!Pbbl8?7=F7YMB2^G4 zcI=`R_R=H?B%W{hsL6^W(mIoL8{coJk_0-O_e`hR#i%{L!`eOur)t`*WL-oxj|97@ z9@QIv!dd^M-cMWi!eVakc-ArnrJ8Tdv+k8%M>?Y3LT$C_O;f&W!R4UNQL|{(k%)e= zdTgspM};=#oczw+#45V~;Y&G{7E*XR1#-pO6;^2-7jl_>K>y3P>OHgpde4OS41BUp z9L>eS6Av_HZvFGMx!_aVaTIvl@plkW!b!j!0wCnShWB6G{F^ENq6P^7A350B{-OhX z6MZX3z!YF>W$U15r*CNd52T}NZUi6@24)r(Ize+MM>%5$AzN!ZTN?nE;j`2IonM$4 zSefX=jm=HXoB&+I^iR0vZ*28^()rEkbc)jYj+TJQa!Xn_j_6J%lQw7+Q(@MAmD$l1o=k|we&9~^lx=7 zy*Ax{KqDgNpzlWaA5w`hFmbT_r&S{Vs0BIgV)#|V?r*oU)*ofR{X-@H-2Oq}4+4J> z_=CWI4+6dc!09^wyIJGcJIDX5>YV9csLq+#nA!fCC)n9I{&TAH-|t8NankssI{)wK z5`S{}gTNmI{vhxNfjJ>|YPr|25U@zk1|mU}UBLPd{@1<5TuOs%D}1zWonxm_OqGLEsMpe-QZh z2y7U5=~U-2^|8w0~%{LIA6@}E+PGXDNj z>Z7CbE)Jv~0YQX7$^3i?MYy1{9O8ZXmM^EAShWTlioHO=EVu|_IibdnmW|+6m1A;3 zC{{|YVYDQEL5Fjm{hjwiX~V-li-FWE4_(Lc>rt00&>^EMw~5qyrjPeo_um5kJ#>Fu z|1|`}$EuP7#BiRE-#GLi7>G1t&a%4#AeG18e9p74R8__YH_M+*-(8+_IP80?*Hh!8 z`R;a*qo2nkKYe*ACX0RXd7STf8hV^!Vi!G=?Q!e6vT3KAitNRCxHrPbXOYAwg?Y1O2)R(l?U6=R zI*rx%%6dVIVf%@K$+qc9R){99NUiI5 znd#oz^-0ft$Hl=(GM>jbZYeyUi@8Vm_RF0%m$$0}kBIk|x0x8Pn-_ms9jzvZ!x`&J zp6kBji3+d%AZZ`n7O%zh-NojY(`ecE`PDmto4K0lqbpA>joP-Rz4)yq)Sxffw^n9U zR!_O6+vqvA2)=$hu}Mk!N=MRh*~4-rWTwQOuo zvVs2qYPh-N$YFEnKt*p6T89Gy)tO!W))(t!>H(Pl{|eZgnh)yLy44Js}+ zTTOIRkYy{uxcO2mxDF2V$^NZL@wEm`ZgvXy2@Pm4Vfs!wr}6HE)8!;(asdxt(fdp9 zL_9lOd+WZu`SU^!9WOsbz0afi0W7c2)`O{#rl78yFN}qa)#okp8`^BT<+p0?8)L}9 zGI$*~+8fqvGKrPx6_lqmP$QL|*e7Dj;I-pxgIkX*Z5TQ2<24VG8!=!M#DYsf;!rOnibbP;>nLZNOxi~*x&B9?>{Hp$kzEtdMQ#8_u-{n6-xG9EeIFm z8K%7~#N2N)6xI_YO$TW zm-SkQIZVGYeeU>Hox=?)9R)ik9RE{5ZF!XTEo|FBt324joEV(=hA zB$nYkT~sTJ<+!O{DBH2q4QPoBw`~^qu@u(#tWObpqZ(I(CktrYFPqo04egg&&t&Il zs&sS}uVq!n)(5EI_$jRw*>RG^_3f_;2joCItLYQmsglL03zbkf;J$5|wI{DmlGgk4 zlkz}=t<%wC#R(b;Cm(+WMR0N{P_Uf4K;Sp!CrpDT#j`u109{qEwO==dz~W$X!U8=i zv$@)>dwf@P*hWnbf&=6Cj^gvs(uh*In^uhZ?Y4frh(eJ%&2!O#$NAvCD4m) z>q1$HLa~U4a}XRPf5*+qPmS*iQsF!~J;1Sa_AaK0lI3jCSXjY<( zyUJ2KkCQOam4WKqTK+s8h12gaVGn1e`dRK$Jm0k9;T$H&1dVCH;Nc_zYL@%Hf34bL zv1Kb%2!@Yd^5p*J9kI8D4hULw(V2tGEWX)1rVD|C;=l81+bPCO&@kUmniK#Y>^QX^ zv6Qp02Mn8UKt{SQ&wGF{q(lG+f~Mg3+gn~9fY5gPmD!&doK!%cRDZ!pGQ?ph7BUXS zp9E{o(Nq#LuGI2=SDdpA5^D^Y07|;jXP>O!4$3F(fd^|iTvoKwMX9J7d~i5vfz%s} zx`RokB51N3C7RM`9=F5K9rzD(n$x_WCtg!@Gj>kTy(E0oPvPb^`vJe>rey#g< z2>>qhw^f%w85n+(xs%(MR~?-P;e%cvqnYpM8Hyu-60EfGIGKSK>$biJvC!5RIl3H7 z0z#9NM=Z1~B#JS9g(;;AnZh9q+}`TU!Sg?DosDZGYsA4|Eg^BT0ew=+0|YuW{QcP5}?5J=?Sv-$kjQc_{M%nR~p2 zE#YuF>XnM*@9J#Y$iJM^ z>9aS0#*f$=`R-_prCK4d0-5L5AE%^a)A$M&T!|(5FH4hnvJtVeL&Yq zNC?kK2KJ>^tJ#>E%$z5?VFZc=@3Y1dMAyjH#r0M@NCeXR5pj10rETU_kyzBsA!^F~B}CON256`i$` z!bV+nrKO|E+OYUFeR`Z`s=|8e>{MRNqs~-p_Of!Zw$}FUEPQ09xz)CXbE|^qvZLK= zMmuXfzm@9nP!ehtevN|$Q1*Ym{rXZ&$LY^1-^M;F}WCwyc+- z8a2Z=FrF{HxgMToGG#Nh%<}vc!5v;+JzN_*+W*`1Hi8-TiP5h>beyLl{UL&c784 z+VkV?kT)%fSLt7v^xBa?P=5%C#-+H-s**?V5kKCRGBa_<6h?zPl4$I4EcnTG1U!xT z2uGv+#O@evPJ5W-I$RnZg~_i$hDUJ1orYf{m-4xV1$RohM4Cpzau+#Lfpfm-!;H-I z>7_5fgd)bGD@4L16?wp*pgrRuYx5Yc=8lyl6tuM`(912Cd3#$Ht#~Wp53GF6T~Yy0 z(7S^s{{zA^Th0yvWufa-C;_9r+-Rqf6@w3Q?;@HK-?}s|J_>wq%l_suPSnLDxh38> zh7;{DoQ;YySDl0rR=fksEJqbe?RsolL(18vrKV;k9;$FejH)p|;21Jia zjQQGPNkb_nseN8ph*>FOTt=|UE79FsTJ)JUvL6XSBw2**q#lw-VTwcF=Lnlc1DazIaedqUrWV9r`{fbd zp9TcS{v27TtBzwD{SYPkQQOW!b{7x5r=&U%+dh=HM`hSEK##YiDy5&1_1Qat>7;ASZhc`dyn%aVeM2sHg~f7lGKyu)UWb#{(8ubt z)gYR+O2$@pMU`!uB(k7%ayzRJ%gkN8{_L-2ETelYnCQor&@W$RF&6iocYTj~Igc$di4xN2e$tFlBO^ZAI$WeK%HSFO6i-Z`bYA87a68@Hmb1Rh{mAUjS zVHG@bm{)=>dMJ`yJ*e!>g=8QqRN+LPRNL0)uUyq(`FNTBG>C^;VNKtOBde?pZ2F{# z8AkbO&bxR#r-TsG1WD{~kmC0E-9nQafn&Je@zwkSc-FcR^N1rqlc#}x2c?6%ZY0>v z@O^G9-dD(yLlR@xamCvWGS)-b1fK$b^b~s4mDk0cjpGtC9eA@qzww#wggW(F2)) z18%)Sq(X*&IoVMZ&f;1HSt)6^t{ddhJREu7_wJsex=)gRAh`SB2+Mr@G#UqSH6V2$ z=iNOAxEf*H0GZ9d9Nn9?@MkVTl>cyb#YjvNql(KT)AitEvAB2qcF1=nFU1WDPZV+s z(U8#{ytS3<|I*gV@xI#Oc02vZL>BX6cabj3_hxro0Bc)0uJ$zCwm3r;gTrI+Gqwx# zseorG?-&$kslj};#I3d;){27m>6;A#5kAP#^j?uje^-yVwEH(3cp`it_p3tS_R(eb z+`doRlZ_$3>u`)n?UNSl-F+WVC)oh*bQ2{aMJu#u->>2DX%Xs)l{ZHnRfTn$BMa`CO!TP~Ppd%f)@x4QVej7 z&?Xu8X;32YQK5cx|AGR;`J`Z?3UNm!B_XRuc_Ym+BtVAgpBr zKdDm#_8XOk?2lu+1iUPF7#p$#pEw+W*Ba<5Msg{t@ZTk)QKz#diy;^X~LBx%#mvXL`8W*eWJ=LeUDTG z^nBw=ikzOfd#p$tEF>1J6f*D=z9741^={@@MO~qh+EcD*Vp6*gd<{YK)6W6bc_EJ*#s?oND<_dqJ zQgaFlhx1c*hIO5OzJx)nf^jd&?gzo+5DXGOk*_HGx-@o;tha3Z)z;C8|FF3MHxFG> zdo=NjLc5zca2=hTPyW4+MF_lXirmrXin5BMv1{mWwxmb!Hw`LWp04iD-*I<_yEDl9 z?83qkW(*$)qeW3kNi_>Xkpgm>imHCRD7%nRUH2>7(ep?1ll!OvX?6#L{k(sZzg70F z;9wN(BULI^sJ9UG)Y9q;M;#Uu6A?{-hKHSkgoFeK2iKTXpVF98LzHv{R+?=tE22?# z7}5C@tl0);PY^x3J-MhZi&yrdXQw|RM@lJud(kva6dhxb_oj?LIc%dU9B<5 zlc#&KD*!& z-pVdPKYh!!JkY~XrVvu6;$>geTF01E-#S7S;O#fesWpDYg?amnMiz`noJDlsI5Now z=caLyo83HUPB(u1QWcuQR&93qNjL&;Dh!GWPq(XQ(PXGy@~wRz)|r+(>l#5Pz|0;l z0uAabuhE*Xp;518F^IjMCbb4P=+qVj8V!npRO6Gfq*hc-25+*&u}GXd0%YzIKb@>c zDB7Z0og74`y#o##O75qAD)pEu1L9&(d%ZeUGkf$1v|+WeV&*9o1YleTojGFzh$K~< ziJuzEp=fKfSoZ5r-Hj}~`#A&1gB?<^p`e#35O=w<8+qSo_u*AMbImqvP!@pf4{kZ(rS| zM_#R0r$-4&s0DSo$5WLt6qEd;%XxD9BhkT1S)+cV8~o^kes!WM5?nQU7V7zAv$|~$ zZDfVR_cyLpc&xtu87zuH%M;^JNUTc7ptp3IkF16L-QsC$g10Oi@puvCZAd?1__F9& z)}e`}XeSG_u2zRuwN5Nl?Cm>ve3RGeW2Xi$DsW+L1g^ z+gV?HcOUeqVnZVt9-+F#LnBGZ8*`dPoM;SPh@(F5>QhS)k5%nHW^J_SXqcgwN{sLF z3MF@ge+w4*SS)e{GH)o~O=1zwD@_`!62cy9Yt2nmOS6;6A6tOOGxW?)tc?|A7|_y4 z)H#PRQnBbuaHYRfJ_04Q6^}&t>Y}0Bi|U4MFa;c!3K0PZ6Z4byT#y>)E`&PLGgIJ- zcDBdzBICG*a-}y1q=(61r-vLa1n!E7@e{j}o-2e=A7V6UF2M+lhQ6HNCdC!6mcIb# z;HcGSSEJ8CKYxbXCvJ@?HN?iseYa4!#bmKuC|B*&-|m-IOlPrOERjxcuwHIF|5@!= z2-)Ivx|C$G-s)D(>rO^@}M{$62f4%5rrl6cCj8bcXk}t4;p@@WZcJ9Qa-n?)uh0N5o5x*-dacQXyZ6&IQ-Mqdz0C=r z;|9Ze*XU-~>BKnsR5=dZSufX_ujaa0%#cQ5vKFZ}I*%nBNz5T3Z*3b;^$Lrmh0!aH z3pSE31@VSN}bjRf~5RPB46P-*|$51x{>hB4&*7^l_F>u7`XY6z~JB@v3}*! z)v8@k9!MA;=lNsH#a7 zc;O$z?l!_SDmrGkFMZwMS+P;U!nRbi3Yn$MLU#C!Vy`6qYIlvVgSWjwg6;ea^+7R3 z$~rzU%e4X5P(aouSBvGd8sG&9&@_tl*_T8mr@SRjgKbLQ^Q~6Y$4sg(1s# z=}Mt#sXU@UAaN7lf|PI+R){wAsrebdr7@%eGyp>O`rbBo>sMz- zH>$abSQm71n)eSoY4>xslSL91*Cu1>EC3FjZ)@JwEsnyPFI9wY6In%DVgG0*Ahd<} z^DwLoy6Bb@qv>t6XRM*c6X+zZG`DR)SWFBZG~pDG>_9{!M=s4B8yFP);HsIx>Rp2 znxm8p(Cj1j$uGLyh>7uW?}eVy5y48>wCFk0$RxR$V7__!dW4cvHHcd-qDr3{`DG~V z%;XC#;bP<_M!nC_D~)VmzS*MrmnmxQ4;p1Kf+{%{a9^qpATWy#{yy{l-d?@Ff916#{srnt5z8p@(Y zUUBUwXNcCND#gRk#*4t=3gRIL(r)L{YY3Tchofw_^wwNjxT3zjTkq@-`)hl*fz#a>B|4B}`bt)JMb+fbqgnT8(pXP+r3p>+UI=QH1nxd= zgBnVNY*{Z1y2fEsX4=;#nzyX{cBq{Rb(x$UR|Wu?DSYpjp{#-KaEAAUmp02tr?mB$ z(q`;sE&Q;_q^NQm^{PlUylIZT$ymak=wthzL!qLtY+lOQKtk6Gn`=z2k~oRA;}0;a zl5Q|9=-ha`m$1eVm+%v)9C;mjFXN4*bGoHW?2S9|UE&*=Fyhz6<#t{QKj*-5IvO+3 zYo0d6I_}SZSA1rxRO7Z5hp(D5thj)p=kEZiPj16a^T;zbES(cCPF2X`6jM-8aBzT1 zc^60c>Fd~0ip9)ND3-Tz-0=zF1qf;30g3ruv?m{P6kZ}(I-*ix$29mGR18qmbb^@M6+hrMx7kUhyB@ZB{0b)&Rac_bZU!J}%%bCe&9zU33 z9*CLwW;0HRJU<^TX|Y)q#&dTJ@y|Fgf1g~z`eHx5=QJP{WrMSiPV^OhQhZ`q4gDKO zWQGZY#}se6xP6nyJamU8T`ht;?bm|o$@rik^u4)!^F-n?eW%VD6*eTk=;)?X`LPj$ zua^3BM}DPNJSm4<$rEa~8fICFmfLNMY0VJJ#_AGT81x6H1|5Xk`;)*#ttV5<2R~25 zT`-1BO6F(PoZ9ne?W__8wEam7OrI8>=V4`hJ2mlYRWET#Os}V~MQJ3k7T}~S@}ke$ zmpyQpEBpHGovW#^lNA`TytCo?9c=@*i{#KTx{njD59=2Bme%U_t^3tR0jr(v7hjGD{U7!@|J_JyYb96b(E; zrQ@`eMKPw@u+)MzV-l{X06gN=Vm+Yx4EOrvOmiHClGU)qH<-4Gk3$9sx^2 zLSk%=gMwok7#Ie!Y{{RYNMA1McqY~epE7O6tZ^;ozW7x%Cr4j@b9Yo&SX5M0L`-a; zH=$CmAUCy1GLf=RwIU-nB}I*;S+u<67L(O_zUKDzl+)R}>R1S#Z;7gWU9m?rG8M?- zJrxXkht*z$d9-9IW0F0!&R%3^+5EdYG*ocxEEJ+w=A$nNw?=d@w%s?4;zO~K1|MtC z0clwheC^puZ%J>{UqKO)i`le41H8Ri1Wsr{C=9N>A0=r}zzJ7%U6lluW z^a_RaY~lamd~)Er({F1fCYFBse(}cTE_Fxz^^lN%0$LiW=+igt3i?WZV7(u#d+HT`E z5fDDqQ_}EHc^6y;*3nNFL1TV_>y-2y;$?vi;s6-K~Ezz+IeleMT|op<@&D?V{?hth1%V$`5fcW!Pj!^ zjt%aw8Fkv!nSS+EYDQEY5x}g(SlGQGGBT}tnY2zt<+d%>J|ydSyRDwR2!q#ZX3J?v z2}6maU+PJ9yUyM7rZyJrJ-fW$+(Tw6(F5?Vv`&RgHlm~$AL)3Sz*|{27sR^R7|zdPkHEH2j($iy;;~#5Wbu*!^c8Wqsk=A3iqBUB zO~M_x9KHHC3H2vrsM->70v|lL0z!2Py8>jMv@LQxMHoZLL`>C3yj6Y`@vtf$ZI%No z*i-{z4&D5!l}=K!7hZqDV*ZIYCi_lwCWzInH_>aiS2(88cA@#Wr+xbA?)ZM^hX5!f zAB)q^nI5r7Y?h-`)BZ>-KK<^%Fl4~SBJM9sk)I|eGB_OPPtf-qZ&L%e!E#p8HK1>~ zB~ZdWh!#&py6J4~P6Y9cM8VAkgRZH_nh7-&Y2~p+`&Do_T~60(UGN;q7+nvl5cB#! zXS}^!udwTx3#hAhRniJJGKOT^au}zJJw{W}<0Eex11KgAcCXQU1=P)gWrW`^#1bb+ z_@@$v)uYzTm#tci&M=u^7Y398UgfyLxxl_!Ui z27QQVCEE^^-jey6FVQ!1`*IpA!cXmyOR0;#D5$UE7-ae=_-?NbPJC67MUt8 z@uH$Qs3hq&s<`UR;9CAn1?W6o1|l}`S{>I-$wXFi7jh5i*3XY&z$iY&L(#Y3(z{9I zX%#%%SD5O%!jUVFwtHV2m*k&wCKMB^DwXpw=AFHS^Lrq?gEf2Oog3WwdqVvpq4G1! zaYgd2kHv(4tZtT8(RYVr)z!`g1R?VJOK@rO6s@8ZV0a2C3;c=~1dGLL@$;K^`}5Ik ziF%&9gF<~tSXkmVRbQVsD0$vOG$3e0$g}ckrL;A0CkeI zDQRAHey^OCl3J_}-Mx&;-mTRBc-Gr>%z6yY=V(ZAla*3?HEe<4? z5{UtmXyjc!pu^LcZZ_L z$!#500M%xAVyQ}{m*s0K7OTx#joWp9`HUa8BJA`yF=U^9Lc~b$s%u!iox}|%Ib0sL zmFUg{E3=3p@}aRDwy4X6x;;CBd3cbn6bVX*JgX=Z94Mpt+A9Gd-a078!ZjN(8Pf0Mde0Fj^})1Q~e0eC_`lyiWG@)BPzTaj5PFx*JnW4sFe$cXnn ziNS`|z7rn_{TO3qDMf^zIX1HJ<3uwugH&IpgHOZoJ-~YF)RCTWGJ!6|UsH_b$C1!zVD5?^RBAEqqC;OhX*^V9DPXOkC5A&bBlc}ELVspv6Hsu&SWry?QjT4Yy?Hl)o&0L3)#*EKr zPRLAVQpXdKw9#RqDA@gz*65d{$BQO7lqH?iIpm656r$h>QrD89oDu3uYO6&rg~|!Z z^Yy+Wwd>a<=BpR(NKwrRyCQa)DfHF(HQ5>FwZ>e)srLj2Et8v)CMrs@>yA#~i)TX~ zXkvsmt6MXQr>lVBF};q2C;1cR?|(+f9ZW^{%u-3JcrC60R&w(bZtHlD>0#b=&(|WQ-J}GuWCg{?-i}i zybR7ybIN$Y2wG^wxa?43(3LPV4<{-|#jKF1i-KyivvT#zORC$65$`|Oqt+s{R--6c zrWx$OlGY$H!Y0}>o}-Xms)#dt`bf$kZD_7m4Kazzbsu!j7+I&DnIrLnzl<$e@WL}j z0hQ}p^GPsGO>(KI#;i`GMQ~8k@<=5@t|nq~z)XDUG_+W3>6^DCxAeJ~u7X!tsmnE! z`F`G(Djhc66;WKR1f=hNicCRuRw(l(U))98N9=n8j`Kb_E1pXdz`HS-JD)}-Tdh{l z%k^5HOzx-aP0)4E%b^C?W0mqzaoxM8I1%XmiF7X0y&H=7{-{rnH?e-N&jq)b^E7_` z%7F<86>}j$K_STzp;gq2(D3lEu&@ky@Kc%}SdmeBt+#7)k#kXn_74^Q)$Sjd;Drkx zPE;u6f4ZHD>6bNzzqV8Tdy^Cl|K23U|J(Egz&^&`O=SH3Q8^O}KH&WQlk)$7tqFkD z34r+r!1=cX{{_1f|7L9hAi!_i7rzWX{Ku?KF#R^G0Wh}l%Ld2)$J~T~jg767qb9(P z$nQVMX#cm^pZHzmUwHrh2l0&T^sN8nJC1+cMmDBpZM)2l^k#$q?uS?2mx#DdqF2qI zUbl+7B-A*h&qsY1uwbu!{#|C_%hK}OQ#wI0`UoM#vLqe&k=n3b)@E#mX>hK?n^UcJ zd-ho4&H&y-woPO0V@MzDhYrUmqy;smUqL5MsJ-_8?^Ln zZ^8*$x8@WN^%$?4*Bo7{_%p08V)t;8PeXbeq|G+6BQGr`*axkk$Z7koqXxv zoMbR41b~x!6Vmp;o8LY-&{d+Sdqd0_nOCOVCDToic1l;)t`FVv0a6O=(wW9He3nx> zOVj(xv$n?@KQo~j$MbcjwC}|mG`Tb~?C|bJ@WDp{iOk89SD}jU+5JGXFfO$e{H#?)nyTxW!2>SGvkEXS;s1_`II>eHqeK6*V4qF)@I?mm&?4$^nQj=@e9U~g1k zViQE=`{QhXc&s8KCfKC6n5aUh5_g!d`f0QAZjo7hh!p?r@*1bYTs^Stz!Bcp{}Ad% zyuz&OgB^GP6=_id&1f{1@{gzhClMyG@@hA~vDQ0Xnhw1WnpP^}mpq4CVF#aoTul?) zMBi(`8HrA|mFb~MamYeuB+nuZNT`>nLnl`1EkmcX|2dO5P;HRV-hv+b5+u8>pbZz`_!Pw7}=4%ZFGb2{`9} z%#^TN)6V8IWDWG&6p9^=={1Jg5=3B=-i2e8-lbLwCr16=+_rv4CIH6=QKIJzjD1u< zS>rlLfITi)KZT%ej)ZqqhCCJMa+~vZbvcs*XJ~^~vIs#TrFgFwlL{2?J}d z7MjLt{o`!9650H~MXX2!n}DZ0A43>r8QIJ}VqsIlQFfRttf(M&T{|_{&mb+0_+vii z(<-6`VxpolqUD0ve3T6{Q7^I^o4%b{5+6_n~_HP%kOl$w>K8jGaNEQ?V_#lsCM zsHN(!X2HcQ)EivuNFNj|mHL;L2Vu(9>jg<^Q~Gn2!*Kj*ez3Ac>Vf9+fGrnmc#Y(M zjUX#quEY{|g?H;+pLM%Ofq6hGA1~n7ZR*_gmP=zd11VBORPdGv@|XQtLZ z>j&G|$&Dc;Zo$U!l#IBE>(M4t*YrzxID-zL=EDvNp%;{;PZ%SzZR`dYf+7!UqPs^Q zWP_kqzeaXL&3X*KLO?^@pK7mz9lHT}UJ1w12RKuA5gB8sDn%Q^Oq6b$thTlfjP+NE zJKBxs)f7?F&+-yRG{we@5ytZ|MhI72TCEz^h+hquAWjZ$*L=Wpsz!#XITv}DD6^_y z@s6}9t2-CNwm$vtRjQYTs))X?im=^jd_}O;Hr$sYU!P1f0%;;;U3^3jg>INZ8uN(+ zf6;u|DF|{s>8uy;;YjQISQ3RgJbFH?eSfh`$KJ}%%3e}Pk z3FS}^Y#9gY{=Wu2{ zUF4#^UEpq|p@|q3hd6(Qq>zFf@|Ra`Fdd!o7_2;L{iNBri5M9-KnVJAHy4rvhnOcf z9gSijsG%OfEFptD*Oy?09@R*eFN-9+n3^<<{RN%lHn#Y=?Ycj=*SqR{@&&@pEnJtf z+dnCrrCSq|9fG7Uuy%nAeWI>A<^WrLd|Cck5eu~re3pxg25wKWPl&nICeGf=!s$;? zF^vdk&p?t`J}#SB9+l^8WOaw;&di`ROy@>5cjT%$c;DVIl-6#kNTT3(%ez%X<_BuY zJ&RV7fg)6DoNL#Ue-ij;eE+q5(!0y<3N_x*(5@-4dqOLKk-CvI(w+V}? zmsHsC-JO*K`27V*ePxA_asAV889Z4rz!+Ir6Q9j593VX3C z6vO%&0t8^OKcS76wSxRVIL2@Wz}i!?kV@EGSSR>O6#P)VurgA_tl@$)?j%MU5RBt^ zV~J43GaU&+*tv>sdU)(r4*hKJ;SSyruJxF~1_Z3^3fk4g;(;f`f&s$`$~gSPD87Nx zD1$zrx(O?fAaJ?c{ob!rdIZG?Sn%o8p;hrrM(l-%i6`j1I7M*DsSU4|mqbJ6oN3NO z5+zqi0+pZg16x`Z$fZXt*Yaimt&;vsR#r(?7H$N1kEzGch+E8=xYiCPPA=rRamCeu zzMVHFs%Oboh!UD(8uC!0k)wz{FW{`X8P$uSf_Hz}=vJdlF1pPbr{j?}xDeNlPfU=a zZ^U7!&3IrXM9LoWs4fG66a*?lH07~OR(2@t$FEV#dk{9sW*&K9J!%tC1rlKp^~z>W zvA*(wR#-Nk7cuSH=k5lqP4}`2v25>r&y=cf@X#Nj=>Pfi%0K>~`2Xm$YDNZ*fAyzH z77mWTKC5PCV*4k{@&A7#O-#S7*Zt$N{WMd07)1&#*b;eM%a6-$KK)=Vuy)Ol%5IO+ zDh;AJ6rabL1RNGtFaZC9v-i$->XM@o&+Xo@crwDQWK$;*vir>!VIz}vPkZ;*BQ`qS zm*Cikms7gJYd+_Pr#CjdwXC&vH-pCr=+d4*R}n;oO^t=lcU09d1|310&=!sGTww`I z0vA-09nMQZUL_R1p)?r5wS@^|D3NiFcxmyS4DQsRwy%z-CxaZ$?ub{S<6riOx4(-K zFgR{F(d^Wx9@ht@H6*o^B(*zb?$+;Z$r1aV!Qrja9@(xOTp^ z_f62rt{kWJex6o63R*$CwG&w!dzR!PXhe-Vf3WN_8vL9kPJl=0e#um$SCdjWRxP+T z*bI~V{!An;17$M4gLtLy2p@ahqe(g{JVde6o(hU3o280neLFJehRKd0v zf;2ZiD72e4Jx<8yI;*tJpf=W-YCQ*=Me^$pZkq$9jsDGMLp1-3y7vHUa@iJ!L5fuA zML_N;Q#Qq^KYzG-(l#E;WEi69|YD5s)rQ*&p3Jvwc1OR;%;0>FYDd0VMQ{=+_(fH5x`^Q8Jk<_X;A2fIsiUox zM~@c%P%$UZt?=EMwqIrT)#gf1-;a+Br@>A}Uas%XXHvpA^LUr{t!VqzwLMP%SldPt z#gTv;(u)Nj<5sn4`>$zVFU0!Y2*RxBrE1UizY=^*HjL07b>sC`ARB(CdA%^b-jB!D zLBuJ~ePo#(OeCJvMXsTRj%un7&|iSS;0h>#$Cc3uWM`@LoKJ(N%d1v3)73h1)1e7n zXN_IZO0?JaIqv~&u#v#6mOoMJXp!K^psAk&*^*N6%s$oQw&ir)Kw~<^i{*pmBQV1z zBRg*aAdISLM;!R-<=>$P4_KQtoOY!L$4jNflci)90{M$3w`-!mhOB1h18_xaQhvG$ zv4`nj*LPNFD-^Y!d|m1$A{*w()AQOofWW-E@Z~fnC=9F9RyY93rbg$;h86MU5nZ0K z-DuH7a|GwqwE_jth%e~bD+2{s3EX`mv#d%Bi%~0#ClAI1U)fr@)SSl-ZqM!Lbfi23 zI}>pv>Qqf~8mysyF@gOz%@L8w*sidS8nFcR$erkwfP|g76dZ^B4{H7WN=JG=WNRI_OxGBH@;#5Qp z3kviC(lv!{v_)H0sUn_d*Spz#PbPo`MZ@u_qBa5}`&nMl(Z9vvvzD$Yllg}$pdZKL z=S%|5rvLnb6madT`s!q0unToX(XSkMAiw1n%S=@=laYUu^KwEHv((qhz=9|(@wt+e zl}2MGLbN}^5o@r;k-D7`GIGlrPau`X7a)ruo^SY6kM{7XwC(Vz)OXoFz>htPBkZvn z+>n~e(JI+C1e(~}D--;gm4}XgtWf?y72#T7AEkys2KxTBi*~}p|GOJzg@>QG?JKMi z7}^L)_@}SZWaPT42t@0OrAH-_2LiS8E_-Q;qoYqXsKp1>UzWW*iY7&)^AkjYCX@({ zIMC9Y8F~hWV|r6_8UUh5tFwdy5m&ZTyK|y3v;nUGG~(y`k>zCMj~4hZl93bM-w(%N z$PVc!(P#p%i$#$@$^MK$`2p^DH`HGy21DCYidnh>fx)QiZcQ(hp?Dx~KpD}0=>}jh z6zdhF0IQQRS*ag80nwsv&420Pz%nGMW#D5LXI8Xs)S10Q3_CPM-qOe_%Au0Cgn2Q5sKGcot1_iYfH)O7D5K;qXc1iO1o zFc_`65WtKM4~-qs=s`v&D9{T)PpbC;X@I_o2Kq*@3m%N2ZCfGmt+YPw+kpCEBrSbv z#dS^>88$T9iOEq5P|6p@4p4m50566`Ah|YjFwcfY^)Bz^fGSZ zqfd>J16{}C)y)Hgu}TvGBUiERA_ga+0x+@RKp7qV{VRLlT7-aVG7oXeUqT?&>>A++ zSL~}BJP!k1a9h_%){0OFIqwGOayKp=tV|=>3(v>p?GZ6$p_N9UG*`-jqeqRn2Bo?zo1%vT+EtT#m1Y<5o z0P*dyWaN))%A}6RIN;hRjHY;Wt^+lv?pl89@mcl~Vr_PwrBErc6o{2c*g%@xqNR5f znC*N14g_Jn+-0-4Oa%){$)BYIWY28r^L!<42xImbQ=+9M4`k@_3Pt0qvI;t|Dt{Ib z5iT&h?pQ0Nh7iw6&=|DA$w`Qinmukcto zfa(ZRW?rc<=K*A5qQ++sL`hBQOJQTGD&q2Gy=Eb5?52Ho8cwo&J zrbGvF0Ms!M=Qp_wG!Miv>#O9gkMXW(^gL}@iJyKm9X%(v%u?l!rW{^WTeKZQIKY#f zvxkEomARZ~w8NJDxO0*!q6Q?hlwU^$Yu3uJkH&zMY5kqO#DKX#_Zbk3=aE_3E6W8z zzUH_LTJ^Aj3)H#Jjb2a-#JH+*oC{8q#!o~FZL$vNbXq^pD3?JpdGOS9Oc)dZP`i05 zJu~H*FXvqpWsF8Gkc&P2WH;80eu48r8* zh)JG>w`G6n=@z6iK%up_0sqnMB`yM7aZ=u*!9WenQNm9nNyZP zz>FQHG<@u14d=4bbDky#hh=rN4c>@+Mg`l}>w7eP<$d6iYDcMHg~Ys>9|QVp(z>G( z*!BhEaPl^0UK!96)MYX}%09@dcC4@twK2f9+lFK^Xe)$5U#z1shnH{LY!I!@2VpEO zd$J6aMf0P-2Ids-)m8(Mi*yfGoTz~6q_7|Ewn^Z#HTL&U=>sy!$1XG^Kf*(lwPL;D z6+r4v@uB493xi!CTTU$+_R~et4z!ZwdF_hx$}Xhd!I&@`lc$ZZxCQ`Z&S)zn2fiwt zT8mF6US`VDy;beFB#v7=3uHJ$$2zk0GECOQA_&vO`p)ZJ%Q+cmVla;cZgDd_ESeoq z4;?Q}4^e(=0of9SI^C^WpN-5tB%^`Jv>LO%A1D^zQSI;=qL>B}>C#q^%r(nR_WCfO zJ=@J$Z^`X^qJ}A0i$=|-=&`*B##km(@;L1&keTZ1T48lR6N81WLX}Lk(>{^GQYChf zBU^CV{(xmda*A9)56!VR$BLgs9?Ys73Pf0F(7Aten%pn&9GslIIm}eSvgR7KB?{p@lgJrj4mnt3 zrfJs^gIPjmjP1TcSlpL85OVtT6cK1C{$NaG;OZw3*jK9_lZ2ur>hwE>#uCt9u!M;Y zS|q)i&9vB>=DCT5=3t6kirgJuwkY&-N9q+_lNJ8q7lP?H;38IM_xWW<-}eBUSe|-Wyz!DlNj6ypNy9G1V0oT<~R{ ze@L}lIFNrI9+bKH1ozQl|)) zlK)}Yap0L_8%p}~14+Fi-~HQ9jMoqBGrT_AXIArBj*P#rr$fp*(c25VOZ5fCZhRYl2* zL}+y*HBCnDXgBwla=EyomaYy5psvLeCwqM}dZ<(9b0tWp&V-;Bw@E^vt9XN82sc1N zpr?49U;DOO0a;7Cn3;RRCZd!O;=0~oaqkLR}^L^Tz=|EjFVpLKhxEwqA0*l z;?(HKh&!xs>-FkxQympyCwD4ygy0(5otQ`7jWYwU6Y!WK6@$^C+ZHlxBRinUY`+HQ z*=)Z%5Srzs#}K;ZN=G%^d(~#O>pmzhvCb4ES1|fv^;$o@*zzG~O5};Jgr^fpDJHVs zZ@J1d{JT#fF6JcifyPFkz2!)=wst-4GoT@*`J#@~`k!Ivahl5$smHz1-uE67KuL)? zP3GmPUW(#^zJ6Pe3rR}!K^0Bs`C5*=)dosO_0mrJp!|CYq-fY~CaMzYOy!llfwpUJ z*5h7lr=6x2@6I9&O->}GmIw}Il|=@C^LJH=-e!UAducD}P}W1Io>8+|hoj!SXb0l0 z+1BeGsa~QIi~hbWArbvOK2;9DI1*0#-p%v|IwdAaHxS-v+OExW#O%NUeNFq|tTGkb z&F~-e4|i5SPGu4Dt@Vfh5Ka4Dw&?qS2z-X^<|(lrYPOp`4;;^L^aK9&exC3w?B_Ex1M>5+98uGbJgztr^(cwi2gM*Fa-6!a-*W#^6aa`xgdf~^MFW*d1G6fHUYi6uy-Cr?62e5riIPR^N8rH6w2PAUK)TUo@<(w*N_%wCw z91692nmXFpwf8lW_cV1B5LQ1;{m|H}7lUk-WHp;4Q_b-;8=*c+CNhSx>UGa7T1U>d z(1myzlB(26Y+u3G@;We%Z`eOE221HtGD(i&&ZnTvp1hSTF#v|YP^ETJVoKhJ?&5x8 zTR19jb=DQB3bT)!Q@15WX(H@n`S_$X>h`N&E9+jikMdeA;W(vh`y>TRawP?vI)=o- zwe?KwL-`a`bozqo-;(McB&TF+uAr_%hn?)h2lLO0^s-6k5}Fm+8x>SJz@5yx;|lvn z5_RGSYi#f0=6C_oCze8AqS5Jzw9v{|jejr$g=uHA6w8)e6Z0y#6Y>pvCpGdAb%Dn8 zhS|L3SB-&yZ&|$OOzx$!6-(>V4JPJO0CG6ADz~u3tj``0(y6^vj9<^XnNf{kGduc= z0l#Kyv&fq18)QDkb`(`lh683Xi;flOd@k#>7ufejqkEUV~2>D~k?+doMSS6H`}sK+wG2 zW%bvSGX5aTABQx4rIA@i0{R~tnPpDS%y@XZ+gUkLQ~0DWKaq&E=%j-y8fK|vz3ED4 z6@sR#9(K(>9;Sy8w_`5d-ktA*ll+aT2+4a z>R^+G{>uZ!{Yw~I-<#vv>AkXO$P@Xkx~NifV_-D}air>IgIP~Y3WKm;$c-JT^t`}V*(cIl z-|$yqp6PNr>Zn?RugbVPa8qiA7&*ziH%icHh9ty(7)p+ef^|8~Xreu_3hzGxP@jX3^1_nh@;$#ST7w%L+2V8w!%f1$-fxjXWM1d;Snia~@Bc5+&^o z#BTp1ReQo9N_>irVpUtPse&`Do@E1Ejs*`CzAY3nzP21CWB3Z)t<;1C+8a!>O( zB&-X#)Y;A(!H0ECv|6k=pN(d84zBbxPnN^S+>omgcSB=MTP#??s6kg+RmAS4L7l;F z2316=w0VjscFpOEW3WrJCpe@44PDYr76P)FT>7+aRf>T+_`FsFha?Fg2d_(LBPL%` z_1u-UCl?(1l5(^e*rY>eV8ZE3z8MO53^-Hlwr%S%%}-qIQ!bnp!`kwvYcq~Ynjj|i zu;x*m6o(@^U3>K8 z#-iyBDs~XQ=sGY=E5=?R7IO2;! z>se0ok5?SLNyx6^4l$=j`ISPe%jh zy~ZUNyQZ#$PKc5kxG4ALjX6TIajuy5Rp?7hoLlHP=XbVhn3mox)>{*#fT!(jsd6*5 zV~A~fpdM9-?LOU}1fzj_T96y5vyH$^VRZcfm0mf$L4VoVTN8{zVBW*Kdto8pO~^at zi1?Dp1Q$P!X$tA8)ERV%~ndiD<;cZ7wZxF;w)5K@Qod78&FGsjEFH zfb{7%g46ZD`m4a*3RU%3%$9?Afd*nvI(dL+2GuzC>MU}RZUd*ZQ6q#zF&k6_U~dE` z+JkvlWz&upLFam48G2C1?pk8N4I0ZzlTl+*9U@7BGz(MI|fJ~8biH0!5CpsQ!FXiR3(VZ49t6dYOFB89tV@` z3lK5`57VE%MoSONX4>$4W1kbqc>+HVPC>qAN24!4Mcd{Ox){MSUJ0^*vl$*^qJ}1- zwGeQ}HMl5*ftu>|<&IVVDK^L!H_OJ>RVE#1Z>%|D`~FRWP}s&ZiUkc($US9of=ggu zZ;CA*mW}Njb4B(efD2)L;7&qj-*lTee^vo{F^PoiPY!w67O-Vs2KqhPO*~M86~t%^+c1|&ejRxV#7IV-O-tdsr#oDKNTmayhdjpAKWEgL zI5$m8Aq4h)NT~CCZwj(Q z*!HCDlnKOTwdx}}ku66wO0V@hxY?Zq;#|3|fq8SO)#+EJ&)c2@09nmf5f35Ab><4@ zPH(OonF^hw9h0xG1F)y8AnbF*#>TB0c5a9|{Y(^{fqNX{5xVXQjQJs?gOv}6t>Awt z-+~sN;_hV10^}-?Oz*6qE!}sj4yX`5YL=WE$S~VY zOrI7^8O^TDpwR)F4!sHMuK_1uLfRTG^r3~JD-GlV*m^gQVDAg3fGnfaT4(OQVXQ#1 z$wqcQCKCdpHnA;QXeK;FUqSeiEjY5qtuom>bOP4Jz7yh2DXi)Wj{F|oE6n#1^a`V1 znQZ$)Nl_3joZ1Shn=S0*wxzq+-V+d?ss?+;950uWpax@}wT@#*2PWr=@XsQyRtxVm z6~K}9ubVnOZ5a)!uD^p{7L}whg%Z6BiC-~-FafEW++WYxGH;v!dpaRl<_aV!N4k!x z7dX;=p{;X57-W0Sb*A8<+}U&zwD4XuC>^g&Fweqi^+N5=f+_Vxo3voeJ&zELu4Dr=LH=s4vchc%-um3)?nzqKicU*HKu^wokFsLK?jlGpL#2 zr-E3Wu%+0htANUPQWn$pOH=Df&VjHFM)Pu~9kcWKG;*qPlqZa`b%O`mo6+1%aw0MB~=ToC z9qpo%guSh*$6i=b?T~Zpm;CrO7}GbEJ^wE$PQYKf>kP&mH5}tmm!tAGHn#JyKwZe*MJpFdo ztJXsKVR3@;UmFze=N(P|Ah_`H^V7dx-r|>#e=KkR*KE#`;xhmDC#wF*<~$bhxLKTv z__CI!V8WE1xt5ljpkN3|B2OTPG9(rnTX^%RvY2>V?n#X#Rm*OMcvca@RxXUSJt4na ziO`}5?0rQmDVo@`@fp?p64>d{Sbyk}>bdNLKKGa|uv5ncp&K}g#M5TH-3ldvcBz94 zlG+a5!`O%#s(!5b9I{1VwnCjfC##!Yck4A(U#OgBi(@aAzmH0H`n67PP8_AKVXB&v zE(<9Z)p8T+#~MCJ6q3pOhvV$&G|gZ( ziH~xJO`~JO``&iGL53zCNx`7OlHk<5_F*AzT)1&DJjj0Itr`+;cM4im;gxD?D%De3 z{Mg=P5K$@YkeiYy-6#CYqNiU)O4K3CH0i?tspn?PZ~cz{_H@7==2 z$mBT8V;|b@UpdsF?l~Cwp-<8iQ5#X?@NjF|Czzfx9SvG*D_1bkCsAw;ghIAIFdw%G*9Z0vpX%jlZWJUBu zMY1Ck`QztYI4V&LwYStakUX{ax)n&yc8U1JUXh}>OOXq4cRI6nIogHIVBW=VB}8(B z2Inwya}Mog9R2jQR(E2M%Kq-+-+$-RBwsO6;z(3!D3n@_T>A3FhtaRz@VJsLDPq)Oj#ncO)F|vela0s|IR&c&8+}ryYyP+Gopk=U|uZwqc9yuO$Q#h%~(s#2^TOdR;p&7mhIl2ol_uZ`W`iQX& zRrWqV;!V{{A0NGqgX7ecfjl)Nwb^Q;k<8F%zUDxS@jlP9!^9)L=DqZ_QI4mUmENIj zH{}YV7et%Mahr0ve`dJOP#mv<3o^ft5 zw%RZlCp6zBI+GlCeMXbL?*b#e3D*z+4~3svzIv}0?nxa@JW{lsm3{pw-Cp3Wm45rOGNE}YRK$JJ$~ z%VaAGgrtR*W<8$xp4op6g7KgCc-d!?IW&d~2Y@R3Z{`3hQJC%aDTStnI%g$v_1Gk% zaG5B7Xc9RtQ|$r%!&Om;dPB6EEB`ijPU2!}yLcn#59FDa1CmoxPOxje6w&~9B4;%= zS-)i3X?T*9T>ha&B@w;N8@DIBguJ0~YMJX6W`Mgk*q{bgOe5pWwj`CdA6swo;-b7r zj`jki_h|Z|Vzj4v#Sa=Z+BrK;WzU6F?BEAMm`CjM0l6Kr3nDoV$eB#|OYR@2gnKjV zKfnxl0^-6~vN5Nl*DEd{qmq_YZR#EM@f3a^5BC|)fHrq;W9clbSwwQu!spee(>hq9 zSJQsTie%&aDEImg7q)S`djku6?r@v5jICoWT6sq;v`nY$obRuzpN6o*_hq;p_dVc5? z3K}_+2CqZ_o*xF@A#D{1W2A7TZ8W?BF^If$!n`v>#;6u_Det4JZ0+SG0|GHlPvCBj z?9k8`CDd#!9qh82Q7YV-h);}2glq>(E zra^nNLDLKMs&Q2yAO__u+bPkr zjIi&mkFh<|vxu1MO^>l&X;l*mt|*U5W^?+E4W?panu&3&nT+-Gj_0x){5nrowCj5Q^C-pAJ^&)s^QFfexi znx*Pyh1PAPp0OrVPgqHeOw_`svxT`YeTa?vm6T51MxAl|0Nr=#`Uc&MeLJ2w7ROFYBUw)<+Kc~lp##Lnnv97R2OZ(*`O9`-_NI3`CU4Rv1ejl zRwDI68pkqJ4QhW@HB~wd(lbP)muUY54AQB@>0nWzj#E&@ZnX@1d*CUjD5^Y)p0>+h zdUdGsn0sDde%7~ksZb-BCXbI=Dd8FP>*X)~dIg(m+C-e`3e?`y3cZ(4e+(v7s8NP? zG~LMo`(J#@zI@k}L8xTkXd8Q{?OWcR2KNS3fnhQdHNH(AFu2sEiu7{@nbB}W<;N2B z<5(yXyjlg7DPH5)Ma%p3Zo3E&F4tf!l3gLJK9aORd)A3;iU5_4f$J zUx>HJN2ScO^jZ|fkx(rpQolSkoh%bUIIa(B`QW3W$H2bK(;_|Z5PA{(bkU1$q<|K*iNu2CSp0X#I$)4mQds4dW?JIPG$1VQekbh(qPa?nE$Ou*MM%#7f3G%O$t-cd(ge;#g#!ZhY*CeR9dBJbJf0uqvvYp@V>R7&M>#O~h z@7QPkUqv&Ye~u|*iEZS%(Wo@n&NYCN&@ZxZWB4jrsbEPtD9T3380=iRPc_v(UDKxKPWrJCjI zP16MQik$sNnvMFMYlLaao!XUxucoXHHx4J8Tyh=ey}b@sTY^1&JAZI+4za=}_KGg4 zbXPUFFMiK0cqp%Nv~d1?V%~jIIrFGzEK59-gx-g}P8mtA1Q{(3=HX{w&V#+uN`QqMg*KqU* z$#jN{W#B5`Lcl?dt&RMCy_{|4wQ~wTR(AzoAKscrAc9zOxh6h{#i8CatsdP6$BIp? zsrldCZETookTA}8vm(bTH+bm3L_PWnckUjM)8^IDTCVu(-z9eUK*8l47C+h{YPlK_ zaD6@8T9K8qM@)U+>4+Lb6^{mJlt8--*9^b%Ip{Q@_88>1Y-qw~c9)7HG2caw*4%<-a)xhNe%QID9#EG+PLs24G*v5FqGyF<;wWPpInD1ch=tDh*Xryw(z6(SGMvm9S*{ zl=-T;w%b*w%6b}~XXE!psj|D+<&0Bj-LuvwmI8DH2#2HNXfb2(kn)fbTQ6KnqNQel z9f7R55ZBH}2G8Hx`~+6N5oKA+l#~<7O(o<7j?*S9J-@=9?8f+p@V7DcT1MJyXCBb1 zk@4#^pZ8^r(E^pTXj(f?aj1WJb6&(gM(0EEw8$H^H{zGMU!N_eR^_nEcabOKV?i1o zf;j4q@)`K)^<+hc5|f`~)4E$U-?&f2iwcB>C3lY)(mlG&^0n~t5&^3wf&0MoLV~9+ zWQYS2t_IG6lFhS3C{NMV09wV(J0IgX6iu7M;`1q%`@n?jyv`7v+`Q%|pGIiMt}xRj z2H$jVf-{wqcuU@3by0BR8>V``1sRTt?9<`QU)v+R9P(6XxtpVz+Ik@1X;vOkgjvFD z08j*@<%s+1*gUbcmka8Y;8v^1#QHU|tkBbjntt0KbuSWAzY&LWW6lakvh(qN zM;4KOrW{jqw5pNeZ+T12qMx5Cl#%A1eGT$_v^gSyRLOMIV2#{Bem6uV`F>Uotf2~w z#0rCjPdCj3Mbig4_;*UIRPBxhkKG?9AEIrjKSetB!bZC?SDbXX=jQj0SMrl>@QY%_ zX$%=cQy(|=5*h40(yh3UJ{8JFFuy*he|dpPA0Z@opq|?K?9|29%{9ivyxZP_U;Ioz zJo@e{T4r{2%{@^Y_x!y#CSW#N#LI9Vl_4qK8v9{qAgq;MRAN=j@cXAEDp6vMcxOiB zB*~GI%)DQa(A`|?m}@%C`Z1ApOf(ynTanAO`-IN>tgw2QO-#hb)?nymPP=cn@oeB| zRA%4BAlYoSMlJCEX7a-gs=22Es~_qO6K;vmmuq*Dd|LPtcY%=bD#CilcbKQ19)Z4a z=_0AYfa53eYbmG7$2_sdRd3rlAA9koP@QSHVv4AxNYnmw6K?z%>0Ilwx)eIloFwRL z?VcKrrW%|ggs2sI06o=2Vs&YL2nKUo*!zq|Z-sUu5H2xMXv^-pRP@#yx~p!YT}K-f zD~Qp2vfmMVU*~G=*wdubcM6SnK}8Lo#s?%~29O+UiT3oTDz|O4zmM`dE{Yg1JKKt; znHRplIg}7{ZVAP=s2gQsnHXun8&XY9Ir2J0P=y#h%ih-(GclzJ>4e0~uluOP^5g~C z%R_+i;619|Vc{|m!Nrm(vGbYl8o|pd?p6l`^A+N_5UV$U1Iu|g#zx;t05Rx7C0??2 zZwgJXwgZ1FKm5TijJ?|ep)4F8i{0*Nz22<#9OJytB(JF01`QbNwUfzH|A~;6<=GXIe9&dhE;FWfk{?^ChzwU}RoJ zg<#f?_#g$cI&k;99=4DjvriFDjXCXlSJ-vuU)v18nx9UC5=4w&mMpArnKIpuP4(mo zKRvWiF2r|vNFZ{U()iRz=`BXWa1U1_kj`pgI9S zb%?*8R0ktJCY2c8;Z@R=eYE3m`T6woiaR8Y_1smOLU*=&FP{^;=2et{j{M?6dX286 za5(3}m2y^kh@;=+hsXIjR0TCTSC2d=ZHK+jcT(EGRz|OipC4zLxsY5x%N6l zcQthejXj3_iZTnS0;R8-e?r`rdsH!XMHgLlN{^bLtJ?de^*yeY;%S>Iu%!yA<@*?x zvDB_w#et=rCs-7;xqQ`|Kj2LDw5v9>(>?;|rAo8`VI>EBJSC1InMJKuBly6~OC=4K z%6UFO=;e#-ql|;vxIEbnrxz5Chz>;&f(vetFLwrqEm>fMJNH<*FNOL%d3lajU(nYC z-_>TFEt}0%S@@D3XW&M)TUn7-NN}_f>z!5^>J`Dbp^^{4S-HsSZbrk^Di@hT%~ZQ3Q@_=0 z{k*&Ho*u4<>~^bm7VbQu8c^_1yqSud!LbA6dc#|=)jH~FJ^aZ|LS#TQ__s*hQcjKW z&hTBQ)W|x&yKF00GvzL<(7k`(lYXUyHJaeFGs4)n)3w{pj^hrY{? zZ@N6H2Z^sB(gB{~ihS7T#P+Ew4gLT(HqPYMZLIs!Os2L|L|LBWT@MA~8YAHgzgOqo zRBJOQXUJx#Uh7{stRfpg3SM_#hh5;P2%;?CGZuN=d@HizZRKIcMu7+~Ptxi9fGfJh zB`?qMow5@Is0o6_C1Uq^Rjxsc>AMYS z3NCfy2_wi<>xR*TmEX=hx(#;TLsUmU&Cs@p-EX*4OtBy|nNRCQbpCwU=15BI#Rq0{ z6H)FKB$H+J<`ckElqS-ftDC-~x4);-=*Uj-ZH*%b7T>Fc^qz;H7OCSaZThn`O14^w z#=hUYC^UOzp=}I$UNW&i<+@EF;R`jAgolB%7*=yK6cf?+9jPE){!jUGX)Bvw?qN@V zjZ4F|0>5gx&Yx)fC0Og-CHWA`1e2_|-~5^EzivB0E8gd6X*x*16mYwN)@k_$DRGTo zvc(Lh?9XG)2(}V+gC$<72ywd7)uokq-=ZAKARDaaAK}M^^w1A=U5l0>cu!jve>G%y z-d@T%FZJ%17y5?=F84lWF5*H9>eTl+0?r;x%N>$G>PZx7@ZJ_J6BU$MLxZht8B}eY zoH!vwbA)*lH)TP5G{|qHE1j!O+f2G6VLs&t+6}pnnxtloq}+!uymH;lrxKCh+1W}} zl#ukzI{)<36U-CGD`T*W17Blrua|y@^*4ZFLwN&X0aPE^926%~4XmEC)5f2EbBbuk z^M~Ybf;Y=2~N8kQUx4+sU#g$6`aUV_CLuSuGuPhR+hE``49nRh^ku^sLY9V2TZ@J01 zC+1H4#<7H5D-y2Kq}>O;vx{2ehld@^vOV1^u$KcYSAGjlO)cvA5cPO-tFm%r{8iq| z*6mtW#0q1m$rW9KCsiNFC#ZdtR1l_JqtuA$rq2u)Z!Q0&?E#8koBpwo{Ab$(^#Apa z*8h(20We{RAFrgv;1VE-<0Y~f{6BdcOa8;CB#qG>k{H83w8asL(EW2!`}IPQ5dxE$a;W{zLQ zmJ$-jJoYpC{qbg-#P1v^c}(qJ!-3NH@%7hql@|Xy==$FW_W$`)cM_8Sl5W3(@1*g< z;3xF?TV&v0^PN0MLh^Tc2#h@m$zRKklE;kp@7PiD#B?bkd154$kUW-~zlJSk@E!XT zvP=IRZ29lW4lwS?+bF+G3jF@^P_sP4EKqY>kr=(8I%MvHH_FvQuKi2?c z{ub{4lc@bO%l|_ekOWB_H(Lz;KYu7w;$*|&-?910e#9@L=g;SRnZIQ_=ijq6KvC!) zlI0&{{!er+iDNbLr<*^&LP*Qths0k?3mNF&AuayQn}12b|BO%nrPlgO2>A0^PUdeB zw}5K%%h~RDI{LSx`*-Piva|S$Mmb(2{e&Im{tkBh_oMvRjO>$r*ndaj-?wQcPWEYk z4T)v(8p>ajSoUw3nEpM9e?3Q^>~Q~#+`mE&$o_nOl9l{BIQPF+1OJi4JUImLGfMrj zo;qIp82loJ{P{Xc_HUVj{z-yLfh3L>E(X6$H$6E|@iU743f`0Zxymp5x6DERgGu~9 z(uYnCqx`Ru^5^=H?B8Nm`nyPZa-ipDr2J!?A1@{ifa6fV+fQVEU%1K~>$w2@5w(E()skJPN+4_Qgb{Ju#2 z{j`Jk<#s+?#YP}&G9nKkut}9mG}o|PRp2MbU5m6Vs?CH z-!Z+bKIIKbFU(lha-0*TdGe*Nmfzf+&nSui<~cD0cYe-`76#R3g-O1UpP-0(?u$*D_;z$^U~-q9K-r2zZ@&eOcdMd=x-Xz?2)^vRS!P5JT=@C zqGhrcTKJqI%ww{pfRezawv)o(P@m=6YSWIged{R>i>Ra2TCvC5Xx=X-Z|_G@wCbGa zOB-u6b4v6Xv$-|fugapQ8kXJl);nf~W{FdLeuA0*^={(abdn_Hvj|HJv(4$)^k?@y zH6FDbxm_y2P8RsiUNG&2-i_#?I!!+xx!KB_CPiezGv3Q+Mp$$w0`AZ_k#RXXn_Uup zM0|R>Z1fwvt$FBHO$Col8Lugk9weys96K?OWQH2z)o>NV_x2$t;VEO2H^DqCd15Bq zj<>KpL9b!N6)AJU?&$PRI2p@c#Nt&=weG~yH+wLJ&${F4N<>mBexoj<*B)iHD(X@2 zDAwOQH*3~=Cc!~f(aLRpDkiP_qfY7S{6U7o#_HWOxNX9ZpU%Ch zCz2Seb zVIzAor~Sml{c9-r^EIse-=h5f*BbVZnfrf0pp#SO|GO;qXFbTs*VRr8?&9nzW_ZWi z6Cc1s#KmA%9(KoI*d;YBb#K4*dOx+ncJ&tm|C8lW${Kyo_(^mum zZ0UN~*g4x;IeX&qJbnvTF|}(zsp8^dK%}9sho_yB zrn9{Z0Q!AH4af%HE_alxr;9rPK4D(~N9tq~_Me-ANBX0x`tG)N?f{7d{veSc2vGZP zp#X))S3uR)#o7)47~XMpb+mKB|4^6sKWFu4LHdtA`md@ScbT4*lbzUK_78Bx{}ymT zL{d!C6X-V^Rp(odb|7&vReTS5f@Fc6-ILz(1c^ujflF4d2s?bo9!IHq-MWUd^+bZC zCB?;bt$a=b5^_KYPseK~DWw3Snf#80&%+R)oiTuNoCXGS@wpBXkp}j)@dW_n0w@O* zYXLfr2DCyuKsrmEXt@8>@Z*yNf6(yf+9R+5FNeqbllo}-IW`SW>;GcrhZPq%F6oe3 zNd1b(E2z^41nO%wO@UI)nRzp<=ah0^zLl*C58ZMcBC)x@^E&YC-2Qf&mAyClr~KVL zxAM1rOCOs?m2L?Ch-u6UyZLI^|ID2JsNDA&lahG#SDzqFjyu@E2Q7fV{&%NrV{^4lj&}VC+=kPu9sM}}jjQNoaC$*}owVPJ9%BSf( z#T!1RF$WQA_UrCR&9fr~W8Imgw_v=ju;JvaruF1A{Q2hV^KY`5R;M>zWslVEzAWpG&(qiR-LB%#4YZ6ptUD`F{Dv}r`ngZb z?QE#Mm_Tcm>&?hde#zX7Z>uBU7#-3KWUkVY`&&SSW?DOEc2Yi<;XK}?exv8u^qaF` zBUgJJ5tQ zv`3B&5>5KIRU7G(n~BvV*w<2AnU+~2U0E&jpWu)mJCkyyTw|nPP)~kJ=u)@Ll(&dH z&znCv+w7K1KxY~9!Kqd-(%Hg%`1I>bp@m*u%(t}TJs0mT35kWtD+9l*`AxV!=HbnH z0VNjHStYT-m5FCQ6PHO~Pub}b_{uM`o{23}7#I7Lw{fJ*t0%0}ukxYD2ZSEf)v+9Y z;+pq7L686Rg;>3;__q$p(QnUqRj5pYY;66Y||$tSzV9*LGuNjk`FcfoV@BwCDTiF1hbrp!Gf$>;NKG3b>bKA#Se+0TJ z5S!FCQhnN;TyPOYvMKDoVf?oH{VCekseyRYcuSTZK2HjDb(w7MM{laDB#hFBB-*tM zd~3TmxF!~~#p?8;+Csu_+Jg<+pNtV`rS_YLb-ncu-hEZG?Yl0xP-xh5zI=k)n-@BNo& zJ$vmv=9+V_to^=YjCp-@x8K-P+9WzDeRW-Ub9`5Lv-dh?%KMHsh~VlaMiK$i6Ha0p zZU^b;bAN?K#>eOB?C8V#mdusOq|3?XdSKeT?An~z1s3F#M{MMCy1Lrix>1$P^mD77 ziOg&_HNJNjpZnpCt9KWhcXywAP~N9+H+2O3^3uGZ{<2k*RIJ%fqa#0 zJN}wH(6A7ynZwm^h^Ch}!iY8W&+Z2j@zv`)Rnq40!@+~WFDPOrZUBOd(^AI>wAiB5 z$2=F4_pMa6d8;E*r}%fxwqm151eoIV7E4hePJ z2GexDImc*x^zOAS#PE54yJ^`;_qtwaa80*>!=8?&!>Inc?=@g}^mrNn>Aj5ICBl8- z6lLv7TL-0liBx3gMrd&@P}(j>!iUpHu6iT*GcSNB97Ap#z{d{@+=?CJ(l}Y{~>67==>hS;5g4Qpk5`04s84hiSv`0lKohY3Et%x{r)^bY;QO zEeg`>mEdlY5@i;vl{`bap#st#=%V(jKe#4M;hGmT1E@CyCDfggpUZ5qOc zm#u8s0Qmq5icDA-b$PMO~c`IYd@gE6X!KkqvS4{yf*?$2OrRftwpe$ET8np^nNW zxQie^(%~4@FeoY+S5oYLzd`IF{RMSN`;Cny|G`Cdn+uEc#+5`jSI_W1lGVH^ELLt6 zpfvg_k7@@7;Pa!NkxhAGhR9xAa`De;PRZsrwvO|Qg2pAIm z+97yp{i&ep6WoE{bw7hU9$<|C27nvxf_79vXu>;~Cz-dWvw&EA0wzw2c;@HpF@+eo zQ}5x|4|4(1bAbPz2K6N<%MWl!D|_>+PI38NZ19A(ynQ!=6E8*?5q#M|VSNC3=8Ymb zP7JgfGJWCwnu)@$!5}MbO7@-1cjG7QPhQv?OK9Hk@kp-9d4%>({#AL2d$KJJOqQ0W zc|Y&SLlA0l-S&3Ph95a_-^>m4G}ggh5R76#@g3)O90(LphI(;7IxgSHeV()zw*mDc z+w^w$FRQ^C4dcGd`Hhe5-emw92S#2}%%n~VQ21K_7H-#pS41eYd(Nsl3)-7IK}cJ; z%W1rTPG`vxeT1?5gw2T`>=`T~V29sjd$NHiFepNFbphes*%%QtzZ4!wdJ%iDv`Pz8 zb4WZt!ViZ7-zz-yl>FU0Mo#gv zx`_PchSjj8q}L&;Sxqu`)4Q&WeiuD0K=9kvj&fLj&tVA^OpXZjCvkDRxviDW+VX4` zko86NnnV!p0M(GoNzU0o{Et_02+Jo*JpmvsRL0Vn>Q&Xm(f| zb5u}bDM&HCHsRC9?|A8k4qb z2b$1(+gmp`K0OIUPX%=qEI~Ow;_X2Fk2+s2#jg;Blz`#FRmtp#B2*vT@k;1GgDHWp z(lv3F9zS^*otWb*L&3BwLoIJ!lJHZ{!{jjef6E`u^l`|Em9GK|#irJSvrwXnBmPFd z2D&TN6Zvx!X{sIa=ttgK#1^8rEyJThSD$>s8Fcxoic>L_;%PK?b~_^G?dYr3p@k+HK}K0 zh=U6k)`@d3S=QVVQy~qIsKa1zGe`-x?{_1yg@OnOyMRv-gui~4GmMRQTmUqQxECoq zujqmnHnjxl{0gLOKG@W-H)t{S>5G0EtHT}5siwhviB@V_W!{fS*Us72o0F}1)14e(=y=mDu)jx_|?5YdYNZwBSRXz{}>oTt|n)mG+o&d>|wFRh4ONyYzIE$c8 zGx;kvkgcQJJVF#}e{Rs3_6{_x2Pt=XRTeG)pV#4KKz@Y-H!Lsc#`-wTf7qEnc$mM_ z+4Uth`-U8`VIIZ!qzNMd_oknbkki!BO=oc(xOA1y`SqKC2C;-N5&mT@tqnd4Ri5cu z9Kbi1jF{TFBxvKgPC|rrUIigx{A0>arAEBrLk!&11suTGiC%+OgOpGJOM zmHKs5k$fM4KRzw5+20y=wWuDn3IYFQN_l88`W%rmq=1M`P2=AXu{Nr_;$uj>HnWSF zlfCqyGVy~rk9pvPMH?Y$^ygOONhNiJkZZ_B%u;tVI*5GJ%t2kE!am3=?Lpp8Rn~xJ z&$46MDv3}!7x(7OOj;TkHmpi;Dvett3i_qttFBHp+qk#iyqi|S47zJ?u_Ix9=8R7& z5CDl)N5P8kG_yuUpA=8YHC=!W*gw|ChIYgdqo??~kWfXuH*pQq#j4gL)Lhi#4e_xE zbDg`2k#l1Kw_~4^?(_ij1bm1mw5+DeGmTd`htT_DKC$!ShS*&? zLV)pd@D<+Hp{qs|%2wU!UD>&LcGGypts}lWpkuXu$SnjPx52VIy{Y<;#akWFfy0d* z6ylTvdVSFM%qlqZu9BY3DjA*IrFi07j1>|uVE=}_E_}moz<3mRo{IXt=9wC^T?Csc z#j~U6@B{Mpp0ttD_-#wJIPHhtD``{rvf)O{`fIb)!XhsKzK}9+oxVtV(MQ9EIgum! zNm38YOoNJoiAu%jczSblL47nSeB71OyjgB-40fY@LwBIFpCWu*)*-SU`2yyqY`69f zQDeCS%Kaj`Va7H$073P|%80}PZULMm9H2Nu|kSC1z!$o-4^<;D9B z)@LS=rRt&|E%e$(ewxa*YoDh?On4US{Yh=VJ83>FEyv4h0v?+6@9BY9b~;WAkcFq=&fO>lY|KVG5cOm>A9^e0*A^SV1 z`A;xS(cRj>)=Ea{e+JP0QStI;fc9I$`(KI4@4WLTKx6pLm;M=`{d(x1KQMj=Xun7D z{}Gz~qu{s*t*YN+W3;*As*{>h;&yoH<7k`BE2Q>SA^#3&| z`$+~_{zS?cSpP)ISUH&JekWzDKVjG(r0i#*$e&3W^WTy(*57E_Z={U=Cno!)VaqQi zCO_Z!UohEk>G*%WYJWzJzYq0~W#`~*{Oi$Q5uqsiA2?UQ!Ce0@3sBYEM!?3={CA@J zZ?pFs@)R|9aC8zf(|7oVDoX4B@%OKE@F(qM`mG+}uTlPwDds=J`mg7MOAM|13}YeL5Iff2Oeh30(f`bVwWP|AMmdnV9~;FqxTuefd8a=FhW#nH+k2#-ErN zpN)}S8~-n3{Pi38&qeoN081t|hF{M6)9-gR&7Zy-`4`{aC1w$3{uxaYC<5rn83*-i zInQbCA+X^zD}ts21!s!ycSrGI7bH(`MhVpJ0SWOLLSuX3 z>!3P9LQxp7k5|#Mt<5zjc68tEAV*YEBThV6J6Cab3V!~ixC(gcv0*2e7hXAqS~GrT z^=1sTv)dcH%PiSIJfr79yGsP&cNXkheZi3gT^YM{O>Yw{;`$n5bP}gL6HQ=6oXgbZ z&~=(E3e#|QV~8VdT_q!Fqi@A@;gBv0Yi#r6(6tb5!nXDW&usi%;fbZZfxU!=OA_9? zuIE3x$qQM@U-eKgr(#v;>Pw0T%siQ5Q^j>^uwUjEY^jC2^HiZlz8&k)J-OXw$6Xl_ zQ3=15Kj`wt*}WE5pazv$+&&N=;w{f2dv4YsB{ndJmBq7{JWv8?vCMc^!&DV1VFm}L zjzE4z3z?!j=0)#!Lb3yZ$Y1aW*s0Xo;+3t0WaQLTxoof|D_f*yAdO^w0$OzeDFHo$rw(5GqkSv5^ z$_$GQYH6#rI#Cudp0#3du#Bw%3FbeT06QSFVSpr>wK{gmon8=-yn_q@3)pV}rVsFh z10IB;(_~u!44tFitGuU>Ep4$|`38)~F&3tHq2&2l+rhB4%zoEabCIMZa}q_=-o&{9 z+--lXS}GWEw{bkOk>79vbzi*t)m&<#OJS=%kVgFg=2Nii=OzA@wq?JDsEM_y?U5P0 zfX_$A?sdnER{#lK36zok1Q{gFGubwPVv`Mr{|F(oX18x`h z^n@A#2EztEoBD;e%LQ%wJ%eT#uuLxa8lwX>t7+j=+>b{Rmwui_6eQdlLF@*qaF@+K zx9m9hUF1vO^n*U?81J`z>F)~ifVh@x(aJyKexTGtRib@dAh?cc&2QnzQ+AFnVB%=q#W_8KQ}#u%s?Vm0BCR(Od<%*_hdQtE)FjN+E3dEUvc65(7! z)Lq_ch|A^{otzEh*%@Nw`Jn-zahi1-)%xip`Ewx|f?aq<>yBrZEKkl08Eg_*CRmJS z0Q1L6n0djpIH!uN;R~t->j+==EsY8bFQ0=)xMhjc$0za!5_Q*X$%DnGyex=;NU~{{ znl*A)sd9^=`FD=Zp4iwHPq1}0G|*m%=({kA_!#lgw^*_BjEB;zzH>}8I7Z7=%Nt68m(60rOK3fm1CSrg(du712PQG?dwOoup0)7bK^zHt)BgTJ?bm;z z|NVWMnT4L?ulMP3Eh)zpQN+%+kq^L79smlcp0Ule>(-GPBr;8V5=(PeID1%l@C0(j zuRwkYcNa}~O!ySAMxviG3n&@aXJ?t#-tO3VxP8~0=DF!O5B5fH7PM2)MjiHFU3^+P zpWa@t-;20ESag+~*OgD6Ukx1Rw+it_y;NAg>2Pdxc<;Pky{d15J?f^D_CREkM|zQD zF(dnsW)*q8pZadF-`$vQX!H8Iya(C^T?S6IWb*lj$brS!F+Tc1XAwuf;XBiQ+iGz| zi?1{LNn8Uage&AWczo|OJdfVawcbyj>MphtKYZS;pb-f9R?+-5ew?vj(K)S5Tulf* zUidky>{>OCRv9|+He!BX>wBzqTz?I zfrfenzz&AzKsP>EZmc!9qPAqETnTK2`^BorC7BWTPBo@U^1*)JcEWDzuy;ljL2fCJN_G1>j;GUr^Qc61Vi_Q6#7Wg zF^pq^&+1l4)Dw*Ib4X6lowo+AD(AO_%P!#td|U#$))3vF z1?_?!r<8DTH+JyA{D!eBLN15Z_kXObZ_{2*l!`hnf>9LW3Fn*7vue-RyC4_q(>>?Z z<=YW+)k>m3WmanBDg?|N#`f4!Q={>jNms1Gq3Jjgvh&7Cf?p=ep&VOTsUylyD+ass z)zUL|qrQ`-e+J}8Dh3A*^$$pi*wC_XEnh*S8q4N&U(ekrTgZmD(QF7yBmk6R+}p=$ zSLxCktgkOD4@=z&Z?9UwS)Y$>G+wBbjMbG%_H3fIY(;5SJsCGxnuch1?ErmQnhR?k zXYo2?@?t3>diDL`F$_N4WpPJfOya8|mKqzVhqor9?3(6UwECDI`tev2ee!xUw3Eh< zE}l(!iV(ws*SVtzdLWyRE1S9?A*?v!>K7Hr}HdaEPQFL>EPsj%^boLf-KiMwCqcmvxj~yzi zByb%t;q)#<1;|UHCN}0cLwc`RdD73w%SDSPd1|wQpbT;>Q7ZwCv=od@Lg?XxkPhX> z;k}+?NtqF^2ohoK^EPq-2qp|gl;)7WiR9DjW8HgjUjU>!q}S4lZ%4-WF*gm=UENjn zNhN=_t>fedEj5asrN03%fP-Fx;*sRw+y)YXjT(yMJ<-p2kZ;Z%L=rD3H-Ol&8gNrT z7Bi=z`ley$NXXoqt?OAMDjvbRIt{b+C5NDcTvFp!2&OR`8P0UD>+*I7T#Y=i3!((T zd>|;9@xx?hFL%&O8~n)DCEVB2E??+RNI6rF7iptj1iV5(9eR2S)771f`Z(reL?^jf!*2MOW-!g z47AZ-OyT&VDo?8O8CSpt1W$a8ggdS&eK*k21JECZ(bL@E%fwRPI2HAe=AtB@#y8M@ za^A70^w(Ht!hzD95}tl&5#0L0+Ox1=;U%a!p-cLvI!QiI8NEaufggz?LcPaC zDVQy`pFgk+nbp6ZV2{DymH@~tkHe^aL_-uaU*ddkKniITq7cB!TNsj-3(3o4m{ett zb)qV2+*TasMeB`b2WNY;6ZR>~glBkLh@^_efOV58g=O|qb(RWUom6ne;f<)-fg`Tp z`hb)bP`3hVm?jO{G_Fd!w!*s9ccX7aN+p`FNn9z5IfJ%lalH7^+&%wUe%XXdxL3DOxPP7vygfslD75D@fjEb9q$WuW{MWM*pt?eyjZ_5Jfglz3_ptMGih z2DaQKa?@0}9i9GAlEtdX39K?7bV*6sUW`dW*C!Nlf_Pr(eD%uBY32DrQZFQESmY0+ zwx+TEnNBq1KBjwjWmSKfuFdt6@)<8|Iq{$U#`vvyW5`H|9&ySE5Y9)|>1Hbg+JbHF zLZHB>a&6LD0%7bnxdD}J{o*tu)W6U6@%=cgc zVbzWSap3*Zz znWCDHcC=PhRMC6LebUV`{CB9L<}cX|#G*s*oyM>?;tG(--}uP}SPK|X>2L|?dH^oZ z38FsaQB9&xo|kv`xIxk;@lC_xVh*9JKRNB05VSB}#K`SS4)Gc=5Z^PP#2ZpKb2Bz6 zCp;eIn$~h4qVS6LeKB^UWz>>$)*8J` zB^Yz)>jMQjn7DLa6dOgwq@M6_DY#R;497*GiJ0&w$qF{fQ|zYK=w<%yyn?$NR$CW( zND1J)m`Tqx|8NwbGT=*Cf*n*#pX>RMuhTjz3WjNvFvA`(yFj-d`|_Klv2Zt(Vz-L$ zNwH6aFeWGU8Bgs!o+zaHQ!OYDPV<&9GXdz;WV2=7qG0(f9*1&F(o0~>^zWRRBj6U$ z^{!FzvdZ$6DOM;(Ps6=)n4{Z*X?EI~zCm$@)E$c{HimrI@D2&i(mJg;W*2#+s3a=0W8gJ@d%bt*F>(j#XBp%`d?O*8OmR8+ ze)*x4pH?rA{fGml0Q0d7spCa4;SB@0iD2KDIUMda&Maz!`K@2+*X9ie=wcb(8Bi~9 znS3(h6fwVd@MOsgfX1rZ_~fIx6HO;xuHp2J))q&&oEzx1n`WcZ?eS2wOadjKZIVTt zkv8`R8@uVjT?ch%FLc+pFv$}d=oFPg3Ym|HpB>0QwiNEyKGKdp#1*VYu)%OLJcn|j zF1n=_G$J8W6C*O*`GIrANCKpf@uyy8B|#Ibn8SwA3nYOH@+kG7lZ+noH5!v;E<5c;q?2;Wz2Z8?iwgQ)S+})cb*^`hG2P#g ztA`#z?TQEAW|Zs5{u2`JNX`QO-P)l>B+zSoE|FMiP7K2NN$__DGy)L+=No5n-FtY2 zJ1kCDqZtV%h9^Si^VHA8*^^Ehu_S;s!(&&VT!`Fxa$lQDAUlzd36ZG1TZ*X=cjo8Jk#a-%kdDt!oKDfkyzkfUrh{aSmBN_ccr>T+Rqnw;P- z)4P$~4Vj4tA|+--8Q2kuA2BF{Gn_$}SBm6H4!s(Vq24dX2-~}6&{j2zWy?&TYt2DR zVS+dA$1p^X)QXG6`IBxq7*9o1*9ggK2q&y-_LWzlYr|w0whdt-g}!hVe{U5WOq*sM zsFb*vzDIr>#?Pl1GQd$g_2vb|jjG{&A2JJLKKErY648p^P`{QDB zu4UMM+b#iWQcY(E+N~iE#u~2!f@pSK5=}zHR6PJ}N7J)H;j8+nmgk@xXyG%M?y}HoLD!A;Dl-*=*jC^MFE4ZCs9GP|s)8^QT4Q5cp zP}^G69SbpRPFjj{QnY&C^Xgt-$MGyNNf0LK(;ftdK|0)Wcob?2gB=6P(Mi*dK+ma8 zG(U_KAd&fs#XmT$=lOBUHha{eH!R!F;+Qh5_B}(NERAT@gBgGAlNNufUh=X1aud*S zxNiuXlou5eKmRTOl#ccEu8%suRPdaVM8)Sk9p5pRdp5_bIn=D{>j)iQ(t=)m;8FQ6 z?OZUL$EtG=#^Q_#X0C zKZND3hsX;?nvfQHJ7ycMI;xAB%ky{`0e0^wl@ZM~XxJowOr7~e9=URj^tlA)Cp7Kd zza%e>m9Y%1+?wHmuq4_LKv6YYsKILO!MP{rT%7R>l|e79Fh;;_PSpCOIn1I};4J?{ zF|fiflK+A9{4T_P7FYhaZiM3xH}W%;TIx@!?!V|1?X2wpK=e%+WuS?fn_>NH zFuyyipE{N4w@zz+)~UZ9`X@*HU8nw>lz$8A|D#!D`mN8|zq&c5UkjS)ele@Rx!1pp zioA0@waR9e_xHj#QKNSV_;)v__New`&-A#@|%bK zy&8ez_m#=?H!JfucmCH)_-DKSpXDA4)4x_D^z&HSu81dW0Ppf$_O1zP^fAA5FBp*W zXLG3&cV$<0r1g#&@Jl82K@pjYbH+R@=qfw2kw~pY{4jU{>cgiu zTu%U&Zj({`hB&HL?;7O%<-{4ATEoq``YY3y!`bh=zV|0)jPIuOPb)X37n{i+cdtwE zuF4I?Pup6}LJLB?C96VOK%vnqf=GNe1AR^Vtkj$BruC)-Fz=X+i-RJ@@+E91CLTgj!S%qMS-oM zJJ^_TNv|PNcB(H!3Pln^Um+wI$l06O+#Zf(;I(vYBTyXP}`z;WnM&|qZ zss?-O?%4-;s`IM`eZTTZe_M$TA+?s;C76hqJ@1}CPcptq8Z#?;Z(OY_1dD7_HsAu zAZTq$?oy{p`{D%SvQotg;Zo3ZqHbAGbL)}i5hITU9pZmOXs}YBu~AeY6~j8k@nW=m1z%?5YmE2+Jz`o1&l&Oh3sfs%%|- zmZWiPRCCT&sLdc@r)qLlW5u~kadvLs@EdxADuGjk@uETcNe}2zJBkY;R`ppM6a;Hs z5ee?V{*XDPLD9Mo=@)Mn6NR^Gf3b86jhV4c5D^n@3)`!zBShIa?I;pFnJpZMN>VTV zCzy?S>n#+V&i!DINo<)pU}0wNSC~eiNk5w0CxP#4EN`bo;7Wr!Zkq`hsm(ni(#C2p zevlz#jsjVzD;TAt2CODm>+RF((}`uG%txV(XXa7|H}Bb@Tpz*d`np(rK+}oX3P{E< zQU)X;=I(@;$7QHN&u$@~>ysmN!xOQ=Od9q&Owl~qXmXX!ZU>^P`vZ7*%Gnfx{iVsW}P6`{u z5mJTp_FTcCwX$W3?-Cq^HO-^=Xci$|PAc&S(B>)mKwLE47W6BEQHraqBLJAFQVZJ# z)P_Ja!M$~;{vHHH1E)a=%-HAR2H2?;7If<8a@GwyG!5(4S_3Ixr7);Ay&tY1YnX)= z4dzahNIxovT`8mE`2CtwLO~wn;mV^S046LG5Ce?0z)NG5n*pcSEI3D zfEDFPT)RQT%Cup@H6)uDa2eQfdJihB7U;)dlSJU+_Lfx?qHNT=C$+>@(UMT*=ICXN zb^JjI3*UU^uy|Z`&9{ZU=f-SnvY=aNnxicx2@jFX_wBWWBIm-n;#|`SyP(vSIlhkX zK}$N92V}e8D7Z&FqL^DE=`lV^?7h=3aCVPSye}_gO1wI6jP25sd2xlb?LvjyM6`({ zkoJzE8c1b2=0$52{WQamOyjy(=I)t!s)sKHGAzba>@&h5vL1jIyRl&wydJS;iDLI? z)d{{}$36j?+;Pg{YK^j)JZgCMK|ex)*Kwe~uwx&!GZhL0D3^kbtxEkIxq9(e)-ICl2f=>M{P%= zV1}AZ68Al~He(XQz{YuhgdVYqKqq;YMcP=K=n|-dfW90J0w*EkN!QT3Lu2PFZ$iAI zFO;6y|WtWN=PFhXBjVlbCL%~zLOPaCf$c_b6@H} zsEi}Krivmd1FOLDB|YqIm4@E61>hO5o)IxO_yT`mG(0OJE+DxVFujSw<>%RL+#&$9 z$OuubA#}7+kz;+0sBV3+v$s%PfW!^Hj-CdNcE&D6(V`R__STdFfVVQM5%&vGixDQC ze3hGkV*LqO?Mzk@~s*!JdkZ%EdpGZpx+J?e(@H`^Yskmr)(P72K z$l9}q4aFhQY9XoSACPggFqA^r&K!XY+G$0Gug=LJ@2W zP&-QFEDN26l1tX5Z1mIM0yK?Tl*NV4$7H~nk0*L-1R;zj;s>;hZrWlN3)EHXbP{H+ zZ)@#)h>RGh9cvho zW?E#{KTf2$>VJ^Y~U5+gfE#$LMz0FP7-wV4OY=ZQNZS_9aVq?NU!PbhHd)8fq3~hU z0S`)>P%U%6v>0bVqhRSZUE)~lWn3t<^jdg17y(d%S~e#d51qIWDi|TbV9!HvnC%I+ zVRtMlVduEx&k%!$VB6^@>^!JM;`DDL2j0NC zxk}-!D}Cuth2HafDtrv-Jha?NJaNnmz`LX~{!&x7vwp9nO&Q~~DRN|BG)E;B>~I5= zA3GWNrAlFl6eAA2ZNcLI#xS5uM-L; zYKt@UF$zI!?t10atXpS~K!g-s>h@t`tQ&uLA!P=}g-p*5{tDx@%xzh+)t z*aF*CFYQy9c=ONux)H|;_<}_0u@T5;lwvTfk`HP;*v1Ew~J}NXG#o4N_eaf zR!&*e#_kcWoP-COdru7XJQtigx|f(QeoEz?Hz?ymTn`%yemC@eR&K5z>ZF)TEvxUE zUKrLCZN<%Pssx#M(Tnn^1uiS+fTiZ)^XH1?m~)DtTP@kpj<)Syifn3$kJtvg;xVh$ zOU`$JDwHfyAA;SIE-&Eg;R=-TEwr*l6t9dxN@3k9KLv!za^50AmO*1Y$TQ0%q2!{G z{zIW+JwT>P$z&m+1=o|8%>(Pt@37dXo?i`8D3|eJF8awD?;grtn<1Z&aX zqC(x@MbMC8S}IL~N*e6iG?tGC--}4 zzRfx*HRCcR(>DR+(ZR5M)}xj%v4L7VVyTB5(=UxYGxt<)9hp9^ydoVIwdP=l5d7I2MU8{jX9x9Ig&zg{I*di2Ea{}F{p@cKr}6wR)YNDx$;LjB-W_A2?zu-h z!Bzi+(r(lWXhJ&)dH&DhM!Yal(3o4Xq9$e|e!1y<9%ptHEGp#(lxC%*z@Cx)WiEv{ zi3>pJj)9C~5MJ`IHYduya`wQjFD*}xVENk;F)D{dV)K>BtNc-DNwwbzw8~3sAMCIp zU?C@L%4DMr?RBzmyWxc?=`G%e2r_#jL%>gQ><=Qt@^_Bx&%JnsE4IS8HexbkAr<#9 z9lJbdUob}c)9Y`QB(}c0mB#2(3?`w|1vd2(IgSBd?5I(F-+fOB54_%B z&yvtBa*ncRb2|Ww7(*k8bJ$L6)Mpe#j zTBG3qC}6)8ZmI4zVbDNyU{ABMrA?&`zZTL|6n9Fequ`;yC)9X>HdBXvxo)WSj@7C) zabj&aNrad>=DsXmIXa=*S>4FfGS(|}v9wZ~g{h-Lp$gr)q+T$gq-JcVAraH?-6cwv zAlX!oJ~Y}etsLWwfXe(Xnwl$2+r#TjFA&$O8`CZEFx;%(eGl~ssXjP`tsvS@yr zxJ}lKKll{)xQ<>$S&krBiXW$(UzIF1kif>+L67Q_;sT zm!nV83EF7Sn^yViH%!mPXhrIXd2ee7*B+)wBsbVBGZA5vC3b?7f33Lls6d%5ISz0~ z%fDavJwEU)(h1@1N!Pb#f2g<7j#f4&r#rzsX6YJs2)A~R>3Mt1d}Yc4-VK&4FGUHL zm98zlg3s_a`)1uy?Xc=Ir^)2?Tc=uCe}4GwgEfx?-kDNah);=yK+F+5JEec-T@H9I z?^lh?qqeIv${lM>M{C|V{cE&OiWFq~Gr46;Y;Yw04To|EFh0s5wSo}M?`1(2LJ?oT zTg$f>zEOEWECuC4^{X(b(TbDFI7@M)`9E45(HGHGR=n012PMZB)3#^2%=Lc+67(B} zKgqx<3CVOk)VpBH2&OOR$)$dl?1su3CN!F4=c!kT!a$woswVk9pB*f?O!_h^v+3&lyT>TDs{B-y}NPW?J}o#1&3phJq7p$O+Z9fH_u4x))j%E*l6YK z0YE!R8wUj4gSwKNX`K00@`ZI2%GksX!CDsyg5h(zwVsyZ$SA!)vx^27=I@1GXH}A|F@!s=@-}Xvo-GD zikhG0Eq{2LUn`gXN`!wo_um5l4z)b!9RGho#2MIFe>v}ua+h)KHQN>TMqj$A4*@!~YP1Hz1Vj=V zPQaP^wX{eaJ==^(@6CarJ}w%-o|lZ-US+{g?Xft@PgBDlGUCkJB> z=uOd_H7g^HvD&>oU8WoR9TckqbSJ9L&p+H7Uo`C%&mtOISF*f)nr*J8V~uMl zPi}5D*Iq_97Z$$##Nr>d)F=YT#O{cc7)CYVju>-$C#t?5iq)QP$7}N^s-}1%_`>M@ z-Sf|PRMa>ighRPN7+~gAz2s0;Ho2?1yky-nz{+53PGt2hZ=)xw-^Z%eON#sB+xGs`Drrlk3-$LEtmB=!%TBV_k>`Y=Cw-HU#uM@g$aAq+Q=bDZRPfV zKA)yo(tUA1v^rN@N*dbrpxr&C`iXy#zHUJs$a@}E%l6JKt#7oRuaBb*S7aS{)nrD7 zeQWfM%L_*hQO`(&c76?*wO_t3+6$f#dJ3pWt>+-e@_Kw?1fSsDK;ue!=F@$@EoasHVoztAx=5DYn+EFiM-WJSxH42`Mx&nFr4&odr+dEP+1eoV{MbSH3;#9^V@-2NrwQ8}B#cPQyB zT#%mH-5I)3H+4_NVG0J0{|$RX4su1Z82373p@KzkhJL`ak>Jpj6= zW<`RWag1L$gv}j?l?&Da(nnevxd`=@kYFSN^voq33h|K8{YtGts?9|J5lf;@3lmU9 zs0r~A-g*Ib9J4BSU#v$HSugT zMfStFY)w{O2}zT=B6D{YQWJHfxQ!g#=@5G^0amf=R&Ga>@Q$13VNntrTS=^{Z9s@< zN{FvS`hJn2LU>secLt=Du93`vNEKc+xoiTd+Craz12LbssH^I=lVv2Gyns5}EYt`4 ztbRg^hg-m<+-nb{hH)a3)CH!lsLXM9?14bESc=jj2TB zaX=_g^(tW+DC&DaO7r*q9u5BQ?l$m!#I zsuK*Q7R)B!Ty$wQwPyArrcoZlNQSUFA9k}WO9xI{1C)?uB$ykJ1kkm5Hb;3iqMZU| zTJz}S#S5v1WD_Ce_cEBqtW==SUvl&ES=$Wlhlu|<34S>TF*7Qxf%ItFEeA>;L_ zwTi>Om}@l(W;k1R)A6LT6`W$o8zBL>zeV>4G{zBon~@^Ut;5JRP@7L#Txasj4Wc67 zeI-sHCm?ztc8R5cI8&DpCRBQ=fe6i)xBAXPUzZ`nR){z3PI`}O=%YFe3JonJaDozA zsOCe^Rz!Hn?#4eFqh}K0G`zB#E7TX64pGHb+&I{|plk`RYS9Kkx$aQFK;!G}r>r>7 z+f|KTkY>kl9E2eK_UtB+9-QVuiu&d0?n>1BHUO|j`P}Scc76@59sreaPdhn})@GW! zFHQAFeQx~mQtP8d6OKhKo!LroBe4Sfi7T!Vv7JOac8U=wspYoCw>@t%y-!@U?L#SM z9^Pr|265)8`*aJ=g+}Db%{wzXs1wr$(CZQHi(WXHCX$+h7=B>VCiH_q-kl6q^Q7;<+uuZk~8Pmh0hbC}uPuBduy?8by^py)B92()_ws zoI!C@|48()FSTT1mBp(Ci?zJbhbb9>m6w{5|ACjlQ%WVKVo3;F1vT=}-|}be%q;7q zf&Q6p*$t%|M<__ZC8RP+;~MWITd#GCGFt^2CvKiUSiX8RfLcm(lJSBwU|2b&&Sk|B z6^S{y4Fs|3AkwuXM_Zf{yA{Ist|0F~l z{}9&_J&8omiG<_#<4j%O6hD*n2zen4b>&D}#hVQdx_JD01G;EO{^SjI7$0sA+fyBV z)akeM4p+{hyT#N{@wSeanhi!@LC&@$Wh1Ho%Ixp>b z+U%a;xFB5!-7bZSm;P{qwp%Yltb+N`)_FEUNR2B*n<^$~S3~KUq?g%avXy z;ZYsuIzQ0qyh(U)<9`JG;wMNpI?1_hSR}nUZMg3$&Jn-OUL;%b@tW9p=_=*@TO^xl z*45qnXHURzD-UIM9B^+RUA9D!ScQ>3W${k`EfTUyriGzvLB&YS_fE)VIaQ2hO z;mBXeU|G+1W`rCuNxJWJPQyRJJLIzti8mLI`uJK{D$}DSy z*lO+HL2`Qp***Sg0(>ega5OoHk&HBVOM5E8mS?sE>D%2$8&T@PA&L9P+wce^t5XWp zZMU@p1`MyPxCT?c8`-m-`IKr zG0!ac#4#Cs?agMsB)KC>=5gY_wMv^)j5u%vRd1He3>;sM?!o(KeuIz1l|7gf!))$^ z6_M$7^5K?_^u{hQz-{1B7*DcBfgFfna`aDhTD-~+L|^*@<|cp1zNBn6Tp&pM53$l3 znH)l{k~M7{V14QjlJw}&@-#`-WWVfIRO-Vt5mD1ywm!QisNI%jEharhd= zG*mIT5d@p$gt|=>!l12G6xVV+V{WrZbFqq@J^WA$Lvd%HCuQ%J%F)bFeiy^6R3Gpz z%%zJ@xG25#?ozgTz=65?!Z${;|1eDg+SEBVu38~HUIiw~aVe6pWcUW+PO>w07z4~E zKiS9m0W`3*{gF_;=r(j_1BziZ3FdpCPCsIzw8EGS7B37h6NtX|$5A42XsGZSyuk?= z8DiRIK&yMlc?4{RK1UC52rSNX02BoYMk^$W_0VO7k$@n;v!1{#!{iBiF40II7R!hv zBj_Evk*P?hU4?>R&beY@#Im&IQuOL|>PQ+Ws5sf_K?k7#L6H$aF!R2BgsVWvn~}Mt zKrLA}B`5Mxp9V544APSNytdviwJqKPlz;t9uEAS96@ih59Bp&%G65uQVC?r%N_pld zf(iP#!)|htCL_goDIzHxj&}RjJC&g1W64G9J~l#QbbLGV8bGLXU{|N$TSZ3>;}%y$ z5FBt1TgxATTPVZ>LwJWr0=W2S5{v6_Q+^OS!LO8|&~R^Udi6!L1F)kV$#tn|?>4{od7+sT%^drY&R#UNAnj7cYb4up(D$F(AdmoN+$GM-~t z?uoK+i*V?DZUwJ&6YuK!T6qqJ3gctEW_dp9eVJ(1GF&YteYO>*IW4L_Lk#1^o@A@>??RIv#uSMg$wD(I4d<PM7Cld+13g+I1YoSWTP2zBy8 zXFG?kQ9Dhv5JHnp1h&5*f>JvKcT5XtT;%gaBh-AD4|`eSoPNqxB6V@GwEOKMnB>*}3XaJ)<1wDF4Bj_81cAZe^vX z&rp~|ZIEOU$uqu@qALGaHcp`YSTyZ_!)5Nz#+H4kh?Z74?3vD7T{QK)Cra&OZAyzc zm#){;7>h+vU|IBF&>KpTLcD)>;M}>Q5O3KX7Z?|C#zPwY?vd3LC{!Dl*JuOKKOGXx z&2D1gke=FCxFwJQj*v-?cvUzJn^2mf=@_L=#$X=vr<94^{_L{X3?dO%Ef<>*@NeVe zc>V=K!hHUNi;@C$0sX9w)u};LYYfixUD^5?#HF|Pjw=C|^X650-)~s^qIR85#8!P7 z7G4;Gj%4mN?k;ThN1q~!Z3?)e|SV_)3mFb?U)#3rjzxA-6(BqtbOI0sK- z=ykqADE7Kjj?QP0j8d-HKxGpE&h4&Hy5Vi26q5an>x_kHT*-V4kTTic^QE_Nw-eau=FcE8(+DXnRP-2W_m|@^dT4+g!KmhCS zDkIU#UetCP`yLJ65PkblBxBT~dp)3{pn*%9WgjL|hCECFPY1OLmXUrI$lM(@6L}4E ztSqhTEDRGKmK<}nPMko!ID^pY{Elp3SPDycukqwO#dDBPhy2j^+3dP8kz-Voo`18c zAQHQpn;Cavn&9ysG@Zj7m)Z(fwTEJdm{7DGtMKP&DLxtJWbsm*{l7jf*t)5LDVLH z#7!>Ijw^!i-B9f1b%>&Qn+ShWY_yS_@=^d%=i?=VuXQER|oId5iZXBxnUr?YW!yt`B?e7%GL=)(M9KiGL7f!(38x z5;;YZV!yNtW8F;lZ37qYGx~HCC&n9UYSgYzLkhjpSp1Avb@(ciAIjkpPP z(#AZ@i)0?;(zFV9H7WmTkFR$e6aricOr|}U3flYRcJ?549;A(W_ifW7wu5;J{i2I} z(hGS#7~Y@bR?ZJ4TFY5;u)1Wg`*@pw8CQw#?nYZ~iG{=*KQPdeLy@hfu3{gJj@Jdrt zDMU`96}ejSe(+41pU(cj)8qeAO#k19kj(7t|BG{HnrG8tQ?%ix=ALiQxYDl*RNtn} zs-e6gJF+`D%YnLMCNLR142T3)t{6Bprf?3v$VEw zF;!ZVZo(bQ>t*|FvW4bkb=mm#&dKHD?PYO&b$0oz^S(kS+1k64lV?+_$?Z&9Sx061 zWf#2G#|`H{d=7|YuXM9asKox1O4M#~lBj6hW)&y1-yfNJzff)E`h#gHU%g*Fdwjpu z-6zIQHV8HO9;gHJOqrS5F*7ewvn z)f*EUd6}9`A%7ffmkH9i-8R^KILvItTZw3^KIDahXPRBca5~CPr%y-gd^pr**_`e%g5+cC5fOs} zF}f(LBW~$EtzjipYvGfzn+UQcK-csj4b(VPjQG^{EgP=>dv1N%A?tk7^58 ziRBf-+jP8oL!`CxWE_0E`mX<#LJh}PZBt0y6?uQ+wRPb4p+xL^UT(dApw(Gr3iQg#e4i-0Ko@L)4XT# zw&}N#XUm+^CnT)#WvD}Y@)}{h9zX)UDvS`oTuH={msa2c29>c+`cxrYc!zXeUf~_c z=h56$g=rMkHo~>So(Ox!Sv`Ne%q0gIt>TeaU~@h_?e2!#-YO-GSXvJ23zrfnXFp?o zt2do~-o#pC^oB7OXxUpOpVl#KWqXFI3xz}+R_Zxs{cwb-N*9*KHe;Z$S++P9#Q}{0 z(k_W`;WU*TdWRRk18uuG0sUadUk}fU%%dj67|YSvA4u~~d?g{*>iio+!ra)ge*Phh z-(!uYJYttx2Kh~XveX%dix;9`IiXT-seHOb%ykDl5G)ZY=M#Wh2^LWBziJqu|CoqZ z)8H_RXF-?maOGHO7bDwGSl^;fB9eKbNYL22u0DNc2>%JTm7dh_Py{pA8G7SY2!p*- zuuWsFtd^FntZpFKvhB#!Xi&#`>Exv%jwk@#1a|Sh)?3X@2#Sf?1B@KqBf;Jy>66P8 zhI*};6CaLxzz;tY+M}u=rR`yhCqwAr0|w)!1!)dNHUtuXWY3b(Don^n`C-@cagKtX zg&+8V>+ow<;!d#@_WM|jY67zGr&>DY%v0OR6KGU#-slI#x=pcZr${x!`=+x%h3N&; zJI;ado-`5p5Nz(ovkewpWQ8FFgCtlNMJ?dQWc9q!WXq5&IIS z|Cxha@Ru1YN%~EDHUm}3UIu7(NhDHyfADQ40Bzoi3~A<;vqq)^K?mI|N=05X(4o`H zs%zq$vFyyo!`{H_^B%To4(q8urF<}RB9Kf1U!bK@o_&~sEbLh4vxLE!Ay+fc+0`>N zplFS<<#$QBx_Fxc^QPw=pR+#kZ_T>^_5ali5pfglLr3yDKY{ z{X4D$8ZVO#cm~1!cOusIaC3#%jijrhUU}mhRNn@W#upC zwPmoE|C?`R;QidjeNG)r%_fx^2UEjCcjeA~z9UsNoGRT5NEisi7zf^^9_(L!rGE&5=loug8uh%gCYfPnhZNTLa877t1`N4pavglA zhod4vahY(jXlo!*7GGLUq7a+QW7IRKgeViy2~aw?^E6aQN}!~1k#`AiuNY#H>LjK~ zCemw0;WtZaiTUZV{?co?xFt=ajFeTl1d$(U**0x2kSU3*y-z7p#*e0N6z*0`rm(X8 zbBf|Q&<5O?03tfOpOU+d;nqd$vSfY+A5qz?$#53Q$ z_GBSpC$tP4dBiIa7r3bBe@1|ppN6x=s!3kRf-0I2k5waa=%$=3fpGGnqcj>Snuvyj zRnn;ywl6s7H-%h@4hsUe-9J2ayCc2a{kIXDQtOao#O>*d(tslRVu6L{2~5{@l|o6O zuWWLK?)Lq&L()O<6{LQyJR3J&y9JIv`r03y*pVk@QR5=J96iYv%Rcs8{vhzfh5T|h zl@n}|AO1s-_o0)SJ771pyR^Hc8k3ZDqg|A(htD&1^Y0%;YCb^wijvMB>~OL{_dq4U z!8}G%0L+8Y(jqeLSFM64>vZlh-rH!;eKg21ef_|5pKy_c;b0WpqmQW1!S@_76P9PR zKhAeBfrYsv!4~XJ(Oo>`o@xq>se60wZt6Vy853IiBe&tJN+fDlUrv@A;nq1r>h?Do zIbupFhxtm>0z{(${RDriB4Mt)o8;e?Tv`o32fkIVZOOa!8P|Hc0iA05|HM|6Pqk~Q z6m56XJi=d8j0TMR=nn4lEJnZ!6~4=)x<8jJ!%`}J&6x!Xz*Rbi+~TzI)ExbSnc6Iz z72;3B)e2Hq_ajT0x{Chi%kv2TBoej!W||51#>Wiz_|V#6%fK&mi}l7d`kp8Omvoz- z^Zwk!FlmHJrz`;iuy_$D@MEilj<@LvR2byM>VcKsfMpXzWdLj^qC({D*(U&5))UGA za7)5-=cQh#Quox8<7rMj;U~dh`0>|oPz=rSuq8C6VQm9L^qWN)4@hJIxjWamy-<=y zIt$d(lJWAu&K&2704bp%O7&k7cn>9 zUFE|gp(8b!s6~^MD>aVky<@E6Z3pnM+pK8CX0q&d2$68pUedYgwFTC?M})L+OmN%c z{8)FLMYpM9@LrGt=)fUugG986-<+sxZY(0q4q&_0H|`k5Xeqlk`lJ1{&q9bD^fwTr z8bpE5krXFS%l*BlzA-XAIj^|{D4B@|RuwQ>6wW}5DC|ce4qV)0eX207lSNh2p5puV z`E!kSxn22is(CWOkAcf$w-c)ZrhzJ+)Gsj&Te5{enlVPha0j8__ELCOER;%w3hc1tLV9wfI>{Q2lD&f?jxZmC!?1A zeSf#+gxClb&4Qau_OlXWYNEGAANt3kWw197xs5Z+*E%0X>@%}bt-;eNQTEyk;yESx zz5W}g4K6JfllI;6ZrbEc=SJ>*9}-nl)Cz;0S_ zKNA_DohbcC`#_JT&RVXv+?>z$odDbjXRQ=@gtN4jE_WLty2R&mH-|5;;ua~KLH`tg z!MgS>yGuwYO>Y{`%&X%MHaGAoi}BPIt*6voR>SNN4u}Yq=kZC&Yd2e@>P`<*Rh$_* zAO>HhRy81%NcmZMbc*JTa4kkcnq2CPu48sQR#&W#fb~3`p(_aS8|Yy@erGUY*j#E zA#f{Ui3daK|K8gxm6zoL5m2J!BA20soU%=6P9znmLW=4T=T%q)TQQ9l(``LFCfuLv z42kP(7QRA?gZ`@c!Jq&yZl#qb;Ev`;EB=FpDPb?Usf-b)peA$l>|E$6 zlu-cbL7)Re2eih9|8k^UwD{uOc^0H=8$$Ay?omlRR;DOncuuOi>me8J*2`*KI&v*6 zu9=)Yf361q%;z1QQDdg*%>1vSRt4UHKI~s$g?!j;P0-7Hf_`?x-abYJM7QbQN9ttR zs9n%d^iG-CB17js#I?wht$QJ2a}Aw(O#N~*iXf~A-qLp6vj$Rsy||aH{QHC!%Z~YC z(_(zssuxE`Pc`W_bk2~~5^@c)$9`7))F`f#Zq6FNFO2WGY7>=`kV0O+_VdVG!?_eJ zI#uhYVcKJWoAJ#3&3d#yuqmJWFU*U;JmJS56Aq zkk*SGpmCRn?G@%qJqfXL^FsXP5tf&q=^uWGHHr|m6E_TmJbwfr_jlxZ1uJ0YGJ1sP za>*_JA+V|;qvHO-P};|%%t)!1)#o5Qda(++@!fI*H|(ZZXcOTyE2PbabkXPj#!#79 zNz#(ldJ@h@T4YB*!g2HBKDoalTJ{_1hn;RK5kr5g$8qS#h<0k&fKE@TMm59axYL~0 zHBKwO+6g}w+l5ld<|8wQ_mhk%MoKv^%BVQ?TD|?0%tH}hBL9)13ljxZ9cW$ceGpb> z$qj){%abX3DG~vDNh1TN_dk1^mIOcHb-Ty?a}zi02vD8bXETHp&T7Dr9=BFTtSqAGEuOP%IEtl&}Si+smhP~7qlqsC;l zg=9_B$Y=Pp-W1%((Ub5!8LI<`+sJ>ZZf(cbF}fjP6}JZH0(L1_1pAQ9F6n^ z7@xA4DID2cJ73+9D>$6_kI?h)6lhK1#9z9Ud7B}8Cb!Fz$7B)ACd15M!|404|2FCxwX3G2rn`vv~_*)O;`2T7d z{&(sO=Knt;lYx=tKOvd_L*npXk;MNKB=f(V-~T6w`TvRun3?{Q{GEmEKgr+OexLfE z@^_Zs_QU^a8)x|Ki2ToDg8xRD@qZi1{~s{{^RHgv7sF)3XZ`Kr{(b5HMgRUkj1vm~ z^)3HrY5sp7fU+=h{4W&dwzlrC%r?Q-HMtkq2CrqT8Povm=LK7tcwM5a+4ExU?^R%S zM*z9_K{^Nue8j=_#*NQ54{!j;JTdi*+(yv^LO6yLTZixV;x-d{jLd|ELvl3L$#Uhq zgtGBr=I6p2J7@0hH#g^xLuTxb@oFMrCFz5~b|Jg(B(*(}{0z6UM1 zAIStY_8g>={0m7k$e_%>rBk_lAEUWh2XBpwzeWPlT}UyARp_jT%9Gi;))NS_U_hh2 zA@hG8;f}n4KD)jU*%zQNS6Yi~2xqmse7?{2cD$eK96yr}rnY)xc)5H`{eq`p7u4{^ z(zRV!V1Xh>FtGvsp0_A~4J)-N6Xk0+pMC!D9^AOwPJBd9S_PkpEQZSMWxK4k+f9!2KJG(>L3cD#8K< z4=PmmFfm3buHnujk4gyanaS+U=9oDhv{uPm{n=dKT#aFSw^Y&M3hZKkKO3CuvV;?A z@_!cU5=o`}>W7KmvpJ>0qZ;fVmh(HSoCVd&h3jYTV|opgd@Zr5uwlG}O;OyITh)up z$I+JarN_SFQ`q*+k{&%BEu~M-zbWAzc4!+%=9Rhen=7DXY8v$N9~>-O6ZmtzAEK6i zUcgvm#rIe1%rStIQI-zXCe7h-WF6=$cBRh%rXZELvI=B9_^*owZ1bo>M;dIQz;n7y zl*RaV0c-he5jrKF>5hg)Q9sW2F))G}C5W7g4saxgw+o{lCN-mKv`8J- ziQ5&J&E#1OBi`&jsh3MZDq3nD2E>=#m6Nf8bj?1Z8jzO2pHFM-xTAH&il{B4MR1*X z4%uYL(z88_`%L%g@SuTun?G8_*l;_j|5(Qaj8prTB!}mU6nrIWIrOi{@l8v-76m!T zPV=?WZn+)o)Bz3S6ef+)`LE@jZ47`fvwDlTK)uSRqd50qHCj=2(yA2XvA+VYZ4{0n zfKQ7z=Xen))V=q=-st6leP=AOsY4Xhl-lBIcFoD$nV^*h)jV^?VScs>fW_(tALbMb z`@wI?*;A$df&=>M#%b?WPy8K$Flm5xJHI;tgIg~kn@>SH4zM4q)cGRf} z+l}aF#oOvHM|zN!Kfb>aaFc9v=_qXd`aYLTAO=UkT;s2K41pcoZ_Exf4=$*$MU(Wx zimMWUs7HHF7F(kxj~<3HNFx_LSR--o&0CXwVigjSxabt^f;ngUd67q!8P_kpx7eJK zA^2HxL-U;QJHWUgxg~CA^%7Uwgykugf2qJcyaU+g>tNk8LWqWf{f58Lo?#w{*)}nKvp1;e^oE!HC1Rv?~K6cRG8C0FKL=eM`6%#9N`@X%7qOK74r}Ew=)gMfz7yt z2+Rt{l$i7DN>Enc`4Cn*=y2AEB9)S}FeN?#J35y1!I$!8fULLZ0uiTP%|#IK_~;+% zpnL||B%MYhkX#{%`ssS%)SM-S^=?)oE_m%}!pYkx;cyMv=qs6zw-<6x!DNqE zYW@pkblqh}77p~=-)Ilgm{_kb3^BNF!%xhdIXs>+vi)6GVa9hGYihWW=Yld;d2t^(5cHfRB z*d?6}29$2WF^V#Cvw(L&-!cLo@P3)9#k0RQ8exjO{EcSc7zJ&Gpk)?pnK-(wzhN+nDLb&3GX1LrBUZ*(yLd9A& z_Wum7NwY>8YL5e{SRBSxa8Dwi%5*AP;g70>J}|DNBPNqnIxy-CAj2$+;tUW4p7~&7 zfnm1i?44#8u&Rm(D0fs|{-LS&CvM*8)Y4Q#gHj|OnxpCm zC9#GpQawL-3QyQ;vfgO6Ao9O?H)srT;{C}&gNA0|+Z{ZOCfE$3c|jEqRiiW|uT6c+ zw%4wsJ*q&Ytfy zj>A4}TXPgiI(Vg+G0J0z-(xhx=MLhsOC@F=SkCPTyo!Tt@nk3p1~{-6T5tX$Ps+in zOc%vZ1Pb26&JQE-#tH1kv)1^`DFP+N6jE`mz3ur|S4L0xq(lz4Ym+1he>AYJ+M0#9gmF3#>JChFa9^b~lhgwK|4C;X#hOpsC#)2+N5jq%)R2C&j{#3N;-*g~-$m0?lkl-x0Erm2gC{TXRW#_p6 zO)(C9n-toDLyJ9_5rBTF+M-CTnV~W`va1rGT%UXo(>01$8Y$6_9@L#kSojYnD-z54 z=zN6~YfZ}$qdNMDG?-E*dlI=(MDTHK(8y^2I`%wgXEqv#{wfgZ-iX>|jJ8fjD&!8{ zjUlb=>g6!AuRz;$A{Lq$yt`&Ws&6_OT2lcU*IjSST>ERTwaJ0+elwyUvB2xIGyq8J z;Jg$Ve34Ff!H%`apKnuMa#=g@4=8(Nu$hPOu*a<0FRKfS%{0{Tno6ki(1usm_p8=O;X3np(-I?VsC%fW~v72m7uTo<4DbAH@ zyeP6_J5*V%#sS6X4EBB~H8hJUeS&cC?!v+yYTUgeVDnTh+#_HG<~C91?{_Jkj1@=SUZX%+ z=coPT=}L;mDgrEzyVNZ6DQ^|G*cZvoSE(&r%PArFvoaF{f`jehl2=8n2hBHbGkq>Y zrWR`!es-1l{CNXh^a@k~V&{fVP#GQRipHz;Z}VfiDQ}|0;5(ce6}@speyp>aZWeL2 z*;&k2;S%UQbEq?cVp)$TDfE*Fcuh zT%i^sq|3Zjw2PuQf&!?yP#mVCM8;eQB#PQlcUK9Ejsy{nBpfu23|aDS2*2%bZ6$-l zY%IY13z;W@LM@N|7HNgu%BkLMpW{=Y5rB%;P5DC8;VbBx!7pSWQ_G{r=tzLV#r2jI1 z+;ypyp-^(Om|25Pz9v*e2@Grlu|lZ^lcCmVF@dkD*qk1g2k9a}ZcfAAF?a6O6YirN zfTbvv=XLfKD`_a;%$6=z4HRx`SeC3+*jx9PzDt}=v}x9e%2((O6(m`j$ep*|vv_4r z-{84?xID1%A-;|r66H4$d~@l%u0omK4YAaUDFSB48M9>!T$O)-wyG4Chww;-)EZ4u zMpz!h^d{SW_(UvP+77m6+I|3vKh&dstA_oIQh&NaO_6^h^QyhtPh)>>kN~G2bgg6g zxJZKa(A@@ghy~~heTLJ1x<-ud4E)Gg_aSr4@RgCkFgAE#7&<=bW@{9qva+iFEZ-51 zNQvrauweYIVha=sQ397zl}Ccj1bxTIcJe-0or-urjb|opln+XDuev=W3u> zsk82?9!*p4Nl;wbwsF?nZzI$nRd(-y4}F)3`5m7$nFUfzAo3Fcddvp58n3_J^i@4J^OjA8A6WK`{h1FjE z+QOlFW$O$aLRTTQD~rZXM29X(&eGl-UheO17296M>b=%yJm}Vd9@A{{x!Z(ylfG*? z5;SgDMu@B=EkERMG`Kp&;im#b9f+(OaCHT6N!rHD3}m^4EC&4fr3NS|>{HMl%DARWge7g-kOQG73Che~*gEELhhRD;~lM!(Ca%i{pHb5yrEVom=Tz z+STm1ruIy|nG3TY`>_)=AG#|aik0n(`j)HnKX4&61E|p2HSXJk5X9E&gAn0j1($_U zjJ*?+UFe%o47Z;&6e=9e|7?=l+_M>`vpUVu82fI!zWwdY+GFuXqE6Nn6<$X1yH=NC)`3gfD_AQ>KPx+Me}X3Z_!_)!AsOrG~25iX?Bpa zEdB&?L)ebDCtJBJ`6Mj&g?&NDYbojmU%=i-NJxD>ocH}1{poVI-5T7#0sY7hV2t1Z zg+_JKVhZh0fr`}+c#W{zvH26*n|WaiU3Z0}v?Z~zBQQ+$57&#fqRCl~fe2a?90e;b zn4S*mKaQXz!BLo&tZ(3cl)UKSD*_`h974Iu+?3HgdLv$n z{!sEJ2|fx8TdsK-fTQ3^AzQd^s|p_afur0+X;(=TS(WT$^c%Ag&=qd@E`Api=f*maee8~xxm)wJH7aFQ zaqT(BVaWv>DFoshnzrlC{pt@Xq4sBC{=F?WsZeMFc(3;+;jGgbAKJ2maY?SD?lP^7 z_l;DFHK7;l@-W8K)Ay-{bEY#!Fn|J~8vcGX^)B6*z^5ptJ%*d6M(ujA98PVE>6=4q zv|t%%YbI}2IzILpuqaK2yX;d1L5x+jJy8Qv`+l3LGpvsEma7$at}wj=$?7%AABclf zz}7&gMJ|0WjVh;n%;N27nLq12ocw1i!OZ~1sf;ODXi=JsmD702iaV+)Pz;}KXS3v1ZLxb*9o&^-bOK8B&TSr%h3@qc8r-&hG@PTo3`3<^)1_6ake)~_v&*^3dcKe z$AWeS~Nd+yeb(dY4Kde=yV($YpM>{ z(Mqs5*ZJ7BMJqB2Kh}tXo%=m=LUH}}kITSqQ2al-|Bha{agr}9YeVQJ7;&^sOfQYx zxO?B7-MqY$VRuW=4%IbcP8#>;54^)eea03Vsej%rpYN9eKdfCxPk6tF?TOQ7l?vKm z)Ucs)K&WS3T)!VkGOw`1T)vtC|Cpcxmv}N^hWB~0agYtC<`BKgwC{6XBf`FVHdRIA+!u(gsN2BF zn(XnmHtX!kmIKwIM2(0e3y>giuUeti8*F7~?c#mCLwT^Ad1;@6gh~Y20%sEW`+)CP zd+ScEK9I=HyleMuyp4s0t6ki<{1Ub=dv+P%zHaq%QrJJuzaU+pVQA;51zJsAV?ax# zibP(_pIq;)6lXF@B)4;alY)px=^uxnibFisxQlwo{o%@qk&81$mWT!n$Q)O?TB?&0 z3)IVw^EudICjcTvyculyyH82$T~oyD2G3tj#r?_+g=r?|)0fD#vAd1$gySX<9Z#|& z*rrpvFTD%Nc7|@F4^xZt_@-y~w&%9p+1dL>`9wQin7LAz0eKh1sXoFDlIj1mMduTqSBQ#U8owv*7AfUufvA-FqKE9?}>Zyu%M(b9gh_ z{+wsLF?Rj+ph0R^ma)jJrFB&FVg2njK$Ux%Z2hvJ%Sg8Fsoh)M82wJzdV^+u4k{n; z8}74sJ3|aE`q}FPu|F6f{%QlO?q~f*%MuC6Ie6lWW3CQa!e5xG->;+J&tLRR6}gQ> zBLZ7d58iPbTXqHZZHa?oTm1GdULn&(D`A1vGKovPe1HR1?T84MbXlaVsNO#M^dD-DvEFTu^_xO zL1$@Ag9nv()TLx8ii4)Fc$C+lEl*kNEVqqyzg4Wyf*?yEUs%+TrjjY?Hxnh!GEVVe zNB@hGHdXXbAx^GLqxL{Kwf70(bnkT00f=g>y)ILR20MIg;XlN-9CD)Y2H9Uo`}PMo zQ>DQ9-IZ_Dnfg!%KxpuCZw{T%JdSzEYWC^eL*_nPx0n||Ay8$B5cgVr#7eHP_|K9- z`Oh~H*;b^W%1bh&ph`^1$jl~wO)K2zIY{g|fD4=>0C$e!+^rG{$%i;bnLb0!7B{=J zbx}tWS_sw1RhYx3)yyhJoQD(kPwJKE*JqA?%cueq9u8H^M=;<>SOXy5Gzx3OD#kvD zT1rg*HF@e{AxjkJI%0pcR^tcJM>|Gqh-?!Fh6Q=2HkCYAT>zEUvwo*Or2s3`eUmXm z?`HfQw0)EFW;csPRW189Ixie))>Ht$T~vJ9&)#}CR9Go&Y+>t^;mpAUBKONHLb zShw>AD9*r?n2x}vp@RGTI~vj2YUCi~OnoOGH9If1p<5v9GlE7T-GWf=f4wEw`9FVKXs{;>_pgykt4jU7XI_?qZ?;+zS1zz$=y;GZJ8KiK zK%6u6Rg!ixo%d-D7_T07;xg_Rl~)+XTzsGLjKo1BL7D56`@*QJ?(6~IWFf$X*Y8O` zS#$~rCWN6^RpbUuFm)L@W_o`31pU|!%1sm*IX=NZG|704O5eJRogX3%pz@Q45oYbx z+$Ah7fEZjzmWBNH$%(GdM2_!VGhk*G7;nwqLMPViMtsZb)1} z*x_I0$zQNvmpB8dy@__&=(xysX@Rsqrx|HfAO_5w;^SrFB1;9Q9Ysqm1%Af1PUgIhk>08ma&2ZFV`K!3 z{P1iU#CH_lVE^UTBN~bD_Wc-z35AG^1YIi^6MUP-)wibxA~|ZM%p{@~>q!mNP-o5? zu+&K_R#|^QXdO?t)p?am*A~fu=Fn088X2L6S}XCOaYMAq5SMh*dB}8<`0eOvbL;Zh z38`D97ejb&sbp6*M&g}kS?bk$jrv9c$=2oRW6s%GHh|amhuNR0*Y@JN2DH0o<-rD} zsP}6;2+~ThV*ne{ydpiosc{EGIGGuT;HqN>vOoH~UT=G4yO7@_6FjjJF>z5ZSN6Sf(>|%_utpReU8sgJQ)TnRS48z^;Yqf}PeXNFu=9 zP`7GvLwh$kx>~SpQ(m-elhDi3Oa7K56Y{k})CYG2L9{;GS8L1u_aUUrhI3zHC67)u zVwRgP*BcI=fU_wQe{!${fc!MFALhCpL}8DPh_>J@dk>aC%;G-%UprN4xXxNipv#Tz zuPe0lhbaH4-eQ;57CKm?4NG9_EO{co_W+vd%5PWzsl}4F)K$eREQn1I2{T~gN5x7( zoElWnI_Pr*2Fd-9N->{qVfoE}#SVr)NI7POr{JeSb|P6@2`_CPJBg1A{`VzTb#&d> zKgP>7pI?2Q1G?=&qFZ;Sf4DEt}pk{n)va0C#U_^DTBnNoZq_kz(}pe1IU3oBp;Ipg+VPf@h&o zz=v3_()!jovG0tgiLT?`G5x%Z8VH^GKDrhGNy3L?bNIGPD4kPKlxHrBT*JfwfB0;J zT}j6jSx2F7TClI(s|25V{s9J@%BOmV^^Gr>o!I9~2vE#OSb;lhN__@^95_aEcG4 zZ>tS0*+-WJonskiy4J4A^5mhze*kk>N!16x`_Bh#D{#&qz`$OOmyYB$}2KS>Rz%|Nz z->p1F9WA;#N+{&j4u41Z3rwqsgqU%ksIs|P)044AYAW3kMR3&)X&_Fbp1ro$iU0TU zqNMV8s1e%lW$(>(1$Duc6Piy?ei`0hN4}dUd8G$Ex`M9VN>_i!?wX6|F}^-MWh$N@ z%znEI_RHH7F%t0G`_cHZcA7D#7Bxc;t2?=9%dx}as2P)qZK0o}*QSRu)fpmjgpWM1$jqk&lY8Q6 z^=w~W8(P^O6PfjAbkej%6M%!BnK9uZk`Q0F78x$&WGFH7;qaTe6?~S5{dg} z>oe{c66r_d?DpFJ#ohpw+(W^sg7tfQv_;U_;X`5l5&7+O`=g7j;757=us7b$cUle> zR5~Cq;2#Dh>NP?#wnavnFhv~laQsFz(O94t*05L296@~!W~OMq(lSm^YU_nV=2-Hx~XHx?wpJJg|W36cfibB z!dr!bT)=@^PQB7vEKsPN__~XMIXyt}szxzzz%V5z8pbIm*4wV^$f-Yby-PH3cv$)u z4)x4Bp=w7U1FX#Sq|9vMtE?i}z09Dp8M}0Mqp!3>w#Du?Q;%Wjo9%R;_4K=`Hm=L|51TTr(7phytBQ@6U$XncE9lwxrm@qXTujthauZn(^@B957vRwDOT6 zGiOCdP(ZdlK<;}xX1OoB{93VbC@^kTW??mjFzK(u*Y4|Y!l?Pnk(xp>-2BuG1z=rh zs-cMWj3C6U-n&7m$T{u9QXr0YYIJKC+5pF%-L{*^*PM}lN_f+2(+e{PM+`>j)+|DT zjoxAFmyB4&8rh61F^xb_7&WaDkhVKuMlx7{qpXq{A@rA|=!UdR$VJMGYr{ zYWpY{gA=LnktLYh7nEe<{7cpjsCeo}Hi6A1$AWAG%bactWMGrH4Ed0ZxV_{|L!HyP zRFoT*HN4bL%Zco>OZmi$)lJ@bDLBl#XvuM7y{!`HcoKaiI+>c5?IkX+Fc z$3=Fsh)E{n@woddA}Ek6*@|z<)#QDQf%& zSVImwX+|>OaT-WW)Nt?-3c$*lX$b`e;Yt1=m_+%26j0`?19i_)^z-_hfQlxLGqeRxjz#8bi56fk}$`bVk8!G|5~({_V23TtbxPR*dh zR8SY&s&5x^7d@*N9&R3bH&e`X@epk z44Jf(kXB6vlN@N~g6`?_VF)T~E0Tayz7K$uqBk#KVq><_33x#nH~+mNc9r#PNhN(T z)kC0LI`&E@VCAiw^GgrOO2v@&K+<&(6s!Gge+_B5aZZQ!)a)sX2~UY>D1@gKE23sx ze7_L#^SHzzjxRKHr*U#(G}bZUbwm*ZB6m8dhwPxrVIB=H1xZ-N8pK->+xi9=P6L?6 zTvIb_nFFv9JQYRjz>U-X0zbYQZ#b*LU6XcjcBGt)H_VZ)3R?^qRMPru!&Nxq1aeiU z3Fe1fpF>6AvS3UnuBhR(P5fLijVMruJyR%i&_{W`c3;*a;v`Cdu(6Xe$Wd$&6XEw$JNX(Wh5Kd*(Jl&lM? zj~2{he#Lk7y9;PMlZ?04ET34jj>!SMC2Pb7EDw`rs;s1CICbu=;?g`g7>ZGp%A1g8 zW9@l#1>gZ>4*xbqdr(t}@mr=IqyKT#Y{vOaMG1MmZj-CS?Wr{voZ67h%v7H}pW3(u zJe^X@mg=1eu3F7+DNGi5KxDL4lg?oy*M{)Y`onXv69#!Ze-S2d;@+wZ9|y!T0llqQ zRL@$Sn@xmBm}6Wi(Wg2E!^tlkwZ476tNw|_h9;rfR8c$%8rw4A zhd6_TTw9@O=3Ln$Dyu0H7NO@Wsw;CnG|gjTO%S;d4~nQanq0E86_<8p@FKgJ@DfW2&+@g~@~niX2&*_=W>p}$d`IS1DfqhY z8M|IckSd2t4UUNhjIx*!kXT&u$llbBVdO-{XR`YuM_)3SU&JVi{%Ht%PiN*pM2B|< zyEjSoj5f1?EYveR;FlI_@GBHBrNY3rb)dtxrfP4&Ukus6bx=^I;dKSq^@MN!5{%_T zsThNdiFS}R?*kovA~({Uq~s4JBt%3s@OaFFJD-+>Ma-s$1EnAkHuZ^qh-P3t??fo|(FXCIh8fR{Ma-17CBQAYKh z)@P!fxbAGcaU)av;C~ilhJB%Vs73?2b=)zg1}`MuC1SIVXPpQF=Sok;W|zV6$YZ4^ zK9s`H+}z!|@klRat9rZ*Ok=#JX%>8B9)YE6 z1J&a!6%psWdcw9{N;(~hDgdx zK6`h|eF_u5?eq0-l_>XmcY2pA2m2XT9x|^h?+yc=%?B1`^WEzt_M2R==N2#Dy%*4O@rIag+KsEG#c4Xeq_~)3!V(P z1yWmYeY)`-9X}nPArLIBmNzNC3b_i{_K%~jtUgMkd8#%4-R4swFCGKi0)$`m9n&%M zOrIdm*rEudbLtIu5e4Jh1XS&dS490%>XTB%aQItJ8MC|DgNGSivAjhaKG&ilyCWYU ztNbT>v*?$oMxqa+kojV%A=q=Y)pUH*C7WwO%G9DT4Iu^Yhtm5`rL~h8U@6u-IO;oQ z)|~bf;Ca`o3rX1B#5QSCP%@#P(HmXf2o+FyQ}CiQQWq{DYyLGBb#AOs#FyKZS^MC8 zCEs8h|K~n8*^3*i9KzeLJ`(2FmMBt#mPN~&Qdr8b3NSCp;;`@x6EeotCIYt@GWWz@ z{^GGZR+klg--_`e#)?gSBK>kF7;A|GteFjqhGkzdbx9KPB>5YZ z|JEou^4Aj$O*jRC;NqLJdBm?eZd0J;6WUpE1Byn~nKFJJ#xsk?`Ty!oXlvzSS2y1W zAXBm-ZxHYeZhJi|{W>CmetA_z?Ouu$%A-jXy4DP0wkl~NI4N@E?1R__l0U*K>3Be< ztAAwTs+G5)wNTAsPw<-$XL^|?sH%F*JiHmKO!O{1gfS1K9SsHekuT(&1YJPCDE#mw>$)3N@TjV3{(gXx&&Us+Im_srkDO@^>vE zcHs}1zJID(3oUk(o1;q#7j>AWQd3rrV_d_T&g zUD{Q4X?3DR${1}+_)rXe-TpKX|mqx(t-_KfKH}#PybO z`m53F$8!$G6F`v)cSpj~ogv(>JmGmnYw&3D|c z0yRJbLkOMAe{HsUeiMmHTWpub$B@JSt_`?gwE7HaC z7v$%%-0h3L@$d#|hW+OkZz@%vWY_ z2Fj!8&>37@B;|EFM&QH2^Tf>$_=_6+@$f!igufg;5P(33ex3XTR^T=5*yKf`xUum` zbC!&4mAiE~&YTta!N&cl=8;c^NTA{5OaqOcoF0**>FArKMv4T9m5k^`-XE$V;sOKc z+rRM)`qvo_LZ9n$uBTo!V$U7T{AGrDntRN+jZh>QvTaI&&JID>7->3d8)q?*=_R7_ zck}K4KG@qAogV&W%PU&`zPh5nDSSCx@$tiqje5Q7ksIkKcUux>`mF$_M($`vsuOo# zhou|rl|le@TZ-X4+j3yc*bXY|4IKMW=Utb_cPf-v88fyRz7LhtVKD+cTOGeuY~lo4 zvyxQfTnK9s5spa}ZR7;cj1t;!NQQ;>&Ql5_rJ2S$?Xi`osZz41}#d`#z=D-IXA@ z&CSg9AY?Q$e%qMq+`lf)*=y0=)3dq3M(Y>C9B@-*?hZ;dns7@G`g$@Cd?s>rx>?e2 zqR05N>!ob9Ns6_wr#wcTq!l#P8~LdJZN80j0k|1;c|CHBI@S-=udY{ZxeDiCJCnzD zWCnDQ?r;ERhwKcr+k85FpT-ci;HMR{-yo=H?IesgxpbS@VZgv3fIz1i3(N3f=c(tz z^T=E0ttSJ~j|vSM;n@AveYhAJ;a#Ffhvt#1c4;} z0fvC$STswgd>%7p?|dee`Mbe^jk<6<7?!YM!@VHajP2pAMT#JM`?!#7#At~^cExqj zXBo=}#=8c4{&P=3>}0(Zumq4|Oq9aHPP9h@pGQ(oRXTd|!CUdq>g8g`B`sZnKLy0c zEL?`mH!z&wEMJ)At67F!@nqss;o5Ic)8LNp*AC&zm?kKXtX{L(tmCS{97s8nhQp7A z4}K@~CeD)@S_@;PRT7Bf-!&miFT5}nSWu#+CZEnuRRa$v7Xu=ab2WKqfR1rU>pKb7he*!NP~STK_gWdzxK1|2I=rP2h($no*bsc||D$6UaS%-k+Qh%rD)Y4;naN)6JoO-|Cc%{hua&0M#KFjJDSy_2hY^h#{w}jM-V%U;!&#AhC{-K=N zk|8Qk@ZyJp*>MPML3~VX5oe(#-E-y9PK%!yf8b}OCetC}l#7_lc&3*~gW5wfm_g|% zpdj+3hEG$9n1hjwK)jbG#>ZaC4cc@d*O~J&aML`%*A}z|+KZ-V=0exLZ*P2!)YIuH zp$$j6G6Uu?5N1J|&@6mX^|uV6iHQnqk~QF=#cc8iX2ePdO3GsQ(N`}wA~^9|6fR_~ zp{OcaOo9x`Y`Peu>A^x8YgDi;^i>pyGG-MB5nOdvp$J`+qO4}UTOi1xYDf|&dXa(4 z&HGI82~Mbi$U@H7Z(tekZRGs0u@Qzz>&+u)M*QJvO&o*Hh;tHz>4;sH>&1(_HnLm` zpYUR@u?>Wsq4QpPYv#JH{CN(VlA8Zsz%t3BgTrR8<@TcgSk!>C4AN=ioAH=>`9_~T zf?iiBf~f9^g=(yoVenw}Ditn<>-w`0u$l|8G9>_5TtR||{0#wSN}~CUa}anjYW}0J zUKT{6rgDV@&yn_UZAXg`ammcqLWb$1V%_{ncV3Mw36cZuDp#yu^eC*OY+2W@Yuh7r z*UX(_w&AUkX&(SP1=np%QzP}z;%!r^Fk@RPLpssyt~3dVF{+ za|ZT_?Onu^bUPVg*2K(PaT~$@ntEJ}dHVzmo^m|Ppy&JXd50eqoDTN7(gg^9T+A(} z%jVGfscue+g|tb4adkZ{5xcP5_Z7lO+0G5R)J;zkTi!JYuKibL-2BJ#&c-$kYSVic z{0#thruNGql;6$3##a|$3Jyp9FDQvdU4z=FwO+s!6v}Erch+<^7XnqD7}n)&E8c!# zbaz@HRXU@%Lz)q`$%dAruDy#)V;3ggbh;%Lbx_`2RoDwLuWuFEP)SWZ8Ze2aL5+Ft z3wiwT`| zzh_Rb9Bw+v%2oAcQIriA-*^oG>t6PMD89Z@^$)VN50P!?x!9D1>zLA7N7|$+ur%82 z=7GBTa_UnbAhM3rb6jCz^i({($G{m|Cmho^phmshze(m-H;>s>6s7FTz0kWvPNCzB zL_)7&S<{%vFF8qbPW^^>$~g@J2k4(6{A;9RK;iJt73ju3%xrW>nX2cqp|EvuogG|Y zw$672%>&L#ab!i=IZWO*+#>Csrf<*ofI%PZHrTg*njy!nU_LtO`+dTf^Y$h1p5T!3Xhhbx*xt`R(B zRet;A6IWH-yudw#o(iX3Pd3SFm+KdW%uesWVtm8p-x7ZP%CP@JMiOUgS*TkQ$nQFy z(}39DEz}wh&-XM+!}*q>kflD8TgXhg4R%p{$<8MkOP}q=bj+tP1O7eu5zto&v3=Xj zl;_tbh8Zt63Jw`-G~l9Dwc?~~N)7U(IsxYDGc-q_c{4B$Dfscnpy9E>!!B`Uznp2L zfwB+tT&jY#cWM!75R1hyDZ+Q$+6QE^G1`p3&F2U(3h70~p@Z+VWjW~0P!JO0+1e{l z@-|C$U5FtI2lp#p)}JV+Lh~66r@mdfoKXWtc|yZC&QIZa&v1UXu6oyUN*#swp}3&l z*oY+kD)#ALwz72kQHRIrzIG+Sq?lxTL(J7%VDUxEn@^hHwYCC!+tjCioMyH>8lQ^j zbMoW9@pK?jwzj8GI#tJW?KO3nXubvQGL`Vm8Yu{fGh&T;AgG44aSQ`{1H><3q`ofK zr6_xwFDpz}D4Z78geplVLOXOsNRqBfFgcg>&Dujz=XTVe`WP$#cnJ<7u?O*Ju*Zd2 z;l=`n)<9aR?P-Q1M#KCp4FDgtm^FX)Ft1kAbb>>styJ z2JG+S$UY#sfEv^62ym3-q~eyl#@iV95Qc=4J~XoA1h4Uek4=la9V2ba5I7P1qR3+3 z#T;VKnXJ*x?38;rRYQNZjK^qfyF~xD%yI@nAFjaj7GjV&%@##I!kf)Y$f{aZeet_I zoyEIuWhFMJ-c|BxSo7l>0yq*j?Je|~kivZ;_=yb!){#>pj}6ej!?-+WU7`OBl|E2C3+!=nOx`=l58ZB8wr~}6lB5DU58_uzFvz~ zX?lB|GdB#N;$~c3*`FBeH64G=Lhghby{|}oHZI%|f}12iHBn?cr5o?fZgO)Y3R${& zIQ>n|wiSsdpRgqwq-f1ld3mgQ{ni7tYYE56EaS{In(>V!p!3;Qfq1&nFm+Gvr6X^_ zc+Yw-#PY5FVR?w?_QLoQyTQoE`k?S5uA#wYJEEp(3$X%0hn(Db-Oa7qhjL;$O>I#* za%^T21sS@)KX}5bv1uV|7pqvAE#ZRHDK)`&81lERepA{O?)Dd8!WvJ2N*Z<5Y>$R> zdHtDIJU;H4;2v_BUQ8OM=VJz;sw{=FZwWTS)8RMcDYmz3>Gy%8h4gxp&BWu?>3>8y z%`h?QFhqd9gJhl49RGATwK$sg)fE`Ez=9O7*T4V9*(pWB&PO;Bdn8%9jL-s#Np-EZ z^%s++Z(Rz(qB&OIrz{|iJF=3KwnwLiuAWfRnsOpPd47axXbT@8^&Rip(==}myGas^7;-&p;^18*z?aOoHzOpIfsAuH2Kel z8BC1K|E-LmOH0~*LjtKA`_}(-0B5wXYzf{i2^Is$=A@2!6(FMy%^SkWfJExJTE<&~ zO781Z%{3|6r~%o2(8V zy=SJyG^ORpmbGWy-^%e6U$mRxA*VS=D?z{-*vs#Q;{ovDmzitnr(B}!`+3k;``kpzP`&d?ht# zP+uJ;(U{$M%X?*p(9>ImnB5obG5Qo8eZ2+eODzlKdZP_~J%bC=j`^j4<^z$fF_Nx^ z@f`b*Ghv};8QLxeA_Ed;mx61*xkDR(9gXvFk?*->0Cs#1!%pnX-=@&KOF9VXkk)<* zKc{&it1+YyT6jm8mNX=c!>q36tdd8lw1mSx;Kk^(I1e%+){SsW=R|pu+%Bp4vPU#s z7Q*6NGfISBR_w?z!Vk!T)i>?xW^Z(X0jBAf&L=BvGSQ3dkKsd*E zuEWrC*;)xW zr}DCTOe?k6FXn9pitP{WPfiJ%GG2KM)fi5ry*&YyypHCP_6BCBS|y!6?kLi#y+M6t z=&+LNZUNZZYlKV#=}>GDrn&i11%OZ zy!w#PQfM_B+4q)j5f}n+oV5`&)E!jP*Nod;tz#0Tcyw9d-JCkle}L79)$$uGA@|Wa zwkfP|+&W!637|5L^QN@V_EwVm(6lF-6DGxiS=-ykLOD@N$<#+llaps_4LYn73#NGx zu=5HHfBV4I%7@Bu`Z_%yY;U)ikB(eIK}Q=Lt5ls$oGhRMlM1o2Z4fk&sAhb%jl04w z__%3{3qD}6hgc*BGxJP5jYB^e zM$ygm!UyMy0Q}Qk0uE_S#sZObh16pSOqVBPbO`WMDdP>pl>@AB5`NYkD@VHl4&Eqa zSp^&4A2~U)JbzN!UfqUEUhJ_I$F@M)VY81ZrnATffrIDAC8U~9ga}qX6IixJRK`KI zpzL-Y_(B>1G04->0dcZjmi(&;wmLy!6F^Kk*JZC6+cBXEubscuG`>|hsnjt;Nb3g*4a?#>MZL`_tebup+HbH=671#-s(7bvXQUQoOQ=LDNO zI$%(4gPnO0wu6bccX~M1WUj=fBUVlb+y)Ov$U!XjPS?j?y9d|6LQz%&4g&{q50-W= zSrVVRM>7z>uK?o)YQ3i!S;Ge`V~RS7*w!^4aJ5(ACj)|%k5i*6H}^+P1scCgH&CL* zk}KGq47S%Z3ax&2VbiN|H>iD;{OCZVIxoC<*qS#ikDo`~H#a(VVIlc_)G#Igrx2u+ zW(Y)<8Gq~chcaiPKWYDVS+J%t} z49>zqT~!~ZzL6F9hYge5m&wm;!E`c8#EL?>`{K>p+NZY|p-)%(FBp@zhXPefJ)lo^ zA0$#35X-3V-)`BPb(gVz7%2P9;J1y7PHX92=`To9*9#EK4NT=hK7+M^HZj~e4B9^z zL=rz{8j?P#`W(43LjnI()1TV`Z_DW>q7;ddZ&d%dh)OC=qATV+J$e*x47;Ms%ymJ-WE9e z;33|6MD=Gji1gMotZ5z*S0oU(2I?1C16QUIN!`!_)nhyNJ7Szh*3HF%N_D!7E^=bE zjbGjHNE}48d+6&T8>z#kC_1~}51)nJu0O^5SJ8nFEo9q{pFB2<(~dC{{A`w|roh@au6#-2)h zl6AHAbVuf)puY-zQj$@0OPc71|>QKTPm57-FND~sap1CGhL}8P7uzlqJ(luUT z6_`fr%@xHATUt;#?^CA4`}5Z~Y_+}v(J9K$u7u2zb~WN}x>jjZ0=ZE4JTNL}gp|a` z8lCxZ9%_BC5Blvmy=J=aUeLMevsB{6^3s>bK2fF!7I;bFAhp>JQg!vdR$#rsQ zc)x`M9p%~MbIaRR@G=TVI!iZP4YP32HUabB-zU^WuY`j)h`I;?OTDF{7KCzv5!lRewkhOP96mm~=^*ND&fd5_A?PaU( zJ2~Ce6)ty-+V#(+=o?u(a`fGsCZ#aS#f?yrvjemn_>rhRcsr)l1uqrQJl!C%gt z%=r9dX&iAJj~fUec_=liTGJrZOn!I-4?h(RUzhLECo^*X`!UWl>X$~3ADGimnC6h1 z0u*SZ1t%ky`&h@HpF9TYq??(#XFVRPAFt0RGutzC$31n?-#=%Iw;pwz%-G~3c$_1E z!nOsfZ%!{&Rjq!AOieco*#i0>JJXpjp=0;P?FJ5vMoW0~Z1Y~b`5{eKcq)C@r#tt2+43S0OGnL}n$dJB z@D_5chnlCM8SY1llZ2`|FrH@@|J+&*9*=Y83?w;46qIN!%VymBni zVWR6HVM(G%D0qFs;Kidp?6E<9!0e}^s+UxnzftPbr+KpSCo((mpLt>Z6g)bjdO5MU ziL${9D#{C(*3_JkBVtf5u*hRDzOBD}*>4~sUJB_T35KY1`Pl5m2jo+gDl<|vl4IY0u8942x$ z!^9*+j3yVtMD+Bbq1$AlQz8mU9F<}JgKGjrk2&?5xv?_qFBU(B)^}E8Z~U873Mwg> ztQX17s;Ev`FLV;QkZ6ICJg9NvE9S3c_6KCfi3uw_!5B!E3I0vB4WNkAJ$+NPCFJ95 zVXxr7omrvP7fx*P=4s9y@T3QW%88^E;M_gj zkM+Z|0^#5lpFAA@((jD|%&@Xi*i1+>P!foENwz5ANZH-o--wj-a+B#Arcje;BiX#1-6!E3ST+jmrKSY`M;r-_t&Sv7W zcCmKTGbg;6RMD+sfI!noYQJXcUZ%T23q@@LJA6dW&kcN=P||H$HSg#Ss5dBdTE}V4 zhD^x8o-tR@Zaa@L_Dfj4b?fwJwByfYR+m}*)^Y971A3dliF|}Wbq)396}!avw`L8` zW+~j1(`hK~dV3e%ICY_5jDEV;ULz+0&Sp>;3NmLwm84(=!$2Dc)(mCVM?s3m;XXl( z{a?LzK=c`nv7p-~o3y*e%-5h$K8_s>kS{7E#0Z*e@&z3+X|{~s@10{&JF-Llk*5%& z$c3i?X7DmDJAT{6_{%?PZLB&C4?%_yIe`@ajW9ajYe%5BJDPKjK|3^5k%AFquIPdh z?5>)TGn%MQ!I@h)KU?)tnkYQ-^AH_eG^k(zI|LXyl>1!M+HyB)h^~NVRj8cR>h{YG zA%m)`arI?KWy1P(kt|}<{<&G8YfwjiYC3amTa>klG=w(VIf=ry&g?bz#O~4;LhD}$ zp?re|eaK&NtXq|?8v7gK6t_M>gy1Nd!Im`j@|uck&)5b8zk~~UX6-vYKc7lzxF@Rb z+oQC7UO%7n*z@LHyBAl`F&gctHX*`mY${rFubWOiNk^dpXiSbjiIqymfF@?!AnbR!XIHPT_z`bMKs_q&*gxE z9MK+Y)lih+%MGRA5908o0^LkJy2Vk0X(X)(Bc^;L4N6K?KLgh0>IQ>xb|?ez_ z6wWjnxnT+&BL~3qZPO2oCzPM`qc`f;_58h?K0~G?vOqP5@MCKMZb*@SNr>-{;U#PZ zD22{Llj6?K9mFau9k>WcZs(hOfcKzjG36JJL?$b^NHIg9a71bS&d|VJiOOA{v`D@A zDoyct0C}Z zrv0mJ&*N_)1Upr{$jzu*;T^_OWe6ICnh=ZO&W9wwfGx{;knV%J^>=mt;{4}uXTm|U z=b1`23dv;TW>y;C#k{gZrj2fKKheZWJ)QR{a+P$mmT7dw$1-1PV!W)F7}i=!yA}mj zc{{z!A_JlG{LN@~z)g$p`rQ(kbShj*i4!Hd1*ey~{&Hm?JatRLO ziK?p1g_7}a1A5Fi`A)ZQl-RNA{2!%Ix{30sb$PMW`ym7A-$LTQIDD@T1vh7hnKXZI zMg4j}hcjlgdU-QvZvy3!-?pAe6W(%WSGf6cB)ar$2wF{)&#mi7e&=G96n8Ix7w^)2 z-SQDwlK$o=dh8a0=W?3ZHR0S8b~o~IU+Hvd>#Ulp+f#@btE1O2ikXrvZlum^x=bjP zgjFtFldK~3gS+uehh_Bh+S<=W6u#lPZj1$rU}S^E>^NNk>rku;Eu;f}-sSdMmaJgj(x`x~qrL3IN`1hC;kj z^&gh?UznTSl^8O0($l-}<~E8ETRNr)#w)xznL?bFHVKKjAVpY?anr15l(FuxSCw@g zF`}cADN_G-L^AEOv%CrpK7xe_6wii?j2waS7sT)CgI}W zY~o7G@1|oVzf8?R*hlyM)}`OgX@h7Li=*}dY3F>w?|s>x zTHUaSo>B3pg#gEpaH_<=1~G1*lcNbm?xCB|cK z8FGmBXy>Q&JotCZVWxu9UYqzpG3ow1lI5u85~6M>qo3JE+9!@S&Tg39OrHj-l)v8) zF@+!RpT%ZSYE+f>c%y&Wb+9Ly%e#H1 z{m4UyWkycd00<6L2(?q5Vt)|Oui-PZ0nOvUH3gxTl+gXyYM}pZ7?G75mN<9nU4De7 z-OaAju|T(xt_zTI$xX)J*BSwk5sW`~?+3Oy2WP6qVV}%IS+^@@uq#ku8gVm1xO;}j z-pEL>{jz)3K8Q|u#=gXGl_Z$i2X`fc`kPO*LBaAjeUl7*eY@e?brX9ibbRqG1K2(z zl)+{w--x+=d({OZo@1^821Z4WGQK8MS7{W01lJyN5qk5@JJP1cUkf9ezOgWp&Y4%Q zDZX7nF&GlU_XjjQzjJ6a85%{vRtTs_Hy$V#cF#M9^7t7);C`(a~Lex z2HF@g{1JfghP83|x1`HdF(h2|**|daVq*?w9vw$WGi@J(M%1@jW>)I%U8KfL-O|_L z;2G0)TR73+u}r4Zn<)DB{35f%GlZf^Rs2nYDDt#aiqh*A5u&iV+~JaR!xv(3hul>L~Y{P<}DV z!72-FTUMeQG@0<|jC!x1lS6ZwJoN$VwX&*?%kJXoPCiTU{9Ywm1n)Cz!hSI>?9^~*6;}uR#V8xXquP6c5**Pwm0m^|`g`VvFq3a^aI_qImuNEDKWIBN( z4lOWDJQ*Tk;AS1Sk4KK@;fcn3^FU*lKXu{!K6|?HS(B~UeOp!Svp9v_J4w~Dn@&5@ z)3NT8c*6iLf*D8U`W$68qC-`-np40j5##sYR%Nh*M7~_NT0HLR;Jb8hVK?S=$hdGJ z?3wn=c9NSi!yr#Xa{rUnLtdUHNZgYfp8Xf3_z@}FnBBNFA9b>x&{5^64x>=}QNr~7 z0E`!~+z-v-N7j{aT$2oENrQolgjvev+#G1974W1B4_BlIWl+FT#szP81b3tlKO?61Tszb%gknb#_#Ly z5}fhmZt{C%N;S|oY=UM8Z`3smH33+5GAcAc|KshGEzP-RkZnlSO>wu>&l;i|s(w|E zdsd4S)XeI*w3f1{2|@8>E^#0^#;r1kNbn_Cx8%Tz9J~V0_q#(;EN7IGj-ot2c1~D_ zyn8j-xZ|3Oc&CK}ujx&PgSc*c=K7`~3r;?7RJ6B&^0JBL7gz>XNl2GA5{S(&w|LwA z=X8@5Q9;7%p82nfs18Wt%_xBWD(JUWq4si|Q4L=?2Ed(?m_8TBPSJ#n zmb1LMe$us;;AT=ce|V$*4sbjRL{7fhp!WiFIP2;gqvIC==m^OWtdP}j;P)r#%Kwnz z`gh|d6;B7#e;MV|E4v!G{Ij9r31k6nIGKT-Pu5M}KV&P1{$jr?6&w>A>)=ce8{-ro( z{MWhvTYUWgc38yJ+1Sa_!NuO`U;Y1AZ~xB@{@>XG9Gr~*#ui{?`!}`#8|S~V1y~pu z|BEfa#Ky?-e`5>Cm>QZ`+L;ruFwrZ!nA)llurU1V@c#!hz{LK&;j4AwyutD7JGbHke)Co2D%NseFrhO?QWY<0%0~Ct z@ZF7nP@7V#kT%tHoOo{Rt@_%(=Ne3cS4Kh$%YjD~S(#+ijtz_7g&k|^U?sYwon~0} zb^v~)CaVNPenRs0?8V0KedeIyedGS6Wxt{#x+HUDq|_Z9Hup^dEy?NbT=n*NYhyP) zjeehE_`9CQR1k;66A2Q}~&44q(f7P_&;D(%7=#942zA^F?U9sO>HJ|Uzr zS+t1yf|ge7F^4sfB4W(k)PoMtk18>lkf|9aeYSd}-Iza%rn)NM&l znuQ7I#KQyh9xCnT0)4p4)lawmRIy6bT|4b7Iq`A7YB7)A40w#{_%dM+N9TGOjF}G- zf614{*`2kegpLz`g%mnS!L5Vw`}$ymjFh&B#+H5GUCrDCy}a~9y-`6-yq)&Qix1@M zg2X(JQzt4~vG5yZgFA|RL--7<&Ws@g-xKk0;*!RTyo2j7k`XZ`mlLma784W}OlEVK zg#{bbpAcc@irG-mM;hye2tWa6c;YbppvpyFclErAO0i$e{dD7!`C@*47UmUM@o*v2 zolRdRaLfvib>E$1)T6ySO`Y&^<2SpJ)oGN*m=PJ&nSKSU+H>OK_UZVsXMv!bGK@Ed zD2BK?3hz5l{E?Waz@NNIJ$*9+J2o&|WzCTK=&<*?FplvygUQFdytN(nt2V3!DGCV( z{h;pGPXCQYno)6xm@wuBPM+3|=mm%TqRF}wkFnsc2K$-Oe`X{p--f}c@(V{V%rY#6ZfFrkV+ma? z;-f8R2%{}fq&P1-^lQ0f7X2YTD4GB)kc}f63jo*;b zOP27$A#S$c^Et&_8Yas^3zf}F=K6qZCyczQXUvpQVrSpR8Kd>oL7b1caF=gNO^fHm zI-505x_5m`4TiRTXM3wCI`(|7_*YKjbuD$k`6SY zu}NJD^soQL*f|Ah7IX`?Y}>YNn_aFh*H^aDW!rX_ZQHhO+jdR=cOGWq#+`_HI8P^c zL_Xxn$lPb|wX%(a>X{VC5bjb^P&O&^Ov&)Gk}bq1u)w(sWxY&kV|ItPTh7{p zDzimutEHVa%cFjNo)eI@E9FQ;M&*DYMSN6ED(3KjOq=Yl8LLbRs~2wWe8lomp5=2l zohvcmdxI8$KNwQDJaZon7Eu_`P|_n&7;w8ob;B8+;LXz38%TRcKkj|OLg@QZkdUOt z*HM$bcZHt431rTObhF1>MW#s@>&0x<-pA#$Wj`mD1dQC~;kBjw%FlNzUC)`E8>0ti zP+%HvTKgLVs<(Sm^7asy4$w@3yAouA?2{u#&Lc+0FpAr3jmBU|H7^3cDs$gDEuDa~ zsT$!nLDUl+UIX;<0vr|iwDEQFd^vm16%nvDOj-j*#u6Z-x(0l_zG$P8UrgMU^$ZyL zP}G1uHTWG{A2XsOBqzsXpk)cdHG=g^mfU3G%SroGrI_ii0{UxQFq6ib;lar>#apzZ ztHIujjNnx3o7FsBfv128B(|=m8V9wfYM#ug|H?c)%%Mw!8Y!_)ET{V)r$%zSX>)pj zwLJ@vVKvm%OJDttg7KkgKYY>%b43U^x*0DIVZ z*xY|z%T?%~V9{82>7geK16FSGP`}{SqxcHD;$`?XwycUAhp z=F&R)r3)!M(UP=1)NE5!oM-zBLe0r0;da?IPLUawC}=K$)wo0{$3;GGS_z<@E!g!_ z`At#W>TS5pO>Ip^B!8uZ8Cw=e7DLH_-_D>%OM|)I2aN`lVE|*jaj!}o%FWXuD=z*+ zUgb_r_4`GAVC&t3p&}zDs^xTLy|W*p!VyLgN0|@|ghIEAU#1TsLb4oD`fw_(Wyi-?P;Ff#J(=3INnLIs zA4v7;q9Il-#iGqx+SEePv*^@xSgu^c8092o!p|K0ET1_7lvmxJcDart;2M2A^efin zAQe%z>GzDJjFkW>ala7CGfcQUE?I`#ZGb86Cg`>)Jk&6z;1G*jfINi{L!IlKUgS*= zyZO~Z!@+L*-v4<~yJ?>1qa1~8?Vs{(VY(!?-=23af_m12Y6Id?u(tbyx(jP^yo-}Y z=|+g&o-78*Gm689P9c&jzKODa@UB~pCETOLQ zb`VJ~;MEZ##YWVBDfmoW0ov_~O5QE!V3YHNi_>Lvu8wJ!cp(}(x9}YrLXvjnY=7E& znK&{1OP7B#5xOCdwl8|Slc%8kp`e=X zTxDZqUvo=#r%5gkyrn`rxDh;3V~ldsK;D>Lw!%33VE))=5D#QR7@g#S1rb0A6&2@axn8tC~JJRVoryljqtdZ+2vYl>x z*$Eq5-NVyEPU)5gVHvKT2pTDxRebFenSVzt(1%FCda}EtT5FY_ch3g!vRQGv)aJl} zijIo4`Q|*|ol~p&nX8dS13nVWI3QM#K;MnI$FmWbjWdjv-x8maCc%Uy1o@e2Cx*gC z2+Uw^g$9Ww*xP`4ipJWYshThsXCh`C#_UnqT9lpvD+dTEixM;1WHN>!liS(f6v9^3 zV2&mRwoP@Vxu59o&0@4COZKHs7oY zOT1$m&ChWBN9lZg{PgZyU}P-lCWxX9JFT&4B%Z_lo4y`cW?W{|U{2O>X;b^4iJ z10-%bzZC(-Bve03NsS%J_#678E3(Ig~{!cJ*xV5)3Z^&yOGX8{)5r8TNPzXDqGtI3EZCkZU zoA1QLNwLdJ?=pxSLXTh~_oK}b>4{b2`_6o-#dV?_23O#R>o|$76OA_AfE=sMZJV?7 zhF|9yQ`n2v@#Tp76f{aG&nNAG?kS4*p4^~A*=E;&kr{I@yB>F7d1eM|1;n6t-4b;=^&q)GOTtLgb~+h3^JsUCSs^q3K9_Jo(`C=S17|H z*cCfU+iB777T6`5vS)gUca5a*Xw{w@bX^Ofc*Dr(CEC9Puiu^Vw5z0POabsX+ zP{fzBb$hXR)9RRUU7PpLvT-3S;U|XtlVig@r1s)ap7#n*8Hf&A2mH|#4mgA6J z;-$574%q4RXbJWnDeS5}m&zOJ6zWxv2fp7;#PyuV>kYNi!i;{L@o{eJJ zeDi2F>a>8|I&tu9!RJn1)m;22AMdeEmB%wy*^` zT0{v?5r}1ha08}dSm)n}a($=8rRNXvsZ3&7z-Hc`ZTR^fa7{?<0s)gmO`NrGDs@NW zjze?r+|I)o*}9sactSLP9^ZUl35sYTvMqF+YQm-mE*$w7s@?PLZ&KhQBWY+Z?(k}h zu=I^o7rw%l+V&6%Prwyxqy7TE@;}fd%-3TzFcMbW1p52mfN=X_1r4*Yb(4tGztfoc zpOAou2d{K&BW`M;ZcA=Epp0OY4vA-BUxyKuxCo&#p$ExjW7`Hb;QiETm;WuO8trP1 z(CjO`{4Z|4{)URF-}(&h?|9jI`#JqT4?>Is@Prs149SxFl^rrSVMcX-_v#wL=a9FI z>Bo$_;^zkNW7l@_kAjotGOP`|K0iX*3IFKVc?H63mJDS_Dmum=8Lot*fW5dQ;Jl!sFr;(h-zlxV$vuuE<QOfhZmPYLjupUd`C*%`v{PB5 z0=KfH;=K)huw!>iQke&6AI1SMn&x(_Ge-mSt-Tg@ZE|5yM2XDU zst_Q-bTt}*-B1;}f*d_a<_6Dl`_K;Lx_s!~aN~;gt%Mdppb)7MX4gt63n0&MNFTNV z$3*Ta1Y*holx1FUSc*pB$G9sbS=5m>qjIS$P%ooVyt>wIP-2cY$Fn(Iic~ut+1Nl+ zDK8{Awp|RX^t`0UmRT?5J#t;ZHGeof*#G9=&(`0eI98gCJ7^5mPc8SOcGeZq(JtV? zm72h%VjX@@r|YG$LV`FiO(I|t??Fdue5yeJ6j`6AL|&_lnxo7i%i(C(6;4{u+_%6c zI|s_9?^jMAK61{qrgiJ9g62Od29x_lc~3mG*|e*Mv(&tonZXsae=@{XGlEHW5(4dP zH|pq&CSpuNaya&_D)8Mqc`YQ@X=n%r7q*uWAfj&bD)2=uGKXT=*Sk6B5RVnj_?~6V zBqbK?9UFDs?aWR~Gn~#XV!~A~w(f36 z-))^@@`;z)mFRtp#zx*XUZPpMchgQ-)c)ENVZSgLDw0vE*&^>A`}disN5hT)#2Ltdij<#=jMT$7^U!};>d$CcId{bg-xrR4E4^^hTx z!h|C;TX#k<)$J^l4ZGy+t?lJ`tLWwP9sL3OTTE$`|M*PfL)k5U--oV~&-?3K-}j-o zM!&1e{p8st%@y);J(BI$h?`nip=KA#i2$ZyLZ(gMk;%D#*OS?SyQ%+n{Avy@-HC;yi z>@RA7fx!#>>@ZP5s8~pa@YR-p4w*=_@GQhOEU&(TMqe-xw|<^Q1RlH~AM@ZB*@dmO zTUEqy18W2c(do%KV}&S>46LQis35{p(t4ww+xH@Iq>ufu!c%m-&5N!d$ndLnUb%OJ zL+a|!G*5pb;a0a^-Vbn>0YL^|uai2NW7Zrd?gLjl zH0IlDPbw@n+XFK`GR1$kiT-APyYlN$C2TR3Q$hTFXgW>W=eaLRx5TSE3^6XTBI89P zFcS*5wcniX}x4yij?FWN4P+m0iDCsma0yA@kpIong zozELff{YA1Ighcav*W+pqcL?}NZnH3GIy%<+O+y!X}%JE{hOnALQN(KK94axbWu`ty$vJvObNPBDf(TVnuDe@}oKns$eWI20=+){rrr-9bgH zD5jx|L-_p|3!ircHK~LpGg_q#wRVHJR2e!kIjH_MT|uJ}HaRKYT#urJjVM4@Lbo8Q z{mt3M`$$BL`ZlzmLu)4`%y2!{g>y+!j5{%$-s5vgBrK46%7%<6(qgngI2;2N%G8Lh z&mVOHTI`X`WIgb_ki7H1X4#A_WWfob}FW zK7sjlfH@FYpDCm}>B_~oYiS$!k|r=6!iRULzh}bK)eWfG`zgHbe%SR57whHPlH_Dn z@WcJ446FN@WNj$O(79lUtXgAv$xm(@0oA{;h8v72A%HZrogaEy+&JtzKEoXNNye3> zT=m*-%81B{$w~_!7qjl*Szt7qUDY(HFIwuy%&KC7P#IlCH?zN%oIC!f2OvU-{Irk! zyV?U5K&*$+~!Fzml!G=TG1La<^p#cl?08p4w0RE;uo_j0lV&0LMi zNJ+2u*7GOW1^*6pc!FogfmMU7DV94nwQpdWC;*^ z|0AaeTVF8Y;0KA*wSh;9CsCY)RFfwe5k9}$0yg_E(}fN+V>N^xdtsF5lA&8wxZ|{4 zn^Qd@D<-O&#Q8w&)YBUi6_4NC1C#`vZ)~)8;K%WmSQ6feMHsUYC@a1xbbq)FBmc_C ze9C$kPXCyh^T_@-<$vgj@Fuv5blOQ&8u0c+y>(r#l?`Y1)pdZ=b;lkKtn4f~hyV`V zBO=km;)F}%$NAlQat4AC1LK+RP|{@pEAV0hmF_nokfOMY#flW^2wz87G6)q4XSk_m zILI}X{40&35UiiF3wTUKg&i20Gh`=e+KbN1L#|kK!9EoJ&`o8x=!XUhJVIV8jvu)D z1cYKR?m^f^=aMC>Ic>jh6@r-pPkZ$}Y6Pn~9vR|J1Yh0B_^Ljg{NK*~2;{_ve={37 zs>DbJ%e22G|L_f~OZM7R*X#%SS1Q>x)PG4AARa|v!@0U?ZpH0Z3`U0|P8E1J4hD7& zmdOYR;G5osNrBw=>V*;R{dbF>VIsZh$%uk9K5-$rB2^9HcCoM=DXpE%RVK;Ll?S?^ z#zWtRrH;5K`1M{=6)|RWBa#@v<$$Gvb~5#cwwC^(DEoI5jf63fp$`2Bs)tZ}!q6)K ztr|I%^o->50Nx!AL4)j>h9+`3)vA$j1u3~Zmk^AsCQ!-?_8lS$ zvFBj6;9lV<(_zN`5t6NNw=CYICUFp>A+BW=wTI>L*-$|p`;%eJb4{Mek>q+vVqkkO zk{7@tFcsgH)fq(qq#$;~?|TKS0_e?vU&f=>Lx|WA-wE;@s;hq%!cKq2 zCcWjrWocC!S)1Z;R!I$n0h~Ab{3YzBvR4MIc_ghJCc1*D*K7O^g1u0=>X)1GAA2|C zb$rbqODzK>EBnFj0I_BDb&5noh<7`1Yf?%woJ}0(G7aVeoNU%V<~j}bVSk(YPL_~g ziu49P5lF?Thhv0F4!^8e7|_PkZFj$LFLhYtU^RE&5O$?=HhQ^h(Tj#vgTc3__}dS( z5`R~t|AP+6?aKN2tA9|dz>xWUK^;_aR|N?7kOi}HV3CV^h)9A{YiZ#aWe5z&>qko? z+)Om^0^Gf7eMuGSA>BbagP}-5KDfLAj1FU-!jX4T0s$y`ybcPD&j8p|*!L zVaM!2rCP(SKD{MphAZK3Ky^VE&oC&axwG|I%xi>uDunbw3>w|l$Co`*-@V6X3cyib z_aKfwLPw@;Q+R`Ofxy5`;+oQ>t|#U&qx*tLQX5;Ygr9LG`{u1tJSm z1V5t77I6?%0^zB(#*#he7NzvWlDTvifm$;t>IlQsk$^sgm*ljWSA|J?LOm0|S253r z@43K@Cr^RZ(J`f16nj^)*U?6QoG6G>& zB3EsnJf=o+n<_b(Q7=zXz|An1MRvqsp}j|AQy~%)A8l*-%xI)qT5D~|X|^;>W!D=&hqQb zR&Yvkm0^|l)`qaJb-9DT=)$Cx~5lK)aI{nX-D(EF{v+TYw`W0u>2uA^7P#r zi?lJ(oDg&Im3+(vQjw+$7@|6vBg%_Ff?&;r!8k@`q8SIhfZ~aEj(f<1&%}?)o<_<1 zmN(JiB)2i=k=hBoAgMAgyVS%hO+n{<(@I5ifMF_jril$V5Kayh4=FphQbhT)bTk65Qtoggf=ex#v8 zE*c`StzOMjwpyP2TJmsD&^6pIPp3y6VW{zT#W+^%r&d|TGw6?q6{<0Bb|CFM+YzA6 z4@P2TLoJ$9)dB2V{HwSG4XR~tp9IuU{lj&jL9ORe$eBP2&QuHNPfDHrQP^>Sq=uFc zTRv=GUDy%`;^2*Qh|0D<&F^@|%FQF8=6Fz5t>HhY1%ngyw&dCc^;Du2RIc?sDu7qV9@O4n((049Q$Mn}u zzxfmg@zTu9Vak*y6zt`jv0i6HRg_t1Rg8ftY3sO&uw`Dd}k#Dp;1G`JG^6sfs} z>Di0en-Oy>vg&*DiMoR-tMvYHs6*SKpd=IM-a4-M6|0x^_fWLm2lvqPdd!&+MXo4;UsHTpjhz-Y)oQ_3v-2N^s??|@552T9&#|W z%CUr6j}R66^-T|oO&x`;U8`RQmz55lz|p|J9!CwGWdSNFd_mDh6pT$*VD_*%*f=q^ z@<$Vwl5^p#Q$!0$n6fVhi$b(WSQ9Z)=(Ju7<9B2 zx3Rq7iWUAz-FBJJO;l-20J4djWEbmfM~-8ARz5@C9S^FQ>b?mbaZ(31AI6Pbg~ZrE z!#5#@)}u*1Y^{{#rDx)fnpI- z*>GK*r-)8xxo8;S&Vv(KXIJTKS?!p$)UE0UzT)&5PiHYF?V-$W+CtS+focn4#D`GP zcv?6u-~1P@-6dV!z}r1s%b9!(8HiZn!=X7Iad(zT+0LTTS)W~1$AyOI9A`Qz_qwVA zIlgcIKs^%q9|AaoUl|77gErqILCTa^pEVHZ;Zmq-6@OMqBLpD)3NoQcNhX?617LWj zC7q;e7_{aQr-R~5XZ9Lbp;;HX&d)rRKX{i{+eV97Zhm5+jgru8!oXcC;L2;xUvCG3 zf|4M@n4K=i5{Cr6CGR`6yac~lUF$&U%WB86!?MP*B9T2-bEHjYTO>bEjzm|p(4$yG z8yOv~wzSCvB?S2`>?FJ5>OhRQ;_dVxU*A;4aGnvtq{FZ-)DQBaq%AgAPLlvm+0x6@ z$8v&q%Hph95WqaCqJ{MH7==ZG$=f2OiQeD~A};qz$zBYcJjJd(XLyFLdENE< z!*3AeW-VZ;gfhz{X=loQXKqnGn-PY&)~>HFSW`+^6t+`bz+VJRQ#-@3i{#qLltU6T zq#}B)rQNj^ksXFLL-USLSy2)u{KKBW#=bE3$PL5IW=tNvv=v2bPsAJtj8zFmWtOM! z>r@Y?DulecstKcNe!&tir+kNv6Fl23%dBA0-$;1^gu3H0NL zTI8AKusg;EpuM@49eSF?Mq!INW0a7Dm-*pg8}QFT___aginaQfrh03YJgvjnx_tc` zwtQhGx#Nat5|??iY(3zF94h8TkR%$v@XwU3A;zc=x?xbY2PpA zLQs9pa0j}jF%X?v8{z&nGkCgNMVIc~BFB(39rzWu7+! zEX-{m&a!0jXKWL=;B{}O0r`(5a2rDj z)6an4HoJjoE|B{Ewx!rc1=y5_9Q&(SlHd%PGvs`Qp(my7n3~G<-Jl&aYH2k z916IYci2w^OzIMZ6={!*#cVdwn{!r>BuWcrWxRl*1=Dqsp~(}yIDyD5bA0)jIF5PE z9kg3)PNzvgC90jO-MIuyxT~LQZB*E^$<6TaRC$qxR<8?q=Qp9d_!s&ABLn<@*DU|P zi(=VWnVJ4u2KfK@hd{nWo~-}*hc4nE%(GfkMFWnln}+h}VYKq;^o+;Isd>L&I9WTq zH1>JwC*_rM8QMtN8X6w9)6d3Y#gk{|rH?w@9PW+OiW1#9TzmwvYiz&yuy=NhDGBE* zywcU*EZrUJx-0EZ^)-2>B2pRu{;pB@+k=SspN9N>F2k4`FzH?B>%jzf=syvcx4SJj ze~{SocY#H3H(>R7u&PJG&-vMNvnu5{+`VV|xP zLLqxP4(4*EUw1+w?RFD?xcRU^f_f7Xg>%!NyoNl;w(1=vM&`RlDK0>4ACOUPT?Dzv z=m6Pp@^M^&Gb4$kumy~qIfvn9S=W5DtYVJLhMQeO71nM*B5nh%OBfh<5_-m2H=+%j zOQ&4+6-xOG6r{%$6+_ub@Pk+xoJQBd_pk{EwGZ%-kxX~5m|{b@3w;gKnJ*Ee&T!w^7nTv0C~hf@>mu5IaK>PteQyB2fV5uZh2cb$dnJ=605=YOW0g0|#{j zb9?-KYvLs4sjcad6ogt{g-+Eg;%8G^3TCHZh)4=E$l(P;Ap!(EdtbVk&LDBx(w!tO zKkq~LN<#AD(r--+%H%xanWiY?H~55Fcl6+Fy`Xb7WofVfD!l6fbR62n>XwnT!xJb; zsnw2T<@3%fnk+Tn$EC)p}4FqSZGx{9SI@EwWI65Eb zNPxAbz>ec3=9CR&19AyK=?+c2Cz05OT3;uO!4Y*q<5pUmJ870W#xEGp_J-i>aHM++ z!Rt%G)!-Hlgg)Me+8~9P#x`5fb%7#Ipb+Tcf>%LIQoo^7OLgRNpf+W(MjxN#AG9=& zQ~mtKi}f?v87%WCD~_M+PD;~8s9*^J$i5=|I(>&Qi-zeji!-Pmzrn&<55lrBHmAm+ zm8CrbBhrVB%`!*^+{epDDb==HM_!wh1^rp4vS)x|ZN#wL#+osAt_N@Lh!Al2+2r{? zMX*!NO|Xu6#m5%*`9E+;jn?Y5h?eQW2KIYlNl=+2*AoV+D8D=rHoY8v1s%{1i=Q(x zm)47aU15pq*H>f_OeLL_$nk%&U+K`2E2xG=bQd}2>eeb$An-*x-`8Dk{&va`M{UAL zgHDTNZxs(QrToM05{Zz)Pi|%%-w4BHOY$;hogz`QjX@(@WQ!q$_xWxDe^ z7^lag%{2u*cprYq0&|4RPH2bHVu%o(3Y6Litnel7@=M?K&?CzA?H-LJUGN(0E!7PN zMLSF6D<1;c%@=}(F$F*8s20PJQZY`>NbS{yw_HGklsSqFdEzg#LosbW1f`qb(c5ZF zDNKA~57YJI$<&(lVY$m+1sgyhC~UkG4k)O%NxK624PdUuCIhm4j2>ct0UQ6Nw% z9Axi7o>bIvV$^8Q6SE~xX{C(t0gK2kHzyiC7TBV@4|hDlL&`G0Vd0~*-vx)+&6Ei}08o!$AHXL8x$8*kCVGa>l3_sxuh zA&P<*)WzHwSO{|^GfM=+pK?hmLOS6G-XGa)!uz(GMGn|7&kV6;V&c*y299&7@TtW4 zqtSu;YCfXWyAflw^`;jNff7QLOR_LO;Vv-H6o+|> z8JweThK2qW1UgfE=>tpqm_GzC!9_f*0Wg5fE zXBxfO090U)hZ(L@2+<+o_d0aMWx9^P6dyzLoo}N2y=Dx-%j0M|d$rph+gzMw%r`YC z&)AZ5c=7xZjCoo8u6r#OKO$%^FO!3HdN}snj705cD=NJ&ZzpcTpdJytlQ#6)D_oV) zfESifrcx4oQwq$;mjAdYCW(Fudax)ZwuFg)4oZtTUb4+{TXpnz83GQDNObC8>Von=uygpy1 z3bv6R)Jzf$S`_`TErY$VJF)wzIWv#9kU$LApa`Fcy;_3yyhpjUz(g0ZO(B`)4_+xj z=J`X+pV0wQ+IHFl<31l2+~uIp?%czoG8nDtzt1O`bH8r3fki1s%N#?K9c5{kJocqM zZ}Y%q&86T@EpA8o{22FYw@`f5Yp1$>eSFXoQ@AN3m>ruaPry>ROE6pia#1!;a^sK6 z(K$v)q7BiX7hLAcFk+ITd-&FP@z)Y8WTI<0MVS1`oaJ5Hu&^4&r0)LLD$P?lbeq!m zVGZdlmNHB17h(L^7=2#*yOP+V7RLj)6_WYIn2CvSZCNO9H7B;!27VEC^A|KvGrJ;W zea)C8awns!P$)gS+QXa*NBI#c1IH_sar0}~#K^I%GN8|}YP$*$h3LCNMPrT+@K zvwi>1YlXE^1VWp0QtbVe%G-DwZ?YiDeEv77)&Clulxm?(=tA_d?uB;ahp_Q}N{zd8 zAHTXN89)rWwo7WDP3ZqK+5*zsasMy!KQr<&{?B;UyE)%**m;mZub%q_7ymoHnY27Y4jL;HoQEW^<^$t7lVUu+;pfI%f>&0-}pd0{H=AgI)Ie z=wzX#MqXmzPoQSx{9K!2A<}hOW@nFZVxl}sMKF46>wulTvDuFGqZ8iC>M9)aYf7r) zKcavJ55fr*!`kuBXdx%Y%an;Uv0YCu!E9_2{^_I;3Ls5`D>z?T3v*8p6H0iSfBR2i zo;PV)9$O>7L7j?T2PV_sEG`3ba$5zozxhoij^U%91I|se-r@zSOYg{6f=JUh7Ut=C z2J&=8-AeU*X^{ZP`7d3WpY&|ATW}g5-Re6=3J`9xqr0U?jGyw&)_WY&;z_?p9MrUB zjSbw^iu8K1m5H+I1$;F9CN9IIjYrj>s#H!IC41!)h!jU+MMl=)SZex^$3#z_W7rF*_p1u}GZWkWGf`6vp-XbS=15kagqiJIWQ^)p-3l z#kvjk=LsIX8N&$u%vi?sicV*}C!7Ao{wTLrGEB%m0gADFn#uiZPe!XAlwpYsA=AQs>^8zg8tH-Hz^G!25O0 z;`SEO-0e7bTXK&8EU;2g$u>1WPSt3g*(z5%Uc*<1s$9-gRNks97YwTM}IYWLsh;*1nlL_6Z;<)Rzq zKYgOV0D2PP2472{-vuH+h?)-m!&`W|-bIYoU_dU{MuHmIPRoNBsvM7YuO~~dXrtVY zH^*o#dx)Q`mUTjiOCcyG`^*xb+0j!IGEE1lPbG*XW!;$bs>13d8+FW>(*psV36+~id^j>M)| zv^?gH&fg2SeJSY%DRNe*$kIIhxpp);{IIbD{)DUZ8{!dX`0U2%gPgMj9XOiUTMP3) zm+-g>J$Dg+LH|&sggcM)#|<;fSSmjzxo<6Av}R!u*fI))H*_D&mXq7nrXm9>n+~$* z)}6GPFr(?s_g;_m0B6o=xq`q@^I@GIYk6ruP*rhHAafCg?K!qayUTI>;z_hr<&SWV z%qb+^CqG=`vQV9IK)GnfI`6d&rxEeaE(=UUSwejZldfpyRx0a`&FNf0AvsH#+r6MT z?U(c)a9Oh(=tG$+03YXG|97ri_m^6l5))oZ<83K`khg(^3N9o&24RL$*pChmZX-&5OO+!iyPbH|yb@Uu zp29h?5%`qm>^9{fAuvLKo{{&1b$~;%hEb6h`U==wt;ap*jpQ@7%B4}s$vxPt#h7#M zr*mdpI+5r%j=eqm*Wml0^eV<9ufvPZL`ais28>USip1{&50Q_e_W)sG)`U``VTYI_ zUP@4Pd1KK1X*K~?ymvL*sH-nJI+;??b)?~0cD|5WcIoFasG22Q!U@cR>K-Urkly&! zp0+$S!5e+hYVLu(f24!TvCSsagfCO^{NC3fTLmhZH|H<9TXonPa?!pM?{Qu2zmq}} z!08diP7|!7qC6o1$t?M%R6dze2BK}~ZukQozm= zQ*Gi;#~R6SSkr~ZH!bv4&iXiZPD&%U&6#&STM zVOG%MFY_yO<$u%+zF`ES>9yw9L3Ie=5+o6#F_BH{FU(tYx;b5|Wo6RA%eN7iE({$M zqxw`}>wi)^8DXkNWp7iE$&ju7F}%y1n;2s(h&T|XKTU&Qg)06aLke1^3#Lwy)(NTZ z3wXj$)dTp;^jLfMGAD|p2Cug96#^>2c6if5XViZM!e;oC>22lPKk9FM5#r)E!E}%I z#s!GD(Ws$4^jcv>vb1)IKDd4ColmcYQO#EzWz zICdioiEEIOK4EyxbPNl3)7=9p#wJKniy!-th4CBtk(WG7M|YyFG|T&viNGZJp`E}8HPtoXr-fBb`grmYgPTk6m7H%gG4?fqD6 z^dv7@m6#8m!^B@W(Hh)mU)gmv!l3O#!qdKbU$B*aAOR@l9RG8Qg!BIoT*%JE_1{w@ z{8n}cQZYNYr$0oOlB-&vxVYW9*4X5;TsN6^uR1wsj2;Q%FGxH-1@lB2Gc*-(HiJOIGy}QrEhi{-uoXL z?|tv7g7JH3SAToxr_<*NA>{M(JsB2FmFTw;(I|u-H?CAqc~_tRI^qu_OLLTAR*t_LNClUU5z7|BR634Cnm@71xoBTBzcKnjw>Q?73QYp z&AB8H^k^ke)fWpvqf{`O*YMEXAgw9=mMCF{>VIpRlOR5^|D$PseA@ncUw%NCxoLp@ zkEYp&=c#`{zkV$G*a4c-PYlm;dCyAVO=00lI>oy6%F3mYLw`kN+c&!M+{4}?$@*&TC$ zQ6TZ-EK?UFv^M~G6WIrI9l>drN#z?(U}xaR>J{;O04&3@7k z#xnpcw=NJ=wS7WVY3I5{YQ9-s4P?Y8Po!`_6i~q{^?GF|gCyW>wNXq){AG;u^+7#4(K3_iCEhp*0G1P{|B*`DxQbe9& zVqe^nu;h|K84uvaH6AnemU2Nayb8#aGNiu~Cq|kLzY>`gad$&nuqUxou^EQ(R7#&9u8GR@`(@ixhmU#l`O<+~j=$7BaSo|Ch5{4oxhtYYOtFx*-DBUYN?v8`2^HyAN`jb?) zR34jr{nAJ)=6WL;pgJ!ii(G~|cx|a>1cTw?y{^o%#xthjXy!Lnq|dH0DU{WB`#9*5 zWyyU^xUrBD7Um7c7hp+&(2X{(bP2mJ^aq4MoTQDCiC{j%G#tg}!$vlh*}2^WKJ>>C zy01L}4qH_3lYA3T*<2a@Nli96dFn;6rEW9#H>EnHf}vGRTdUCjaPd!rD!>FeGB$iy zedBvdKs8#sy2N*W)&TaTH$&70+}7Du%Uy;`?M)_3Pk=y~y<~77w|357aV(rX17WZY ze;Lqh!;0+dQ^=AKFog}c)X$y93w2u7SR+vq{La5OOAeNojGtMRDv+)RJd}hgiC_|A zA(2q#?$LM8Lo!3pAs(-H94lx`d&)XT?R(Ue1DzSV(U7|phyEY6c3AP<)|7gP2Br`( z(aD-Q5?lu0jWiHW3}}zM_hWeTduCJR$aPE=qY?xs!y)Grzf9_fM8@Mz289eW=8TOH z3HL;Brmz2D4L|I+_8%nVp}HP>84kbctM%NDb&mk6{c_T5Pr0?&y<&4jXsg!-zM$Cf z6IL&V#Kvf0i!5jO9C@ufx~fHdP~w<_2?U@`G%_GV--iDGJY!F&rB`8cg8u70P$pE0 z8_=moLRIJFiW~7_IYR7PTd_{7GuMu6lu}>#e*KxPLkSIRVXD8`@Drn)2u7#bGGnNa zyrVw!f}9!;NPimbGYNnQUeu)K5!z97H-Uf?IC&nz7Rp$BjVtT)#b@!Pe^_{r~_ z88@D=YLjCP16G(jh^#XE)@R+B$ibh}VlG&FS_i;`ZRgTR{QjWTZ#2%^huM?Yp7PBz zs>V@mu*J~AfuH0;+NKqZ|=o zp4G}!!QDO{sM!{htn31rvFrTk#G7)mALli%+|2x@12^Mu%3EsQ2QE#I4En<2^M$qr zWujLC4(!7e>KfR=@bJf01L8sK1qN$8BgF#UEs4Mz5+m}FW{JgUq`}&NKC$J(76A$e zX);~9Fy>7k_p|srg(M#mbc+x-x&C~=y90sw3_iUJ-wc8`iVO{xJ&0v04JcUP9e!VE zV1JZo7>h%Q%_=C>$W3s4Z!8P=+7kzkZGJeYpA^QH!&PHe))`5+nKu0nzQY-5bP z(d@FYyNu3D@K>D~A*i1B3%|O2(>p|D0`SvPCclIV(o$8cIHCKuz57njp)kV^<`4}` z6AcJK3wyuObk~SgM7OnMidL(D4Ha%Zm0AE}l5eYR&_ zouv1=6k;qddbjB1%L5r~#3s)q83Oqen~1gR$WPs5M$cc2SvXSpN!0IhJu{W5#J2ny&Zk@=IIpD@q9V^df!iWP9_~Z{E{#C zzBuf-`Dl~k`0C1+PdmK*}AK^I69y)`L6j06Sc^=K7e@oxmzGqn33301*)&^CM2-wN5F@!Q|6K;A%gdg z#|G`(&}~+-ATl{exseID<&>(#x&$?`Zm_I(xJ?Ohhir3t|NC%_>%WcP*gV)CII-#L zef`-1?jjLygUyvX>yHk5jG)MC-U<)1Z56|;{>8Q1?pob7{ytvisR@7D`yLEJPFQE{ zK4%+|2}PQ@aoiu%B~In`Ns}N(PH~z33E8Z2_VzqVtZupQd{YO zF(W9W5D-;w4~PGXBK z>k|1|l|#*vp6zSa-xxG#g<|a80D^ze4{%XN;IkVM@B5wn%C;3j8NMQI z_UC34O`?s427#OsycH8N3qV*DsqoD~UsC-C3?oV_Kxto!&D0Mlt#6%C0Xex7Y9Lbc zGjG{X4JLN~jVM>{`;t0}U}zxxdB;pG>@T}f8SnSfpBY1f+XilJAjwKk_GbPliIn?l zrlciM-Rp4&hbioKSiYoOtoS>W$xa_g%QQK{@N9V;Kg7Zm8ksK`0}~Ce_ArWY>>rj~ zcIcbJmMQSN3jG)gg*v_ND0*(rajXLnG96s>W-tW<>HO4ypxDNaNm zcR7n%v>p#jm(x+vc>9aI!Ox#{PxPAZgP%TMIFO76DUm5I*-ORm%nlWm|Fwr^43NV1 z9Q8EMIJl&oQiyyaKk73rLkb0FE~)UBoJ@hvHgsNvT6utDbY8!pRqD&bVyl|&PhVjs ztlblgeQ5Wk4eVDxW(3<=?_@;*tRG*34SfR)u<76hw*QXyUs~4q*k!nDx~ufZ{Dnb? zgI_-6VUIDWrQTJJHm0JvSDNI-lu}|9R52@COiY#F9}gZE0n+AO%8(9Yq|8jBE@`zy z9d`OEj1>@2-HFs^Xfo_^lj$#DJSs2R3#Uo@dhjO`OrST-XTe$gj26LgR|X!7Y~b2- zcb0kKFqgTPFq9l>(gWfwJoEt1?KBo%#^qsF`1%(0HH=;!(0Xe`Qctj%KgeHm9 zM#i<_>n&0N!atLnZta1kC!5Z>;RJ@Mn~x;XXzgdtQp7ycsn?60%ljS(W%WM{!!>%; z=P2|pRFl~~iw9yh_j`S)O9gOV41YkSZk;!nnz0YvL)oX4HKmZ)#7yDvokOJd^NNDC zdw%}Neq18uR?3kM${j|A7x^5U_^9Ev% zvDqQ7rvJmNp^3Q?dw=zaJ-%rw82z4k#U4wt^x`i4(JNPY<;#?{o?DIUuTg~Q)hb;I za*Qh^XdYl5i5*IID_+07a7<`El)QK}1!kLZ=4?Kki{#a1B5~(d8+#lW_yhW zfo}y}#qLYoo`RVgiebAMTc6<|e;NFutGeAB54_#PjXZcOb*Q##%)+{wN;Zvq&@GhX zK2lG$?vKkjYC62QmMENcJPVRX!}%3#NcGaOoUd^5KqC3YhUXuEl3J+mmQ=1wFn^m( zzw`*f5)}Y(L7N8j@az`0TM!D8Xwo4001m;_Dr1~PRpN>39D0W7^w{Ljoa1+#+C0$3 zCE7;q`)a^6@0nZE8c5SBni`*ZV&;n>{-~g?iW$g9Z&!dG=uFX~w-)n?NTGpex$cgJ zHo~9sT|o0mZl?L&L%pydK_ZpmCao{1CB&oAIvv(B9-zDpxV0P2b42Y(6S`GgYol$V2V9aR2E#Q@eBbH9F0%z}4lHJ&p0z|d{JJtJ%)-=HIkmYnO1A(ZN41{tU5nRO(jSYXL5&E~E5KH^745_Vu>lPN+KK|v zpj<|EmAOY?%^q_dIJf)>*3w3QH*>=73}VxOoyz~Bg0qS$kVCs6nMHmd!6j5Q&{v)P z${Z4atH5Xy0LRf-LQ_ZW+d*-gfng*G)XG$me zTx&ALqakY9rF2rU2&le7!r(NS6Mozq4qqQPBt0X~4 zF1NGn9AmXO@6#8GI}P!dmk(5KOc}qXJL+?r5PUi_ZnIsBj)=s=da9t6&2r%)1dOi2 zHWmH9Vgg0;w97#-?RV2PJFZ8s38*D|n!VMT3UVqfP7{mf>NjJXX=(wDp3WMN4Tm0V zTWb44UEA@Qf}8q%dfNvk{5>9Z61O(f=1UK^#)^?Fa=QucK_*u9M`X>rz7Tvgl@w)# z2q|5T+!AHNW3|?~)si|(j|R!g-`T!~NgG*>65+dMpUP&BiG80+r-Da9?@5pL^8e|>i542sc0D8eK*bF-IHs~u)aBJb`$NL=h_4Vj*d?Lgd zJxu%dS-W%)hb?)g6yPF~Au9jxA_rgvSDfzjy-WwRP7geBA#d895m4Lz=4>La=Jl*% zT=kyYWlv1)mwN#Z&Eb|N>C{#pf( zBC7_B&N+rQa4YPK_thh|K^bJKQfH}XK_JBW)7zRdXK7G zeZzKx1Hp%V*KfB-xyoXj5-0%RPpfO|aA`C8M?6Zv`D{eOkPL0f7WZZE4Gg88BO;RZ zA&3MG?05z=V^70W}MMawK6O;2gu6M`#D(=SC`{yr5-gK1Zv(GmE zmT#r}<2JgPZ^DUjTdS0>^Pgy@&vB+nNaA%1D$sG1GTHc$8`p1NvE!|O_M2Ca@Em*D zOd=x-w%}&W0};TWf`}I|CYYFdgI$9OWGAG5$xilSvfiKSHaKNR&eWK`yEoRrQ}Q}< z*a*xku7w~{t-PW(lu1oQ=5r-QeH}afS2QL}6t|jVgRNv!ECdBLTgkIaMtX91NO5df zUWU`~g1W@p#eMga?C|{qP-Dus0|!SGH_UI$kFH;u%95yD?hFzg(ei4($qQ52M7!CU z1!6pfxLT}gx70DjhOt8nRh$^oF8!cPyv|}%)$LK#76D-Zja9Ir#eX1XLghN~pCKx( zc#AeUKn_4mz*H!x1b~Y&gvD^8uu5+%t%~_ND37Umx_;`@^OA;Uy!>M3p9Joigk6UE zI4g#eRJ6^MN2*5K8L1^Il$j`NY7{e)Ybyh;%WcI4 z*-0`1yn%~Av3jJvnC_N7fUp`lA^z>&OdOPV^gX0}i@P{#$&K7us&3_wkXwAPVk=T; zBX84YBSNW;k$Lr+E`gGWlMLek0n2gU{S>na#Fotqa1aQtU=+++Y?g9|(#L|Wu~hMe z9f`bcXrhC0oI+PdNnNUXW2UO0_xRvZ4F8?X{L~(jO?Ws2-yIO1;U_`rO~IkQ_-k=^ zh=w&5t+dq!xpD@rQyd1?-~%zq)t4W}8b<(7rvI_Uzlz>NW0oGa+PSboI46e+vZ~K* zCFlroh*zw^B=}GU?&m8&Q|5*5UthFH5@fK>JT69Z@l7d>O?18V$)~^U`=KUfAP{6L z*cI|CYUX?*^IT{6QY8`D=!rh)!Us`W`A2*g5z59fK&!l}(49?yko&bzdrS7X{`$qb zMFYd0wx;2U8SQ*b+FOgZirlcDAJl~L>F=uxBjWTY>nvls7~`73CgaEx-hp?#mHW|$ z^f?U7L{}Mq-w@ywroTPLaSfRJv185d!u1i44z(tg5jZDYMo>OORRRToh(XWR8iFP) z)?QLXHnetgRHeSX*;~-`i{eByQg9M$E`B~UoXjMoNzNb{(l&i; z^n)3L%qRCb(DZZ?sKlRM8+>8>~zYV(*`X}oo1-;!OMcBu3rW4Nv&_6gmJh8 zUJsTZL@poc*i}LV$xhhNmwE8Y_aGs5BetvY_CkVYA-z^Us(rVrc@k7DM&AjV+biRi z$rV}R4KcQ&gOOkPWO^`sKIpLMjG8oKWW!! zGD_Hz{B+mKGF;;v_J#z=CyP&nk4bUx-ljr43}2~>!jC3vDwRB^Uo4f5$GJXgc_6Eb zg?#|zhAw9(8uv$X-Bs_1dfeuwipC;d&sg}@GU;3&09U`VgFO*fS8u|l(RB<77*9ze zrS#Q@(1o~?F5n0-p2tUwVMb+UAxwl)l5zi^aRK?)0 zo0c57Hn#unwbup+&twi#1A!ld7ut2-tOZBFR8{r;@M?o?)eJg3iXcfZwBnwMr3PKx zO}}!fuatpOszyYXVJFg&5*<;}%Q=en8a_{FB`Z@zKO@>wvO zqEjqrt0D;6%Dddv3%+(O54AVPTfvf5DVUe0MXQfzW7^V0Ef>MQK~nd4C8iUN&*CKBfPt{oeusS1C-0B z0TvV7YFB^i$uF(4?zvZ&vsI-=omI$cY=Vqkia#4CPbL>`ZT!~dOA9<;-VVB!`_xf- zK)BII7Djw62+-3V<1ttI_cIkq1hkOTZ>H_j#J%hQ{Pf%_oO3`v7#Jfmez+PZ727~m zz;ixAv+#Y{W$<*%O(F`6fcBgq1{$WQQvw?j{js5t^qmMnv}|g;Ky8#d<`8-|DWpQ1 zJNL{>LZZyyLh2#f^^MZQ8;bFG!|_!g&fP9}=~CxFkY!M?{bviD4?!v_XI8!wPd!=`+AFr7q&?jQ#-2~wVaujzv@qI~+mEu^=UaXV!3=%- z&_|4HcWo_*pZ!;1t+6nQcy1$@KNi??7_PN1Lm2mMh#asryP8dEnIvUU4iJqZ(S7!T z-`h^CrXGuA$g+)EF{eCMGUMQxD0oul|1KFe0;9IpP%qPi8i?;v5&|NSnPHge3Awu% zh0Y8u?j?;4E)a^W6zV$LYQRLuKtB9Z(WZM|Z}XF@edbP~1PSFZigj7~@$5&%#^Pkb z)3^SG_Y2Jc`0U!4^Yk${S(F?<;T?uj{%H}8E5vm(524RmbQfu>Z{2G{K3`t0;)8f* z@GC7LRjUnpOE`t9h#YzIQjv`VDnNZR>}9qI2d20Z(;@nWKW2*S@qMgHYZ|!6A)$a^ z7K7cs*8$yxB7xUBTD8nKUT`+0we`16gIHpDxj&gIi(|;&v0jd9o^3>RyZ{K<fYw){@WC&`%!xV{T6n_@eOA z0HyxoiG(OMQizEE$3Wmu=IlN$jsl4}rTab#a?N39Ta*>~pa+M`o?l z;46+70|_r^1*qNE)HMFm2XN)QyWCHvG!?OSq_!`<7x6cS4xj%y6rG!H%WRoj^R~2+ zb{)Mc2!L4(i5t;f_VQ^i(l-Y<+3EmNa`;V`n95xd5ae3Q9rX74oKDT6&?!n~03kjD zsD=9es;4j0GiJ&nm1@fpj2K`X7I*x%I^N+DL}2FwUN0b#uI1^u`i09`M0nNXHkl1J zbF;~%qt@=|H6nw#Yy3Zj-ei#N)(OF4VQ6TiNQ9pf?{q_~>3azu%1%T6AV#J9v zw2DU=HalWhh~@ODjK~{6!IpZSgAJ8YI7!!!sxYhNP7#skf@gYC^{MDf8)VsceLTE- zU{1GO(u|~nNJ;VZGk}*EC8DO_dYz&|5!uACK0LJXpM6hOhilP6SsY5ZTksMxqB{I| zDUBz!2Dl4#CL6x49ThgmWeXfNQ2u%YuC(?(S--5f+D$`1o1$`!oqa^Kpf&m#Vc9xu zMc`3*XGs`~gGCoDf@;RGXVta}7R?J(j^ZV!F2`D)sr%y@;`)^@H4q=|E&+T(APSZ{ z7+2;(y=o81Y`w(zZ7&$-ec{+1EgHm11swCDA+chBo3mzHehJkjbQlUGyB#!ym> z{@CV>#R_a-;$e+$rf3b?ZqkaUpLGm6DM~|G$veTnN4YDBFp=g;>N-xk@ju+bBzT_ZflIKss)_WVDbRN=b(b&7+Z;u z8=Woxe7BDgg3)fG8l12oi|eh~cP-6e;~YYh-9R!ddJAOIL?`@uwcmGujlzMlnlira z&hzE5R!R|*O3;;AgoH`#v3d!*aE-gQquHvFtDM%Ud zEgk4;UEozY?-&fW!{Pc_ck>ln|A*M^6>5*T?oUVqp(a#bLG)md;c4i1&5eDC*tGh` zMfdBU%^yIp$VILH{T_zn|4zV-k&S`n|F?(H(6QTKL-{>+`sow12)9T;c>+WMeQ&NA zhH`ER<3aJ!H(p2FpU9;kAM^dX?oQ5OY3Ue92m%e4Q6RZ#4@(P6dwf;dN`_Wqxg3tV zt1M+4PRVJcKUnj8aN+LUSiLiAq@i9&zOdxp(q&VB%3^iW>h&Ji?e!V_#)Bim+tW)e z2^5h&$)p}{P`}k~Sce1m`x>a&+kLX;!1$p`N8pZJvu4E6zX*p+9sJdaw#dDuFlw}$ zz5Y^eED0)DOUxCX=k39V>j7!JrOxuff!pqn_k#iV;h*LH#sku@y;|B}fYTlvP{5J4 zsjuFvhY5ko?A%U(pmoo7CN${YNb;CSdVISaW;)3^CR^4ZX@?7ev8^-y0FUR7`&Z5z zG$=8#AnTR)a$Pf+0GG+|5<-NMKwm8@ytpu6zG6z|fy8IT@oZJAN0*pAX;xgQ<}{ny z{qY!Df9GsOrTisl$J=Ex_v)rZtD#>xm$z`sVxcB2o=Yx9xe#eqjjV0V7^R<$!|Re- z@99zHDrhTvGmrpuHXNcagz7DHM2i7g2Q9|bHUj@bavisa7IC-_*@iDO!#E)VpZr51 zsRG9Jfp6dhlXgjo5*vtw1+j5QNop^O4>hWeSDxMU(G5kmAkXJ;z{gJ-ynn7NU({1y z%s*GIU&<4dfOKD=)Gz%G2Aq)nrB^B;Q6o1@^gfb!cX+7bxgP2Q0k&SAWOfEjwhE`> zYgGZnx+5sFgTOrP;z>316i8Sz4&!X@V>3wd_dSF>W&bV05oB1rA5GO8QhTOKB6~GS zgBlQS%F=_cTt#U+`6oCN?|A6!Dy3RI;A*)N)x6u{Rwt&sUZb8&dgFdmkR68slCFN( z(r0q_2yAlFw>ws;U(WTN+*QNnc#98+yX^A&&clI}-zpUczzZ~q%7h`Ty|tzFVc|o~b|NT=1od_OPuRV?{ZvTkdOPk}z&*<`f@Cr}(si z++bRF)_9&Y(n$*#S+C#Ez@S6P?^1bQ$^ zJ>|^@CJE!39|j(Fk+Z2kmZ3t?WEXI9yFTRr!;%1&hLL%z%g=|qshHCX6qpKk@xcdh zy&V0I0n=-09}JOJ<1Y#7MMGV7uBqCXA)GC1UlwJ}+4x-b(f~?0Dzi2V`L<`5+%I_V=dOllS??r0miqDX%erP|*?^u-8_YMJ`LJtNH3j%RNJT6M)j zT(E5@j`4y*y(Aey1vVCvcR`(OU`YRZTByFau^6LVeBDVFwUI#&1TQonvCr7;bSw+= zdLbC#<|gZ(@R*Vr5DvmLeT?m5^r$P8@rGFZuKKRHP5P>rhX#9 z5b_lGPfXp+#rjXj9Z>~Xz(Z_f5oN%D^TpS=rSW%!qWbt#UOqAg?mJ&2cF$T!U)wr! z35OE%M-#(ug;J0;@U``-XvL(y3_(M{cOwLr`U(8F#nR2Ja26qL6;fi!^&#-kU?&Fd z%m&WTK#lN-C&W#zT|bq7VH6j-CUf${sUI^IA}Njq@k>!rs~R~e|A`Mx(9=>i|K7-^ z^DcRoTJSCMc8P)nA3pB^N7dvRER|_bV~=(YqT)azXkMJogbG34c@%>BgpILx5Co3-M3*B(5$3hA!=5ljqxYKG2D^r@(7}6PPhp~6Z(l#>7 znp2G%O4%vmE01-xAS*A%9LF&_-2g1{lY213s!_%R(e_PCHV#jd+doJ$s@*)OD*+UO zsogcRn^=<~Ja@hDIiDdV-pVL|eULPXwQsBre8D6*1~ub&muG*Pv}ciR;zDG^lNBY1@7CXaklVFcSWRr39^g z-=AKQgFgVER0m$KnXXzp=oY4SlH%lmt58Zp=e~PceGzaZD+Z~-yw{{QW^0LD*)rMu znDd|hj-PiMcI7DJFcXyV(f?}4$o;icKV&kEq1E-Bxc?3i7Hsl&CEZ?UkGmE7?HDNF z8QY$Oe*~WtPOca^{Lo(jh9vy&CnRQ8rvD`n@*k!Y0ll1|rIND^0ln-mndz6<^dC|c z0V4+s3%#_7t(mj=FRF=??Kj!l*~F26{+BD|Y$9x8WM^!`%j@L)t21u{3+0}@q+?@; z-QN7~1n3JM_)!QMW$yMiN2K20h&-!l+!mos#w*AhBStjV)nq*WaBDiRgYQ?$1uiU1 z@zBEor|cBe5SA6|p7VyABrKXn*Z_*s#Q@sEdk^YJa1Z**7!k_I2C(oKl?xEUTmhi- zN&wB^u6GdkDyON(Pr(nVA?__7L{GA-vY&$IQW3AdAPF)L>V5@91r?wsoC4LWuK=w? zVLf0OA-ub^CTM_+=eHtHVPGP_7Z4=4P^60@9;nDm&>k`mI1U%muv&w-3W8)-mn+5) z^aRurgkv6%5;H<}H>hqsUjf9q0(Hi+n*3bBAKDD*E+QW0twGXX1VJM}-~?AfhN25d z*hKNSLfD>Ujlz0}5ORHg34J7=A9oz-OgQn5T9;H1vI_|XYNqH@V1J3Ac%YKHYQE>T zr*54inKMye2QeNbDy9gk>Y;@I$%jE?Rvc-9o`VE3C8*F|F)=Y-v_w3r!5(WEM6iG; zK@XtIC_$9JgcFG=KQ*31f{KV&@xcI_{IM)pGE=>utX%2 zK2YQwfD_^ut0K=LF4+V|fK-RdpOX(uc%&aLAGQx5)eB~cM+y&+dI|P3`}ekU_yZvZ z@d*&YKbIJqL-tngaVC$(lO8SC|s)5hK8@{_wBxy>M=ceBe5?azj1n=R%?+KdBt4 zqkK`hupgT*QfLe-#2}y#QfT8M@0UluD&*iF%cvgEdwm#Kq~Zd(t{pIdd_I#?HEZOM z^V6hnnh?+qI}#q7@?clmfZV!F$;V*g3W9C&3X z=b>IAn3KQ47`YUd4&wWf3_v_Z#6%YGMwmoMy_uTeiR5R(3DZ(Ck3(h*(uA%snZbX# zQ*aaz{YWig&r&r70}g7*=7pHpf(8E3!WwYwFCl~yR}jtQK1ww!6P#fTK#)))8!^rW zC;&+r>x7zvyvsJsDNLr;l@uY(Rg2RVGm^;3qm&_y4*t) z7ATg3C==-k-H7H!+*6eBzsDj$3WJaDB;1M{2jIt>`MGUa|7nEj&=vKTph*xGG@%zMd$0@ireQb;qAVp1s7M z2O(&iYrV?n*3_!~NxpR3Vf2&p+wk%0sdSZjJ5+fa^mNjoo$R0@;Jv%_RJlRBK;_Z+ zdvEQdL92RGPx~s*+g~b9VHn6pLv}agO_5h~{#50mhY$nqhwrGRPI{Lylw59O(FIAv z2hNKM64{U8qbgmsa0+g?fBF%29|km`ln*|3bp{9nOfed9zZ$otb+85hDb}<-{&I!I z_oF_IRtZg$Q$>a6@c$Ozyd1Tn3 z(R3UloP2{;nY84Z(95S~-O{-bw*=-ia{uYsL44pFWh_h`hhN`~Um-;!@YWz1XEYEP zGwq7sn!MFAf`QLt)$(NO(5z)gfn2(g(4e+tcjqucuKZ>g7Q94W8D*jret(!2^~`?x zWr#h4HW|u$k4)ygDfkjD9y1r)hLwy zw4(-n?_-!|6WIJ<7^+O?nuo_HcQ`|Z0@u<|GAHcKb^*gTlzV#9<0S_igMkG$JF~6O zhJ17u)!2G*qnF)XQNv{Z7AtO9G#x<7K%iQ1^B7c2f0EZik%M0OmMO}nb4;+bjpMsH zl?mJM8b60;FsPC6^`k<0pN(rXzDIFS2uk?eUqI+d&Vm z$^)0}nShOT;jB+D()&1UHV@uL=(9xb_TzT76JzmrSk$2-Vp z-dy+!J|#d8KDmH}I_Mgo%1AsA z*z!&fMaPcndN=@8; zzu_tpxm0M%rEm;3g|{Jj4JR8AK(VM7oAVqHKAsuAQgmMMKq!Ek@dpO+*)9)h@9rl|D&8k44Dq2#%v~BgFLIh;h;R|Cy!4PMrj9(Ly$Qj_8>} zQ;y(n){YcXrUUZOyLkAw*%2gS=Fg?A60^t&gQ~y%wu~$hJ1Y&IiGbX@qBVpkq{NeO z2q7~7%fjE<*xvd-x{>6;-ua5F?R!)%}mI6OZjfiJ6Y;3(iwd zu?fx>>-XFrLr}LO>fc4Mnb8dXkF&)6(H5{u2<i(9c5 zFLF5ss2zj`Jz=7F!w%8BQEEn8?fSN+T5(21TJuE0cZ=+KwtZm8?chqP;K6e&pn0KI z4z{~8Is0%$8za`?uZdqNv@dqZo8VNxzow&HmrqG*9Ohoa@ZCBqukt4E4eLMLd2$vn zCLI^7v!>~%4=SfUTWeM(9rfCD>7)S8@CdiSX_}M+m9OlV<($2Jf(yAuxS6s3HTQ~9 zby`3>d=^uJ2o(rO_n~EiaM=>Z zVeCbx54nM9PBxeV70vaH*%clj<#lRbwj4=!Vs`Hw)B`lnAynmMW<01)HKj{dR)tAM z$@WkTD?e6b6w;^xO3%*548iy&)4JqY%cNacU@l5~f+}fX-^j2w79`3-vsy7QY_wOp z=s@y3nW$=dfF2#~w+>rs^=v6O9v>NUt<|Lc-Z(cQ?}VbI?l~(Y%N6wwT%@R{RxQ%0 zpW9K70raS?u3T&i%}D1oJMWmgQ>koMEgYDui)X-pw6PhB>D%CVZQN(`UbCA_gKh}O zr}59IY+q6Od#K%EsSAF9ZD1*{RM!tTO2e3tQ9X7@p>>VjNE!`6XKpgkfyIOJ1CN#UcFyf({$pTtSw%j5e+u)K{&=y4-;Tm2rsD3exV+y;jLkh$M z#86wRJLwT}yf&yhj|L}x8X|T;q?ItP&~uG2+#6ggd2!}kQ6{OP1iheto-x{IULmTE zee7tP0&rBi<*jizWW*k>(G=yAVoE2L1~mks_b~j6O`KTZOY;+RZ8?%db(QT^MV}5; zjLUPosJz!dEH58wX3-Rf)a9uJCagjbUQ7Qr*P?id-TE{x@ zujqz!JjUY8QDb;&xHeX{`qRH>)(1ldav76gk1tWkk@V zd6>=<&7OexL`Es=j0J*P#-ziG!NS}>`&DtQq?cB!H730G`~AXr*_wW3V@y+r_Ts`s z|aQ zx#8Nouc*cgoi9emf6;DnA1FssO@N?exoqV_OH-;aMbSG}Ee?9oe)wW`;MrleBdoh^ z+z(gw(!_R?FWsU=b|v=GdUyw7t?dg~#lQ5;?ERJP(Km~txp6T)pthC#C)DjN&IYHB zu$^QtOU>scIB@r5FT)oOuA-wozTh45rRNjVmoCleRGjIi`#3$zg`9nH3yUwNXK@xv zK$c9Ed6`9XrrjG>y(sPtEc-gVuxnjU1tY)62*_AmZ2t<3zLJ>-9abH-T85ln&DylG3sO_v=~B&7 z40r|#gfgul1dLbBv*?KfT{D88t9yG(c|5RDIvO~)EL1nY+V-Db9UR|P?xxZepG0nP zwxa#EpQ)1_s@UtEgyDcevXp7!2~%afmplZYZf;)ICDW%UnjeuBzcGq*vnWe98n{1g zbonCQh>GtVRtvv5abEJsr%mTSM#kTMh32v1y*O1;f=7T^V$$VKCdMnu;f5G%EiV~P z1?SxtlpD>IrOyU-l~V@#;jj9DFS+Izxwmm(5%<0qiYzUKs;&A^e4#ivM7~QIvSgd> zD!68~&y=%boeRD(y{6TcB2A+-T}xc!^dvWM!GK~tSZu>fT%w+CXJZ}ps?E$!Md4?@rITz13YR(W1;z=wm})VI0Q4J3FGUcuug zTBEiaJi=A{1eu^cqdpZp9J@c-wz;+KBHtIz4FmSQlyhydGCki4TM|eupZ3O|tm~=6 zUl-vlD}zuCen^y!N$)ote_R(>_*i%+xB zyp$4_2Vd)vGE>@&UzUXz$^Qh=Dwu4|cv zJb_JR6p?x-?nbnXDQ44Ski8n6luO|`ls%ZZ$DkVn5nk0|QXXS_$mUc&-dH}gH1IXU zokN_;C_XsYgh9ALTAG`IB;{;2KG+H<)dRWRT(6&c9rh%ZJ;sP#$gHHvM1^BKYtCg4 zW`{ilUArYjt&4DLPo37F;L5#)9h*TyZstz_rsY1a3Ff@3h$kQ0?TFha&#Ex|1o7d? zfdDh4zw7{lwSzOa*!GAlxg)?vMo|g~+4901tHlL=cT<>NV)`i!ynL5IE*z!-c_A{7 zKdDHVCqNct&IRBlaT6=RD#58UJY2oAHZ(wGqU=Y!G&b%lVMez5qU5@!h*-OSvbNX) zTUqf5KfP6b15l1zV#{4?L8fQP)d##tq4-p$~dz^q?~HQk2)4F}k*0RUhd zL3emkt4NC?bt2>M-JTw;ZKOEIY=;gy9Uy=sl~|1 zqQ5rOZR3lo_L%8lKDzgm=wQ6k4bT~4v5jG|mh%l@vC`m|^r18yMvfT9VMB2U+68!t z2kUsWTFfS&twrGSK9MWu8+xpN7m@UnxPc}3o$5SF6-0 z$k{qR7Ixl&{04^IJYBFw#muoRAx>m3RU!^-80o&$Y|yK=))0lG=-Q4(+Cs@I6if zP$g3x6|mSrJhGCko6vR3>M?LwZQmYsoh6X{y2E5_pUjzW7uROJk48QBK)Ncq1#whR9^?grCz`n_2GlN zw{NIGJ0C3J&KmxFlH8fW#t>okKhh*Awlre5@y*FA+5{tP;!C%ZR1yDyx^ z0iiuv%qZRj>O%o@gELi{ZcTfF^{_|OHsb-A=15i9R^&*vA(p@j%(*7Z1w=zE{(mt| zGsn+o+OlH=X2$VKOk+iQW0V+U)=5ko#ZzpQjf=)D!Wpy*j%pB0Qi`S$$Hj2Qse1oz z_)UFHj@ACBX_2sSim_JXqz=wT6Z{8FcoGzkEI5Wqc$kb(JoEUr*)T(U60LchtZDiu zWlh#(Svr@4e-N=9q@Bb`;wbT7Nz0LI@hz9!{qF3p%iB8(C7VN!hD{#tMMAtgRF@;QMHM{-H9rxZ2UM4%WE^U=9h&j3D}&_;uewp5bY6Z3O2d|j0Hc~1 z)VN&X4wy{%Y!kJO25RqxF3}kuQO~K7t>eqTjl_YMX0nnr4Z47)ki-W^Nx?1Im|sX& zpt|l=%w7iGE^>@NZ}Dc;_nUyxP;4cP0frMEOs(hT_hRpBLBA=-4h7i41vKHy4<+Q^ z0Zxx8XZJ7NtCL2inunWXFf_H`pAIt5Aag3lWMJkYO9EtG2r?D@N$A5cbqiktPAvte zh4p;@$0*FKZ|OO^m|u2-BZ4#Ah}pz?de$~lHCR_ta!EE_EA^+ZQ(NRAZ5ri%One~2m($1pM zwBm%X1z6ye_Y-U|Di;}!%_(&+Grs{`g3e=V+Z2+@n#>}5or9}6Nu38bJ3nsR;r%oH z+{;w%L28d~#u<~7aZBEYu3e{mXkJ5%uo&+!H3gL3o&t9f;k(4J{S2SsDDg-&Pt@91 zO5bY!yT_jWH?NeP9ivRtg{pMZX%?$e4d&@gi)HCX(@a))P?p--v#%e}0XO#y%?HPl zV-fx7O5MyfOx8(_kD0Q^g#n?;D)bz-MdW)?>ide2$FP2S@9oHwCZe9qjWx-0;I3;6 zQq}jnalM^nK3P91McGZz;k!yV|5ZnnvQWRD&KH<*7!;;z&atM$K4|)`%K>PbuC9Se z^3PthTg-d!<3D+N)$^ONlE}ZI63cRyDm4pB8B#Gti%5kM!fZ*U7%CaYil(+Q#p~*M zlp;x`C@R|A3YL<;iq9qUj;)ePkyL9*l1dR&87Y!V;Zz!Fl1e^Qm>H5iRf*N*Bz!4{ zWr?54iFuOu3lhFu<8tJ0XC!<%hh<5h&WU-l|245xNq9E$rq#AAY126po@-pDjG;g& zdDcR^72jPY)99iwFX4M3<*R49li)-%-9EGjO)*@T2-Dp=?vfq=oqHloUBX-%#zUn zh$fhi)}##8XBhw_;;#*IkEyQ!0*qjYK+K?$McXa7zU&`8n%rLplmS}@q>%~Ak7hkL zs|z`%Vx0sdCgTDvO|z*UvuR?u?t`ga0m+4-$eM~4&ocuwY0Xd83IDEwg%2a9WCM&a z77bgTIu5pMkH5jo=8XYkkXr$^>R+`5MB)q~Z)2mA5HLEczsjP3=Z_n}5+tWwXOY4T z#4*;A1SS-^WQi{)D{L(w1Q4dODQ062c&|Uke+&p=TtD0oLSo4hP&HdCh=m0MI<^H6 zqS#phT6YIp2PM}U%~KoLfdM1(|8Vvez?tkyny8uGW@ct)W@c!!+t6mWnVFfH*==Yu zGh-WmGcz+YKliDW$4X75P=AQYti{)dkA>`7lB&h(MN>YVe3a ze!%&vS}cO#%zEfRX*K3wD})v0=cuh2MaS9x+$aam;f5~-Uso4eQ@zQq^h0|CBxni2 z_H9#rVZ#dy1u!9meYbJoDxQylPQ&t0ce@aQA~!uC)WHPVgBP*DiqI`$gJ^+jLnEb4 zgA|}+48BX22%Uo>26^>tEh>ODnqS5m&7vFd3}7N#D24;)Lkxr`3CfR|sg)V(Y=VG6 zgkmSM14)bu0--<^aOxw1O~w#L!3CEHDS?W@hyMZ>JO>I0LtM=6^XJCQhq%M`d`p<=h zry~2WKbbWkrGRC4MDoK0Mz-SY8X_=iz5;6~wna#hS$zhGP{We~-^~~6425caj_p9~ zQ=`vL*3z?~mn(iER&&QV5=LABi(>2qV4u$4jy11o!SslH5(AzsHj+SMQ6u+ir^BA8 z3NZ{!U&WBne&YJ+QEZ4jWF#z{L}GXM2LE%#G><{s+(j0!3>oHV zU{&8N<|k!`@_j80U>F3LFPEETZPAR)Lhi9xKQ`GuEoIM4fkM|sh#B<685MxrW z*X@|k-d|4y^zVQP~Su;y91yCljjTq>tqEnEibrIJEUFRBlEC|NEnE{vL*pTZtQ)gEDMO747e zmj2-sh#%BVSg5S2nu%jQPj5d;?@TmVVS7qPjI5K#uIWHp9d*By`{I?b#^E->ai$fP z(Bzdc8mOP?G#!2hZ$?|j%SjOe_TKT}2c0M$i) z$q{f2<-)B!x(nUIc~XLh;Ue#4D-WHevdZN&!{tN;=yY%tW(06s49{h$5M-)|9H_d; zuQ`6H=r3IXP%Zo!Z8o-yC*-rgKUH6>xJ~cyhK_#F)yYB)YD&PTt#aLN;=*K!oZ~J# zMpyRdc^yptlj(QX41T6ap2Kj~40~4HYqrP>VCx?;5OKK3d)UguX3eZ}Sxs=Yzh=+e zXBD9M+s!M9SfAs1|EsF~0QVdIp4AH1-Jcs0jm_NV@YutJ%N?@D)qa#Y_tHGGq-B!! zA62{ms;WK8G#1(aPay`fNDu&VlU&nzSrj9o1NpE@5`A4qu2Gz zIRq#QpZAagKF!l#76HWwhGKXZ#b`N`aP;`j@1A0~@Xsxg5+Tnan(2c}>&0Szf=gpJ z9d6|wG4}~xt^6}+AyL9a?2$pR>=s;_XRvGri;->z|KvMd%RfZ=n_9fRdI1sZKQd*p z8eL;C^Nqz)W&Y{J+#$HUOp5SqA{OV5P!jM0Z?psXbL(FyFyL;LX!SNqN-pR_)*xuaQltI+o;rk!2TVrdZf9worWBKcj!~Zvy z|Ki~L|HQ)1_*V<=?^%q$n_C(D_^WK}%&dR0`~IHmzfFgoo#}tf!tvMRM*e=3zmbje z{|^@v3)^3(^nY_jV`ltMQ~5V^R=cCKaG93`89v*8>MQ!fq}MT4>*5 zN|8<3uferHJp@;5-^6Ed}v@+Za( z#IRz4iqG3N^i{+f2}epFh7Li+N+6P!C3Xm>507?`Ce(oX?1hGcku(l*l_VmNGiJEf z>=!+HZxVz_BNr`SVZzl6-K|BdtSiYA{^S7Z9OpxPUPDZ-TM1m0#R@ z5qpA>;b^~qL$)%mN!O_c^J59SM5JenLgK7T1&hWFfm6yT4gZn{wMh8|{5Sx~uvW5V z7(%lgMrWll*CZ8x-ODtRMaf^kzmn35g~4n1)=V|g#0LqE30yAEU3QL(Q9 z+6kS$Mjf27LHpO(P<+6Ub88j)eE|A}_z@!l$-p7{H!Lt977dK^hB%=I>pNk03zWzs1_pAH zufttFv}hnu9+ZjFCJP~mVNmy$9$Bw4lr^~5C}ImSK&U#kmb$ii8a>DdO%g%OpJ-<_ zPpcn$nD{&-7c{E(m-K)pqQjnNN}b$I51hE^ zv@Qci)|~aQ9SzoX{q0_wHWO=JP>i$BR}lKZe<#2#06C|CII|2Bt{ow*chqbY%brjy zJ{W_nDG|N@k+hU3FoMF@Az}+`0hH_;#G0!{SERTUXSeswcpnZlt7NPV!8%|2%ihjH z$V1oL_2cFF!pHjsLD&1;=uQ{GH=oz%og8oX*SgPraG;4dJ$&s?NK^8J4BuX_5FV-* zff1^zf8ycpIFY04_+{xr#Mj= zddpYHItbt|;7{O3yU6G#Se?OZPy5mR9aO;?k34r0cpN<(Z|o%|r<3=dT!ub{t3naU z5L5=ZKKtL4or6NpDeka5Tbl?R&fvx)f9!h0TdJ-ZnRhK5A~Y z+qIPmU!%((%TJ634&bY@Ls%lMg4l~p11&DthuMX3zOUp) zxmox#7{Kzp-u?L99pcD<@xr#<{;uug-NMcRFSv){Ry3M)i z8MkaYw3@(9)`cNjLqOB(7%HG!0Eq97E7hsoCBsPz{-={qVhM-VqH>wR;gIW6Q&T-& zfx#jFxNY*!msNMI@kMwSDQz?p?6x9$_&Wy@JrzZl3Qp!UOOgji<2@EM0_Er$ne>w8 zG25c>mu$AA=Tyw7xf6|JeXwd+Ks>iBpFK7LYr;i#Y~P_R!WCiQ1|EXH?hL%3>9jd# zf`Uj>QHFK+1npOV?{ON;VC4;Du27bMVAii{*^EhQ2Stg5`MkoOzFCVL)V+9RZzzm8ujM=Xb1FC(aMTzGnabFXQ; zW1BBV4xpBK<_{Wskv6|v{$qT|-T`NekKo?nYD#&2 zwZ78zcj*bWGd+MMH7UFlA#=pD+T{BcYjT$!${4B~_q1gP~6owFZWTyVV6w_=6! z*e3P*d9H;WvJNW*X^%Rd?|m7e$uj#O683$0wH8+puOleXCb&)P#f z?3D+|Njdi=ltCFAS|rDGq4jU_%W{NPbqS3N3|&obt=Yc<>c{1mO(?92QK+&VJHJIp zR*4iY5KW&T){Okt62dy*Q#?!)VU(E#E?Ph)^`fZ_S^&yvRRxZ$hp#TxU2cg9zriWD;<|=&G76c?#Wps|2-u^yqyE2za1$C z#D5;}v_9Tt9AEr3t8ts{Wa4Wky3D{1`Mc1-T=}s$){APoK*GTp1{jHA)kh0^wRlM} z8Lve+ysd;>9sx^zl~fYt5RCu5x|bIT|GbqKPyQRZ@v1)@M%U(;cC5j>N-4tJ&z|qf z4}r{mY05ZKZq#>q5bUmrHM3KfcYjvuGyOFe+GT0&QzVbrjg$ZK$)?Fb`n^U&1-!xZ zH#&3mocbe~WdyRb{RHP5DG!^%GuG)!KJ&it`V58T0n@YXI_E1*0VCtH?&?N$jh8Rw zYo7BboG0)Z4H*-k^&M2-ye$VDJ-iwAKFD!NLMmvcUGUB#E=0OF-v*pELSrnxCUAQP zRg6Ju+CZ@IO#sOo@#A~t43*0f{8>4(;QW1+>yt*a|#i`rj>l zj{iBB;`}cgP5vHA{5QbD$@xD9ESy|_#Sni#%Ktu{Pw2t+7ijcJ64AMypumtf&gM}52p2O_$K$t6GhM&0m852amRwsrf~5&yJG`j#!y#A61tjhH zJrB@3n|R&~J$bTpGJ@>udr-jc7$_P;za^% zfGvazwUq?}UIU;IgIyFRGXp6g#vIb*l#0M9iqm`#jF1UlA$f~=H#F4a z$`w+%vMQh9fQENxJRpkNWyD}z#2}{SVpOsh1FcchH@>c}MCB;l)MtsM0#bqzhJncQ zOAQBM>2{Jfh%QV#M0Lz$2F(>@2`Eb(0SYwnGudhbO#|~m(*RNztP^w)Tf`75jPVo_ zYUUm+F=D-h0RJ|IFQf{lxs}%-iD&N{0&B-L!`%m%ZimE;Qxbs?PW_JCDZP$q?$FkU3C zr=qYJ2r2#DjrJ^k*+}g7w#fzTW28rIsJS`79ev7`=lAFjE#hJu>O@W>cx0=sQoRVh}Ql^JoOOm?hA=P0xR`CYa z7P+`4n@DV2Wf+>xVba7lFQ^#F)NCq>cvc7NGAW(LP29hgQQqKiDgUcJ09>LhmT;Id znBBBvGYHD;i{EoMyjIeLU2>TIX@-sUMQknB&ECsO$jVCBI{*9oNyL9q^T^Z*NZubD>GG#e7x zT67jpeATU)8h8L(xw0Ml>2Wm#-%gKL-ct)nflhZPtV9pNpOB<{xzAwF=rcY3J|6z2 zX+0Z7_7PES+{vaAQ{DDa6At25Vgb}P5&;AgwiRZVFH=4iY~r`SEijhVCS-9nI&uVP zbY_m<4!bsO2zdNOWp;m0ctgu2PgqcZ?~f=da#@K5M;I(3}?Gxa+6SF2s0!4?lM(1TLB{_$|P$Gnh?dxIS9`>lGJt5 z#tfAF5F`b0zlVPqF)24PA9;{AFqC>py~x zOcZEhUPM*n&AY+Kt3Fje?nu*o^ktWss>Y zGIOA)*4$1&Z;y)&EfBXcQ3;ma!^#DashV83KtVx*kccPclVV@yJ@X*EV! za0vx}79|taMBpZNe-c`0LkupBj(&Rk>aj50-9o$12*ae=`Od&h=q_;y*Rid`LPD9J z#2~h9xCboflZ@rOm{8-tI|I8>6hIE|e9+sw+HZ)-Z{hhv*ivmpV`OPB%8ZEP$4(d* zoO7*>isR?yBu4S7Y$Qkhs?cP=zI;>KPK;{!lOOSPXUdwMP*w#PW5yhs9;vz~2^p)F zx;xJ3ITGk)9y|O}aOrfT7m%4N=Gn~W+1&n`bKW0rT^DYh9DW`dao!qkEg60uD+2|Y zxjI4PLIMGv6jb3>>#4a8=cB-@#ZOn2tT$S>w{mU$)a1?h?s^?@7ju_zmvWbJmvdKe zSA17?b&-%$(N(d*@t$L?KXzRy@e;HCS}}35o_n~SE6T^&p!Lina4Uuv0f-2@*VVIehp!J z+MYhQZl%Wyb}9peTj0Dsu)~IluWLxLIfsqoLVFCMy(j-i5O)J(>s{m<2(0C3@7|BA zRpBE$18agQeBWi94anSkzyq+E&B;qcj$%VtIzpuAgt!=jo0yHa+LtG0+U-SM;GC^N6 zLFaocapzb3bhSEg!Z1=TP5GjwH0Rv?&GWD#nf;K9zcWbT74PF7jNaYPv=yj4>g=eq zaPN5O+zJ*2GriF%Blc*wQH(R7!CJc?;&NskzalZNTMa0 zY8GC@OeJXEM>`%I_O!Swsy927q)_7s-iNF-zk6Tww7x3>vN()IDLcWcG6Gdi9_xTU5pjRrZcmOSr(0yTM)Mo!v20 zRK|5=>;rUq+A-yCF$fpazcoG(YeHK4 z^n1BP2)02777>I4vo!=oCq08>Ak~J7r;JA8g#GXW7$iK%a}e+~1uVhIG`al>A5ami zT^iA%siA<_cghBXzZ|N5+`MCX1gG z4jDDOq7`8m!lF|&%V!=G36QETfksQ;FDQ?!b2VZEvuF^- z_>sp&o*Mi@j>gGK;pgxef;7QDNsHx$%X%Q#Ly0LtU`hm~2%xg$B``QtoAHTUgMb?p zGsY87)%8c*N<|5Tq_>Tnr?~Y?VdsRI#NBcYHo!q)^)Qo%iw@cEH|vf>i@78$Os)ao zr?XfQvC7Y&e(M>&B#qSL3x-2AN$(nJ#FD5lqU?5zrXfm~DmRtZ z>HEzewx7Gb~MxtvrOY+A*$CW2I~6%kn8FIiNuLsSK^+OJy4KWY~S zgk3odc9CQoQ{@$js#CC(5t^t54Aqh}h=HF(FD|&BICGe3+1LOot-uH^GP~e*EL^8P zHZQxza4@V05|jE-V%&%ZmWotnUs2CC2u`(m+&(Q1ainl+iCJ8QHdr-SMzqIW*L!?` z?wyVWS3}Wh6=)X494C?1=c$-7qCNozbVn@#Hgdl3RWVfKxIDUkP?QAII710sLuIT! z?3CSv1aHSimLAVn3_InEs}U{+np{pKO|Y^isKzSWXCNM-BOpuiL^s)b^ik3Hq~KE6 zxcPX7%IS17Z1QVo?=)W``t}OmmTJ-&-lKySW){ zM&)Y4E)VyQ+qKW115Xdd2wfk~Pe*SyA5RwwU2jjL2R?jWFQC8fVvdi_HWVQiZ^knO z-t&lcMc$3Uc8;SDjGZKSW_zLp=dO-MC!M+b0Qwc_#O<_}Komu*<0Q2d~^WEvo1YFGx4P6y)R%fQVR$f*jRy6BrB9;ghJoRW7 z)ax1l%)U>u^Eu&mMsF-!1#)LA-i7?)C=|)y$d@Z}X9C{uEnI@dbOGLhOto2srgY2| z@FVEl>f-TpI2bcE&S{5shV`Bq<-2EodDvaGx2toV*d8C@ec8eKk^E{7!h7SEB8Y-l zd#?%5XUVx?%XyIEpEpqWRX%0foHjEE7Z+2wp2W+nj{G~4`KWJ5L61KMbS3rTHT#Ku zuEg_k|7Iv>Xi+OHJE(U2Bg91{P+QS@Mhz~yW~j9zx7Vat)Do2#-;x2i<|LKz11z-Q zG}5byQ(^JpLwVvG^$STSKyw#6!gH~1IIC{hiPoNi_8Jzw1qI!y?7_ML|KxVGMNF#p z9hs4mCvOXyk?IePz2GCa^RU8hrD1hUX(Uh|DZ)t_S5fQ&b_1sT2K+PRn&~k;M(F+t zbD5iGVhAz%so6Z^;CtxJD)g3#ZKUpxO!f{I<^t*F-`3mwBkIIA+pjytx$f^_PB{dY z;NcA*1Fc;#ckPHLPr3MgkIojBp!IMJ{X}yxJIkx!EafzB9y$5(M+@F3gGE+uXWNIh zza?^Xe}&3I2{2dTw16zRZL=mQ79cnyVYxf;bnWxofv3-n=)b~D&+ z#RFOHX1{?jS4m@X+p6%B{ls(T&0g%?=Bo%D8YtLr6qZE#$ zAiT7Gzp&h>Ki629%Ua>1lh%ntRP>hjW)fDw)WJCT?>;Ck#3}_@BEjVMHb9A0Y=4rnKcwoD43zxI zDcND?X|s1J!^^8%*rqRRx`$?TjZo!$x57I4jO>#<*J<2fqj{#?aar;0QH{Z~45O0@ zuHsu@5f|(Dzm!4gpUO~);`uKH$m2>*7btCsOTU|qBtHuDL=|=MUxJ?DAc_df?i|t8 zFFLsaVbRJ~(B#z3#z;NVo&z^|R&(;h>iEisH+hTK3&QeNZoyVIBV7ZcyVZN?5jbF7 zqDz^Cfbr0lcSG~@`fAUP!_mG}wR5`NioG$8SE8yaDVVLKiqp&Ms7y+aXL_V+F9}V) zdQeYfT|mwrZ z+8%hf@io4P8$Z{30&LpVbC2E@U>tucBXs%d&i1xis_dy8dC|!><+E1>Q8_m-uKijn zL@)X}E_G$%=zq>m5mGTMYo~=YW!XvD9Ju?T-V%JvJESMPK9R$B&2EV?VCFvc=GD}=w~`rD@t~frE%y#8+Y-B!#(CZ z(OrFMMOj|XURlo0m|9gXT4TnsYSR;bkcqJnZbS9HkFXRz^)9u>{M<0iLByKZa|TZ) zXV$o^jX$$~#QXA->IX){;MezdTjC1)6e!y^DNjU~Hfc{pinEm+NIUV3&X2P=1|3_3 z=AC8KV#}G=wkI}7dH{h>y1GjD5c-|c$>$HrdDJs$z9kIfHxw!8J+r#of2lH#Wa z5#Kc3B7Bk$0d*t2fxoq|nV4Ardfvs~e;5DnCN>k-|JePBiJ9}?J2U?>Mrzu zHszTanK}NKDbLCB?>@d~{TII<-7t4#C^%9bI0cw3m zXlA6Iwm`qIO?v}XAa!0J+_xZIQ^eB$v@1; z%S{RiXhvLa6=cfINUJ=pZ1+ljV-84VR?#Q$gcQ)s!DJF#?~2$rzsR4iPtouE*)!CjaLeCAj4{a zPBvlG!c)4C4@N40D5138Dg1#vLw#$`eXu7AjhJ@KalA?P-$B&czroOVrXK zKEY_RQ$UKSUY#;8pA{};9oBufS4x{YHl4Jj|BbG_-c`T6DqqCFydexKS^SD9{`;;r zO8id)!_HMpUi*oFM?=+vI9E{Z@B*s09t3sIy2P3wz` z4RWms8dDhoq=pGF2d!Y{({h>A9pGYG3}(=F2^KrQAQSTuAM#XvHE8wxLJ@r)j>V+t zYJ`8Bx%tLR62p@j5;4GH4Jhev%L9&vE3#IxQsK7q`$nQr@QpL?yk2U z^aMIQAI3Ma09!W~m9VfHnxY)8qE@=h^mF_T zn0AR-12isSZLb2#os$!sO;!Mo%K-P^@;Y)Wf&~2Uw@(QMIL;}<^r@vd6ZK+q2pitd zk2g%Xo)5znLFt?X>o}?Uu2)XRl)~`!NtRVKmUc71oY(jZg4ToHH#s>z0)hlP0Lae> zIr>GpuHcE4zSqEqE1V)pH2KG9iYJgXQuDh_v{C7d&Trxx#~gzRciLmmQRxOV&rz;q za>~t{nT}*l@oCzJa)>OjOI^nQ!?Z~avq)r~;(udbs^#w(>h?-lPUB92@zI7=9 zTIfWTki^6i(JI5yg4EHJk`#2eEabnsentBFRR3AX7Q}%zm8hWNsxqLsRYI)zl-sL> z))$2Em@BFVl1M3CPQXEio<-Ds&Y=`m*k7Bpd|<)wA;g~A!rh%(%H6H=d$xd_lkKns z8UU6?XY0$vvk5fgoLaRPoB!xir+-y%s(Iq@^_R_8ot!9IRalxJ1P_1JhL!g_jX|{` zjxx`M$jZlcX@`}}OT(xQ!BI?|mkIjLsy2AJN2K9mM zFOPdE0&lNJ6Y{K=$>$1}P%JMBmq0XxGoF*;i!U`lrST3#Bvo>=5XDrK7lKWgG6>wl zoex8j4n&1>(-4ha?^_T=*&Tg?CDN9B{3SZl5l`$_7j#B5d8MGrM1FJ&371=XAP{Td z<bH@MkMn6~`H&|( zm_s}mFq#bfo!D_s*$c%+&P5kk5}ufIbd%iED&N!J%Ird;Kal;u4Eh85{N=m4Y4WT? z>R+Pdmj$0b*TNpkO!P2M{%L3{$#QhJgfL_ohv*^__uLFL&0!##V=s(U(6R4sa3~M) zS!g@SNOTEL{uz`f>8+=?NFW}tOTWIB`N2?9W^Hj2`(U=(a_ZhyxMQqUE)?UM9FWo9zV#E~Q&Z~F#1|yx!-m|+odS@iHJP7xVU-wbw3&Hs5(PTOMaDqfTKW)pMjg?9*O#{-)2~P1yK6JBk_p8au@YjL6bcN{_pmQ(J>Cq} z+D{1cZkR`G-m}0fj{8zZ%hA0G#G}rxUdT(2lkVVBQJg`RlA9>AWJcSdQ)EVYEQ4&M z0?nO)W3RL?*vLAKyomrlxLWP4T+s5ADn)`pL`6qVjzgfIr`+A{Zw5}jZQ2-~)eVVX zOZ==!9PyqO+b%;_IM>ZGI(4E@z)zcmR6w460D-8XIw;_@p4LD0pR zg+S_dZ~=F80d;u#wz{iiRPyWj6}`{(upa7T-_F6XiXBCuP6AUN-Xc4?LqA7@-{QgQ zcOWbVh=@1hRph-zG76_%Vf&5wMhWgKnu9TiNRv#y>;7KAO)G(0m(ztFWeZN=ID`#~ z$ttSo6aK#W6id<3h~C4o*Y%A86J>%MQVV6mM7X$h!?gal>GeC%fuMud2?NcCq9-~* zW@P#u@GzA5L^}K_3z=8xWbaRD*c55HRGa4Dl0LV=>5iFtkDd5*J0zkHo^R!0%|GKFi}YR+cHbNT&OCkAVIdz z{zIzNnMs4)S@*PFXIT?twbuzYLh<>jr9Ka5J^dETeEl6GGXKf(0WFe-mstNHFZ*-CuZDg}@p$gk=V6!tFH-xd~5>w$R&yR6TZEe5O zmVH~EnjyAuka7wl%V&?E$TucL%Jg2T)Y+EWvzME?FKSOsoESnuTCCK;ARVca=_lX^ z>>aSqnO^h}Ze4DJ4J?`Cc>-KE?v&6jJ{E{@i~mom@K;pzFI8aUWaZ-c7jF8iGW-ix zF%f>^M0R%0zXtL>?SORE8JH8`b+}ktFKaYwXwy3TRqk$+Ja5rR)*{*XL#pw|Z)*B- zyCLwER1-mcX|p^LVPF05`o!4Kg9Ud*g#}lWI`|{WWr5iFVpi?r5ZVqkB65| z-iwbZ$u2(AeZW{2m&5*8T8j%=Ad)cmBckHL$a-aVTmnKD1eFa4jJmM@`PQRBU^UjZ zlx1sU<>)G=g}*CNzn8;->E8O)jG?_3Q9qA*6KIgZ*p{&oyey}Q&ydZp8h39OG8 zCCpyZp4W+5`O+P`Uf^UAm+j1DD}2X^x1-_Q43us&{I8GJmv*_%p@p|jpu87$LQ)S4 zF-Ps3vnVqXVFY91%r`ejE0+a4AB$O{S2bc`v1^C6`P=1NbsOuLO17o2G@zItG?RAHPg#(cT1~jVtCn8?U>*0|i`x2JO4J_*;n}&MW4` z_yVNBn34;AyVu9HUorjeC*zdt zqXbB2BHn6Yp0DON^?Ekf0zeLVAoB3|NM~~^>%P4}@v$-id>Faj<@|gw`ABE-2TW&O z?Av)MJlk3UT0TQdqa%7DFGX2z>E%dHJ}DkhVLNwF6~(`|3|M!{&)gBP$k$kq_#P`R z7GjXmpv{&!W-~5xMs9Kf?!ATxp$_ri$?EsZ7u|b$Km=M-TbOQ5DXPcbb zdEXB=7Qh$eA`hqw-SrBMn_U3k)aXNAzPa36_6C$(tkh?LzjJBDFor%qZq0nUc8zme zrm>?69A$e<>25rG7su*-^9u(^`e315W8`pEzEZ2QP`zVoU0YqS&3Ae_!gk>{@1A8kcA=E)tgHrT$M|1sD=9u z*rpIOd_YSdIOm~SBV5~yl^n0!pZQnaqyyT>QwWhf|6pn7(U0vm{TS@Aq_2DS(gU0_))LRmuj3UED>^AzsziB6LFo_$bl_`p0uwZ=0Ds>{o&kb;g-y|McVgrWDm*Q3ne%==_q(9aGCL?vha z^hD0{hjt6ZnPfgEL){b*9tD;YhLzscgVYLjzG6}Zs>i7YJLf>TgwhAq2k(YF1kVIL zgkX&*5vOVH82+snntX|)g!6$2b48Pf7c$xMN}D)9APWDgQi8S2j!=y;39Ipi61*I7 z#S=pd#*EkvV5T?HWUY6Rf?hzMHZ=Yc7Aur4Tc&OaF^kTtF(dQ+fPc_p}{&-`*;#meMb>jYFA#ZT??) zQ(-8^8H6I|GVUWt>FlnqIh4S`$v&yF(HtvAoAOUdZzAcjv6U| zgiU9j82AHpJBrfZND?;l3%C+BwHTTidU^Pmr(Bui0atHGJ=cG#y-Sb%%9QhI zZSTUlLmOPc$IWG;%>&W>VOk*WV_ftDa#7X{{z=dDWKyg|PqyWrXZY@Ao8l=(nOARO zV~k*%08#oe<5Bk&+!MCT&t|XSRpOQLgXshMgX#n81K~aA_23obmH3?<69t8t1TtKL zNQqsOFbi8X0$XtT%#7+-h-ON>9@=5iH)=5m#TF(zWW^5hTTp>3-FoCiAI}xqqqHYl zC;CP>!gk-I<}0r^a2M^RzwZW;k-v^2l(Z0833ya4nxj8{h#h&hUxXcK{P*XDqb}aJ zt~{a4gm(w*2ZCn>8TmsV(f;*_-ydoq)0FeVoprzc1MS>$!;t+J1G@qyKtFtl3oaN( zKBBr6^z(*ZmA$b%qu&VFiGq}w(>FSmS1ABiq(;SD3f~~d`nwJo-ZuoHjaI#oC1qYw zJ^3a@VX|KZf`Gt%pop$)UO`>2KX*I%AA(93ZQ6iHYh}T_(&rwbdcsb^!FYpC%EDyV z(?$4Gd<4+q2;QEMNB^pbC`bHZ8Uw@%lXrw1dPee5R*Wt9j-eR^2AQh{^5kLc z1VlWFD7?K6Npj-5whVqj4$Qwv@ zxiK6h;RC!e9VDUNfs!$<3#=WT@=3tq0Hh1+Pz$CV1&M|lL=V`J4`>iYkLnK6H_U2H z)XxUIH4TIS%pG4J_A9M-y0n0)k2?Hwx$}5Q5@A|oH@PCGEkT{KI{g$6 zd=X*BGSh^%{pckR(_<&OHUkP}DbjFS%#|pvJMVM#G{y?Nzhm&dcB* zA-pwFF5y2Ru-fLsJlL`)XdkhF_HIxt=9EzXMF?`I*3by{2GIHK+?Uy`rrNH?I*4PO z*^)BQxsKyVN7j;gpfX@LwG40*Am6xDU^6|AVn^Z*l6 zkJBKD8BRUo^T9(xqYf9U&?pgebz5oDpqE(-PcX6ORwHm_f)3YM<)YSb(%R{W#udOf z2kxs?@vX68QbHZ`KdoLM|{8 zEgSKwSd7wOZ;nU|uuVAjgCZ!;mZHBZG`o{+>Ka$*>oSkmwn(7m%*|9xK|&r}7QMKM zk}GJD3Q+cH=wSQ*XgjN*IHIUQ;{;D|m%!jQxVyUrg1fsr3~qxBgS$g;3+^6V0)gOe z!3hqVe|Ky5--oT*t=g^ns`|WibwAv?eX7s7-@zf~tJKI`6s!E+)S5!wnB;^GfLicb zH!22vv|=rBRg2G%l9}5k5xWVf3E2?Shw-52s7t+#AJZe4hN+6-XPWoMA7 zBUtzab3JH@zx_=d`E9TIkO;vlqYE>d(zh&gch9b<2B7d?MYuR7ZIC zLC27g{cTWwGbeSRT1@jBV(w3NozuQG#FGxVdgX7Y7sSNt-Ce=#*vG~?zuOye52S-l zv{i#mg6!M%9Rl1>RqnmqoH_0KFwnjgFk*heK)T#l4*L}F`0{sYbUf7aF?5MAs{Lg8 z+xLE&wxy>wtS$y%Ds?4IvQz+#gq>Yvw8rE`5NTKK`py?|rH{Mol7um~3Tct*_a9{! zz_&6~S2CY2`8uNz`~U-PXh~%yww<=;xD2h>wS?oTbRU^%EN?JBb^ldEMN0)(zq)A?+f% zdX;uX-rU@JzWlku_$8e53k?WgKsyw(-%sQ8lL;< z^HcCKxzo*{fgYTVGnrb1scQ=2Db*%=sES-3u)ec1t{J|i8PXWLRejErkzOq^#$hjp z$X!uFOevfDHFA=dei5T%3Gbt>9MVEVr(*$&lGAF(H|3nV5m+uxH33SjIRQ&5x8myW zLGF|~Tq5ktKl>*>sEhxeebLU^iKJhvjz^U*j7alF-qP?cPdph5$e8eGQ0uf+VEYw7 zwa6s#Cyn*+eRYdC02fGr1gjp@b z<97T#Oj=W$+qXWR_i&i+VbwuW?@7mekfLw z6q|h}IHRqCQ!8>Q>Up#q*C48(*gFW9j+I_DrU2oEqhW)J2M2Gjp8ZzkSZ%I_=F$Sq zX@#h8bjyZ+JjYuyN0t(jO}>TTr4%!b7I`9Up(AltV!;|xeaH8(Z1JZ=%^Gh^`gC>o z3=WxxdHjerLwOV~PMnQj@K)eyF@JXcw}lniG79xn;Q90^CT?{d5To3&(AT~#|7D=7 zuRuuc)A4lQxo^)jk1<_aSzG1L3-3V(gp*TvQSMpkv{2t>(VJCiozklO3O+d1(kbBr zP()>274KFQo(1SDC1c>cjCdB$*!m{L5yi(tM>31Z6G`?zR-fQ{PX|J3jdmpNKVfy~ zFzX{v;gw3-xi2G`u-;2F(kp%>&FIJ@~6_Rqo^FiyzGkr?*dA8VJ7@s%`5tbloJU&P&3shpsWiEtO?# zUWK6_mDVO+wwWPPu~R;C7&I-M7@M5#FJ9zaXm*}h5%CN^yBzXnRMZRqL_Aw87L0bw zD;A7#OH`l=|B5nOu7-x)#;Yb`0t=$p^@F*GOMtUDBCSB7#(<8F{dmRw3G>fP3&RUz zk#uj{=Eb%cot)UY2l^3mYAVELH7N~lPXcxlxx<=!0j=oFz1R-|MjWgsc}5&8C-Fye zMl+_sD?=IaVBMJvPq6MphC5MHBv5@MXE5U@Sa&!h6|CEzAu@8yQ5FSU2kTB}u#R|e zSP_}0ag>Dt6$zU%fPcWY=1NTF_&_Tvb3MW)5b%a*VKReuWYT=nU}VyC(qV*)qbvk? z2hJSM$OLEhX9$cea+E~^e}XH`COt-^2sOtuP)C%^mH5qn5NiI&z#hTnEQTyb&?qFrPFgx*-_pn#d64JRmgRFrCaNyx}q5 zFq_N<`-TC7EhZ@lZ~RBPrZYBy2izm1mXppzHzXr3S-?7u10Aq$1hCg)asuod1MD@K zi~~RNn;V%--hh1*fU<-)oFgw#;0(tByLq1Jz|K+3|$q*kwXFpIM5gN#dBD(o#{ug*4KJtvZ5jQ@Ll;LS7M!!rNB@;fZ^ztI|&`M;s+9>*%W zlO|1V8!?|h%>>@O&t>KBOGObdUue@X*^A3ChfSI>Pk0o2lQ(}a*yB_XDP0yRY)E7vD%+#> z`*Q&eki&VG8Apb8sgC<|O&Hsrv2p!njepIAm_xfH>t16Zt+qS*&@TCL66i~^)gyfT zYaZm^^u0LH3oCx>$1!^-X=zMv=^iiiB@3csoA&R)sLC$@0GsADHlVja*QjLgkn0Lj zA+LOoUm-#5nltOBoa-+$Ad0~^(#Ssxl0Q3CPVWnW(9!$mK&Y~AKE?~njEgH^sx^vQ z)gfTVtq{Nyl~{lvvJAfAkbgHtLjs{fgiT@HBcf$3LSo~ux2u8BmuQGT!y^?yv|x{1 z;k;~*Rc|G?IZcqhJ=dr+9-`0C9s&91C*ocBr3_t@8^^d^y=zXpPDPYms$kO_u%Fhm%rPmrW&{(WDJwQz4IqXuhC8frk;)B>|Y))WF9AsBLq z5c5)ROu^q2pU71m|C>>RJjSCJzy#2z=TC%8K^=-LsB8S-S$gsyo73fvnk5kzQ9xa9yR!shHQU z)Z&xlxrARazTO0!!hz{ey0zE@QrWFiBY^Gia?ugPKG1Q}$0EKI_G7rjjE^C!ZDSAywaJT0YHp09mS+~UI^U$8F(9n#z>8bIpmxr z<=_Kco6o8!vM6N;(lQtm-3Zi?P8ST4iT5;@bTFf^#*(W#Nq^b;(m`x6`I1kfu|oN{r>zT@Ka$b!7?-eHfqni@cpJSZI)3kPJ_MK6eLy*Xz{{#pdrZ}^uaTfsGG{>F$esF$b)?|_o-YW>|n zlm}y&_s^H2%Qb&{3iS5_jauiQbDSdXKR{oJ7VkCtnm}VmrVjx~mt0$Pt9Kja%_Lo_ zcD#Q1vrg9{n1pbop|_(j$lI&1ZQm*8%|POPFk9+VJQvhie>S4H1-r0pz5MQNy?iMU zUI;H?wu1TsK@_$eUH5RWR9nbu2jm6b_S07zh%dQ)o3L$U55Eg)^$TnD3u-SUSEoS# zavL}&7z3;aa%d;!NvF2(sDHd)?Y-R{>V?r=VwXhQZ{l-5H5qglTl!BtK7Vg@uwR*P^xRBKqiYkc zNbKa&*l^qEnPM5RIz3R%ew^Xm4a|0(vdZZua<^%6ZF1(UTVHG}wA}5%V6hqO!sz5h zclh`NiKnY6M3SW5&*t{>4dXmqpdfjI=Lqb1s=xHT`giO1{k0x$ma4*#s#u-o>b2IQ z(z>?tQg36`xI((Bs8d#>jrlKYD~;7{#g@lC32A`gKP++gEvM-?QJUA@>V$PHz(7GhCNwYD3NiU!S};A zGV^KtSF`kcBVSg|qo2v{%bj4`k=LTuyH>WYJKD6uaCBxocUq>=a+djg!*+ErS$E`= z>o|vA8P8Q+^M_E<(1(>qEGXL>~OFgPPso&~f`_j_|7%8}T+%xtJ^xBT1>%(oJSZY-p8E3;-b^19AeAdDF)SiEvvccbF%Mif4-p0WE zCQ*&yOgqOe59lS~70-Ebz~7}8Vn~{&amdMN&RlADpbl4NcGY|c_UwEAgYy69K!Oz^T6`JEx|9rF2PMBR>Mlc z9>QqDYr|^8X~R6hbc4vncun{V&}LD-B7H?Yf?{#ps?8xjSvmb0=7U8X6t>CO+PGDL<#A4h9sO)4PVYT2GVHRNaK^$TX1qf>B^l-Rv zs4$NpAu(1;vWCBMBiv%JsfVY7q1`!v)(ZiyGNGahzEXZ!BAiKbzi&Y>?5|hK` zz~vz1z>p#bU_78+{`XA`{te{;d5g2J9Ha_E0UrrV0sDse@bQwj4;ge1djb1~`hd1& z*q0AG3UdMThTubTiNB@XM*A?2Fb-_IVwk-P; zLB=pf2rs0Ua9h58?jUMVK5P)G555cGCHj_apDK(hY#xFTtPd$W0w018y30own0ktj z@aS+zFo|&FutMlQAL_9#DYr&J$T0Wt=kPBdT-dgvKol_Nuxl7?XfAYHn0i9 zSHc6)$j8M0v(N_~#sLP21k{gYQV&b`|1|s`Z}CicAQIW0XnJm*@xO*|!M`!z*{~e{ zVBoLt_SSo(fSc{n*yR$LNh|(^Ox8Z#`6ZfCHJ0iM8(o0}PI>-0m?ZA2^ z#3-djch)6dtt?Mp?TAPgIvRq%9JzGt5^)NF6n z57fk7~g``Lee`ih`Yn`mMMt# zWDu<{IN*cKF-!;Q-?PJn!y%&*{5Np*QQuMe3w8lR`5V1H|8>}$Y7%<&fy^7P$-YmC z7{G=nE6jkzbJDMB4tbhvWCJ-07Nn0RCN z*JZkre7j<$W^8_Vd5R^?`yjtJ{F1<<>4$`qs1{kbgdyIv^GLf6NZ5A*(rZs)->ImbPC)|^O*ZB z>reJLST{_k>9L3p*)Y?r{cyV^rYE4W(4ucckv5Jy6nM0WQ|CaYRI9}G10aJ+H`M~g zdz4aekzRCOTS$63OQq6IZ=JSVsDTJ{%cU&!(VB(pD>!t-jB6zowMjl(qiJuETwkb? zdc&&NGdBxk2OUgK;5A-N|0!ZNTk1TqxMU6s(J4);ti&_lvvn8-`iaAxiYmv=G-&&*7+@)*H@#u2G*5CibDdtb(DKMQXNEZEBZZ z3T0$sngRfHb;-!e+OToz%Y=4aY8lw*NTLKwhDAxeWU&hr94~KoWdTJv36VOwwEt-cr7yKUKvN;-fkXO68+H z${9!L;Yv5+qxe^W^~hSUA@GUNj+l@!(mK`(Rl4|&28=fvzflOYx~RMn&!&)&>nm7B zp$Es#^+r2Tv(^npTl>c&T^EL7Md6DCP%>N-ia>T6rT-l~fLnItQ5G1_QQ;_0nLMU( z{};X?oE6R;ZHM(0tC52jg2qs87haKKPNbgpgKFeNf7MYzIb}S&?J@27;+Y8M;Es#grio$!6+=3$Uy zX`t7F$0^rfR+BgYe_=y-i7ABB3^L85uyCYKp$i#(%ru}h`OG=WF^&35U#QjpwK`dL zM?-Vh#byCxz5VayZF4A~g@L-83x320IfpA_G{W*hVs~cK0 z0)YPlfkS?7yNOJLuHkF|Yg7|4+K#LMoTa;J_m@?@b25emHaps2+XDMrO>rhg7=P;3 ztkEg(pE*yg>-AP`$Y#jt|EApAQ{dz2pR3QXi&!dCIg{HN zbUx56ERDFn%$nETz_3}MHt{Ga6Q%2{tn9_scHbm;&i{CXoy|5?)7mz<Qow9MO=4D+tW2iv23Z z%BY@Bqn=)p&MMDl2$3>Wb)zkTi?K6*qP_o!iSeU?l>>#`(r7OZn$50}v}5`{K>3cjmit8Zd) zK@a^bRhUK^!Sh-T&$_d?NBq6;et8MxRIlV707X9t^Btq^$(P2(DvL^;amgHpA`RVt zZLA*C+~KL8*3UnRkPg&Ey3o^jL+D&P$}A|ut{d8y8-n0H1QnZ2WNb09|DeR+*%TGH zdXX!f<`fZnD7$HhGc!`;d;Kf<%ApSB0}B*o%|sUomyKo@n!OkHp_Cv04|FNQECSIXQ1m@TB;7|oin5R=F*7rH?ctQK7)DUy@)3mt{r>Oh zRxC8D2>4@C5wt7U#bji%BVhhyqtBJQ4fK^#+OTJD71dJ0;hI=diU-!oS!Q$95n43~ z;mSAwfpJVc{LJXAPlA9SD^kpFZTr~aHK7_+v-oV?ZLc}VGgZ~=Z@U}UH)t{mSxTX( z+Oxm8yqZ=GIxKuur%xys*_RnGqIhs=P{A;rFSKBE)J(1XE_S2T~N4_1YItxz2#p9S0 z<#c3{5}dHBQ7ez^4|#`aiEQOmAN*^yj< z>2V@9d6L%9X2*&+xo0)YwY4_cT^|}0Qh7L8NMACI%fC<<_PepL-^0f-Wk(162zUu1 z-iPO5siUisghtkF?WIqtQxu0ezh16r6}7uy^^S{b0!UYEZX7iJ6MI#Ra+WsVF}CY1 z%3PP&MqdhEBdz$`xvW5RBpVGt%E&TUaOKHja+?;d`wOEh8A-KM9O~o=b#*)4xq9YK zrNzE!eaZfjcab#EOS`&i%VTB5Raf^!DQb}WmL*-MXaPl@U#}+1rsaPD4EK=oiH-l z>Kmd$UM5ARC9;|09rYbjBtT@qVyZE+&e<&5lezYZpE7R&eC1vnLq}gd^>|>8^|)6s z_JT-8w2obp$4`*B)dJgCR$Xhpy6zxF==Gy*A@?5~r#0L@&qJDPaqq{aUjk8VRpNi_ zG{}FqNS_QZD}0s`1+JLX|MNptiWdna2Pq6Wr4Bja4d)e1Pfh~NW;_YUkS!*;?NE?) z-Q@A973iI`t%)Isbh_Qq2{9a>%|s-B==u&lF6C?YQKg!2lop{!K;XSP|1iTTZ|z=7 z;M{8dDs5`_kgnYm>*Hyh=M~P|&{9|aMM z2M3TjL>ocrF39Tyx-sBtDejt~)Mjj*`I7>($+(IDdXhhp!e2sZUJ&FDaY`&X#Pw)# zXtwEuP*ggI`AyZiCb5#*ne_QqO3w(h2g8uc+m471Cg66o(pYlNG*o`|#*yzMU>Q6V zygju#KWy0REG=$c{>4}(UDx+#_r1Dbu6cfITvU6WB3at(;EL!xPDlxxz+b=LUvDK1 z_E;I9c)b}teB1lMk5=pFHXJ#qGi~HDrCAh=VYGn8zPzi>*r9lv4cXJs+5gAFV1Ho|BhTCdG-d7I zj=L^%O%WZ7sB&NVFL~A&K(NjZrfS^Zu34^P4x(#tw`Fxu%f*ImS~ZnET%>zZLkk9?EgS&gE(=9D>Ur&SI370shu+MUaY6= z9hxS(r+o{}fRVg51O)sEa8eO+vD&Pvf(U+UEX0=oJC@Z5Yv#<}Oj4dOYe@RvVORW4 zvco8dB-MBKxv?5~6xQA^)D8`nTFmsn$M#SKi4>_;X zA#2MGPpm}`9pC;-2GiA$@$qqEEh4_VD4=iHA>*#+Fxs-Vsxh#2@f%k9%s7!R@A#nc zY8#^p6@~3>`V>4GpSefIMP$1GTKR0M`_mCJGP=wfpCR_4hy3IM;F;GD`}CHIRTz6Z z{%ds`kk@RWDa9?tt;GqM;gohF@wW{Ph1!sEp16!7%Q!*MU z+cG_uE;m_e#Lcx~`;AV1r(Y1ci1pRa^>#1gBI=_S|H;@PsF=iDS630gCBH8o+R}_; zhly!q|8a|r5@sBc*TWTTB3&orSH5x~Ugy=9yP-Hv(5o-mf$ry37C+a74=Z&U(Q8;A z>;CAIQ18fP$Y4>>+$cHGlJF&3IJ@=NJS*W|xSQ^N`n;R5W{&UeNN#27Hrnd2E5gFr zTZD7h(MH`J;v3i}FR1;7?b^$DzNoUsU$#GyTILfMk>@QTN)euFP4W<8>XCFlFTh!! z_!WzyfmWm_O=Jh}FyhpRfx$=lD)nw zz~BT^g2zCbxAm8thG_iLXdC2HM|_or<@~VUh)@RAhz~vLcnzkP;*Zvz!|DmPgRS>f|C@kx|)7sT}KA z_~fXMjErnMq5gUHD^FBLBB93I7u@Jz&98j@;*%}E_fgN23cP9k&w`@ltF~lUp}%q< zgcrP32wk6czjR?MRr1P@GU1Hrvfx`N#A`&yl(#G7J`Hh70OaY)+e}`P^a+1S2;o2(rYxt9D zw&|SU`mL+N=OV>0+e<0Dhg|%O4z}X&^V@z1?W&{?S!9m=n{RPdiL&9+WkmQ-2|ayk zSSb?h*A+tHtCpZlmCrj~wB-V0&Q#ZkgtPOijhCp&f404!2BM=f8EQ=0km}-1$$P&W zXC6U&-Z7AJ@tcaFmZ%(oL5rU+;J@lpD?>6W^BxXC$B~*DiJhPI>j)~is0S_%+{WN| zA4XB@H5y{^bnYKmwU==F6b*}Tc{wV5xopEDO8-<{=js~~A)N-y&6MV~;MpI$=i-oT z6s59R9{VfkZfIbTa064d^|*Ww+tCFDClOyEDF`prXnKR-Vk-6*Um z90!0%H%+Y5c8`Ex^(FzVyZTTnK^SW2ENw6z85?yjN|Jk)JeDBjHFg|J5aG%c`CS&# z8U689yb5B>g>8$!m{#JWDmKG##VCF%r{aP{Y84OJ92bt&f&L!nn`rsA-CNac;WzaA z;gHJ@G0~T(TBlQXagVKN1D-+@H(>rIL1ZotV_$guN-nG`Cs5S4063%^_GV`=9y~p+ zjm^3E(`@u7!+`!D@<_*LgNn9vJ<~dAA$$(mDrjEiv4 z0!>qCMDwd%f7JP;ZvTg_Q7DysI)yKMYOCkg)%ek^(Y-C_mdb#=;;S?{nFo3t#g+p( zAQ6N7=9j9JFl_@!!0u#XyC?R5UheHHE^5x-A(Q#`-@L-WEjI0rYimzjX>)?bsbAfq zSuGVklck{;4H7ut&Y~9`9TaBt+ANovr57|j+)BakJ);-bqxx0`S3A-KJprEGz>N#k zhbh*S`E00K^G;d9KJVQg00Dci%%?GhO3wwm86?C|Q844mLi)%#$vRD}UP)?v>c3_@ zpk7)V<6Q?MuD#NXn)uDB5|h1WQwDgW?>&id{>-~z>!Q2BMn$bd6x-c9$m!~Xei zbE*4AmC*)gZo=0;fSEJ99y{sd@kDn&XIgW~)$*vnrN!D_c~}@t-vaRS5i1SeKhxb9 zANxUiA&IAe=_i12B03DJkSxL*et_tMzXXPyzW8%7d&iVjxj6rI-B zCYUU`ze-l0g*iv(gGbhhEeDOgk72FD9W3hh?E-Zijzj^a-w6~X&oQ;-p_H@ zrvvTS!489`dwTOIH355ir4en!+5q&KWhD4_8Hn>9X#S`^0;4>zMSXW)%Zl9Bg#V>z_tYGs2x%>XXnu0u`bci>h(&Y=!4)b_%2>9eHZ0k;rMn z`lLM@!6H|ro_|S`f_x18+B1C2Fe4 zn61G=TYWE6Z^d(L*<|fr;xED-ORxO7z5G@a(-TBCBX0Zi7PdU&?!wZsZwGaaZSe}K zvzk3mBj5LVYv}8LyTGAS5NSk=3eG#;(ND6*m0f*1Y&E|8(cKOLp=OQA9A4`T)bSRksaH}S21Saq%%iE7WZu(*)^ zx-dq}pQyM2N`@-M4Or7>iiR@LW^z+%XOFn`%yatlOf+mT1T-~t!=DGg?pBhYMQGy} zmo}%u*4~K8M0WFC*g6rPZE)q_tt4liCLARRm-4Ec$6j#9AHxf4as{RNGsjgo?nq^3 z$oqMl6$PYR>1v6)aSWH@n}2n?%r!WKn4zy1q?K3lgWE5~%3?QKp>nwrKr;Ob`_FK0Zb{W7R(Kl0 zP)mWUU9aiKq1|B=QZiCB5PJph_ozF4*e*(lL2YC|@6$Q{*1&_pjQh@Ezch}9N6Slw ztjqRm)vQ@BU$Im|z6Q9ejw8!#YfI9yrbiMpYcvp?sk z)aib5lj=SWib5?%<!I?K8 zHvZhCnm-T?EtHuPd7Rqwf4Y+R`!NVb3)oYylY%d+jTba5^##hTDaCp9M8g8bK?dbn z>K``^FZeNa++@Bym|W-6cJTN~jwEAg9MGCinno~eoL?qwoU^yr(C*8%A@cBk+&g&S ziyEb=Q@Hhg%_-Yn8X0YbJRXwYk-(pXo;a*?JnV)ZDM+~OQD`yzr$dC;D_wR?h z-Y(hwEVE>DhLTAKNd^EbGJf1dWp#vxZW?AGIzmc*HMZhHX?H{|I~@s>ysk;eu`e^e zT>SedYMQNX^>y*@6tcIJ+1pc1P0ep&xE`c}-z2XF1Jb=6PAXHDy}z1H)0d|!S8iUo zYnEjvsO{^V^#T^M8ozn+VvAzPIB?t4BX`~LFY2U=qAU#}#Ir?FaRP#=Qf$MFSN)oq z=*S5;oyF78(W;f~(SnHZnqJD`&D@46Gkj{t>!vSy%I=Y@SS2v4(H0*R2xPJEb-w&+ zJlpJSa?nmlc|LuK!?%t%;B}STLv`H9*?7vFQ07<}BX(AYCyN6NaI)izYlR9(Q%LM{ zMvUbvi=R7Om%k~Ar1B_*J6^K8AVWR^}Ux80w3?rypGh=kNerOPkWHMA4l|2#ZQ zM%Vrlo=jya-C63pGYKUxQ~P@xn9!(P>O{V#vCY>!?kAu(_H8k&p~Sw%a3)sdwdA88 z*5e?*99EeEfqJS|z@N&ri08h5Z1Nl3MwT4JvksMTJVtU^qE01xj#A@1^r}bbE?rpw7&U{?b`@h0Y?jhcgd7EB+tL_6>uz{?zGXy;ap$xTFl z{RZ=TU8pf2KQU(;aesY6w;O+ zQt|T#cU$N$YqFh;zT_~0vpOYQ}qS=n{L7^Hp9Qu6(LKj5iehQ-8}W8@|)O+#V{xx~Ht< zZWEFGdoPq~{1D?Sp3wAuAGMk;jxc$ziW<%AvfiEE8-J%hUC&>?Yx1BNJvuU|nHHCy zK`rQeda>gUQ3Io5jr9J?%IX@`i>;JlZM^$YXb6bMHM&Vw3DZ&CSGlUlZ0@Jxf5sE0OD{27bQ@J2Z;o7`DG_<3 z6g4iUt`zt=9tb74b#nWx_klW4SdIzHu}m*(2#=aTVOvcq_jGc?vma|drPpSEHWoRY zw&X5CVimlRw6yc5MaknZSJzjU6`3AX0T0k!%;wTq4l)agQTh20H#;7C#al=h&E)jr zf_p8>3A%Y&!4odp?*0euVWkigU}Adn<=g(JTjt z_F@dSX5gcO(uY;80r_+H449CIp#r0_e%=J|3TandwxX(}DN{N@_>U}ZZ1eC-+(ba2~Dg|7MjQz|Ee-bZAzI{$B(*LP6kujj@c z#RRg`bgz0H!G!R1FR0wb^g-zQ*VXNWBQ94y(erltN;dWCS#s%^U#w!enR!^nnRlzU z&NA}d3DqdhbFmjfUbBJGIZ7#^p(vRDya0Q9@(iJE^z=uuj&!4P0srb1f38m^YVETc z8W@Vr7T~MAez_k&l}@u#i@(@?2^}zOsb}jwy+$nbzhAo5^8J0FY%Dlc`18lUo}<5| zVSTN$-)_f~iQ!up9B=iKLh-`ZZ5tf9qTfU&d)x=bvX0eEC*o)$%R?- zodu-&GP~fyTeVU(zcCGZ`P?DtN&?L7y3bDf8C^~|f0J9+$LS--apvmP15olbWwpl2 zSeY-;I9%K<5+hF5Jx4~cP5w#5hf8shKG#~DIhMMPd$(cDxlw7b7sbvOacJN#`tcY# zh_AW=aJ1JferGDOwQM-hm9Ve;DI$5)GrDgf+t&5;99L-iZ57WuVcLt9?cKytYI-mU z-Pd7N@EuC)W#6faUZh<!=^wf0jzrAa1j>xt{C1vEdULt}_=qt1uY$bX?)0wN$?Z-PkMcMh41*~Vy z6LNZkZ%Stz*f=||$^7C5bI$I{AFzZQk9L+^H24adeJZr}oyWcxO&wLV+3Pn{+j2je zudGNb(+7PB?iS_u&AgL;;noNpt&M3*i-=mDu3*m9|6$21L)<<;GCx9;O0oBMG6&WW zT=Cnw*hi#6ee;OMZTD0f5rDSoVo4tOTwE-<8kIs_zt);aE^Jjavlw7MI5^kBiC(&) zfyqrw!q39Cw4wPZj(g%v;9L-&upZ(aD-q!z?Wg2~T{~HP5dyk9D(Lj>*ijN{`?z04 zsQMv-hR&F;^T9C%X`Gw@Reo^zcX$nFt*wn{FO|Aw?E?XAa%tmI{AqX?%|fk%xfaiE^!K zI0@P81_7cgdPQnOI^{Z!Uz4acZEgi@t;VrJF&)H%aXn48bL2?oV4dmBHgCDo!G6j3 zTzv^oZAa#(XP2C^uQbaDwSkxw;od5BGG5cn%a`*+sg>@U?Pra0MCp2IdfFL}A;E7- z?5@{gO;*{&mhn40-bLhE3jXir^Y<*^{QVyDoC0j|hJ(`D?W1|3NG)f^s2^a<0s^x? zH=Lr;60c2T802vZ-XD2KQ(6ijc|`5j+y znnp&0Zz48LUtHq`&Xhd(`ui71Wb*p#TkNhPIE)H4w}Zh)D$5}|Y1QvIWPFeKBC0i- zS6vdt^8#RMRWO1w&o_cbYYY21)~Bf@Q2|lzVpjS)Lr$^4h{$lf&HeouCyfHK$ICsaKx)S5ZgWuXx)gBWEY3mbpIk$f(JJ z>MTQpluvjALc0wHyEn3lM2Q(vfi6T@-BY9|z`r2u=(~%rw?Vk)_2OL-tf==H2ZRX& zh8$y#CQ}m`HPz$^12sc8!n5GD@h5SIprzzeLma+{r_yVbz}ntmFi600J_na1>$BUKNuAUKH< zBakce$>CQUDaAcN*ML?!@UiH#cYu?jo~vf<##v5lQPlN`a_$w?8ExwyuQ|Jjcw20q#4>L>hyW;ccKSQ0C|Zg zJtw)`sauDjP0n>u7LD{X3#aL{6*OyOp|*g9l=R7pnggyg!#|oWTieW=pDNoc2!!%Z zNRyn99|q|u0_hcaS*q$AT^y;LsYHr~WqU>}ugX)rc^6_lj+Zs1Hz|bT>#&x> zFEHHq;-JVeSea~cm=MZGaWeyIjguENsg0oEC$!E8d&Kj4kTG68<&bqZ(KqjaUzNt? zhqvFbcC8gx1aQ~Bk6m8Cybz7)Jmz$%t=UUWw?qNsaf zCsq}vx+38!F&O=&dG4Ge{!x_`cT}Q(6LKbmr&yuCjC-7!TKdIiPYC&YmCN?i*y=Mc zG_9_;)Bi3$m+1cL_je_IjpQ*`gT`Ld(*dRIiLzP2DS01zjN6}*RkRAFRPp5(=>o_k9o%tf!q__QQeH$(|*z{^y5S2Z;~8TXQ*p~ z?rY~=fdh(Si2W(KozjnR+?*0&tfWm9*7e>6n@+4C$v9v|_nV|MS>1Rp%#ro!5bm@a-p}%+f(_ z&Kr^xD`FB}<+a7=P&5B*YTu&X3~%Oik!or-BGRH3&zPU>MI}8?;oJ0!Uo{0tEj@qm zC~y3U{`~5lP2T>}DKDUM4c}v$Lc@j#FU}+1!l1wjB&CfgfK**Ky6-R^SZ0xzEB5b} zV=1i`36s_CbS?4;C*slO#~CQryGO zA9LK~9ps@yzs7TKa(9OaCI}8m%X2he0O>m~F7mA7{3^_s*_nnQO6hSxKD}E*-1^G; z^1=H-x34Del8>~LQ)Z93VKhXJ#;wwTAy^O#{Yu{t+C#ozmOm7f_z-xq*sm%fk}ufc zd(*e)^>AEpZX!?w+7jd0BIf%Lq+)^=&azwGyIY2nKN(c*;(T%T7bilnarvNjT-nOs z%{D?v0ZFzt9#hZAqPh{+iMi`R~k{MJ0}i(IdCz*!crcud>|rB3T8q6`m`!=5HHgazkE8hT z`AKN^%k0|-R0vn}P%m+*cvxdRqq)ApSxC@8?%wawhbk3g-+>>%F;XNa9{1vKtxK;V zkBdvNKlWW+Z*0(hVK73dO8}2;Z(=z+ZI9aUq*np_)Y*1s^lv^gJjw+^xU;_zJKjvM zqF3&9NO3YNd>@o%s>4A;uJ2yyp+<33ikuz&2==czg`|)iEr}`iSoRGGSpusK!t_}p zPw3QRVNY$Y0AKSD3v_=Zo_i$J-N1Omh{Auy)GY3}p6&kvJ3z$0lFf&1;l-p73WY2Y zW=zk6Cib8Y*-U(t{$U1{c*`F^W-|L@t{ivtS`BXB`4;mf{1V#<59 z@_io~oIIX$o3G;WzgN>P3?_(tlV*VKJS2?z%-?m__ES5c^`0FcZy(wKd+_ZKZLdRC zyj|J89sJBj;8>;IdBc&}Q`!3pH}&q=Fk84GyEiwT8_F6jshlsD0Ia!S8Q^;R3UtYM z!!W>=O!wu6+i@y;(|v_JZ2X4VLVkJk7T7+p*6G{5~Y(Em3Z z?Iwz=nB=|>4NRUGbW63u0I4a~pJ+ec4Fm#Cr$vw;+W2>w!C8E^o@PQ~F;g$t{ICVT z&E_-9WM<#rYOY34q4$)^pY- zRvkPquLeIUCp5JurlP3d>uO6~m(|d8*O9{ZzNzd)p}#lkN)@`Y$y|xp<$ezs){7;Q zmqy`UM0zQh+>94Al>u#SKT^oU*7_$3dDvc8s*o?YxU44x7g{d9W1d`vJ=7|F;^jP} z{~$9~^2~^MhP0}<@9lKRSyG{p8FiJtfTd9{U@1+=RT8b)Z|!LTEVaC2mR?C+RF`$4 zt8={gpr}K;v4@ckZ4h;+1{mkv9?$OWwUEcAY-f8yf6aEt=IrLen!eihLN?o!12&pE zZ5|eEZ>`8)E}0ZKd=Z#hpjXd9zFLLL0c*2sHW%`sg=~8v58E)qM$Y6xD}r^cEwL1| zb7iiInKJ@5{=2o#+`ea6AF8q`Xp*29IU_TNoc5?)^Y>`sU*DQKG9CjL$rLQhYOSn9 zCf7y#`^naKrIW=6MV|Lo*#S9koXf z?i)$o|H1703&(pmkL@cQ)zC+?J987cK|t#ZO~bKlc*)-pZ6Q=pk#!eK$P{v~0-mBa zkH5c=hpisnhwP)!ZWC-6^p&t_bGXv85zQvl)zukFUx7{Bswvj*MU^jC*-I*@dZy|s zGvcF4!kGadk?KKF;DdrFkP;vY8l&4{k2*B(Lc7Hda-~FkXLT;WmCKd{MWfX~L182e zkd%6IBuSjvEEV!N_jx346G2W`a|t&6=JfZsgMWF z%&aZsFK@`S)KY1*X?c>l5Z@?!wfNtKoyk$iCK%T+dCVpc591nN!Dp3nsSZU?G)(dK z5;F;@M3JaZ@NbWx>jNT!rsv?%x4yedJVUl>;N;yyX%Ri!fDL#U`=O9&ayyYf_o2<3 zTlTd=44sWccpn-CYst4f_%z`0ZI}WgY5sb?1^i^?ki9-^ESJ4aLBGHMWUsSusBd3( zcVVKpHJ&YuWjk~AIbW75yG7;hI-M3>qa_p#SiKxa3lj?hV$+A5g*rHrD3%%KfTm?m!l&?%yVNe1PmlIL4>rn45Kw#KPZc`x-+v#mB z&T0ZduovkVFt)(UVqofdja zz{h7H8?~hgn5Q?R1}yn<3$|z>58L3Cg*(zW1^q zP2c_jU#~+cAxTC`OZ70OlXPkDhovy<#HE$~5*FdmYJSy_<$X4T1e`?4SVt(%_wC5o z$=DUbI0E@Aqdu>cYDB#vMvmpvrO2_}!>VPBZ}9LMLM?EG`4!Nz`>+>~eQIyFtbwtw zbAhQTRbCA}RLijC`dgujg;o1i7Vs0e5vz#=uFvMPhY#26Dy-{Ulg$1BIHb zJEzax3B4CdDXFb?$wf^IBS#fk0hbRQRf#RH+f~TJwi`i5hgz=*6!Jp*k~@)SBPnOT z)h@ZLrCE*CyYx_3jcc|-H~xz4b#F{U7*_mlyX^U4?k7a2ZMNC6_gJd zBhlN@7eGGXR8ZIg%r~I5>@Sgg=z)AN)TT;?UR_tmRuz^FGt+l&2&vWLVQ>LDy#2~D z1Zx!31ON7J@>^Itwg%gb^T4n9=z`$x+%n$(EpPh$a zr6t4QV@9RX;<;ffrAd%Ui3G;8SrmnRCZhr$qDhI>DoI8u7`e^V!O-mlyv2lz1(!{P zeHjJV`ZNg%*);GY<@m1+hAmCxZ(6fqSLY9#1~&cBH7rhTP76gmUlGEPk>o`fvNZxJ zgvC-gaFD$i0skYVKL~oEc9jD^$}0_q@n7d*Jo+0~$RxY%+QFUeR`Q6~S+ya)=DP7}JFks7yfH#fxZ5UM+Gp3* z_%f4q?)Ijn*_^9x+v4|4cMjdKHY$_4i+`Bf?P}@|PVRCxW-rY&rwOS!8VVXZy6lN| zlve`e<74E%VQm2U+=-&^wT=;JO)#|@>xEegs-PVkYwE9UA8}CL4!9gfe024i7Jt{}odjD(V7@b%H^EYjg-DSWz)nREHHMn<(IS za-sUFBaFg37or1Iz2$%o&>%c6mJ<~clT$)zRdW=@ab)@O=>izlzD>Ah<$yl<$z>zz zC%T0`Q70*7BKO_bzwzqfl*;tuQiO!SZeRQ>K1#Kq;5E1ii#2hD~47VAc zbS^KP1xWW?B(d70d>w>`&{6;sfw!-ujjp<-IRbyn)FE$^2(*ykiRN%91%3s&0S?+% zD{2Gaf0>ty4_K-VAU??IwE-@>b;TWlu#zMYTi8F`1@!+BK=poX9kx}F(yw3x#O#@o z;M4-xtar2nIw5O-f>R1$4Ys#Cyxskq$05}whhqJymDb>uTHq9+r3jV`!ppC*Lg^Dl zxq%_r!udRG!kb#vC_GmiDK+$VcHy#VYmH09sNe}*@tM4*ZqGmLshJtBF-i!6qUDS% z)U%^IJ=Ny$^z;t+Cy(_xNd<|7x%dWeIh-8WOmww*7xvPo`r4z)F(y_7xlzuT{@q5Jw@g0CaRagRh z0_6%1*TU5%P&z%>{tuLGUn#8&E<*u@+y_|~QDWkG6{V&G*)P|ef-IGr%~)*=>Ol^QzQB9*H+tqPW4r}fcnKlx9WD-ebwx{U%2 zsuE^Ko>szFJrCa0zwGry359is&{xY}F_9;hhL~%6&6z8trLwqi zN~{nIJVUWQ9Yh^y^PQ)}z;YP8ot5N1)ZaAOonWJ*gMC#SuI+a&VHa;|1$Mdo z$WniLY~8RW-VvUt$;Zs>-OaRQp)ukoB|x3>Eo`YlINR+wx;M`L7HO%Y=Sp z=xw0kGGYQEZh^=U&O`eNpdzd~@;suWEgiyxT0F$TN}PTr?w8_z2_8m899OBB{j*go zW<%%35trlgic;LJ<)yfvBIK|_?*$DuGz-{iUcm7)ngQGI zlr_01Yx0sEl#BF{BR9k#Op-*?B~c|~VZP+5vn2c3;VaIPy!s?baOK-gl3YdXt~^Qd zftg@;N2aPm{`3Z`Ruak$jYeTU@0SfpG)b~I(0xN!`(&d9|IM{uy|s_^)Om~TC96&S zrsUdPA8rpBa<@HkwCCm>tvcY_6+bdQ(YoUV@}Ey3{~1#Ef?(MJd7X*~RMUuDS(;#q z%y9(H$p~XfK@cleuX!C%cf*3m40~VKDG>Mx>GMHr%2aszkhSEx2G=**IU!C=292u zOO(YghEiTlX>P`HFZ$2IpCuTX zRBE(W8O(|LX75UC=<8@s*;Vc;yOJVtavSg9WHOmlAImjfdh&96cxyvoN!QsIh2cHS1Yv! zR;l4xSih1t^Ez+B7N`%pJmJ>0n7~bXKYb8;0Q;j*RjUbq72AnT0h)JUv-r>Et3tZt zw?k*GS!34h@7UR)(`a-ZJE@_Yv7zHxXW?jX)70MH!QYOJjBOd49V267v9S%w=ly#J zHvGDG=ypxPoV^=*Ju;!!s+|7E!U5M53bwuctX3Fl)e0&8>`!3%E1|eX-SO;EXCW`# zXlxL0W{e$kjRDS}d+kj=p9gpA-SF!?xSv^5$eXjWyOA>`6Z^d7^8h29fcYvXWv@Eh zk66hs!&UiPF=zA&!~gVtf|4kmK@_cV9M@=JHT4_JvCdGiD`D~4rO=O)dFlr$nS6B- ziH_`RH%GL*F)?-P+OZRB!@q>J*-HT;F#y2voI;@~g#apN1J?A0G6Oc3V-@LWzPfBR zZ|(6jj4A8yJUF^+3gS`_09M-h9kHMK64s2}jqGO#jKT&5rEM43qS)DNJM=Vf0d-9jeaRvV4K* z6G0D*qrvbNpv<#k^z5QI!vTfOG-4AIYYO>^tk8-oFEqpOg*?+&LO?KF23vwQZF!(e z?2fMxyT1A~+7gk;W^ZwS7$zZn#6Q5rb5&iaOA!X(yWdz&-(NTB%$*W zNJ1IUC`YSuWubRY<fu>;3TmGg^> ztJ@pN7GQ5ah`oq7we3h3-!SI07V^HVfkIZmP(p%BHlUo<^X|F-4h%BBvy#P}^9mMsiN!>h-H0-{ zV6E?Xh1e_^6*6{(ES;+{@yZsxGR+6@@f57{Kz_A6V(3iQ;fetC$^y_U3&1sK0%$NH zz@kB1{LS-%f9n*HoKr+{VEY&35yKB>(SqBei|iErJ|~)Ori=Cm6tua&Y5}L0iaiJg zi$$00<%&UFYeptspsqp#3ri&)R#eh1S9n+vnrm2!%#k0HXzd20onwX`Mni+8aGNon zO|&2Hk?5T;*d{BF7#>@H*8-C zE_4U`-3m*;BDb{WO9ZY3KaEBfBf@{UUXZv-JX}L3Vm*hsah66mQh*zk+YsskMu57B z##vHcda`1qr&IyaL6FCBf+UI;QLRWv(5$A4FH$sI1JP*r>SR=rBL7Cnb#ANC!AZzZ zP%^nv^48~JZAeP0mXjNlS{VuCo&bMjmn=#p@k?0mkdP`MU+NeCO5X<1JCVwHjw#27HJW zlK|j0BM0KoxGVZFbAdBUOE?LOI0^p{OEUJ3ehuqn;jJj8 zaGwmi(MUB;qMK;JP5jjj)dT@Vl@e|PIQBhQC?~QR-U;B(nQ38^jw!RQRL4>%`nd`h zD?ZYevhcf{7if;nj2JorP1Aylb3F4cCObc|*sg)An zC-7GYna*u7*&(MTdd(7_i4VwRmkuv+U89%C6oBax6=1qd2AB?$-R~ z0nHo)5)j886C|JpP=SLLXrN__L7UbR!%aXJ&co`8Cfq1mFTQk$$7N7c!Z3CRuW7~b zCNJKgz!feS9)WyTC~6X+ey@VF_jBbCh_L2Xyu98PR2)Hf0H+j{r!OlVS}J@^u39*> zqHJiFR2OhMyaomJgYQ!cgU4p~akvaO72lBJx`4~>)yt`i-=XB3(`xr=30d*YYPC*D zld#6-&f-U5d0$$oQ{xx#&#HAQie%)H;%R)Cfor!a^qS%fv}?sv;(efqj`d0m|_4NWg0lGiacwH6mgFehXzS^O6%Tjg+g^fDU9 z$-gk1$7QSHnBqB>qm_C!o}#pJa>`&*)1*|Rx)dW`(J5%yCqhdxiDAU|$qQISsBQig zj0JDX!`0OMXa&qTIHyk5EhA(;ZUHCGnzNb!3d;Co^`9 z?;)4VYPjDO!xOPgjEKeL)`x;~jStF?kcY+bf3&PNhicVVrr!BnzK8PQ;+Wz7JQibP zzmJhh5?mj&K9mp6$r~Tcqc+4ifLQ%=Y3&=&6)S%(4X#xd{vi315h>PKRSXQQm6}+f-Tu z=e6nd4wJoMD1MWYckzKhRRGW`4`}sqMu+*aMr;bvO72WNjcgp#w zbLRc(!^zY1kx~FEl@d$%Bci~wJk?L;h4bj-={z{I6mCkbC{MEzy9n|w5u>06A=pHG z9M%W3)yASGtB2*)G{ai-dJ9X}P9`%On=BtxIcuwYz42gQ$Xn}V$v1lEMj~?FYid=h zU}_?1qha-O@Td5E)E6Jw+wJSFcZC|h7K=LTx?qi6@a87kj3ux!ab+#v0(fJM-0+Cq z^I^>#`Dk_UW0E7VP!uedSzbmf!`lsyIhx3}bYVy&1wIuklyyVET1+>swVr7n2 z42&}ZThSX6CW4Z9Hn!aH{>b2-c6}u1H!2tsnkR`on0EK&1_vS?euYE=JnTA^RwXyN zAO67b;lV0K!Eti6R;|!$<&@jFW$TtrcCUkcYsP{S4dN(sSFkTw1-wh8qt;*5A0vJtaIhm@6Cb{&wfFFF z#P7#rw3H%2pGX(SV=-4+^x0_7ydfLCm1|C1lA<(r1!>?^>rUmtHB=0!IfYwEaGfjk zK;AWHl0B3+9Vsu<1@*gfZL4zCFW#_B2$pJo5eF=~;{DoCXN^By>z2!Y{U3bU94ZDC%aQR*x zh;QRhF*d9LTaU(}wOUNgFW?gyF6{S6A5I+bJi ziG}euh@C)ZTd^Fr3HzlG(HX_Nu^^_!$3U0XgO6XRiGUxUwQT_(KO@10pfR&zYw`7& zppQD0Iv5;1l`)JM2t)RMO-w>I09d0`x-$1S%(*t;8}84za2G6?D^+A&*JA0&bYV`A z5#XE`UYRbW#FDQszX~gR3Z*_@Llwg_H7V*;9^Ak%dMb|@Sa1uaGJAg>-Q{QKE)ALc z^YA`Eq+Ga)thkX0ITB(8IdH28``mOSRj$Qz^&I+!%TnmUujKL+dWI4Ah@C3gpjPc} zUtjNR(#lnS*MqTKoz2^Sa4@^8!%-cuxx5zM>}lVSw8ahQ6^gGlH(EnhRdby!VpYZJ z<9B*ZgWZv4uZH?hGp~!7V%b`YN+~z8S`)z#27i+$*i~oe{q?S3heH*&cw3BoDiY5o ztqg7YM52+i2lRu?a1HNbma8j}mH-$s0!I0Zmm_A%e%uZD--@ujN89l(74vIcL{-ZM?B?h|@Bk=q! z=l%9s{iF1?(0-!ld{%f+fAs=H#(96nK1=H#&C^J(#m8L=9ybWF#fH@%9LKcLYy%(T z!SgAkj7($Td{q*SRR>>2>50eP-dNmCJfB$8;9w*YrH-{3Nt%qNh`P((Mv$hhK$_~X zN%$@u3akdd2d-`g2+o5SI|opr9AAKIoWV@YS=)ZDBv+zX39Fo;{OZaxDsnZ;(1u(^ zoEn#MH6=QpC$>toHlDX}GWxqKWon+1Yb_|9My7u3+X`uga7By%v5H`Me#pof627ri zuYI!kTdhWTW9*OMjVm(TH_Xe~{phVq8SeXqH&|7Q{jgcpUamgfG3Pp+nrm$c)y{?v8!M*Mt9Nw;8I46}uxcc=^`6eMnwz~|W9>{$ z|2mU38IPNq*VO2*tm-TG36m21>rBQP<2JupQPnoqBue6OK&@(VjjSqe$*!p}oBGMX zT$Rx^TOyEd+_$@dJV*1^^$uHIUv;>*&OQU5Hjn>>_&9i4=;dq^M)4DJNPYwIa`c!1x;XMg z+)2^aS@vkz(Sdnfg-S<<7rdOMQ!9NPcy{F*txT;e^Wt(}Cq2_|+>JnOL} zx3(_%I@xHjH&~T~zE0oVa73oF>x-9YxQZ16a8v=RCty)cB0jti`8tuhuSH|f*8yGu zc>f#3_eWm;8M~rU@CxGiT^XHD(HO8(YVU0LNz+{2N7YB@qk?0QMu~=H$AB-LX9_== zH_fT*KAK183cf*ld17H{GWd$5H{Kvw=^O}#2B_dfeP*)B;_leeZjM&RY>bBI+-AW& zaH|!-?}hGxru5FZ6gYOGhk!gkfdpS%?jIn{!(T$<0ljFRhsT0xpj)7{$e#_&c{B#c ztl{udzSN zBj4prY6;EI3RBQt{M>SV>vIN;QcB9G;aWeP#5eE)c#E`9%l9i-3SWE9Rqd))niueO z89Sy7-~Y3k-`5Z|4G)-8v~Ny+|1;coID+FJppR6pI5xd}$+3*DCVYQhSUlR-@IW42 z%gOIY31Yxnay0*dDB(hpW3=$t^y>Lw4fS>9U22)v3n)^kN>A3iT4GKmL(&pTZVxv2 zqV3`K{&dKd8m)CC0~Q4hzM&buD(I1D2UZzyZ!8e?eRDv9vyAHMND{rkOZ(uRoWu*jyVGL9f< z&_&|rxWxp$_VT)Av>xCrrAAd$OJVf_sX~hXkCIbLX#%~?W}OcIltjvq;618|7s!7F z@6m-_hvvz++%wS;#yq7nhgfCnjvo@h(oxP6Ud~{s4K{{Q>iR|bctwcR#7IJQi*>` z5CADtoK}c?PBxRo+A^OVmD}oa^FLvMoi4dEpYt#k&BH4^0q?bsD5gKP* z7L!9KC9ZoPDFevf;$oREeTKm`E{oaDNy#IJNvXzausAgY^9ka&GNptffI5Hs+rZ4B zv}{~il&Zi%MnZq>pD8%TB~i)#2DJfygV+Tq;4ZBJhT-SWN~Ln+0)F>7H}8`1`UU)+ zj8e|qW(_jUtn3hZtq2^KFXty%d3nWIrgG>(T>Q7Okz9(rRIJ#xhKz)bb`4Gqy(+=g z4vPu+Ez~LE4uawACX+*h(}YH)prk7KX@b}2l@uXSDvC!5`~wm>P$`9u#Zb@n68|B z9AJi@0sl)qP&vY&^OhqFpdW_vk4*2M;40b0_iKP?$|Z%LE7S<#Ze}^T=JhwxGN4k8 zUM1lTCb>q#D)5}ess{U7qgiLu7w2h}9%4w0yntp=D=;M%EUoK3H_ymOSbzB^7X{a9 zUPfk6J!Q*JE-sDu3yv*5TAHL>e1f_tPN^)OhHXO`z>(F#?w_{xAM2Jp-U_2=k!~OxkB1Vqw{}AH%Yw=V@OC?ZbhE zAHP@$;7EUYO6hWlj(-h!u?B-pE8%dd!E3X64N|qt9CSKECYj6>ayo-%8Gf`hD}j7U zsa4VpFqeNzxg%DE!WwbAqh^J|9EFrEEEe!5sLkjJn*?p=i5-{=GZ3ls3N{R$_Zkd5 zEcN#fO}Av8ee) zs6H^ri|cN(x}YcS0(5$M@eTX~3_ z4*<$2u#oVK%);U`=au*nkmei)A29NDNG4f^%%O)97w0aE@_~4JYYhJG?~BKJz%R5R zVe%+`n7$6s+bYt#540tcyRXy^{w}Fa`<=;n)byf6iDK$9Tz8|zrDYhc3uc6c$?t-D zeve?tP1rP`|6SxUGKQX^5%Z#PcE-ckg6BwHgcLu=crtL;lulYMqQz;KRXHj38mk;d zA>PLoMz6`_;T4R^$lggSwPr2L%W=ABT;&Ucf};9PiqC3sB!SFal*%Q-T9}0^d;xVW zLLMVtTJ{c#fHArB4vIhq?k>GUnWCr@EEm>XmC(dX@DcB#R9X{!MDjMd(Q7t(c}4Lf z6<>gtqR=<+o#=oQJfrEN6fVgt1svc22Y}d3FlG%}iK@O!;}pI63N7Z(@*mzV^tzYh3v1j~cF zy;*#a!WK=K3adsv5hjuUhJxh+gnMNan4FapMpB-khLKK}lB+82$x|51z17BPwH*1c zELVKR>vDKK9uzycz4%%DkMup5SFn#60}0b!NI1=kM9B@L!Kt_%OT&a+lw4#z1NTj7 zlwZpb2EEo;UeY#3A`KN7i2rW$^yW=8uC|-C7M+r87;CaQQ)5XSI10Sc#uD_l=ZllC ze80Hy+e%JB0}xE_dg%v0o|}91hu_^zF$~Gb5f-`uJmIgv6S}c3p`X_Zxp7)?)(G65 zgHNi3OG3i59LypYo;Xq~J~BKYJ~C9pQua)Pw!V%iqf}mt|H{@h+CVCG7Olmu!s)4* znHh>;ZAOEQlM=g+66U!d|KO!vw3H!e1*iNs{IlPG1^?{xGFA?rmZ2^dhr#pSwy43M zqvioc6GFU##XpHLm<9X=h=?H10D@vL0s0TGyoT0!KMnQ;6)4eDzbZYyo*T&ZQ!0l^ zYt|{q>dq){igktw;9eL2;-sh#ex~@jCr%gt=^y2soQCLl?H8XoJ2gH3t4Ky0e;4 z0Ap)$sBmhaKbxaSjok=5BqISg?E3|(jvQ+nwyYLi!6j&0WU!&PlzeZ=+W&N6f$Vy|R zxJRNfX|-mx#3(nojV9o$;p83VX`ug(N<7E}n-A_md<5O2i~z0vK6s-vGWzFfYX6eAneBcnn2|@+70JHLeq4_$RJM?w-rB}FA>NQSS4?N;L z@>(9W%ANf0{K!V|yQ1MdXc;s;Gx)pw3^au4XCsxZMhC;m!K1pye+vAROCaX+xwX13T zP|nrTP;22Rn;*yoO-!{mXsVF5J7LC(KKdCtv5FRM?RYMavjzr97`-5B;IR+)7 zc!{~6_F^;GHf%fg??`U9_4Uqd!4~in8CCDrZ2#IVTgF>G9=P<;zn^JM^goTih>c?$ zelg=rZ2OPReSIc&5}(`=__N(^T7&($V~6RD$PW3R8@F%6fOxRzKdhWtV4s}^Tui~i z-=DmO##vxFRC64SyTpNzh|9)D`nLT?9=3~3;&O6whduD;JZ!t81N(EnV@JgFMn1Bm zQU2#VyoCt}2`m0bMe*S9DZGtPm>Ny3Bm@pSsMVwZ9He+{xmtC=UA9&tsxV5tq#LJW z4Y>rLx&1r$-}(Ig(~Z0_Iex=q`+AN}rXZhzjb_;Pt?%pl=i-}>_1k-oo%`EoAH(s} zGoelQ@AU?GDU~kXktP|=ZE?6&1dRtsl_}(^iddB73F1CH__u$>mF?S(x8M374~=vk zdGw1H)(_l$Y-^8?)v*$_iBoCSDurIB-uC6+e{k0iUpRO7@Z^_^mp(V~<$E>&;3WUl z=NUOeF-o0=C;)^*Q8Kk`bMXdp0N6ro@j9UMj{;lxQEVTug&P(XytIc|&m8A(|Vk{Fi zNGX89REgn3BOiRQVRG*1+(bic>fUKRIL~C@K{v-cI#MwX^k*>ZOOfc`($clL#o9P| z=-8pjM*P6YtusyZ4;cV~X^Beu14hT23?2t>*GcSN$LyAt;Z!KxFmiZp*O3j4%)c=T zDMst2*dS$^ULd%P1vB;8`|R6uV}F{)wt0u9f*YiCDj6N~ zYzN#q3z)hV^n7puRlpl#3YcqQX4T8$v=~?o-k1{qpk*I~=AvVN%CBgUhAo~${9cQ? zP`FeoYBeIXdKHEnbplRFmPh%PxE&w?Fc2eGM!1MtfP`f+e$;d8SFZ!mMPuQ4tD3~a z;appUm(jp$QMwz~rq>U@Z+$Fv_=#hFT*6v;-U7}ETAOQpY6(q{5*ed%L^~2|Hr_Ln zD6Z?@-Qmzhb1A&vR6mg!9Xvc7!Viw$xup*Ofkaq!jCqabbiBdiSH#Y4K{R)2e4%urnK zXcz+8w{5T&r6~`F-T8zc&@nacfTbym{?rvk_l*P9|Xfr%!>9_aW zJ!}4J+()-J)$Q=S0l2suaj{Z2m+`PP^lC{55x5%+d6}_Bal8Q8v zx+QQ~>SrY@3fDr0IcTyWx#jM4TAWt#I)g<`;he9xIivtw0GK`8HIu&i22EVYBj5+ryPeqo5%mr)WaMFb`?jH63)2kr?pmOCT$OKXEY7fr1^l{< zvN_B)cXl?jVahVSfd4Mz#4OG}XCKhJp93}V4NZlCnzYo%cUEoxC1BT{cc*k7p{@AX z&+{uzG&|7NT_&2a8G zgj3ikpmm>CcsaF3$Law3Weq%C{Hn3BcO%hE@cyLTUhQ+Ki;vmkAum^4pw>cEUbXmF z^82(Nn*@Hq^~hVbkBqHv>;LJ-dS+vtWYbR_Va~A;{8V*~Rjo6w6XO|heqa(VsUmLD zC|MO=xv~GJd332`(@*m&t~FI$96{H@>fa@#?(i*QYMXC z`~(Nuc^d43HDZL|fy+)_g z+!ewloWp3cX{a#H2XHCtFd6MY^@4{rx=W{nxFJkl%b7Hi;=IFywqJnLI?xo4^_8FP z@LMUKbGWi~n5t*}0`SkLMr{?0^S0A7kvI$ zypi%XE#NO)$f#&4M-8gsag%v$ypu9@fzO%fVA7W{4a#JLri?GiVBy}KxyFuPjKnEm z5=MVv@vAH&;K$Xn)3ryp=SnQZ?I zp{#%I@~1LaOCK8RL?h}ho6{0||D@HN^4tzN_OKIYILKNpgFA}90(-1o*mK^Y(P}l1 zc-{|B`-sCGH`)Nhow(UfIO9e;OX0TLG}=oa@!%FW@e_}&_( zI19ghUGOhne_f?PTlePT?{OAzaPwk;s;81@Ogt;}TY91w<{^Q z<3mS=gM@DXH$S{_?7?py&BN^j-@I|dBeR*-eGhEd@bDbiJ_s`u7XL~xR1kAxt!Na{ zs8}E@XE9ExSin2a+BVTMKwvIigw`0k>1UN08~kQIkG_H-`*Mgu2-Hg$Mo0l}^obfu zFmi*-$h!=RzrtD7B%_ewVM@uFv}UJPVwRzCZv}8=PATA63}@z)%)b!8IfM}qI9|04 zbVYXq`nF?7gdT_|t~sCdfgdcjK-@O3aJf=ITT&TW6UUQGY>G`S;LWF*X*5{~b}7K) zSr*Nk2Uo<jJQKC7u_FxkFiAfW(enj&c_*RtVI=epZA#Vy^3Cw@!RNHuagtF>xn zzyz5LF0)Sddh3>v9(N!Uv$z5-V8M7b&#Krek13El*ju;lnrnOiMJB8oI$A7}*8}=& z#6Bd@CrR{YR3qzxBb~vKkzgmOwl5IZT)@=2HeH(u*b-AlKDaKn=<(2lQ>F#ne45@W zlyHg{QtV2+1e{Prv-9ZcL3Ft)zs?g|%%cWq*a8sUtzx~Vcw`AMtymcWsQi+BY?)4~)l8j^4AUm3KN7DuaX90oddAyFBgdlMNGT zkA$@tbY_Ge-sd&O)*kI`yJoCONzk=p2Y}Xl7Ufheu-joQ zCg!un-0T9u%m*k6i!KoK1wO*MH^r=h1>AU!otAH*rZI8(6IjL@h$9S>L9MzVoXEm6 z&*#NcP2&0{VhL|xH_Jhr`m!{Zs<3h}XywJ-RIN_?f)q}(cIzaU78F_)0~g-H|3d5C zQKz@Yp?*Qb7xxgwDE_@ZkM9+UQc43KLGlXhBK1z2jU_u|FbE*k$lkiwOZwg_3Kgs{ zaxdiq8kiR(tP%hIxnOOuR%u-z`p#fV*8+~6ZEmI;7Vwrc)f@RGp%SOHR3v+yZiZ){ z%Y)Oa;ra9V>WwsCDMY2YEWXuiL6zsKabf@f_9|{MX`bBM^S&?bPVE}4*UM>G%*ofe zb0EEMIO-X^ZoM-esM6U?PCMa{sTH(dS8R1>s}6qpn&i2CpE=m1F_`oLH*02PCY#aK zeNBIQy4^w2z||mFmrJU%>8gUohbXdP>s_$tKDk%`Ua1SK#d@*b$a;p_7KrY7rNyF5 zE)YEzFlB79sfn%vuX{!}*|~rlN)QKqf>j+m-j|%Ms^Cb!sX;iAUjU1Tg<#5_MBxH zBey^doW+bZw}7{vwQN*uL95D$6QH1+oS`l7yZJo&5-k?9Y?3<~gc3AC5CifgNz0gG z4Wl-Bt!_VyGx)DBJp>~{dM)ugwL!s9HVT&d41aFUlE_H#|)M2MNm%-5I4k*+NGynJ2q0m66z{g=!ju!1P78hIcM4Z1oswku5HBfr~r z=<&VVKQY%98rt96I-POX?0j_Bwhv9m+#NG5eY1nXA06Ji@31wsp>5}Zh_`2VPkKw* zdFSmn-ht=V-MTRv8oh3~ZP)rikF#fFs-f%H#$)Nf`)&;uS zQjX+Jmp&C6%(S~*ZJqtqTlek-8ZZUy!UE`d5?Cj;6KR0G25JB-DBl7!;Cvuc^mrr< zPywo8S7SIWsk92>oK__No=g#RC=zHAfc#faNlZxoC0kd@Kef^%G%hb}xgvL)T+r8y zAOFH^Xr#MFC#M*tR2FO>uitv_#wcOw$gNN8KeaJXmw){5^`G1pe8SVUHPbQEYBM)) z>dbure_{NKpSX8dtDM#8>{jS|u{w6}Fx|ZO!3l8-H1^9t6+S_QK)*IB zXl#hEWHg+EQ-B}Lq|U4s`3Xj@l3bdSC>0C?IwV}Z3_EH~T9Zr5ye?JC=x$g!4|Lu-t%Z{jzeOO@$eB0= z^GpduzI8&zS)eUC1m5gpfGf>H20lcR`_9L`;0LQ;Ag-TR@Nou^KXo=d#nx9~NKvIL z03?P%B{L$7o=wF4e0I8VM=aC~?!k#u|3(_O|VV zwJKU6qvd>h)jqDqu|a&_-9#E#+)Fi<__VnuCM+&c>a4 zMYxD#y8&8!0MKBfgcfUvfsAU+xPMK?zh;d;L#jcaz89dy7OsWk8xUITAFp0?x#<2W z{vD%5baj7&fELGH)r)!5!19j%N@%g+J%Yst+K+r;U&q`;vqs90YL%>h{9t$Ij&4t6 z{Q9BefL;0eNu1x?cZfxl~I1;^W;=bLD28TnV z*4qtLR;SVrt%y1R@M zcY^-lVT2QJSdJ5+2a-JpJP@6!;c2`DtHzoE1O)y=^~Mzr2rD>i6?kzTT!et)nY^bN zbPgBt=(@}Oj!J)RHK)VFToE)r+g3Yj!ji7(KDRZNiU0 zV;l6+^xC4`+n+f2_`%efJ)b(*tTmfdD$c@bt(?^CFgrW<476`fJC(~pBTdwAeLs+e zeV||X8o-QoSQdLuT#se(nT%0G3~d>}BS+Ktt~B12#_Q5}RT@t(5M3F)(q>cMP>=7e z#|P{2=6XC*j{|Gfb$%AZU4ZDY7>-6*^56n!21_V$<-+1$Gjgz_Y+g(xXukkJyDtNv zk?EHsk?HBzP*od*MbW2PST+Q7$%*F0Jh)uvFG14ocK}J5cLGVj20Gli(Gyc`K2{qW zKKA$lUoKOv22L9;QOFejhM^=}jgqu<46U!Z=Dtb)myHboln(R&P@0}eXJ*>%_-EFA z;`-&FRHId>G&(hcrJOo<)8|E4diR#*&7D;cmfrm3YodwKoq%ZDflfXFB-Oqgl^Osl z-F+4_&{~K}O{=0(lNO;;(^XMvIXQ`Z0)f&PtuaiPAZVQVFrjBWNj-!~#ISW_=LlF9lJ7GV!wud>dRKOc@Kr#(>9_VSE0!V&4Lh{wH2ua_;!N3pfP2=_X zg8<97?#zchJ-fTpo7xM)uKRVUWeQW|?`2*?X%-Vhz!t$HL z-3c>9^Q|do-N{RzjtzFSxt;9@&F=%YX$)BJ#}S(E7Dn2Zqxr6RA2i><7Gz}M48Q}D za3!R#Fy2eB9@_3Ox0Pl z-Fg5ZrL0ynaN|EtITJ0r?;TtJ(QA8wTlM}=^#XjKh!5|mYu(o6Q}7PhtM3N7`RYo9 z--r-?BSQGZ1~wFeL{(-xR>< z5vmqz#SWHm`qrfp-&;x}zIEr5JQLdmhkNT!GrNW1-qe+cd+Rc?yl@2^?5zigeYZH+ zn_7LaxAE$Oy*zkGsY-h3F110$&~mNnyWJB>y)oJqORh~vWU#mwK}orWHCyY~zi%vL z={U0Kv-qo8u9vfDWemWK28Y?Gda3*1#+=*JQf;z&EE3M9SLrzw>#!TD2Y00Eb{xKY z!>0qVW)_e)AHwaomT-I1Ww=|h8ZEFqwcce0Fw7F~42FARW=3t+ z!)!E5q9^2P44Et*3#~TmGzM0saoF_Uu5InL>$;+Hk`8xH0rumsEBx%a&{8p*PO{b%?8?e8xR z*4%gBt>>J3&bj5?!+%2ZOOe)T(K#$;HML2hmb2IP9g=9R)WG>)5ctf+9|RV#gqnz1 z{+r&-%-Z@rIj%+!(Goqjkas_SEYt3p2ZK9c~{^Gsc1tNjPO@7H?m*Ry4y=?jSq<|!g z`e%VBrZ4=vU<#yBDd@!vyUq*h(7>!qs|@R@(y=>sc3v@5|Tqwsx z-d1iT6^VUa`To|ub>V@IxZ7GC?+#Usbrt!Wc2*U2HPt#Cb#49Rzc=<8 z{V}(zG!(KH?^xCbs!F0ZXJstrV5;)Xju5`_Y!EQn1DK2vZR|b$r`#|r)jvjPwL~Kt z6}keW(N^QM)q(;pfy>}v?B#bR_mM$q;T+FiHh ziW@6NKQQR^*7gU)*k8Ew?tQJ(!}S5WV8`A2r#`s7;PbYMO%;s;5uLq!Q)T0(Fiq*M zdiu_Om_i@^(8$%_yR*ORmZxu?|M*zAA#=|b_${u_+yf)|HW(-&unxmSKfnH~d)!6S zghio;xo`Z7-c$ko24`=fvjIz3>7nBR`nVURh|4pOMohnvwXkxI31nA)%PzV48xqMB z;`2|46jG5;rVzdSYucz3A{jA? zX%wPQ34{W45tHPdc~Ev2E)Xf`RSak$7W`0#zN{Msdnyd}lvwa18RF*}kYAaL_j5^p zmF|A5`NMAti{6{&4}<0}`hTJM*>$>%UUOWg&of)xddYI5LW^#zlZnZz#X48WjeL`;7`do4C zfsZEZ_Oul$&_$F&Q2L&_9f_JCzrg+l&9vGdjCowk zcSO_%gG@==3>uS4VgPj(+f)^4i&}+3fr%l{f!YUyfVS&o%l}SMMFX>lAClbIMOq)< zN_wgYw7%dmv>FFmpNMM+Wz}!OVNu`>(D<+LO5q}HuMb!K2DH6MA9w?6`d3!8!FyOg zTYXngcB~igzGH9K>|j-%MjLFNx-;o-tqdr|A`+NGB4NtgLw(cjjG*v_ksVj{F!vjZ zyDD1e3+)w~$}9UyOyn?fAn0w}amDqW%{N~^x4BHJ)F|XCy;5(}h!rYD_2{)7*22i< zg@JHq%n`JX-Z1F%*YzSTzZ*tLV)brroZHQ9;C6G%&)C-0@-|k>+b*l+b9QqR&>7M4 zyhsIV-V@Y{$@|a$2`DS1)zpVov^=ZmA5thKoT8WO?K)P~3y4iXzh0o9mnb0;yrwTC zFAzGy2h@{0RBne3KwA1FB><6JM+xGzw6v}=Qs@&4f-jgS8h;{q7fsKnHV0qGm?s2{ zKgkHzXnOIwie7yAJ>A}Ke{I{XdrRF7yBaD6%I!s4ZrHi~+QHzy0}ZrShQdc^JOVAF3r9!b?J zp$W??l3Zs0<@41Xr+b=ygST+2Ude@Nuk6Yz7?|(ga%FcOb^M;!AKo+axi>#?-cO<%c!`{mE|iOfVEQO1tbJc^FX%(OzOa14sjL0+_L`z+SlUsNjMI1=B! z@HaWmr<4iX?p6qtF0&3F=Y#nbiCnAkr}+T04a8Oa+Rl!ZwVi7pSI||}?D9?+FYgSY z<(>Rf;^ExoowfV1kF%N3B2SoGfghmKD0Yq#UJW>duzIq zcEGHuW^YGC4t*9;Vi{dCGTpHIwq0RU`-ub3QW3O4+of~pWfHB+WN?|yDpJ1lt}922 zih652o?xDob{f@YTCMf_Y~?$Tv^HFQ=Ob7AM5g0BKne~6mU4D!V;8OVY|q)HRp4FP zKciKfArm}uZ24YyX%*})?Vs_o&k)+BRb(0WZ@uz!xcZ8Ru1L&osivhOfl9524NSN3 z2l@{4yR=~i z&hvQ+^3a7>Dzi?b%k$YI!wc>8=}pxNN>n<`p67d8C=?m6{Wq~<|EYNU@2_V}c!w4c z&DnK>^39ht0nf0zw2HVQlaqQqD=^2)%_UFu2@SfZr3SoPD?R^8_Eg`~B12x-QrjDj9pQ?;rE1pPcXJxNM(D4R+u` ze(h%|YX_EQ*M35AS-9cP$f(<7ScQC76PL#-`vVv{$>DpWe4MC|+3s!YBM1 z_w`5A=p$^9D)Rj1RQqMl_|b00Z$YR0$WQJ6)J(P3Y*r}s4ujUJm6{zEPxHR6hTZjU zAwKA*$zxUU%#)^qH7$`2BJ*w&<6r&3lZARooR!%e}f?KnXTUo z&Vgh>XSO!uZ$9v@{Oh6kYe;tw0jXrCB&#Wmw7U*(!@r*K#9zZoeh6*j$WCV@>k;+8 z@r)Mr#L&YZzjd-sp*8B9HltlD#%HuXyHo2xXS8k^#AmcV_3Qa#UtrH@)g_yKD`&I- z6MCYERA5Y4*SH<`^KQqBkvkVZ+Al38a~z7BkVA3gxygXGGYu9LdXg$e6MWXuCc|yF zGMpD^hI8KpzrREG(fH6!-&Ap2CTD;kaYBF`b;o6pBO>pYQv~)b1W$4;yG8mG-qk1M zguFOpXKfIFjtzo*py2&W0F&%}4=a33F@|q2N1_17A3P z$4_nY|l;p9gT zZmzTr-1_Cr2cNmN#@D=i?j*sVHv?NGOe!%Id_EWHbCNy>>9vzS8|kx>$nA-lEWp&! zAx|(-gbNiSNR%WH@`(b@w`l=~@&e9dRso0d0?yS;0s0VB?XsXu76tmNpt-$g_{DqC zG`IJh6aN${0y~M4L5`2pB#o9r8qatK3$*7*32&aD)ez2c)3ZfOMP+}&!EbRJ$SWR% zcJWIkjb}4Zgcy~vVyUdRSn@YNDkpg99yxndPKyjQp^!vhCjIpebX1NzDTl4Jr!h@b z1r=nGi!5*=pH1;|{E?M7X+opHg!lAK4EE$h6=%&kmLk{F%aK{wXVH_rapZd}07(MK(N)$`lxlfD-#Dio<+O9d0nEtav)I)VIzaRo zk}hhF?bX~!QX_Kffq3fLI6T(Iv5THslIFhErm_{P_)wvP@q@LxxwLX? zJjYtyR+*2!KFP<23ej~Hdf=4s@FHieO3DY&S&b-IAU|fURTAH)60bpy)r!eri1YkbW~6Fp&Wx88DDwMgWueM5Iqh7THNGOLeR)EjC#oU_v6+#IXVT zeH^H7a)iU$a~Ix;J0XP@4SOx(DJ^nes6|Rpi!M6SK1tC;kPxzxR0s+T4SOMW;0CXS z!f533W;Ex=tBCVFjczr07XPk{{5AjmZH;ZgkI~Uc1M437{J$x+DiOM~k$g_1cZFPe zB`)n) z6A{9R2;szo+ldCZ^9ibqAfOb^YB-AyR>k!YdK?{u+>v913aE0bxE zv2r?(?4h-+jqp282x4=C<{Uo4?^~GT7qCM~?KwV|R?9jx#JRLwF8o@7d{!=M(eM;= z?ke+muE-;E4#d5L55gHatHj8;urzXI!tXE6LLR*3x@sE2nkATmMVx<0-pwSpKKrgS zlNIl2mpa%elB;Fx(Z-dTiAKiFO!8rBrk8Ou6Yg{)VEP{jc1Q75!DqOc$#3xp(HDft zLJ?Vjy+alT$bg(|LBfhbC}{zesN%Ju^GFFSE)f)!kf0V}&Pu4&41qTAu^?lQ z7(RwZLM_sLkhK=sb2^lLv6if;ZL6KA75Hk&+H+JWSfp|NfS#T7_1pbK6WdwMe7Wpzm4S(b|byhb}trR$e>W;x9(D z>Y$dWpNf73_k`jUg{ZgQS>hmBj#edsUK03IE{phNkFb`I7Z6F_^D^8v!a(F zM#jaoLYiUGPa#Im#q5BXkK$YkE~XT6?Zs)7*}9gf`*0c+7t;bUCvc3Ki`h$ckz?Xn zh|zH|TOnpAj?tqSJO?bGeoFP=Q+!z;5@)aviPOl3#5XmEz26jFeUT4|Z)P-yMc!{_ z;1xe@@?Sh{TD7!G{WLgu&B*4f1_Jq;&~Jb6L$*jusI;|EZ;!SVm9`Y=zP$79ebwcY z_w3nz&%T<9$$L^mGtJIm$5aA-9f6K1e5d?{D7i>=@?UI!iO3@#c?>V?o+I^V99N32 z;=b5s7k9ZYw)Kx?@T=?>+oH>z-dmLF?C5HE$vtYF9PKzto)9R&YBg9@!gCUIp_5o9 zp%w-tlpK8?tCEXmNFha{JLjN<-4`mTNx*3ZyK?>|!078|i}Q-}h_Z83Q(P`Hzm$Ji z8T+Q-2>Wpjzmkh_tI9XOl!4cR*f%qffSnKF_KMe>%e&;qG$v|Nsa`Hrpu-?imHZ>6 z^&WY=)?Zu9NQE-7K&&gQ?Z|K3)8JNxw{-3!`;?kHoGzi#L~BiYT5)f*FJ57Z)EP_$ zvBs=5*>zTwhjGJs7g^&Kw^$Qo}a*3i}PaHOVgJUSHXp5@XIg4lSauq(BAzWG)WfDNPMD**K z#9@)?8(D_qbZT{Uo$qEU)|$8#Ij5?!_N^G1x74V1tRc`&7<1R`aqwj$5uYt;&N6_3|s!+wYidj*syE13n^z{%Nd6gPeR^EJ0VdfP&0t$d4`Kb&gix znqjID?7yA-*D=TWlXm2f;u=Ej`6~K``o-cymang{$QoA}`Wnwy(YMpZ6)$Fr4~Z;a z&t-|C===Nrh4TeN4Hpm1w|Nug0i{qVK)#hE)`G@JFcG#GirUKpF`G`KH<9yT2Mg7z z<)7)pmbR%@Pf2{V*(+7kayd+qLBC5hI<>}Akb+wOQ?C9-~Ni?PjFo zcK{AP3L_^>#MxE$Q^Cq}3TP*U(Ir7oCnUE7PZH)S3jEp@}SSa#5MIWyFS`IdL zU9o0=y)gDj1`^Vqr!w?mQQg-rfe&6x2;Y5wo%*P+E7LJN9k(l8vHsa^bEJ?_N|DTy zT76MxRezab>&Q_0NMe%W?GL7^6V< zqV164sb~TE-e( zJ)N6(J=o9~Z_wnG`WLMFV12&7+@tO6?dc@y-V)i|$wpUqA!7@i)%&SKp zg!V2!N{&%4@VDinyL^x0yL_)jclnYJoiVxEeM`%U z4E1K&CONO%{cqwz|5OqLdarZBmO#Pq|P3jh5?=A8mk^QD`yY$bX!; z?(KsRfVPRK#$(4%08dq2_!E_)?p?7~<2nQ3l54G`^-;|+H;k}HMb`lX!Jq=>`TFx; z=d9I7Gn!)}@1q%b`Ch*?p;Df<{T-cCP42vw{hj^$0~4y;~@2sa`Lo?MCF18(FGC5|r?hLYc~_HCiZGg`TVwks7pZ_AVREv?RDvWDoS~F>WH2;{&4eIDo z!LKw(qHOQRfIj|K^x4S zL;{gISf20#X6v?`WZ~n}`qcHtU(Vs-xG}QRD0A@YM*A53d*E452J9FVIHG=!4Df0I{5XWBFriy4^y#oH{cYxP?O#-DfM<2|%3m(YuC5Q|U@hr#|u;!Cp z;bm57D^??KWsMeWSZ#jCM1!X>=GTa2GO44muFzZJ*64x_p(cr(b!L`m?}}ABV+BsJ z5DZ;XAd>qkngdmXm3F(^{*|uG7$Jtu>D}`)n%Y&0eEd2+NAS z5v^V$RO;0VjZ!Mt(<*CGz28|{;FJn&`S?t<;lkTgJ#`zlWye=+*&BFU_E=nJ3fkRa zGW;NCqaKwXUomH|Soa+1gPEMP@6n#s=h(9XWY5+s72TXOS;_LR(D49LC=vf&pf-Cg zj-XZEEm!@X`p);x*&J7(vli%{$t#2)owO#MR!;5{N?3Py%L`_*b@@30+bn;g^wbB4 zD)#jEmxvPb*jZo57gE~K0cTkVB^ooIg~^K+_~Vg+YuqN%^k7yzAq{uM8q3xd`)mf% z7epS(6kH=RJ(!hOm%R@tu*$GCt+H$N1>Na*VIu4RAs`ZqW#&Llu{#zpb##WS&9p{u zAcqwyrE>W{^bu{{u7u}Dv7s8bOr?^WEy&@5QlnJa3!SAgsm4Is^t8q4wBJIK)@TQT z*Wmv|6~l-^))0FF-d~0$E^?De4#a*4a3Dtm=`;EHA}vEQp9K+JMOJ-oJsf1Ue17yZ z8Az{TK8s{_)#omOgY4?iy4GwU*O)E#H0`Nt*<0^)bspJaC<-{0=qL@E{T0|snhW)$ zyRW!@u*`f*q|TjiXk5h(XOUg~Lh(?ezi42gv-jj^wMe2+&|0lQDU?XWu2^e8XK67F`=u{~Aa9k%Zt`up5 zWbo70W9|f*_)HD~FJZSr25a!s8S61o;xjoEtX@OFOIohTQS7QuKPsqFrfIyTDH&&s zfhw;n>e1P2cQ+??RM|S}T8I8FTvt<4UT5&zwY1h#<}v5HX_=!mzp4D;{MJ&3sVH9P zh!zI48h0@4^fX4DmZBPOtk3BlB!%9>0$vAcD&%d9Q}F82b) z7{FK|a5+0;vlg8rAAXEbDv5H$<>ov$nDd`;I7Eoq9|&MY@xWRp&$VP7HJ`~q@<8-~ zOaPR^18aHwA~(%z*F-P!&&s$vuH5Q~6*`pY#$$^&!W1V8^%T<^svjyddlGvaoA=Z^ zZq>Sr9JWHIMq$l&xtht{T_;jC5`|Jls~M|YAqUP5>I}~Ej>0g@{MD6R5d+N>+3W>Q z6^+(GtEelfl*ma*gvcS+2Oy?|I!<0MvOaeNK-q8_6BknqxwJUO%*7a}<5a!K z05KLWrWDfXMZoexD;E=mm|~pE#>IFbmj@?gdEr+gk1&qEl&J?BB}LrEj!lC66d@-R2|4*`w1fij9WZh~MVN>f z`KdU~Y`MQTd4F@d`hI)leyx83deXS`>hmy}dY)am%??z4l-hc?+@I-fZcg5xX-?a# z@6Xu%{>c3qoYxXzZ_aN-f6(&dMF`-gn zA*Z+4p`@g8i9n*H%|DWp6c2b_5DLC+eD}I)eFKQ;ij^`D#*aH^F4QqBW?=Nr3k-iQR&8!aTxF6yw)lN2DyrApzQ{QV0i(#yD>XF zMx}_XC(FeOlh>c-wOFMd$Jw&`k*rJWb46)4B3*$X4u~xg_bKz;lIz9 zm6ViGgXr&h8;YQ=&!#>9NHkVj>LW{Hu@dq-=;iWG^!H7a`fd~w+*^vw>XNeM7t6{@ zUWNzq!w?ujrCkMo$gh+}%FlN|=$>daMloEXWeEg+hqC=+EE)?#0A!wndX{=#^skgy zdWJxn<96zY)ZdH#1)k61edX=cx2P|Q{z#Ouw&Q8S5;#ZR9M`J)OZJq!Tq3ZS*h>oX zmUQQ+8_pCgNf)>eih)wQ$jGbDV_y?`O^LhY?@I(KHnlEqDTC6Vl@=^zqznA_#5spy z#FE?jM_Fvwb$yA2Laj`#kl7Tr;kw8` zP2OzESsC#wwMLmjDHvv)N{QJ_myLgD&*;Z8)gG_fV_;lbiI(wq>}$Q{2AN7Lkt{pmu zB45&;$2d`{L`xY+V-YT8_*BTG%-R-cda&XgId|$nCFJz-pDt)sD(wYVFaV|yIZn$( z4>;YwFy%Qt%P*<*dNuV;x4{W*-cBu1KNtNG+WZ99hi9p0F}bnBF=-=V_n_T*5sG}H1-@?yZ;Q26q{x-&0 z8}L(&=nq6IG0kfEI&$k-Ux}|oWjjZHAg&@*nleq9x%yO{O;muG%FH>K&-IbO`YU=B zFKXcA1=XiAT!ynEbJorLTCWI*g^+YdJmnIsc8I{b0t0;We8#TK!o0nvurpO#x67f{ z$pmJFO{s7Pqt4n6bD+%b>!|hlo3>Zj%fmi}TxwF96^4f5igI(X)Zy!@@e9sWZ>x9P z(FLR?x|xJJB%ocRnlysoHyCODF;gD+da=FRSq82Hf&uiE7Ji{UxL)RuPkf) z+6Hsn+OBxD{gx!J!0gf~1aC^kN)KbOXk>!#eN!OO*vxjPLL{O7O|L|om(Bj?VMXU{*29XWpqa<55ZS@Gk{50Y$0+*zNI(36|pfdKQIT%urHMjL4J$w+ie zDAQQLCE+3b?9B0T-;&p< zRO+12mNUAnA7z+fy~?f<`j#?l5?J^Yc#LQL=dI_jNKi(7UqmWg77N%e!lva{>L@Ag zuvpv*Qbfur8ErS3T(q1Tp7=iX7qwPKks^us%qirfP9UXK)XybgvQR>~_@m1|fEgtx z*9jLuVqPLfIM;v8EUIp4MCaaAei}D|I?!x7-IEtK_U#gu2h^m~7Cv-51npj(2Pu>iy zY9qIuky)2i2m`hy@f>%y0=kZDNR<_&H|nR@wv-XitzNIr?H{(My)^F4pJEdqN?5`XCyiJBgXhBY)F{veN-y|BdR%6mg zzAaT+)LM&L{E9?t##RQ_QeY9|n@i3(92(0xa{Fl_UxTa-WlSWJTb4YYh<*l z)bZEpt5FX+~ZH|sBqQU9+t}mFz`r)SfduJd{wpeE_9Pi_2dV)7WX$4 zYQ>^qg-$6nJIsY$leNv09X_@CoX4XvDDZtu%ip6dI+I3PoxW?w?)&!FX-!t2pR+GO zSHoO^z0bv~L^v_~6z51V#LR_2!nn-4^g|`NjuhJUDoD=f&vOj$C87`#tCU{g0wr+4 zdQu6IzcF{uh0a?!h{~`3KpY>Wo&`N%FxWJbGp+%LOydgM2{n14t80y&{X zXKu)z<;VCi^%p+0{A04153_wn_6SI$LVjkw9cI>A5cjxiBv$)h;v=Bxt6I#rjkK(7 z(Mmg3>gGll*gJ%c-Ag+qA)h3-!HmrW$RU?hcsN0w&*DlU@~n!4!NZOjtaVlf2p%z< zA7wLX6!DAEw`=TDjoko^5Q$zqKMx#Fb0gwsTtjd>u$@KJvZqT<6+T9aBv{u4<`v=)ffNL>0hGh@|?zbE*yL}#?>y5xGLjQTZn4*mmt z$IpLRfDXh8#X<;wGaLUCn-Pkj&%Z{gbT*Axq@-2oUJus7B_q)e z2G(CdXSY~1Khpa2Bw7ss{)$?`i!e+>G<%~gmB zqJ_8->!ENXQ3(p@Oo5}3Mq1b62sbVfG)d4}nxTI||B)8aw7Fr4L7ZmhxDjjLE0CcC z()amSIXlT2rW--{uF5MDKyIdCDYKFv`_o{B@fAh6*DwWPo^lZ$&@_g#pv-2xE{~=z zobhy6s5I%cPPz14=j8F{L*zOpVhtekzo2|5`l>A;+M4(+Pc3wr)5xuAf zPZE{TGSKm7qh5tzjWGaXzY(|o5@{@aqLrS2O2{gQm5Cwm&WsPCnU!F>K%sYJ^zBoqmwZ z$mL~<4^uCp2@NHbNzQ+VszNtzqQkxCzeUv{cf10r7J0N@`44}OiJd~*w{43et6oP2 zsa?WZd;$gEWJ*1ACZiE~pQN54GK7eFj%X}G(&b%`m+WHNuh=v&-RgF?T`@Q?)9Sv; z7)pf75&?}V)C9kNHTCSCkImFqW&Un#@5g59s`mfg{+-7Lyd@(C+jblq@Rf`lLe#1x zE2t`A2Gp1NF_qaaP_PXV;D(e&%1}$Pj@!|NQz*c?Xf)y7ajHtCSZB*xXnh%QLujH=WC2mtDmfF*evizF%{KVcyx1nr% z+im1Eb~0nJ8{ICi?$hNX?X~vmZll!*GaRMFXw-PBdy0a6+xIu$1g#8^c~qxxj_4%n zPM6e$a3fnhHu#O}Ga8TE6Y=cv%y>i|kEl)~GVmn)5yl)6wMErPTx8`WTF1{GFb;Tm zS8Z!P+2?v@;y<9HI*W%6b``W&`6Y6ZPUQY5wE()Vrod31`Wy(zB4wRfLLo6p&LKKQa*k7w z26UJLFLso3L?g4D0^>H18nO(8iVlAuh*_oGed`*nG4 zA5H#@R%zAe-yxq`#``AuBtx|ecM)Yo!KsKH+Hp1$iHQ6~m?(acF&Fs}PD8Ikd_@lC zbI&^%4J)S|+KYz|b%i_1++wLjB9}SB&5_;HsRe(XTcc-s$j4^PLfN>|yyOjlj6LM4$Y#3p~auW@UYP2fAw z)VinII!^~`i>h~eO&~3b8}oHkb@fJ*6cX_G6O{5YBTM-*d`^I5`4Ctz5V+jw)<6&+ibR{>JMX>wrhCT6w~gdAPqwv= zHabVPO^n~()!WxW2kJw&S+?%o(zki%)?rFAb8vF9dtY%d)e`Eiayv`g@|!0L!zpq{ ztg)fOQt0>T~@hql91yb_^BTgB0`_T z4XmYE&9g%wmya*r(O-Qwb;Pyl&bg9)gH8!U)f%h}BzDx=DQ~K|W3*s_eV;fntN~$QvFYUsd2}FMZOHS*x0Y989=W}_W}>Iq6>Z4# z)fSl<)UO8OQBcJDus&lzpK+bhP%lAeyj*8~La+w^yDGJyy>?G?(~cUOt#(&S)2qC3`zCn$*^ z1v<@sN@+evy?8oDuf2ezb0g?A|GVfli9)*kL77r1yYoJsN}_l`Y&JM`S4$PYFw!~$ zNQ3_vQRplNop?$pluFN^)}e9HPkedkCg-mlgu=$k^-9(8?#t1RCsrNs(~Ct90VF;H&R7IoDeBpZQ|OW)nqf3cre5 zS%V2^Km%JNI)^BPopY=xL6oPjZQHhO+wa=8ZQC~A)w{NB+qP}*otfR)Z1#^yPC8ZH zT_=_5ba&y@_fuC5&dMH$PgAr&y|7}b8#HH9B=fs44=QEb2jbQsc0gHr{a~|^Z60Nz z@+h>a7)LbROcA|Rg4%izySN`F_rwNwO9<=VLX`^%4K1(0^r*J`S0-yN17_pYM7cYA z9?caa`74F=)MzN}x1h>Ox&`%#Nj9yN63AFN03;Dc*mlQJ)1RBKOF|Nk7n8PP_^wT> zD)uKcbc(IR;mr)HN#s2>8S?l9HY=C#=L`O@uUA&7P1`eR*ubTHENcmhA@)}{JWXDo z-hVJCS+F)K94SHB02>WpuXa?e*KiZurVZoZ!n}Ths$OZZ9n5b--KVyBmMk%R2}wGi zYPH3P;*74re31)w&6HRGAW#s4GM9U&<733}nQx1W*(@3ZG!{ z9j7s(Lt1<>nB3r0+yCQqIPoISthvg9TQbibi!P!*IB(L5p$PRap#(2@AlgS14P~9FveGD4243 zU9UFM`6FnKqp z%wAn@Z$PwhthD;F0>PZ+$wTX+<5r?>Rb1Q6nogjxco`j@=C47n`DRZgjuYVQ@VNit z*x43c=&-mxxRI{5a%_w}PfkaVLumsxx`NRT6kgg~2Qtl#{^vAV8B z{#O1=EdDrYaE{BaSF5J@l`DKdCsozUnJ!y7S#eWTZ+n4JQ}9?mrglRoGjGzSLdJgR zzmCi;%W#ZUS+t>I)%vZZKEAC0z;R3(6Q_INntrpEOo4VNaNyAJHn z*Hai=*ePq#fCXKI;50djn}XsPwt(#!r2tK)3gmsXhs|Q&1H1Hgy1&Q%iaG&v8qmK` zPg_usFPzV3Lxk9f`-WR4Acr%Py=Bz+N6Bv^(7!8H@Jy_s__YK-!%!4d9It(z`Impb z4M0^s=mY)QP|6n0cdGqM5`#YI!Dx%SqQEu%3oKz-j9SyW)yzOwbAfy2Z^i@2SHOeN zcbSKo;C$?xc=<{@|hgGoe;c9_m}5S={~&vu{#R)0Ss# z#rox)6}8_jdLs0YIV6XXnJwt>ut2N!iEGNxj%a;=G0DjV-gN<{h1HKOTRzR?U z0up8MwVpl6-oQYugskqmqg~^Cj_$gF`;87D^!1e#%$V#|?a9Gpg|_G**>&MHx(lHS@GS`BjD5Aa97fuNnZp#^q?a`r4{JRj;_+Y*y!yoF6ZWcYD0xbNzf zn3bfNx=w$3HhVlzQ+KL;E^Ll&_DprL?J)8){Pg#Wqm96|!=>nyx8I|yeP7@5hW+Fb zf5g$?v>lJaieGa$?j*?Lc-)R=5bN>X)53N89S&6#s^RvWH&xtph`CJRira|8;~?X8 z1O@qZvw2^ESAUJ&T;;G{Et61OBl0#`L>^9>s)W-?ZNqvHRW+uh@B?knPDz!Gvbvu)o{`J8wx1#cQ(!jz|7+i3x3A!O9TiX2c0Lk!1!M5MZY_t`Uv53_ z9nGhq@y8jOxG;+9iYiwV~8?iqnVT(*w29dt)T`_g8|x% zb@~u9w&~qu=>N{D7dJDoYNro9oIr$9kQUz7fCzPoWMU8>hhrMzeaj+1Bdov_a2lfh z$O_3|2`z|VY?Fk;00_efZIUp8-W=a4L-{JlzY~1oh9y%K0t*!(BoV<0M*33Ff||e} zhdG23dgdPvC|na&GXfV#ZX$twPYGoHb|`9s#+o^$k_+f(8{|_&AXf5%kxU6`fuG0< z@KlB|>hh#FK;@MYqPFRTK8_o{FhgHiu7!^iuQGbw^~1^B@j}=s*dpp`+vBV`nYHCH zwI_%=aeqf_bzTtn(|hTn60EUx!vdcuu@|IV1+oy_7TI=K2Tf=v@_Q(h`v8j(wLGyu zOxjVejWDr!BP_DQTJGmnkHB4e{;GcoPk8hTFki@Gyb`CMi6MXB1mK!Oto;&O;X;dC zu%twa$p~?&E*N-l180Fs26!IrQ2H@9OE{yUf5o#ua}F7XQrrDM2A4TwyjViDxMHj_ zMx4(FRWkfB2IHbIf*x8oQN*KIu92gnJSI^e6f6@D)I{nu=yGe00FsmXUNep~Ibj*W z?W?Ra9x#-tX$4rP_q%J2f<|aJo?(u$1|gMkP6}0V{Tn6A`~dl7jWi#;r}m?(LW&Pq zR%$S#Hx#oSi-+2Hh15HcPK>;|@N);;FOQX&!=<_Xr8%PSYDZ({wY?uU*{2+s&iSR& zI45Cw;z}5*5KpE}y#|^c5~Z2p<;7d)(eu%1Lf}lxlLvVM#d-t&eC?CYU^J3MT;Ly^ z!yBD3MOcJvYtz(N(w#p+jBxUts0mOO-@eRecl%%9jAVyfuH_Z?jgNM!%gH%<^JdA$ zaHJK#viy}d*nYc7Xt{@t_}~}Ye-@A)4)^96hiZL+nTu^R1Z%Md1Q@HpA_8KFb%=7r zYYq46$C(i&@WyzUB{?P%$r?b&3T|%TIF>ecLV}Mg=*NCNdJbI)VzF;B8UsY1tbV^Jb zqoh%sZw<4)5Od&mr>ZGl1xgD#%4>@Hq z^n^IDfQc)8vUd%?u)vCIguzq39PPn)p@6T@xF_`Kqk_}zac+kF(bznWg;(uh&i2*q zO~%$LCSQ5h7p1PYQL}-A&(E#(F{lF7Rh>4WjdQ5=^C{yq3V6XB1WYXxc_Fv@|4jX%Tx(xOu`U_i^hAYK1QA=zRQ^epI0`y=`EX-skFu z^pbRvOj1{Pv@+iC1Egupm^|ns?k??A@0*QXVU%6P8?%vF!Mw1Fl{eBk)^s=D7;-yn z$qTs zzRRuh*wVc@tu51(RlY`lA7S_);D-d)!=^UeERDugiIWy%#7{AY+I5PRg2Uiq*#`~uMr}v@-t`N27ihO<70@{2+5N83>0Y+j@(484bo)%#Ph*402 zaj*;CP|BvyvkZ9NW|%9M)(GMIx$l9E=3pHHjK8SVR$>R-q@c5EP*q!;x?2pi7-!Jr zMaUZdv)S=XA=Wf}4Q7U7Gq#vOOAr6h@B|?zTh3UE3+7IyIjll!DZ=VdYZ+QTNWmBU zg$>ZeZU0{3L-EUoV>8Xh40~lBWEhbOGi42i_PkG?!j<_GPN1Do+Yjg^!^Q^xS{S?2 z>|;Js%ij{t$;V`Y@H5)p4k1S2!xKQ&Go_c~w6{v5Pwzj z*R722!8|pC^H)7a7OOB{!}e443ql8b?df@;xdpw_Z>08R&#NBTLi_e4MqcR!er!ZD zuEgc3Te2LK8pu#TvJK8TBD@&cRB17gH}9)JZXOiSgf$vmn`q5Ak!y+j$w{xiBiJ}? z^gFRSWia-q_V?^eD!v%2i$SHJ$*0bvUGseiuGm25p@>lFcDJ=baZSnDTZw+N3iHE15wb$5` zY{6)9b@FnLGdW0*RD2>G;JqA%F=%Y^5@jJF8!roU1HMj&S$RQbWdD`tpP4%q?~JkI zL`HgsQRaM6#-lpZfIX{FCT3Z3MxI7Cwlrf|TUeqKrKy7_59bRu zg@=zkD9mZO`ecdV^BDt^1&{qG%sm|K@sf;A%nA;ko=BRYlITj{1SgLi`uet9tnB!v zTzt%*_xiCL1xg?6B&&(n5O2^A8Zk<%fW#4rqUXN#%qlz26~7 z^wI<1a7A>am;?fVt#!h^hD#EiW@{I<-5FTh(j})&Fe^f9+QAq_-XQWJ=JJWOHS3_B zpq<9<76T49eHYZaWoL%W)?M4VBp?s4Bh8H&j9{Yh% z*gY{`B2UBxP;aLuaq!axScB=Vxo`Vk_g94=>J9`)v4uQdq5S#6O6HA}Icd2;Qc6lk zn4)?=sjKobz~si{(Q6Ng$T^ek+m`DGAlz|J`Fa@A@Qg4MYXBYy^;Btx1$?nA0~iC0 z$8fMX517MBn3>1!mR6uL0f^^c@V)27BG1T#$=1q)bfJj8H(3Z|Smd5J_T2 z##B66y8JPplDvE~3y9u^^~J*8sqi#)|a+eZ!8u^6A#+H%pD zDLTV-gmAbDSDomY&G(jCZ)>TbVh{T z_COhPfP7>C!p)N>MC4`8G9^7H%^HVuFH6K_!6|VdhLfGbX_djBV^Gh|3LXAy4|u># zAnc&^Ts(~C4yLtdr2l=#g6Gak6BUHPojyL-y1)!=K3dz)GX-mus@$sfpe%tOU7{MZ zX)GsxqVV(p-78~3ps4zw4F_o6>C(s~{ADwsg%ngJbArIku*yHbHox8vf-HQC1H-7r z6~_I}4$mBK$S}v=8FOZ5gygf4em&itim=e`qF?J`9)5;z%;g2{$)!bD-B8nJ<|J*V z$GrgZ_Wmwd=hiO~EEM*EsY0lxVs?Q*RoUWF+Xjq>EStldGq52fqjh4BPt^bmCCdOD z(YH5!JjEL!XsZ9PEAXR0t+E3&^z8E71S>>a)m7y)kni|G5Nm-O0B%}FJhu>3A!Qx9 z48Q-(`T}o_eQAAzVaoOHrKw3+UyiDoYJP5EQV}S}`a;6xB`hOd$Ue6n>GUK_8N`9P z(oTz8#Q}9L-TN~&kn`nJhCTJ=GZ1u(5vU6XXVzeQhGPlK7|}OP7#!c+=SzWCfb95q zAVi?2N38`V#M%%^6c55{hi9o{AuVlH2tJM_l;MON_6Pd|=+|z5TYir}E+0USpLRxe zyMD*p0McDCUjhGZP4nJHar#eqfN?o7K7s#bKNruC`qogZNgwDmgRp~KKVSH68a(T; zP$ssHLc$hNjH;f>5|?+H#34oGg_@)#&gUv#It}DGR6lYX%cM?#;eO|WqQj37aLRC zYzC7xQmPl-Y`&O^5o<7kegD+#{QNB7;&y#pYh8E!vZ0#2cD%v`ASCzjV*-nau|tbD zN_-UVo&5I|DdJ6vf3Ssup`LNM*>SL1UO|~w=|g=kBJuKmKJ~|#YkQEM!^GUKxgS61 zZG6$5dtzpvS4(oRhxOd;N|6h4=!pii)_J;3PF};@aD>fw09XBdyk|z;r_}7WB4=q$ zW&yTJfIli({Z4s8W~-NtHnE8=$_x(U!L&A;W2mbJ&2oH+R9mVbZs1tAvZj+N{G`0?Y)|}471K9=3*5 z;VXH?Ek#y*q#v*M{y?1t#!l`VErN;-KT8Ww#Iw&~?L+NelZ*@HG0jb#{_($x!ut?^ zv^?i~`u_YXMtb7$Ofi@pb$R(X*nAqqx4YJj+V-2;U%4;I*L~O@NtbH8SXdOKKE4)S zq3s<&F0+|)?FveMIA1In%c{16F}WixJ8O4@N>SPou9k1ledkl!vDO*0@(m&@!!Hbq zYA(f9|>Gvl{Ku_|!b+ZQd4*n}aW` zlec{7Y|q`h7WPAoQB*_QEwF@KXD?{U!{At09z`d35khqnY!qbIKR51w^q zqX%OCTA7Rs+9zf`Fch78ILvWdugKt-_?jb|Tb@tBue0ra)ZlP$D}X03Eg_5#`i=X* z1N(k+@~Lw>i<_R6vB#h5ab+doM)b$HI+|Vx@0?Yo=k`6sCnn8@Hi4Y3P@JzE)_!^g zjk@$Y(=AVQCcxE~wyFDKJ+XshDwT)dmwuDp(em4e68K!}66-kXVPcG5_}b&8GjP*+ z=d)h)BGlx@6FpAuJNHJr6YA1_pvVK zlXG4EIUjA+H4(Wi$Q{%qDK1~=UZ)Y?I?LwLgPdR|0ab!6#s7Zu~ zPelHwXQ2?(W)+&t>}I|_pq=ewuJa*mju^mA#|@wV9jN!Wo;RjQq~FHeCqF8MH)2JH zFA8k0dE9`i3)JyR?a`j6-p=q(vMNv;jQ)zZVcdYapd5g;*u8N66YxNn02l!3&}_pP z9w?Y)Tjs<~sIW?LgzT$}zp$=+V*MR-CHW%0(Hby*JAhrBUR!?~fTlYeLqCK(C!G%% z_O0&yp>^?$-se{U>+lmr_BUA+pu7=TKERE>JOjW=cKxTnwVRu1Kf03&Yz%09;`)V`3Uk{62|C7)E zuWC7_cJErO|9Scc8VObakfYTu3GqZfPXC3HBvAN;ICB;JV`voW;mIuYDQaOaRU=j9!ScXzN7W0r-y=;0Cv%21o$27GA#1d!L`a2|s{QW7t>Rj+?w9?V^Sy{1W_^3K1$(KFgty zZE}?N>^|6HxaJ&HBUqLAfH}&Q=*O&qb1(rUX90nX2v~xsGm=#}pdmP;*d;j}!bo^W zgjcv%1bDZ_fqq`JpHA#2$hf0geOD&+-&p0AVW-y8@ON65ly|ptx5b-s__Ck;Z-K9b zcZM;n7za3waMlN3@o!S`SfFA4?WPS9* zmjTyk;C&415l({Z&@0l1%>$YyW=IH7OWRlNOoDR2B{ zaSna)xg>{P?|U3@8hC90cffnUz$O*PU{?PssHn#$q@*LG zytg|yY0?%9W*RYAq(Zc*&>%s*@r0F00vxfg3J5QPt;_>m*Rrx6Zo7SeQLH5>F*0j~ z6wSXmk(UXdSuQ@AgY1uwLCwJ0n1jZcAw!yw{v01^VqYysOu)KcObljL`;P9c=^hO`9Mb`G`VaXPMsEH)$B*k(xZIZOjPy&n~+?kaHT zHww#YawVrGAj2r_x8;2x3>@C5`F8ak3w4K_DSt)Sqq#OjlC|ea5T9i;Cw!bS9k6LT zIU-nx;6^5Ie{b`lUN`Ud59FIUhjfI%_n>tU*$9ivmiV2b~pvPIl@|RwLr0BkIt@RXR&v`xXOcI6Ci6P++GaiA5<_`#E8>-2?Wo6rS)xe&CVYP=He5rSP>InpD zxDkV{Iz|W5Kdv0UN}pWaLgS<5by=lj^{!z#()QPF8_%ti#e*g{i{K&vP#DiCu;kJgxg&4WM%SJro5Pxy zxVGgvyU(q8#4fy&!8?D1N6meJxA>nBMj9c4&GRf6clv1oGq!FnZ{3{?3kDDKHV2Dl z?2Q3Dd|utlqgv)#iOUNvR>9`v!Qxhg8}&Q5Ze{jMh}DOw8W2RTKD^>JAXmSI2@t~xkO(Fq z8_$fxag+!qq;d0Vn$grf5EQ0pAYZ{{Hq9_bo7ieRUgk!uIGVq}T>bcrf~ysCAQm;T zNF?%1g!OTYvf)=Qt({^(B;(n1p!OR`g|9;8MgQasZvs0yEuW zDqRH1p$IJX2y#@x!Xc+40KeS!myI&WwdL*)^O6(TY1d7kyGnIOAIi9?J-O#C+Syo*oqSDe_g&>VsVgON z>a)p)<6NRwjdDlw2^`Yz7jwI(frY_Gf#cVjJj`|m$>mEM&5_rgH5nmEUgw&yXVYW z9&K!~uCYB_TkVE!R~g!V#ZY!aOA5Mo5$dWbS364Vt{SY~RVy*IgsTIkRoR}NpLjPm zRu&eQR=%v&^w8;zHRcxQRs=a|uVkxyY-XCDn^;(1Lh@{`t;l#&OG*^D2=jGG8K9YZv)~JLmY;vomfuV0 zG6Za%8V;k^J03ee6kXLWL|vsnKu?EBXD$_5-45P6Kl=M|7!k-vE<+Ax5&35uS@1hH8Jn z@9DBns(1ZJpQ~0^R*MYVgI|$$3&2wv_KI{*weUGyH|88x?E*f^tE4Q``!`=QJK^Jb_{Tfm@Mrs6gt^^6Zqzx=yStWFGD)BzXN&V#Ig)9Y9Byx{2*)|z^sEc@j|TNYP0M< z@@J>BN<`&me=S(+Tvjme6lW)c;0$R2z?0|0Pn{AsCd}nu$y{IhA!Rh+GZe1v%(qPY z3ZP7WgCi-5mroHqIo$3tDZ~qTtAJH|OV1{ZkWbLFjOH$|_r{S_&On<7HbOv*>kbyR zM~~aX$`b5s+;o0TA7KF$|Er9??fQD=R&$s>QPvLG*;sf34W2JC79=Kq^M;+tJtK|U z3>gaW@5!X0a$aLLA<S)UhA3DNwPaq_6{`!`K(Oz)H*nRpLFwJ>QXX^e{gpUk}6LFbn|`0kG?!mdOsW) zq0~8g&(C=c^_QQA@sX@y^$Loec9E(|L>ebWYVxm9mDF*uGL0p>M%dXGkX^nMf5hrF zBXcY$)w5rN{FrFyfsZ7OG#!?MfHOwQpr84sTqR3j$7e#Is~e>oZ`>f23tJ@g(J7^# z!&^+$3_EoRq#%V45H+sl0K@$|VBp57mk>^x5$fC_@sHR%0@wH7qwOF3g)mD?OZ9B3 zClideasT~)dYA;!-2wi4`~LU{J{ezrm(@||5db)$v;@Ar%(ZyE2Sc@LuAnP}yQkEj9Z;Khc0(;22XsqU!XUr6qhz#hGul&~coK+1*_7i4v+)M7O! zk+Rogfk53xN^^fW#%@Ge)vT)jjeDyFc=`JN(KuF40X%svc*DZ9X)$S!Ozx#-`{jW% zD}afjdP;WaM6`)dnb^b^`&vA+*KDChivFQXi=4gccC*Q4D;-vDt!BI+xA=qIvExnN zS;AAr?lsh%a)VrQ-d7v8s@h!FuwKN>eF~0iYPYk8W@qQrCZ;maEoKSCi@L1d-C?^l znX)_FK8dlT)P%;e{@W#+MH+@N8pK`vOE_~;?>OLQT`lPX&#RIAgS#iC!u+uO2PSww zr@{^pH5&_)J|x3qox{nfdBu`RViR5lT2pA=+r@t1u9KSv+VlsLA?82OH%#Q>pEO8g z7w&zw%5gpKP9u^n*4nrU$P{&V``WP2RH33?~WR;=UAXK zR})Gl)s$=6V;deEkw25VR z!6QaXqhO3>EUL#<*hl0TX=mXTdKlu79BbcLx%9a+x0$%2x3TN&;d-_S0V+yuRV!1B zJRGtLWqZZ@ok{)Q+2!_?9^5))ac% z<+8*-LPgWB>@X9YDV%&|nkR>(zXrK2<7G5j zB-e^DK&w(T(yoXyp)kvaFuH8floU%KnS^R@;t5K->i8WBsfY~3jg?SG;ct$RkVgv} zpMrk0b`CpN;@4m{TEB5dTcIQAyXYreT#!oEEpa>C`5S$?$!yw&rW)ydi)Ji&Oy+ANls#zJpSSW|9zcdy1paST{u3K{U z?<2CSCo#~f=!k%oDXYg17`fUtN&uFl7@+SGv?&&UfrwJY1lq6`IS-VUFm=wb0Pkpo zJE`We7g7ug#0YZ-c7gHjiuy?MF%*>Id^)*ZKEsJQ#ve&@osox_a03sd7nrx$oE&@YYBQr94SQ7;H4Ts90JvUJR}l~~ovc+4Qtft_a8AEm>E8g&Euk90;ibQI8hVOKF`?C8Y?Bd_t#rjPYoh9-lkV|8 zNE#B6ztp+3bCO^nKcY~-D9c`b9&6v%(fi=wYJQyfeeSpM`&gMzt@!;cb=mQ(x4hR$8-e@2s_(4RcL%s2O01aq zZ_F#OIf5?1Z6`B*x%_pOyLU(W_}eUSlK;;xr_y0MTT>tiux#7$*1?jiI?uff$%?dF^5ZL+b{hC8z5hJCi%aM9nS zvcF;ytt(baccxlVuGj-LsV~3Va(=luE-oM#(P`;t`H$*m>Qr5K*1ghm2v5y|nSw)> zSk3ZTnNZrsk(4tq6&p|~waBA^jqiZMS9u%W7h%uvVtvKhb(xl$;qUasJWlGp-+Db& zSHa=f*fOpx8*cMtEva-edX?Q|rUz+L9t*;HoDg|bJs=Htw2i<}9@yPG{$Nm&J+!X-OAoG=8ksCZ#1LN-Ysb;xAot21G+lsbu#y)1M zRM>R?qRZD%+8V0APY0)E^|-ZXk}lL!@2k3-8ZMT7^$HyZXW%=%JDcBcp+CwuMS`lo zCPKs5P+mjvFbZiXvEaRgWoPNYPt9SO0!tXAqTeaY=jLtnRkFX816o<$VbXz7><0KT z&?>R=1vMRQA}4%%I2|3zc3Ny?@!T2%M%?=NouJ${uzCtb??^N*z} zIZ`&M&W~`&vOzPcI%tcYL8(E`ERm69P67e%v{0iI8SVCZuKhHlvU;$dZ6(=-MIyDDKz<2t9U=mTtb5=r1>6Hsv zC_>y0lq^FLsCJS+H33=%JmUU-L!f@V9TIC3fO>8Ec<1}l# z-W|fQv2T$#nP?K^Bj%Ys-}d}Gy+Ge%{TLu`iaNQY^tt50HJjt|b`MC`$EoBx-u}6W z!}tsEOf%!I!WLw)Y%<*YDr?*A&WGM0GS#VV+jd9#Hcf* zfuLXMW_HJva2pG2v$cftNMY1Lqlo8U-OAAAZh;MhN8^I_{H1(1Y3+GxPxQ+uokHr- zBbgZoz5eCvaLZ&&S@jO}!urng!Dz@W{g!m1Ob*fg-0q1#7;aA%%S)xXW+bLL+cYOh z1B^2Or14oSnn}TgaEe4JlC&$7Btm#=;@_wa^8HIEh@Y$CIOGX>D z$og4$g$oDWz6P_GP%=@p3%h40x`MlBdO-3!9+HeWt%Ey>=Vv`brhLVDGgQOE@0c`@;9fmRB<7R&WyHMu@MaDCi zu@StWMqDd-9%GMB9To>}vcGDbY?1H+Ud5ok-mF(eHMX|Ek=JE%)*b znfsVK8$0MbXam+;eP}9m~B8Bf%stk+{=x}8ApQtZ}v5c^){Aksjo#|Z~ElWu>MK zlaJ7p;3WY}8rrX4yz(;qTIR>5X3hw22kC!0tJ9G}*2}3zb=&m1>z%{rZ51+WDt~mC zRHhGHjQV(5*jA6jSw)@;c1$R2o*v>N4OoFi)oJ|%p3DMk2po@DQ$@p)FOcqEw^epVfB8-CNOr51|KWkkTh$4$wKNcfe?EM}G*3ZD}V2<$O)%nrXLVs(&OPkZPu_@B$&^XJ6$c&lHV0prNA)f?d8H>a*^9k%#b?L{MkC0m|v(702j ze)bo0_ACEMK>#-phv&bkK~ zkWNUiYKz(_-?J0s3~eRf-pt9P?t9}h2Md$R`mW|gB0C=J!`%D zSB|N!O&Qw2f64Y{BBvB==F6G?X|E=5`bI7OLvg1)Z$sBE zA`Re$&S}y|3AOBHfD}qZ?_wK>4BHFJgF^xzIZ996kXc{%=J+@T&Xp__o!$UN3#n16_qpU_$>G*7YCH>sbR&@ z7b*7br9HhBtoS>O#KQ=X!p&KQ;+~rITx>iHEQpiin$3;)rb4oDDahul3d(iml+p$4<04EcA|*-C zlV}ZurIV>U7^7o!WqM&BIbbNy03lV@G$FamV-`cC54GmbzBIq!Zi*q`NmtMbl_t62 zAnnaXqMwARE;}Y2tvr%JHH{#UOTkLK{O6Ot?o6<;u_48h1Y6BREXC;b1Eu4ILB+DO z@v69LjknuprAZpg`1k7ND%PbUS~;;2<#QLMP>zn9IohEBS$KT%7c!KkNuwg8Dmt@^ zRZmC1$dEmdN*SRJrZtX8yv9`BzbkT4PiMqjWVUuRsNx1i(+|S%l{1=xkSJtL!<7h% zb=;Ur#`71^`oM@fzummMBe9reg2HrTg#gbmr?=ovEAa9TBs%=YDlF%7`2w2tl z#$=12zs4kH!BGX1Yj*6o!UdO$utpS;?AhO7q;n;LX~{xVVtU0QQVn8RfK{@gP7cRJYmSkq42KR_k^!ud=toOacJz7f5N+iR}A{WwgZSD$rMCL=?$cJ?b!`Re8{Y z2#cPCw36(#31R8#JW=Kao8bc#jqzm>UlJ1I3s06o+5&zQX}$t`3{W^lAa(ep{S-X= zm8#eq<5A!Q;eN#1N3jqdbxB~r4mj`_x$2}5d*CDX)`b}{vbz%FjVgwjt{Ah8gG`3I za0ufW5RhWmg1_Y3($6{5}Bw!tn-j@RNEd0XN`}^dx z0)%&Zm-Yt4S!nl zkEdK5RT*0)?6oe<@YJvaPPOuwaxO6%M)k*Ie0^@uXxfHPU2x`lF5|HoE@di znCg_o3KNaPQK4c!*X?9hiScv3a7~Iz)P0)wiW`dcs7ax3Jrjr$8abtP{*j4VCS{_G z!q(C+qKhSL#K3mmLyxa#n=xITA==F;bLF%YQxRE|Zq$ZX8pM3@*C(-}gR8fogeIDO z0qCCf{c}NgW)Q6bkKAwP(G_Z#kD4h5#dSrb%u=aP!utCMzQ%lgD?z#IWGn_AD^g8W z4UY9gM7``jx-YljGXR;I37&7OvuLf`LUw^R1}h=mV6ZTu-PG)0_}_9Jnwj|9`8bRM zWTQIe99B%m*}u+hEv{d%y|4!^@E%)qTn!+fuE}#gj!K9s2yhtnbu|IJ*UfXHOe$Lx z4k{8%aj`_es4C8qCmlgmS?j16^BbaC6z5-a>L`Y*%5<=)8u}epjlo;kHySA}lL~x`)^^sm zFOAy^>#cQMF|SA6YI32;)%TZQ5$4nj@d`rB{F4=qRO@nlJv~?7I!{=3tsJiUSE28? zr2%CFvu@D0LWo$9Y}V79@lI4>>z6#cJV$>Ap&9~t$iLguQKF^{nPAnm{WsB#hgAOd zV$>a?gFugBO+Z0w=u_4nauJ=UZkC47Q0*hrUdljEAYFj>qM6(|e2pXHnZe&4i~gk{ znPUGXVtp+885rf8t_*Z}Y{d+T5eid@)?e7p6wYYG9sc zYU!@}jkv+5P%hwzl?&0zu5k1G2K~YDF`PPi=y-E-7s2=(>lnioe3_dt_)X}qG@JWM zqDw`!Zv|zRrpM6lkg|86k2#Ok@H8oB-=* z&HPMjU7}!1;L6SZZD+Pde{=dB^KF6@qL28y;^jJfrcuW-N=esPdHi*GN>IhV=sz=w zE-!0ny_4a-tk))TpuPaBSZIJ!cb3%t^YsUMwh5sv)VoXdNXPFdzG^dzu;g;rd(w5ltJnmBEBzU@v2ablV6gY*H{t4p}92q-$2*x=-IEoFT-<;Hc) zs;4Fu&X9cAMv4tgDz7Bh;$T;V2!s^l!A~)fWa3aDLS7J$nNFEBgNaWoh#LLk?I5>r1KPO2%RU&C zlw@gisO^CNl%LE4RsMnwwddg_pOsqFejxW$E}5m!!U%&fL+krO8E+e22OB^oBy6SqF}y91K5^$Y|8m-16;1d%t~aeZ$^!z2XPI z8t5IXgt6+G{fImY(zFuQ1l<9vK+>#JD8Qf1M-(zg^W`~2PK}driXz2LCRZdsY;9A7 z*=U6yYp{Wf1A!TUi(s_Pi`S1MKHFc?|{3* zhP+S9z*ZIWPiHocHf9EGAZZwjOevyaM3^fE>b7%Zu6?sWJAl!P)4Ms$y*+2 z2p6_F!iu(iNh6Kzal%%+7+_U5NT@P4z?w2$kz%m%c%Kd*`cJU%ct-z5Y~eMAviVXi zYvIv+MpRx{sBc_5RXda&@5Qrp#Pp}?YstDSFDk}6Ox;@zP$RlG+PsG^7(kd=|IHLKvh;r;hlW1+*evH=^vuPsuCS^UV;xyFx(2V3q21FtYcb7~-T7Jpuf&0ks9Qo0>9v z98s@C7wyedWvWnFz$=KXY3d2Dh}4AaI$xwLoZXhzCSm1LoZ?tGT?|~r6c4bI2JtaE zhwaZrD%)H!Js}bc^cZ{f?{EX~ofMoe7>bMH{JRb)_0*~a5-j23SoqA?+dfx@I7~AC z44B-Bx`TOvK*@+Ex+Wu|UL4(-R}yV+svl7s6_L@F!H_%B(^OI)X%APm<%NxL8+lIZ zVH^2!fQwCIl(MSKxwN11*=1kc2V(viqfx1sGsgLD%Az7~0dFrN^04o7xYee)fp79z zh(4N5b3M2HM)gdQ(}Ovn@YjYEg!oB1}S>;n>ttvg~?Ewgf(J;8XrTCc$hJwTQrK zd88%ob+Wsr!mi@RyW0~a19A!jl}igP!%YkzI(=!f+|U~Zic5r_Q(9qd_7Qb2P+g7s zP({$%h+Yy|qJ3S~XmNgSSGYY=*<{U)6wCjdDGs~ZjO@T-gFSI-f@wJO*463jrvs^* zAi=yyh!(Gkpzh@>GxYil6`!xdTP0t010~R~sYaJ$H)59r5UNVgv2+AUnMO%p)?3s9 zf!d<73T!%2yj9tDh*~>EcTEn+G(^$%L2aEkUCP+WarFZW0*;Z$fQj@)?2EM|Qru*+Isn$Kxu#U<49Y}|Kk(BIRO@3UCMfQccWuX3k2dT=m58VXkK z0i zM08;u8yLg{08H1^a4G_5a1oP0l~|K{L$szwm=cKn#KM%#$>()tk$fBkdro*>Kr8}i2__=RI1s?a|@Q(1_y#<>ieN7$V z=158CcC*YKDG1xzG;Mc9_=#yn|D3s0!}$#b_2CcAlR<2MP^#~!ARQd6iJb)Z2s89bI9a}{%@R+V zhZK}$g|o;~d$XN1*>miqKHZ&878^rGQfqX=KcQ1dswVQ9qJf$V{1s6%EzhR{{Ja3) zY~}~@@LP{ie>BHAB+utlr7aOjPeiL7Dy1To;T&sSq_kyi#JVEB=(>h`l=>%ZSX1$i z|LVm7J#Yx{2o$hyy`<@(-(bcIOvtd2(#qqk|rWt-u<{ z&(BP^`d1%qaW|$DVx|0_c8?Zy7MgZ%F77Hc4Q^i(`)`NWEPC|L-rb=L>ee)!XQZ_K zP)}~AQB#=dDkMc@M#akV%3VDL&f5Nfy}Go}Y--7=9(1|Z)U+M$%@guXv47jL&r#j& z9p3Ax>YCY97ovn|eqWxxrOj3x!oJLQpy6#m!z$3n)xk`EMrRbsWGHkYD;;&0hW*u@ z8MM7NlGoB2v9}u{42Nbe9H|Th2;bFXV~~f8C5o{>Ybh1V%vUpC|9h~%4AY0U#^q$HAYQZ{qDY9 zdDS?+$IY84ofUKOy=&aONg_&!S?z0Jq1?&rL4H&fbh&)RzL1YXK824IGxg%byz+oB{DpV&U%f3+2^Vt<8^$;?*v-HvhV67P)(ZLaTv7g{Uc*tt%i3-p!Om zb@rD`c?4dI|DqAj(djb@y_m=pGg;xZP|{xjeE|dB_ZB;MHNeh|=NF)Xn_HUC+3?ir zMQr#)i*MHIo+HlXHz@jYA$sF^YSk+-JXvi*X@~B~iwI!tm z;M0$4gV|KRI-eBid{}Bw#j22s%mK`aqxg+~8CYE87#+!2G*(tDCn`AntiKtFq5Wiu z5%2P2pCmEnb&C}kB)bag67&YI^j{YYZgn1ZlACP@Y~*J10W-N(e^^i6r6SHM37+zl zk`zdZ(*i=sznf3;DMFyRfZzU@aY2-2jL2K;PjfSk+=~kat|k_O4a{2(w$zgX)TPp~ zXLfCSVtY}^*fV3>p4e7=JR@|Vzw1D&Be5mk+wtvFt@Xz)jPLmNoh^08E*xpUcY96w zmV3K8?%P&fzWH9fq7C%htI!|3qAeWsZml?6LH1V=TfK+zqBeq|2wSn}y2Wf^#fqgC zv&~=2wg`QeTFVyL^w9dOP<_2KNhmzysgdz=+S)qvK)tz-8OjEm9gWQ$p4Pit8#h&_ z6TjX!d9q3AD0ap25~QMkpU_;ldunntttX$`-*(@wy5tPk&bw2zdVC$o{qTH%eDT1q2|cC6;-t$0{u9bb|1=2d%Q zur8{}74pS2dF;8QI(hG=l{Y&Y$@A=rPG?ZtLAG zZfSPO^(IY*5x?0f&6cLgs>#VI_t@+?mAw_dwawUQQ-~!>i9{{q>r6UbRr@OuITNQZ9wXJ1UB-DPVJYo#r9f_~b^s|eyl<|-*r?+6JUsSO!gWsp(=GF20 zG2&~&6H8haU42C^M4a}9h)!8Yw}dyz^bj;pobKe@^gFrLSa+rcnmnH7Kw4G?e=%&| zm{!?s+iTPEH5y%B@4;|*ygh3%e^RWFiA1u5N4a2iR!d)+*0>0n%5F^LqIC^!KHt>h zt{>}~wq@+};%+5w~ zrA1kzT%n`|%Djj@oGy*%!v*nZ!PU!nkgp%Oh^gos2wY{?-FlphEuXs)3COi`4*gvm z0q&aTiYui{y5bz-Zs0_-{iT1y;I~-z1arGPP-e_(}UahQsUE^8&7p zNPoB_0)nwEEv$?1n&P?%$3$>6gz#}|12}%=V%;F!=EpGNa(Rj1-;I|TCU8Vm*c-Pr zT5B^Cp$lIj8=y#8D!|Pc2~x1KGzzH;bBmkU(1S*@#8RjwB25c%JUfeVO1;KdNEh*S zU@1Q7B=JWbq^}@icJ{^QIyu$pDU9>T!Y*-0Or_Ol@HF1;cd7n0m0lJuHu_kC(q#QR9UK>r;YLA^n* zuT~cIbo581b<#BWp(0N&>Im0{D=Mtb`ORc=zswUU3ag;g>k^{~^A~=O0s9>naZodb z#}>xebk{BXTdePf z>FTO0a_MxgqPi{yjjq3C*Dbq7MUm4@w}tnG>)odHkWg)19jw5O~eR%AF9As}CFaomV} zZ0=7uFzT$bNg=q&kJpBnNNaOp=6-6v&Mlg;v5)Pf&awpSt#dK*YmqwfWR;oa2iacJJE1G7P1| zZW+lF#-GPz`k{}F=%L`+GKECZY%0qsBR$xn%kmIL57C@P6sHj`711msvSmaWO{Ar( zyt%oGoM^hDR7R8nFH+^@ipq&`ko`Wzpn^0j2t_TPgv(V>dS_VQCTvT6lyzXhzEdoN8uG1RjLi&$? zpoI#f2EVUbNaVzRDInw-a6~4cfBjopAk}N|yTpXC_uLYtm|-7+JrX;GMFAsLN{GK8 zo`Z7k3Dd6-8`)Qvh?LUUD%|_**u&I%=)D7V2lKZY4;xA1f>lTeg)(F^M;#`S$#B6Z zyH!TY&}ea5QaYKC z?G5{U5q|dybpd%$Lr~3k5q#$=C#i^9H1I>Ns1Sb$LnT7(7U*BDQwc7t+#O+B6A#fU z-Wl-BJx3cCai8!cEq-$ggI~Y=E0qx_AtIiSt&yp43Gqjv0*rfsOcd)Oe#Dmu817-( zv^23wqnDFU8O_|ov>KUSq|q7`Gwj=4NYqBYN#-&}ln35hRnW@UmY+v>8vVRneb(#E zqMYZfR+0H!*6xyXqJ7j}F2tnd-k65p)G;@eL~wHtOFSn#=QO82CQIgO^=6HGuq-!R zn4Z8v@Hc0ZzZ8i@;$l~h&Qs;iYsk~P zEk3JUr3Jz%Rp~}cNlVTVsnKD`&CSZiGb#I_clYx2$c0LfH)s%9^3SW?=aJeXlI5Pu z+-=+`+Z#B?>`TN9%Ti*7DNj-?R5=`D@#EoMEf*{#@3jU8s?zfFyhfcFj{y9pX)HR5 z*9L-XN}(!ySx$CmQC^oftIVOK{?s_WB1fdN8)`*jY^G6mnn#l){ENNfcY9ZCZOCq` zuzM^2CJ?Zfw*bGjKwtEX9_4fIPjj9ZY0sr+o|EsU&gEvE9$37xY!0?2*O^%MfzAj&rOT@$POb-aKHgM&4Jz8s8qxkkc_=5^&|mphcQ z%u-KwcM)bCjOXTjzqezwBD8x&PIeYiLGx*ff`75qfq4dER`(0}r~IHrLhmm3%Enk9<|?-WX2ySUZqaHoI>pUXb{EZo6Js~;C8W8BD#|nYZSot zOs@!1uio3_)8(rL49UDBmI+9O+)`kx(r9&>ST<&QOcCOz8mOndw5!k{6bQr$M4>|B zBXS+!z7n;ewP;;1(Dmgk)t5bu=L zd6cHi(#y_yc4zL??`8HTrp3$VzlMnufvy`*iIdye2@4iS8zN|f8vosSf+$YT|e5IcQcW7%eM_T59! zN;T*){1&+LDC4}y2v&nVZui{WTi}Yxhum$uLTx)jHfPK3)~0Pu_MOU{#zJ2xPlvbt zL)4#Y$GY;|tved)c6H`vw{CCtw3laEOFO)I?PbsWX3t?}8aw-TVnzZ0jW0pkz&9aCNE4796ZL zd2_vHMxv4$HJr8MQb_G(thFOe^nuWUH5oT}SaXx>(o^%y9hRGkH(5Wx9#m$Uko>$! z^hNjXOu05=T)TH}26pD6>IO5g92;}5M<(6`f0!0X6neG7lIb?2jzy!#?NG}z^#Yop z|2KQz0UuX&=6lQBDfdqARdc6HqtU30G@4NzY1DhMB+HVE%1D;2W)(LK7$;y1B!FYU z&PGlF0wiP!p~d87Qy_~WU?-c+X0w4jvitJ#vRO7uHp%7z8ozVSy)zogvT?HI_ulWx zpEYylmUF-Jec$=M|0(yJH>GN+5O^x7CC`!k)OtJabmV|*#6kwW9nwI&hQAGXMEkQu zS6DU>keXI7ssEwE@I$630bdL7G4OyA*9vA^QMn{! z&b(osU4!`Pl}$DQ_!-@J`gOf{#D1++uBHWri9(1N(x{@w+Y?OjokH{tp*-m9@Ya;= zB){F&Qxd`tr+!0TUBFv+0$zP^H8{1yzM^r69j+CT!yz-z%NDVD&RfI9)!tfL4Gz8| z1mbh5vkA06*7r3LX26J$AYUQHN~1<&R!WH1fI$FmK_I7y#|YvaA(H7SEeORlBVJ94 zBtkUWPJqKSY*ayZYZwOqh7i&)4RyIJD|=tyol9sjXfS zX~XmRm0Hr0J#Se|an3EdnqCL|dyR>42FFBFP)Km}(j^jBD3Mg01f_C=7}5nw z<-kHQ6LwxKrVT3&y+p4)PwTDoI*DRlvPd4ps;^$F5IHoy$E%b~cXw%0>)UBXcz|G8 zrCy2)I^L!jg9h>X7;z5meWNh|NGGEukdfyIR;rMo$&ASs0)I{@1}c{*q^Q^7hxo71 zeqC@?xbshRyH^KkRRpIdUeOaz_Uls@sup1ZlWZ}O8Di$Um zkZIs!alr?)Odte!rdO_{<;f)Q6wnHAM#%^@YOPo%SJ3#3UI%}xv>Jt3oBRX?+KL2* zkzYZxWf@G0sh-E46G}+<68=x$!1Lcp_eyayV)2614A|uN1ef>;ugPa&EXM>kkjuil zT*j}Jiz|@pgn!BJQI33O)grCKWOiskW5HoIIe>NtQ^OPF4^V#-qm;g% zXZ7eM61~T2_39)NofniWdF9vmS-}9}$r6+5|BBUJW|V%w)f5JJQoelST-^e}HFUi) zN^aI_jB=q&q_VBOeQHyQaI=uBy+YDJD!VI!SC0Zobzv8P zycN%3&jV?a`2aip%{zaCDlI^DYD2njK1iZ!!ucEg$B8{-djz;dtCDIIG#T!V z+Su~m5b&!yl|sYd)a2{QZ9n*7vj4I~CJ_(-=8b>vZ-08=z)yetR}&z71IeS_>63ty z%YYLHK>af8D{39}l*0a$&P;Qx07jI5!z*2s8X5?zONt3!$^+`v_+?wPCrr{H@~X8G zLNGEqG7f4aY+uPJV&W)aJn+-M{oXhP$^yX58~Bqy`~m*t>mnJj0Kmz2lkJd``>)9G zCk2lKnSdIhd|haM9V0IRnPB-hDv~F<+dJDyT%uD+)pD8$)CLWv{J0;dAfnVTq~O%& zlaD_6RPyo1#4<7Ru{~dS>e=Dp=f3=fUeHJdB4Gd@cK|*$Ws z>PdX)^CAX_1hCTkg)ct`*Qq~qMGWlZ=Y){F1=|UJp9H@zqu;k;JK-Au%z5{eP{?)Sm3sKj1N@f~rCu)AD<#Q)Mx7im76Fr&DH*hVAROX@>pGJsAEQay zpp=OPa1Ue*&+8m3)tF0rqcu|oIX4Eo9 z>2aHUEi?5c|aR=5E^Mo#U^<{U}W_NXE*OGGEWlXNA)KnTH zueSCDFFKu6>#*@v3OHo6*+f*yP1Hn!HyH%CukYm3`|BZHXP{6wM7TYsuFEQG+gi&_)J|{ z&qUeaNBaGa*v^XT1AT?d-KWN*2G&k9N`n%_U7;(-<*nZxsTgVSLVOD+LwFmNe7UNa>dm}VKg|^MZTH?7P5%>iz%nw>dg)vjmp}gc12(Y}% z`dp=BC}{CrR8G=+1d|y5DlmEl=?(M-aB5qDbnkOXrfH;RVCiue?hyDj>bKAqc5q{k zPf6qqbpApjN1!x0^ai(4_LfqYyn|T%H-afPTHi|5=eN)ns5*_BCQra^9|QoHelTVs z_kQpU&~@(>jO-KGfIU}yrSy$#IEZPHs+zKkvWuja%b1kCSXM@bUk&V_FRJuV(dmJY z^g`;nYx>smy&u_W4|*JG zv(auQ2x!Y1bu#R1%wBkSZ{e5se|Dx+p)+diMp`Ws8LdWl+ri$3y>$)&B`~@153F{P zTq`rM$q4}&8NCB)=x+GN1Z4wl?FMWl7MrR&Qg^D3OvILBx5r2UXc-iE3&I6t*o#ZV z@O^`v%F9x-SsDTYXbfJ&;H)5VBtp3_YQ}0)o)5@i*UoqNefhZ2pY^Xz2>6wP*S(x7 z+VJW@`b~<0y$>(89UQFms=$@9S!`dYbk(woW%V@K1Go@<^MndH-FH?&<&1%AI3T5Ve#BEu)r-LWeJ7vCDL*oXWju z8jG(fB4Z`h^vd9w5vi2J7io6_cgFJa%WoROVYoMzkAEpNOn$R`?lTj+KRHt#=viv6 z8H+oEyHAhpJT(|_)s4s64|U~y`NY8^$L-Z4@x@~W-uA`zrs+o4Ll55j0AAN~>p)&k z*K%8IYJ01TZR*)sQoS$`%J14&79Qzub$D9)_7DelP0#GkZHZSqA|G2l8|rC{dtC9R zuEPC?4sj6|BOe96w*ae!`%%~mFT+vpXwS~Ujs|m zzx}bHiF}*LkF97Jp4ayz582- z!=;0>;p+Wuxka!K6=?Vy{}G6S{6_x1FC4r1^J9MaeeCn&{^OSV!@K$qw>Zq`yVY?c zhyv~m{2)LSLD1gS=3G)`sTe?*QKNPxa#R=jIQ|yE7U`+m8)A6Ku?fyV(`LyBg|t+- zIxl2sAtjNDaQk}DAy+bRgN)ycWD=@Ku7N`@8adn%iY(a-eS9z^;&xy-4tTyB$gm9V z6Q;kM?*fFCe4o+h3r(;3hm|EM_`z3=>tPS?Rm+;ML65sr&_gOj&?C@0R-&4nt)A>C zmI@?dN}`SS%~fx^rO$7wT^PI;>}Z_c-k!ZZ0YC@bNJ3-Pdfb+rmZ?}|V*lZ01UYc* z06-kKfD&zoh@1SdIxY!8tI&=PQi`%f!_RM z+wPf&=(Fr{MqyB9>7CimYk>`Su3I354Ic#~b-S!@1sj2;61?HPbHim@haDpo&Pd#ILpFof$sGod6z z3PSh;MfkY@9?pI+n*dnjZV=(g+et!vh`@8JFH5afX$b%w&1Dx03Memt8+93QV*}X8 zcvEu&;t<{l;&_Hf92FUeBUcW@vxYhD-xY+IV>mQ(db{VixoQ$%j!q79v|I~wFpN|| z-x%tc2Dbb-+98TZ9XfzIbd>s4;|-vWbgvKj_-3F(t+@{5U=1c4+V7DBt?^%ze~u7G zDb|R6CwAAVhI0*1G>~`HJy`eoIJ`DP#M!c@ZK7XFZKHbY4_Spro z&yIk*Zj8e|z@wEPxiyV`mH_%`a6R*1dv;3Li={8NV&$INN`nXTm$>MIB4CNtKcdqaTWogeL3ybL5&DTXGu;~Payz8g=F;nWC{kg z9oiA|sn-D^|F-t}H7KOfSmjdCB;lbD8%hD8oVJ;}9`4SBLNcQhL%Watn!J#KhAv@Q zmuSNcpnbu5dyIg7mHPDEof)Ug&Gmpy&@v-IV~X=y+WpvN(7I>(2^Rr8wHh8D+pi} zQ2XirmA^v$D;Gn0VQ?a&cP08Ey(^{H>0J@Qj$N%lEETUlL@O9dAeKqqY#%Q(m_u!$ z;(^*+F~4HIqNsVesP}M(*HpVa{38Abl>#9g80zF&l~VH4j$0=CJifXjtJP%%2u(^W z?R4s$-+I4tMK;wnIXx1OeCS(%lU{U9dS+GTaap3Pr$)2}H_p>rg@4 zV!M|uZO^M1t@Gfn+5|9I06Wvlr7wz@2(13fTSSS zWt1{TZntRN@!b`n{&=2*p#1S+P%nH}J|JfV4lDrtKqzJ^a40VMD1Zqr>3x=hi-J6d zQb{`!G`E8i@Q4uJWC9)h!+}l~fsoFOQu!pBhy~yD%MwdLyr4uB{^tU@!LBnn4a}2p za&__>L~;SY504rwzeR&(;N!P&f`eSAR?);Q+}I{9S{)ZkHN^7jm!TzJc^B>GTZ@&( ztkHF7C-Q2b3TinpZp_f~RX}I+?diN%_o+ae=a&j6lJWTmdh&W|av32v#!CCjx{8|i zHM&0a36qDlDs)=20sp=TR6J<>$$fI8#jYFr_-F|4?f>YGpj4%mNB}5hR8pbZp!UQD zLo*3dKpO1$qeim`U{$F`Ax?e=CviN`H3Pla(JSwg-Js4E0iO-Znp4hoo?ODD;fukb zhO*mZ?u(jnBbPTB;+tN)Z9O z2HC=Rpzm;F31`QU<7ih$2#3SyGTKq;g*|O*FoeLKKESvAcweHkp`# zS43xM?DX!Ddxmlyb>nrF1Er?yzK;&~9_!69h6k$a5^=}F`{yG)C1!oeK+W8!$67Vk z)H+hCw^Zz@ZyPT+;6!Dj$>*yZE-CD7u4OG{H7$YAuBKdfYPtB~ zow@8{u=b+cEecMUFN!u+x{dHbc2wp;#bxm$nsj z9qh^>4CVFhz8%NAJ^sOaMq`tmWggWrXKW}^zP-#gzvQTomlGwileaDQhZu!|7Rwa0 zQbUt+mArcT-cFej8sL0Q{N~Z}tg`<3Q}NjchqJTe1NoCnjM@ZCyc3kT7L*u{903HO zzl^b$q?U`S3D4&JDS~Svh+5zFd-v8%bys-R-hq4fj@~oqzr|j)tGZ=Zi57mh?kdp` z%0n0L>tZX151$!0{K|b@ji+9{=g=2tiW?7~AK<@1{WuE@)B#XL5c9;;IhV3jD$K}e z)URdss6aIFGV<3OyHi4&zzVKA#X*T_YW0$U7K3O_Q~&(F0yH$?*2=hH_i;lHXInk-B{#O4~q` z7Lwm*pnPktyho1n?d?!T-~JnV)Yi`Z4~RrulY3mPJS~zN(dNL(95k>Anl<>N0=Yg* zXK)#$r{&t@4~gW>`0aR((e(4w7Jok%Fd7hs01zQgqs>Epeb`e` zsQe9ov7g%`6-1%3SA$h>1Sj~XM4`>P_E8w(8{GEjz6W=f?{3JU(bQoOhFsOV>#HZ4 zvz^TgosObx2Mk0y{MYa$Wm3$Dk{#CeoU!|M<>B1}9~sP3=yW1lt_9VB7V1noYx!_2 z+*M)$fk?ML5WPYWd0n$WQwR8(0HaWT%$Qq#3AUzT6pFkO48q3rS_Jx#=(E24yneQ6 zy1HaWwoo6NgsXxGiHSx5DuZB^YT z^6izwm9fE6Bi<4}wx`TlwPXIHE%kTbHs4bq0?lR#@bb`fr7~%3_P%a&u&{rjv8boq zk!PEJU^vHL*N-&%9$C6+U;Pb4pNzixQUbmP!-XHCnIPCr1d#yGzDrgEdAqPetOiCP|0T8il2vB6ssV|ME@2gy#6=aQ`F^*M^u1!3sD6dK zegqP38i0h?@2;=@<_rBNhYOtXv6}L}h{fA;d`I7r4$s0;JW=QP%;di531jiL^6_y` zR`p12)nL?e`1r9yICJWLXU(4K(6+`(tEs%UEl{$n(eJI@Uby{K$W~e3iT_(;|3H(Y zthmsWJDZeegJ5Gb7njDo+lGgEuN&lTEhnb4g)Ygl%1gf5SDa2!_rn>~Br?y>rPT_sNW zv8>7=WM2A`{+h01L`nTUx6SwFgQ&vj3~&N~Oeu@a+}j~DsOiFO2Wog5ocn0i%!50j zc?F7k%Gm7m$UkMrv{*Kl6;tS5(%N6bX!8X{uloYk&j*&5-^t&kZK}I^@W1lt3rClq zT8fq*dEwYW@O?Zucw6t-9X+n#;BoNX>mqJB{qB={`X2wc&pr6Nr_eWZ=0|tOw?BCC z0RNpD{ipPxb!v(+j&B=OjFhqVP<_DYVF&#ip?Cgc2LAdZ=HUJQAMJ#f%+nBp!O=GFABG1Hc&sj7yjC9)JsbR7!B;-bX$L{g2E zQOTtWx7!>ZJ`%6G>HaS-{+kH(#t(uRH~~t@wNzhP*HV2c)lz*Cv{YY&E!AHAi=09H zC%055V0V1=+(4O1Bp?Ao4{uv+x^{Pb)p&bI2G>3Su}4+dJ6)YQ`j3xy-#H%9WjW-G zLa($LojKR+kLTw~h*b)Ol66}%2mkvHpt1k=$lp-f41Dlygb!YV_}~JM4|?dn>*9l} zx9PqbAN)q6ely)A|JSL}fBap6(&W?`+$PzZT2=B6BAJi>06)QMlYg0>&r`f73{cSJ4WVy+GT2lpG+0$`~8{7KadC;@YV%2CFXcz4F0sl~>z2Q9oFGiM zR=Ftv)l(foDV(PPxTUk}_qJST5`Zd;^;zIF0Q|H2KQ|Lm84NU|(8>9k0G_r(o6iIw zKx-Aw1po+-p9??;$!}uZ*!O$n5-2|xPhW!Z^d%5a)i0X6nZEzXv2VfOavjm1mMX3q z`v!dRW8Z+UZ)2&Q0Urgm5RL?cwv4UtCDar8k`MNTUI@f4fLIggHC_<)e@I*Azi3F9 zc&`6T=kFYk(h9AT9}?Cod++}0hYSg)#)LshHCQfoFxEGfeI%RM=R4{nnta=RM8dV~ zA`-S`8_{SRuo3%=M~%b_YWyTz-Vztf@JZ<*De+af!X*yZw;Uv<2txZ3T;!5{i4Ism z#PXygR%(&Uog4ekH|bv$WP~sQ`HkTIFWtKQa3U|b4}MSN9apf0_1jCwZmKsrTb6oj zM;n3wM4dYQ+o#81_`3gh==)1!pS@*grETXY|8gIUWB#_iNAFCHI)g|SgzphyIp5B* z8*!tZ!5O6rS83E=clG2bFYrMGwv=|hf%ZIn<3E4sS>W9)_PxIk4n6ZD&nW(Fixv6` zajH;PNQh6F&Y6hACj77l|5Ib)&b7su|A@%Aae!Jfwp^vLR}7X_kGB>{VLvmdlZMi5 z6Qx{a{K(8d5nb1hjNB--R4J2coi5YH$anx)>MbZT-X7a_$H0RF#PR@supbxo8?%8_P>6Rn-GfCk?y_a znSr6))aG9&)`BYk#;%>*>Vo_fts9QHuW8heq-WfrmK$H zaGlY2Hcn6blg7_W4@!#$1bp}D15=6 z4%g`odSA|%I=E|1L4Vv3W;iv18R)FaQA^Mw<%FG6j3z*oh1<4m+qSJ~{%zZ~ZB9?y zn6_=(wrx*qdpElen{2X4Jrt7rRP|E#obz=@|gq#uGb3;F#!D~#0fSeDcomMqr~Xy})pent``3!CjKke}uV z$l93Ix;y4Z)zA9^&Pvre*oHVS-KFaqTXS@H7D!=j7+W(+cmQhGXdheCbGV^)sj*3J zxShHfIIZ+aZg`Kd>(po!iU70nz`(->mRz4jhHua5<*7bIsX?Vbn=`oHx^j*pt#)3l zo9xz^S+X$I4bJq~TJSW{e#uA3Z8=1dllR5U;Cx>(8hYKsv1KAGiW6Q@27w?@stf<~Z z3hoxMk|92g-Q&-(hnuSatc`*cjM`cvkNuHSsC?SWiVLg2_^4oc1C#~%t_m@#KL^XI zsv&jt0=BCNHI%VLsxqa!*t(N0{O7NyaJthg)4VB;USCKXjiYRP3pY-&O?dcgC~D5^ zkwf|~XDuz&zP1d~e<^OtyWh8wHhZze0$I#d>2WtASlf{t_78HR!rtkj^oAM8JTf@W zEmyT+ydwB{KOSBw5}S1ab=;Tbuq+^9WHNI2lp%Z|5iRfa23(nX)gfPWgg*fCB%pw@ zW{bxRkK)4BDva?(l~+4GSw7W#c1u?Y05Q5OJWdT4t^Ifch7HN0yr~=fS)s+g(8+Pj~y@jHR2Qu}N7CTQzoIu}b z(hcgE|6r_F)mPmjZ)tpDqs+9$q73sF|Eey~NgMeT$H&DOe?bd=z4_tEt74nfx>oSq!uIi%B!=nkVH0tq4_;uoXjo|4%er22DMp2BUAWSQ!@ zeeb+|llsH>Mevf6avn)xo1$gv#0rZ#RnlZCtbCP1RnLlhKEqO#%H=)BDhV<*R=~!O zS4{P>;1kp-@;$&5q7IAhcg-W8E!+It33K~v<&GlvOnIEDjxGa(f@y0`#fT;66*c9x zGux&8b^71t(fTOf5?ohd!HEdNAil%l%|4AzeC|3{TIrGw?|ZMzR1itSG$&azS8<9#5bdVw(yAXXp1U$&5FTx)Dri;^c4h^xut5uiMePt zGVJrE+{v$sg@Dtbi{NT{f3X}eQ@GIX3+yZ|&8*`Jmh#9%MLj6v$sAmD%ZKMqFL)E3 z9on!w10IJp6Up+E%ID2@cDH=n)J_#-a@P4)<)j~YacdTZ&YY_3(9Y>Iy%^!wTW0p6T(Y$jZ zA}wj&n$x$muA{xaJqWELm1sN?S|d`s>Mn)Lfw&4no(Njl=W6u)4s|SZH;Xi@2n?Nb z=XtKZeM50m1w3Q-w#jpJ2x_+g-Vu1m;v+>Nu&S(FF`pAh|9IO%E-?5J_Sz5&mu1Jo zW}#J9Cj<+Oz8D~Xm&L+5V~tKe4Q^*dnK@Wwy9I zzIo|X1Ni-G4>qmi&_ncnY6I5!-R{h`-BPm5&7o;PuZ@454TZhkXrqmQ?*qs& zV}#lqN#Rb*zSwSJkUDb;AbXGkO46o)fGOvr`Zoc}0cIbKxyrb*D=9pbAOTCke20csK%PJ!Q8nd5c7`)XRf;-W z2V(#;gSzfDrDu`42C7ZAL0$v}j4p8Vm!=)#H5Et2$5b(DtNt)pz%L+W`4Z((u@T>+ zd=l*+{Q^zkucY!tn5wA2jRP*Dr)=qrdINyZ}qu={hB(-ar{L zM>KVw=#6MOfP3PU#-Boeffi~L&_tDLW-K+BCJ|d_>&Z2BaGep=zeVLzquL;cWC3cb z!x3aSsf#Jvd-b7C^@=aZ7ZG>^*y=4ec;0u=9z zH=TrlCN3BD2gYjd0bihwDAB#?`mfOLz4!@$0Iz68P`nI(o)a_Qzt4K06E+@gGaU%y zr>u!^U*VS}b@i8j1GMD!K=PF;U(!x^Nw|mO;`*6%*2F`9FQ|k`cb86SsKKc<_^Zw1 zP9=?+pv0!BONXk2s^+BLM5IZh0d$H%`c@1+*aEd-a04Nt0$=7ptV5a6QwC9aL@%CP zwy|RvxU#e5>v|Ezs~N`BPD5KMyzb0`FzL0~RWUY@*|jfzLoBY@RiHgntBB~THV$$<6DwH6LIlU9!UXGif=7XQNW^F zX&+T68Q8i9;jVowZsrFgguW#AjpKnR*Gl5U135s#)p@h=(-o4uZ5~ud&`?E`n0jZwCh=C!7o~4F;?=!+ogPMwgh3`vrN*M& zq+UU`g|%>fPJ+<4b8mu7*KVw&HJNRHpkEHqg&s+vi7XUjG$j@Tp{LrHb|4ek3?s~w z+l`15M4?m&G9&Dim?5MliQB&^Acgpf$Z3srPzE>*raMj%QW=DUp!yeK@ySMCvph)h z?P~Q%u4ulJa_{1>w-1jK-UX79xC}zX=eee#9)jPR@R~(PtIin22-~W`)O~P%{e$QG zK5Cgy=f@v%#LLj&s^skT{bqm)K{*fp2HxeCjxd3{8(I>OpdgW&ou|~QODRh^Phm^U zDuG(hThda63w=4r76F*fS;MmdWcLLAa6xqz0%PfO6o{Ry6aC z46oJx;}&h}i{+O*QmPCrfTPnQ^Hj)r(NVVhJm}8I2pS(L1UFeeASrFod})=|`e#$rI}ez1FQNa7*dWzL%c*;831xh7G zyCC`Jv9AFN<)qli1vMCFJAADmIDc`}>`+|x-;8VxdSh^B#XmpQFgNzg`RFrXOuQ#? ziXwUhy%OJ%Jz?zb3{?SF^3;S*1eqOGO4UBtMK1d-pA=S_AGyEI@kssA<=Au+IJba# zDj^|lp~Dpn9V%Z2Ucdf3TfG<0 z-zNb|albZii(D}*#AiJ#cNz7F8)9QfuZLIVsegh%!MMmt`K@(C1;$>Q`O0ty_XIl& zLmLCkY`p!zGQdsi$zTDVa==y5&3cmM5t$n_#TX5~h1H@Tsnlp#^AkT~N5gflf~$HO zX&z!EtzfDlJR|9j5h{6o>ALb8{KrwGz7N$DLL$n3y@80)l*UDl!i>FQHDpvMjE>Xg zzmn7Nt5~H{Nu_sxxX{>yLX2oVI%&aR_QgrEqwD_S4Wfw;s0<& zMfiz2;jjelOh^^W-B+|~AMP~>Pd z`x+OufMmuRhIvygbop~YEzCatiCLf`_lC=4Mh-;4%mO^{-RD$%@99Y=aDXv6=Ty!u zgE`(Ho2WV8T%iY~B4h(VsRG^h+4uR+{SAvXwdi06E@=UU%70UHX6U(Pkw_-Ay0&R~ zv>i&%E8TzO*yw~`s%N@sESDkL-SuGq@D(@$_~*jd8K1oN`LkDbnU&N9SJF^VGpg=f z+w?$4`mx*o81@sE6Y#e%sxZHg>4I-q1^;N$>5qVajooNPv@p0Gm#O*Ra9Xg39U_`~ zjoU=aZF9Ch^!X}>ZcD+kce3q3_>IQB8D&(W=L;9$GAXkfl@0jJA=c5^aYi$>jv(-XivZ`=Qu_NbheX$CE~Wsfa8j9aeZyf9SD0_!#s6 z`;0OjJ$qQ0;?8_az>wk$<W^vYI(FB^m6*3(aN& zqysbteMK99TA0NztL(C@^@Q&d#yX~R?Omw%B(MamktX_FOLmlr z%aaL5-81#qdkZ4$HtmMmg~At#<-Kd6x={Jai&*9n2+7+yLd?k-wu!4D9f32g2yNKr z1HxF8;_-7LLb$LG0c*%~JH1m|$!+Bk0z4wrtkLzH>iZOu+LzqhG!9kJouHImKj%t6 z6P6OKaTVCisSiz;oRr&WeZ6cKeU`aT*i*$Y%7*r5@v(Y_7YSq0J-7Rm%?-I9LKI1n zIOA$`SNq`ub-XlERM!@M2i)J`dqxo4`eU^TYL+*F%_`zB34H&tr-!ha4bbO+Ne_bL zqbzuc@>wn8bf+EZ++Q@VS&~bR5vxuW^`>bnAi{%Y!I4k8jMl;si#!8pnI)Agd0enMPnPeK*J#PausTHsTr&5 zA3NgILV*h#Qg!)Is-Ad!Yp&sTpwTy_YJ3JZ#BkBlmQ-u*5>5<&Z2)SB^t3}5zrF@b zl@?_}dQJLD3%EtfWt_g4=i&8V3{U5Z)r)uF_JA!sEWhWiXM?vyNncCg$GnbqbE#)L z^tbonU+2;n#j7Fzpm{wkSYSW$FK~Wd#*%@?cJvP2%B3uGtg5%7w3J*j%mr;8UbRbdpm4)>H03$le%~uqX3_M_Vn}~WJ(}`JFT5RSZ zc?MwO5aHq)*b3Qb2(`Kb)k*^@@O}_bK~l+?mQDYdXjDl>DS4?+O;ayDh!Hw(g`PP> zo4Rik9g%X(>q;q2jkz!4P~aP-(JDo!1K&jT37d7~`SMQ+bBuBs0|UPJci54N7xEj{ z(c{0X#ov)L(Dff}bWgv4jTg^$#|!jFa*0EJ@FBK9NADP4Bnr|`IJp41kL0KlHL;2F zhtqfXKPn)+zr-sbBY%-VUuvdCs3Rh~Ll23F#0|?o1YqO<9X%PsGnd*9UED>8pZE&Y z9d!Z{7x&th=cm(VmtLut8hZ@n4sy1N@)0N8n}(EIstBSe`9Fd z-*9^pNUcn=w_(#Yp>^V+O_Mkv!Hv;(C04$RWwF4+bim1kuNO9U>op0{P2C9rUJidp z{kd*xRTHfudt|XN7JM8vSJIyN)4|>mDjO!fA*8ByoQRO^m|+~;{wMGeGwI{@e4!}z zyg7fnvrD;n>Bje)2@1hTEB(&0eDA^o)T|Hd)&j*|jQ=p-71qB0rFT{UPiIYehRV=j zaLiZ)o7C@-8lJSMN4z`*;)x#x=Vs1|4UnDjI+&ztJWnm|4h=@)r53%6Y(E?vqTxWR z9--A!K<4TXOmGHK%+O2wDyiYT#Pxak#27aKTHb}*%HY`#JL{9HqcAa(ws=CdbdBBQt84#k{BD~klRwKANNJgIg*jzA&q>YY z*v$O~V9`!^XG!i8q+Lrv_kQLzp>bDluERisSg#Gex@1ZvjnAKEKe=gSAliA`t^ylk zpB@q$Wh8{VfaI{}(|=-@9@Akgt{@{9DYjo35>*)U7f38J5?Rtl!<}yRKmZiLHV$rpPxOLZroUSPgUY-IN!u=MT# z_`_GxWD3d9L?I$K61c-ua59XcPR8^<{USZNE+T=J0lhMblrpez!zoRnc@+`!F}}S` zxO&o}x~m^l;6P2)w5bqo9 z?lw35HIodN_%o4`FmP+{=bu%|lIo74&$|3!{SN4U`fPd{W@8WUjdzEbYXw4a#HBr* z)#YbaSHD58Hf#z+G_eS8=)`cF5L*yNUC=b#f7K9LF{Z4;WJp*$S+iRK$dJ!;h}}*7 z%m36OE)PORKP^Y`yUKSIh5=`}ElWJm@Y95rk}$5ze*8N77&M60kceK&YoAl$S@h2X zn7<6UhsX@C=c~C$oIuLr?|Ess$#+MFe&u1jlkAba1TH7zOHjZ^$yKF;YdJocC0Y)o z$%Ra)HnaL&WKpx|{0RASs&j&5ephys*3MItr$3|eM(4hZjM(lzlnZvyt}m=x2&Uh$qXJ-I(s)oC`0TVF2^o`8qrP)XZSWjg> z7E3%BO60bzQG+VGjNg+YxQ~f9>l=(E*NPW zBO@-?B-$rT-3c2g(?%&YGL=9e8W*ZlbLSF&!j@X2>fyMxtYY;Fl_pY+WD3)+P94NR z)QO4lK$bBFyX8`npwVKp6f+xyv~nq{h>Us-7GbPZoQFLa&RrePUat^q;>1lNsFrTj zFCNDa$-_!QS~Kc3Y1}S)V*P8Q7#qw7fnahHfjdcta#JGM$9O)b4-Khq>@FQeWUu>0 zY9%s-W2a|IKkxvSN2JORPo&DPIDutQ;3QS0evSPaspesUQWm4-lNZ>y>l10|M=Ys$ zHEPjkhu^B0e~df++PsdCe426q5R{5ktP{&k=r_)P6q5AS>Sb9lSMJc-%#R}SdCTiU zRa1TA#4~RJ=JDb6j?87~ZHrT$3RjhGq{O3UaR^I`2x+JCP0_*N^hV5hE6Y4V&r*{4 ziM8;l8qa7Jyy$WBmr1s6wr=7an;$qmyt8Uo)L2}bXg$U})hMv0DyceT$nUuBm=*P_ z^JzXDmkVob@TBM%vU=2F`m4V}Qa6*aeN{4g%pU7tLdX2`8zFe<`>VzlVl;#O^%%%2 z&?Mf@S4@oBQcmY+vYe27&jX6GgjCEXK_4%Cg^ebsTsy`pdv*y`TdU9QBLw!I`Y4@0 zTtqJ&33&PZUGi$W=2Yjk_13Xj1X_I!>^r;jn@c`Jlrwd+H?|hLt2*!rx9S>tc)Pa- z5X7=l-!PH|#|a|5-|w;v$W#)v52)n7=CcmmEbyMhi_y_>*{*!ou|iMLJc4~jdmwLX z*7D99NnZ;|;--FR8B`sBsv>b9V=frHxoe}m{qCsqZIUYPc2bNT<${}G%jUmeG+KKx zud?k>?ptG@j;)ae66BbyM*aiS3FCud+8+*@jRw0)@(!)sGf9|rJTjd;YzN>SPJmmA z*+#Tqdc9D5_vq!S)%{ASavDKa@OW^@K8iFL9WC%T)am^BhAu^mMgi};I-XfP6iO<; znXxJS01%QCdv>&&L_nAnqdQ}!EN}0>cPU-9ESW0y2wNY-l?C_Evmu{}{BWSy3B@qy z^PSm{7AnlePBNL`yaPx#z2$j=zujUZkQCkRMFc6d=O390WLHRm{|JwO-&7;3xxu%? zCMgXrbYVa8$B8Y=TLK;#sZrvidzur;maXTrll(PF*ZY1jj;E#+StZ`cU9ExL$t0G@ zd3SLC66w-}-SvX~NZunm75oB8#ib$W?;fY7q^LEvb4gOgn)u}vor)N`DSX9INAvWp zd&=KiuMfOn6%qC1A@cX$hjag2Gid-w(ln|mE+}inn-eP|EA<^s{4=(I$L7u_Wfx$n zoz{@9I-{;9^InMCy0Bfwe$~gRb5PbG&w_62J0Et~#@7G#^a?M`3U}&mP5j{au4tP% z>26L0X#w}E!#;wC_`|k^{_z{_=%u>Q9@7MKQ|H#r&~@*vV7Wjt+E4HCLCM*I`jK(y z?kA}5CJioy51AtjF+`ubDMf%_PHdQD=Ii%DJjspi9LDE6HJ~N#T31s4AL^<19AQo2 z3l~iV!@ETWL)rxL*+fIN==+!GDeciWAhArd3h!^HYE#9z^HTM>qUtx9Its5o>fg4W zv`T)B_vF_B*W>oN_VA0;r(Am^&dtr+j^X)Xd(KqOt?kF;5`T+-YR=XVoZ3;^2rVDo zuJuo6%R7za>)ZB(cHbAzoV=@XmvN~Iz9%9l_U!^YRX2V`?_<|39p4%=i8;L91m|x) zGtT^sFCTd)H{RPF~hrh7J0o2)HX+}&i|-jSa!{cI4MDZ5XM1FB;tWBK^*8|HdXNsagGa_H9!{{Qjs zJL#Ix+jx`tYxXrWQfj{;@?;-5Y}?ZlpdWVm zCm=xImlC$}$`~$Mj2#V<>fEactX2GtOqGG z-Zj2hS>(=xr2?i-#sc{7W0$^SaO@R__TBj`hE}#xSca*yAX(@Cy_`6da0^rX&rKP* zoNf(pCm3Tz13L8(^nf0b1gnvfT4o#I%mIwP9k6DwxFKOH;7rL}(%n%ssVO62hZ2ZP zh(RO%-Bq$?%q(rO9+X{P;A#OVfswvcmP+U%iM~WIHz=JsXeZeKzGg#7rKq8Gp=n8> z?upaL1tRuHF2lYZyw+o=R?a6ljwxqg3=nGje;U*nLNkQG+>^o9TDP0Xw|MCzSk1XT z&EOyFuyOqj69GL#E}qSS2fxbT7FG_;LB;}ytom-09Uutsg;g~5B^YwKyNl?&##y*{ z!^Sg{u8AFPKzQoms&OP$jQj4oPBnR#;XH!o|A@Ryk+h{1zN4N-fpLK5Ko|4H325aM zE;iBebVs=GfO|+=+E?M-exU3c!EClc6*)A4rx4>}33JC6_;AH>*$UYzf?Ss>OaD`b z##m5<4#tb#ZTG#no|$O%H=fSglt@6!>xwO8>F<0Y^;D=#o>^MviS%O(t}m$$Th9gV z$tRa1wgmf*uFTo4fB!bW?1pz>2{R2Qjn+i)&l$o=RGZXYQ84fItOnEZlte2G%h1+@QDrf zvXKB}0!ii#F_1zt7WklcR+lLK;nt!jsn8N@if*tdoAdngIHzVUvtuNtcG8&+B4s@- z*U5>NO0vf5rJOFTcW9y{_l|q9G*O#XdA?7BZ`(gV!P@tSN%f$%eaV_^Ep_n9Ihq(+ zx>0sH`f&}A2dVJJTp!4E5q==(9nJVqwP2?VApa-?x(Uq3c}=q$I*S>Jw6*q|I@6o? zz~(!4+{QxJX%!(!7wK+#hTEO}%oH=%hq(4uM23?Xkb3(GPR3HB0@I;5JliM&oV3)%? zGLTENA@@D?#*_Al}2H$TcQ zJHEC(%2Tm_euwuxmKr6?Sop7hXvR^sqV#ojh+M|M?9ti;&k%{y#ICEUh+4dr!ie8sgym@q?URq> zSqKlFv5W-(mh59bFERd-f4*42lp+$nH6F(4{JLPOF0Bd&jG+kClrgc2a;~~Ridz0F zB=_i9)e>(`_5{w7)%kOwE@zmDsnZ3UZ2%Wn-d)9}097CB{`0vtg-YNL9H6;+NPJ6( z5zSq3@7_Otw-pF@RiKhSyHR>yorsoJKtuTy4!VRK-mh#z5R5{KYzC$0e`ysPXQm9uMO-(H)bh>hlBz>z(4S4ACB9sWg_gpEW;efUS-^W z;PKCaHw+HCj9z~5G^``GkTjy8Tr;V~1dc$tc!v|?x{yZ;Gr560K_5-P09rNpBw^Hj zGkL!sg*!M`_#0qHRey5Kyh|uv80hQyBZmh2`vyIf zmQ%2FrSOb+Pf!~+;wC9qn-fW$CuA=lHxC!FcsV%zO@O!i`m|iz z8bf2$ds~D0QTwnvd!(6Nm76K{r~NI9miN z{%|W%DJ>_ii7O?AmP5N4nV4DqgYvepvSjRNgba^6N=qGv)_%Oss5qx@7bo%wHb z6xiMIp+S^!gT!q8bWjXnatNo~oE+Z4YjAM$QX%HywAFGgH|TL-2M9Z0ryTGZkRiP6 z3^8nHM1TyQ9tfx6l_J=${U`c*R?-H^)jCrHb-W!VqXwZlSkgQ?*k92~6_JV9KM6y8 z5QkjQadZm!;J+EC0zvRY#BmG*ktZEyf`SM(c2l*{-4}T9jre)-emqJXqxz)Xgb_od>r*$%rE}yEoobgfmH3M)hb_xZp2CA&sSCf z#4%PjY#jNOG{N%eDXVFO!f#W@&NOQL?!ySP^JTiKR^*b>qcP^!2b<3Em>SZFJPPw52S)-paLj{f~#rL zwfX;KX*-cvs4~&63vwLxz5S6blhUc74Uf2s=s?)A#0M(>RIh1~OuX7tExpix&=A$&#&p>6! z_Mk|=VLcR^4OrqG%?f;1WrH3^UF&R3S9X*slpDoGB5MUV0{ydUmKLhi*JrUJ!W$$Jlz=Kh0g)(m{io>(0ee+i(&H={q+*fjRYpENmOcMhlgFL z$jE3ZnhGNyy~T~{iVoWrhXGW3s zZlc=+#(Rr(7~f>s>7KTqP&aaT`jlyg-V~Fnw$)f?D)UgbnZ#0)lsp|9heAK{g8OBfDY4VDa?N&T%JHyELN4|E|LPH)0>cS1Y>J=Ene_Q8Cxo#dOa zJ!-grAQwqw&~4KHVj!^Tb-~td*pOpi=2CpYiRdYTQFHi(LN-WPXBuF zN)R^xLKT~T6AB{>srC2v=v)M%-%w{P00^6w@EBTQ^EMWF^C6^3M5!S;Y8R^NB#>*6 z1!Xg|Du98I@LJzRG{{cs7IM{1G^mG@%){ERUAXU?o2qu{A`E=1HV+rWWgv)fsS_6~ z3jq$`(w;BO$#xnB@x3_<)b%#}RoL57b9%$7zXPm#cnJ*;V`^vO?BZl%|C;mhG0K_RnY&mJF|#nUaxh9*+PIiHF-q7Nx|oWY8rz$g{`WaE5i2tX z6T5)G|5WqHy7GngQ2n7deeZZ%%afOrr8a@IB#ncpuO`)wt7s7u3yp$66P45>{lyWf z45>n=oL^;OkATZ#u_CqQZ7$@{&7X_o%aq7GtHXAE#glk{`hCLWcG2LCwf@HqFQn+2 z_uHw$jvQTVgLf|7Qyd36$u&4o>>XTB zeBvy)&(5kG-LB(?W!>3aP~VZi!`MUGL!$Vz`k5tvwuhDg zW5<`YtxUgrtz}Lm8U`>Y?-rYjTMrldc;dxdjo!x_FFx&#FQS@Hb0S}`{K^%tmZv9L z#R7(qYdeY$Vx$Q!$)2;*2U_QAIi1%Vs_BT)T>Y;tLD$5W+uiVy6iCTyMX%+e;A#SB z7aTY2<`BHRq`doG!Wik9B;+f?&zrG`FVse4Y-LoL5MOn+pX9;D-SGkGC7p?UYjyw*8$PNDBdMPn^nY@YCad#D)518Sc(_&v(+ zJKbGMMfZU5;^ZI;AcJ)cs8r5B9kBz@0qmTCpg z6FW0Q0h-<$+^V%LPNJ+Op+_HEwBq}C(#noCd}U|;=saE6m$(ZpmKGKN2w)XA!DzTu zM}Sy+_iBKC=u4@&yp(xo$(qxjd|1|sOSx*ee0?MC@rie!T&Caw)U#hm24Y6s!b8pg z(BzTXTF}f2fn?{^{bmIr_p)F^USO2(XEvOj_ z6&D|4RMjB)5$v(8xB8HUTl%I~b|v?CzhQZDIsgCys{TAxmVzYWJ_lOcxfJ5luL{)b z_5^!A<}%2+dnb(Lh!h}E+We)94Ls2g;!dtgq%V5Yykmj!Ag90x_idpWt^y3W<;0OQ zlPAUkalyS30yRPHHE|0^0wTuoiyWVuekM}{kxLfutpZ+ee2{dYy`E9lK)sl^DnO$X ztywL!p6~IE2u&cB$F+$)nLueQTl)_{ielRq2==)rEZxKJtZkQ!%>H=~gNz?2Q@Sqj zkt47`WQrds|2`|@rS-gkx5YPe1(H_ZR>uMlyQ%Sb3V~5`dB@K9AU+8=!W5kZf!-V# zfU<(QaCbR@uyKgE1R-97(a;PCJ_&|wD3mq~<`L!#K4L8RE z#(e|d=SV0RLzCgC7?Y0aW3fSndW-{L)A^_d_ee4|wvBj*o4751wX*nSoziS}V{}p2 zn4^I%vKk8di+&-TcqBPv$kOd3cIr%Dg?ZrFg0Bv37~d^Fyq2F_EOtsBv$WYiIb%!N z5p{cebTZC9sBCD=+<23|7w*ajpzGwwOmDFL$YkTC?biBMf^SH}!v2N}?9w7U%5 z%ilM10?1s5nj6@DzBqf(5#7O&rPihGI`=!*Db!x+ujS!Sh-%8J$=~T&ssdFuhjLEV z&*}}FdNtUYC6+5z>#p;!S>x;IhN)70qHq-X;!s z;nu$a`2anMzP*o!f`;g4EEKi83jd-?L|uo<7JA8NB|=P$_!v$!Xq?-@Noonv3wH;0 z5|WK~QYLPPpAv$dMNth?&!cDrb|q$9k8=wSsoB?xlM&DFK_$B=8E7AJ(Iu_C2yp#6 zb?p~~6%3s*7velgfU6>{ePQ3V!BEf`Prkh9r4k7Qv-H9gbMQpeJ-d`<@=exanfAO`x@dfpFy2 zejyXYuxfD8wofiZ&E|0HFIVkBPv(5JH()=bp)!RyH=*%zvJD-!hVC8-cwk1s6 z6BSU(I-9T12m-ST?hQP2FL83ebOFFq3*_K|CY4v_=MZG%8_^cdFDNJ1yb8)G=}CDW z*fKRPv0k(+1*ORr%5z4Fd}F$9Ml@QVRr}DQm6|_?YwpP6o=#)X%PMJxvCvw? zaH9i{i6f@9f;`o{!0Yd9swO|R*jQ|bQzs=Bl=8<3pS3w*Shj=Z;lYc`6WCeP+d&zH z-sdRIe!&F@8Lt{69&$P3RaJ?OSFD*du|hgPm-);_zSI!79DK%J00LBJ>w3zMQUXGw zn(vqU_|mPho$~TB<6ulu;F98kU1pu&(zwa7&b;0eaKRx@E5#r!dO(ZvjBVy7>~06+ zhy!D_u=7Dgpv=J16IWxjb?N)k6Jz0PmwvrkkxpukO-@MlQb|#+5zeA$4%;rb#o8rr zkPN~az_Pf&NK6ayWib6q1RpVeC)%~i8xZv{m_2MpRF;GHIRdIAGX~vb-p!(0AOi7{ zyFHEoo4Nq_nFt5u`t?US-J1iHm-1@ok78P%&M|8BmWcGutUy;NbeVg`f$i{JIGYoi zY~5}>Z?DHK#Rog^=%*Pv8eC`1U?0`t0afS|py<1!yVi?+5d8mwI5Yy<@EqAnU4dK6 z)AbkjD(!;F6`*im%LDV{*yEZFyfa}l5UgGEGCV@VDgjducwD3)H(XAk0>mYvIhl5gCA^H-n+0z{5g&n@eY*hq^{m<<)+FF zBHU712(PZ%G(UtC$)tJo$i*W(LBwEDJqJDIdNG<);z|!JTiUPyjpNn@_F8=-g&sI{rze)&N$&=2 zn*OVxDcrk&jn;SIgqK}4X{y9Og^SA2pCOJ=OD#@NyIuXvbR!Ju2hw+adVTEBk|Bg^ zVaxN7nx`tnS3^#D+5p+o*xoP8*B9s}*=y*^;E;sa?nxckoQHq|icgS~^*H!qkcR<* zM}M_D5m4JspXY^VlMK_J62xCkm6D+1h?;E0hYjT5rArtTsrXwbd5(UD9tkWmI~Ottd2b5GBAJ@X|UJG zkDU(U5nR|;7~Zo_v1a1z41^TL3qcWcOB?=DnZ{g!mJa#8oI%(zfqs2VQWB_> z*#lB6lR=O=0ncF)QE0gx6s7v-os_`Gfrl?CU*(lN2T-DtFDB^G5*fkDznKtUmI{LR zRaN)#!o4LT|7(~U!oa0g->u9i*Q{Y+o+Y%{Jc5BadoW0XipM4Lms(U3^KAdXQL4f1 z99MAT4HEeU%Za$9FWS7W7F=h`B(lK3jp3~7cYxIsQUuV2LZ{{+b4eNZv8aUHIAHeAIFB!xn<9w;aHr$li@u_R@Ga^SCiMms zFGJw2`@DOsu0gp`e1g3RjE&CXK4Jy1tqiwtIL0E14}3*Zi!&&MML?$60F|p~qT@xX z8C+6Og%=parGf`fbjGG2gc6x(qoWey+;qx8LE_*!N&G#=ZLib|G5Sn~t#v@3a0-fV zn|+!0lbq@K99qOS|4THp%+@_&adEMrLAGkq6efsQcQbnJ1VO{Yk1|p^_^&kSAJ`B| zSF|mKV_fhL=kN(EXN_JD>%o}K3}Mu4(zUW)4`&q;Rwa5?jjCRzm3ls9StA}KqH^2Y zI53p_v>-ApMTq5N(Bud1-+7td0jXXh>r#>ynEg{itA=J1@xjovmAQhu#{KuDhPY6$qMigNI3dpQ^0uxkY=c#K_3wZ+ATOwz0jyW64YS%TW-6BBZl8Q+3cHMvHuvGjqx5iacfx`KIe8+pW6n(0_iEx;)yPv9E zKGV`8yJ#zzw`yWR@5EedJpEnbP;~ZS>^#rGFVZi}77*$Q>lcyMFE>*~ zU6?~Sc-%$Xl=k3w@NkK!`;`Sl)J<9-Kpcu7vJN?#N}IQlX696MPiis&7<1DR|cMv{gkKL=N2r?iQSO-10gC2FKTz-e!O!iIu3ZwD+>3n z)s7>sRNaS8lH3=pP~QJ1hYv>(%nc)v+b13nY5VgKd4_4vyx8^<~AsdAB>Hs}DWj;|Np#18^JuF0A^EOy8|df(U`Ev3VC`JB@Etj((U z*ygia4TJf$vh^DzvLDQpoZ=|yoC4|S z6y@~wOjRpedAr7@p%m?Omm=l*A~h?y%$%8T8di23i6aSQ*0|#M z41DIbVjkj(ZlxFHjI?QkMlR$t5tVAq7b#V3l^N0^?gV|nW`T|{Ur70`!7e5eHMzV= z80$f(`O7oYGvarsbv=Ch#&_|KC`)#5@cF(%zA;_U74f8ae8HPSN3rm9pZJ}j`a*&d zTcU!!k3AEQhHv(>aDIlY4f-McZhimM&>rP_K2!XT{(T|~?dfU$hVnF-r2K*0&=mpn zlP}20fArtHwLtGgR{ewp>wX!7yd%6r>bWPv-}#m)j#jW&`--x?>#@D_ZQ>KN#U0h5 zBLE25!H3ZChTa*Z4`L?{MP-qjNUFQ9kscmcyK8)L^+~t}JWrzw(P82XNu?ubW5z)a z=863nMKR4{(w}>#z`}WxFu5bw_*3B?Y#nTUNUxwQtvq#>x$wuRmDeCeB_1u-5!{|lm_aw*_MLL$a@#It9^XAGOx zzzqtUq=a`P(>yH1YqQW9OJ?+@C=_UNMVgSq9A=zoBQpg;#Z32j66ZJNB9~& zm?B61N+qF1mvUn4E4{yIa%BSv&8niNuS0&gQlxtpH${GEITv zcP<6p*eolW@}%7IDX2cr7v)_cGkS3Nb2;)-j(6s1giX-v&x3`FL_eCXJ7#o0rt6)@ zWp$bF^()iIk6uTrzam{f?V-yhLY;Y^Mb@*9nO~{NeGd!oxDrs0v1s6$;NgyM^%(Qz zNJrCu0yN2zB~nwfb{9^Ma4-Y$8M|ID2D8wHIqAFXr+d15puH}1ntI=^nC2M&IvIUVV9-_JQIglt}%u^TKD=}n93qNxa>B`8Mof(B&y=BP0w&S^I-d-z|cfeLkzn$w}l+xaTf}sbE9@jlW(fpq2693|5o*B6vLyIpfGD6QE;-lYTfQ!bM8H zkrJQxND!s$D3Z_AdzP~69q&I+`kl#4Uy~}CA`q>Zr)-F2T$^^_&pgcOZm>z_+udw) zg*u;u?+8OCnw*EBj0Kxr^Um^b!YQwV^AEXCuZF#SX<8=d-wPsmePD#zHk2n?vDS+p zPC#!FJNY>i^18o19MC97EeL(BeuGZ>@|EsOm!3e&;K%myuGb^Vdco%@4Cdzr>_?4~ zs;;9473wj%Y2VN5)21({+!Zd;ixYU)5hZ6UE;k4&>#<7RrB*Ksg=s2X{8w*#zx=JX zZQH7`Dur&c=4}&{tJD*%Zi}cqRPKQ$h)$C0tZ6JA@otnfO*Us7^l&Kl-=p*{Iwm#&iX%+IU%9Gi6y zCX-T8!`EZ%4lI8IA0#7V9967`}*fwC^^smQ?YNPQD1fIDzFQ%40Qd3||lXQ>E?kkJh z+0$pXYoQ4DnH^{mpf^)EDyku051bVlvmo{Wuk>5ARNa8Vzstl7ko|@~WFGJ$L4V(+{=_s#-L)>Dc{D zCj>EL6@(~Y*l~96a5+O2Yeya4J>_@rY!FAK|59rD#&cYfK)b zX@NEkzT9890vP4BzxKrj>!S`ilEe`VfVWb*4`KG&3!NH3a zyqxfYUT$j~&Aba(r9-;~eM2b%2y9DB*A|x7Q{@Ly=5XEZ=S4-$F6)~lcYF(fPS1u2 zGRQsDLOlPFv=$lfbfgEEwGyh6b5LmCiRi|2>&M6b-ItaBM~Pxm4~XfwjzQmuT?v3N zirj0}gfrvZpI*chG6?Q_bN($1?$_59d>LVD>1rlb)r|<@aq>;$tp}hj8bSKDGu%!1 zL%ZwgtafouY3z-YO5Xe5+WRRyCpnIm)W87gnT+=Phf`}RLFhLT9w`#R)A*6g)p1UL z@YNZKy6X_t!@J^kWQ~aQ%4weXcp!n!;`Zo_qP9SMi8}EJ_n&S;-vJ3p9?WLw33))u zt`~w?vJT->?BK<*T1?KKWgFtZzdU~dWCS2Dan0~k!Wb6ZY%aL!_xsJ5{yKhPFsz0~ zkS}qW!6>_^mt7a>J7hCIEDKfy)f#1}(sYE3_~u)qZwAssvzM+E{v(R+GrJ;9 z_2+z-g{bXwz}UpBR;kvkmi}8gB*Hr8RPwjZy9vevP90U-u+V=71CNjhD@$ptq%N@Zs>$B%ZrkpPbJb7X!u*mqi`wQN7i z&0!k~6*)ve4%Mg4l-@jdhcB(BFwyCS4{^9k)VZQ$)+RtsE_}7id%5q3tGTw8mwZ5S4R&|a+DP^KFpOvl!7JC1i@$vC7Qe{ zMp};oq7p*6aK$X41<1?n*tx#hbj;bHKM~Mfz(KqBaP#H0<9j`~{dKuoQ-}A~7-gA9 zzJcF>F@*tq5P9IbQuyCvY-|dr!wE{G%^Mc)ak?m!-8J&8<5pNH-Mne;_QAPn-gU1~ zxe`0aECk!OBx549EoGKm(cxaG@%$hBYgriyar;uWr?*0jxyQ6rzQF8BT-l0-cxfZh z1nzQCgK~#JU95%0mN|8|5lk$7n^c-PGB^VqHHbRLE!=fXlJ(C~49z@)Z5@TXG7lYA zZ|jt8%}Ng@N03Zoo>|TrtX&aa>v|DTXt_tfOL22a92bmF4%IuzfrsziT|n!6-vdTI!Jvp=9~7R$?z%j34-8Z;(}8m`ZI^}0b{#+2NC-nFnggRh zQHKoj_cYvC_;|qvJQRDwc`szGCh5F7=qR2lnbXb_Xwqwbd18;fgSt!}_c1U1TLo0J z?T*Vfd>KTyvD$^>eRSl5bA#3{4NYF=Uo#S}d)i4iKyi0FqaL}EAVExJ?322`}zW(K><>r}g4&|D)pLcl-XIQK>Onix~?%-0+Et!E6 z&}Wmo3C$jvAH=EO-M86d5pWw>_<%6Y-p8_@x>fQ>(AbtTYkLt%Uy*_nI=U40q*q6Q z)9o~@8$5L5A?(D7Kfc?>qCrXVU8Ap2K=A12Z~d#>YxBcb%c}Lg+;5v*=Z7ZhQ_&52g66=Uxzu)8=|nsV<4@UH5CHvt>##K$yx&7OtYpwRiF+n8`v-oH;kdQCsBaJVxQjkFKjhF;76LRrfIFpql6Y7juo@T(~h z4c==TE+x{vpiftd5-_=m9t<}VJD9Kg`+W85aA>(`lOV)d!C))b3;)yXX?|ZJL{xH% zz$J%Ymc}GEVMyQdD-A_H%!RI!pKOJ&{SU(kK#j2~X1@t0&Ew#iF7;L^RT7~76v*X& z+w2@}d9+%8=HvJkmwIn^XJ!m3FDZ^=bOjHbA)p^?QeuDe8JjxlcNse-rbE`7Rh)-JX9DM%$fX4 z-Xig77&Ak6w?mv2w$Jf~@L{+G_A;M}%v>R-m%+g~$9q5Iln#crB>B8Js_WrK5U>?4 z1arXW>$46e#1lMm9J{Nb0kg%rw0|q<(<(e$h2NAe*hkj=q!bH%4`&gnN5G7P)(s5H z?QFFxL4hwm+3gHF9zARUv{=NQ+F}Ci)lCWww7`B`-KSzU93nyYB&HkWQb{wj2hlNEY6tV%7q_gIMb#&~#XL3-S4dL;) zHx>F)ByZRumkqzB9I_B_u!psOr*JvGfB&;j+;S{YeLh$Bl?U;mAIS($P6V#k?8xP{ z?+v?UKB@<|7Dm_q9eD&vm<+6z{e;^!(1@&^Ql|_Xv{!H*iLm3oV$Egf2@BP@S=*>< z$D10iIrc4u1cS~$F5gzn+GaBDYg3HeUDnqua$PPA&kM6d2(;Ouuk*f)_vn@P=!GwE zqgI|bMd}C|K6OK)Bfn#LmPEsg1hKV)3=F(<4*I`FXH4!xeD$#*yF||?E1t;`?jJDu z(nt`;iAi@x#}N~*24MzgBo$KrAl>u@`bDzWW{w^^yVqLaa9VODz>u@JD35 z$Y(KA8!+pQQ*vI3?q%pRWP0?o@91R(uH;kj{)a{O@H5++nn0h4;lXF)H2KaEr!nzt zp2uqUozoc-Ke5ld_xt)B8|J$d-qpg)FxoWC13124AG_RDb3@ z0~iKu1;z;E`mX14Rx+DxX*zxJ zL`)fq5QX3$bQ?Arb`bW8wI%hfQU3Mi`Q^EQ-_+pDKV#Emz5ip@=jQUP9{2f_e*~F- z2`3iSuAov5xMz7_i-4y{Wq%qQ_pSgjvh^W>N#^?rkfj2<=F@gWDdF(+tU<~2By}+4 z%VhSfVYZ=gUNxa|U-5TTNqRgXY;xpw8uCdbMonKgA^g2!wja(*dotc^vRJ*g#D#&g zr_SZ}Oq!-J8DhG2r5c;uJ{2aBHDk3mHW|;HSc76UcWf1+9!(qUU=ZJj%F<+8Y$C#A zJ6&@1Xy<&?I6ryxI+3dQV_lKLf#25FY=8YE-R-@WEPtnwJ8twNApp8cNPofq&4SfqW}3H@S%hId->GzwOCf8BvS&*h6vn{>9Nzi6}c<-IDYzVLfg2YdO+G98%m zNO4Atab*FgB$^8(w!3h)AAYZwb;uROJ40VEB<5sDV{|&ABz47DkFi9*Ow!mD%soQ* z673hLrq9^L79*V(;yl5g(HE$Gy>Lt=RVP`!3~@o4L3V$6y7>6*RpRtMFlS1r>o+JYrhw7BWpcseSTYdq-{a+RX<{%IPUiVAhq7IY-2-4G`ciG zmcHikffp}VGUMi>;(DiQiH@O~U>14%DlKujn@t{OoZfc>8%g4OrLz5e753?(QJkWc9{~$2 z=qds^Z`uBu#o7AABcGD~qWF1TlrL+UrWbEi`nfapj(THpxH(%?&1S|6%{YjEofYHE zD#*PxIqVZ1xK>u2W;@Aj9Q@VXlSE8g~}bMk$scsC+CE{ zD)IG<%AVPE`HP2_Cf!ftspSmScU6l_;t*k(0RTygI0oF zV=DI#Mi!dc%v;su?mXCPSCs7+(;q|LjpMxJOvv;K|DOgR^?;;up@{PH)Bf4z5^lDy zB@+p4?mt}T-N8FuDq@tR^?K>`_H0q9b{Di(^vqjl2S=C%LQkhh>t$VsJ6#*&K3W-A zQvw;Kmvt**Cy<;~T#7SWXU^Uh0jfUYRHblB1OQyE5 z&m1$g@EFb)5zMe%6Z7s>A*ZzCX+t80Iyy6#MibrvC zz4)xZf9Ho;JWFvKZk?>pxQWj5Dm}pk-k3b|rRS*zf4sXQZW_X}$@SJHrR+@EFMj9~ zyDFD8&FE!3!`IiHz{S1f(Rn{SmE8f;yt^|R2z+WS7cpmWXgPh}9lShvcrLDg)hG~i2VWV?IkjIhg3=W{fTOnxaHP_!Ui zfkM|G?c>}B!+Q&Ru4z_T)q&7BQ$Ei$Dy=WfJb$dUZ9DmYZ_I-h@PAhfNvfXTIh>1G z*$FP2ij`aFmRG&@Eio2(s#y*O|6_H=8*$Wt1GE zinc{mt&tW<@7X-ZZbdjFdg>+k$aSxKT9|!U(ga32YS?Jrz7$_S<*`sJ{Rh78k!uOb zo}zzrlYDMT_adi;=zq+aujjy0sI>H52+som*PiboPpx59(AJX0k#WYukg14?SGNu-LngNz^B)1W!L(*Z%fQWuvzD7AQU7q z$0O0$45&jL(9QYt@&s}MN&@!_5eL=)h6|za9tV6h1$Fq%Ba*t^k!FLgfF7%stc8o+Ak}7MOZv=PW;^zu9Mb4u37A)$0`u| zu^dFpsr*m;q#3n5B=V?Vm_bjnj6;!5_4fu=)gtJ-QVyu)OzhAqw zSg9?*X|wX0d@*`*9Z3Vk9kEn{&v4SFGm4I!BE!2HAeLha;N7WZsf?N)=KXL(K5;vV zvtL-At53|DRcolGW;fMyuZ%l1wU3N*1ZGE^5ld@i`*GmEcE?D7KOqudSTg>*6#gIo zC58XL&DtknW#tqQKtcS^qmpOiyeJrpWYSZwS0_x$Gpd^MqzXWPEjqMIOFAY21jM9dl z_a=%=Ui?5S{25|0#xPDUzBcCVtU3F$SbjN&r?$JfN9)KfE^^9J)wO_rCD_i?Co8ir zdbP$!Vvm-*h_^>i>tuapclY*R3BEDTYMO{*l^4fb<#{AqVaLCgTrM!LRv7-yA-)*& zDL--geR-KSzSRz@qpRPi<)smJ{G#Blqk_z$^85w?S7T50-^~~Mf0?iU4S8T^W9IxH zArJo$5$v3-{}uCa)`{>-XK;~8!0B?aYkbK}dWrFGGQ()H8*kIDdtCE?wUK!}*03}Q z0)mzlJOY9&RFKaWsSOB+rfH8NSaB>~L`P~|LwR*h*<$Ba8>jiqR+|2EdOfaV&>zC5 z=JPRoSm0$6Xgg94-hh0!NOzfX32ysvo3_pl5ZVhk95VUcc zY`Yd)&5R?$Mcnt`QPrF2CHP%BPe)%3gjK1nkDiU9aLg2*-(5@B;pP4$vm_vKaZ2qhNp*kD_zwza`Z(O5_ z-}iuSJh_?Nxdc7k!TJ0p+w^#1Ed&Gjb_9<;kF-0ScC3;n}hcDHb6k`F$ehlPhg!SSRq(h z1R(lU>iikT*|kn5w{x1d{WB)+>+K*|pip8h7GkVS3Ec&n9Pgdkh&1WoB(;Q8oW4a5 zJ@~r{ZCy=%$yW-ANST4!Z^NwX?KI3Ue2xYXi!xFhQB|(I4d1f1EeOOOnf1XVG}6X7 z*fh^TN~f{wrEPl|~cDX8DK+XZj>P2F?Jog^nHJ|DtpVs?{_Ipk>@+(ZdLYo;z z+eu`N+m~Z;jD0~$AiJZ3Wv-TiMi;E~^qsb`DdMdDgK2}qYQw4F7deNs#)SS7CmXoc z@eL4W=F&dq+ zX}vXL4u9$#LYZVcPY%x%nS1gxqNRaei{to1I?h-qcn`Ff^XsH{6qF{@^sOr|Je^6` z!t&>f!d&x9r6Ti1DCI&r?i0qs6*tm!16#kP1x=GDhz0yyXQFyqCZA7B#3kaX_YQlJ z0veJ}Tyo}kqQq0p#0-ZelVO3oo)g=O@7Rgl4Etg}{g=G;yhzY;a_A(EnCoV@u*eJ_ zI1^4<9op*pB4$BYHEuFG_$4WSEpLZU$=;2Cysi2iuM6DiT)o$$*Ao#5%h>+-crDaj zz$#LYFBm51=l{shUfw9s8gAce##0>5repQ5U>vhBKe_7a1tnipcA-m8oLyK1C7vga zEJ#(t5FsPdQWRN$*jlOWv2on~IJ@T-L|x8zZWHy}f@lo;OCp=TkUr7jPmYDiQ1lW- zPqH*{rl}!9XpT6y3 zBc_aaW_fb6YsQDOhk}cjMa22^Bd2irAgtd#YRz-rquOOo%0TayNX!2CU94N3rCIMs zcdyeydql!cX@UWr4+!bQz@Wn(0p=thw8=pJRhb7oz&=?i#v8jsCs}TWACKRvzp`JO z|EgcQzZs;OLxvLEEmvLbs}fr~9D7|2DQ7#H%b#u`LL1zh+F>P@S2$G^TRI3H;!=cC zY#JmBZbfWG6h+cJl~oOop>rpNWdV**GZrWlQ&=UudANrWW=9ri3)EZ26$iHhh#=YC zoar~%q$@`sgvGrSMRLVSH`?)UV!|}1h8(%*^>|~p!d8biiIX;xcoVFpw=#)inSm4L znU~E4{`S?}30d3As>Cq7iY~e}RDTuG?XtFOzGy$|)o|~bt$#8^dtJ20z;PhpY0<6@ zohT8s!`d37LT^Cq5Hh>fh^#pfuS(pof#BN`DhphqO%TCn`fb9I^#} zQ>Jz!mN5pxzE%v!9=1O^|F1`AwjP=Bo6YY3DSRSCpTT(~&UKm?<&3^|o8^oiwZ?4j z9X)24)ZlHI$MYZh7EAu;<^P|)|4~5Q`pB{C{XeSzU;F=B5(w)dO`#hh#r?kfdkftQ zJqs0G-@RQrMmabHYdHF8Xm;Y3Ui4CPF^ z8bc%rHKMAA@#Duq{@XE#1dXivzc0d-i+WzVVau#en#J0o8>W1v{y=7b|oI4eJ23~NaBF>X1rd<9D0_kikgg1L%(g3^}c z7QJ`+?lz-wYaYPi_qp~PX$-1+N)h_Qjn_56?Y3-G_f1YyEZtn6R$tn8G4gbZIje(+ zFM^tij8&T!qjhahOnWzXAbu;{QJD-gByJK*He2OZad(7wvokT26p${&a`;G-!R zuwFakisSwR75WDI)x+GyG;^eVynNS0IMi3eN3KI*mMiXIX(+6rLO_211?4x{vdx!t zf*LpdOsTG7t~d@(=tc+^sKy~nT1A~qb%@4cOZJ&J_f|O}!fVHUx8ydOxa*!z`2ki| zMu-&Xdp`s08YK7UFKeE6kpHT0_j{U`#5s6LN^iJr9GNGQZ4V)x-cR~%j#c|N zvTawH)HlR^n8cB%L*H9tYP=&qT;*NKw+}9i4PYi_jXkswT+gRM4>j$deT~?yQG}n6UF)d+@!D)zOWz22}_%8C6 zGoDSvNn*&+sIe1}WM;Zrq5IHfoW%HwuD`Ml`B6cqm-WzPxVbg*%FRTqDAcp#hxzb* z??lFn_@YVUUM;8D(?HFQ@*nwU!qo4{<9`P7fn~@YtXKC%tsHlI4XhJhsSV}3K-e(s z{W_n@605)AUB!pdhJe@}SEmI$SUxT)aIwqgjb_uYfy+LtBUHSB7z}Sh-5ToDg7ox`Tu1lvc zQEn){T-;__d=g+K-{{a3=iiZXvDsJT76c9GFGmisO}g9w;c?QL=JwXW;B$*s4+!yq zk12uTj6%K)soBPa#Er1TKf4=@a2RT8Zf~C*i$ni5sm`_1dVD^%pg&{nE{!`k{t@D1 z=`OWTt7%C;FD=dDmVHq$(dwvCd(R`;H&{Z+;)70Wv_Ev!Qu0_9~9ltO?l>d`4by z#%8=>4J3W~D8$v_%2JAfEl(tI7UE@{&>2c(1iF;jflpM6(2z@P)H3m!%Fgl&XJBW= zM{GIP;Wdh@yD;j7qTtX!9J8mHO_o16Efw23%bOiVpsCfqhjKFOuic%Sz%%XQ24fnL zO<9nI-S>=uxM0h73PJ%<4+0A&mk#%BJbJmJamA=}oPE~%UH4VhFNYw)j)pz$ISyK} zc_hnHG;R`Zj9-U-sOqni2!C#N@CEpABITv4F(8=c+;z7%!#qH2#PM#>=-u7d&^){K^Vl;@&kqoYy&e~E@aXET+u_~Ph7h~QbUV9 zMyYlcXLO|rFW3Oi+bunB?;Oo3lD4D)MKCot;V2_-EnL+^A^z0LV;MGMf{r`&!zXr(dMaiI^2 znK56Jl{#%Lgm#I4RQ|kP(1aoGw9nCG@qrv;`eTGl>L}C)WL_Jaf{bD^H19u3vVq?~ z7$Av8$;TGT@Q;T6ZG)5Hj~Ev<8Cj4s`IV-j)fc%J&L7r)W!9W@?w|q~|EPJkSnsu> ztU8jM>)Q0S7QPm}7J`|W8I2j28TsGp35o~eyte47-h`r>H0O*y9X1a$)T#b&DN5*$ zPwVxJxzINmGoMmSupSAH_IV)R4>PuzA|XylLbw-XDP%b}k*HSsXUIpBCue9is76Rz z*fxOF$eT6Eq7{MB2Y2iV+|#g-6;%%|K%nFbPwq7_SRn6;1r$T`mesdqF=dEIJU4(mf>joz-Uxuq$#v0%cgXX3(rl?Z6@~tF%P-H3F*h)C}Yz48(V25MOC@ zg?Ajaw^=4^&bfpZbL4*Lt+}fI%jJP2! zh!TLKqA6xb3YvmcffRxR!2k|bEJ|i1@{&Z5KxT+?fJ3EJ*}OOrXpkqO3&4t2jCMh> zv{+F*FTU>^A~wKGB~+27L{Y*J2c(Qh2?(bJpnQ#hK%@mIj+DeolBS5HilBmQ5J`zN z`FCYAD#y<73hy)F+KdP2(-SV*vP&-XVT7y~g#9xjOoB!-kln{1ntT3=qh_ zazpejVE(xyib$;Jp3~kFQy7T;G%XNc%;{>_E-R1szB1H5hn!$y73+r2he&L3& zM*-78en{=eA^Luu(SUpd3K^hW!GgAwo*1fLI05=4N$=_Eu9E&;R>pA=C)yRdUheOP&npT%B*BZ7Z{jejvFA4B~Lg5CX z%M!be;P5PTW8^mu8=nGkMkrMcy}}mT0l%%B?usz!!7}Nnw2#meqpH@_O;^y=eBfj| z4b2aCM?Vu|dTR?U^e*HhqyX`b4*s1x>_-Ii0y*>OPXy`t73?L12FVY92Ql+5^ayzl z*Mmu+T_+|_x+bRNmQo6Q^cYvRus#N6@dhK zBYFTFX@h9@kxN6f%~ar(X8zOhko^>cYcm5P0}=y*0#XAkgoMQyBI%*t2xgdPLWGDR zI??WkLT?#z1)(|-?%;B_pgSS&c+to0{ejST$TKm1*|0oNcYv7tTWU8K-fE#+!R0kFE0o) zO1Zdx!G5TL189(hU+};1KsZy!39yNHbR_hlBATOE^Z@!QXe;w=w50P=`VbNM0m&+w z5_uUSxS%3HvZCfsLktiIz(eb-s3~M90CGjN1q1+~5*M`qth7(GCW=xeu@b$Ky|TTc zrhCQP`6RhLO225C0nCJPG>(GXG>XXJnx2(qe;|tUH!ypy0pvUGOodSQmlqi37wKI7 z%3)Vpf?B-*=%$E*_BAF?XSdgC@YDkm@y1`qHLbdOAT`~ZC2Y&DqXJ&vZj~1Dw$Aqe z$>wIKwS;E2x!VGrwPyadM!hEN@#zRVOZ&B(i{$C1+EJa=rplE%k8wGjXwe{WFGHYC zw4GsyL{5}NGay;@a?^1GhYD{FuK}h)s=+wor&cF-+aI6#0)n;Hs8)is_-T&aW=OJ7=HQV9Dj?X`OE1d-eTe_2;!`Z}t6h zwRtuKF_spSl4=f?-txy1Ph_^4L>xX?%gos?samja0A0e@+$c_|1NN%}2lH-aPx-@Q zOtqB(p62Z4D>&SBE&QJdlEN>K*E%6LFO6T)uXBtWF$;t#h|5l(_{T^C_(x4&q_2)pB02UvNHYvj}H4Q`Oj=4bdty#QQMCf z(pd{xpPUv;CE~7*>3JCe@=2uEpp?hF2T%mh3rkmVJu#cp>P!46DKGJ+)BWOzw$hfl z?fKVVkC)Br&P$KyR3B17k1?2ntvYMR25pw(#c~<%8E;pR4bE5tHk(kNe7~N)tk)ZAEY;p{EC@HFupTG8>(K6oe*b!#>^xb$C<7TWh44R z$PJ44QsOb!YtNFx`=2&tUrBu8>+IvqCeb)jRMG%$c zb=C*{l|PiSRcamUYB}U(7J|nQR@m%ECOk@>`7EjP*DLARLyWs0FBqP%`%m;z4;}*1 z0~CEF)6#+lLXxuzGZA3QJC!@OnaGq`I`G#Qn3scQndebWWQ5M}52SZQ=X0(Xc2B~0 z*mu--qIZl=(58ehY}M;k;@y@=G$+Y)#|$d?nwm+i+KH`8xi=kd+`jcX(!DD*SBDGm{P2Qr-qG+Qm-&Gh&jTkp1MF39kf=4hLpuBRuBpiOLi%_B4&m~;W1}#Atfw>l z_7-L>#M=We_DAmQ(s0Nu4jwyC;sGX_tPM4c#P`usd>qq^q4= z`da~W#<-qGU&V@MW}6gw)4 z!l;Y{1ty~26hy+&?O{kix9Ly)>g5AfR&QN9pfDc6l(gx}zSvJZ(Z1C8_fZd<#n24y zEv311h8|!{Z!!f=eUmDP+D2oMv+ZVH`Aeqe2;u;l0T5K-W1V%2t6VT`bdOi$r;fBe zatn2kk^`SejpL9+oo)7^y`Xf6lU)_oXdOywm2_n!HE%1%f44Wp` zXo*BD9G2Y4H6LqXKJ#frfJa;UT!S>vD#244Lj%d=GiHMh=$qZ~5k-pNWKmZ@(Kge(qV4b}aJhEGAd2mRg2SLJRdNuKMYt@QX1va3^!uE8$X zGu?@|%8_{D6Np@9ax({isT8Z~Sr28E9zsCDW3&sApf=V@6F44>;}pWJkq8}!tNJMp zR1Lk5zgikvcV`wao*zYTeNH__Nm%<`2OvJ{K{GLrSQotpwi_-J#g%3_MNuTmK0IP5 z5!^AEt{4cMg-oH~?rb~AJAA!U(fRUXdGYDm7*xkAT*RHye>^$Ae;7j8gHAYmt%`F5 z`!z*Y6u@V>K7QbJME|$e+U^WPQau@3!`279u5A1(y8D;3n)VrsajEN4HbKPq`a37( z2waIv&*I#!o?xb`RpxGbhS8MKs;Rpo_Dc(-CiTPeBJSI%A^YdCx%)o?PPN|q23qWS zi7PI_mE8NZ_Z|hr4vzjvLwDGTUeGxEzQG;{v~d_rqNw{(k8`rozv8u9Njt6_^g}PL zLNjN@C~l=SB;STZ#z*0kzly1b zC)A6Sb$QPwkMY-R%`N<%&hWa?XwXP65=l<@PFXHwYwxo6e4f?|gZo3hrV{0Qp(Bgi z!al1did{(8f&cV{FMI(pWNy~2^6V-$ZG-o5C;-6C60{ei?mTl6*1;&gw(0u%vV#j5R3R` z@k{Vj;E{S+;8V@85z{UH+||=C+GLE+{$<Y@$2Z$Yj?N;&NgD4by@erD6b!1#++aTRZ>W)~26M_Fayc|pywEwR zN-}aD;S94^qLc~*pb)Vfe3?W={3=Q8eEcioUj>uCj50}T@}=!�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

    {~k21rovqL^_(J!Y{6Yp79o# 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

    --nz9tn%J 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 p4sjD={rHC)Fe@{VG Date: Mon, 29 Jul 2024 18:19:30 -0400 Subject: [PATCH 446/450] Registry tests (#1176) --- .github/workflows/tests.yml | 14 +++++++++ contracts/mocks/DeployerMock.sol | 4 +++ package.json | 1 + test/registries/AssetPluginRegistry.test.ts | 22 +++++++++---- test/registries/DAOFeeRegistry.test.ts | 34 +++++++++++---------- test/registries/VersionRegistry.test.ts | 22 ++++++++----- 6 files changed, 68 insertions(+), 29 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1b74a763d6..def1110b17 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -314,3 +314,17 @@ jobs: FORK_NETWORK: mainnet FORK: 1 PROTO_IMPL: 1 + + registry-tests: + name: 'Registry Tests' + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 16.x + cache: 'yarn' + - run: yarn install --immutable + - run: yarn test:registries + env: + NODE_OPTIONS: '--max-old-space-size=32768' diff --git a/contracts/mocks/DeployerMock.sol b/contracts/mocks/DeployerMock.sol index e8beb8b07c..d6e57d03d9 100644 --- a/contracts/mocks/DeployerMock.sol +++ b/contracts/mocks/DeployerMock.sol @@ -16,6 +16,10 @@ contract DeployerMock is Versioned { function implementations() external view returns (Implementations memory) { return _implementations; } + + function version() public pure virtual override returns (string memory) { + return "V1"; // make different from '4.0.0' on purpose + } } contract DeployerMockV2 is DeployerMock { diff --git a/package.json b/package.json index 9442079bf1..976ba27d97 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "test:fast": "bash tools/fast-test.sh", "test:p0": "PROTO_IMPL=0 hardhat test test/*.test.ts", "test:p1": "PROTO_IMPL=1 hardhat test test/*.test.ts ", + "test:registries": "PROTO_IMPL=1 hardhat test test/registries/*.test.ts", "test:plugins": "hardhat test test/{libraries,plugins}/*.test.ts", "test:plugins:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/plugins/individual-collateral/**/*.test.ts", "test:integration": "PROTO_IMPL=1 FORK=1 hardhat test test/integration/**/*.test.ts", diff --git a/test/registries/AssetPluginRegistry.test.ts b/test/registries/AssetPluginRegistry.test.ts index 0c727afb9e..2b3287c550 100644 --- a/test/registries/AssetPluginRegistry.test.ts +++ b/test/registries/AssetPluginRegistry.test.ts @@ -4,7 +4,13 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { ZERO_ADDRESS } from '#/common/constants' import { Collateral, Implementation, IMPLEMENTATION, defaultFixture } from '../fixtures' -import { AssetPluginRegistry, TestIDeployer, VersionRegistry, DeployerMock } from '../../typechain' +import { + AssetPluginRegistry, + RoleRegistry, + TestIDeployer, + VersionRegistry, + DeployerMock, +} from '../../typechain' const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip @@ -25,6 +31,7 @@ describeP1('Asset Plugin Registry', () => { // Registries let versionRegistry: VersionRegistry let assetPluginRegistry: AssetPluginRegistry + let roleRegistry: RoleRegistry beforeEach(async () => { ;[owner, other] = await ethers.getSigners() @@ -32,8 +39,11 @@ describeP1('Asset Plugin Registry', () => { // Deploy fixture ;({ deployer, basket } = await loadFixture(defaultFixture)) + const RoleRegistryFactory = await ethers.getContractFactory('RoleRegistry') + roleRegistry = await RoleRegistryFactory.connect(owner).deploy() + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + versionRegistry = await versionRegistryFactory.deploy(roleRegistry.address) const assetPluginRegistryFactory = await ethers.getContractFactory('AssetPluginRegistry') assetPluginRegistry = await assetPluginRegistryFactory.deploy(versionRegistry.address) @@ -50,7 +60,7 @@ describeP1('Asset Plugin Registry', () => { describe('Deployment', () => { it('should set the owner/version registry correctly', async () => { - expect(await assetPluginRegistry.owner()).to.eq(await owner.getAddress()) + expect(await assetPluginRegistry.roleRegistry()).to.eq(roleRegistry.address) expect(await assetPluginRegistry.versionRegistry()).to.eq(versionRegistry.address) }) }) @@ -130,7 +140,7 @@ describeP1('Asset Plugin Registry', () => { // If not owner cannot register asset await expect( assetPluginRegistry.connect(other).registerAsset(tokenAsset.address, [versionHash]) - ).to.be.revertedWith('Ownable: caller is not the owner') + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidCaller') // Invalid registration with zero address is also rejected await expect( @@ -260,7 +270,7 @@ describeP1('Asset Plugin Registry', () => { assetPluginRegistry .connect(other) .updateVersionsByAsset(tokenAsset.address, [versionHash], [true]) - ).to.be.revertedWith('Ownable: caller is not the owner') + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidCaller') // Fails if any of the versions is not registered const versionV1Hash = ethers.utils.keccak256( @@ -385,7 +395,7 @@ describeP1('Asset Plugin Registry', () => { assetPluginRegistry .connect(other) .updateAssetsByVersion(versionHash, [tokenAsset.address], [true]) - ).to.be.revertedWith('Ownable: caller is not the owner') + ).to.be.revertedWithCustomError(assetPluginRegistry, 'AssetPluginRegistry__InvalidCaller') // Fails if any of the assets is zero address await expect( diff --git a/test/registries/DAOFeeRegistry.test.ts b/test/registries/DAOFeeRegistry.test.ts index 6872be6118..4c67a2e361 100644 --- a/test/registries/DAOFeeRegistry.test.ts +++ b/test/registries/DAOFeeRegistry.test.ts @@ -9,6 +9,7 @@ import { whileImpersonating } from '../utils/impersonation' import { DAOFeeRegistry, ERC20Mock, + RoleRegistry, TestIDistributor, TestIRevenueTrader, TestIMain, @@ -28,6 +29,7 @@ describeP1('DAO Fee Registry', () => { let rsrTrader: TestIRevenueTrader let feeRegistry: DAOFeeRegistry + let roleRegistry: RoleRegistry beforeEach(async () => { ;[owner, other] = await ethers.getSigners() @@ -35,12 +37,12 @@ describeP1('DAO Fee Registry', () => { // Deploy fixture ;({ distributor, main, rToken, rsr, rsrTrader } = await loadFixture(defaultFixture)) - const mockRoleRegistryFactory = await ethers.getContractFactory('MockRoleRegistry') - const mockRoleRegistry = await mockRoleRegistryFactory.deploy() + const RoleRegistryFactory = await ethers.getContractFactory('RoleRegistry') + roleRegistry = await RoleRegistryFactory.connect(owner).deploy() const DAOFeeRegistryFactory = await ethers.getContractFactory('DAOFeeRegistry') feeRegistry = await DAOFeeRegistryFactory.connect(owner).deploy( - mockRoleRegistry.address, + roleRegistry.address, await owner.getAddress() ) @@ -58,18 +60,18 @@ describeP1('DAO Fee Registry', () => { describe('Negative cases', () => { it('Should not allow calling setters by anyone other than owner', async () => { - await expect(feeRegistry.connect(other).setFeeRecipient(owner.address)).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) - await expect(feeRegistry.connect(other).setDefaultFeeNumerator(bn('100'))).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) + await expect( + feeRegistry.connect(other).setFeeRecipient(owner.address) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidCaller') + await expect( + feeRegistry.connect(other).setDefaultFeeNumerator(bn('100')) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidCaller') await expect( feeRegistry.connect(other).setRTokenFeeNumerator(rToken.address, bn('100')) - ).to.be.revertedWith('Ownable: caller is not the owner') - await expect(feeRegistry.connect(other).resetRTokenFee(rToken.address)).to.be.revertedWith( - 'Ownable: caller is not the owner' - ) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidCaller') + await expect( + feeRegistry.connect(other).resetRTokenFee(rToken.address) + ).to.be.revertedWithCustomError(feeRegistry, 'DAOFeeRegistry__InvalidCaller') }) it('Should not allow setting fee recipient to zero address', async () => { @@ -192,9 +194,9 @@ describeP1('DAO Fee Registry', () => { expect(await rsr.balanceOf(owner.address)).to.equal(0) await distributor.connect(signer).distribute(rsr.address, amt) - // Expected returned amount is for the fee times 5/3 to account for rev share split - const expectedAmt = amt.mul(defaultFee).div(bn('1e4')).mul(5).div(3) - expect(await rsr.balanceOf(owner.address)).to.equal(expectedAmt) + const feeShares = bn('1e4').mul(defaultFee).div(bn('1e4').sub(defaultFee)) + const expectedAmt = amt.mul(feeShares).div(feeShares.add(6000)) + expect(await rsr.balanceOf(owner.address)).to.be.closeTo(expectedAmt, 10000) }) }) } diff --git a/test/registries/VersionRegistry.test.ts b/test/registries/VersionRegistry.test.ts index 9edfc493d7..789a3a3c1b 100644 --- a/test/registries/VersionRegistry.test.ts +++ b/test/registries/VersionRegistry.test.ts @@ -4,12 +4,13 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { expect } from 'chai' import { ONE_ADDRESS, ZERO_ADDRESS, ZERO_BYTES } from '#/common/constants' import { IImplementations } from '#/common/configuration' -import { DeployerMock, TestIDeployer, VersionRegistry } from '../../typechain' +import { DeployerMock, RoleRegistry, TestIDeployer, VersionRegistry } from '../../typechain' import { Implementation, IMPLEMENTATION, defaultFixture } from '../fixtures' const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.skip describeP1('Version Registry', () => { + let roleRegistry: RoleRegistry let versionRegistry: VersionRegistry let deployer: TestIDeployer let deployerMockV1: DeployerMock @@ -21,8 +22,11 @@ describeP1('Version Registry', () => { ;[owner, other] = await ethers.getSigners() ;({ deployer } = await loadFixture(defaultFixture)) + const RoleRegistryFactory = await ethers.getContractFactory('RoleRegistry') + roleRegistry = await RoleRegistryFactory.connect(owner).deploy() + const versionRegistryFactory = await ethers.getContractFactory('VersionRegistry') - versionRegistry = await versionRegistryFactory.deploy(await owner.getAddress()) + versionRegistry = await versionRegistryFactory.deploy(roleRegistry.address) const DeployerMockFactoryV1 = await ethers.getContractFactory('DeployerMock') deployerMockV1 = await DeployerMockFactoryV1.deploy() @@ -32,8 +36,8 @@ describeP1('Version Registry', () => { }) describe('Deployment', () => { - it('should set the owner to the specified address', async () => { - expect(await versionRegistry.owner()).to.eq(await owner.getAddress()) + it('should set the role registry to the specified address', async () => { + expect(await versionRegistry.roleRegistry()).to.eq(roleRegistry.address) }) }) @@ -48,7 +52,9 @@ describeP1('Version Registry', () => { expect(versionData.versionHash).not.be.eq(ZERO_BYTES) expect(versionData.deprecated).be.eq(false) - const expectedVersionHash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('V1')) + const expectedVersionHash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV1.version()) + ) expect(versionData.versionHash).to.eq(expectedVersionHash) expect(await versionRegistry.deployments(expectedVersionHash)).to.not.equal(ZERO_ADDRESS) expect(await versionRegistry.deployments(expectedVersionHash)).to.equal( @@ -60,7 +66,7 @@ describeP1('Version Registry', () => { // If not owner, should be rejected await expect( versionRegistry.connect(other).registerVersion(deployer.address) - ).to.be.revertedWith('Ownable: caller is not the owner') + ).to.be.revertedWithCustomError(versionRegistry, 'VersionRegistry__InvalidCaller') // Same version, different deployer, should be rejected. const DeployerMockFactory = await ethers.getContractFactory('DeployerMock') @@ -79,7 +85,9 @@ describeP1('Version Registry', () => { const initialVersionData = await versionRegistry.getLatestVersion() // Register new version - const expectedV2Hash = ethers.utils.keccak256(ethers.utils.toUtf8Bytes('V2')) + const expectedV2Hash = ethers.utils.keccak256( + ethers.utils.toUtf8Bytes(await deployerMockV2.version()) + ) await expect(versionRegistry.connect(owner).registerVersion(deployerMockV2.address)) .to.emit(versionRegistry, 'VersionRegistered') .withArgs(expectedV2Hash, deployerMockV2.address) From 867d8189da8b7b78969d2297c00787b4d6545e88 Mon Sep 17 00:00:00 2001 From: Julian R Date: Wed, 14 Aug 2024 12:05:01 -0300 Subject: [PATCH 447/450] get to compile --- contracts/fuzz/CollateralMock.sol | 84 +++++++++++++------------------ contracts/fuzz/FuzzP0.sol | 2 +- contracts/fuzz/FuzzP1.sol | 2 +- contracts/fuzz/MainP0.sol | 2 +- contracts/fuzz/MainP1.sol | 2 +- contracts/fuzz/Utils.sol | 3 +- contracts/p0/BasketHandler.sol | 40 --------------- 7 files changed, 40 insertions(+), 95 deletions(-) diff --git a/contracts/fuzz/CollateralMock.sol b/contracts/fuzz/CollateralMock.sol index ec87388932..542c55222b 100644 --- a/contracts/fuzz/CollateralMock.sol +++ b/contracts/fuzz/CollateralMock.sol @@ -123,56 +123,40 @@ contract CollateralMock is OracleErrorMock, AppreciatingFiatCollateral { } } +// DEPRECATED // A CollateralMock that does not use decaying lotPrice()s, but instead just returns the last saved // value. Needed for DiffTest, because refresh() doesn't always happen in the same block on both P0 // and P1. -contract CollateralNoDecay is CollateralMock { - function lotPrice() - external - view - virtual - override(Asset, IAsset) - returns (uint192 lotLow, uint192 lotHigh) - { - try this.tryPrice() returns (uint192 low, uint192 high, uint192) { - // if the price feed is still functioning, use that - return (low, high); - } catch (bytes memory errData) { - // see: docs/solidity-style.md#Catching-Empty-Data - if (errData.length == 0) revert(); // solhint-disable-line reason-string - return (savedLowPrice, savedHighPrice); - } - } - - constructor( - // Collateral base-class arguments - IERC20Metadata erc20_, - uint192 maxTradeVolume_, - uint48 priceTimeout_, - uint192 oracleError_, - uint192 defaultThreshold_, - uint48 delayUntilDefault_, - bytes32 targetName_, - // Price Models - PriceModel memory refPerTokModel_, // Ref units per token - PriceModel memory targetPerRefModel_, // Target units per ref unit - PriceModel memory uoaPerTargetModel_, // Units-of-account per target unit - PriceModel memory deviationModel_, - uint192 revenueHiding - ) - CollateralMock( - erc20_, - maxTradeVolume_, - priceTimeout_, - oracleError_, - defaultThreshold_, - delayUntilDefault_, - targetName_, - refPerTokModel_, - targetPerRefModel_, - uoaPerTargetModel_, - deviationModel_, - revenueHiding - ) - {} -} +// contract CollateralNoDecay is CollateralMock { +// constructor( +// // Collateral base-class arguments +// IERC20Metadata erc20_, +// uint192 maxTradeVolume_, +// uint48 priceTimeout_, +// uint192 oracleError_, +// uint192 defaultThreshold_, +// uint48 delayUntilDefault_, +// bytes32 targetName_, +// // Price Models +// PriceModel memory refPerTokModel_, // Ref units per token +// PriceModel memory targetPerRefModel_, // Target units per ref unit +// PriceModel memory uoaPerTargetModel_, // Units-of-account per target unit +// PriceModel memory deviationModel_, +// uint192 revenueHiding +// ) +// CollateralMock( +// erc20_, +// maxTradeVolume_, +// priceTimeout_, +// oracleError_, +// defaultThreshold_, +// delayUntilDefault_, +// targetName_, +// refPerTokModel_, +// targetPerRefModel_, +// uoaPerTargetModel_, +// deviationModel_, +// revenueHiding +// ) +// {} +// } diff --git a/contracts/fuzz/FuzzP0.sol b/contracts/fuzz/FuzzP0.sol index 3dae97dba2..605975ac3c 100644 --- a/contracts/fuzz/FuzzP0.sol +++ b/contracts/fuzz/FuzzP0.sol @@ -129,7 +129,7 @@ contract RTokenP0Fuzz is IRTokenFuzz, RTokenP0 { ? basketsNeeded.muluDivu(amount, totalSupply()) // {BU * qRTok / qRTok} : uint192(amount); // {qRTok / qRTok} - return main.basketHandler().quote(baskets, roundingMode); + return main.basketHandler().quote(baskets, true, roundingMode); } function _msgSender() internal view virtual override returns (address) { diff --git a/contracts/fuzz/FuzzP1.sol b/contracts/fuzz/FuzzP1.sol index 94e6edb0f7..ce2132c2d3 100644 --- a/contracts/fuzz/FuzzP1.sol +++ b/contracts/fuzz/FuzzP1.sol @@ -467,7 +467,7 @@ contract RTokenP1Fuzz is IRTokenFuzz, RTokenP1 { ? basketsNeeded.muluDivu(amount, totalSupply()) // {BU * qRTok / qRTok} : uint192(amount); // {qRTok / qRTok} - return main.basketHandler().quote(baskets, roundingMode); + return main.basketHandler().quote(baskets, true, roundingMode); } function _msgSender() internal view virtual override returns (address) { diff --git a/contracts/fuzz/MainP0.sol b/contracts/fuzz/MainP0.sol index f936525389..131c7688c4 100644 --- a/contracts/fuzz/MainP0.sol +++ b/contracts/fuzz/MainP0.sol @@ -208,7 +208,7 @@ contract MainP0Fuzz is IMainFuzz, MainP0 { params.minTradeVolume ); - basketHandler.init(this, params.warmupPeriod, params.reweightable); + basketHandler.init(this, params.warmupPeriod, params.reweightable, params.enableIssuancePremium); rsrTrader.init(this, rsr, params.maxTradeSlippage, params.minTradeVolume); rTokenTrader.init( this, diff --git a/contracts/fuzz/MainP1.sol b/contracts/fuzz/MainP1.sol index dd99a9df6a..f54c5b4e9f 100644 --- a/contracts/fuzz/MainP1.sol +++ b/contracts/fuzz/MainP1.sol @@ -212,7 +212,7 @@ contract MainP1Fuzz is IMainFuzz, MainP1 { params.minTradeVolume ); - basketHandler.init(this, params.warmupPeriod, params.reweightable); + basketHandler.init(this, params.warmupPeriod, params.reweightable, params.enableIssuancePremium); rsrTrader.init(this, rsr, params.maxTradeSlippage, params.minTradeVolume); rTokenTrader.init( this, diff --git a/contracts/fuzz/Utils.sol b/contracts/fuzz/Utils.sol index 87246e85dc..386a9fc0b2 100644 --- a/contracts/fuzz/Utils.sol +++ b/contracts/fuzz/Utils.sol @@ -30,7 +30,8 @@ function defaultParams() pure returns (DeploymentParams memory params) { issuanceThrottle: tParams, redemptionThrottle: tParams, warmupPeriod: 259200, - reweightable: false + reweightable: false, + enableIssuancePremium: false }); } diff --git a/contracts/p0/BasketHandler.sol b/contracts/p0/BasketHandler.sol index 623eac3b3b..c469dfa795 100644 --- a/contracts/p0/BasketHandler.sol +++ b/contracts/p0/BasketHandler.sol @@ -902,46 +902,6 @@ contract BasketHandlerP0 is ComponentP0, IBasketHandler { require(_targetAmts.length() == 0, "missing target weights"); } - /// Normalize the target amounts to maintain constant UoA value with the current config - /// @return newTargetAmts {target/BU} The new target amounts for the normalized basket - function normalizeByPrice(IERC20[] calldata erc20s, uint192[] memory targetAmts) - private - returns (uint192[] memory newTargetAmts) - { - main.poke(); - require(status() == CollateralStatus.SOUND, "unsound basket"); - uint256 len = erc20s.length; // assumes erc20s.length == targetAmts.length - - // Compute current basket price - (uint192 low, uint192 high) = _price(false); // {UoA/BU} - assert(low > 0 && high < FIX_MAX); // implied by SOUND status - uint192 p = low.plus(high).divu(2, FLOOR); // {UoA/BU} - - // Compute would-be new price - uint192 newP; // {UoA/BU} - for (uint256 i = 0; i < len; ++i) { - ICollateral coll = main.assetRegistry().toColl(erc20s[i]); // reverts if unregistered - require(coll.status() == CollateralStatus.SOUND, "unsound new collateral"); - - (low, high) = coll.price(); // {UoA/tok} - require(low > 0 && high < FIX_MAX, "invalid price"); - - // {UoA/BU} += {target/BU} * {UoA/tok} / ({target/ref} * {ref/tok}) - newP += targetAmts[i].mulDiv( - low.plus(high).divu(2, FLOOR), - coll.targetPerRef().mul(coll.refPerTok(), CEIL), - FLOOR - ); - } - - // Scale targetAmts by the price ratio - newTargetAmts = new uint192[](len); - for (uint256 i = 0; i < len; ++i) { - // {target/BU} = {target/BU} * {UoA/BU} / {UoA/BU} - newTargetAmts[i] = targetAmts[i].mulDiv(p, newP, CEIL); - } - } - /// Good collateral is registered, collateral, SOUND, has the expected targetName, /// and not a system token or 0 addr function goodCollateral(bytes32 targetName, IERC20 erc20) private view returns (bool) { From efc88ebb6e9bdb4f451cc779771250d2843a0493 Mon Sep 17 00:00:00 2001 From: Julian R Date: Wed, 14 Aug 2024 12:37:03 -0300 Subject: [PATCH 448/450] fix tests --- test/fuzz/RebalancingScenario.test.ts | 4 ++-- test/fuzz/common.ts | 1 + test/fuzz/commonAbnormalTests.ts | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/test/fuzz/RebalancingScenario.test.ts b/test/fuzz/RebalancingScenario.test.ts index 613402c3dd..fe49892c63 100644 --- a/test/fuzz/RebalancingScenario.test.ts +++ b/test/fuzz/RebalancingScenario.test.ts @@ -360,7 +360,7 @@ const scenarioSpecificTests = () => { it('performs validations on set prime basket if non-reweightable', async () => { // Check current basket - const [tokenAddrs] = await comp.basketHandler.quote(1n * exa, RoundingMode.CEIL) + const [tokenAddrs] = await comp.basketHandler['quote(uint192,bool,uint8)'](1n * exa, true, RoundingMode.CEIL) expect(tokenAddrs.length).to.equal(9) @@ -409,7 +409,7 @@ const scenarioSpecificTests = () => { await comp.basketHandler.savePrev() await scenario.refreshBasket() - const [newTokenAddrs, amts] = await comp.basketHandler.quote(1n * exa, RoundingMode.CEIL) + const [newTokenAddrs, amts] = await comp.basketHandler['quote(uint192,bool,uint8)'](1n * exa, true, RoundingMode.CEIL) expect(await comp.basketHandler.prevEqualsCurr()).to.be.false expect(newTokenAddrs.length).to.equal(3) diff --git a/test/fuzz/common.ts b/test/fuzz/common.ts index f3635c4442..1a52300f20 100644 --- a/test/fuzz/common.ts +++ b/test/fuzz/common.ts @@ -70,6 +70,7 @@ export const CONFIG: IConfig = { issuanceRate: fp('0.00025'), // 0.025% per block or ~0.1% per minute scalingRedemptionRate: fp('0.05'), redemptionRateFloor: fp('2e7'), + enableIssuancePremium: true } export const ZERO_COMPONENTS = { diff --git a/test/fuzz/commonAbnormalTests.ts b/test/fuzz/commonAbnormalTests.ts index 10fda1c8fc..3931ef254a 100644 --- a/test/fuzz/commonAbnormalTests.ts +++ b/test/fuzz/commonAbnormalTests.ts @@ -116,7 +116,8 @@ export default function fn(context: FuzzTestContext { // Check current basket - const [tokenAddrs] = await comp.basketHandler.quote(1n * exa, RoundingMode.CEIL) + //console.log(comp.basketHandler) + const [tokenAddrs] = await comp.basketHandler['quote(uint192,bool,uint8)'](1n * exa, true, RoundingMode.CEIL) expect(tokenAddrs.length).to.equal(9) @@ -152,7 +153,7 @@ export default function fn(context: FuzzTestContext(context: FuzzTestContext Date: Wed, 14 Aug 2024 12:37:43 -0300 Subject: [PATCH 449/450] remove console --- test/fuzz/commonAbnormalTests.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/test/fuzz/commonAbnormalTests.ts b/test/fuzz/commonAbnormalTests.ts index 3931ef254a..379c970521 100644 --- a/test/fuzz/commonAbnormalTests.ts +++ b/test/fuzz/commonAbnormalTests.ts @@ -116,7 +116,6 @@ export default function fn(context: FuzzTestContext { // Check current basket - //console.log(comp.basketHandler) const [tokenAddrs] = await comp.basketHandler['quote(uint192,bool,uint8)'](1n * exa, true, RoundingMode.CEIL) expect(tokenAddrs.length).to.equal(9) From cf4400b01dc56bbf920c6b6be476794cf414516d Mon Sep 17 00:00:00 2001 From: Julian R Date: Wed, 14 Aug 2024 16:03:09 -0300 Subject: [PATCH 450/450] set issuance premium --- contracts/fuzz/Utils.sol | 2 +- contracts/fuzz/scenarios/ChaosOps.sol | 4 ++++ contracts/fuzz/scenarios/NormalOps.sol | 4 ++++ contracts/fuzz/scenarios/Rebalancing.sol | 4 ++++ test/fuzz/ChaosScenario.test.ts | 2 ++ test/fuzz/NormalScenario.test.ts | 2 ++ test/fuzz/RebalancingScenario.test.ts | 2 ++ 7 files changed, 19 insertions(+), 1 deletion(-) diff --git a/contracts/fuzz/Utils.sol b/contracts/fuzz/Utils.sol index 386a9fc0b2..b8ae3bde7e 100644 --- a/contracts/fuzz/Utils.sol +++ b/contracts/fuzz/Utils.sol @@ -31,7 +31,7 @@ function defaultParams() pure returns (DeploymentParams memory params) { redemptionThrottle: tParams, warmupPeriod: 259200, reweightable: false, - enableIssuancePremium: false + enableIssuancePremium: true }); } diff --git a/contracts/fuzz/scenarios/ChaosOps.sol b/contracts/fuzz/scenarios/ChaosOps.sol index 6c66d922bc..ad3dca2120 100644 --- a/contracts/fuzz/scenarios/ChaosOps.sol +++ b/contracts/fuzz/scenarios/ChaosOps.sol @@ -937,6 +937,10 @@ contract ChaosOpsScenario { main.setLongFreeze(freeze); } + function setIssuancePremiumEnabled(uint256 seed) public { + BasketHandlerP1(address(main.basketHandler())).setIssuancePremiumEnabled((seed % 2) == 0); + } + // Grant/Revoke Roles function grantRole(uint8 which, uint8 userID) public { address user = main.someAddr(userID); diff --git a/contracts/fuzz/scenarios/NormalOps.sol b/contracts/fuzz/scenarios/NormalOps.sol index 6c230da1a3..b76722dcc1 100644 --- a/contracts/fuzz/scenarios/NormalOps.sol +++ b/contracts/fuzz/scenarios/NormalOps.sol @@ -625,6 +625,10 @@ contract NormalOpsScenario { ); } + function setIssuancePremiumEnabled(uint256 seed) public { + BasketHandlerP1(address(main.basketHandler())).setIssuancePremiumEnabled((seed % 2) == 0); + } + function resetStakes() public { main.stRSR().resetStakes(); } diff --git a/contracts/fuzz/scenarios/Rebalancing.sol b/contracts/fuzz/scenarios/Rebalancing.sol index b6ebfa5b0e..71215a2f3f 100644 --- a/contracts/fuzz/scenarios/Rebalancing.sol +++ b/contracts/fuzz/scenarios/Rebalancing.sol @@ -996,6 +996,10 @@ contract RebalancingScenario { main.setLongFreeze(freeze); } + function setIssuancePremiumEnabled(uint256 seed) public { + BasketHandlerP1(address(main.basketHandler())).setIssuancePremiumEnabled((seed % 2) == 0); + } + // Grant/Revoke Roles function grantRole(uint8 which, uint8 userID) public { address user = main.someAddr(userID); diff --git a/test/fuzz/ChaosScenario.test.ts b/test/fuzz/ChaosScenario.test.ts index f5d938ee36..03a15f6caf 100644 --- a/test/fuzz/ChaosScenario.test.ts +++ b/test/fuzz/ChaosScenario.test.ts @@ -218,6 +218,8 @@ const scenarioSpecificTests = () => { // Uses reweightable basket expect(await comp.basketHandler.reweightable()).to.be.true + + expect(await comp.basketHandler.enableIssuancePremium()).to.equal(true) }) it('can create stable+ collateral with reward', async () => { diff --git a/test/fuzz/NormalScenario.test.ts b/test/fuzz/NormalScenario.test.ts index 45bf939284..230be87fb2 100644 --- a/test/fuzz/NormalScenario.test.ts +++ b/test/fuzz/NormalScenario.test.ts @@ -192,6 +192,8 @@ const scenarioSpecificTests = () => { expect(await comp.broker.main()).to.equal(main.address) expect(await comp.basketHandler.status()).to.equal(CollateralStatus.SOUND) + + expect(await comp.basketHandler.enableIssuancePremium()).to.equal(true) }) it('has only initially-true properties', async () => { diff --git a/test/fuzz/RebalancingScenario.test.ts b/test/fuzz/RebalancingScenario.test.ts index fe49892c63..eb8aff05ef 100644 --- a/test/fuzz/RebalancingScenario.test.ts +++ b/test/fuzz/RebalancingScenario.test.ts @@ -222,6 +222,8 @@ const scenarioSpecificTests = () => { expect(await comp.rTokenTrader.main()).to.equal(main.address) expect(await comp.furnace.main()).to.equal(main.address) expect(await comp.broker.main()).to.equal(main.address) + + expect(await comp.basketHandler.enableIssuancePremium()).to.equal(true) }) it('can create stable+ collateral with reward', async () => {

    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 z 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 PL^3mqh-evWGc*1dkn$lA literal 0 HcmV?d00001 diff --git a/common/configuration.ts b/common/configuration.ts index 06287d852f..34bd87fbd4 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -106,7 +106,7 @@ export interface ITokens { Re7WETH?: string } -export type ITokensKeys = Array; +export type ITokensKeys = Array export interface IFeeds { stETHETH?: string @@ -218,7 +218,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', - wcUSDCv3: '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A', + wcUSDCv3: '0x27F2f159Fe990Ba83D57f39Fd69661764BEbf37a', ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', sFRAX: '0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32', sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', @@ -488,9 +488,9 @@ export const networkConfig: { [key: string]: INetworkConfig } = { cbETH: '0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22', cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', cUSDCv3: '0xb125E6687d4313864e53df431d5425969c15Eb2F', - wcUSDCv3: '0xA694f7177C6c839C951C74C797283B35D0A486c8', + wcUSDCv3: '0x53f1Df4E5591Ae35Bf738742981669c3767241FA', aBasUSDC: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB', - saBasUSDC: '0x184460704886f9F2A7F3A0c2887680867954dC6E', // our wrapper + saBasUSDC: '0x6F6f81e5E66f503184f2202D83a79650c3285759', // our wrapper aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', diff --git a/common/constants.ts b/common/constants.ts index f0cffa16b2..9ff6414605 100644 --- a/common/constants.ts +++ b/common/constants.ts @@ -1,5 +1,7 @@ import { utils, BigNumber } from 'ethers' +export const ZERO_BYTES = '0x0000000000000000000000000000000000000000000000000000000000000000' + export const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000' export const ONE_ADDRESS = '0x0000000000000000000000000000000000000001' diff --git a/contracts/interfaces/IBasketHandler.sol b/contracts/interfaces/IBasketHandler.sol index a47e72f9d7..44aeace135 100644 --- a/contracts/interfaces/IBasketHandler.sol +++ b/contracts/interfaces/IBasketHandler.sol @@ -171,6 +171,20 @@ interface IBasketHandler is IComponent { } interface TestIBasketHandler is IBasketHandler { + function getPrimeBasket() + external + view + returns ( + IERC20[] memory erc20s, + bytes32[] memory targetNames, + uint192[] memory targetAmts + ); + + function getBackupConfig(bytes32 targetName) + external + view + returns (IERC20[] memory erc20s, uint256 max); + function lastCollateralized() external view returns (uint48); function warmupPeriod() external view returns (uint48); diff --git a/contracts/interfaces/IDeployer.sol b/contracts/interfaces/IDeployer.sol index 535a5d4f93..f8732a30bc 100644 --- a/contracts/interfaces/IDeployer.sol +++ b/contracts/interfaces/IDeployer.sol @@ -123,4 +123,13 @@ interface TestIDeployer is IDeployer { function gnosis() external view returns (IGnosis); function rsrAsset() external view returns (IAsset); + + function implementations() + external + view + returns ( + IMain, + Components memory, + TradePlugins memory + ); } diff --git a/contracts/spells/3_4_0.sol b/contracts/spells/3_4_0.sol new file mode 100644 index 0000000000..9fb80238dc --- /dev/null +++ b/contracts/spells/3_4_0.sol @@ -0,0 +1,526 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/utils/structs/EnumerableSet.sol"; +import "@openzeppelin/contracts/proxy/utils/UUPSUpgradeable.sol"; +import "@openzeppelin/contracts/governance/IGovernor.sol"; +import "@openzeppelin/contracts/governance/TimelockController.sol"; +import "../interfaces/IDeployer.sol"; +import "../interfaces/IMain.sol"; + +// interface avoids needing to know about P1 contracts +interface ICachedComponent { + function cacheComponents() external; +} + +/** + * The upgrade contract for the 3.4.0 release. Each spell function can only be cast once per RToken. + * + * Before casting each spell() function this contract must have MAIN_OWNER_ROLE of Main. + * After casting each spell this contract will revoke its adminship of Main. + * + * The spell function should be called by the timelock owning Main. Governance should NOT + * grant this spell ownership without immediately executing one of the spell functions after. + * + * WARNING: Only cast spell 2 after + * (i) all reward tokens have been claimed AND + * (ii) all rebalancing + revenue auctions have been fully processed. + * More specifically: All non-backing assets should have a balance under minTradeVolume, + * and there should be no more non-backing assets to claim. + * + * + * Only works on Mainnet and Base. Only supports RTokens listed on the Register as of May 1, 2024 + */ +contract Upgrade3_4_0 { + bytes32 constant ALEXIOS_HASH = keccak256(abi.encodePacked("Governor Alexios")); + bytes32 constant ANASTASIUS_HASH = keccak256(abi.encodePacked("Governor Anastasius")); + + // Main + bytes32 constant MAIN_OWNER_ROLE = bytes32("OWNER"); + + // Timelock + bytes32 constant TIMELOCK_ADMIN_ROLE = keccak256("TIMELOCK_ADMIN_ROLE"); + bytes32 constant PROPOSER_ROLE = keccak256("PROPOSER_ROLE"); + bytes32 constant EXECUTOR_ROLE = keccak256("EXECUTOR_ROLE"); + bytes32 constant CANCELLER_ROLE = keccak256("CANCELLER_ROLE"); + + // ====================================================================================== + + // 3.4.0 Assets (mainnet) + IAsset[51] MAINNET_ASSETS = [ + IAsset(0x591529f039Ba48C3bEAc5090e30ceDDcb41D0EaA), // RSR + IAsset(0xF4493581D52671a9E04d693a68ccc61853bceEaE), // stkAAVE + IAsset(0x63eDdF26Bc65eDa1D1c0147ce8E23c09BE963596), // COMP + IAsset(0xc18bF46F178F7e90b9CD8b7A8b00Af026D5ce3D3), // CRV + IAsset(0x7ef93b20C10E6662931b32Dd9D4b85861eB2E4b8), // CVX + IAsset(0xEc375F2984D21D5ddb0D82767FD8a9C4CE8Eec2F), // DAI + IAsset(0x442f8fc98e3cc6B3d49a66f9858Ac9B6e70Dad3e), // USDC + IAsset(0xe7Dcd101A027Ec34860ECb634a2797d0D2dc4d8b), // USDT + IAsset(0x4C0B21Acb267f1fAE4aeFA977A26c4a63C9B35e6), // USDP + IAsset(0x97bb4a995b98b1BfF99046b3c518276f78fA5250), // BUSD + IAsset(0x9ca9A9cdcE9E943608c945E7001dC89EB163991E), // aDAI + IAsset(0xc4240D22FFa144E2712aACF3E2cC302af0339ED0), // aUSDC + IAsset(0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333), // aUSDT + IAsset(0x01F9A6bf339cff820cA503A56FD3705AE35c27F7), // aBUSD + IAsset(0xda5cc207CCefD116fF167a8ABEBBd52bD67C958E), // aUSDP + IAsset(0x337E418b880bDA5860e05D632CF039B7751B907B), // cDAI + IAsset(0x043be931D9C4422e1cFeA528e19818dcDfdE9Ebc), // cUSDC + IAsset(0x5ceadb6606C5D82FcCd3f9b312C018fE1f8aa6dA), // cUSDT + IAsset(0xa0c02De8FfBb9759b9beBA5e29C82112688A0Ff4), // cUSDP + IAsset(0xC0f89AFcb6F1c4E943aA61FFcdFc41fDcB7D84DD), // cWBTC + IAsset(0x4d3A8507a8eb9036895efdD1a462210CE58DE4ad), // cETH + IAsset(0x832D65735E541c0404a58B741bEF5652c2B7D0Db), // WBTC + IAsset(0xADDca344c92Be84A053C5CBE8e067460767FB816), // WETH + IAsset(0xb7049ee9F533D32C9434101f0645E6Ea5DFe2cdb), // wstETH + IAsset(0x987f5e0f845D46262893e680b652D8aAF1B5bCc0), // rETH + IAsset(0xB58D95003Af73CF76Ce349103726a51D4Ec8af17), // fUSDC + IAsset(0xD5254b740FbEF6AAcD674936ea7Fb9f4053781aF), // fUSDT + IAsset(0xA0a620B94446a7DC8952ECf252FcC495eeC65873), // fDAI + IAsset(0xFd9c32198D3cf3ad3b165918FD78De3654cb22eA), // fFRAX + IAsset(0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0), // cUSDCv3 + IAsset(0x8E5ADdC553962DAcdF48106B6218AC93DA9617b2), // cvx3Pool + IAsset(0x5315Fbe0CEB299F53aE375f65fd9376767C8224c), // cvxPayPool + IAsset(0x994455cE66Fd984e2A0A0aca453e637810a8f032), // cvxeUSDFRAXBP + IAsset(0x3d21f841C0Fb125176C1DBDF0DE196b071323A75), // crvMIM3Pool + IAsset(0x05F164E71C46a8f8FB2ba71550a00eeC9FCd85cd), // cvxETHPlusETH + IAsset(0xCDC5f5E041b49Cad373E94930E2b3bE30be70535), // crveUSDFRAXBP + IAsset(0x692cf8CE08d03eF1f8C3dCa82F67935fa9417B62), // crvMIM3Pool + IAsset(0xf59a7987EDd5380cbAb30c37D1c808686f9b67B9), // crv3Pool + IAsset(0x62a9DDC6FF6077E823690118eCc935d16A8de47e), // sDAI + // Morph-aave maUSDT/maUSDC/maDAI/maWBTC/maWETH/maStETH collateral excluded + + IAsset(0x1573416df7095F698e37A954D9e951868E526650), // yvCurveUSDCcrvUSD + IAsset(0xb3A3552Cc52411dFF6D520C6F725E6F9e11001EF), // yvCurveUSDTcrvUSD + IAsset(0x0b7DcCBceA6f985301506D575E2661bf858CdEcC), // sFRAX + IAsset(0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB), // saEthUSDC + IAsset(0x58a41c87f8C65cf21f961b570540b176e408Cf2E), // saEthPyUSD + IAsset(0x01355C7439982c57cF89CA9785d211806f866224), // bbUSDT + IAsset(0x565CBc99EE04667581c7f3459561fCaf1CF68602), // steakUSDC + IAsset(0x23f06D5Fe858B18CD064A5D95054e8ae8536094a), // steakPYUSD + IAsset(0xa0a6C06e45437d4Ae1D778AaeB4605AC2B62A870), // Re7WETH + IAsset(0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5), // cvxCrvUSDUSDC + IAsset(0x69c6597690B8Df61D15F201519C03725bdec40c1), // cvxCrvUSDUSDT + IAsset(0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67) // sfrxETH + ]; + + // 3.4.0 Assets (base) + IAsset[9] BASE_ASSETS = [ + IAsset(0x02062c16c28A169D1f2F5EfA7eEDc42c3311ec23), // RSR + IAsset(0xB8794Fb1CCd62bFe631293163F4A3fC2d22e37e0), // COMP + IAsset(0x3E40840d0282C9F9cC7d17094b5239f87fcf18e5), // DAI + IAsset(0xaa85216187F92a781D8F9Bcb40825E356ee2635a), // USDC + IAsset(0x073BD162BBD05Cd2CF631B90D44239B8a367276e), // WETH + IAsset(0x851B461a9744f4c9E996C03072cAB6f44Fa04d0D), // cbETH + IAsset(0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50), // saBasUSDC + IAsset(0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461), // cUSDCv3 + IAsset(0x8b4374005291B8FCD14C4E947604b2FB3C660A73) // wstETH + ]; + + // ======================================================================================= + + using EnumerableSet for EnumerableSet.Bytes32Set; + + TestIDeployer public deployer; + + struct NewGovernance { + IGovernor anastasius; + TimelockController timelock; + } + + // RToken => [IGovernor, TimelockController] + mapping(IRToken => NewGovernance) public newGovs; + + // Invariant + // for each erc20 to be included in 3.4.0: + // assets[erc20] == address(0) XOR rotations[erc20] == address(0) + // (checked in constructor) + + // 3.4.0 ERC20 => 3.4.0 Asset + mapping(IERC20 => IAsset) public assets; // ALL 3.4.0 assets + + // <3.4.0 ERC20 => 3.4.0 Asset + mapping(IERC20 => IAsset) public rotations; // erc20 rotations + + // RToken => bool + mapping(IRToken => bool) public oneCast; + mapping(IRToken => bool) public twoCast; + + bool public mainnet; // !mainnet | base + + // empty between txs + EnumerableSet.Bytes32Set private uniqueTargetNames; + + // ======================================================================================= + + constructor(bool _mainnet) { + // we have to pass-in `_mainnet` because chainid is not reliable during testing + require( + block.chainid == 1 || block.chainid == 31337 || block.chainid == 8453, + "unsupported chain" + ); + mainnet = _mainnet; + + // Setup `assets` array + if (_mainnet) { + // Setup `deployer` + deployer = TestIDeployer(0x2204EC97D31E2C9eE62eaD9e6E2d5F7712D3f1bF); + + // Setup `newGovs` + // eUSD + newGovs[IRToken(0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F)] = NewGovernance( + IGovernor(0xf4A9288D5dEb0EaE987e5926795094BF6f4662F8), + TimelockController(payable(0x7BEa807798313fE8F557780dBD6b829c1E3aD560)) + ); + + // ETH+ + newGovs[IRToken(0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8)] = NewGovernance( + IGovernor(0x868Fe81C276d730A1995Dc84b642E795dFb8F753), + TimelockController(payable(0x5d8A7DC9405F08F14541BA918c1Bf7eb2dACE556)) + ); + + // hyUSD (mainnet) + newGovs[IRToken(0xaCdf0DBA4B9839b96221a8487e9ca660a48212be)] = NewGovernance( + IGovernor(0x3F26EF1460D21A99425569Ef3148Ca6059a7eEAe), + TimelockController(payable(0x788Fd297B4d497e44e4BF25d642fbecA3018B5d2)) + ); + + // USDC+ + newGovs[IRToken(0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b)] = NewGovernance( + IGovernor(0xfB4b59f89657B76f2AdBCFf5786369f0890c0E6e), + TimelockController(payable(0x9D769914eD962C4E609C8d7e4965940799C2D6C0)) + ); + + // USD3 + newGovs[IRToken(0x0d86883FAf4FfD7aEb116390af37746F45b6f378)] = NewGovernance( + IGovernor(0x441808e20E625e0094b01B40F84af89436229279), + TimelockController(payable(0x12e4F043c6464984A45173E0444105058b6C3c7B)) + ); + + // rgUSD + newGovs[IRToken(0x78da5799CF427Fee11e9996982F4150eCe7a99A7)] = NewGovernance( + IGovernor(0xA82Df5F4c8669a358CE54b8784103854a7f11dAf), + TimelockController(payable(0xf33b8F2284BCa1B1A78142aE609F2a3Ad30358f3)) + ); + + // Setup wrapper `rotations` + // <3.4.0 ERC20 => 3.4.0 Asset + rotations[IERC20(0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9)] = IAsset( + 0x8d753659D4E4e4b4601c7F01Dc1c920cA538E333 // saUSDT + ); + rotations[IERC20(0x60C384e226b120d93f3e0F4C502957b2B9C32B15)] = IAsset( + 0xc4240D22FFa144E2712aACF3E2cC302af0339ED0 // saUSDC + ); + rotations[IERC20(0x8d6E0402A3E3aD1b43575b05905F9468447013cF)] = IAsset( + 0x58a41c87f8C65cf21f961b570540b176e408Cf2E // saEthPYUSD + ); + rotations[IERC20(0x093cB4f405924a0C468b43209d5E466F1dd0aC7d)] = IAsset( + 0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB // saEthUSDC + ); + rotations[IERC20(0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A)] = IAsset( + 0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0 // wcUSDCv3 + ); + rotations[IERC20(0x093c07787920eB34A0A0c7a09823510725Aee4Af)] = IAsset( + 0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0 // wcUSDCv3 + ); + rotations[IERC20(0x7e1e077b289c0153b5ceAD9F264d66215341c9Ab)] = IAsset( + 0x33Ba1BC07b0fafb4BBC1520B330081b91ca6bdf0 // wcUSDCv3 + ); + rotations[IERC20(0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1)] = IAsset( + 0x994455cE66Fd984e2A0A0aca453e637810a8f032 // cvxeUSDFRAXBP + ); + rotations[IERC20(0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5)] = IAsset( + 0x994455cE66Fd984e2A0A0aca453e637810a8f032 // cvxeUSDFRAXBP + ); + rotations[IERC20(0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9)] = IAsset( + 0xB58D95003Af73CF76Ce349103726a51D4Ec8af17 // fUSDC + ); + + // Setup updated `assets` + for (uint256 i = 0; i < MAINNET_ASSETS.length; i++) { + IERC20 erc20 = MAINNET_ASSETS[i].erc20(); + require(address(assets[erc20]) == address(0), "duplicate asset"); + require(address(rotations[erc20]) == address(0), "duplicate rotation/update"); + assets[erc20] = MAINNET_ASSETS[i]; + } + } else { + // Setup `deployer` + deployer = TestIDeployer(0xFD18bA9B2f9241Ce40CDE14079c1cDA1502A8D0A); + + // Setup `newGovs` + // hyUSD (base) + newGovs[IRToken(0xCc7FF230365bD730eE4B352cC2492CEdAC49383e)] = NewGovernance( + IGovernor(0xffef97179f58a582dEf73e6d2e4BcD2BDC8ca128), + TimelockController(payable(0x4284D76a03F9B398FF7aEc58C9dEc94b289070CF)) + ); + + // bsdETH + newGovs[IRToken(0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff)] = NewGovernance( + IGovernor(0x21fBa52dA03e1F964fa521532f8B8951fC212055), + TimelockController(payable(0xe664d294824C2A8C952A10c4034e1105d2907F46)) + ); + + // iUSDC + newGovs[IRToken(0xfE0D6D83033e313691E96909d2188C150b834285)] = NewGovernance( + IGovernor(0xB5Cf3238b6EdDf8e264D44593099C5fAaFC3F96D), + TimelockController(payable(0x520CF948147C3DF196B8a21cd3687e7f17555032)) + ); + + // Vaya + newGovs[IRToken(0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d)] = NewGovernance( + IGovernor(0xA6Fa215AB89e24310dc27aD86111803C443186Eb), + TimelockController(payable(0x48f4EA2c10E6665A7B77Ad6B9BD928b21CBe176F)) + ); + + // MAAT + newGovs[IRToken(0x641B0453487C9D14c5df96d45a481ef1dc84e31f)] = NewGovernance( + IGovernor(0x382Ee5dBaCA900211D0B64D2FdB180C4B276E5ce), + TimelockController(payable(0x88CF647f1CE5a83E699157b9D84b5a39266F010D)) + ); + + // Setup wrapper `rotations` + // <3.4.0 ERC20 => 3.4.0 Asset + rotations[IERC20(0x184460704886f9F2A7F3A0c2887680867954dC6E)] = IAsset( + 0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50 // saBasUSDC + ); + rotations[IERC20(0xA694f7177C6c839C951C74C797283B35D0A486c8)] = IAsset( + 0xf7a9D27c3B60c78c6F6e2c2d6ED6E8B94b352461 // wcUSDCv3 + ); + + // Setup updated `assets` + for (uint256 i = 0; i < BASE_ASSETS.length; i++) { + IERC20 erc20 = BASE_ASSETS[i].erc20(); + require(address(assets[erc20]) == address(0), "duplicate asset"); + require(address(rotations[erc20]) == address(0), "duplicate rotation/update"); + assets[erc20] = BASE_ASSETS[i]; + } + } + } + + // Cast once-per-rToken. Caller MUST be the timelock owning Main. + /// @param rToken The RToken to upgrade + /// @dev Requirement: this contract has admin of RToken via MAIN_OWNER_ROLE + function castSpell1(IRToken rToken) external { + // Can only cast once + require(!oneCast[rToken], "repeat cast"); + oneCast[rToken] = true; + + // Validations + IMain main = rToken.main(); + require(main.hasRole(MAIN_OWNER_ROLE, msg.sender), "caller does not own Main"); // crux + require(main.hasRole(MAIN_OWNER_ROLE, address(this)), "must be owner of Main"); + + // Validate new timelock + NewGovernance storage newGov = newGovs[rToken]; + require(address(newGov.anastasius) != address(0), "unsupported RToken"); + require( + newGov.timelock.hasRole(PROPOSER_ROLE, address(newGov.anastasius)), + "anastasius not proposer" + ); + require( + newGov.timelock.hasRole(CANCELLER_ROLE, address(newGov.anastasius)), + "not canceller" + ); + require( + newGov.timelock.hasRole(EXECUTOR_ROLE, address(newGov.anastasius)), + "anastasius not executor" + ); + require( + newGov.timelock.hasRole(TIMELOCK_ADMIN_ROLE, address(newGov.timelock)), + "timelock not admin of itself" + ); + + Components memory proxy; + proxy.assetRegistry = main.assetRegistry(); + proxy.basketHandler = main.basketHandler(); + proxy.backingManager = main.backingManager(); + proxy.broker = main.broker(); + proxy.distributor = main.distributor(); + proxy.furnace = main.furnace(); + proxy.rToken = rToken; + proxy.rTokenTrader = main.rTokenTrader(); + proxy.rsrTrader = main.rsrTrader(); + proxy.stRSR = main.stRSR(); + + // Proxy Upgrades + { + ( + IMain mainImpl, + Components memory compImpls, + TradePlugins memory tradingImpls + ) = deployer.implementations(); + UUPSUpgradeable(address(main)).upgradeTo(address(mainImpl)); + UUPSUpgradeable(address(proxy.assetRegistry)).upgradeTo( + address(compImpls.assetRegistry) + ); + UUPSUpgradeable(address(proxy.backingManager)).upgradeTo( + address(compImpls.backingManager) + ); + UUPSUpgradeable(address(proxy.basketHandler)).upgradeTo( + address(compImpls.basketHandler) + ); + UUPSUpgradeable(address(proxy.broker)).upgradeTo(address(compImpls.broker)); + UUPSUpgradeable(address(proxy.distributor)).upgradeTo(address(compImpls.distributor)); + UUPSUpgradeable(address(proxy.furnace)).upgradeTo(address(compImpls.furnace)); + UUPSUpgradeable(address(proxy.rTokenTrader)).upgradeTo(address(compImpls.rTokenTrader)); + UUPSUpgradeable(address(proxy.rsrTrader)).upgradeTo(address(compImpls.rsrTrader)); + UUPSUpgradeable(address(proxy.stRSR)).upgradeTo(address(compImpls.stRSR)); + UUPSUpgradeable(address(proxy.rToken)).upgradeTo(address(compImpls.rToken)); + + // Trading plugins + TestIBroker(address(proxy.broker)).setDutchTradeImplementation(tradingImpls.dutchTrade); + TestIBroker(address(proxy.broker)).setBatchTradeImplementation( + tradingImpls.gnosisTrade + ); + + // cacheComponents() + ICachedComponent(address(proxy.broker)).cacheComponents(); + } + + // Scale the reward downwards by the blocktime + // This assumption only makes sense if the old Governor is Alexios, which has been checked + { + uint48 blocktime = mainnet ? 12 : 2; + proxy.furnace.setRatio(proxy.furnace.ratio() / blocktime); + TestIStRSR(address(proxy.stRSR)).setRewardRatio( + TestIStRSR(address(proxy.stRSR)).rewardRatio() / blocktime + ); + } + + // Set trading delay to 0 + TestIBackingManager(address(proxy.backingManager)).setTradingDelay(0); + + // Asset registry updates + { + IERC20[] memory erc20s = proxy.assetRegistry.erc20s(); + for (uint256 i = 0; i < erc20s.length; i++) { + IERC20 erc20 = erc20s[i]; + if (address(erc20) == address(rToken)) continue; + if (assets[erc20] != IAsset(address(0))) { + // if we have a new asset with that erc20, swapRegistered() + proxy.assetRegistry.swapRegistered(assets[erc20]); + } else if ( + // if we have a rotated asset + rotations[erc20] != IAsset(address(0)) && + !proxy.assetRegistry.isRegistered(rotations[erc20].erc20()) + ) { + proxy.assetRegistry.register(rotations[erc20]); + } + // assets being deprecated in 3.4.0 will be skipped and left in baskets + } + + // RTokenAsset + proxy.assetRegistry.swapRegistered( + deployer.deployRTokenAsset( + rToken, + proxy.assetRegistry.toAsset(IERC20(address(rToken))).maxTradeVolume() + ) + ); + } + + // Rotate ERC20s in basket + { + ( + IERC20[] memory primeERC20s, + bytes32[] memory targetNames, + uint192[] memory targetAmts + ) = TestIBasketHandler(address(proxy.basketHandler)).getPrimeBasket(); + + // Rotate ERC20s in prime basket + bool newBasket; + for (uint256 i = 0; i < primeERC20s.length; i++) { + if (rotations[primeERC20s[i]] != IAsset(address(0))) { + primeERC20s[i] = IERC20(address(rotations[primeERC20s[i]].erc20())); + newBasket = true; + } + + uniqueTargetNames.add(targetNames[i]); + } + if (newBasket) proxy.basketHandler.forceSetPrimeBasket(primeERC20s, targetAmts); + + // Rotate ERC20s in backup configs + while (uniqueTargetNames.length() != 0) { + bytes32 targetName = uniqueTargetNames.at(0); + uniqueTargetNames.remove(targetName); + + (IERC20[] memory backupERC20s, uint256 max) = TestIBasketHandler( + address(proxy.basketHandler) + ).getBackupConfig(targetName); + + // Rotate backupERC20s + bool newBackup; + for (uint256 i = 0; i < backupERC20s.length; i++) { + if (rotations[backupERC20s[i]] != IAsset(address(0))) { + backupERC20s[i] = IERC20(address(rotations[backupERC20s[i]].erc20())); + newBackup = true; + } + } + if (newBackup) proxy.basketHandler.setBackupConfig(targetName, max, backupERC20s); + } + + // Unregister TUSD if registered -- oracle is fully offline as of at least May 4th, 2024 + if ( + proxy.assetRegistry.isRegistered(IERC20(0x0000000000085d4780B73119b644AE5ecd22b376)) + ) { + proxy.assetRegistry.unregister(IAsset(0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2)); + } + + // Refresh basket + proxy.basketHandler.refreshBasket(); + require(proxy.basketHandler.status() == CollateralStatus.SOUND, "basket not sound"); + } + + // Rotate timelocks + main.grantRole(MAIN_OWNER_ROLE, address(newGov.timelock)); + assert(main.hasRole(MAIN_OWNER_ROLE, address(newGov.timelock))); + main.revokeRole(MAIN_OWNER_ROLE, address(msg.sender)); + assert(!main.hasRole(MAIN_OWNER_ROLE, address(msg.sender))); + + // Renounce adminship + main.renounceRole(MAIN_OWNER_ROLE, address(this)); + assert(!main.hasRole(MAIN_OWNER_ROLE, address(this))); + } + + // Cast once-per-rToken. Caller MUST be the (new) timelock owning Main. + /// @param rToken The RToken to upgrade + /// @dev Requirement: this contract has admin of RToken via MAIN_OWNER_ROLE + /// @dev Assumption: all reward tokens claimed and no surplus balances above minTradeVolume + /// @dev Warning: after casting an RToken may lose access to rewards earned by <3.4.0 assets + function castSpell2(IRToken rToken) external { + require(oneCast[rToken], "step 1 not cast"); + + // Can only cast once + require(!twoCast[rToken], "repeat cast"); + twoCast[rToken] = true; + + IMain main = rToken.main(); + require(main.hasRole(MAIN_OWNER_ROLE, msg.sender), "caller does not own Main"); + require(main.hasRole(MAIN_OWNER_ROLE, address(this)), "must be owner of Main"); + + IAssetRegistry assetRegistry = main.assetRegistry(); + IBasketHandler basketHandler = main.basketHandler(); + Registry memory reg = assetRegistry.getRegistry(); + require(basketHandler.fullyCollateralized(), "not fully collateralized"); + + // Unregister rotated and <3.4.0 collateral not in the reference basket + // Warning: it is possible in principle that a <3.3.0 asset that earns rewards does not + // contain a call to `erc20.claimRewards()` in its own claimRewards() function. + for (uint256 i = 0; i < reg.erc20s.length; i++) { + IERC20 erc20 = reg.erc20s[i]; + if (!reg.assets[i].isCollateral()) continue; // skip pure assets + + if ( + rotations[erc20] != IAsset(address(0)) || + (assets[erc20] == IAsset(address(0)) && basketHandler.quantity(erc20) == 0) + ) { + assetRegistry.unregister(reg.assets[i]); + } + } + + require(basketHandler.status() == CollateralStatus.SOUND, "basket not sound"); + // check we did not unregister anything in the basket + + // Renounce adminship + main.renounceRole(MAIN_OWNER_ROLE, address(this)); + assert(!main.hasRole(MAIN_OWNER_ROLE, address(this))); + } +} diff --git a/scripts/addresses/1-tmp-assets-collateral.json b/scripts/addresses/1-tmp-assets-collateral.json index e8bb4eddab..64e267f254 100644 --- a/scripts/addresses/1-tmp-assets-collateral.json +++ b/scripts/addresses/1-tmp-assets-collateral.json @@ -52,10 +52,10 @@ "sFRAX": "0x0b7DcCBceA6f985301506D575E2661bf858CdEcC", "saEthUSDC": "0x00F820794Bda3fb01E5f159ee1fF7c8409fca5AB", "saEthPyUSD": "0x58a41c87f8C65cf21f961b570540b176e408Cf2E", - "bbUSDT": "0x3017d881724D93783e7f065Cc5F62c81C62c36A0", - "steakUSDC": "0x4895b9aee383b5dec499F54172Ccc7Ee05FC8Bbc", - "steakPYUSD": "0xBd01C789Be742688fb73F6aE46f1320196B6c973", - "Re7WETH": "0x3421d2cB19c8E69c6FA642C43e60cD943e75Ca8b", + "bbUSDT": "0x01355C7439982c57cF89CA9785d211806f866224", + "steakUSDC": "0x565CBc99EE04667581c7f3459561fCaf1CF68602", + "steakPYUSD": "0x23f06D5Fe858B18CD064A5D95054e8ae8536094a", + "Re7WETH": "0xa0a6C06e45437d4Ae1D778AaeB4605AC2B62A870", "cvxCrvUSDUSDC": "0x9Fc0F31e2D26C437461a9eEBfe858d17e2611Ea5", "cvxCrvUSDUSDT": "0x69c6597690B8Df61D15F201519C03725bdec40c1", "sfrxETH": "0x4c891fCa6319d492866672E3D2AfdAAA5bDcfF67" diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index a1babf1a77..154dc6ac77 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -216,30 +216,30 @@ async function main() { ], 'contracts/plugins/assets/NonFiatCollateral.sol:NonFiatCollateral' ) + } - /********************** Verify SelfReferentialCollateral - WETH ****************************************/ - const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr - const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% + /********************** Verify SelfReferentialCollateral - WETH ****************************************/ + const ethOracleTimeout = baseL2Chains.includes(hre.network.name) ? 1200 : 3600 // 20 min (Base) or 1 hr + const ethOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.0015') : fp('0.005') // 0.15% (Base) or 0.5% - await verifyContract( - chainId, - deployments.collateral.WETH, - [ - { - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: ethOracleError.toString(), // 0.5% - erc20: networkConfig[chainId].tokens.WETH, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: ethOracleTimeout, - targetName: hre.ethers.utils.formatBytes32String('ETH'), - defaultThreshold: '0', - delayUntilDefault: '0', - }, - ], - 'contracts/plugins/assets/SelfReferentialCollateral.sol:SelfReferentialCollateral' - ) - } + await verifyContract( + chainId, + deployments.collateral.WETH, + [ + { + priceTimeout: priceTimeout.toString(), + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.ETH, + oracleError: ethOracleError.toString(), // 0.5% + erc20: networkConfig[chainId].tokens.WETH, + maxTradeVolume: fp('1e6').toString(), // $1m, + oracleTimeout: ethOracleTimeout, + targetName: hre.ethers.utils.formatBytes32String('ETH'), + defaultThreshold: '0', + delayUntilDefault: '0', + }, + ], + 'contracts/plugins/assets/SelfReferentialCollateral.sol:SelfReferentialCollateral' + ) } main().catch((error) => { diff --git a/scripts/whalesConfig.ts b/scripts/whalesConfig.ts index 1adf923ba4..986f13fa8d 100644 --- a/scripts/whalesConfig.ts +++ b/scripts/whalesConfig.ts @@ -1,5 +1,4 @@ -import { ITokens } from "#/common/configuration" -import fs from "fs" +import fs from 'fs' export interface Whales { [key: string]: string @@ -9,8 +8,8 @@ export interface Updated { } export interface NetworkWhales { - tokens: Whales - lastUpdated: Updated + tokens: Whales + lastUpdated: Updated } export interface RTokens { @@ -45,13 +44,14 @@ export const RTOKENS: RTokens = { '0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff'.toLowerCase(), // bsdETH '0xfE0D6D83033e313691E96909d2188C150b834285'.toLowerCase(), // iUSDC '0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d'.toLowerCase(), // VAYA + '0x641B0453487C9D14c5df96d45a481ef1dc84e31f'.toLowerCase(), // MAAT ], // arbitrum '42161': [ '0x12275DCB9048680c4Be40942eA4D92c74C63b844'.toLowerCase(), // eUSD '0x18c14c2d707b2212e17d1579789fc06010cfca23'.toLowerCase(), // ETH+ '0x96a993f06951b01430523d0d5590192d650ebf3e'.toLowerCase(), // rgUSD - ] + ], } export function getWhalesFileName(chainId: string | number): string { @@ -62,4 +62,4 @@ export function getWhalesFile(chainId: string | number): NetworkWhales { const whalesFile = getWhalesFileName(chainId) const whales: NetworkWhales = JSON.parse(fs.readFileSync(whalesFile, 'utf8')) return whales -} \ No newline at end of file +} diff --git a/tasks/deployment/deploy-governor-anastasius.ts b/tasks/deployment/deploy-governor-anastasius.ts index 626e12ed9d..fe02065ae9 100644 --- a/tasks/deployment/deploy-governor-anastasius.ts +++ b/tasks/deployment/deploy-governor-anastasius.ts @@ -4,23 +4,38 @@ import { bn } from '../../common/numbers' task( 'deploy-governor-anastasius', - 'Deploy an instance of governor anastasius from an existing deployment of Governor Alexios' + 'Deploy an instance of governor anastasius from an existing deployment of Governor Alexios, with new timelock' ) - .addParam('governor', 'The previous governor, must be of type Alexios') + .addParam('alexios', 'The previous governor, must be of type Alexios') + .addParam('guardian', 'The guardian to be set on the timelock') .setAction(async (params, hre) => { + const [signer] = await hre.ethers.getSigners() const chainId = await getChainId(hre) - const oldGovernor = await hre.ethers.getContractAt('Governance', params.governor) - const timelock = await hre.ethers.getContractAt( - 'TimelockController', - await oldGovernor.timelock() + // Deploy new timelock + const TimelockFactory = await hre.ethers.getContractFactory('TimelockController') + const timelock = await TimelockFactory.deploy( + 259200, // 3 days + [], + [], + signer.address // will renounce after saving proposer/canceller/executor ) + console.log('Deployed a new TimelockController to: ', timelock.address) + + if (!(await timelock.hasRole(await timelock.TIMELOCK_ADMIN_ROLE(), timelock.address))) { + throw new Error('Timelock does not admin itself') + } + + // Deploy Anastasius + const oldGovernor = await hre.ethers.getContractAt('Governance', params.alexios) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await oldGovernor.token()) if ((await oldGovernor.name()) != 'Governor Alexios') throw new Error('Alexios only') let blocktime = 1 // arbitrum - if (chainId == 1 || chainId == 3 || chainId == 5) blocktime = 12 // mainnet - if (chainId == 8453 || chainId == 84531) blocktime = 2 // base + if (chainId == '1' || chainId == '3' || chainId == '5') blocktime = 12 // mainnet + if (chainId == '8453' || chainId == '84531') blocktime = 2 // base + + console.log(`Using blocktime of ${blocktime} seconds`) const votingDelay = await oldGovernor.votingDelay() const votingPeriod = await oldGovernor.votingPeriod() @@ -30,7 +45,7 @@ task( if (!(await oldGovernor.quorumDenominator()).eq(100)) throw new Error('quorumDenominator wrong') const GovernorAnastasiusFactory = await hre.ethers.getContractFactory('Governance') - const governorAnastasius = await GovernorAnastasiusFactory.deploy( + const anastasius = await GovernorAnastasiusFactory.deploy( stRSR.address, timelock.address, votingDelay.mul(blocktime), @@ -39,5 +54,16 @@ task( quorumNumerator ) - console.log('Deployed a new Governor Anastasius to: ', governorAnastasius.address) + console.log('Deployed a new Governor Anastasius to: ', anastasius.address) + + // Link timelock to Anastasius + await timelock.connect(signer).grantRole(await timelock.PROPOSER_ROLE(), anastasius.address) + await timelock.connect(signer).grantRole(await timelock.EXECUTOR_ROLE(), anastasius.address) + await timelock.connect(signer).grantRole(await timelock.CANCELLER_ROLE(), anastasius.address) + await timelock.connect(signer).grantRole(await timelock.CANCELLER_ROLE(), params.guardian) // guardian + await timelock + .connect(signer) + .renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), signer.address) + + console.log('Finished setting up timelock') }) diff --git a/tasks/deployment/deploy-spell.ts b/tasks/deployment/deploy-spell.ts new file mode 100644 index 0000000000..52aa7084e1 --- /dev/null +++ b/tasks/deployment/deploy-spell.ts @@ -0,0 +1,58 @@ +import { getChainId } from '../../common/blockchain-utils' +import { task, types } from 'hardhat/config' +import { Contract } from 'ethers' + +let spell: Contract + +task('deploy-spell', 'Deploys a spell by name') + // version is unusable as a param name + .addParam('semver', 'Semantic version string to deploy, such as "3.4.0"', '', types.string) + .addOptionalParam('noOutput', 'Suppress output', false, types.boolean) + .setAction(async (params, hre) => { + const [wallet] = await hre.ethers.getSigners() + + const chainId = await getChainId(hre) + const isMainnet = chainId === '1' + + const version = params.semver.replaceAll('.', '_') + const spellName = `Upgrade${version}` + + if (!params.noOutput) { + console.log( + `Deploying Spell ${spellName} to ${hre.network.name} with isMainnet ${isMainnet} and chainId (${chainId}) with burner account ${wallet.address}` + ) + } + + // Deploy Spell + const SpellFactory = await hre.ethers.getContractFactory(spellName) + spell = await SpellFactory.deploy(isMainnet) + + if (!params.noOutput) { + console.log( + `Deployed Spell ${spellName} to ${hre.network.name} with isMainnet ${isMainnet} and chainId (${chainId}): ${spell.address}` + ) + } + + // Uncomment to verify + if (!params.noOutput) { + console.log('sleeping 15s') + } + + // Sleep to ensure API is in sync with chain + await new Promise((r) => setTimeout(r, 15000)) // 15s + + /** ******************** Verify Spell ****************************************/ + console.time('Verifying Spell Implementation') + await hre.run('verify:verify', { + address: spell.address, + constructorArguments: [isMainnet], + contract: `contracts/spells/${version}.sol:Upgrade${version}`, + }) + console.timeEnd('Verifying Spell Implementation') + + if (!params.noOutput) { + console.log('verified') + } + + return { spell: spell.address } + }) diff --git a/tasks/deployment/deploy-timelock.ts b/tasks/deployment/deploy-timelock.ts new file mode 100644 index 0000000000..6479a671bd --- /dev/null +++ b/tasks/deployment/deploy-timelock.ts @@ -0,0 +1,44 @@ +import { task } from 'hardhat/config' + +task('deploy-timelock', 'Deploy an instance of a TimelockController') + .addParam('governor', 'The address to receive propose/execute access control on the timelock') + .addParam('guardian', 'The guardian to be set on the timelock') + .setAction(async (params, hre) => { + const [signer] = await hre.ethers.getSigners() + const TimelockFactory = await hre.ethers.getContractFactory('TimelockController') + const timelock = await TimelockFactory.deploy( + 259200, // 3 days + [params.governor], + [params.governor], + signer.address // will renounce after saving guardian + ) + console.log('Deployed a new TimelockController to: ', timelock.address) + + await timelock.connect(signer).grantRole(await timelock.CANCELLER_ROLE(), params.guardian) + await timelock + .connect(signer) + .renounceRole(await timelock.TIMELOCK_ADMIN_ROLE(), signer.address) + + console.log('Revoked admin role after granting CANCELLER_ROLE to guardian') + + if (!(await timelock.hasRole(await timelock.TIMELOCK_ADMIN_ROLE(), timelock.address))) { + throw new Error('Timelock does not admin itself') + } + if (await timelock.hasRole(await timelock.TIMELOCK_ADMIN_ROLE(), signer.address)) { + throw new Error('Timelock does not admin itself') + } + if (!(await timelock.hasRole(await timelock.PROPOSER_ROLE(), params.governor))) { + throw new Error('Governor does not have proposer role') + } + if (!(await timelock.hasRole(await timelock.EXECUTOR_ROLE(), params.governor))) { + throw new Error('Governor does not have executor role') + } + + console.time('Verifying TimelockController') + await hre.run('verify:verify', { + address: timelock.address, + constructorArguments: [259200, [params.governor], [params.governor], signer.address], + contract: '@openzeppelin/contracts/governance/TimelockController.sol:TimelockController', + }) + console.timeEnd('Verifying TimelockController') + }) diff --git a/tasks/index.ts b/tasks/index.ts index b595bfbebc..6fba90bae8 100644 --- a/tasks/index.ts +++ b/tasks/index.ts @@ -19,10 +19,13 @@ import './deployment/create-deployer-registry' import './deployment/deploy-facade-monitor' import './deployment/empty-wallet' import './deployment/cancel-tx' +import './deployment/deploy-spell' import './deployment/sign-msg' import './deployment/get-addresses' import './deployment/deploy-governor-anastasius' +import './deployment/deploy-timelock' import './upgrades/force-import' import './upgrades/validate-upgrade' import './validation/mint-tokens' import './validation/proposal-validator' +import './validation/spells/3.4.0' diff --git a/tasks/validation/.DS_Store b/tasks/validation/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..27e1500a2ddc5c72b3e665b87c70dbee3a466ea1 GIT binary patch literal 6148 zcmeHK%}T>S5T0$TO(;SS3Oz1(Em&Ffh?S@ zWV7QhGC=Rng%ONF;rQwOWuq`rAx2-rQ4(j9R_jfa%9V}Hs#A4p&W(SsX8t6YOtW4v zzM|Q=Qb}0YL3j}lXM_6oiApCyoDRpjAdZHZa(x-6k(%|?G>tM{>zjb%I_{v}n9n=y zc2jn`hl{41A04#NZg&?8*V)u8DIu}%mAGa5|z-im>bkb2M+Z6Nbw3G3EFg*Ae0t8 zi@8CJpa@fnXi9~>VhB@?erfYOi@8Bl4nnVt&#@~DdqWX=b@WS}4#G3YBQwAZEHh9x z(>nG4)9>&9%SAk62AF|=#ek^v{eBO(WP9t%=BU?7)LT>%%F7LYl%SzoG3HV$ZlG#G Yza#_EvzQx14+{SXXc~B627Z-+cW@(3y#N3J literal 0 HcmV?d00001 diff --git a/tasks/validation/mint-tokens.ts b/tasks/validation/mint-tokens.ts index 5d6c298cef..ee91484937 100644 --- a/tasks/validation/mint-tokens.ts +++ b/tasks/validation/mint-tokens.ts @@ -97,8 +97,9 @@ task('mint-tokens', 'Mints all the tokens to an address') } }) -task('give-rsr', 'Mints RSR to an address on a tenderly fork') +task('give-rsr', 'Mints RSR to an address') .addParam('address', 'Ethereum address to receive the tokens') + .addOptionalParam('amount', 'Amount of RSR to mint', fp('1e9').toString(), types.string) .setAction(async (params, hre) => { const chainId = await getChainId(hre) @@ -108,11 +109,13 @@ task('give-rsr', 'Mints RSR to an address on a tenderly fork') } const rsr = await hre.ethers.getContractAt('ERC20Mock', networkConfig[chainId].tokens.RSR!) - - const rsrWhale = '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1' + const rsrWhale = + chainId == '8453' + ? '0x95F04B5594e2a944CA91d56933D119841eeF9a99' + : '0x6bab6EB87Aa5a1e4A8310C73bDAAA8A5dAAd81C1' await whileImpersonating(hre, rsrWhale, async (signer) => { - await rsr.connect(signer).transfer(params.address, fp('1e9')) + await rsr.connect(signer).transfer(params.address, params.amount) }) - console.log(`1B RSR sent to ${params.address}`) + console.log(`${params.amount} RSR sent to ${params.address}`) }) diff --git a/tasks/validation/proposal-validator.ts b/tasks/validation/proposal-validator.ts index 72bd613e42..908ac9a8b0 100644 --- a/tasks/validation/proposal-validator.ts +++ b/tasks/validation/proposal-validator.ts @@ -8,18 +8,18 @@ import { fp } from '#/common/numbers' import { MAX_UINT256, TradeKind } from '#/common/constants' import { formatEther, formatUnits } from 'ethers/lib/utils' import { recollateralize, redeemRTokens } from './utils/rtokens' -import { claimRsrRewards } from './utils/rewards' +import { processRevenue } from './utils/rewards' import { pushOraclesForward } from './utils/oracles' import { passProposal, executeProposal, proposeUpgrade, stakeAndDelegateRsr, + unstakeAndWithdrawRsr, moveProposalToActive, voteProposal, } from './utils/governance' import { advanceTime, getLatestBlockNumber } from '#/utils/time' -import { test_proposal } from './test-proposal' import { HardhatRuntimeEnvironment } from 'hardhat/types' import { resetFork } from '#/utils/chain' import fs from 'fs' @@ -28,9 +28,10 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { BasketHandlerP1 } from '@typechain/BasketHandlerP1' import { RTokenP1 } from '@typechain/RTokenP1' import { StRSRP1Votes } from '@typechain/StRSRP1Votes' -import { MainP1 } from '@typechain/MainP1' import { IMain } from '@typechain/IMain' import { Whales, getWhalesFile } from '#/scripts/whalesConfig' +import { proposal_3_4_0_step_1, proposal_3_4_0_step_2 } from './proposals/3_4_0' +import { validateSubgraphURL, Network } from '#/utils/fork' interface Params { proposalid?: string @@ -39,7 +40,7 @@ interface Params { task('proposal-validator', 'Runs a proposal and confirms can fully rebalance + redeem + mint') .addParam('proposalid', 'the ID of the governance proposal', undefined) .setAction(async (params: Params, hre) => { - await resetFork(hre, Number(process.env.FORK_BLOCK)) + // await resetFork(hre, Number(process.env.FORK_BLOCK)) const chainId = await getChainId(hre) @@ -54,9 +55,7 @@ task('proposal-validator', 'Runs a proposal and confirms can fully rebalance + r } // make sure subgraph is configured - if (params.proposalid && !useEnv('SUBGRAPH_URL')) { - throw new Error('SUBGRAPH_URL required for subgraph queries') - } + if (params.proposalid) validateSubgraphURL(useEnv('FORK_NETWORK') as Network) console.log(`Network Block: ${await getLatestBlockNumber(hre)}`) @@ -64,7 +63,9 @@ task('proposal-validator', 'Runs a proposal and confirms can fully rebalance + r pid: params.proposalid, }) - const proposalData = JSON.parse(fs.readFileSync(`./tasks/validation/proposals/proposal-${params.proposalid}.json`, 'utf-8')) + const proposalData = JSON.parse( + fs.readFileSync(`./tasks/validation/proposals/proposal-${params.proposalid}.json`, 'utf-8') + ) await hre.run('recollateralize', { rtoken: proposalData.rtoken, governor: proposalData.governor, @@ -82,15 +83,91 @@ task('proposal-validator', 'Runs a proposal and confirms can fully rebalance + r await main.assetRegistry() ) const basketHandler = await hre.ethers.getContractAt( - 'IBasketHandler', + 'TestIBasketHandler', await main.basketHandler() ) + const backingManager = await hre.ethers.getContractAt( + 'IBackingManager', + await main.backingManager() + ) + const broker = await hre.ethers.getContractAt('IBroker', await main.broker()) + const distributor = await hre.ethers.getContractAt('IDistributor', await main.distributor()) + const furnace = await hre.ethers.getContractAt('IFurnace', await main.furnace()) + const stRSR = await hre.ethers.getContractAt('IStRSR', await main.stRSR()) + const rsrTrader = await hre.ethers.getContractAt('IRevenueTrader', await main.rsrTrader()) + const rTokenTrader = await hre.ethers.getContractAt('IRevenueTrader', await main.rTokenTrader()) await assetRegistry.refresh() if (!((await basketHandler.status()) == 0)) throw new Error('Basket is not SOUND') if (!(await basketHandler.fullyCollateralized())) { throw new Error('Basket is not fully collateralized') } - console.log('Basket is SOUND and fully collateralized!') + console.log('💪 Basket is SOUND and fully collateralized!') + console.log('\n', 'Basket:') + const [primeBasketERC20s] = await basketHandler.getPrimeBasket() + const [refBasketERC20s] = await basketHandler.quote(fp('1e18'), 0) + if (primeBasketERC20s.length != refBasketERC20s.length) { + throw new Error('Reference basket length != prime basket length') + } + for (let i = 0; i < primeBasketERC20s.length; i++) { + if (primeBasketERC20s[i] != refBasketERC20s[i]) { + throw new Error(`ref erc20 ${refBasketERC20s[i]} != prime erc20 ${primeBasketERC20s[i]}`) + } + const erc20 = await hre.ethers.getContractAt('IERC20Metadata', primeBasketERC20s[i]) + const asset = await hre.ethers.getContractAt( + 'IVersioned', + await assetRegistry.toAsset(primeBasketERC20s[i]) + ) + console.log( + ` ${i + 1}: ${await erc20.symbol()} ${await asset.version()} (${primeBasketERC20s[i]})` + ) + } + + console.log('\n', 'Core Contracts') + console.log(' - main:', await main.version()) + console.log(' - assetRegistry:', await assetRegistry.version()) + console.log(' - basketHandler:', await basketHandler.version()) + console.log(' - backingManager:', await backingManager.version()) + console.log(' - broker:', await broker.version()) + console.log(' - distributor:', await distributor.version()) + console.log(' - furnace:', await furnace.version()) + console.log(' - stRSR:', await stRSR.version()) + console.log(' - rsrTrader:', await rsrTrader.version()) + console.log(' - rTokenTrader:', await rTokenTrader.version()) + console.log(' - rToken:', await rToken.version()) + + const [erc20s, assets] = await assetRegistry.getRegistry() + console.log('\n', `Assets (${assets.length})`) + const targetNames: string[] = [] + for (let i = 0; i < assets.length; i++) { + const erc20 = await hre.ethers.getContractAt('IERC20Metadata', erc20s[i]) + const asset = await hre.ethers.getContractAt('IVersioned', assets[i]) + console.log(` - ${await erc20.symbol()}: ${await asset.version()}`) + + const coll = await hre.ethers.getContractAt('ICollateral', assets[i]) + if (!(await coll.isCollateral())) continue + + const targetName = await coll.targetName() + if (!targetNames.includes(targetName)) { + targetNames.push(targetName) + } + } + + for (const targetName of targetNames) { + const [backupERC20s] = await basketHandler.getBackupConfig(targetName) + console.log('\n', `Backup Config (${targetName})`) + for (let i = 0; i < backupERC20s.length; i++) { + const erc20 = await hre.ethers.getContractAt('IERC20Metadata', backupERC20s[i]) + const isRegistered = await assetRegistry.isRegistered(backupERC20s[i]) + + if (!isRegistered) { + console.log(` - ${await erc20.symbol()}: NOT REGISTERED`) + } else { + const assetAddr = await assetRegistry.toAsset(erc20.address) + const asset = await hre.ethers.getContractAt('IVersioned', assetAddr) + console.log(` - ${await erc20.symbol()}: ${await asset.version()} `) + } + } + } }) interface ProposeParams { @@ -100,9 +177,16 @@ interface ProposeParams { task('propose', 'propose a gov action') .addParam('pid', 'the ID of the governance proposal') .setAction(async (params: ProposeParams, hre) => { - const proposalData = JSON.parse(fs.readFileSync(`./tasks/validation/proposals/proposal-${params.pid}.json`, 'utf-8')) + const proposalData = JSON.parse( + fs.readFileSync(`./tasks/validation/proposals/proposal-${params.pid}.json`, 'utf-8') + ) - const proposal = await proposeUpgrade(hre, proposalData.rtoken, proposalData.governor, proposalData) + const proposal = await proposeUpgrade( + hre, + proposalData.rtoken, + proposalData.governor, + proposalData + ) if (proposal.proposalId != params.pid) { throw new Error(`Proposed Proposal ID does not match expected ID: ${params.pid}`) @@ -111,14 +195,19 @@ task('propose', 'propose a gov action') await moveProposalToActive(hre, proposalData.rtoken, proposalData.governor, proposal.proposalId) await voteProposal(hre, proposalData.rtoken, proposalData.governor, proposal.proposalId) await passProposal(hre, proposalData.governor, proposal.proposalId) - await executeProposal(hre, proposalData.rtoken, proposalData.governor, proposal.proposalId, proposal) + await executeProposal( + hre, + proposalData.rtoken, + proposalData.governor, + proposal.proposalId, + proposal + ) }) task('recollateralize') .addParam('rtoken', 'the address of the RToken being upgraded') .addParam('governor', 'the address of the OWNER of the RToken being upgraded') .setAction(async (params, hre) => { - const [tester] = await hre.ethers.getSigners() const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) // 2. Bring back to fully collateralized @@ -131,12 +220,11 @@ task('recollateralize') 'BackingManagerP1', await main.backingManager() ) - // const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) /* recollateralize */ + await advanceTime(hre, (await basketHandler.warmupPeriod()) + 1) await advanceTime(hre, (await backingManager.tradingDelay()) + 1) await pushOraclesForward(hre, params.rtoken, []) await recollateralize(hre, rToken.address, TradeKind.DUTCH_AUCTION).catch((e: Error) => { @@ -155,17 +243,11 @@ task('run-validations', 'Runs all validations') .setAction(async (params, hre) => { const [tester] = await hre.ethers.getSigners() const rToken = await hre.ethers.getContractAt('RTokenP1', params.rtoken) - - // 2. Bring back to fully collateralized const main = await hre.ethers.getContractAt('IMain', await rToken.main()) const basketHandler = await hre.ethers.getContractAt( 'BasketHandlerP1', await main.basketHandler() ) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) const chainId = await getChainId(hre) @@ -175,23 +257,26 @@ task('run-validations', 'Runs all validations') redeem */ // Give `tester` RTokens from a whale - const redeemAmt = fp('1e4') + const redeemAmt = fp('100') await whileImpersonating(hre, whales[params.rtoken.toLowerCase()], async (whaleSigner) => { await rToken.connect(whaleSigner).transfer(tester.address, redeemAmt) }) - if (!(await rToken.balanceOf(tester.address)).gte(redeemAmt)) throw new Error('missing R') + if (!(await rToken.balanceOf(tester.address)).gte(redeemAmt)) throw new Error('missing RToken') await runCheck_redeem(hre, tester, rToken.address, redeemAmt) /* - mint + mint the redeemed amount */ - await runCheck_mint(hre, fp('1e3'), tester, basketHandler, rToken) + const mintAmt = redeemAmt.mul(999).div(1000) + await runCheck_mint(hre, mintAmt, tester, basketHandler, rToken) /* claim rewards */ - await claimRsrRewards(hre, params.rtoken) + + await rToken.connect(tester).transfer(await main.rsrTrader(), mintAmt.div(10)) + await processRevenue(hre, params.rtoken) await pushOraclesForward(hre, params.rtoken, []) @@ -210,13 +295,12 @@ const runCheck_stakeUnstake = async ( ) => { const chainId = await getChainId(hre) const whales = getWhalesFile(chainId).tokens - // get RSR const stakeAmount = fp('4e6') const rsr = await hre.ethers.getContractAt('StRSRP1Votes', await main.rsr()) await whileImpersonating( hre, - whales[networkConfig['1'].tokens.RSR!.toLowerCase()], + whales[networkConfig[chainId].tokens.RSR!.toLowerCase()], async (rsrSigner) => { await rsr.connect(rsrSigner).transfer(tester.address, stakeAmount) } @@ -230,6 +314,11 @@ const runCheck_stakeUnstake = async ( expect(await rsr.balanceOf(stRSR.address)).to.equal(balPrevRSR.add(testerBal)) expect(await stRSR.balanceOf(tester.address)).to.be.gt(balPrevStRSR) + + // Unstake and withdraw + await unstakeAndWithdrawRsr(hre, rToken.address, tester.address) + + console.log('Successfully staked and unstaked RSR') } const runCheck_redeem = async ( @@ -249,11 +338,11 @@ const runCheck_mint = async ( rToken: RTokenP1 ) => { console.log(`\nIssuing ${formatEther(issueAmt)} RTokens...`) - const [erc20s] = await basketHandler.quote(fp('1'), 0) - for (const e of erc20s) { + const [erc20s] = await basketHandler.quote(fp('1'), 2) + for (let i = 0; i < erc20s.length; i++) { const erc20 = await hre.ethers.getContractAt( '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', - e + erc20s[i] ) await erc20.connect(signer).approve(rToken.address, MAX_UINT256) // max approval } @@ -273,32 +362,30 @@ const runCheck_mint = async ( console.log('Successfully minted RTokens') } -import { proposal_3_4_0_step_1 } from './proposals/3_4_0' - task('print-proposal') .addParam('rtoken', 'the address of the RToken being upgraded') .addParam('gov', 'the address of the OWNER of the RToken being upgraded') .addParam('time', 'the address of the timelock') .setAction(async (params, hre) => { - const proposal = await proposal_3_4_0_step_1(hre, params.rtoken, params.gov, params.time) + const proposal = await proposal_3_4_0_step_2(hre, params.rtoken, params.gov, params.time) console.log(`\nGenerating and proposing proposal...`) const [tester] = await hre.ethers.getSigners() - + await hre.run('give-rsr', { address: tester.address }) await stakeAndDelegateRsr(hre, params.rtoken, tester.address) - + const governor = await hre.ethers.getContractAt('Governance', params.gov) - + const call = await governor.populateTransaction.propose( proposal.targets, proposal.values, proposal.calldatas, proposal.description ) - + console.log(`Proposal Transaction:\n`, call.data) - + const r = await governor.propose( proposal.targets, proposal.values, @@ -306,11 +393,14 @@ task('print-proposal') proposal.description ) const resp = await r.wait() - + console.log('\nSuccessfully proposed!') console.log(`Proposal ID: ${resp.events![0].args!.proposalId}`) - + proposal.proposalId = resp.events![0].args!.proposalId.toString() - fs.writeFileSync(`./tasks/validation/proposals/proposal-${proposal.proposalId}.json`, JSON.stringify(proposal, null, 2)) - }) \ No newline at end of file + fs.writeFileSync( + `./tasks/validation/proposals/proposal-${proposal.proposalId}.json`, + JSON.stringify(proposal, null, 2) + ) + }) diff --git a/tasks/validation/proposals/3_4_0.ts b/tasks/validation/proposals/3_4_0.ts index b28a3838dc..959df2f770 100644 --- a/tasks/validation/proposals/3_4_0.ts +++ b/tasks/validation/proposals/3_4_0.ts @@ -1,51 +1,26 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types' -import { ProposalBuilder, buildProposal } from '../utils/governance' +import { buildProposal } from '../utils/governance' import { Proposal } from '#/utils/subgraph' -import { getDeploymentFile, getDeploymentFilename, IDeployments } from '#/scripts/deployment/common' -import { bn } from '#/common/numbers' -const EXECUTOR_ROLE = '0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63' -const PROPOSER_ROLE = '0xb09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc1' +export const MAIN_OWNER_ROLE = '0x4f574e4552000000000000000000000000000000000000000000000000000000' +export const TIMELOCK_ADMIN_ROLE = + '0x5f58e3a2316349923ce3780f8d587db2d72378aed66a8261c916544fa6846ca5' +export const EXECUTOR_ROLE = '0xd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63' +export const PROPOSER_ROLE = '0xb09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc1' +export const CANCELLER_ROLE = '0xfd643c72710c63c0180259aba6b2d05451e3591a24e58b62239378085726f783' -// RToken address => Governor Anastasius address -export const GOVERNOR_ANASTASIUSES: { [key: string]: string } = { - '0xCc7FF230365bD730eE4B352cC2492CEdAC49383e': '0x5ef74a083ac932b5f050bf41cde1f67c659b4b88', - '0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff': '0x8A11D590B32186E1236B5E75F2d8D72c280dc880', - '0xfE0D6D83033e313691E96909d2188C150b834285': '0xaeCa35F0cB9d12D68adC4d734D4383593F109654', - '0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d': '0xC8f487B34251Eb76761168B70Dc10fA38B0Bd90b', - '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F': '0xfa4Cc3c65c5CCe085Fc78dD262d00500cf7546CD', - '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8': '0x991c13ff5e8bd3FFc59244A8cF13E0253C78d2bD', - '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be': '0xb79434b4778E5C1930672053f4bE88D11BbD1f97', - '0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b': '0x6814F3489cbE3EB32b27508a75821073C85C12b7', - '0x0d86883FAf4FfD7aEb116390af37746F45b6f378': '0x16a0F420426FD102a85A7CcA4BA25f6be1E98cFc', - '0x78da5799CF427Fee11e9996982F4150eCe7a99A7': '0xE5D337258a1e8046fa87Ca687e3455Eb8b626e1F', -} - -// some RTokens are on 1 week and some 2 week -const ONE_WEEK_REWARD_RATIO = '1146076687500' -const TWO_WEEK_REWARD_RATIO = '573038343750' - -export const proposal_3_4_0_step_1: ProposalBuilder = async ( +// Step 1: Upgrade all core contracts and assets +export const proposal_3_4_0_step_1 = async ( hre: HardhatRuntimeEnvironment, rTokenAddress: string, governorAddress: string, - timelockAddress?: string + timelockAddress: string, + spellAddress: string ): Promise => { - const deploymentFilename = getDeploymentFilename(1) // mainnet only - const deployments = getDeploymentFile(deploymentFilename) - console.log(deployments.implementations.components) - // Confirm old governor is Alexios const alexios = await hre.ethers.getContractAt('Governance', governorAddress) if ((await alexios.name()) != 'Governor Alexios') throw new Error('Governor Alexios only') - // Confirm a Governor Anastasius exists - const anastasius = await hre.ethers.getContractAt( - 'Governance', - GOVERNOR_ANASTASIUSES[rTokenAddress] - ) - if ((await anastasius.name()) != 'Governor Anastasius') throw new Error('configuration error') - // Validate timelock is controlled by governance if (!timelockAddress) throw new Error('missing timelockAddress') const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) @@ -53,71 +28,16 @@ export const proposal_3_4_0_step_1: ProposalBuilder = async ( throw new Error('missing EXECUTOR_ROLE') if (!(await timelock.hasRole(PROPOSER_ROLE, governorAddress))) throw new Error('missing PROPOSER_ROLE') + // it might be missing CANCELLER_ROLE, that's ok const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const assetRegistry = await hre.ethers.getContractAt( - 'AssetRegistryP1', - await main.assetRegistry() - ) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - const basketHandler = await hre.ethers.getContractAt( - 'BasketHandlerP1', - await main.basketHandler() - ) - const broker = await hre.ethers.getContractAt('BrokerP1', await main.broker()) - const distributor = await hre.ethers.getContractAt('DistributorP1', await main.distributor()) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) - const rsrTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rsrTrader()) - const rTokenTrader = await hre.ethers.getContractAt('RevenueTraderP1', await main.rTokenTrader()) + const spell = await hre.ethers.getContractAt('Upgrade3_4_0', spellAddress) // Build proposal const txs = [ - await main.populateTransaction.upgradeTo(deployments.implementations.main), - await assetRegistry.populateTransaction.upgradeTo( - deployments.implementations.components.assetRegistry - ), - await backingManager.populateTransaction.upgradeTo( - deployments.implementations.components.backingManager - ), - await basketHandler.populateTransaction.upgradeTo( - deployments.implementations.components.basketHandler - ), - await broker.populateTransaction.upgradeTo(deployments.implementations.components.broker), - await distributor.populateTransaction.upgradeTo( - deployments.implementations.components.distributor - ), - await furnace.populateTransaction.upgradeTo(deployments.implementations.components.furnace), - await rsrTrader.populateTransaction.upgradeTo(deployments.implementations.components.rsrTrader), - await rTokenTrader.populateTransaction.upgradeTo( - deployments.implementations.components.rTokenTrader - ), - await stRSR.populateTransaction.upgradeTo(deployments.implementations.components.stRSR), - await rToken.populateTransaction.upgradeTo(deployments.implementations.components.rToken), - await broker.populateTransaction.cacheComponents(), - await backingManager.populateTransaction.cacheComponents(), - await distributor.populateTransaction.cacheComponents(), - await rTokenTrader.populateTransaction.cacheComponents(), - await rsrTrader.populateTransaction.cacheComponents(), - await broker.populateTransaction.setDutchTradeImplementation( - deployments.implementations.trading.dutchTrade - ), - await broker.populateTransaction.setBatchTradeImplementation( - deployments.implementations.trading.gnosisTrade - ), - await furnace.populateTransaction.setRatio(TWO_WEEK_REWARD_RATIO), - await stRSR.populateTransaction.setRewardRatio(TWO_WEEK_REWARD_RATIO), - // TODO - // plugin rotation - - await timelock.populateTransaction.grantRole(EXECUTOR_ROLE, anastasius.address), - await timelock.populateTransaction.grantRole(PROPOSER_ROLE, anastasius.address), - await timelock.populateTransaction.revokeRole(EXECUTOR_ROLE, alexios.address), - await timelock.populateTransaction.grantRole(PROPOSER_ROLE, alexios.address), + await main.populateTransaction.grantRole(MAIN_OWNER_ROLE, spell.address), + await spell.populateTransaction.castSpell1(rTokenAddress), ] const description = '3.4.0 Upgrade (1/2) - Core Contracts + Plugins' @@ -125,45 +45,41 @@ export const proposal_3_4_0_step_1: ProposalBuilder = async ( return buildProposal(txs, description) } -export const proposal_3_4_0_step_2: ProposalBuilder = async ( +// Step 2: After rebalancing, unregister all +export const proposal_3_4_0_step_2 = async ( hre: HardhatRuntimeEnvironment, rTokenAddress: string, - governorAddress: string, - timelockAddress?: string + newGovernorAddress: string, + newTimelockAddress: string, + spellAddress: string ): Promise => { // Confirm governor is now Anastasius - const anastasius = await hre.ethers.getContractAt('Governance', governorAddress) + const anastasius = await hre.ethers.getContractAt('Governance', newGovernorAddress) if ((await anastasius.name()) != 'Governor Anastasius') throw new Error('step one incomplete') - // Validate timelock is controlled by governance - if (!timelockAddress) throw new Error('missing timelockAddress') - const timelock = await hre.ethers.getContractAt('TimelockController', timelockAddress) - if (!(await timelock.hasRole(EXECUTOR_ROLE, governorAddress))) + // Validate timelock is set up correctly + const timelock = await hre.ethers.getContractAt('TimelockController', newTimelockAddress) + if (!(await timelock.hasRole(TIMELOCK_ADMIN_ROLE, timelock.address))) { + throw new Error('timelock rekt') + } + if (!(await timelock.hasRole(EXECUTOR_ROLE, newGovernorAddress))) throw new Error('missing EXECUTOR_ROLE') - if (!(await timelock.hasRole(PROPOSER_ROLE, governorAddress))) + if (!(await timelock.hasRole(PROPOSER_ROLE, newGovernorAddress))) throw new Error('missing PROPOSER_ROLE') + if (!(await timelock.hasRole(CANCELLER_ROLE, newGovernorAddress))) + throw new Error('missing CANCELLER_ROLE') const rToken = await hre.ethers.getContractAt('RTokenP1', rTokenAddress) const main = await hre.ethers.getContractAt('MainP1', await rToken.main()) - const backingManager = await hre.ethers.getContractAt( - 'BackingManagerP1', - await main.backingManager() - ) - const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) - const furnace = await hre.ethers.getContractAt('FurnaceP1', await main.furnace()) + const spell = await hre.ethers.getContractAt('Upgrade3_4_0', spellAddress) // Build proposal const txs = [ - await backingManager.populateTransaction.setTradingDelay(0), - await furnace.populateTransaction.setRatio(ONE_WEEK_REWARD_RATIO), - await stRSR.populateTransaction.setRewardRatio(ONE_WEEK_REWARD_RATIO), - await rToken.populateTransaction.setIssuanceThrottleParams({ - amtRate: bn('2e24'), - pctRate: bn('1e17'), - }), + await main.populateTransaction.grantRole(MAIN_OWNER_ROLE, spell.address), + await spell.populateTransaction.castSpell2(rTokenAddress), ] - const description = '3.4.0 Upgrade (2/2) - Parameters' + const description = '3.4.0 Upgrade (2/2) - Cleanup' return buildProposal(txs, description) -} \ No newline at end of file +} diff --git a/tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json b/tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json deleted file mode 100644 index 6743faf97e..0000000000 --- a/tasks/validation/proposals/proposal-19635069547141631801899721667815895344178432860995231621586111571059800714939.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "rtoken": "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F", - "governor": "0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6", - "targets": [ - "0x6d309297ddDFeA104A6E89a132e2f05ce3828e07", - "0x6d309297ddDFeA104A6E89a132e2f05ce3828e07" - ], - "values": [0, 0], - "calldatas": [ - "0xef2b9337000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e00000000000000000000000000000000000000000000000000000000000000004000000000000000000000000093cb4f405924a0c468b43209d5e466f1dd0ac7d000000000000000000000000fbd1a538f5707c0d67a16ca4e3fc711b80bd931a000000000000000000000000f650c3d88d12db855b8bf7d11be6c55a4e07dcc90000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000003782dace9d9000000000000000000000000000000000000000000000000000003782dace9d9000000000000000000000000000000000000000000000000000003782dace9d9000000000000000000000000000000000000000000000000000003782dace9d90000", - "0x8a55015b" - ], - "description": "Test proposal (swap dai into the basket)" -} \ No newline at end of file diff --git a/tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json b/tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json deleted file mode 100644 index bedb8078e1..0000000000 --- a/tasks/validation/proposals/proposal-57514285674680658177308923843884653494858997429824418248202790423910218544052.json +++ /dev/null @@ -1,85 +0,0 @@ -{ - "rtoken": "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F", - "governor": "0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6", - "timelock": "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", - "targets": [ - "0x7697aE4dEf3C3Cd52493Ba3a6F57fc6d8c59108a", - "0x9B85aC04A09c8C813c37de9B3d563C2D3F936162", - "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", - "0x6d309297ddDFeA104A6E89a132e2f05ce3828e07", - "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", - "0x8a77980f82A1d537600891D782BCd8bd41B85472", - "0x57084b3a6317bea01bA8f7c582eD033d9345c2B2", - "0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f", - "0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A", - "0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8", - "0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F", - "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", - "0xF014FEF41cCB703975827C8569a3f0940cFD80A4", - "0x8a77980f82A1d537600891D782BCd8bd41B85472", - "0x3d5EbB5399243412c7e895a7AA468c7cD4b1014A", - "0xE04C26F68E0657d402FA95377aa7a2838D6cBA6f", - "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", - "0x90EB22A31b69C29C34162E0E9278cc0617aA2B50", - "0x57084b3a6317bea01bA8f7c582eD033d9345c2B2", - "0x18ba6e33ceb80f077DEb9260c9111e62f21aE7B8", - "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", - "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", - "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c", - "0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c" - ], - "values": [ - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0, - 0 - ], - "calldatas": [ - "0x3659cfe600000000000000000000000024a4b37f9c40fb0e80ec436df2e9989fbafa8bb7", - "0x3659cfe6000000000000000000000000bf1c0206de440b2cf76ea4405e1dbf2fc227a463", - "0x3659cfe600000000000000000000000020c801869e578e71f2298649870765aa81f7dc69", - "0x3659cfe6000000000000000000000000ee7fc703f84ae2ce30475333c57e56d3a7d3adbc", - "0x3659cfe600000000000000000000000062bd44b05542bff1e59a01bf7151f533e1c9c12c", - "0x3659cfe600000000000000000000000044a42a0f14128e81a21c5fc4322a9f91ff83b4ee", - "0x3659cfe6000000000000000000000000845b8b0a1c6db8318414d708da25fa28d4a0dc81", - "0x3659cfe6000000000000000000000000c60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c", - "0x3659cfe6000000000000000000000000c60a7cd6fce24d0c3637a1dcbc8b0f9a9bff6a7c", - "0x3659cfe6000000000000000000000000e433673648c94fec0706e5ac95d4f4097f58b5fb", - "0x3659cfe6000000000000000000000000784955641292b0014bc9ef82321300f0b6c7e36d", - "0x7162c797", - "0x7162c797", - "0x7162c797", - "0x7162c797", - "0x7162c797", - "0x2a6b85da000000000000000000000000971c890acb9eeb084f292996be667bb9a2889ae9", - "0x6e300590000000000000000000000000030c9b66ac089cb01aa2058fc8f7d9baddc9ae75", - "0x4f533b23000000000000000000000000000000000000000000000000000000856bbf3646", - "0xd7ccc275000000000000000000000000000000000000000000000000000000856bbf3646", - "0x2f2ff15dd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e63000000000000000000000000fa4cc3c65c5cce085fc78dd262d00500cf7546cd", - "0x2f2ff15db09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc1000000000000000000000000fa4cc3c65c5cce085fc78dd262d00500cf7546cd", - "0xd547741fd8aa0f3194971a2a116679f7c2090f6939c8d4e01a2a8d7e41d55e5351469e630000000000000000000000007e880d8bd9c9612d6a9759f96acd23df4a4650e6", - "0x2f2ff15db09aa5aeb3702cfd50b6b62bc4532604938f21248a27a1d5ca736082b6819cc10000000000000000000000007e880d8bd9c9612d6a9759f96acd23df4a4650e6" - ], - "description": "3.4.0 Upgrade (1/2) - Core Contracts + Plugins", - "proposalId": "57514285674680658177308923843884653494858997429824418248202790423910218544052" -} \ No newline at end of file diff --git a/tasks/validation/spells/3.4.0.ts b/tasks/validation/spells/3.4.0.ts new file mode 100644 index 0000000000..55ea242257 --- /dev/null +++ b/tasks/validation/spells/3.4.0.ts @@ -0,0 +1,129 @@ +import fs from 'fs' +import { task } from 'hardhat/config' +import { BigNumber } from 'ethers' +import { useEnv } from '#/utils/env' +import { BASE_DEPLOYMENTS, MAINNET_DEPLOYMENTS } from '../utils/constants' +import { resetFork } from '#/utils/chain' +import { + proposal_3_4_0_step_1, + proposal_3_4_0_step_2, + EXECUTOR_ROLE, + PROPOSER_ROLE, + CANCELLER_ROLE, + MAIN_OWNER_ROLE, +} from '../proposals/3_4_0' + +// Use this once to serialize a proposal +task('3.4.0', 'Upgrade to 3.4.0').setAction(async (params, hre) => { + const network = useEnv('FORK_NETWORK').toLowerCase() + + const deployments = network == 'base' ? BASE_DEPLOYMENTS : MAINNET_DEPLOYMENTS + for (const deployment of deployments) { + // reset fork + await resetFork(hre, Number(process.env.FORK_BLOCK)) + + const rToken = await hre.ethers.getContractAt('RTokenP1', deployment.rToken) + console.log( + '\n', + `/***** 3.4.0 Upgrade - RToken: ${await rToken.symbol()} - Address: ${rToken.address} ****/` + ) + + const spellAddr = + network == 'base' + ? '0x1744c9933feb8e76563fce63d5c95a4e7f967c2a' + : '0xB1Df3a104D73FF86F9AAaB60B491A5c44b090391' + const spell = await hre.ethers.getContractAt('Upgrade3_4_0', spellAddr) + + console.log('Part 1') + + const alexios = await hre.ethers.getContractAt('Governance', deployment.governor) + const step1 = await proposal_3_4_0_step_1( + hre, + deployment.rToken, + alexios.address, + deployment.timelock, + spell.address + ) + step1.rtoken = deployment.rToken + step1.governor = alexios.address + step1.timelock = deployment.timelock + + let descHash = hre.ethers.utils.keccak256(hre.ethers.utils.toUtf8Bytes(step1.description)) + step1.proposalId = BigNumber.from( + await alexios.hashProposal(step1.targets, step1.values, step1.calldatas, descHash) + ).toString() + + fs.writeFileSync( + `./tasks/validation/proposals/proposal-${step1.proposalId}.json`, + JSON.stringify(step1, null, 4) + ) + + await hre.run('proposal-validator', { + proposalid: step1.proposalId, + }) + + const [anastasiusAddr, newTimelockAddr] = await spell.newGovs(deployment.rToken) + console.log(`New governor: ${anastasiusAddr}, new timelock: ${newTimelockAddr}`) + + const newTimelock = await hre.ethers.getContractAt('TimelockController', newTimelockAddr) + const anastasius = await hre.ethers.getContractAt('Governance', anastasiusAddr) + + if ( + (await newTimelock.hasRole(PROPOSER_ROLE, alexios.address)) || + (await newTimelock.hasRole(EXECUTOR_ROLE, alexios.address)) || + (await newTimelock.hasRole(CANCELLER_ROLE, alexios.address)) + ) { + throw new Error('governor rekt') + } + + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + if ( + (await main.hasRole(MAIN_OWNER_ROLE, spell.address)) || + (await main.hasRole(MAIN_OWNER_ROLE, deployment.timelock)) || + !(await main.hasRole(MAIN_OWNER_ROLE, newTimelock.address)) + ) { + throw new Error('RToken rekt') + } + if ((await rToken.version()) != '3.4.0') throw new Error('Failed to upgrade to 3.4.0') + + // All registered collateral should be SOUND + const assetRegistry = await hre.ethers.getContractAt( + 'AssetRegistryP1', + await main.assetRegistry() + ) + const [, assets] = await assetRegistry.getRegistry() + for (const asset of assets) { + const coll = await hre.ethers.getContractAt('ICollateral', asset) + if ((await coll.isCollateral()) && (await coll.status()) != 0) { + throw new Error(`coll ${coll.address} is not SOUND: ${await coll.status()}`) + } + } + + console.log('Part 2') + const step2 = await proposal_3_4_0_step_2( + hre, + deployment.rToken, + anastasius.address, + newTimelock.address, + spell.address + ) + + step2.rtoken = deployment.rToken + step2.governor = anastasius.address + step2.timelock = newTimelock.address + + descHash = hre.ethers.utils.keccak256(hre.ethers.utils.toUtf8Bytes(step2.description)) + step2.proposalId = BigNumber.from( + await anastasius.hashProposal(step2.targets, step2.values, step2.calldatas, descHash) + ).toString() + + fs.writeFileSync( + `./tasks/validation/proposals/proposal-${step2.proposalId}.json`, + JSON.stringify(step2, null, 4) + ) + + await hre.run('proposal-validator', { + proposalid: step2.proposalId, + }) + } +}) diff --git a/tasks/validation/utils/constants.ts b/tasks/validation/utils/constants.ts index 8b05f23458..d641965d2a 100644 --- a/tasks/validation/utils/constants.ts +++ b/tasks/validation/utils/constants.ts @@ -44,3 +44,70 @@ export const collateralToUnderlying: { [key: string]: string } = { [networkConfig['1'].tokens.saEthUSDC!.toLowerCase()]: networkConfig['1'].tokens.aEthUSDC!.toLowerCase(), } + +export interface RTokenDeployment { + rToken: string + governor: string + timelock: string +} + +export const MAINNET_DEPLOYMENTS: RTokenDeployment[] = [ + { + rToken: '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F', // eUSD + governor: '0x7e880d8bD9c9612D6A9759F96aCD23df4A4650E6', + timelock: '0xc8Ee187A5e5c9dC9b42414Ddf861FFc615446a2c', + }, + { + rToken: '0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8', // ETH+ + governor: '0x239cDcBE174B4728c870A24F77540dAB3dC5F981', + timelock: '0x5f4A10aE2fF68bE3cdA7d7FB432b10C6BFA6457B', + }, + { + rToken: '0xaCdf0DBA4B9839b96221a8487e9ca660a48212be', // hyUSD (mainnet) + governor: '0x22d7937438b4bBf02f6cA55E3831ABB94Bd0b6f1', + timelock: '0x624f9f076ED42ba3B37C3011dC5a1761C2209E1C', + }, + { + rToken: '0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b', // USDC+ + governor: '0xc837C557071D604bCb1058c8c4891ddBe8FDD630', + timelock: '0x6C957417cB6DF6e821eec8555DEE8b116C291999', + }, + { + rToken: '0x0d86883FAf4FfD7aEb116390af37746F45b6f378', // USD3 + governor: '0x020CB71181008369C388CaAEE98b0E69f8F4C471', + timelock: '0xE0289984F709fc7150E646B672bfaDC879a15f14', + }, + { + rToken: '0x78da5799CF427Fee11e9996982F4150eCe7a99A7', // rgUSD + governor: '0x409bAc94c4207C6627EA5f4E4FFB7128e8F654Fc', + timelock: '0x9aD9E73e38c8506a664A3A37e8A9CE910B6FBeb4', + }, +] + +export const BASE_DEPLOYMENTS: RTokenDeployment[] = [ + { + rToken: '0xCc7FF230365bD730eE4B352cC2492CEdAC49383e', // hyUSD (base) + governor: '0xc8e63d3501A246fa1ddBAbe4ad0B50e9d32aA8bb', + timelock: '0xf093d7f00f3dCe6d415Be564f41Cb4bc032fb367', + }, + { + rToken: '0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff', // bsdETH + governor: '0xB05C6a7242595f2E23CC6a0aB20699d63D0939Fd', + timelock: '0x321f7493B8B675dFfE2570Bd0F164237D445b9E8', + }, + { + rToken: '0xfE0D6D83033e313691E96909d2188C150b834285', // iUSDC - Assets skipped (USDbC) + governor: '0xfe637F7D5B848392c19052631d68F8AC859F71cF', + timelock: '0xd18ED37CA912bbf1EDE93d27459d03DC4343dea1', + }, + { + rToken: '0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d', // Vaya - Assets skipped (USDbC) + governor: '0xEb583EA06501f92E994C353aD2741A35582987aA', + timelock: '0xeE3eC997A37e661a42673D7A489Fbf0E5ed0C223', + }, + { + rToken: '0x641B0453487C9D14c5df96d45a481ef1dc84e31f', // MAAT + governor: '0x0f7f1442dA7F687BB877Fbee0539FA8D6e4d1a02', + timelock: '0xE67cEb03EfdF9B3fb5C3FeBF3103e2efd3a76A1b', + }, +] diff --git a/tasks/validation/utils/governance.ts b/tasks/validation/utils/governance.ts index 10b2057004..ac315df9cc 100644 --- a/tasks/validation/utils/governance.ts +++ b/tasks/validation/utils/governance.ts @@ -64,20 +64,22 @@ export const voteProposal = async ( if (!proposal) { // gather enough whale voters let whales: Array = await getDelegates(rtokenAddress.toLowerCase()) - const startBlock = await governor.proposalSnapshot(proposalId) - const quorum = await governor.quorum(startBlock) + const quorum = await governor.quorum(await governor.proposalSnapshot(proposalId)) let quorumNotReached = true let currentVoteAmount = BigNumber.from(0) let i = 0 while (quorumNotReached) { const whale = whales[i] + if (!whale) throw new Error(`missing whale at index ${i} for RToken ${rtokenAddress}`) currentVoteAmount = currentVoteAmount.add(BigNumber.from(whale.delegatedVotesRaw)) i += 1 + console.log(`Votes: ${currentVoteAmount} / ${quorum}`) if (currentVoteAmount.gt(quorum)) { quorumNotReached = false } } + if (quorumNotReached) throw new Error('quorum not reached') whales = whales.slice(0, i) @@ -168,12 +170,20 @@ export const executeProposal = async ( ** Executing proposals requires that the oracles aren't stale. ** Make sure to specify any extra assets that may have been registered. */ + await pushOraclesForward(hre, rtokenAddress, []) console.log('Executing now...') // Execute - await governor.execute(proposal.targets, proposal.values, proposal.calldatas, descriptionHash) + const tx = await governor.execute( + proposal.targets, + proposal.values, + proposal.calldatas, + descriptionHash + ) + const receipt = await tx.wait() + console.log('Gas Used:', receipt.gasUsed.toString()) propState = await governor.state(proposalId) await validatePropState(propState, ProposalState.Executed) @@ -196,9 +206,28 @@ export const stakeAndDelegateRsr = async ( await whileImpersonating(hre, user, async (signer) => { const bal = await rsr.balanceOf(signer.address) - await rsr.approve(stRSR.address, bal) - await stRSR.stake(bal) - await stRSR.delegate(signer.address) + await rsr.connect(signer).approve(stRSR.address, bal) + await stRSR.connect(signer).stake(bal) + await stRSR.connect(signer).delegate(signer.address) + }) +} + +export const unstakeAndWithdrawRsr = async ( + hre: HardhatRuntimeEnvironment, + rtokenAddress: string, + user: string +) => { + const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const unstakingDelay = await stRSR.unstakingDelay() + + await whileImpersonating(hre, user, async (signer) => { + const bal = await stRSR.balanceOf(signer.address) + await stRSR.connect(signer).unstake(bal) + await advanceTime(hre, unstakingDelay + 2) + await pushOraclesForward(hre, rToken.address, []) // required to withdraw + await stRSR.connect(signer).withdraw(signer.address, 0) }) } @@ -230,7 +259,13 @@ export const proposeUpgrade = async ( console.log(`\nGenerating and proposing proposal...`) const [tester] = await hre.ethers.getSigners() - await hre.run('give-rsr', { address: tester.address }) + const rToken = await hre.ethers.getContractAt('IRToken', rTokenAddress) + const main = await hre.ethers.getContractAt('IMain', await rToken.main()) + const stRSR = await hre.ethers.getContractAt('StRSRP1Votes', await main.stRSR()) + const amount = (await stRSR.getStakeRSR()).div(100) // 1% increase in staked RSR + + // Stake and delegate + await hre.run('give-rsr', { address: tester.address, amount: amount.toString() }) await stakeAndDelegateRsr(hre, rTokenAddress, tester.address) const governor = await hre.ethers.getContractAt('Governance', governorAddress) diff --git a/tasks/validation/utils/logs.ts b/tasks/validation/utils/logs.ts index b79dbedb33..795481684b 100644 --- a/tasks/validation/utils/logs.ts +++ b/tasks/validation/utils/logs.ts @@ -45,6 +45,9 @@ const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.aEthPyUSD!.toLowerCase()]: 'aEthPyUSD', [networkConfig['1'].tokens.saEthPyUSD!.toLowerCase()]: 'saEthPyUSD', [networkConfig['1'].tokens.cUSDCv3!.toLowerCase()]: 'cUSDCv3', + [networkConfig['8453'].tokens.WETH!.toLowerCase()]: 'WETH', + [networkConfig['8453'].tokens.wstETH!.toLowerCase()]: 'wstETH', + [networkConfig['8453'].tokens.RSR!.toLowerCase()]: 'RSR', ['0xaa91d24c2f7dbb6487f61869cd8cd8afd5c5cab2'.toLowerCase()]: 'mrp-aUSDT', ['0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase()]: 'saUSDC', ['0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase()]: 'saUSDT', @@ -53,6 +56,29 @@ const tokens: { [key: string]: string } = { ['0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A'.toLowerCase()]: 'wcUSDCv3', ['0x3BECE5EC596331033726E5C6C188c313Ff4E3fE5'.toLowerCase()]: 'stkcvxeUSDFRAXBP', ['0x83f20f44975d03b1b09e64809b757c47f942beea'.toLowerCase()]: 'sDAI', + ['0xa8157BF67Fd7BcDCC139CB9Bf1bd7Eb921A779D3'.toLowerCase()]: 'saUSDC', + ['0x684AA4faf9b07d5091B88c6e0a8160aCa5e6d17b'.toLowerCase()]: 'saUSDT', + ['0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7'.toLowerCase()]: 'saEthPyUSD', + ['0x81697e25DFf8564d9E0bC6D27edb40006b34ea2A'.toLowerCase()]: 'stkcvxeUSDFRAXBP', + ['0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1'.toLowerCase()]: 'stkcvxeUSDFRAXBP', + ['0x093cb4f405924a0c468b43209d5e466f1dd0ac7d'.toLowerCase()]: 'saEthUSDC', + ['0x27F2f159Fe990Ba83D57f39Fd69661764BEbf37a'.toLowerCase()]: 'wcUSDCv3', + ['0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F'.toLowerCase()]: 'eUSD', + ['0xE72B141DF173b999AE7c1aDcbF60Cc9833Ce56a8'.toLowerCase()]: 'ETH+', + ['0xaCdf0DBA4B9839b96221a8487e9ca660a48212be'.toLowerCase()]: 'hyUSD (mainnnet)', + ['0xFc0B1EEf20e4c68B3DCF36c4537Cfa7Ce46CA70b'.toLowerCase()]: 'USDC+', + ['0x0d86883FAf4FfD7aEb116390af37746F45b6f378'.toLowerCase()]: 'USD3', + ['0x78da5799CF427Fee11e9996982F4150eCe7a99A7'.toLowerCase()]: 'rgUSD', + ['0xCc7FF230365bD730eE4B352cC2492CEdAC49383e'.toLowerCase()]: 'hyUSD (base)', + ['0xCb327b99fF831bF8223cCEd12B1338FF3aA322Ff'.toLowerCase()]: 'bsdETH', + ['0xfE0D6D83033e313691E96909d2188C150b834285'.toLowerCase()]: 'iUSDC', + ['0xC9a3e2B3064c1c0546D3D0edc0A748E9f93Cf18d'.toLowerCase()]: 'Vaya', + ['0x641B0453487C9D14c5df96d45a481ef1dc84e31f'.toLowerCase()]: 'MAAT', + ['0x093c07787920eb34a0a0c7a09823510725aee4af'.toLowerCase()]: 'wcUSDCv3', + ['0xa694f7177c6c839c951c74c797283b35d0a486c8'.toLowerCase()]: 'wcUSDCv3 (base)', + ['0x53f1df4e5591ae35bf738742981669c3767241fa'.toLowerCase()]: 'wcUSDCv3 (base)', + ['0x6f6f81e5e66f503184f2202d83a79650c3285759'.toLowerCase()]: 'saBasUSDC (base)', + ['0x184460704886f9f2a7f3a0c2887680867954dc6e'.toLowerCase()]: 'saBasUSDC (base)', } export const logToken = (tokenAddress: string) => { diff --git a/tasks/validation/utils/oracles.ts b/tasks/validation/utils/oracles.ts index e4bb0874b8..49c0a934a8 100644 --- a/tasks/validation/utils/oracles.ts +++ b/tasks/validation/utils/oracles.ts @@ -41,22 +41,29 @@ export const pushOraclesForward = async ( ) const registry = await assetRegistry.getRegistry() + let addresses: string[] = [] // hacky way to ensure only unique updates to save time for (const asset of registry.assets) { - await pushOracleForward(hre, asset) + addresses = await pushOracleForward(hre, asset, addresses) } for (const asset of extraAssets) { - await pushOracleForward(hre, asset) + await pushOracleForward(hre, asset, addresses) } } -export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: string) => { +export const pushOracleForward = async ( + hre: HardhatRuntimeEnvironment, + asset: string, + addresses: string[] +): Promise => { // Need to handle all oracle cases, ie targetUnitChainlinkFeed, PoolTokens, etc const updateAnswer = async (chainlinkFeed: AggregatorV3Interface) => { + if (addresses.indexOf(chainlinkFeed.address) != -1) return const initPrice = await chainlinkFeed.latestRoundData() const oracle = await overrideOracle(hre, chainlinkFeed.address) await oracle.updateAnswer(initPrice.answer) + addresses.push(chainlinkFeed.address) console.log('✅ Feed Updated:', chainlinkFeed.address) } @@ -84,6 +91,18 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s // console.error('❌ targetUnitChainlinkFeed not found for:', asset, 'skipping...') } + // targetPerRefChainlinkFeed, uoaPerTargetChainlinkFeed, refPerTokenChainlinkFeed + try { + const assetContractLido = await hre.ethers.getContractAt('L2LSDCollateral', asset) + const feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractLido.exchangeRateChainlinkFeed() + ) + await updateAnswer(feed) + } catch { + // console.error('❌ exchangeRateChainlinkFeed not found for:', asset, 'skipping...') + } + // targetPerRefChainlinkFeed, uoaPerTargetChainlinkFeed, refPerTokenChainlinkFeed try { const assetContractLido = await hre.ethers.getContractAt('L2LidoStakedEthCollateral', asset) @@ -102,6 +121,11 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s await assetContractLido.refPerTokenChainlinkFeed() ) await updateAnswer(feed) + feed = await hre.ethers.getContractAt( + 'AggregatorV3Interface', + await assetContractLido.exchangeRateChainlinkFeed() + ) + await updateAnswer(feed) } catch { // console.error('❌ targetPerRefChainlinkFeed, uoaPerTargetChainlinkFeed, or refPerTokenChainlinkFeed not found for:', asset, 'skipping...') } @@ -118,16 +142,31 @@ export const pushOracleForward = async (hre: HardhatRuntimeEnvironment, asset: s // console.error('❌ targetPerTokChainlinkFeed not found for:', asset, 'skipping...') } + // Dealing with nested RTokens // TODO do better - // Problem: The feeds on PoolTokens are internal immutable. Not in storage nor are there getters. - // Workaround solution: hard-code oracles for FRAX for eUSDFRAXBP; USDC is registered as backup - if (asset == '0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122') { + + // eUSDFRAXBP + if ( + asset == '0x890FAa00C16EAD6AA76F18A1A7fe9C40838F9122' || + asset == '0x5cD176b58a6FdBAa1aEFD0921935a730C62f03Ac' || + asset == '0x994455cE66Fd984e2A0A0aca453e637810a8f032' + ) { const feed = await hre.ethers.getContractAt( 'AggregatorV3Interface', networkConfig['1'].chainlinkFeeds.FRAX! ) await updateAnswer(feed) + const eUSDAssetRegistry = await hre.ethers.getContractAt( + 'IAssetRegistry', + '0x9B85aC04A09c8C813c37de9B3d563C2D3F936162' + ) + const [, eUSDAssets] = await eUSDAssetRegistry.getRegistry() + for (const eUSDAsset of eUSDAssets) { + addresses = await pushOracleForward(hre, eUSDAsset, addresses) // recursion! + } } + + return addresses } export const setOraclePrice = async ( diff --git a/tasks/validation/utils/rewards.ts b/tasks/validation/utils/rewards.ts index 8213618a08..5abd4ddb29 100644 --- a/tasks/validation/utils/rewards.ts +++ b/tasks/validation/utils/rewards.ts @@ -1,6 +1,4 @@ -import { fp } from '#/common/numbers' import { TradeKind } from '#/common/constants' -import { whileImpersonating } from '#/utils/impersonation' import { advanceBlocks, advanceTime } from '#/utils/time' import { IRewardable } from '@typechain/IRewardable' import { formatEther } from 'ethers/lib/utils' @@ -19,7 +17,8 @@ const claimRewards = async (claimer: IRewardable) => { return rewards } -export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { +// Expects RToken was transferred into RSRTrader beforehand +export const processRevenue = async (hre: HardhatRuntimeEnvironment, rtokenAddress: string) => { console.log(`\n* * * * * Claiming RSR rewards...`) const rToken = await hre.ethers.getContractAt('RTokenP1', rtokenAddress) const main = await hre.ethers.getContractAt('IMain', await rToken.main()) @@ -36,22 +35,29 @@ export const claimRsrRewards = async (hre: HardhatRuntimeEnvironment, rtokenAddr const strsr = await hre.ethers.getContractAt('StRSRP1', await main.stRSR()) const rsrRatePre = await strsr.exchangeRate() - // requires 3.4.0 plugins to be swapped in - // const rewards = await claimRewards(backingManager) - // console.log('rewards claimed', rewards) - const rewards = await assetRegistry.erc20s() + const [rewards, assets] = await assetRegistry.getRegistry() + let successCount = 0 + for (let i = 0; i < rewards.length; i++) { + try { + await backingManager.claimRewardsSingle(rewards[i]) + successCount++ + } catch (e) { + console.log( + `❌ failed to claim rewards for asset ${assets[i]} - review, may be a false positive` + ) + } + } + const emoji = successCount == rewards.length ? '✅' : '❌' + console.log( + `${emoji} claimRewardsSingle() was successful for ${successCount}/${rewards.length} assets` + ) + // await claimRewards(backingManager) await backingManager.forwardRevenue(rewards) - const comp = '0xc00e94Cb662C3520282E6f5717214004A7f26888' - const compContract = await hre.ethers.getContractAt('ERC20Mock', comp) - // fake enough rewards to trade - await whileImpersonating(hre, '0x73AF3bcf944a6559933396c1577B257e2054D935', async (compWhale) => { - await compContract.connect(compWhale).transfer(rsrTrader.address, fp('1e5')) - }) + await rsrTrader.manageTokens([rToken.address], [TradeKind.BATCH_AUCTION]) + await runBatchTrade(hre, rsrTrader, rToken.address, false) - await rsrTrader.manageTokens([comp], [TradeKind.BATCH_AUCTION]) - await runBatchTrade(hre, rsrTrader, comp, false) await strsr.payoutRewards() await advanceBlocks(hre, 100) await advanceTime(hre, 1200) diff --git a/tasks/validation/utils/trades.ts b/tasks/validation/utils/trades.ts index af256b8543..b06d1cc0ea 100644 --- a/tasks/validation/utils/trades.ts +++ b/tasks/validation/utils/trades.ts @@ -2,12 +2,7 @@ import { MAX_UINT256, QUEUE_START, TradeKind, TradeStatus } from '#/common/const import { bn, fp } from '#/common/numbers' import { whileImpersonating } from '#/utils/impersonation' import { networkConfig } from '../../../common/configuration' -import { - advanceToTimestamp, - advanceTime, - getLatestBlockNumber, - getLatestBlockTimestamp, -} from '#/utils/time' +import { advanceTime, getLatestBlockTimestamp } from '#/utils/time' import { DutchTrade } from '@typechain/DutchTrade' import { GnosisTrade } from '@typechain/GnosisTrade' import { TestITrading } from '@typechain/TestITrading' @@ -92,6 +87,7 @@ export const runDutchTrade = async ( trader: TestITrading, tradeToken: string ): Promise<[boolean, string]> => { + const [signer] = await hre.ethers.getSigners() const router = await (await hre.ethers.getContractFactory('DutchTradeRouter')).deploy() // NOTE: // buy & sell are from the perspective of the auction-starter @@ -111,25 +107,36 @@ export const runDutchTrade = async ( } const buyTokenAddress = await trade.buy() - console.log('=========') + console.log('=================================================================================') console.log( `Running Dutch Trade: Selling ${logToken(tradeToken)} for ${logToken(buyTokenAddress)}...` ) const endTime = await trade.endTime() - const whaleAddr = whales[buyTokenAddress.toLowerCase()] - - // Bid near 1:1 point, which occurs at the 70% mark - const latestTimestamp = await getLatestBlockTimestamp(hre) - const toAdvance = (endTime - latestTimestamp) * 7 / 10 + let whaleAddr = whales[buyTokenAddress.toLowerCase()] + if (!whaleAddr) console.log('missing whale for ' + buyTokenAddress) + whaleAddr = signer.address + + // Bid near 1:1 point, which occurs at a difficult-to-calculate time due to maxTradeSlippage + const bestPrice = await trade.bestPrice() + const worstPrice = await trade.worstPrice() + const delta = bestPrice.sub(worstPrice).mul(fp('1')).div(bestPrice) + const maxTradeSlippage = (await trader.maxTradeSlippage()).mul(fp('1')).div(delta) + const unofficialEnd = 95 - maxTradeSlippage.div(2).div(bn('1e16')).toNumber() + const fairMidpoint = (unofficialEnd - 45) / 2 + 45 + console.log('bidding at auction pct:', fairMidpoint) + + const toAdvance = ((endTime - (await getLatestBlockTimestamp(hre))) * fairMidpoint) / 100 await advanceTime(hre, toAdvance) - const buyAmount = await trade.bidAmount(await getLatestBlockNumber(hre)) + const buyAmount = await trade.bidAmount(await getLatestBlockTimestamp(hre)) // Ensure funds available await getTokens(hre, buyTokenAddress, buyAmount, whaleAddr) const buyToken = await hre.ethers.getContractAt('ERC20Mock', buyTokenAddress) - await buyToken.connect(whaleAddr).approve(router.address, MAX_UINT256) + await whileImpersonating(hre, whaleAddr, async (whale) => { + await buyToken.connect(whale).approve(router.address, MAX_UINT256) + }) // Bid ;[tradesRemain, newSellToken] = await callAndGetNextTrade( @@ -181,15 +188,15 @@ export const callAndGetNextTrade = async ( if (parsedLog && parsedLog.name == 'TradeStarted') { // TODO: Improve this to include proper token details and parsing. - console.log( - ` - ====== Trade Started: Selling ${logToken(parsedLog.args.sell)} / Buying ${logToken( - parsedLog.args.buy - )} ====== - minBuyAmount: ${parsedLog.args.minBuyAmount} - sellAmount: ${parsedLog.args.sellAmount} - `.trim() - ) + // console.log( + // ` + // ====== Trade Started: Selling ${logToken(parsedLog.args.sell)} / Buying ${logToken( + // parsedLog.args.buy + // )} ====== + // minBuyAmount: ${parsedLog.args.minBuyAmount} + // sellAmount: ${parsedLog.args.sellAmount} + // `.trim() + // ) tradesRemain = true newSellToken = parsedLog.args.sell @@ -206,25 +213,31 @@ export const getTokens = async ( amount: BigNumber, recipient: string ) => { - console.log('Acquiring tokens...', tokenAddress) + console.log(`Acquiring tokens... ${logToken(tokenAddress)}: ${tokenAddress}`) switch (tokenAddress.toLowerCase()) { - case '0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase(): // saUSDC mainnet - case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase(): // saUSDT mainnet - case '0xC19f5d60e2Aca1174f3D5Fe189f0A69afaB76f50'.toLowerCase(): // saBasUSDC base + case '0x60C384e226b120d93f3e0F4C502957b2B9C32B15'.toLowerCase(): // <3.4.0 saUSDC mainnet + case '0xa8157BF67Fd7BcDCC139CB9Bf1bd7Eb921A779D3'.toLowerCase(): // >=3.4.0 saUSDC mainnet + case '0x21fe646D1Ed0733336F2D4d9b2FE67790a6099D9'.toLowerCase(): // <3.4.0 saUSDT mainnet + case '0x684AA4faf9b07d5091B88c6e0a8160aCa5e6d17b'.toLowerCase(): // >=3.4.0 saUSDT mainnet await getStaticAToken(hre, tokenAddress, amount, recipient) break + case '0x6f6f81e5e66f503184f2202d83a79650c3285759'.toLocaleLowerCase(): // >= 3.4.0 saBasUSDC base + await getStaticATokenV3(hre, tokenAddress, amount, recipient) + break case '0xf579F9885f1AEa0d3F8bE0F18AfED28c92a43022'.toLowerCase(): // cUSDCVault mainnet case '0x4Be33630F92661afD646081BC29079A38b879aA0'.toLowerCase(): // cUSDTVault mainnet await getCTokenVault(hre, tokenAddress, amount, recipient) break case '0x24CDc6b4Edd3E496b7283D94D93119983A61056a'.toLowerCase(): // cvx3Pool mainnet - case '0x511daB8150966aFfE15F0a5bFfBa7F4d2b62DEd4'.toLowerCase(): // cvxPayPool mainnet - case '0x81697e25DFf8564d9E0bC6D27edb40006b34ea2A'.toLowerCase(): // cvxeUSDFRAXBP mainnet + case '0x5ale11daB8150966aFfE15F0a5bFfBa7F4d2b62DEd4'.toLowerCase(): // cvxPayPool mainnet + case '0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1'.toLowerCase(): // <3.4.0 cvxeUSDFRAXBP mainnet + case '0x5cD176b58a6FdBAa1aEFD0921935a730C62f03Ac'.toLowerCase(): // <3.4.0 cvxeUSDFRAXBP mainnet case '0x3e8f7EDc03E0133b95EcB4dD2f72B5027E695413'.toLowerCase(): // cvxMIM3Pool mainnet case '0xDbC0cE2321B76D3956412B36e9c0FA9B0fD176E7'.toLowerCase(): // cvxETHPlusETH mainnet case '0x6ad24C0B8fD4B594C6009A7F7F48450d9F56c6b8'.toLowerCase(): // cvxCrvUSDUSDC mainnet case '0x5d1B749bA7f689ef9f260EDC54326C48919cA88b'.toLowerCase(): // cvxCrvUSDUSDT mainnet await getCvxVault(hre, tokenAddress, amount, recipient) + break default: await getERC20Tokens(hre, tokenAddress, amount, recipient) return @@ -246,7 +259,6 @@ const getCvxVault = async ( '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', curveTokenAddy ) - await whileImpersonating(hre, whales[curveTokenAddy.toLowerCase()], async (whaleSigner) => { await curvePool.connect(whaleSigner).transfer(recipient, amount) }) @@ -308,6 +320,40 @@ const getStaticAToken = async ( }) } +// get a specific amount of static aTokens V3 +const getStaticATokenV3 = async ( + hre: HardhatRuntimeEnvironment, + tokenAddress: string, + amount: BigNumber, + recipient: string +) => { + const chainId = await getChainId(hre) + const whales: Whales = getWhalesFile(chainId).tokens + + const collateral = await hre.ethers.getContractAt('StaticATokenV3LM', tokenAddress) + const requiredAmt = await collateral.previewMint(amount) + + const aToken = await hre.ethers.getContractAt( + 'contracts/plugins/assets/aave-v3/vendor/interfaces/IAToken.sol:IAToken', + await collateral.aToken() + ) + + const baseToken = await hre.ethers.getContractAt( + '@openzeppelin/contracts/token/ERC20/IERC20.sol:IERC20', + await aToken.UNDERLYING_ASSET_ADDRESS() + ) + + // Impersonate holder + await whileImpersonating(hre, whales[baseToken.address.toLowerCase()], async (whaleSigner) => { + await baseToken + .connect(whaleSigner) + .approve(collateral.address, hre.ethers.constants.MaxUint256) + await collateral + .connect(whaleSigner) + ['deposit(uint256,address,uint16,bool)'](requiredAmt, recipient, 0, true) + }) +} + // get a specific amount of erc20 plain token const getERC20Tokens = async ( hre: HardhatRuntimeEnvironment, @@ -321,80 +367,120 @@ const getERC20Tokens = async ( const token = await hre.ethers.getContractAt('ERC20Mock', tokenAddress) // special-cases for wrappers with 0 supply - const wcUSDCv3Address = networkConfig[chainId].tokens.wcUSDCv3!.toLowerCase() - const aUSDCv3Address = networkConfig[chainId].tokens.saEthUSDC!.toLowerCase() - const aPyUSDv3Address = networkConfig[chainId].tokens.saEthPyUSD!.toLowerCase() - const stkcvxeUSDFRAXBPAddress = '0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1'.toLowerCase() - - if (tokenAddress.toLowerCase() == wcUSDCv3Address) { - const wcUSDCv3 = await hre.ethers.getContractAt( - 'CusdcV3Wrapper', - wcUSDCv3Address - ) - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.cUSDCv3!.toLowerCase()], - async (whaleSigner) => { - const cUSDCv3 = await hre.ethers.getContractAt( - 'ERC20Mock', - networkConfig['1'].tokens.cUSDCv3! - ) - await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, 0) - await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, MAX_UINT256) - await wcUSDCv3.connect(whaleSigner).deposit(amount.mul(2)) - const bal = await wcUSDCv3.balanceOf(whaleSigner.address) - await wcUSDCv3.connect(whaleSigner).transfer(recipient, bal) - } - ) - } else if (tokenAddress.toLowerCase() == aUSDCv3Address) { - const saEthUSDC = await hre.ethers.getContractAt( - 'IStaticATokenV3LM', - aUSDCv3Address - ) - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.USDC!.toLowerCase()], - async (whaleSigner) => { - const USDC = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.USDC!) - await USDC.connect(whaleSigner).approve(saEthUSDC.address, amount.mul(2)) - await saEthUSDC.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address, 0, true) - await token.connect(whaleSigner).transfer(recipient, amount) // saEthUSDC transfer - } - ) - } else if (tokenAddress.toLowerCase() == aPyUSDv3Address) { - const saEthPyUSD = await hre.ethers.getContractAt( - 'IStaticATokenV3LM', - aPyUSDv3Address - ) - await whileImpersonating( - hre, - whales[networkConfig['1'].tokens.pyUSD!.toLowerCase()], - async (whaleSigner) => { - const pyUSD = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.pyUSD!) - await pyUSD.connect(whaleSigner).approve(saEthPyUSD.address, amount.mul(2)) - await saEthPyUSD.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address, 0, true) - await token.connect(whaleSigner).transfer(recipient, amount) // saEthPyUSD transfer - } - ) - } else if (tokenAddress.toLowerCase() == stkcvxeUSDFRAXBPAddress) { - const stkcvxeUSDFRAXBP = await hre.ethers.getContractAt( - 'ConvexStakingWrapper', - stkcvxeUSDFRAXBPAddress - ) - - const lpTokenAddr = '0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f'.toLowerCase() - - await whileImpersonating(hre, whales[lpTokenAddr], async (whaleSigner) => { - const lpToken = await hre.ethers.getContractAt('ERC20Mock', lpTokenAddr) - await lpToken.connect(whaleSigner).approve(stkcvxeUSDFRAXBP.address, amount.mul(2)) - await stkcvxeUSDFRAXBP.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address) - await token.connect(whaleSigner).transfer(recipient, amount) - }) - } else { - const addr = whales[token.address.toLowerCase()] - if (!addr) throw new Error('missing whale for ' + tokenAddress) - await whileImpersonating(hre, whales[token.address.toLowerCase()], async (whaleSigner) => { - await token.connect(whaleSigner).transfer(recipient, amount) - }) + if (chainId == '1' || chainId == '31337') { + const wcUSDCv3Address = networkConfig[chainId].tokens.wcUSDCv3!.toLowerCase() + const wcUSDCv3AddressOld = '0xfBD1a538f5707C0D67a16ca4e3Fc711B80BD931A'.toLowerCase() + const aUSDCv3Address = networkConfig[chainId].tokens.saEthUSDC!.toLowerCase() + const aUSDCv3AddressOld = '0x093cB4f405924a0C468b43209d5E466F1dd0aC7d'.toLowerCase() + const aPyUSDv3Address = networkConfig[chainId].tokens.saEthPyUSD!.toLowerCase() + const aPyUSDv3AddressOld = '0xe176A5ebFB873D5b3cf1909d0EdaE4FE095F5bc7'.toLowerCase() + const stkcvxeUSDFRAXBPAddress = '0x81697e25DFf8564d9E0bC6D27edb40006b34ea2A'.toLowerCase() + const stkcvxeUSDFRAXBPAddressOld = '0x8e33D5aC344f9F2fc1f2670D45194C280d4fBcF1'.toLowerCase() + const stkcvxeUSDFRAXBPAddressOld2 = '0x5cD176b58a6FdBAa1aEFD0921935a730C62f03Ac'.toLowerCase() + + const tokAddress = tokenAddress.toLowerCase() + + // Solutions for wrappers without whales + if (tokAddress == wcUSDCv3Address || tokAddress == wcUSDCv3AddressOld) { + const wcUSDCv3 = await hre.ethers.getContractAt('CusdcV3Wrapper', tokAddress) + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.cUSDCv3!.toLowerCase()], + async (whaleSigner) => { + const cUSDCv3 = await hre.ethers.getContractAt( + 'ERC20Mock', + networkConfig['1'].tokens.cUSDCv3! + ) + await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, 0) + await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, MAX_UINT256) + await wcUSDCv3.connect(whaleSigner).deposit(amount.mul(2)) + const bal = await wcUSDCv3.balanceOf(whaleSigner.address) + await wcUSDCv3.connect(whaleSigner).transfer(recipient, bal) + } + ) + } else if (tokAddress == aUSDCv3Address || tokAddress == aUSDCv3AddressOld) { + const saEthUSDC = await hre.ethers.getContractAt('IStaticATokenV3LM', tokAddress) + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.USDC!.toLowerCase()], + async (whaleSigner) => { + const USDC = await hre.ethers.getContractAt('ERC20Mock', networkConfig['1'].tokens.USDC!) + await USDC.connect(whaleSigner).approve(saEthUSDC.address, amount.mul(2)) + await saEthUSDC.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address, 0, true) + await token.connect(whaleSigner).transfer(recipient, amount) // saEthUSDC transfer + } + ) + } else if (tokAddress == aPyUSDv3Address || tokAddress == aPyUSDv3AddressOld) { + const saEthPyUSD = await hre.ethers.getContractAt('IStaticATokenV3LM', tokAddress) + await whileImpersonating( + hre, + whales[networkConfig['1'].tokens.pyUSD!.toLowerCase()], + async (whaleSigner) => { + const pyUSD = await hre.ethers.getContractAt( + 'ERC20Mock', + networkConfig['1'].tokens.pyUSD! + ) + await pyUSD.connect(whaleSigner).approve(saEthPyUSD.address, amount.mul(2)) + await saEthPyUSD.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address, 0, true) + await token.connect(whaleSigner).transfer(recipient, amount) // saEthPyUSD transfer + } + ) + } else if ( + tokAddress == stkcvxeUSDFRAXBPAddress || + tokAddress == stkcvxeUSDFRAXBPAddressOld || + tokAddress == stkcvxeUSDFRAXBPAddressOld2 + ) { + const stkcvxeUSDFRAXBP = await hre.ethers.getContractAt('ConvexStakingWrapper', tokAddress) + + const lpTokenAddr = '0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f'.toLowerCase() + + await whileImpersonating(hre, whales[lpTokenAddr], async (whaleSigner) => { + const lpToken = await hre.ethers.getContractAt('ERC20Mock', lpTokenAddr) + await lpToken.connect(whaleSigner).approve(stkcvxeUSDFRAXBP.address, amount.mul(2)) + await stkcvxeUSDFRAXBP.connect(whaleSigner).deposit(amount.mul(2), whaleSigner.address) + await token.connect(whaleSigner).transfer(recipient, amount) + }) + } else { + // Directly get tokens from whale + const addr = whales[token.address.toLowerCase()] + if (!addr) throw new Error('missing whale for ' + tokenAddress) + await whileImpersonating(hre, whales[token.address.toLowerCase()], async (whaleSigner) => { + await token.connect(whaleSigner).transfer(recipient, amount) + }) + } + } else if (chainId == '8453' || chainId == '84531') { + // Base + const wcUSDCv3Address = networkConfig[chainId].tokens.wcUSDCv3!.toLowerCase() + const wcUSDCv3AddressOld = '0xA694f7177C6c839C951C74C797283B35D0A486c8'.toLowerCase() + + const tokAddress = tokenAddress.toLowerCase() + + // Solutions for wrappers without whales + if (tokAddress == wcUSDCv3Address || tokAddress == wcUSDCv3AddressOld) { + const wcUSDCv3 = await hre.ethers.getContractAt('CusdcV3Wrapper', tokAddress) + + await whileImpersonating( + hre, + whales[networkConfig[chainId].tokens.cUSDCv3!.toLowerCase()], + async (whaleSigner) => { + const cUSDCv3 = await hre.ethers.getContractAt( + 'ERC20Mock', + networkConfig[chainId].tokens.cUSDCv3! + ) + await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, 0) + await cUSDCv3.connect(whaleSigner).approve(wcUSDCv3.address, MAX_UINT256) + await wcUSDCv3.connect(whaleSigner).deposit(amount.mul(120).div(100)) + const bal = await wcUSDCv3.balanceOf(whaleSigner.address) + await wcUSDCv3.connect(whaleSigner).transfer(recipient, bal) + } + ) + } else { + // Directly get tokens from whale + const addr = whales[token.address.toLowerCase()] + if (!addr) throw new Error('missing whale for ' + tokenAddress) + await whileImpersonating(hre, whales[token.address.toLowerCase()], async (whaleSigner) => { + await token.connect(whaleSigner).transfer(recipient, amount) + }) + } } } diff --git a/tasks/validation/whales/whales_1.json b/tasks/validation/whales/whales_1.json index b8215cf6ee..537bc44460 100644 --- a/tasks/validation/whales/whales_1.json +++ b/tasks/validation/whales/whales_1.json @@ -75,7 +75,8 @@ "0xbeef02e5e13584ab96848af90261f0c8ee04722a": "0x7E4B4DC22111B84594d9b7707A8DCFFd793D477A", "0x2c25f6c25770ffec5959d34b94bf898865e5d6b1": "0x3D3eb99C278C7A50d8cf5fE7eBF0AD69066Fb7d1", "0x78fc2c2ed1a4cdb5402365934ae5648adad094d0": "0x733c33339684F38C8aADA0434751611e168255c4", - "0x9bbf31e99f30c38a5003952206c31eea77540bef": "0xC6625129C9df3314a4dd604845488f4bA62F9dB8" + "0x9bbf31e99f30c38a5003952206c31eea77540bef": "0xC6625129C9df3314a4dd604845488f4bA62F9dB8", + "0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f": "0x8605dc0C339a2e7e85EEA043bD29d42DA2c6D784" }, "lastUpdated": { "0xfbd1a538f5707c0d67a16ca4e3fc711b80bd931a": "2024-05-02T02:11:46.313Z", @@ -153,6 +154,7 @@ "0xbeef02e5e13584ab96848af90261f0c8ee04722a": "2024-05-02T02:11:49.422Z", "0x2c25f6c25770ffec5959d34b94bf898865e5d6b1": "2024-05-02T02:11:49.529Z", "0x78fc2c2ed1a4cdb5402365934ae5648adad094d0": "2024-05-02T02:11:49.639Z", - "0x9bbf31e99f30c38a5003952206c31eea77540bef": "2024-05-02T02:11:49.748Z" + "0x9bbf31e99f30c38a5003952206c31eea77540bef": "2024-05-02T02:11:49.748Z", + "0xaeda92e6a3b1028edc139a4ae56ec881f3064d4f": "2024-05-04T02:11:49.748Z" } -} \ No newline at end of file +} diff --git a/tasks/validation/whales/whales_8453.json b/tasks/validation/whales/whales_8453.json index 1b7fdbe5d6..d35952e4ce 100644 --- a/tasks/validation/whales/whales_8453.json +++ b/tasks/validation/whales/whales_8453.json @@ -3,7 +3,7 @@ "0x50c5725949a6f0c72e6c4a641f24049a917db0cb": "0x73b06d8d18de422e269645eace15400de7462417", "0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca": "0x0b25c51637c43decd6cc1c1e3da4518d54ddb528", "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913": "0x7c41fdced2ea646ed85665d1a9b28e6632b61c41", - "0xab36452dbac151be02b16ca17d8919826072f64a": "0x796d2367af69deb3319b8e10712b8b65957371c3", + "0xab36452dbac151be02b16ca17d8919826072f64a": "0x95f04b5594e2a944ca91d56933d119841eef9a99", "0x9e1028f5f1d5ede59748ffcee5532509976840e0": "0x123964802e6ababbe1bc9547d72ef1b69b00a6b1", "0x4200000000000000000000000000000000000006": "0xcdac0d6c6c59727a65f871236188350531885c43", "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22": "0x3bf93770f2d4a794c3d9ebefbaebae2a8f09a5e5", @@ -23,13 +23,17 @@ "0xcc7ff230365bd730ee4b352cc2492cedac49383e": "0xb5e331615fdba7df49e05cdeaceb14acdd5091c3", "0xcb327b99ff831bf8223cced12b1338ff3aa322ff": "0x6b87b8663ee63191887f18225f79d9eeb2de0d34", "0xfe0d6d83033e313691e96909d2188c150b834285": "0x1ef46018244179810dec43291d693cb2bf7f40e5", - "0xc9a3e2b3064c1c0546d3d0edc0a748e9f93cf18d": "0x6f1d6b86d4ad705385e751e6e88b0fdfdbadf298" + "0xc9a3e2b3064c1c0546d3d0edc0a748e9f93cf18d": "0x6f1d6b86d4ad705385e751e6e88b0fdfdbadf298", + "0x796d2367AF69deB3319B8E10712b8B65957371c3": "0x46271115f374e02b5afe357c8e8dad474c8de1cf", + "0x641b0453487c9d14c5df96d45a481ef1dc84e31f": "0xa80d70609e78802d82f196502cf56805f985b350", + "0x3ea46eb5589bce55460a751d9855bc6d74bceea9": "0xbdff420a0aca5a1efb59e72e72c96c93b6be8c27", + "0xb125e6687d4313864e53df431d5425969c15Eb2f": "0x2b4ef83aee6bb3dd5253daa7d0756ef5bd95f40f" }, "lastUpdated": { "0x50c5725949a6f0c72e6c4a641f24049a917db0cb": "2024-05-02T02:08:54.913Z", "0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca": "2024-05-02T02:09:09.449Z", "0x833589fcd6edb6e08f4c7c32d4f71b54bda02913": "2024-05-02T02:09:20.185Z", - "0xab36452dbac151be02b16ca17d8919826072f64a": "2024-05-02T02:09:20.356Z", + "0xab36452dbac151be02b16ca17d8919826072f64a": "2024-05-08T02:09:20.356Z", "0x9e1028f5f1d5ede59748ffcee5532509976840e0": "2024-05-02T02:09:20.574Z", "0x4200000000000000000000000000000000000006": "2024-05-02T02:09:23.915Z", "0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22": "2024-05-02T02:09:24.479Z", @@ -49,6 +53,10 @@ "0xcc7ff230365bd730ee4b352cc2492cedac49383e": "2024-05-02T02:09:30.955Z", "0xcb327b99ff831bf8223cced12b1338ff3aa322ff": "2024-05-02T02:09:31.083Z", "0xfe0d6d83033e313691e96909d2188c150b834285": "2024-05-02T02:09:31.159Z", - "0xc9a3e2b3064c1c0546d3d0edc0a748e9f93cf18d": "2024-05-02T02:09:31.258Z" + "0xc9a3e2b3064c1c0546d3d0edc0a748e9f93cf18d": "2024-05-02T02:09:31.258Z", + "0x796d2367AF69deB3319B8E10712b8B65957371c3": "2024-05-04T02:09:31.358Z", + "0x641b0453487c9d14c5df96d45a481ef1dc84e31f": "2024-05-09T02:09:31.358Z", + "0x3ea46eb5589bce55460a751d9855bc6d74bceea9": "2024-05-09T02:09:31.358Z", + "0xb125e6687d4313864e53df431d5425969c15Eb2f": "2024-05-17T02:09:31.358Z" } -} \ No newline at end of file +} diff --git a/utils/chain.ts b/utils/chain.ts index 333a09973c..4693e1961c 100644 --- a/utils/chain.ts +++ b/utils/chain.ts @@ -1,4 +1,6 @@ import { HardhatRuntimeEnvironment } from 'hardhat/types' +import { forkRpcs, Network } from '#/utils/fork' +import { useEnv } from '#/utils/env' export const resetFork = async (hre: HardhatRuntimeEnvironment, forkBlock: number) => { await hre.network.provider.request({ @@ -6,7 +8,7 @@ export const resetFork = async (hre: HardhatRuntimeEnvironment, forkBlock: numbe params: [ { forking: { - jsonRpcUrl: process.env.MAINNET_RPC_URL, + jsonRpcUrl: forkRpcs[useEnv('FORK_NETWORK', 'mainnet') as Network], blockNumber: forkBlock, }, }, diff --git a/utils/env.ts b/utils/env.ts index 8deae52e77..8af0009843 100644 --- a/utils/env.ts +++ b/utils/env.ts @@ -19,7 +19,9 @@ type IEnvVars = | 'ONLY_FAST' | 'JOBS' | 'EXTREME' - | 'SUBGRAPH_URL' + | 'MAINNET_SUBGRAPH_URL' + | 'BASE_SUBGRAPH_URL' + | 'ARBITRUM_SUBGRAPH_URL' | 'TENDERLY_RPC_URL' | 'SKIP_PROMPT' | 'BASE_GOERLI_RPC_URL' diff --git a/utils/fork.ts b/utils/fork.ts index ecec9d0c7e..a127f5d64d 100644 --- a/utils/fork.ts +++ b/utils/fork.ts @@ -7,9 +7,24 @@ const BASE_GOERLI_RPC_URL = useEnv('BASE_GOERLI_RPC_URL') const BASE_RPC_URL = useEnv('BASE_RPC_URL') const ARBITRUM_RPC_URL = useEnv('ARBITRUM_RPC_URL') const ARBITRUM_SEPOLIA_RPC_URL = useEnv('ARBITRUM_SEPOLIA_RPC_URL') +const MAINNET_SUBGRAPH_URL = useEnv('MAINNET_SUBGRAPH_URL') +const BASE_SUBGRAPH_URL = useEnv('BASE_SUBGRAPH_URL') +const ARBITRUM_SUBGRAPH_URL = useEnv('ARBITRUM_SUBGRAPH_URL') + export type Network = 'mainnet' | 'base' | 'arbitrum' export const forkRpcs = { mainnet: MAINNET_RPC_URL, base: BASE_RPC_URL, arbitrum: ARBITRUM_RPC_URL, } +export const subgraphURLs = { + mainnet: MAINNET_SUBGRAPH_URL, + base: BASE_SUBGRAPH_URL, + arbitrum: ARBITRUM_SUBGRAPH_URL, +} + +export const validateSubgraphURL = (network: Network) => { + if (!subgraphURLs[network]) { + throw new Error(`Valid ${network.toUpperCase()}_SUBGRAPH_URL required for subgraph queries`) + } +} diff --git a/utils/subgraph.ts b/utils/subgraph.ts index d057660ff1..07800ee021 100644 --- a/utils/subgraph.ts +++ b/utils/subgraph.ts @@ -1,6 +1,7 @@ import { BigNumber, BigNumberish } from 'ethers' import { gql, GraphQLClient } from 'graphql-request' import { useEnv } from './env' +import { subgraphURLs, Network, validateSubgraphURL } from '#/utils/fork' export interface Delegate { delegatedVotesRaw: BigNumberish @@ -8,7 +9,7 @@ export interface Delegate { } export const getDelegates = async (governance: string): Promise> => { - const client = new GraphQLClient(useEnv('SUBGRAPH_URL')) + const client = new GraphQLClient(subgraphURLs[(useEnv('FORK_NETWORK') as Network) ?? 'mainnet']) const query = gql` query getDelegates($governance: String!) { delegates( @@ -29,6 +30,9 @@ export const getDelegates = async (governance: string): Promise> } export interface Proposal { + rtoken?: string + governor?: string + timelock?: string targets: Array values: Array calldatas: Array @@ -37,10 +41,10 @@ export interface Proposal { } export const getProposalDetails = async (proposalId: string): Promise => { - if (!useEnv('SUBGRAPH_URL')) { - throw new Error('Please add a valid SUBGRAPH_URL to your .env') - } - const client = new GraphQLClient(useEnv('SUBGRAPH_URL')) + const network: Network = useEnv('FORK_NETWORK') as Network + validateSubgraphURL(network) + const subgraphURL = subgraphURLs[network] + const client = new GraphQLClient(subgraphURL) const query = gql` query getProposalDetail($id: String!) { proposal(id: $id) { From 1b8919ab7111631e8340ee6e6c6cf8186869064a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 30 May 2024 14:03:15 -0400 Subject: [PATCH 384/450] CHANGELOG --- CHANGELOG.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 87da72eb58..7a6c40192b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,12 +6,14 @@ This release adds Arbitrum support by adjusting `Furnace`/`StRSR`/`Governance` t ## Upgrade Steps -Upgrade all core contracts and plugins. Call `cacheComponents()` on `BackingManager`, `Broker`, `Distributor`, and both `RevenueTraders`. +Upgrade all core contracts and plugins. Call `cacheComponents()` on `Broker` if upgrading from >=3.0.0, and also on `BackingManager`, `Distributor`, and both `RevenueTraders`, if upgrading from <3.0.0. Adjust Furnace melt + StRSR drip ratios at time of upgrade to be based on 1s. For example: divide ratios by 12 for ethereum mainnet. Set Governance as Timelock CANCELLER_ROLE. +This is all implemented in the 3.4.0 upgrade spell, so that governors do not have to think about the details of the upgrade. + ## Core Protocol Contracts Throughout many core contracts negligible gas improvements have been applied. These are excluded from the list below. @@ -45,8 +47,7 @@ Throughout many core contracts negligible gas improvements have been applied. Th - Fix allowance check in `claimTo()` to use `msg.sender` - curve/convex - Add `CurveAppreciatingRTokenFiatCollateral` + `CurveAppreciatingRTokenSelfReferentialCollateral` to support `ETH+/ETH` curve pools in non-recursive cases - - Add `CurveRecursiveCollateral` + `StakeDAORecursiveCollateral` to support `USDC/USDC+` curve pool in the recursive case. That is: USDC+ will be backed somewhat by its own liquidity against USDC. - - Modify `CurveStableRTokenMetapoolCollateral` to check `isReady()` status of underlying RTokens; try-catch asset-registry call. + - Modify `CurveStableRTokenMetapoolCollateral` to check `isReady()` and `fullyCollateralized()` status of underlying RTokens; try-catch asset-registry refresh call. - metamorpho - Add `MetaMorphoFiatCollateral` + `MetaMorphoSelfReferentialCollateral` to support `steakUSDC`/`steakUSDP`/`bbUSDT`/`Re7WETH` morpho blue managed vaults - frax From 78152edbe7998b51778cbbb25ac35b349734ff96 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 30 May 2024 14:20:50 -0400 Subject: [PATCH 385/450] CHANGELOG --- CHANGELOG.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a6c40192b..8bdac02699 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,17 +2,20 @@ # 3.4.0 -This release adds Arbitrum support by adjusting `Furnace`/`StRSR`/`Governance` to function off of timestamp/timepoints, instead of discrete periods. +This release adds Arbitrum support by adjusting `Furnace`/`StRSR`/`Governance` to function off of timestamp/timepoints, instead of discrete periods. This changes the interface of the governance voting token StRSR, making this a complicated and nuanced upgrade to get right. ## Upgrade Steps -Upgrade all core contracts and plugins. Call `cacheComponents()` on `Broker` if upgrading from >=3.0.0, and also on `BackingManager`, `Distributor`, and both `RevenueTraders`, if upgrading from <3.0.0. +Warning: Do not attempt to execute the steps below manually. They are only a high-level overview of the changes made in this release. It is recommended to use the 3.4.0 Upgrade spell located at `spells/3_4_0.sol` and deployed to mainnet at `0xb1df3a104d73ff86f9aaab60b491a5c44b090391` and base at `0x1744c9933feb8e76563fce63d5c95a4e7f967c2a`. These deployments will only work for the 11 RTokens: eUSD, ETH+, hyUSD (mainnet), USDC+, USD3, rgUSD, hyUSD (base), bsdETH, iUSDC, Vaya, and MAAT. -Adjust Furnace melt + StRSR drip ratios at time of upgrade to be based on 1s. For example: divide ratios by 12 for ethereum mainnet. +High-level overview: -Set Governance as Timelock CANCELLER_ROLE. - -This is all implemented in the 3.4.0 upgrade spell, so that governors do not have to think about the details of the upgrade. +- Upgrade all core contracts and plugins. This includes ALL assets and trading plugins, including the RTokenAsset itself +- Update 3.4.0 ERC20s via `setPrimeBasket()` + `setBackupConfig()` +- Call `cacheComponents()` on `Broker` if upgrading from >=3.0.0, and also on `BackingManager`, `Distributor`, and both `RevenueTraders`, if upgrading from <3.0.0 +- Adjust Furnace melt + StRSR drip ratios to be based on 1s. For example: divide ratios by 12 if upgrading an RToken on ethereum mainnet +- Deploy new TimelockController + Governance contracts and rotate adminship of RTokens. This effectively creates a new DAO for each RToken +- The `tradingDelay` can also be safely set to 0. It was a training wheel and is no longer necessary ## Core Protocol Contracts From a21feddd49f1de57d7ad0ab6e6b3c4bf06db58a4 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 31 May 2024 11:38:44 -0400 Subject: [PATCH 386/450] fix GnosisTrade approval (#1150) --- contracts/plugins/trading/GnosisTrade.sol | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts/plugins/trading/GnosisTrade.sol b/contracts/plugins/trading/GnosisTrade.sol index ba4291bb68..3c7759cfbd 100644 --- a/contracts/plugins/trading/GnosisTrade.sol +++ b/contracts/plugins/trading/GnosisTrade.sol @@ -139,7 +139,7 @@ contract GnosisTrade is ITrade, Versioned { // // Context: wcUSDCv3 has a non-standard approve() function that reverts if the approve // amount is > 0 and < type(uint256).max. - AllowanceLib.safeApproveFallbackToMax(address(sell), address(gnosis), initBal); + AllowanceLib.safeApproveFallbackToMax(address(sell), address(gnosis), req.sellAmount); auctionId = gnosis.initiateAuction( sell, From 264109926be7bdacbedcdf9e9d7ae7ec593e9f54 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Mon, 10 Jun 2024 16:03:14 -0400 Subject: [PATCH 387/450] upload 3.4.0 solidified audit --- .../Audit Report - Reserve Protocol 3.4.0.pdf | Bin 0 -> 174144 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 audits/Audit Report - Reserve Protocol 3.4.0.pdf diff --git a/audits/Audit Report - Reserve Protocol 3.4.0.pdf b/audits/Audit Report - Reserve Protocol 3.4.0.pdf new file mode 100644 index 0000000000000000000000000000000000000000..c470ec8eaa191a8a61f1acd293f8cc6b30fa4b5c GIT binary patch literal 174144 zcmeFZXIPZk)-7s)7NI3bQjjDnf(Vi`C@3XLP>>`^ax4nT89@OR0TDsTq6jFV$T^ir z&XOshP;$;W)SX4|Z@0U@^PT(WKKD64PXFkKlA>z8Yt1$1m}88!F5bH-f0d6%ko02b z?DS7kKGtijC?hLUNlD%ZmX0>2te0;%nOHiqs+!uN>>XLJ!VeCn_RglP_v}%QC}Wfj zs{oH6&oxd`Uib$SCu384*2`+vmWI6Wv8+fwei2p#3S|zTa}#Ck0Do+2Vrp+{&nYcU z3O^FQNZ{`;G&W@ABjuG2@7h_*8w)(9+fM z*GLgm3hGOEojgT6H8C=CiD&r9l<8#>@?RqtpMS_jFUck=p$04|0= z2a#uv_;tGkIm3T`h`9|JqL?hpKs@$Oenmj`P84|z1W`K+rk3Uwj;w;$;Ac6M4a#24&d}JDRfktWPEOX)!PJD6u#~ELu*{Z@4);v$ z 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 literal 0 HcmV?d00001 From c02cb711e53c41176c855404adfb6a4262bdacfc Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 13 Feb 2024 15:12:39 -0500 Subject: [PATCH 207/450] document limitations of LP token pricing method --- .../assets/curve/CurveStableCollateral.sol | 20 ++++++++++++++++++- .../curve/CurveStableMetapoolCollateral.sol | 18 +++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index d94c59a7a3..792fc179d6 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -41,7 +41,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 - /// @dev Override this when pricing is more complicated than just a single oracle + /// @dev Override this when pricing is more complicated than just a single pool /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return {target/ref} Unused. Always 0 @@ -56,6 +56,24 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { uint192 ) { + // Assumption: the pool is balanced + // + // This pricing method returns a MINIMUM when the pool is balanced. + // It IS possible to interact with the protocol within a sandwich to manipulate + // LP token price upwards. + // + // However: + // - Lots of manipulation is required; + // (StableSwap pools are not price sensitive until the edge of the curve) + // - The DutchTrade pricing curve accounts for small/medium amounts of manipulation + // - The manipulator is under competition in auctions, so cannot guarantee they + // are the beneficiary of the manipulation. + // + // To be more MEV-resistant requires not using spot balances at all, which means one-of: + // 1. A moving average metric (unavailable in the cases we care about) + // 2. Mapping oracle prices to expected pool balances using precise knowledge about + // the shape of the trading curve. (maybe we can do this in the future) + // {UoA} (uint192 aumLow, uint192 aumHigh) = totalBalancesValue(); diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index b743021b65..45ac36de40 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -83,6 +83,24 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { uint192 pegPrice ) { + // Assumption: the pool is balanced + // + // This pricing method returns a MINIMUM when the pool is balanced. + // It IS possible to interact with the protocol within a sandwich to manipulate + // LP token price upwards. + // + // However: + // - Lots of manipulation is required; + // (StableSwap pools are not price sensitive until the edge of the curve) + // - The DutchTrade pricing curve accounts for small/medium amounts of manipulation + // - The manipulator is under competition in auctions, so cannot guarantee they + // are the beneficiary of the manipulation. + // + // To be more MEV-resistant requires not using spot balances at all, which means one-of: + // 1. A moving average metric (unavailable in the cases we care about) + // 2. Mapping oracle prices to expected pool balances using precise knowledge about + // the shape of the trading curve. (maybe we can do this in the future) + // {UoA/pairedTok} (uint192 lowPaired, uint192 highPaired) = tryPairedPrice(); require(lowPaired != 0 && highPaired != FIX_MAX, "invalid price"); From 57531ab6f7ad62513c1497fdbf4cd5b998d3d97f Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 13 Feb 2024 15:14:06 -0500 Subject: [PATCH 208/450] nit --- contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol | 1 - 1 file changed, 1 deletion(-) diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 45ac36de40..717707c0f6 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -68,7 +68,6 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { /// Can revert, used by other contract functions in order to catch errors /// Should not return FIX_MAX for low /// Should only return FIX_MAX for high if low is 0 - /// @dev Override this when pricing is more complicated than just a single oracle /// @return low {UoA/tok} The low price estimate /// @return high {UoA/tok} The high price estimate /// @return pegPrice {target/ref} The actual price observed in the peg From ca004bf4e4ddb2e6ca8960d44c011c8982769d3a Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 13 Feb 2024 16:12:19 -0500 Subject: [PATCH 209/450] fix powu() tests to actually run (#1071) --- test/libraries/Fixed.test.ts | 48 ++++++++---------------------------- 1 file changed, 10 insertions(+), 38 deletions(-) diff --git a/test/libraries/Fixed.test.ts b/test/libraries/Fixed.test.ts index 3f313e2c0f..8fa2451627 100644 --- a/test/libraries/Fixed.test.ts +++ b/test/libraries/Fixed.test.ts @@ -738,22 +738,15 @@ describe('In FixLib,', () => { }) }) describe('powu', () => { - it('correctly exponentiates inside its range', () => { + context('correctly exponentiates inside its range', () => { // prettier-ignore const table = [ - [fp(1.0), bn(1), fp(1.0)], - [fp(1.0), bn(15), fp(1.0)], - [fp(2), bn(7), fp(128)], - [fp(2), bn(63), fp('9223372036854775808')], - [fp(2), bn(64), fp('18446744073709551616')], - [fp(1.5), bn(7), fp(17.0859375)], - [fp(1.1), bn(4), fp('1.4641')], - [fp(1.1), bn(5), fp('1.61051')], - [fp(0.23), bn(3), fp('0.012167')], - [bn(1), bn(2), bn(0)], - [fp('1e-9'), bn(2), fp('1e-18')], - [fp(0.1), bn(17), fp('1e-17')], - [fp(10), bn(19), fp('1e19')] + [fp('1'), bn('1'), fp('1')], + [fp('1'), bn('15'), fp('1')], + [fp('0.23'), bn('3'), fp('0.012167')], + [bn('1'), bn('2'), bn('0')], + [fp('1e-9'), bn('2'), fp('1e-18')], + [fp('0.1'), bn('17'), fp('1e-17')], ] for (const [a, b, c] of table) { @@ -763,32 +756,11 @@ describe('In FixLib,', () => { } }) - it('correctly exponentiates at the extremes of its range', () => { + context('fails outside its range', () => { const table = [ - [MAX_UINT192, bn(1), MAX_UINT192], - [MIN_UINT192, bn(1), MIN_UINT192], - [MIN_UINT192, bn(0), fp(1)], - [fp(0), bn(0), fp(1.0)], - [fp(987.0), bn(0), fp(1.0)], - [fp(1.0), bn(2).pow(32).sub(1), fp(1.0)], - [fp(2), bn(131), fp(bn(2).pow(131))], - ] - - for (const [a, b, c] of table) { - it(`powu(${shortString(a)}, ${shortString(b)}) == ${shortString(c)}`, async () => { - expect(await caller.powu(a, b)).to.equal(c) - }) - } - }) - it('fails outside its range', () => { - const table = [ - [fp(10), bn(40)], + [fp('1.0001'), bn(1)], + [fp('2'), bn(1)], [MAX_UINT192, bn(2)], - [fp('8e19'), bn(2)], - [fp('1.9e13'), bn(3)], - [fp('9e9'), bn(4)], - [fp('9.2e8'), bn(5)], - [fp(2), bn(191)], ] for (const [a, b] of table) { From 51594993b9596555518e599bfabb86e5b888a4f2 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 13 Feb 2024 22:30:59 -0500 Subject: [PATCH 210/450] Move ORACLE_TIMEOUT_BUFFER into OracleLib and use max oracle timeout for price decay (#1069) --- CHANGELOG.md | 6 +- common/configuration.ts | 2 +- contracts/interfaces/IAsset.sol | 3 + .../assets/AppreciatingFiatCollateral.sol | 1 + contracts/plugins/assets/Asset.sol | 37 ++-- .../plugins/assets/EURFiatCollateral.sol | 2 + contracts/plugins/assets/L2LSDCollateral.sol | 2 + .../plugins/assets/NonFiatCollateral.sol | 2 + contracts/plugins/assets/OracleLib.sol | 4 +- .../assets/ankr/AnkrStakedEthCollateral.sol | 1 + .../plugins/assets/cbeth/CBETHCollateral.sol | 2 + .../assets/cbeth/CBETHCollateralL2.sol | 2 + .../compoundv2/CTokenNonFiatCollateral.sol | 2 + .../assets/curve/CurveStableCollateral.sol | 1 + contracts/plugins/assets/curve/PoolTokens.sol | 7 + .../assets/lido/L2LidoStakedEthCollateral.sol | 7 + .../assets/lido/LidoStakedEthCollateral.sol | 1 + .../morpho-aave/MorphoNonFiatCollateral.sol | 2 + .../assets/rocket-eth/RethCollateral.sol | 2 + test/Broker.test.ts | 4 +- test/Facade.test.ts | 12 +- test/Main.test.ts | 32 ++-- test/RToken.test.ts | 8 +- test/RTokenExtremes.test.ts | 4 +- test/Recollateralization.test.ts | 12 +- test/Revenues.test.ts | 22 +-- test/fixtures.ts | 20 +-- test/integration/AssetPlugins.test.ts | 62 +++---- test/integration/EasyAuction.test.ts | 4 +- test/integration/fixtures.ts | 30 ++-- test/plugins/Asset.test.ts | 16 +- test/plugins/Collateral.test.ts | 158 +++++++++--------- .../aave/ATokenFiatCollateral.test.ts | 16 +- .../individual-collateral/collateralTests.ts | 39 +++-- .../compoundv2/CTokenFiatCollateral.test.ts | 18 +- .../curve/collateralTests.ts | 30 ++-- .../CrvStableRTokenMetapoolTestSuite.test.ts | 3 +- .../CvxStableRTokenMetapoolTestSuite.test.ts | 3 +- .../plugins/individual-collateral/fixtures.ts | 6 +- .../lido/L2LidoStakedEthTestSuite.test.ts | 1 + .../individual-collateral/pluginTestTypes.ts | 3 + test/scenario/BadCollateralPlugin.test.ts | 4 +- test/scenario/ComplexBasket.test.ts | 26 +-- test/scenario/MaxBasketSize.test.ts | 8 +- test/scenario/NestedRTokens.test.ts | 4 +- test/scenario/NontrivialPeg.test.ts | 6 +- test/scenario/RevenueHiding.test.ts | 4 +- test/scenario/SetProtocol.test.ts | 8 +- 48 files changed, 359 insertions(+), 290 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aabc6f7750..511b236760 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,7 +12,7 @@ Call `broker.setDutchTradeImplementation(newGnosisTrade)` with the new `DutchTra If this is the first upgrade to a >= 3.0.0 token, call `*.cacheComponents()` on all components. -For plugins, upgrade all plugins that contain an appreciating asset (not FiatCollateral. AppreciatingFiatCollateral etc). +For plugins, upgrade all plugins that contain an appreciating asset (not FiatCollateral. AppreciatingFiatCollateral etc) OR contain multiple oracle feeds. ## Core Protocol Contracts @@ -40,7 +40,9 @@ New governance param added: `reweightable` - frax-eth: Add new `sFrxETH` plugin that leverages a curve EMA - stargate: Continue transfers of wrapper tokens if stargate rewards break -- All plugins with variable refPerTok(): do no revert refresh() when underlying protocol reverts +- All plugins with variable refPerTok(): do not revert refresh() when underlying protocol reverts +- All plugins with multiple chainlink feeds will now timeout over the maximum of the feeds' timeouts +- Add ORACLE_TIMEOUT_BUFFER to all usages of chainlink feeds ### Trading diff --git a/common/configuration.ts b/common/configuration.ts index 1c16240b29..ac18ca70ec 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -573,7 +573,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { cbETHETHexr: '0x868a501e68F3D1E89CfC0D22F6b22E8dabce5F04', // 0.5%, 24hr STG: '0x63Af8341b62E683B87bB540896bF283D96B4D385', stETHETH: '0xf586d0728a47229e747d824a939000Cf21dEF5A0', // 0.5%, 24h - ETHUSD: '0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70', // 0.15%, 10min + ETHUSD: '0x71041dddad3595F9CEd3DcCFBe3D1F4b0a16Bb70', // 0.15%, 20min wstETHstETH: '0xB88BAc61a4Ca37C43a3725912B1f472c9A5bc061', // 0.5%, 24h }, GNOSIS_EASY_AUCTION: '0xb1875Feaeea32Bbb02DE83D81772e07E37A40f02', // mock diff --git a/contracts/interfaces/IAsset.sol b/contracts/interfaces/IAsset.sol index f59b09e9e5..3196f9ce6e 100644 --- a/contracts/interfaces/IAsset.sol +++ b/contracts/interfaces/IAsset.sol @@ -69,6 +69,9 @@ interface TestIAsset is IAsset { /// @return {s} Seconds that an oracle value is considered valid function oracleTimeout() external view returns (uint48); + /// @return {s} The maximum of all oracle timeouts on the plugin + function maxOracleTimeout() external view returns (uint48); + /// @return {s} Seconds that the price() should decay over, after stale price function priceTimeout() external view returns (uint48); diff --git a/contracts/plugins/assets/AppreciatingFiatCollateral.sol b/contracts/plugins/assets/AppreciatingFiatCollateral.sol index 012b7097f1..df947ed337 100644 --- a/contracts/plugins/assets/AppreciatingFiatCollateral.sol +++ b/contracts/plugins/assets/AppreciatingFiatCollateral.sol @@ -20,6 +20,7 @@ import "./OracleLib.sol"; * - targetPerRef() * - claimRewards() * Should not have to re-implement any other methods. + * Should also set `oracleTimeout` in constructor if adding a new oracle source with timeout. * * Can intentionally disable default checks by setting config.defaultThreshold to 0 * Can intentionally do no revenue hiding by setting revenueHiding to 0 diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index 302a6a6731..f2df97c40b 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -7,8 +7,6 @@ import "../../interfaces/IAsset.sol"; import "./OracleLib.sol"; import "./VersionedAsset.sol"; -uint48 constant ORACLE_TIMEOUT_BUFFER = 300; // {s} 5 minutes - contract Asset is IAsset, VersionedAsset { using FixLib for uint192; using OracleLib for AggregatorV3Interface; @@ -33,17 +31,17 @@ contract Asset is IAsset, VersionedAsset { uint192 public savedLowPrice; // {UoA/tok} The low price of the token during the last update + uint48 public lastSave; // {s} The timestamp when prices were last saved + uint192 public savedHighPrice; // {UoA/tok} The high price of the token during the last update - uint48 public lastSave; // {s} The timestamp when prices were last saved + uint48 public maxOracleTimeout; // {s} maximum of all the oracle timeouts /// @param priceTimeout_ {s} The number of seconds over which savedHighPrice decays to 0 /// @param chainlinkFeed_ Feed units: {UoA/tok} /// @param oracleError_ {1} The % the oracle feed can be off by /// @param maxTradeVolume_ {UoA} The max trade volume, in UoA - /// @param oracleTimeout_ {s} The number of seconds until a oracle value becomes invalid - /// @dev oracleTimeout_ is also used as the timeout value in price(), should be highest of - /// all assets' oracleTimeout in a collateral if there are multiple oracles + /// @param oracleTimeout_ {s} The number of seconds until the chainlinkFeed becomes invalid constructor( uint48 priceTimeout_, AggregatorV3Interface chainlinkFeed_, @@ -64,7 +62,8 @@ contract Asset is IAsset, VersionedAsset { erc20 = erc20_; erc20Decimals = erc20.decimals(); maxTradeVolume = maxTradeVolume_; - oracleTimeout = oracleTimeout_ + ORACLE_TIMEOUT_BUFFER; // add 300s as a buffer + oracleTimeout = oracleTimeout_; + maxOracleTimeout = oracleTimeout_; // must be kept current by each child class } /// Can revert, used by other contract functions in order to catch errors @@ -117,12 +116,12 @@ contract Asset is IAsset, VersionedAsset { /// @return _low {UoA/tok} The lower end of the price estimate /// @return _high {UoA/tok} The upper end of the price estimate /// @notice If the price feed is broken, _low will decay downwards and _high will decay upwards - /// If tryPrice() is broken for more than `oracleTimeout + priceTimeout` seconds, + /// If tryPrice() is broken for `oracleTimeout + priceTimeout + ORACLE_TIMEOUT_BUFFER` , /// _low will be 0 and _high will be FIX_MAX. - /// Because the price decay begins at `oracleTimeout` seconds and not `updateTime` from the - /// price feed, the price feed can be broken for up to `2 * oracleTimeout` seconds without + /// Because the price decay begins at `oracleTimeout + ORACLE_TIMEOUT_BUFFER` seconds, + /// the price feed can be broken for up to `2 * oracleTimeout` seconds without /// affecting the price estimate. This could happen if the Asset is refreshed just before - /// the oracleTimeout is reached, forcing a second period of oracleTimeout to pass before + /// the maxOracleTimeout is reached, forcing a second period to pass before /// the price begins to decay. function price() public view virtual returns (uint192 _low, uint192 _high) { try this.tryPrice() returns (uint192 low, uint192 high, uint192) { @@ -136,20 +135,21 @@ contract Asset is IAsset, VersionedAsset { // if the price feed is broken, decay _low downwards and _high upwards uint48 delta = uint48(block.timestamp) - lastSave; // {s} - if (delta <= oracleTimeout) { - // use saved prices for at least the oracleTimeout + uint48 decayDelay = maxOracleTimeout + OracleLib.ORACLE_TIMEOUT_BUFFER; + if (delta <= decayDelay) { + // use saved prices for at least the decayDelay _low = savedLowPrice; _high = savedHighPrice; - } else if (delta >= oracleTimeout + priceTimeout) { + } else if (delta >= decayDelay + priceTimeout) { // unpriced after a full timeout return (0, FIX_MAX); } else { - // oracleTimeout <= delta <= oracleTimeout + priceTimeout + // decayDelay <= delta <= decayDelay + priceTimeout // Decay _high upwards to 3x savedHighPrice // {UoA/tok} = {UoA/tok} * {1} _high = savedHighPrice.safeMul( - FIX_ONE + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - oracleTimeout, priceTimeout), + FIX_ONE + MAX_HIGH_PRICE_BUFFER.muluDivu(delta - decayDelay, priceTimeout), ROUND ); // during overflow should not revert @@ -157,10 +157,7 @@ contract Asset is IAsset, VersionedAsset { if (_high != FIX_MAX) { // Decay _low downwards from savedLowPrice to 0 // {UoA/tok} = {UoA/tok} * {1} - _low = savedLowPrice.muluDivu( - oracleTimeout + priceTimeout - delta, - priceTimeout - ); + _low = savedLowPrice.muluDivu(decayDelay + priceTimeout - delta, priceTimeout); // during overflow should revert since a FIX_MAX _low breaks everything } } diff --git a/contracts/plugins/assets/EURFiatCollateral.sol b/contracts/plugins/assets/EURFiatCollateral.sol index dfc36ff73e..d22e3152a0 100644 --- a/contracts/plugins/assets/EURFiatCollateral.sol +++ b/contracts/plugins/assets/EURFiatCollateral.sol @@ -2,6 +2,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../libraries/Fixed.sol"; import "./FiatCollateral.sol"; @@ -31,6 +32,7 @@ contract EURFiatCollateral is FiatCollateral { targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/L2LSDCollateral.sol b/contracts/plugins/assets/L2LSDCollateral.sol index de926c0a53..f61b4abb72 100644 --- a/contracts/plugins/assets/L2LSDCollateral.sol +++ b/contracts/plugins/assets/L2LSDCollateral.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import { Math } from "@openzeppelin/contracts/utils/math/Math.sol"; import { CEIL, FIX_MAX, FixLib, _safeWrap } from "../../libraries/Fixed.sol"; import { AggregatorV3Interface, OracleLib } from "./OracleLib.sol"; import { CollateralConfig, AppreciatingFiatCollateral } from "./AppreciatingFiatCollateral.sol"; @@ -34,6 +35,7 @@ abstract contract L2LSDCollateral is AppreciatingFiatCollateral { exchangeRateChainlinkFeed = _exchangeRateChainlinkFeed; exchangeRateChainlinkTimeout = _exchangeRateChainlinkTimeout; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, _exchangeRateChainlinkTimeout)); } /// Should not revert diff --git a/contracts/plugins/assets/NonFiatCollateral.sol b/contracts/plugins/assets/NonFiatCollateral.sol index 1923dea24a..956fb5337e 100644 --- a/contracts/plugins/assets/NonFiatCollateral.sol +++ b/contracts/plugins/assets/NonFiatCollateral.sol @@ -2,6 +2,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../libraries/Fixed.sol"; import "./FiatCollateral.sol"; @@ -31,6 +32,7 @@ contract NonFiatCollateral is FiatCollateral { targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/OracleLib.sol b/contracts/plugins/assets/OracleLib.sol index 87db68e2b3..aa56808468 100644 --- a/contracts/plugins/assets/OracleLib.sol +++ b/contracts/plugins/assets/OracleLib.sol @@ -11,6 +11,8 @@ interface EACAggregatorProxy { /// Used by asset plugins to price their collateral library OracleLib { + uint48 internal constant ORACLE_TIMEOUT_BUFFER = 300; // {s} 5 minutes + /// @dev Use for nested calls that should revert when there is a problem /// @param timeout The number of seconds after which oracle values should be considered stale /// @return {UoA/tok} @@ -32,7 +34,7 @@ library OracleLib { // Downcast is safe: uint256(-) reverts on underflow; block.timestamp assumed < 2^48 uint48 secondsSince = uint48(block.timestamp - updateTime); - if (secondsSince > timeout) revert StalePrice(); + if (secondsSince > timeout + ORACLE_TIMEOUT_BUFFER) revert StalePrice(); if (p == 0) revert ZeroPrice(); diff --git a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol index a71da001da..4d3ab9d5ae 100644 --- a/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol +++ b/contracts/plugins/assets/ankr/AnkrStakedEthCollateral.sol @@ -37,6 +37,7 @@ contract AnkrStakedEthCollateral is AppreciatingFiatCollateral { targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, _targetPerTokChainlinkTimeout)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/cbeth/CBETHCollateral.sol b/contracts/plugins/assets/cbeth/CBETHCollateral.sol index dc9ba50a55..e407328197 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateral.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateral.sol @@ -2,6 +2,7 @@ pragma solidity 0.8.19; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { Math } from "@openzeppelin/contracts/utils/math/Math.sol"; import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; @@ -36,6 +37,7 @@ contract CBEthCollateral is AppreciatingFiatCollateral { targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, _targetPerTokChainlinkTimeout)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol index a67366e06c..1d30070013 100644 --- a/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol +++ b/contracts/plugins/assets/cbeth/CBETHCollateralL2.sol @@ -2,6 +2,7 @@ pragma solidity 0.8.19; import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; +import { Math } from "@openzeppelin/contracts/utils/math/Math.sol"; import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; @@ -45,6 +46,7 @@ contract CBEthCollateralL2 is L2LSDCollateral { targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, _targetPerTokChainlinkTimeout)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol index 161fb0ccb6..8c9818e0e4 100644 --- a/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenNonFiatCollateral.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import "@openzeppelin/contracts/utils/math/Math.sol"; import "../../../libraries/Fixed.sol"; import "../OracleLib.sol"; import "./CTokenFiatCollateral.sol"; @@ -33,6 +34,7 @@ contract CTokenNonFiatCollateral is CTokenFiatCollateral { require(config.defaultThreshold > 0, "defaultThreshold zero"); targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index d94c59a7a3..aff843a253 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -36,6 +36,7 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { PTConfiguration memory ptConfig ) AppreciatingFiatCollateral(config, revenueHiding) PoolTokens(ptConfig) { require(config.defaultThreshold > 0, "defaultThreshold zero"); + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, maxPoolOracleTimeout())); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/curve/PoolTokens.sol b/contracts/plugins/assets/curve/PoolTokens.sol index 3616aca59f..b9e002f8ae 100644 --- a/contracts/plugins/assets/curve/PoolTokens.sol +++ b/contracts/plugins/assets/curve/PoolTokens.sol @@ -299,6 +299,13 @@ contract PoolTokens { return balances; } + function maxPoolOracleTimeout() internal view virtual returns (uint48) { + return + uint48( + Math.max(Math.max(_t0timeout1, _t1timeout1), Math.max(_t2timeout1, _t3timeout1)) + ); + } + // === Private === function getToken(uint8 index) private view returns (IERC20Metadata) { diff --git a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol index 7597282cb8..3309620077 100644 --- a/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/L2LidoStakedEthCollateral.sol @@ -31,6 +31,7 @@ contract L2LidoStakedEthCollateral is AppreciatingFiatCollateral { uint48 public immutable refPerTokenChainlinkTimeout; // {s} /// @param config.chainlinkFeed - ignored + /// @param config.oracleTimeout - ignored /// @param config.oracleError {1} Should be the oracle error for UoA/tok constructor( CollateralConfig memory config, @@ -59,6 +60,12 @@ contract L2LidoStakedEthCollateral is AppreciatingFiatCollateral { refPerTokenChainlinkFeed = _refPerTokenChainlinkFeed; refPerTokenChainlinkTimeout = _refPerTokenChainlinkTimeout; + maxOracleTimeout = uint48( + Math.max( + Math.max(maxOracleTimeout, _targetPerRefChainlinkTimeout), + Math.max(_uoaPerTargetChainlinkTimeout, _refPerTokenChainlinkTimeout) + ) + ); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol index e9ea66a6f5..08e465790d 100644 --- a/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol +++ b/contracts/plugins/assets/lido/LidoStakedEthCollateral.sol @@ -40,6 +40,7 @@ contract LidoStakedEthCollateral is AppreciatingFiatCollateral { targetPerRefChainlinkFeed = _targetPerRefChainlinkFeed; targetPerRefChainlinkTimeout = _targetPerRefChainlinkTimeout; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetPerRefChainlinkTimeout)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol index 145711c890..376b16470c 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoNonFiatCollateral.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import { Math } from "@openzeppelin/contracts/utils/math/Math.sol"; import { CollateralConfig, MorphoFiatCollateral } from "./MorphoFiatCollateral.sol"; import { FixLib, CEIL } from "../../../libraries/Fixed.sol"; import { OracleLib } from "../OracleLib.sol"; @@ -32,6 +33,7 @@ contract MorphoNonFiatCollateral is MorphoFiatCollateral { ) MorphoFiatCollateral(config, revenueHiding) { targetUnitChainlinkFeed = targetUnitChainlinkFeed_; targetUnitOracleTimeout = targetUnitOracleTimeout_; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, targetUnitOracleTimeout_)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/contracts/plugins/assets/rocket-eth/RethCollateral.sol b/contracts/plugins/assets/rocket-eth/RethCollateral.sol index a116c02842..02fc479afa 100644 --- a/contracts/plugins/assets/rocket-eth/RethCollateral.sol +++ b/contracts/plugins/assets/rocket-eth/RethCollateral.sol @@ -1,6 +1,7 @@ // SPDX-License-Identifier: BlueOak-1.0.0 pragma solidity 0.8.19; +import { Math } from "@openzeppelin/contracts/utils/math/Math.sol"; import { CEIL, FixLib, _safeWrap } from "../../../libraries/Fixed.sol"; import { AggregatorV3Interface, OracleLib } from "../OracleLib.sol"; import { CollateralConfig, AppreciatingFiatCollateral } from "../AppreciatingFiatCollateral.sol"; @@ -35,6 +36,7 @@ contract RethCollateral is AppreciatingFiatCollateral { targetPerTokChainlinkFeed = _targetPerTokChainlinkFeed; targetPerTokChainlinkTimeout = _targetPerTokChainlinkTimeout; + maxOracleTimeout = uint48(Math.max(maxOracleTimeout, _targetPerTokChainlinkTimeout)); } /// Can revert, used by other contract functions in order to catch errors diff --git a/test/Broker.test.ts b/test/Broker.test.ts index c41846c170..3c534f1604 100644 --- a/test/Broker.test.ts +++ b/test/Broker.test.ts @@ -43,7 +43,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, SLOW, } from './fixtures' @@ -1228,7 +1228,7 @@ describe(`BrokerP${IMPLEMENTATION} contract #fast`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: bn(500), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 4e1d3e9877..e647e447c5 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -49,7 +49,7 @@ import { IMPLEMENTATION, defaultFixture, ORACLE_ERROR, - ORACLE_TIMEOUT, + DECAY_DELAY, PRICE_TIMEOUT, } from './fixtures' import { advanceBlocks, getLatestBlockTimestamp, setNextBlockTimestamp } from './utils/time' @@ -284,7 +284,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { it('Should handle UNPRICED when returning issuable quantities', async () => { // Set unpriced assets, should return UoA = 0 - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) const [toks, quantities, uoas] = await facade.callStatic.issue(rToken.address, issueAmount) expect(toks.length).to.equal(4) expect(toks[0]).to.equal(token.address) @@ -495,7 +495,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Set price to 0 await setOraclePrice(rsrAsset.address, bn(0)) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await setOraclePrice(tokenAsset.address, bn('1e8')) await setOraclePrice(usdcAsset.address, bn('1e8')) await assetRegistry.refresh() @@ -523,7 +523,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(backing).to.equal(fp('1')) expect(overCollateralization).to.equal(fp('0.5')) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await setOraclePrice(tokenAsset.address, bn('1e8')) await setOraclePrice(usdcAsset.address, bn('1e8')) await assetRegistry.refresh() @@ -579,7 +579,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) await setOraclePrice(usdcAsset.address, bn('0')) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await setOraclePrice(tokenAsset.address, bn('1e8')) await setOraclePrice(rsrAsset.address, bn('1e8')) await assetRegistry.refresh() @@ -913,7 +913,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { ) // set price of dai to 0 await chainlinkFeed.updateAnswer(0) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await setOraclePrice(usdcAsset.address, bn('1e8')) await assetRegistry.refresh() await main.connect(owner).pauseTrading() diff --git a/test/Main.test.ts b/test/Main.test.ts index 6760d9d7c6..877bd961d3 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -70,8 +70,8 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from './fixtures' @@ -1182,7 +1182,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1204,7 +1204,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: newToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1230,7 +1230,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await gasGuzzlingColl.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: await ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), @@ -1629,7 +1629,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20s[5].address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -1724,7 +1724,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: eurToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -2110,7 +2110,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('NEW_TARGET'), defaultThreshold: fp('0.01'), delayUntilDefault: await collateral0.delayUntilDefault(), @@ -2988,7 +2988,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { await expectPrice(basketHandler.address, fp('0.875'), ORACLE_ERROR, true) // Set collateral1 price to [0, FIX_MAX] - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await setOraclePrice(collateral0.address, bn('1e8')) await assetRegistry.refresh() @@ -3032,7 +3032,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3045,7 +3045,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { // Set price = 0, which hits 3 of our 4 collateral in the basket await setOraclePrice(newColl2.address, bn('0')) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await setOraclePrice(collateral1.address, bn('1e8')) // Check status and price again @@ -3067,7 +3067,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: await collateral2.maxTradeVolume(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3075,7 +3075,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { REVENUE_HIDING ) await assetRegistry.connect(owner).swapRegistered(newColl.address) - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await newColl.setTargetPerRef(1) await expectUnpriced(basketHandler.address) }) @@ -3092,7 +3092,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3314,7 +3314,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3358,7 +3358,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: await collateral2.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral2.delayUntilDefault(), @@ -3397,7 +3397,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: await ethers.utils.formatBytes32String('NEW TARGET'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral0.delayUntilDefault(), diff --git a/test/RToken.test.ts b/test/RToken.test.ts index b225dd3bfd..a65730a057 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -39,7 +39,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT, + DECAY_DELAY, VERSION, } from './fixtures' import { useEnv } from '#/utils/env' @@ -369,7 +369,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { it('Should not issue RTokens if UNPRICED collateral', async function () { const issueAmount: BigNumber = bn('10e18') - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(DECAY_DELAY.toString()) // Start issuance pre-pause await Promise.all(tokens.map((t) => t.connect(addr1).approve(rToken.address, issueAmount))) @@ -1096,7 +1096,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { }) it('Should redeem if basket is UNPRICED #fast', async function () { - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(DECAY_DELAY.toString()) await rToken.connect(addr1).redeem(issueAmount) expect(await rToken.totalSupply()).to.equal(0) @@ -1718,7 +1718,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { }) it('Should redeem if basket is UNPRICED #fast', async function () { - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(DECAY_DELAY.toString()) const basketNonces = [1] const portions = [fp('1')] diff --git a/test/RTokenExtremes.test.ts b/test/RTokenExtremes.test.ts index f5c8afa994..229960812c 100644 --- a/test/RTokenExtremes.test.ts +++ b/test/RTokenExtremes.test.ts @@ -21,7 +21,7 @@ import { IMPLEMENTATION, ORACLE_ERROR, SLOW, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, defaultFixtureNoBasket, } from './fixtures' @@ -66,7 +66,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: fp('1e36'), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), delayUntilDefault: bn(86400), diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 6bc20a55bb..af71ae59d7 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -51,8 +51,8 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, } from './fixtures' import snapshotGasCost from './utils/snapshotGasCost' @@ -645,7 +645,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await collateral1.delayUntilDefault(), @@ -658,7 +658,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: backupToken1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), @@ -856,7 +856,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { }) it('Should not trade if UNPRICED', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(DECAY_DELAY.toString()) await expect(backingManager.rebalance(TradeKind.BATCH_AUCTION)).to.be.revertedWith( 'basket not ready' ) @@ -1029,7 +1029,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await advanceTime(Number(config.warmupPeriod) + 1) // Set all assets to UNPRICED - await advanceTime(Number(ORACLE_TIMEOUT.add(PRICE_TIMEOUT))) + await advanceTime(Number(DECAY_DELAY.add(PRICE_TIMEOUT))) // Check state remains SOUND expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) @@ -2166,7 +2166,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: fp('25'), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: await backupCollateral1.delayUntilDefault(), diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 43028e57f2..8887b4ee28 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -50,8 +50,8 @@ import { IMPLEMENTATION, Implementation, ORACLE_ERROR, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, defaultFixture, @@ -590,7 +590,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { it('Should launch revenue auction if UNPRICED', async () => { // After oracleTimeout it should still launch auction for RToken - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(DECAY_DELAY.toString()) await rsr.connect(addr1).transfer(rTokenTrader.address, issueAmount) await rTokenTrader.callStatic.manageTokens([rsr.address], [TradeKind.BATCH_AUCTION]) @@ -1170,7 +1170,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await setOraclePrice(collateral0.address, bn(0)) await collateral0.refresh() - await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await advanceTime(PRICE_TIMEOUT.add(DECAY_DELAY).toString()) await setOraclePrice(rsrAsset.address, bn('1e8')) const p = await collateral0.price() @@ -1227,7 +1227,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, bn(606), // 2 qTok auction at $300 (after accounting for price.high) - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) // Set a very high price @@ -1308,7 +1308,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, MAX_UINT192, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1319,7 +1319,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_UINT192, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1487,7 +1487,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1686,7 +1686,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1885,7 +1885,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, aaveToken.address, fp('1'), - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -3390,7 +3390,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.05'), delayUntilDefault: await collateral2.delayUntilDefault(), @@ -4775,7 +4775,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) diff --git a/test/fixtures.ts b/test/fixtures.ts index 0242741b24..07e8ce3a15 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -84,9 +84,9 @@ export const SLOW = !!useEnv('SLOW') export const PRICE_TIMEOUT = bn('604800') // 1 week -export const ORACLE_TIMEOUT_PRE_BUFFER = bn('281474976710655').div(100) // type(uint48).max / 100 +export const ORACLE_TIMEOUT = bn('281474976710655').div(100) // type(uint48).max / 100 -export const ORACLE_TIMEOUT = ORACLE_TIMEOUT_PRE_BUFFER.add(300) +export const DECAY_DELAY = ORACLE_TIMEOUT.add(300) export const ORACLE_ERROR = fp('0.01') // 1% oracle error @@ -198,7 +198,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -218,7 +218,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -238,7 +238,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -267,7 +267,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -295,7 +295,7 @@ async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: defaultThreshold, delayUntilDefault: delayUntilDefault, @@ -534,7 +534,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await rsrAsset.refresh() @@ -666,7 +666,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await aaveAsset.refresh() @@ -681,7 +681,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await compAsset.refresh() diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 71ae4bf11d..cab2fd3fb5 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -7,8 +7,8 @@ import { Collateral, IMPLEMENTATION, ORACLE_ERROR, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -1091,7 +1091,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, }) it('Should handle invalid/stale Price - Assets', async () => { - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Stale Oracle await expectUnpriced(compAsset.address) @@ -1123,7 +1123,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, ORACLE_ERROR, networkConfig[chainId].tokens.stkAAVE || '', config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await setOraclePrice(zeroPriceAsset.address, bn('1e10')) @@ -1134,7 +1134,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeroPriceAsset.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeroPriceAsset.address, bn(0)) await expectDecayedPrice(zeroPriceAsset.address) @@ -1146,7 +1146,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await expectUnpriced(daiCollateral.address) await expectUnpriced(usdcCollateral.address) @@ -1203,7 +1203,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: dai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -1217,7 +1217,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeroFiatCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeroFiatCollateral.address, bn(0)) await expectDecayedPrice(zeroFiatCollateral.address) @@ -1237,7 +1237,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await cUsdtCollateral.status()).to.equal(CollateralStatus.SOUND) // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cDaiCollateral.address) @@ -1289,7 +1289,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -1305,7 +1305,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeropriceCtokenCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeropriceCtokenCollateral.address, bn(0)) await expectDecayedPrice(zeropriceCtokenCollateral.address) @@ -1321,7 +1321,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - ATokens Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(aDaiCollateral.address) @@ -1377,7 +1377,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: stataDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -1393,7 +1393,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeroPriceAtokenCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeroPriceAtokenCollateral.address, bn(0)) await expectDecayedPrice(zeroPriceAtokenCollateral.address) @@ -1409,7 +1409,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - Non-Fiatcoins', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(wbtcCollateral.address) @@ -1456,13 +1456,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: wbtc.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await setOraclePrice(zeroPriceNonFiatCollateral.address, bn('1e10')) await zeroPriceNonFiatCollateral.refresh() @@ -1472,7 +1472,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeroPriceNonFiatCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeroPriceNonFiatCollateral.address, bn(0)) await expectDecayedPrice(zeroPriceNonFiatCollateral.address) @@ -1484,7 +1484,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - CTokens Non-Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cWBTCCollateral.address) @@ -1536,13 +1536,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cWBTCVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ) @@ -1554,7 +1554,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeropriceCtokenNonFiatCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeropriceCtokenNonFiatCollateral.address, bn(0)) await expectDecayedPrice(zeropriceCtokenNonFiatCollateral.address) @@ -1568,7 +1568,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const delayUntilDefault = bn('86400') // 24h // Dows not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Aave await expectUnpriced(wethCollateral.address) @@ -1611,7 +1611,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: weth.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1625,7 +1625,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeroPriceSelfReferentialCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeroPriceSelfReferentialCollateral.address, bn(0)) await expectDecayedPrice(zeroPriceSelfReferentialCollateral.address) @@ -1643,7 +1643,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const delayUntilDefault = bn('86400') // 24h // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) // Compound await expectUnpriced(cETHCollateral.address) @@ -1694,7 +1694,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: cETHVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn('0'), delayUntilDefault, @@ -1713,7 +1713,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(zeroPriceCtokenSelfReferentialCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(zeroPriceCtokenSelfReferentialCollateral.address, bn(0)) await expectDecayedPrice(zeroPriceCtokenSelfReferentialCollateral.address) @@ -1731,7 +1731,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, it('Should handle invalid/stale Price - Collateral - EUR Fiat', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.add(PRICE_TIMEOUT).toString()) + await advanceTime(DECAY_DELAY.add(PRICE_TIMEOUT).toString()) await expectUnpriced(eurtCollateral.address) @@ -1777,13 +1777,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, oracleError: ORACLE_ERROR, erc20: eurt.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold, delayUntilDefault, }, mockChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await setOraclePrice(invalidPriceEURCollateral.address, bn('1e10')) await invalidPriceEURCollateral.refresh() @@ -1794,7 +1794,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectExactPrice(invalidPriceEURCollateral.address, initialPrice) // After oracle timeout, begins decay - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(invalidPriceEURCollateral.address, bn(0)) await expectDecayedPrice(invalidPriceEURCollateral.address) diff --git a/test/integration/EasyAuction.test.ts b/test/integration/EasyAuction.test.ts index 355d92f00c..5a298c4533 100644 --- a/test/integration/EasyAuction.test.ts +++ b/test/integration/EasyAuction.test.ts @@ -10,7 +10,7 @@ import { Implementation, SLOW, ORACLE_ERROR, - ORACLE_TIMEOUT, + DECAY_DELAY, PRICE_TIMEOUT, defaultFixture, // intentional } from '../fixtures' @@ -554,7 +554,7 @@ describeFork(`Gnosis EasyAuction Mainnet Forking - P${IMPLEMENTATION}`, function // Make collateral0 price (0, FIX_MAX) await setOraclePrice(collateral0.address, bn('0')) await collateral0.refresh() - await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await advanceTime(PRICE_TIMEOUT.add(DECAY_DELAY).toString()) await setOraclePrice(collateral0.address, bn('0')) await setOraclePrice(await assetRegistry.toAsset(rsr.address), bn('1e8')) diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 1c17047ea3..6311deabc1 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -67,7 +67,7 @@ import { Implementation, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -197,7 +197,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -226,7 +226,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -262,7 +262,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: staticErc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -288,13 +288,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await coll.refresh() return [erc20, coll] @@ -322,13 +322,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) await coll.refresh() @@ -347,7 +347,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -379,7 +379,7 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold: bn(0), delayUntilDefault, @@ -407,13 +407,13 @@ export async function collateralFixture( oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), defaultThreshold, delayUntilDefault, }, targetUnitOracleAddr, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await coll.refresh() return [erc20, coll] @@ -715,7 +715,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await rsrAsset.refresh() @@ -839,7 +839,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, aaveToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await aaveAsset.refresh() @@ -853,7 +853,7 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await compAsset.refresh() diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 1d671deeb9..029a34a683 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -47,8 +47,8 @@ import { defaultFixture, IMPLEMENTATION, Implementation, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, VERSION, @@ -286,7 +286,7 @@ describe('Assets contracts #fast', () => { await expectExactPrice(rTokenAsset.address, rTokenInitPrice) // Advance past oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(compAsset.address, bn('0')) await setOraclePrice(aaveAsset.address, bn('0')) await setOraclePrice(rsrAsset.address, bn('0')) @@ -377,7 +377,7 @@ describe('Assets contracts #fast', () => { }) it('Should remain at saved price if oracle is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + await advanceTime(DECAY_DELAY.sub(12).toString()) // lastSave should not be block timestamp after refresh await rsrAsset.refresh() @@ -441,7 +441,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -478,7 +478,7 @@ describe('Assets contracts #fast', () => { oracleError: ORACLE_ERROR, erc20: await collateral0.erc20(), maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -660,7 +660,7 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -745,7 +745,7 @@ describe('Assets contracts #fast', () => { ORACLE_ERROR, rsr.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -788,7 +788,7 @@ describe('Assets contracts #fast', () => { expect(highPrice2).to.eq(highPrice) // Advance past oracleTimeout - await advanceTime(await rsrAsset.oracleTimeout()) + await advanceTime(DECAY_DELAY.toString()) // Now price widens const [lowPrice3, highPrice3] = await rsrAsset.price() diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 21ca93859c..29e37b53f4 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -51,8 +51,8 @@ import { import { Collateral, defaultFixture, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, ORACLE_ERROR, PRICE_TIMEOUT, REVENUE_HIDING, @@ -255,7 +255,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.constants.HashZero, defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -273,7 +273,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -291,7 +291,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -309,7 +309,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -325,7 +325,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -343,7 +343,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -361,7 +361,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -377,7 +377,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -395,7 +395,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: MAX_DELAY_UNTIL_DEFAULT + 1, @@ -414,7 +414,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -430,7 +430,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -448,7 +448,7 @@ describe('Collateral contracts', () => { oracleError: bn('0'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -467,7 +467,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: token.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -483,7 +483,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -501,7 +501,7 @@ describe('Collateral contracts', () => { oracleError: fp('1'), erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -522,7 +522,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -540,7 +540,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -643,7 +643,7 @@ describe('Collateral contracts', () => { expect(lotHigh).to.eq(aaveInitPrice[1]) // Advance past timeouts - await advanceTime(PRICE_TIMEOUT.add(ORACLE_TIMEOUT).toString()) + await advanceTime(PRICE_TIMEOUT.add(DECAY_DELAY).toString()) // Should be unpriced await expectUnpriced(cTokenCollateral.address) @@ -776,7 +776,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: aToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -982,7 +982,7 @@ describe('Collateral contracts', () => { }) it('Should remain at saved price if oracle is stale', async () => { - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + await advanceTime(DECAY_DELAY.sub(12).toString()) // lastSave should not be block timestamp after refresh await tokenCollateral.refresh() @@ -1002,7 +1002,7 @@ describe('Collateral contracts', () => { }) it('Enters IFFY state when price becomes stale', async () => { - await advanceTime(ORACLE_TIMEOUT.toString()) + await advanceTime(DECAY_DELAY.toString()) await usdcCollateral.refresh() await tokenCollateral.refresh() await cTokenCollateral.refresh() @@ -1192,13 +1192,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) await nonFiatCollateral.refresh() @@ -1215,13 +1215,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('delayUntilDefault zero') }) @@ -1235,13 +1235,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('missing targetUnit feed') }) @@ -1255,13 +1255,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('missing chainlink feed') }) @@ -1275,7 +1275,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1295,13 +1295,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ).to.be.revertedWith('defaultThreshold zero') }) @@ -1351,8 +1351,8 @@ describe('Collateral contracts', () => { expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) await expectExactPrice(nonFiatCollateral.address, initialPrice) - // Should become disabled after just ORACLE_TIMEOUT - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + // Should become disabled after just DECAY_DELAY + await advanceTime(DECAY_DELAY.add(1).toString()) await targetUnitOracle.updateAnswer(bn('0')) expect(await nonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) await expectDecayedPrice(nonFiatCollateral.address) @@ -1368,7 +1368,7 @@ describe('Collateral contracts', () => { await expectExactPrice(nonFiatCollateral.address, initialPrice) // Advance past oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await referenceUnitOracle.updateAnswer(bn('0')) await expectDecayedPrice(nonFiatCollateral.address) @@ -1391,13 +1391,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -1419,13 +1419,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: nonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, invalidChainlinkFeed.address, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) // Reverting with no reason @@ -1480,13 +1480,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) await cTokenNonFiatCollateral.refresh() @@ -1504,13 +1504,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('delayUntilDefault zero') @@ -1525,13 +1525,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, fp('1') ) ).to.be.revertedWith('revenueHiding out of range') @@ -1546,13 +1546,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('missing chainlink feed') @@ -1567,13 +1567,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, ZERO_ADDRESS, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('missing targetUnit feed') @@ -1588,7 +1588,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1609,13 +1609,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, REVENUE_HIDING ) ).to.be.revertedWith('defaultThreshold zero') @@ -1691,8 +1691,8 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.IFFY) await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) - // Should become disabled after just ORACLE_TIMEOUT - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + // Should become disabled after just DECAY_DELAY + await advanceTime(DECAY_DELAY.add(1).toString()) await targetUnitOracle.updateAnswer(bn('0')) expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.DISABLED) await cTokenNonFiatCollateral.refresh() @@ -1709,7 +1709,7 @@ describe('Collateral contracts', () => { await expectExactPrice(cTokenNonFiatCollateral.address, initialPrice) // Advance past oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await referenceUnitOracle.updateAnswer(bn('0')) await expectDecayedPrice(cTokenNonFiatCollateral.address) @@ -1828,7 +1828,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1857,7 +1857,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cNonFiatTokenVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1899,7 +1899,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1939,7 +1939,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(100), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -1965,7 +1965,7 @@ describe('Collateral contracts', () => { await expectExactPrice(selfReferentialCollateral.address, initialPrice) // Decay starts after oracle timeout - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(selfReferentialCollateral.address, bn(0)) await expectDecayedPrice(selfReferentialCollateral.address) @@ -2004,7 +2004,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: selfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2054,7 +2054,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2078,7 +2078,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2098,7 +2098,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2118,7 +2118,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(200), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2190,7 +2190,7 @@ describe('Collateral contracts', () => { // Decays if price is zero await cTokenSelfReferentialCollateral.refresh() expect(await cTokenSelfReferentialCollateral.status()).to.equal(CollateralStatus.IFFY) - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await setOraclePrice(cTokenSelfReferentialCollateral.address, bn(0)) await expectDecayedPrice(cTokenSelfReferentialCollateral.address) @@ -2313,7 +2313,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: cSelfRefToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: 0, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2363,7 +2363,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2386,7 +2386,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: bn(0), @@ -2406,7 +2406,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2426,7 +2426,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2446,7 +2446,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2466,7 +2466,7 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -2546,7 +2546,7 @@ describe('Collateral contracts', () => { // Decays if price is zero await referenceUnitOracle.updateAnswer(bn('0')) await expectExactPrice(eurFiatCollateral.address, initialPrice) - await advanceTime(ORACLE_TIMEOUT.add(1).toString()) + await advanceTime(DECAY_DELAY.add(1).toString()) await referenceUnitOracle.updateAnswer(bn('0')) await expectDecayedPrice(eurFiatCollateral.address) @@ -2569,13 +2569,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, targetUnitOracle.address, - ORACLE_TIMEOUT + DECAY_DELAY ) ) @@ -2597,13 +2597,13 @@ describe('Collateral contracts', () => { oracleError: ORACLE_ERROR, erc20: eurFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, }, invalidChainlinkFeed.address, - ORACLE_TIMEOUT + DECAY_DELAY ) // Reverting with no reason diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 7a4a52862c..2575586520 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -14,8 +14,8 @@ import { DefaultFixture, Fixture, getDefaultFixture, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, } from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' @@ -215,7 +215,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, stkAave.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -239,7 +239,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -443,7 +443,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -461,7 +461,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault, @@ -682,7 +682,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + await advanceTime(DECAY_DELAY.sub(12).toString()) // Price is at saved prices const savedLowPrice = await aDaiCollateral.savedLowPrice() @@ -705,7 +705,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -730,7 +730,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: staticAToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 6fef4809f4..9768c5abf5 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -7,7 +7,13 @@ import { BigNumber, ContractFactory } from 'ethers' import { useEnv } from '#/utils/env' import { getChainId } from '../../../common/blockchain-utils' import { bn, fp, toBNDecimals } from '../../../common/numbers' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from './fixtures' +import { + DefaultFixture, + Fixture, + getDefaultFixture, + ORACLE_TIMEOUT, + ORACLE_TIMEOUT_BUFFER, +} from './fixtures' import { expectInIndirectReceipt } from '../../../common/events' import { whileImpersonating } from '../../utils/impersonation' import { IGovParams, IGovRoles, IRTokenSetup, networkConfig } from '../../../common/configuration' @@ -84,6 +90,7 @@ export default function fn( itChecksNonZeroDefaultThreshold, itHasRevenueHiding, itIsPricedByPeg, + itHasOracleRefPerTok, resetFork, collateralName, chainlinkDefaultAnswer, @@ -225,11 +232,15 @@ export default function fn( before(resetFork) // important for getting prices/refPerToks to behave predictably it('enters IFFY state when price becomes stale', async () => { - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(oracleTimeout / 12) + const decayDelay = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceBlocks(decayDelay / 12) await collateral.refresh() - expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + expect(await collateral.status()).to.not.equal(CollateralStatus.SOUND) + if (!itHasOracleRefPerTok) { + // if an oracle isn't involved in refPerTok, then it should disable slowly + expect(await collateral.status()).to.equal(CollateralStatus.IFFY) + } }) itChecksPriceChanges('prices change as USD feed price changes', async () => { @@ -339,9 +350,9 @@ export default function fn( expect(await collateral.status()).to.equal(CollateralStatus.IFFY) // After oracle timeout decay begins - const oracleTimeout = await collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(1 + oracleTimeout / 12) + const decayDelay = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceBlocks(1 + decayDelay / 12) await collateral.refresh() await expectDecayedPrice(collateral.address) @@ -430,7 +441,7 @@ export default function fn( expect(p[0]).to.equal(savedLow) expect(p[1]).to.equal(savedHigh) - await advanceTime(await collateral.oracleTimeout()) + await advanceTime((await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER) // Should be roughly half, after half of priceTimeout const priceTimeout = await collateral.priceTimeout() @@ -607,14 +618,16 @@ export default function fn( }) it('after oracle timeout', async () => { - const oracleTimeout = await collateral.oracleTimeout() + const oracleTimeout = (await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(oracleTimeout / 12) }) it('after full price timeout', async () => { await advanceTime( - (await collateral.priceTimeout()) + (await collateral.oracleTimeout()) + ORACLE_TIMEOUT_BUFFER + + (await collateral.priceTimeout()) + + (await collateral.maxOracleTimeout()) ) const p = await collateral.price() expect(p[0]).to.equal(0) @@ -939,9 +952,9 @@ export default function fn( priceTimeout: PRICE_TIMEOUT, chainlinkFeed: chainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: erc20.address, - maxTradeVolume: MAX_UINT192, oracleTimeout: ORACLE_TIMEOUT, + maxTradeVolume: MAX_UINT192, + erc20: erc20.address, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: fp('0.01'), // 1% delayUntilDefault: bn('86400'), // 24h, diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 921b3f1bec..26e2b7c212 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -14,8 +14,8 @@ import { DefaultFixture, Fixture, getDefaultFixture, + DECAY_DELAY, ORACLE_TIMEOUT, - ORACLE_TIMEOUT_PRE_BUFFER, } from '../fixtures' import { getChainId } from '../../../../common/blockchain-utils' import forkBlockNumber from '../../../integration/fork-block-numbers' @@ -218,7 +218,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ORACLE_ERROR, compToken.address, config.rTokenMaxTradeVolume, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) @@ -241,7 +241,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -436,7 +436,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: ZERO_ADDRESS, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -472,7 +472,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: vault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -490,7 +490,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: bn(0), delayUntilDefault, @@ -695,7 +695,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi describe('Price Handling', () => { it('Should handle invalid/stale Price', async () => { // Does not revert with stale price - await advanceTime(ORACLE_TIMEOUT.sub(12).toString()) + await advanceTime(DECAY_DELAY.sub(12).toString()) // Price is at saved prices const savedLowPrice = await cDaiCollateral.savedLowPrice() @@ -718,7 +718,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, @@ -743,7 +743,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi oracleError: ORACLE_ERROR, erc20: cDaiVault.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold, delayUntilDefault, diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index cfb97d23e0..77b1602c3e 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -10,7 +10,13 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' import { BigNumber, ContractFactory } from 'ethers' import { getChainId } from '../../../../common/blockchain-utils' import { bn, fp, toBNDecimals } from '../../../../common/numbers' -import { DefaultFixture, Fixture, getDefaultFixture, ORACLE_TIMEOUT } from '../fixtures' +import { + DefaultFixture, + Fixture, + getDefaultFixture, + ORACLE_TIMEOUT_BUFFER, + ORACLE_TIMEOUT, +} from '../fixtures' import { expectInIndirectReceipt } from '../../../../common/events' import { whileImpersonating } from '../../../utils/impersonation' import { @@ -444,9 +450,9 @@ export default function fn( expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) // After oracle timeout decay begins - const oracleTimeout = await ctx.collateral.oracleTimeout() - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) - await advanceBlocks(1 + oracleTimeout / 12) + const decayDelay = (await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) + await advanceBlocks(1 + decayDelay / 12) await ctx.collateral.refresh() await expectDecayedPrice(ctx.collateral.address) @@ -471,7 +477,9 @@ export default function fn( it('handles stale price', async () => { await advanceTime( - (await ctx.collateral.oracleTimeout()) + (await ctx.collateral.priceTimeout()) + ORACLE_TIMEOUT_BUFFER + + (await ctx.collateral.maxOracleTimeout()) + + (await ctx.collateral.priceTimeout()) ) // (0, FIX_MAX) is returned @@ -491,7 +499,7 @@ export default function fn( expect(p[0]).to.equal(savedLow) expect(p[1]).to.equal(savedHigh) - await advanceTime(await ctx.collateral.oracleTimeout()) + await advanceTime((await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER) // Should be roughly half, after half of priceTimeout const priceTimeout = await ctx.collateral.priceTimeout() @@ -659,8 +667,8 @@ export default function fn( }) it('enters IFFY state when price becomes stale', async () => { - const oracleTimeout = bn(defaultOpts.oracleTimeouts![0][0]) - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout.toNumber()) + const decayDelay = (await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER + await setNextBlockTimestamp((await getLatestBlockTimestamp()) + decayDelay) await ctx.collateral.refresh() expect(await ctx.collateral.status()).to.equal(CollateralStatus.IFFY) }) @@ -745,14 +753,16 @@ export default function fn( }) it('after oracle timeout', async () => { - const oracleTimeout = await ctx.collateral.oracleTimeout() + const oracleTimeout = (await ctx.collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER await setNextBlockTimestamp((await getLatestBlockTimestamp()) + oracleTimeout) await advanceBlocks(oracleTimeout / 12) }) it('after full price timeout', async () => { await advanceTime( - (await ctx.collateral.priceTimeout()) + (await ctx.collateral.oracleTimeout()) + ORACLE_TIMEOUT_BUFFER + + (await ctx.collateral.priceTimeout()) + + (await ctx.collateral.maxOracleTimeout()) ) const p = await ctx.collateral.price() expect(p[0]).to.equal(0) diff --git a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts index 0ab94cd268..ad87c603cb 100644 --- a/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/crv/CrvStableRTokenMetapoolTestSuite.test.ts @@ -4,6 +4,7 @@ import { CurveMetapoolCollateralOpts, MintCurveCollateralFunc, } from '../pluginTestTypes' +import { ORACLE_TIMEOUT_BUFFER } from '../../fixtures' import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' @@ -231,7 +232,7 @@ const collateralSpecificStatusTests = () => { await expectExactPrice(collateral.address, initialPrice) // Should decay after oracle timeout - await advanceTime(await collateral.oracleTimeout()) + await advanceTime((await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER) await expectDecayedPrice(collateral.address) // Should be unpriced after price timeout diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts index 11d8fcb5a9..89694aa40e 100644 --- a/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableRTokenMetapoolTestSuite.test.ts @@ -4,6 +4,7 @@ import { CurveMetapoolCollateralOpts, MintCurveCollateralFunc, } from '../pluginTestTypes' +import { ORACLE_TIMEOUT_BUFFER } from '../../fixtures' import { makeWeUSDFraxBP, mintWeUSDFraxBP, resetFork } from './helpers' import { ethers } from 'hardhat' import { ContractFactory, BigNumberish } from 'ethers' @@ -233,7 +234,7 @@ const collateralSpecificStatusTests = () => { await expectExactPrice(collateral.address, initialPrice) // Should decay after oracle timeout - await advanceTime(await collateral.oracleTimeout()) + await advanceTime((await collateral.maxOracleTimeout()) + ORACLE_TIMEOUT_BUFFER) await expectDecayedPrice(collateral.address) // Should be unpriced after price timeout diff --git a/test/plugins/individual-collateral/fixtures.ts b/test/plugins/individual-collateral/fixtures.ts index ae2e4a6da3..463bf9de1b 100644 --- a/test/plugins/individual-collateral/fixtures.ts +++ b/test/plugins/individual-collateral/fixtures.ts @@ -32,9 +32,11 @@ import { RecollateralizationLibP1, } from '../../../typechain' -export const ORACLE_TIMEOUT_PRE_BUFFER = bn('500000000') // 5700d - large for tests only +export const ORACLE_TIMEOUT = bn('500000000') // 5700d - large for tests only -export const ORACLE_TIMEOUT = ORACLE_TIMEOUT_PRE_BUFFER.add(300) +export const ORACLE_TIMEOUT_BUFFER = 300 + +export const DECAY_DELAY = ORACLE_TIMEOUT.add(ORACLE_TIMEOUT_BUFFER) export type Fixture = () => Promise diff --git a/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts index 32c4e2f591..bc1a466734 100644 --- a/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts @@ -283,6 +283,7 @@ const opts = { collateralName: 'L2LidoStakedETH', chainlinkDefaultAnswer: defaultAnswers.uoaPerTargetChainlinkFeed, itIsPricedByPeg: true, + itHasOracleRefPerTok: true, targetNetwork: 'base', toleranceDivisor: bn('1e2'), } diff --git a/test/plugins/individual-collateral/pluginTestTypes.ts b/test/plugins/individual-collateral/pluginTestTypes.ts index 2dca2653da..aa70a23c10 100644 --- a/test/plugins/individual-collateral/pluginTestTypes.ts +++ b/test/plugins/individual-collateral/pluginTestTypes.ts @@ -109,6 +109,9 @@ export interface CollateralTestSuiteFixtures // does the peg price matter for the results of tryPrice()? itIsPricedByPeg?: boolean + // is an oracle that could go stale involved in refPerTok? + itHasOracleRefPerTok?: boolean + // a function to reset the fork to a desired block resetFork: () => void diff --git a/test/scenario/BadCollateralPlugin.test.ts b/test/scenario/BadCollateralPlugin.test.ts index 9745c962b5..ec2e04c0ee 100644 --- a/test/scenario/BadCollateralPlugin.test.ts +++ b/test/scenario/BadCollateralPlugin.test.ts @@ -27,7 +27,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -104,7 +104,7 @@ describe(`Bad Collateral Plugin - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 6b7479212c..9dd384a82c 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -34,7 +34,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -172,7 +172,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ORACLE_ERROR, rsr.address, MAX_TRADE_VOLUME, - ORACLE_TIMEOUT_PRE_BUFFER + ORACLE_TIMEOUT ) ) await assetRegistry.connect(owner).swapRegistered(newRSRAsset.address) @@ -203,7 +203,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: usdToken.address, // DAI Token maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -227,8 +227,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: eurToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('EUR'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -248,7 +248,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cUSDTokenVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -269,7 +269,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), staticAToken: aUSDToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -293,8 +293,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), tokenAddress: wbtc.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), targetName: ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -323,8 +323,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { combinedOracleError: ORACLE_ERROR.toString(), cToken: cWBTCVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), - targetUnitOracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), + targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('BTC'), defaultThreshold: DEFAULT_THRESHOLD.toString(), delayUntilDefault: DELAY_UNTIL_DEFAULT.toString(), @@ -349,7 +349,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), tokenAddress: weth.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), noOutput: true, }) @@ -380,7 +380,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR.toString(), cToken: cETHVault.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER.toString(), + oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), revenueHiding: REVENUE_HIDING.toString(), referenceERC20Decimals: bn(18).toString(), diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index f1380b63f7..a3ab632140 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -28,7 +28,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -158,7 +158,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -198,7 +198,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: atoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -245,7 +245,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: ctoken.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NestedRTokens.test.ts b/test/scenario/NestedRTokens.test.ts index 38b11aba25..6386b158fd 100644 --- a/test/scenario/NestedRTokens.test.ts +++ b/test/scenario/NestedRTokens.test.ts @@ -22,7 +22,7 @@ import { DefaultFixture, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, REVENUE_HIDING, } from '../fixtures' @@ -119,7 +119,7 @@ describe(`Nested RTokens - P${IMPLEMENTATION}`, () => { oracleError: ORACLE_ERROR, erc20: staticATokenERC20.address, maxTradeVolume: one.config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/NontrivialPeg.test.ts b/test/scenario/NontrivialPeg.test.ts index c247b1cf98..70e0fa263f 100644 --- a/test/scenario/NontrivialPeg.test.ts +++ b/test/scenario/NontrivialPeg.test.ts @@ -23,7 +23,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, } from '../fixtures' @@ -82,7 +82,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -124,7 +124,7 @@ describe(`The peg (target/ref) should be arbitrary - P${IMPLEMENTATION}`, () => oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 815ff2f7fb..8b1cfa00fb 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, } from '../fixtures' @@ -116,7 +116,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME oracleError: ORACLE_ERROR, erc20: cDAI.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), defaultThreshold: DEFAULT_THRESHOLD, delayUntilDefault: DELAY_UNTIL_DEFAULT, diff --git a/test/scenario/SetProtocol.test.ts b/test/scenario/SetProtocol.test.ts index a9021be240..a2a67dd94a 100644 --- a/test/scenario/SetProtocol.test.ts +++ b/test/scenario/SetProtocol.test.ts @@ -25,7 +25,7 @@ import { defaultFixtureNoBasket, IMPLEMENTATION, ORACLE_ERROR, - ORACLE_TIMEOUT_PRE_BUFFER, + ORACLE_TIMEOUT, PRICE_TIMEOUT, } from '../fixtures' @@ -91,7 +91,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token0.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -106,7 +106,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token1.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('MKR'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, @@ -121,7 +121,7 @@ describe(`Linear combination of self-referential collateral - P${IMPLEMENTATION} oracleError: ORACLE_ERROR, erc20: token2.address, maxTradeVolume: config.rTokenMaxTradeVolume, - oracleTimeout: ORACLE_TIMEOUT_PRE_BUFFER, + oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('COMP'), defaultThreshold: bn(0), delayUntilDefault: DELAY_UNTIL_DEFAULT, From 9c3292f6b2aced0045eacee0077231ce542aeaa0 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 14 Feb 2024 15:10:09 -0500 Subject: [PATCH 211/450] remove unused frax oracle from configuration --- common/configuration.ts | 1 - test/plugins/individual-collateral/frax-eth/constants.ts | 1 - 2 files changed, 2 deletions(-) diff --git a/common/configuration.ts b/common/configuration.ts index ac18ca70ec..0b16a197e6 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -333,7 +333,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', diff --git a/test/plugins/individual-collateral/frax-eth/constants.ts b/test/plugins/individual-collateral/frax-eth/constants.ts index aa6cda39c6..0a03a3b9ca 100644 --- a/test/plugins/individual-collateral/frax-eth/constants.ts +++ b/test/plugins/individual-collateral/frax-eth/constants.ts @@ -7,7 +7,6 @@ export const FRX_ETH = networkConfig['31337'].tokens.frxETH as string export const SFRX_ETH = networkConfig['31337'].tokens.sfrxETH as string export const WETH = networkConfig['31337'].tokens.WETH as string export const FRX_ETH_MINTER = '0xbAFA44EFE7901E04E39Dad13167D089C559c1138' -export const FRXETH_ETH_PRICE_FEED = networkConfig['31337'].chainlinkFeeds.frxETH as string export const CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS = networkConfig['31337'] .CURVE_POOL_ETH_FRXETH as string From 3f449be2be9e121eddd9b7d3ee52c2ef7cf979f5 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 14 Feb 2024 15:13:52 -0500 Subject: [PATCH 212/450] remove unused frax oracle from configuration pt 2 --- common/configuration.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/common/configuration.ts b/common/configuration.ts index 0b16a197e6..c05602867d 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -434,7 +434,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', From eb71af1a60bb44bc677345e6352780e3bd9ba88c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 15 Feb 2024 10:58:22 -0500 Subject: [PATCH 213/450] FacadeRead: use avg price (#1068) --- CHANGELOG.md | 5 +++++ contracts/facade/FacadeRead.sol | 35 ++++++++++++++++++++------------- test/Facade.test.ts | 26 ++++++++++++++++++++---- 3 files changed, 48 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 511b236760..c78d68ccbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,6 +44,11 @@ New governance param added: `reweightable` - All plugins with multiple chainlink feeds will now timeout over the maximum of the feeds' timeouts - Add ORACLE_TIMEOUT_BUFFER to all usages of chainlink feeds +### Facades + +- `FacadeRead` + - Use avg prices instead of low prices in `backingOverview()` and `basketBreakdown()` + ### Trading - `DutchTrade` diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index 62f2cfc2f8..afae7f6589 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -210,13 +210,17 @@ contract FacadeRead is IFacadeRead { targets = new bytes32[](erc20s.length); for (uint256 i = 0; i < erc20s.length; ++i) { ICollateral coll = assetRegistry.toColl(IERC20(erc20s[i])); + targets[i] = coll.targetName(); + int8 decimals = int8(IERC20Metadata(erc20s[i]).decimals()); - (uint192 lowPrice, ) = coll.price(); + (uint192 low, uint192 high) = coll.price(); + if (low == 0 || high == FIX_MAX) continue; + + uint192 avg = (low + high) / 2; // {UoA/tok} // {UoA} = {qTok} * {tok/qTok} * {UoA/tok} - uoaAmts[i] = shiftl_toFix(deposits[i], -decimals).mul(lowPrice); + uoaAmts[i] = shiftl_toFix(deposits[i], -decimals).mul(avg); uoaSum += uoaAmts[i]; - targets[i] = coll.targetName(); } uoaShares = new uint192[](erc20s.length); @@ -359,17 +363,19 @@ contract FacadeRead is IFacadeRead { for (uint256 i = 0; i < basketERC20s.length; i++) { IAsset asset = reg.toAsset(IERC20(basketERC20s[i])); - // {UoA/tok} - (uint192 low, ) = asset.price(); - // {tok} uint192 needed = shiftl_toFix(quantities[i], -int8(asset.erc20Decimals())); + // {UoA/tok} + (uint192 low, uint192 high) = asset.price(); + if (low == 0 || high == FIX_MAX) continue; + uint192 avg = (low + high) / 2; + // {UoA} = {UoA} + {tok} - uoaNeeded += needed.mul(low); + uoaNeeded += needed.mul(avg); // {UoA} = {UoA} + {tok} * {UoA/tok} - uoaHeldInBaskets += fixMin(needed, asset.bal(address(bm))).mul(low); + uoaHeldInBaskets += fixMin(needed, asset.bal(address(bm))).mul(avg); } backing = uoaHeldInBaskets.div(uoaNeeded); @@ -383,13 +389,14 @@ contract FacadeRead is IFacadeRead { rsrAsset.bal(address(rToken.main().stRSR())) ); - (uint192 lowPrice, ) = rsrAsset.price(); + (uint192 lowPrice, uint192 highPrice) = rsrAsset.price(); + if (lowPrice > 0 && highPrice < FIX_MAX) { + // {UoA} = {tok} * {UoA/tok} + uint192 rsrUoA = rsrBal.mul((lowPrice + highPrice) / 2); - // {UoA} = {tok} * {UoA/tok} - uint192 rsrUoA = rsrBal.mul(lowPrice); - - // {1} = {UoA} / {UoA} - overCollateralization = rsrUoA.div(uoaNeeded); + // {1} = {UoA} / {UoA} + overCollateralization = rsrUoA.div(uoaNeeded); + } } /// @return low {UoA/tok} The low price of the RToken as given by the relevant RTokenAsset diff --git a/test/Facade.test.ts b/test/Facade.test.ts index e647e447c5..8a47823248 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -205,10 +205,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(erc20s[1]).to.equal(usdc.address) expect(erc20s[2]).to.equal(aToken.address) expect(erc20s[3]).to.equal(cTokenVault.address) - expect(breakdown[0]).to.be.closeTo(fp('0.25'), 10) - expect(breakdown[1]).to.be.closeTo(fp('0.25'), 10) - expect(breakdown[2]).to.be.closeTo(fp('0.25'), 10) - expect(breakdown[3]).to.be.closeTo(fp('0.25'), 10) + expect(breakdown[0]).to.equal(fp('0.25')) + expect(breakdown[1]).to.equal(fp('0.25')) + expect(breakdown[2]).to.equal(fp('0.25')) + expect(breakdown[3]).to.equal(fp('0.25')) expect(targets[0]).to.equal(ethers.utils.formatBytes32String('USD')) expect(targets[1]).to.equal(ethers.utils.formatBytes32String('USD')) expect(targets[2]).to.equal(ethers.utils.formatBytes32String('USD')) @@ -936,6 +936,24 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(targets[3]).to.equal(ethers.utils.formatBytes32String('USD')) }) + it('Should return basketBreakdown correctly for tokens with different oracleErrors', async () => { + const FiatCollateralFactory = await ethers.getContractFactory('FiatCollateral') + const largeErrDai = await FiatCollateralFactory.deploy({ + priceTimeout: await tokenAsset.priceTimeout(), + chainlinkFeed: await tokenAsset.chainlinkFeed(), + oracleError: ORACLE_ERROR.mul(4), + erc20: await tokenAsset.erc20(), + maxTradeVolume: await tokenAsset.maxTradeVolume(), + oracleTimeout: await tokenAsset.oracleTimeout(), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01'), + delayUntilDefault: await tokenAsset.delayUntilDefault(), + }) + await assetRegistry.swapRegistered(largeErrDai.address) + await basketHandler.connect(owner).refreshBasket() + await expectValidBasketBreakdown(rToken) // should still be 25/25/25/25 split + }) + it('Should return totalAssetValue correctly - FacadeTest', async () => { expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.equal(issueAmount) }) From e6e95d19fc5f6e636570f74719a8373cf7408a50 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 15 Feb 2024 17:10:30 -0500 Subject: [PATCH 214/450] add facade function to query issuable RToken using amounts (#1072) --- CHANGELOG.md | 5 ++++ contracts/facade/FacadeRead.sol | 44 +++++++++++++++++++++------- contracts/interfaces/IFacadeRead.sol | 7 +++++ test/Facade.test.ts | 26 ++++++++++++++++ 4 files changed, 71 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c78d68ccbe..94eac583c2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -55,6 +55,11 @@ New governance param added: `reweightable` - Add new `bidTradeCallback()` function to allow payment of tokens at the _end_ of the tx, removing need for flash loans. Example of how-to-use in `contracts/plugins/mocks/DutchTradeRouter.sol` + ### Facades + + - `FacadeRead` + - Add `maxIssuableByAmounts()` function to provide an estimation independent of account balances + # 3.1.0 ## Upgrade Steps diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index afae7f6589..a08ce4205e 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -28,6 +28,22 @@ contract FacadeRead is IFacadeRead { /// @return {qRTok} How many RToken `account` can issue given current holdings /// @custom:static-call function maxIssuable(IRToken rToken, address account) external returns (uint256) { + (address[] memory erc20s, ) = rToken.main().basketHandler().quote(FIX_ONE, FLOOR); + uint256[] memory balances = new uint256[](erc20s.length); + for (uint256 i = 0; i < erc20s.length; ++i) { + balances[i] = IERC20(erc20s[i]).balanceOf(account); + } + return maxIssuableByAmounts(rToken, balances); + } + + /// @param amounts {qTok} Amounts per basket ERC20 + /// Assumes same order as current basket ERC20s given by bh.quote() + /// @return {qRTok} How many RToken `account` can issue given current holdings + /// @custom:static-call + function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) + public + returns (uint256) + { IMain main = rToken.main(); require(!main.frozen(), "frozen"); @@ -35,19 +51,23 @@ contract FacadeRead is IFacadeRead { // Poke Main main.assetRegistry().refresh(); - // {BU} - BasketRange memory basketsHeld = main.basketHandler().basketsHeldBy(account); - uint192 needed = rToken.basketsNeeded(); - - int8 decimals = int8(rToken.decimals()); - - // return {qRTok} = {BU} * {(1 RToken) qRTok/BU)} - if (needed.eq(FIX_ZERO)) return basketsHeld.bottom.shiftl_toUint(decimals); + // Get basket ERC20s + IBasketHandler bh = main.basketHandler(); + (address[] memory erc20s, uint256[] memory quantities) = bh.quote(FIX_ONE, CEIL); - uint192 totalSupply = shiftl_toFix(rToken.totalSupply(), -decimals); // {rTok} + // Compute how many baskets we can mint with the collateral amounts + uint192 baskets = type(uint192).max; + for (uint256 i = 0; i < erc20s.length; ++i) { + // {BU} = {tok} / {tok/BU} + uint192 inBUs = divuu(amounts[i], quantities[i]); // FLOOR + baskets = fixMin(baskets, inBUs); + } - // {qRTok} = {BU} * {rTok} / {BU} * {qRTok/rTok} - return basketsHeld.bottom.mulDiv(totalSupply, needed).shiftl_toUint(decimals); + // Convert baskets to RToken + // {qRTok} = {qRTok/BU} * {qRTok} / {BU} + uint256 totalSupply = rToken.totalSupply(); + if (totalSupply == 0) return baskets; + return baskets.muluDivu(rToken.basketsNeeded(), rToken.totalSupply(), FLOOR); } /// Do no use inifite approvals. Instead, use BasketHandler.quote() to determine the amount @@ -426,5 +446,7 @@ contract FacadeRead is IFacadeRead { erc20s[i] = unfiltered[i]; } } + + // === Internal === } // slither-disable-end diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IFacadeRead.sol index 5471a1ebb3..8a3918be06 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IFacadeRead.sol @@ -18,6 +18,13 @@ interface IFacadeRead { /// @custom:static-call function maxIssuable(IRToken rToken, address account) external returns (uint256); + /// @param amounts {qTok} The balances of each basket ERC20 to assume + /// @return How many RToken can be issued + /// @custom:static-call + function maxIssuableByAmounts(IRToken rToken, uint256[] memory amounts) + external + returns (uint256); + /// @return tokens The erc20 needed for the issuance /// @return deposits {qTok} The deposits necessary to issue `amount` RToken /// @return depositsUoA {UoA} The UoA value of the deposits necessary to issue `amount` RToken diff --git a/test/Facade.test.ts b/test/Facade.test.ts index 8a47823248..f06031f2f1 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -256,6 +256,32 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { ) }) + it('Should return maxIssuableByAmounts correctly', async () => { + const [erc20Addrs] = await basketHandler.quote(fp('1'), 0) + const erc20s = await Promise.all(erc20Addrs.map((a) => ethers.getContractAt('ERC20Mock', a))) + const addr1Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr1.address))) + const addr2Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr2.address))) + const otherAmounts = await Promise.all(erc20s.map((e) => e.balanceOf(other.address))) + + // Check values + expect(await facade.callStatic.maxIssuableByAmounts(rToken.address, addr1Amounts)).to.equal( + bn('39999999900e18') + ) + expect(await facade.callStatic.maxIssuableByAmounts(rToken.address, addr2Amounts)).to.equal( + bn('40000000000e18') + ) + expect(await facade.callStatic.maxIssuableByAmounts(rToken.address, otherAmounts)).to.equal(0) + + // Redeem all RTokens + await rToken.connect(addr1).redeem(issueAmount) + const newAddr2Amounts = await Promise.all(erc20s.map((e) => e.balanceOf(addr2.address))) + + // With 0 baskets needed - Returns correct value + expect( + await facade.callStatic.maxIssuableByAmounts(rToken.address, newAddr2Amounts) + ).to.equal(bn('40000000000e18')) + }) + it('Should revert maxIssuable when frozen', async () => { await main.connect(owner).freezeShort() await expect(facade.callStatic.maxIssuable(rToken.address, addr1.address)).to.be.revertedWith( From b03cab62bde246d440a8c3c601567f341c559f07 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 15 Feb 2024 18:33:55 -0500 Subject: [PATCH 215/450] lint --- contracts/facade/FacadeRead.sol | 2 -- 1 file changed, 2 deletions(-) diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/FacadeRead.sol index a08ce4205e..8ad96bc3b0 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/FacadeRead.sol @@ -446,7 +446,5 @@ contract FacadeRead is IFacadeRead { erc20s[i] = unfiltered[i]; } } - - // === Internal === } // slither-disable-end From 4bfe7f5628fd4e11258c5b04a89810e1ae8b5c31 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 16 Feb 2024 11:36:28 -0500 Subject: [PATCH 216/450] Claim rewards on plugins (#1065) Co-authored-by: Akshat Mittal --- CHANGELOG.md | 43 +++ contracts/facade/FacadeMonitor.sol | 24 +- contracts/interfaces/IRewardable.sol | 2 + contracts/p0/mixins/Rewardable.sol | 20 +- contracts/p1/mixins/RewardableLib.sol | 25 +- contracts/plugins/assets/Asset.sol | 2 +- contracts/plugins/assets/RTokenAsset.sol | 2 +- .../assets/aave-v3/AaveV3FiatCollateral.sol | 21 +- .../assets/aave/ATokenFiatCollateral.sol | 7 +- .../compoundv2/CTokenFiatCollateral.sol | 43 +-- .../CTokenSelfReferentialCollateral.sol | 23 +- ...apper.sol => DEPRECATED_CTokenWrapper.sol} | 1 + .../plugins/assets/compoundv2/ICToken.sol | 2 + .../assets/compoundv3/CTokenV3Collateral.sol | 8 +- .../assets/curve/CurveStableCollateral.sol | 18 +- .../curve/CurveStableMetapoolCollateral.sol | 2 +- .../morpho-aave/MorphoFiatCollateral.sol | 12 +- .../stargate/StargatePoolFiatCollateral.sol | 8 +- .../yearnv2/YearnV2CurveFiatCollateral.sol | 2 +- contracts/plugins/mocks/CTokenMock.sol | 7 +- contracts/plugins/mocks/CTokenWrapperMock.sol | 60 ---- .../mocks/InvalidATokenFiatCollateralMock.sol | 2 +- scripts/deploy.ts | 1 - .../phase2-assets/2_deploy_collateral.ts | 115 +------ .../deploy_compound_v2_collateral.ts | 293 ---------------- scripts/verification/6_verify_collateral.ts | 21 +- tasks/deployment/mock/deploy-mock-ctoken.ts | 3 +- test/Facade.test.ts | 54 ++- test/FacadeWrite.test.ts | 10 +- test/Furnace.test.ts | 8 +- test/Main.test.ts | 6 +- test/RToken.test.ts | 8 +- test/Recollateralization.test.ts | 51 +-- test/Revenues.test.ts | 92 ++--- test/ZTradingExtremes.test.ts | 13 +- test/ZZStRSR.test.ts | 8 +- test/fixtures.ts | 34 +- test/integration/AssetPlugins.test.ts | 189 +++------- test/integration/fixtures.ts | 34 +- test/monitor/FacadeMonitor.test.ts | 44 +-- test/plugins/Asset.test.ts | 8 +- test/plugins/Collateral.test.ts | 106 ++---- .../aave/ATokenFiatCollateral.test.ts | 8 +- .../individual-collateral/collateralTests.ts | 17 - .../compoundv2/CTokenFiatCollateral.test.ts | 133 ++----- .../curve/collateralTests.ts | 3 +- test/scenario/ComplexBasket.test.ts | 324 ++++++++---------- test/scenario/MaxBasketSize.test.ts | 15 +- test/scenario/RevenueHiding.test.ts | 6 +- test/scenario/cETH.test.ts | 9 +- test/scenario/cWBTC.test.ts | 14 +- test/utils/tokens.ts | 6 +- 52 files changed, 662 insertions(+), 1305 deletions(-) rename contracts/plugins/assets/compoundv2/{CTokenWrapper.sol => DEPRECATED_CTokenWrapper.sol} (99%) delete mode 100644 contracts/plugins/mocks/CTokenWrapperMock.sol delete mode 100644 scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 511b236760..a31e3418ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,48 @@ # Changelog +# 3.3.0 + +This release improves how collateral plugins price LP tokens and moves reward claiming out to the asset plugin level. + +## Upgrade Steps + +Swapout all collateral plugins with appreciation. + +All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be traded out for the raw underlying CToken. + +### Core Protocol Contracts + +- `BackingManager` + `RevenueTrader` + - Change `claimRewards()` to delegatecall to the list of registered plugins + +## Plugins + +### Assets + +- compound-v2 + - Remove `CTokenWrapper` + - Add reward claiming logic to `claimRewards()` + - Emit `RewardsClaimed` event during `claimRewards()` +- compound-v3 + - Emit `RewardsClaimed` event during `claimRewards()` +- curve + - Make `price()` more resistant to manipulation by MEV + - Emit `RewardsClaimed` event during `claimRewards()` +- convex + - Make `price()` more resistant to manipulation by MEV + - Emit `RewardsClaimed` event during `claimRewards()` +- morpho-aave + - Emit `RewardsClaimed` event during `claimRewards()` +- stargate + - Emit `RewardsClaimed` event during `claimRewards()` +- yearn-v2 + - Make `price()` more resistant to manipulation by MEV + +### Facades + +- `FacadeMonitor.sol` + - Update compound-v2 implemention to deal with with-wrappper and without-wrapper cases + # 3.2.0 This release makes bidding in dutch auctions easier for MEV searchers and gives new RTokens being deployed the option to enable a variable target basket, or to be "reweightable". An RToken that is not reweightable cannot have its target basket changed in terms of quantities of target units. diff --git a/contracts/facade/FacadeMonitor.sol b/contracts/facade/FacadeMonitor.sol index e8221a1195..d14ad06a5c 100644 --- a/contracts/facade/FacadeMonitor.sol +++ b/contracts/facade/FacadeMonitor.sol @@ -9,7 +9,7 @@ import "../interfaces/IFacadeMonitor.sol"; import "../interfaces/IRToken.sol"; import "../libraries/Fixed.sol"; import "../p1/RToken.sol"; -import "../plugins/assets/compoundv2/CTokenWrapper.sol"; +import "../plugins/assets/compoundv2/DEPRECATED_CTokenWrapper.sol"; import "../plugins/assets/compoundv3/ICusdcV3Wrapper.sol"; import "../plugins/assets/stargate/StargateRewardableWrapper.sol"; import { StaticATokenV3LM } from "../plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol"; @@ -157,20 +157,18 @@ contract FacadeMonitor is Initializable, OwnableUpgradeable, UUPSUpgradeable, IF ); availableLiquidity = underlying.balanceOf(address(aToken)); } else if (collType == CollPluginType.COMPOUND_V2 || collType == CollPluginType.FLUX) { - ICToken cToken; - uint256 cTokenBal; - if (collType == CollPluginType.COMPOUND_V2) { - // CompoundV2 uses a vault to wrap the CToken - CTokenWrapper cTokenVault = CTokenWrapper(address(erc20)); - cToken = ICToken(address(cTokenVault.underlying())); - cTokenBal = cTokenVault.balanceOf(address(rToken.main().backingManager())); - } else { - // FLUX - Uses FToken directly (fork of CToken) - cToken = ICToken(address(erc20)); - cTokenBal = cToken.balanceOf(address(rToken.main().backingManager())); + // (1) OLD compound-v2 uses a wrapper + // (2) NEW compound-v2 does not use a wrapper + // (3) FLUX does not use a wrapper + ICToken cToken = ICToken(ICToken(address(erc20)).underlying()); // case (1) + + // solhint-disable-next-line no-empty-blocks + try cToken.underlying() returns (address) {} catch { + cToken = ICToken(address(erc20)); // case (2) or (3) } - IERC20 underlying = IERC20(cToken.underlying()); + uint256 cTokenBal = cToken.balanceOf(address(rToken.main().backingManager())); + IERC20 underlying = IERC20(cToken.underlying()); uint256 exchangeRate = cToken.exchangeRateStored(); backingBalance = (cTokenBal * exchangeRate) / 1e18; diff --git a/contracts/interfaces/IRewardable.sol b/contracts/interfaces/IRewardable.sol index 48da999850..75ad05f625 100644 --- a/contracts/interfaces/IRewardable.sol +++ b/contracts/interfaces/IRewardable.sol @@ -11,6 +11,8 @@ import "./IMain.sol"; */ interface IRewardable { /// Emitted whenever a reward token balance is claimed + /// @param erc20 The ERC20 of the reward token + /// @param amount {qTok} event RewardsClaimed(IERC20 indexed erc20, uint256 amount); /// Claim rewards earned by holding a balance of the ERC20 token diff --git a/contracts/p0/mixins/Rewardable.sol b/contracts/p0/mixins/Rewardable.sol index a2d0bcdbe6..a74a250016 100644 --- a/contracts/p0/mixins/Rewardable.sol +++ b/contracts/p0/mixins/Rewardable.sol @@ -19,9 +19,13 @@ abstract contract RewardableP0 is ComponentP0, IRewardableComponent { IERC20[] memory erc20s = reg.erc20s(); for (uint256 i = 0; i < erc20s.length; i++) { - // empty try/catch because not every erc20 will be wrapped & have a claimRewards func - // solhint-disable-next-line - try IRewardable(address(erc20s[i])).claimRewards() {} catch {} + IAsset asset = reg.toAsset(erc20s[i]); + + // Claim rewards via delegatecall + address(asset).functionDelegateCall( + abi.encodeWithSignature("claimRewards()"), + "rewards claim failed" + ); } } @@ -30,8 +34,12 @@ abstract contract RewardableP0 is ComponentP0, IRewardableComponent { /// @param erc20 The ERC20 to claimRewards on /// @custom:interaction CEI function claimRewardsSingle(IERC20 erc20) external notTradingPausedOrFrozen { - // empty try/catch because not every erc20 will be wrapped & have a claimRewards func - // solhint-disable-next-line - try IRewardable(address(erc20)).claimRewards() {} catch {} + IAsset asset = main.assetRegistry().toAsset(erc20); + + // Claim rewards via delegatecall + address(asset).functionDelegateCall( + abi.encodeWithSignature("claimRewards()"), + "rewards claim failed" + ); } } diff --git a/contracts/p1/mixins/RewardableLib.sol b/contracts/p1/mixins/RewardableLib.sol index 58b34987b4..79cb91426f 100644 --- a/contracts/p1/mixins/RewardableLib.sol +++ b/contracts/p1/mixins/RewardableLib.sol @@ -19,25 +19,28 @@ library RewardableLibP1 { // === Used by Traders + RToken === /// Claim all rewards - /// @custom:interaction mostly CEI but see comments // actions: - // try erc20.claimRewards() for erc20 in erc20s + // do asset.delegatecall(abi.encodeWithSignature("claimRewards()")) for asset in assets function claimRewards(IAssetRegistry reg) internal { Registry memory registry = reg.getRegistry(); - for (uint256 i = 0; i < registry.erc20s.length; ++i) { - // empty try/catch because not every erc20 will be wrapped & have a claimRewards func - // solhint-disable-next-line - try IRewardable(address(registry.erc20s[i])).claimRewards() {} catch {} + uint256 len = registry.assets.length; + for (uint256 i = 0; i < len; ++i) { + // Claim rewards via delegatecall + address(registry.assets[i]).functionDelegateCall( + abi.encodeWithSignature("claimRewards()"), + "rewards claim failed" + ); } } /// Claim rewards for a single ERC20 - /// @custom:interaction mostly CEI but see comments // actions: - // try erc20.claimRewards() + // do asset.delegatecall(abi.encodeWithSignature("claimRewards()")) function claimRewardsSingle(IAsset asset) internal { - // empty try/catch because not every erc20 will be wrapped & have a claimRewards func - // solhint-disable-next-line - try IRewardable(address(asset.erc20())).claimRewards() {} catch {} + // Claim rewards via delegatecall + address(asset).functionDelegateCall( + abi.encodeWithSignature("claimRewards()"), + "rewards claim failed" + ); } } diff --git a/contracts/plugins/assets/Asset.sol b/contracts/plugins/assets/Asset.sol index f2df97c40b..86a9a83b98 100644 --- a/contracts/plugins/assets/Asset.sol +++ b/contracts/plugins/assets/Asset.sol @@ -187,7 +187,7 @@ contract Asset is IAsset, VersionedAsset { // solhint-disable no-empty-blocks /// Claim rewards earned by holding a balance of the ERC20 token - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual {} // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/RTokenAsset.sol b/contracts/plugins/assets/RTokenAsset.sol index e9487fe671..a045e22fd7 100644 --- a/contracts/plugins/assets/RTokenAsset.sol +++ b/contracts/plugins/assets/RTokenAsset.sol @@ -134,7 +134,7 @@ contract RTokenAsset is IAsset, VersionedAsset, IRTokenOracle { // solhint-disable no-empty-blocks /// Claim rewards earned by holding a balance of the ERC20 token - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual {} // solhint-enable no-empty-blocks diff --git a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol index 8aa9d87eb1..240bbacf9f 100644 --- a/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol +++ b/contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol @@ -34,9 +34,24 @@ contract AaveV3FiatCollateral is AppreciatingFiatCollateral { } /// Claim rewards earned by holding a balance of the ERC20 token - /// delegatecall - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - StaticATokenV3LM(address(erc20)).claimRewards(); + StaticATokenV3LM erc20_ = StaticATokenV3LM(address(erc20)); + address[] memory rewardsList = erc20_.INCENTIVES_CONTROLLER().getRewardsList(); + uint256[] memory bals = new uint256[](rewardsList.length); + + uint256 len = rewardsList.length; + for (uint256 i = 0; i < len; i++) { + bals[i] = IERC20(rewardsList[i]).balanceOf(address(this)); + } + + IRewardable(address(erc20)).claimRewards(); + + for (uint256 i = 0; i < len; i++) { + emit RewardsClaimed( + IERC20(rewardsList[i]), + IERC20(rewardsList[i]).balanceOf(address(this)) - bals[i] + ); + } } } diff --git a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol index 439a711831..2a40884470 100644 --- a/contracts/plugins/assets/aave/ATokenFiatCollateral.sol +++ b/contracts/plugins/assets/aave/ATokenFiatCollateral.sol @@ -35,6 +35,8 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; + IERC20 private immutable stkAAVE; + // solhint-disable no-empty-blocks /// @param config.chainlinkFeed Feed units: {UoA/ref} @@ -43,6 +45,7 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { AppreciatingFiatCollateral(config, revenueHiding) { require(config.defaultThreshold > 0, "defaultThreshold zero"); + stkAAVE = IStaticAToken(address(erc20)).REWARD_TOKEN(); } // solhint-enable no-empty-blocks @@ -54,8 +57,10 @@ contract ATokenFiatCollateral is AppreciatingFiatCollateral { } /// Claim rewards earned by holding a balance of the ERC20 token - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { + uint256 bal = stkAAVE.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(stkAAVE, stkAAVE.balanceOf(address(this)) - bal); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol index 9434ddada5..057b10bc70 100644 --- a/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenFiatCollateral.sol @@ -12,7 +12,7 @@ import "./ICToken.sol"; * @title CTokenFiatCollateral * @notice Collateral plugin for a cToken of fiat collateral, like cUSDC or cUSDP * Expected: {tok} != {ref}, {ref} is pegged to {target} unless defaulting, {target} == {UoA} - * Also used for FluxFinance. Flexible enough to work with and without CTokenWrapper. + * Also used for FluxFinance. Should NOT use with an ERC20 wrapper. */ contract CTokenFiatCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; @@ -22,30 +22,21 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { uint8 public immutable referenceERC20Decimals; - ICToken public immutable cToken; // gas-optimization: access underlying cToken directly + IComptroller private immutable comptroller; - /// @param config.erc20 May be a CTokenWrapper or the cToken itself + IERC20 private immutable comp; // COMP token + + /// @param config.erc20 The CToken itself /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide constructor(CollateralConfig memory config, uint192 revenueHiding) AppreciatingFiatCollateral(config, revenueHiding) { require(config.defaultThreshold > 0, "defaultThreshold zero"); - - ICToken _cToken = ICToken(address(config.erc20)); - address _underlying = _cToken.underlying(); - uint8 _referenceERC20Decimals; - - // _underlying might be a wrapper at this point, try to go one level further - try ICToken(_underlying).underlying() returns (address _mostUnderlying) { - _cToken = ICToken(_underlying); - _referenceERC20Decimals = IERC20Metadata(_mostUnderlying).decimals(); - } catch { - _referenceERC20Decimals = IERC20Metadata(_underlying).decimals(); - } - - cToken = _cToken; - referenceERC20Decimals = _referenceERC20Decimals; + address referenceERC20 = ICToken(address(config.erc20)).underlying(); + referenceERC20Decimals = IERC20Metadata(referenceERC20).decimals(); require(referenceERC20Decimals > 0, "referenceERC20Decimals missing"); + comptroller = ICToken(address(config.erc20)).comptroller(); + comp = IERC20(comptroller.getCompAddress()); } /// Refresh exchange rates and update default status. @@ -54,7 +45,7 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { // == Refresh == // Update the Compound Protocol // solhint-disable no-empty-blocks - try cToken.exchangeRateCurrent() {} catch (bytes memory errData) { + try ICToken(address(erc20)).exchangeRateCurrent() {} catch (bytes memory errData) { CollateralStatus oldStatus = status(); // see: docs/solidity-style.md#Catching-Empty-Data @@ -73,16 +64,20 @@ contract CTokenFiatCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { - uint256 rate = cToken.exchangeRateStored(); + uint256 rate = ICToken(address(erc20)).exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; return shiftl_toFix(rate, shiftLeft); } /// Claim rewards earned by holding a balance of the ERC20 token - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - // solhint-ignore-next-line no-empty-blocks - try IRewardable(address(erc20)).claimRewards() {} catch {} - // erc20 may not be a CTokenWrapper + uint256 bal = comp.balanceOf(address(this)); + address[] memory holders = new address[](1); + address[] memory cTokens = new address[](1); + holders[0] = address(this); + cTokens[0] = address(erc20); + comptroller.claimComp(holders, cTokens, false, true); + emit RewardsClaimed(comp, comp.balanceOf(address(this)) - bal); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol index 34fdd32856..fcbe5651c8 100644 --- a/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol +++ b/contracts/plugins/assets/compoundv2/CTokenSelfReferentialCollateral.sol @@ -9,6 +9,7 @@ import "./ICToken.sol"; * @title CTokenSelfReferentialCollateral * @notice Collateral plugin for a cToken of unpegged collateral, such as cETH. * Expected: {tok} != {ref}, {ref} == {target}, {target} != {UoA} + * Should NOT use with an ERC20 wrapper. */ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; @@ -18,8 +19,11 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { uint8 public immutable referenceERC20Decimals; - ICToken public immutable cToken; // gas-optimization: access underlying cToken directly + IComptroller private immutable comptroller; + IERC20 private immutable comp; // COMP token + + /// @param config.erc20 The CToken itself /// @param config.chainlinkFeed Feed units: {UoA/ref} /// @param revenueHiding {1} A value like 1e-6 that represents the maximum refPerTok to hide /// @param referenceERC20Decimals_ The number of decimals in the reference token @@ -30,8 +34,9 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { ) AppreciatingFiatCollateral(config, revenueHiding) { require(config.defaultThreshold == 0, "default threshold not supported"); require(referenceERC20Decimals_ > 0, "referenceERC20Decimals missing"); - cToken = ICToken(address(RewardableERC20Wrapper(address(config.erc20)).underlying())); referenceERC20Decimals = referenceERC20Decimals_; + comptroller = ICToken(address(config.erc20)).comptroller(); + comp = IERC20(comptroller.getCompAddress()); } /// Can revert, used by other contract functions in order to catch errors @@ -65,7 +70,7 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { // == Refresh == // Update the Compound Protocol -- access cToken directly // solhint-disable no-empty-blocks - try cToken.exchangeRateCurrent() {} catch (bytes memory errData) { + try ICToken(address(erc20)).exchangeRateCurrent() {} catch (bytes memory errData) { CollateralStatus oldStatus = status(); // see: docs/solidity-style.md#Catching-Empty-Data @@ -84,14 +89,20 @@ contract CTokenSelfReferentialCollateral is AppreciatingFiatCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { - uint256 rate = cToken.exchangeRateStored(); + uint256 rate = ICToken(address(erc20)).exchangeRateStored(); int8 shiftLeft = 8 - int8(referenceERC20Decimals) - 18; return shiftl_toFix(rate, shiftLeft); } /// Claim rewards earned by holding a balance of the ERC20 token - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { - IRewardable(address(erc20)).claimRewards(); + uint256 bal = comp.balanceOf(address(this)); + address[] memory holders = new address[](1); + address[] memory cTokens = new address[](1); + holders[0] = address(this); + cTokens[0] = address(erc20); + comptroller.claimComp(holders, cTokens, false, true); + emit RewardsClaimed(comp, comp.balanceOf(address(this)) - bal); } } diff --git a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol b/contracts/plugins/assets/compoundv2/DEPRECATED_CTokenWrapper.sol similarity index 99% rename from contracts/plugins/assets/compoundv2/CTokenWrapper.sol rename to contracts/plugins/assets/compoundv2/DEPRECATED_CTokenWrapper.sol index 27b37d8382..c4c5a10d80 100644 --- a/contracts/plugins/assets/compoundv2/CTokenWrapper.sol +++ b/contracts/plugins/assets/compoundv2/DEPRECATED_CTokenWrapper.sol @@ -5,6 +5,7 @@ import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; import "../erc20/RewardableERC20Wrapper.sol"; import "./ICToken.sol"; +/// DEPRECATED contract CTokenWrapper is RewardableERC20Wrapper { using SafeERC20 for ERC20; diff --git a/contracts/plugins/assets/compoundv2/ICToken.sol b/contracts/plugins/assets/compoundv2/ICToken.sol index c83f9a3552..2fa76ec185 100644 --- a/contracts/plugins/assets/compoundv2/ICToken.sol +++ b/contracts/plugins/assets/compoundv2/ICToken.sol @@ -31,6 +31,8 @@ interface ICToken is IERC20Metadata { * @return uint 0=success, otherwise a failure (see ErrorReporter.sol for details) */ function redeem(uint256 redeemTokens) external returns (uint256); + + function comptroller() external view returns (IComptroller); } interface TestICToken is ICToken { diff --git a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol index 7ea45ec6be..eed7b3bd53 100644 --- a/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol +++ b/contracts/plugins/assets/compoundv3/CTokenV3Collateral.sol @@ -22,10 +22,10 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; using FixLib for uint192; - IERC20 public immutable rewardERC20; IComet public immutable comet; uint256 public immutable reservesThresholdIffy; // {qUSDC} uint8 public immutable cometDecimals; + IERC20 private immutable comp; /// @param config.chainlinkFeed Feed units: {UoA/ref} constructor( @@ -34,15 +34,17 @@ contract CTokenV3Collateral is AppreciatingFiatCollateral { uint256 reservesThresholdIffy_ ) AppreciatingFiatCollateral(config, revenueHiding) { require(config.defaultThreshold > 0, "defaultThreshold zero"); - rewardERC20 = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); + comp = ICusdcV3Wrapper(address(config.erc20)).rewardERC20(); comet = IComet(address(ICusdcV3Wrapper(address(erc20)).underlyingComet())); reservesThresholdIffy = reservesThresholdIffy_; cometDecimals = comet.decimals(); } - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external override(Asset, IRewardable) { + uint256 bal = comp.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(comp, comp.balanceOf(address(this)) - bal); } function underlyingRefPerTok() public view virtual override returns (uint192) { diff --git a/contracts/plugins/assets/curve/CurveStableCollateral.sol b/contracts/plugins/assets/curve/CurveStableCollateral.sol index c8847b3b3d..a623d41b3f 100644 --- a/contracts/plugins/assets/curve/CurveStableCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableCollateral.sol @@ -7,6 +7,7 @@ import "@chainlink/contracts/src/v0.8/interfaces/AggregatorV3Interface.sol"; import "contracts/interfaces/IAsset.sol"; import "contracts/libraries/Fixed.sol"; import "contracts/plugins/assets/AppreciatingFiatCollateral.sol"; +import "contracts/plugins/assets/erc20/RewardableERC20.sol"; import "../curve/PoolTokens.sol"; /** @@ -15,6 +16,7 @@ import "../curve/PoolTokens.sol"; * whether this LP token ends up staked in Curve, Convex, Frax, or somewhere else. * Each token in the pool can have between 1 and 2 oracles per each token. * Stable means only like-kind pools. + * Works for both CurveGaugeWrapper and ConvexStakingWrapper. * * tok = ConvexStakingWrapper(stablePlainPool) * ref = stablePlainPool pool invariant @@ -28,8 +30,14 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { using OracleLib for AggregatorV3Interface; using FixLib for uint192; + // I don't love hard-coding these, but I prefer it to dynamically reading from either + // a CurveGaugeWrapper or ConvexStakingWrapper. If we ever use this contract + // on something other than mainnet we'll have to change this. + IERC20 public constant CRV = IERC20(0xD533a949740bb3306d119CC777fa900bA034cd52); + IERC20 public constant CVX = IERC20(0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B); + /// @dev config Unused members: chainlinkFeed, oracleError, oracleTimeout - /// @dev config.erc20 should be a RewardableERC20 + /// @dev config.erc20 should be a CurveGaugeWrapper or ConvexStakingWrapper constructor( CollateralConfig memory config, uint192 revenueHiding, @@ -154,9 +162,15 @@ contract CurveStableCollateral is AppreciatingFiatCollateral, PoolTokens { } /// Claim rewards earned by holding a balance of the ERC20 token - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual override(Asset, IRewardable) { + // Plugin can be used with either Curve or Convex wrappers + // Here I prefer omitting any wrapper-specific logic at the cost of an additional event + uint256 crvBal = CRV.balanceOf(address(this)); + uint256 cvxBal = CVX.balanceOf(address(this)); IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(CRV, CRV.balanceOf(address(this)) - crvBal); + emit RewardsClaimed(CVX, CVX.balanceOf(address(this)) - cvxBal); } // === Internal === diff --git a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol index 717707c0f6..8f759b4e96 100644 --- a/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol +++ b/contracts/plugins/assets/curve/CurveStableMetapoolCollateral.sol @@ -134,7 +134,7 @@ contract CurveStableMetapoolCollateral is CurveStableCollateral { /// @return {ref/tok} Actual quantity of whole reference units per whole collateral tokens function underlyingRefPerTok() public view override returns (uint192) { - return _safeWrap(metapoolToken.get_virtual_price()); + return _safeWrap(metapoolToken.get_virtual_price()); // includes inner virtual price } // Check for defaults outside the pool diff --git a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol index 96cb195a62..5b55214855 100644 --- a/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol +++ b/contracts/plugins/assets/morpho-aave/MorphoFiatCollateral.sol @@ -2,7 +2,7 @@ pragma solidity 0.8.19; // solhint-disable-next-line max-line-length -import { AppreciatingFiatCollateral, CollateralConfig } from "../AppreciatingFiatCollateral.sol"; +import { Asset, AppreciatingFiatCollateral, CollateralConfig, IRewardable } from "../AppreciatingFiatCollateral.sol"; import { MorphoTokenisedDeposit } from "./MorphoTokenisedDeposit.sol"; import { OracleLib } from "../OracleLib.sol"; // solhint-disable-next-line max-line-length @@ -18,6 +18,7 @@ import { shiftl_toFix, FIX_ONE } from "../../../libraries/Fixed.sol"; contract MorphoFiatCollateral is AppreciatingFiatCollateral { using OracleLib for AggregatorV3Interface; + IERC20Metadata private immutable morpho; uint256 private immutable oneShare; int8 private immutable refDecimals; @@ -30,6 +31,7 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { require(address(config.erc20) != address(0), "missing erc20"); require(config.defaultThreshold > 0, "defaultThreshold zero"); MorphoTokenisedDeposit vault = MorphoTokenisedDeposit(address(config.erc20)); + morpho = IERC20Metadata(address(vault.rewardToken())); oneShare = 10**vault.decimals(); refDecimals = int8(uint8(IERC20Metadata(vault.asset()).decimals())); } @@ -42,4 +44,12 @@ contract MorphoFiatCollateral is AppreciatingFiatCollateral { -refDecimals ); } + + /// Claim rewards earned by holding a balance of the ERC20 token + /// @custom:delegate-call + function claimRewards() external virtual override(Asset, IRewardable) { + uint256 bal = morpho.balanceOf(address(this)); + IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(morpho, morpho.balanceOf(address(this)) - bal); + } } diff --git a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol index b9b815ed48..7deb645d81 100644 --- a/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol +++ b/contracts/plugins/assets/stargate/StargatePoolFiatCollateral.sol @@ -17,6 +17,9 @@ import "./StargateRewardableWrapper.sol"; contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { IStargatePool private immutable pool; + IERC20 private immutable stg; + + /// @param config.erc20 StargateRewardableWrapper /// @param config.chainlinkFeed Feed units: {UoA/ref} // solhint-disable no-empty-blocks constructor(CollateralConfig memory config, uint192 revenueHiding) @@ -24,6 +27,7 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { { require(config.defaultThreshold > 0, "defaultThreshold zero"); pool = StargateRewardableWrapper(address(config.erc20)).pool(); + stg = StargateRewardableWrapper(address(config.erc20)).rewardToken(); } /// @return _rate {ref/tok} Quantity of whole reference units per whole collateral tokens @@ -38,6 +42,8 @@ contract StargatePoolFiatCollateral is AppreciatingFiatCollateral { } function claimRewards() external override(Asset, IRewardable) { - StargateRewardableWrapper(address(erc20)).claimRewards(); + uint256 bal = stg.balanceOf(address(this)); + IRewardable(address(erc20)).claimRewards(); + emit RewardsClaimed(stg, stg.balanceOf(address(this)) - bal); } } diff --git a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol index d3b0d1b836..7644f58759 100644 --- a/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol +++ b/contracts/plugins/assets/yearnv2/YearnV2CurveFiatCollateral.sol @@ -83,7 +83,7 @@ contract YearnV2CurveFiatCollateral is CurveStableCollateral { // solhint-disable no-empty-blocks - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external virtual override { // No rewards to claim, everything is part of the pricePerShare } diff --git a/contracts/plugins/mocks/CTokenMock.sol b/contracts/plugins/mocks/CTokenMock.sol index a0d4f0b562..a1208f2cb1 100644 --- a/contracts/plugins/mocks/CTokenMock.sol +++ b/contracts/plugins/mocks/CTokenMock.sol @@ -3,6 +3,7 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol"; import "../../libraries/Fixed.sol"; +import "../assets/compoundv2/ICToken.sol"; import "./ERC20Mock.sol"; contract CTokenMock is ERC20Mock { @@ -13,13 +14,17 @@ contract CTokenMock is ERC20Mock { bool public revertExchangeRate; + IComptroller public immutable comptroller; + constructor( string memory name, string memory symbol, - address underlyingToken + address underlyingToken, + IComptroller _comptroller ) ERC20Mock(name, symbol) { _underlyingToken = underlyingToken; _exchangeRate = _toExchangeRate(FIX_ONE); + comptroller = _comptroller; } function decimals() public pure override returns (uint8) { diff --git a/contracts/plugins/mocks/CTokenWrapperMock.sol b/contracts/plugins/mocks/CTokenWrapperMock.sol deleted file mode 100644 index 78a93b44af..0000000000 --- a/contracts/plugins/mocks/CTokenWrapperMock.sol +++ /dev/null @@ -1,60 +0,0 @@ -// SPDX-License-Identifier: BlueOak-1.0.0 -pragma solidity ^0.8.19; - -import "@openzeppelin/contracts/token/ERC20/ERC20.sol"; -import "../assets/compoundv2/CTokenWrapper.sol"; -import "../assets/compoundv2/ICToken.sol"; -import "./CTokenMock.sol"; - -contract CTokenWrapperMock is ERC20Mock, IRewardable { - ERC20Mock public comp; - CTokenMock public underlying; - IComptroller public comptroller; - - bool public revertClaimRewards; - - constructor( - string memory _name, - string memory _symbol, - address _underlyingToken, - ERC20Mock _comp, - IComptroller _comptroller - ) ERC20Mock(_name, _symbol) { - underlying = new CTokenMock("cToken Mock", "cMOCK", _underlyingToken); - comp = _comp; - comptroller = _comptroller; - } - - function decimals() public pure override returns (uint8) { - return 8; - } - - function exchangeRateCurrent() external returns (uint256) { - return underlying.exchangeRateCurrent(); - } - - function exchangeRateStored() external view returns (uint256) { - return underlying.exchangeRateStored(); - } - - function claimRewards() external { - if (revertClaimRewards) { - revert("reverting claim rewards"); - } - uint256 oldBal = comp.balanceOf(msg.sender); - address[] memory holders = new address[](1); - address[] memory cTokens = new address[](1); - holders[0] = msg.sender; - cTokens[0] = address(underlying); - comptroller.claimComp(holders, cTokens, false, true); - emit RewardsClaimed(IERC20(address(comp)), comp.balanceOf(msg.sender) - oldBal); - } - - function setExchangeRate(uint192 fiatcoinRedemptionRate) external { - underlying.setExchangeRate(fiatcoinRedemptionRate); - } - - function setRevertClaimRewards(bool newVal) external { - revertClaimRewards = newVal; - } -} diff --git a/contracts/plugins/mocks/InvalidATokenFiatCollateralMock.sol b/contracts/plugins/mocks/InvalidATokenFiatCollateralMock.sol index a1f8bdbb38..dfd5197c20 100644 --- a/contracts/plugins/mocks/InvalidATokenFiatCollateralMock.sol +++ b/contracts/plugins/mocks/InvalidATokenFiatCollateralMock.sol @@ -9,7 +9,7 @@ contract InvalidATokenFiatCollateralMock is ATokenFiatCollateral { {} /// Reverting claimRewards function - /// DEPRECATED: claimRewards() will be removed from all assets and collateral plugins + /// @custom:delegate-call function claimRewards() external pure override { revert("claimRewards() error"); } diff --git a/scripts/deploy.ts b/scripts/deploy.ts index e2916e7d00..93be6125db 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -47,7 +47,6 @@ async function main() { 'phase2-assets/assets/deploy_crv.ts', 'phase2-assets/assets/deploy_cvx.ts', 'phase2-assets/2_deploy_collateral.ts', - 'phase2-assets/collaterals/deploy_compound_v2_collateral.ts', 'phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts', 'phase2-assets/collaterals/deploy_rocket_pool_reth_collateral.ts', 'phase2-assets/collaterals/deploy_flux_finance_collateral.ts', diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index 5a58c3bea8..d16a1e6168 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -448,27 +448,11 @@ async function main() { /*** Compound V2 not available in Base L2s */ if (!baseL2Chains.includes(hre.network.name)) { /******** Deploy CToken Fiat Collateral - cDAI **************************/ - const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') - const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) - - const cDaiVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cDAI!, - `${await cDai.name()} Vault`, - `${await cDai.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cDaiVault.deployed() - - console.log( - `Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} ` - ) - const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, oracleError: fp('0.0025').toString(), // 0.25% - cToken: cDaiVault.address, + cToken: networkConfig[chainId].tokens.cDAI, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -481,32 +465,17 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.cDAI = cDaiCollateral - assetCollDeployments.erc20s.cDAI = cDaiVault.address + assetCollDeployments.erc20s.cDAI = networkConfig[chainId].tokens.cDAI deployedCollateral.push(cDaiCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) /******** Deploy CToken Fiat Collateral - cUSDC **************************/ - const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) - - const cUsdcVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDC!, - `${await cUsdc.name()} Vault`, - `${await cUsdc.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdcVault.deployed() - - console.log( - `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` - ) - const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdcVault.address, + cToken: networkConfig[chainId].tokens.cUSDC, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -519,32 +488,17 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.cUSDC = cUsdcCollateral - assetCollDeployments.erc20s.cUSDC = cUsdcVault.address + assetCollDeployments.erc20s.cUSDC = networkConfig[chainId].tokens.cUSDC deployedCollateral.push(cUsdcCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) /******** Deploy CToken Fiat Collateral - cUSDT **************************/ - const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) - - const cUsdtVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDT!, - `${await cUsdt.name()} Vault`, - `${await cUsdt.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdtVault.deployed() - - console.log( - `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` - ) - const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdtVault.address, + cToken: networkConfig[chainId].tokens.cUSDT, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '86400', // 24 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -557,32 +511,17 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.cUSDT = cUsdtCollateral - assetCollDeployments.erc20s.cUSDT = cUsdtVault.address + assetCollDeployments.erc20s.cUSDT = networkConfig[chainId].tokens.cUSDT deployedCollateral.push(cUsdtCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) /******** Deploy CToken Fiat Collateral - cUSDP **************************/ - const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) - - const cUsdpVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDP!, - `${await cUsdp.name()} Vault`, - `${await cUsdp.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdpVault.deployed() - - console.log( - `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` - ) - const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, oracleError: fp('0.01').toString(), // 1% - cToken: cUsdpVault.address, + cToken: networkConfig[chainId].tokens.cUSDP, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -595,33 +534,18 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.cUSDP = cUsdpCollateral - assetCollDeployments.erc20s.cUSDP = cUsdpVault.address + assetCollDeployments.erc20s.cUSDP = networkConfig[chainId].tokens.cUSDP deployedCollateral.push(cUsdpCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ - const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) - - const cWBTCVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cWBTC!, - `${await cWBTC.name()} Vault`, - `${await cWBTC.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cWBTCVault.deployed() - - console.log( - `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` - ) - const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { priceTimeout: priceTimeout.toString(), referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, combinedOracleError: combinedBTCWBTCError.toString(), - cToken: cWBTCVault.address, + cToken: networkConfig[chainId].tokens.cWBTC, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '86400', // 24 hr targetUnitOracleTimeout: '3600', // 1 hr @@ -635,34 +559,19 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.cWBTC = cWBTCCollateral - assetCollDeployments.erc20s.cWBTC = cWBTCVault.address + assetCollDeployments.erc20s.cWBTC = networkConfig[chainId].tokens.cWBTC deployedCollateral.push(cWBTCCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) /******** Deploy CToken Self-Referential Collateral - cETH **************************/ - const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) - - const cETHVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cETH!, - `${await cETH.name()} Vault`, - `${await cETH.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cETHVault.deployed() - - console.log( - `Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} ` - ) - const { collateral: cETHCollateral } = await hre.run( 'deploy-ctoken-selfreferential-collateral', { priceTimeout: priceTimeout.toString(), priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, oracleError: fp('0.005').toString(), // 0.5% - cToken: cETHVault.address, + cToken: networkConfig[chainId].tokens.cETH, maxTradeVolume: fp('1e6').toString(), // $1m, oracleTimeout: '3600', // 1 hr targetName: hre.ethers.utils.formatBytes32String('ETH'), @@ -675,7 +584,7 @@ async function main() { expect(await collateral.status()).to.equal(CollateralStatus.SOUND) assetCollDeployments.collateral.cETH = cETHCollateral - assetCollDeployments.erc20s.cETH = cETHVault.address + assetCollDeployments.erc20s.cETH = networkConfig[chainId].tokens.cETH deployedCollateral.push(cETHCollateral.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts deleted file mode 100644 index 89b2464c55..0000000000 --- a/scripts/deployment/phase2-assets/collaterals/deploy_compound_v2_collateral.ts +++ /dev/null @@ -1,293 +0,0 @@ -import fs from 'fs' -import hre, { ethers } from 'hardhat' -import { expect } from 'chai' -import { getChainId } from '../../../../common/blockchain-utils' -import { baseL2Chains, networkConfig } from '../../../../common/configuration' -import { bn, fp } from '../../../../common/numbers' -import { CollateralStatus } from '../../../../common/constants' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, - getDeploymentFilename, - fileExists, -} from '../../common' -import { combinedError, priceTimeout, revenueHiding } from '../../utils' -import { ICollateral } from '../../../../typechain' - -async function main() { - // ==== Read Configuration ==== - const [burner] = await hre.ethers.getSigners() - - const chainId = await getChainId(hre) - - console.log(`Deploying Collateral to network ${hre.network.name} (${chainId}) - with burner account: ${burner.address}`) - - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - // Get phase1 deployment - const phase1File = getDeploymentFilename(chainId) - if (!fileExists(phase1File)) { - throw new Error(`${phase1File} doesn't exist yet. Run phase 1`) - } - // Check previous step completed - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - const assetCollDeployments = getDeploymentFile(assetCollDeploymentFilename) - - // Get Oracle Lib address if previously deployed (can override with arbitrary address) - const deployedCollateral: string[] = [] - - let collateral: ICollateral - - const wbtcOracleError = fp('0.02') // 2% - const btcOracleError = fp('0.005') // 0.5% - const combinedBTCWBTCError = combinedError(wbtcOracleError, btcOracleError) - - /*** Compound V2 not available in Base L2s */ - if (!baseL2Chains.includes(hre.network.name)) { - /******** Deploy CToken Fiat Collateral - cDAI **************************/ - const CTokenFactory = await ethers.getContractFactory('CTokenWrapper') - const cDai = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cDAI!) - - const cDaiVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cDAI!, - `${await cDai.name()} Vault`, - `${await cDai.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cDaiVault.deployed() - - console.log( - `Deployed Vault for cDAI on ${hre.network.name} (${chainId}): ${cDaiVault.address} ` - ) - - const { collateral: cDaiCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.DAI, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cDaiVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cDaiCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cDAI = cDaiCollateral - assetCollDeployments.erc20s.cDAI = cDaiVault.address - deployedCollateral.push(cDaiCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDC **************************/ - const cUsdc = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDC!) - - const cUsdcVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDC!, - `${await cUsdc.name()} Vault`, - `${await cUsdc.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdcVault.deployed() - - console.log( - `Deployed Vault for cUSDC on ${hre.network.name} (${chainId}): ${cUsdcVault.address} ` - ) - - const { collateral: cUsdcCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDC, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdcVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdcCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDC = cUsdcCollateral - assetCollDeployments.erc20s.cUSDC = cUsdcVault.address - deployedCollateral.push(cUsdcCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDT **************************/ - const cUsdt = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDT!) - - const cUsdtVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDT!, - `${await cUsdt.name()} Vault`, - `${await cUsdt.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdtVault.deployed() - - console.log( - `Deployed Vault for cUSDT on ${hre.network.name} (${chainId}): ${cUsdtVault.address} ` - ) - - const { collateral: cUsdtCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDT, - oracleError: fp('0.0025').toString(), // 0.25% - cToken: cUsdtVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125').toString(), // 1.25% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDT = cUsdtCollateral - assetCollDeployments.erc20s.cUSDT = cUsdtVault.address - deployedCollateral.push(cUsdtCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Fiat Collateral - cUSDP **************************/ - const cUsdp = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cUSDP!) - - const cUsdpVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cUSDP!, - `${await cUsdp.name()} Vault`, - `${await cUsdp.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cUsdpVault.deployed() - - console.log( - `Deployed Vault for cUSDP on ${hre.network.name} (${chainId}): ${cUsdpVault.address} ` - ) - - const { collateral: cUsdpCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.USDP, - oracleError: fp('0.01').toString(), // 1% - cToken: cUsdpVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.02').toString(), // 2% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cUsdpCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cUSDP = cUsdpCollateral - assetCollDeployments.erc20s.cUSDP = cUsdpVault.address - deployedCollateral.push(cUsdpCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Non-Fiat Collateral - cWBTC **************************/ - const cWBTC = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cWBTC!) - - const cWBTCVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cWBTC!, - `${await cWBTC.name()} Vault`, - `${await cWBTC.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cWBTCVault.deployed() - - console.log( - `Deployed Vault for cWBTC on ${hre.network.name} (${chainId}): ${cWBTCVault.address} ` - ) - - const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { - priceTimeout: priceTimeout.toString(), - referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.WBTC, - targetUnitFeed: networkConfig[chainId].chainlinkFeeds.BTC, - combinedOracleError: combinedBTCWBTCError.toString(), - cToken: cWBTCVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetUnitOracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('BTC'), - defaultThreshold: fp('0.01').add(combinedBTCWBTCError).toString(), // ~3.5% - delayUntilDefault: bn('86400').toString(), // 24h - revenueHiding: revenueHiding.toString(), - }) - collateral = await ethers.getContractAt('ICollateral', cWBTCCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cWBTC = cWBTCCollateral - assetCollDeployments.erc20s.cWBTC = cWBTCVault.address - deployedCollateral.push(cWBTCCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - - /******** Deploy CToken Self-Referential Collateral - cETH **************************/ - const cETH = await ethers.getContractAt('IERC20Metadata', networkConfig[chainId].tokens.cETH!) - - const cETHVault = await CTokenFactory.deploy( - networkConfig[chainId].tokens.cETH!, - `${await cETH.name()} Vault`, - `${await cETH.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER! - ) - - await cETHVault.deployed() - - console.log( - `Deployed Vault for cETH on ${hre.network.name} (${chainId}): ${cETHVault.address} ` - ) - - const { collateral: cETHCollateral } = await hre.run( - 'deploy-ctoken-selfreferential-collateral', - { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.ETH, - oracleError: fp('0.005').toString(), // 0.5% - cToken: cETHVault.address, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '3600', // 1 hr - targetName: hre.ethers.utils.formatBytes32String('ETH'), - revenueHiding: revenueHiding.toString(), - referenceERC20Decimals: '18', - } - ) - collateral = await ethers.getContractAt('ICollateral', cETHCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.cETH = cETHCollateral - assetCollDeployments.erc20s.cETH = cETHVault.address - deployedCollateral.push(cETHCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - } - - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) - New deployments: ${deployedCollateral} - Deployment file: ${assetCollDeploymentFilename}`) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verification/6_verify_collateral.ts b/scripts/verification/6_verify_collateral.ts index fbcfe84d23..41a4375322 100644 --- a/scripts/verification/6_verify_collateral.ts +++ b/scripts/verification/6_verify_collateral.ts @@ -9,7 +9,7 @@ import { IAssetCollDeployments, } from '../deployment/common' import { combinedError, priceTimeout, revenueHiding, verifyContract } from '../deployment/utils' -import { ATokenMock, ATokenFiatCollateral, ICToken, CTokenFiatCollateral } from '../../typechain' +import { ATokenMock, ATokenFiatCollateral } from '../../typechain' let deployments: IAssetCollDeployments @@ -115,25 +115,6 @@ async function main() { ], 'contracts/plugins/assets/aave/ATokenFiatCollateral.sol:ATokenFiatCollateral' ) - /******** Verify CTokenWrapper - cDAI **************************/ - const cToken: ICToken = ( - await ethers.getContractAt('ICToken', networkConfig[chainId].tokens.cDAI as string) - ) - const cTokenCollateral: CTokenFiatCollateral = ( - await ethers.getContractAt('CTokenFiatCollateral', deployments.collateral.cDAI as string) - ) - - await verifyContract( - chainId, - await cTokenCollateral.erc20(), - [ - cToken.address, - `${await cToken.name()} Vault`, - `${await cToken.symbol()}-VAULT`, - networkConfig[chainId].COMPTROLLER!, - ], - 'contracts/plugins/assets/compoundv2/CTokenWrapper.sol:CTokenWrapper' - ) /********************** Verify CTokenFiatCollateral - cDAI ****************************************/ await verifyContract( chainId, diff --git a/tasks/deployment/mock/deploy-mock-ctoken.ts b/tasks/deployment/mock/deploy-mock-ctoken.ts index aedc14c43e..c140adc2e9 100644 --- a/tasks/deployment/mock/deploy-mock-ctoken.ts +++ b/tasks/deployment/mock/deploy-mock-ctoken.ts @@ -6,6 +6,7 @@ task('deploy-mock-ctoken', 'Deploys a mock CToken') .addParam('name', 'Token name') .addParam('symbol', 'Token symbol') .addParam('erc20', 'Underlying ERC20 address') + .addParam('comptroller', 'The Comptroller') .addOptionalParam('noOutput', 'Suppress output', false, types.boolean) .setAction(async (params, hre) => { const [deployer] = await hre.ethers.getSigners() @@ -21,7 +22,7 @@ task('deploy-mock-ctoken', 'Deploys a mock CToken') const erc20 = ( await (await hre.ethers.getContractFactory('CTokenMock')) .connect(deployer) - .deploy(params.name, params.symbol, params.erc20) + .deploy(params.name, params.symbol, params.erc20, params.comptroller) ) await erc20.deployed() diff --git a/test/Facade.test.ts b/test/Facade.test.ts index e647e447c5..f863d38d69 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -17,7 +17,7 @@ import { BackingMgrCompatibleV2, BackingMgrInvalidVersion, ComptrollerMock, - CTokenWrapperMock, + CTokenMock, ERC20Mock, FacadeAct, FacadeMonitor, @@ -78,7 +78,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { let token: ERC20Mock let usdc: USDCMock let aToken: StaticATokenMock - let cTokenVault: CTokenWrapperMock + let cToken: CTokenMock let aaveToken: ERC20Mock let compToken: ERC20Mock let compoundMock: ComptrollerMock @@ -157,9 +157,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { aToken = ( await ethers.getContractAt('StaticATokenMock', await aTokenAsset.erc20()) ) - cTokenVault = ( - await ethers.getContractAt('CTokenWrapperMock', await cTokenAsset.erc20()) - ) + cToken = await ethers.getContractAt('CTokenMock', await cTokenAsset.erc20()) // Factories used in tests RevenueTraderV2ImplFactory = await ethers.getContractFactory('RevenueTraderCompatibleV2') @@ -204,7 +202,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(erc20s[0]).to.equal(token.address) expect(erc20s[1]).to.equal(usdc.address) expect(erc20s[2]).to.equal(aToken.address) - expect(erc20s[3]).to.equal(cTokenVault.address) + expect(erc20s[3]).to.equal(cToken.address) expect(breakdown[0]).to.be.closeTo(fp('0.25'), 10) expect(breakdown[1]).to.be.closeTo(fp('0.25'), 10) expect(breakdown[2]).to.be.closeTo(fp('0.25'), 10) @@ -227,7 +225,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(addr1).approve(rToken.address, initialBal) await usdc.connect(addr1).approve(rToken.address, initialBal) await aToken.connect(addr1).approve(rToken.address, initialBal) - await cTokenVault.connect(addr1).approve(rToken.address, initialBal) + await cToken.connect(addr1).approve(rToken.address, initialBal) // Issue rTokens await rToken.connect(addr1).issue(issueAmount) @@ -269,7 +267,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(toks[0]).to.equal(token.address) expect(toks[1]).to.equal(usdc.address) expect(toks[2]).to.equal(aToken.address) - expect(toks[3]).to.equal(cTokenVault.address) + expect(toks[3]).to.equal(cToken.address) expect(quantities.length).to.equal(4) expect(quantities[0]).to.equal(issueAmount.div(4)) expect(quantities[1]).to.equal(issueAmount.div(4).div(bn('1e12'))) @@ -290,7 +288,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(toks[0]).to.equal(token.address) expect(toks[1]).to.equal(usdc.address) expect(toks[2]).to.equal(aToken.address) - expect(toks[3]).to.equal(cTokenVault.address) + expect(toks[3]).to.equal(cToken.address) expect(quantities.length).to.equal(4) expect(quantities[0]).to.equal(issueAmount.div(4)) expect(quantities[1]).to.equal(issueAmount.div(4).div(bn('1e12'))) @@ -320,7 +318,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(toks[0]).to.equal(token.address) expect(toks[1]).to.equal(usdc.address) expect(toks[2]).to.equal(aToken.address) - expect(toks[3]).to.equal(cTokenVault.address) + expect(toks[3]).to.equal(cToken.address) expect(quantities[0]).to.equal(issueAmount.div(4)) expect(quantities[1]).to.equal(issueAmount.div(4).div(bn('1e12'))) expect(quantities[2]).to.equal(issueAmount.div(4)) @@ -341,7 +339,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(toksCustom[0]).to.equal(token.address) expect(toksCustom[1]).to.equal(usdc.address) expect(toksCustom[2]).to.equal(aToken.address) - expect(toksCustom[3]).to.equal(cTokenVault.address) + expect(toksCustom[3]).to.equal(cToken.address) expect(quantitiesCustom[0]).to.equal(issueAmount.div(4)) expect(quantitiesCustom[1]).to.equal(issueAmount.div(4).div(bn('1e12'))) expect(quantitiesCustom[2]).to.equal(issueAmount.div(4)) @@ -368,7 +366,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(newToksCustom[0]).to.equal(token.address) expect(newToksCustom[1]).to.equal(usdc.address) expect(newToksCustom[2]).to.equal(aToken.address) - expect(newToksCustom[3]).to.equal(cTokenVault.address) + expect(newToksCustom[3]).to.equal(cToken.address) expect(newQuantitiesCustom[0]).to.equal(issueAmount.div(4).div(2)) expect(newQuantitiesCustom[1]).to.equal(issueAmount.div(4).div(bn('1e12'))) expect(newQuantitiesCustom[2]).to.equal(issueAmount.div(4)) @@ -387,7 +385,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(prevBasketTokens[0]).to.equal(token.address) expect(prevBasketTokens[1]).to.equal(usdc.address) expect(prevBasketTokens[2]).to.equal(aToken.address) - expect(prevBasketTokens[3]).to.equal(cTokenVault.address) + expect(prevBasketTokens[3]).to.equal(cToken.address) expect(prevBasketQuantities[0]).to.equal(issueAmount.div(4).div(2)) expect(prevBasketQuantities[1]).to.equal(issueAmount.div(4).div(bn('1e12'))) expect(prevBasketQuantities[2]).to.equal(issueAmount.div(4)) @@ -542,8 +540,8 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await usdc.connect(addr1).transfer(rsrTrader.address, 2) await aToken.connect(addr1).transfer(rTokenTrader.address, 1) await aToken.connect(addr1).transfer(rsrTrader.address, 2) - await cTokenVault.connect(addr1).transfer(rTokenTrader.address, 1) - await cTokenVault.connect(addr1).transfer(rsrTrader.address, 2) + await cToken.connect(addr1).transfer(rTokenTrader.address, 1) + await cToken.connect(addr1).transfer(rsrTrader.address, 2) // Balances const [erc20s, balances, balancesNeededByBackingManager] = @@ -557,11 +555,9 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { if (erc20s[i] == token.address) bal = issueAmount.div(4) if (erc20s[i] == usdc.address) bal = issueAmount.div(4).div(bn('1e12')) if (erc20s[i] == aToken.address) bal = issueAmount.div(4) - if (erc20s[i] == cTokenVault.address) bal = issueAmount.div(4).mul(50).div(bn('1e10')) + if (erc20s[i] == cToken.address) bal = issueAmount.div(4).mul(50).div(bn('1e10')) - if ( - [token.address, usdc.address, aToken.address, cTokenVault.address].indexOf(erc20s[i]) >= 0 - ) { + if ([token.address, usdc.address, aToken.address, cToken.address].indexOf(erc20s[i]) >= 0) { expect(balances[i]).to.equal(bal.add(3)) // expect 3 more expect(balancesNeededByBackingManager[i]).to.equal(bal) } else { @@ -925,7 +921,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(erc20s[0]).to.equal(token.address) expect(erc20s[1]).to.equal(usdc.address) expect(erc20s[2]).to.equal(aToken.address) - expect(erc20s[3]).to.equal(cTokenVault.address) + expect(erc20s[3]).to.equal(cToken.address) expect(breakdown[0]).to.equal(fp('0')) // dai expect(breakdown[1]).to.equal(fp('1')) // usdc expect(breakdown[2]).to.equal(fp('0')) // adai @@ -1006,7 +1002,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(erc20s.length).to.equal(4) expect(targetNames.length).to.equal(4) expect(targetAmts.length).to.equal(4) - const expectedERC20s = [token.address, usdc.address, aToken.address, cTokenVault.address] + const expectedERC20s = [token.address, usdc.address, aToken.address, cToken.address] for (let i = 0; i < 4; i++) { expect(erc20s[i]).to.equal(expectedERC20s[i]) expect(targetNames[i]).to.equal(ethers.utils.formatBytes32String('USD')) @@ -1038,7 +1034,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(erc20s.length).to.equal(4) expect(targetNames.length).to.equal(4) expect(targetAmts.length).to.equal(4) - const expectedERC20s = [token.address, usdc.address, aToken.address, cTokenVault.address] + const expectedERC20s = [token.address, usdc.address, aToken.address, cToken.address] for (let i = 0; i < 4; i++) { expect(erc20s[i]).to.equal(expectedERC20s[i]) expect(targetNames[i]).to.equal(ethers.utils.formatBytes32String('USD')) @@ -1087,13 +1083,13 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(owner).mint(addr1.address, initialBal) await usdc.connect(owner).mint(addr1.address, initialBal) await aToken.connect(owner).mint(addr1.address, initialBal) - await cTokenVault.connect(owner).mint(addr1.address, initialBal) + await cToken.connect(owner).mint(addr1.address, initialBal) // Provide approvals await token.connect(addr1).approve(rToken.address, initialBal) await usdc.connect(addr1).approve(rToken.address, initialBal) await aToken.connect(addr1).approve(rToken.address, initialBal) - await cTokenVault.connect(addr1).approve(rToken.address, initialBal) + await cToken.connect(addr1).approve(rToken.address, initialBal) }) it('should return batch auctions disabled correctly', async () => { @@ -1419,12 +1415,12 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(owner).mint(addr1.address, initialBal) await usdc.connect(owner).mint(addr1.address, initialBal) await aToken.connect(owner).mint(addr1.address, initialBal) - await cTokenVault.connect(owner).mint(addr1.address, initialBal) + await cToken.connect(owner).mint(addr1.address, initialBal) await token.connect(owner).mint(addr2.address, initialBal) await usdc.connect(owner).mint(addr2.address, initialBal) await aToken.connect(owner).mint(addr2.address, initialBal) - await cTokenVault.connect(owner).mint(addr2.address, initialBal) + await cToken.connect(owner).mint(addr2.address, initialBal) // Mint RSR await rsr.connect(owner).mint(addr1.address, initialBal) @@ -1436,7 +1432,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(addr1).approve(rToken.address, initialBal) await usdc.connect(addr1).approve(rToken.address, initialBal) await aToken.connect(addr1).approve(rToken.address, initialBal) - await cTokenVault.connect(addr1).approve(rToken.address, initialBal) + await cToken.connect(addr1).approve(rToken.address, initialBal) // Issue rTokens await rToken.connect(addr1).issue(issueAmount) @@ -1475,13 +1471,13 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { emitted: true, }, { - contract: aToken, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, }, { - contract: cTokenVault, + contract: rsrTrader, name: 'RewardsClaimed', args: [compToken.address, rewardAmountCOMP], emitted: true, diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index 9176c71ac0..c19f200e23 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -29,6 +29,7 @@ import snapshotGasCost from './utils/snapshotGasCost' import { Asset, CTokenFiatCollateral, + CTokenMock, ERC20Mock, FacadeRead, FacadeTest, @@ -49,7 +50,6 @@ import { TestIRToken, TimelockController, USDCMock, - CTokenWrapperMock, } from '../typechain' import { Collateral, @@ -79,7 +79,7 @@ describe('FacadeWrite contract', () => { // Tokens let token: ERC20Mock let usdc: USDCMock - let cTokenVault: CTokenWrapperMock + let cToken: ERC20Mock let basket: Collateral[] // Aave / Comp @@ -144,9 +144,7 @@ describe('FacadeWrite contract', () => { token = await ethers.getContractAt('ERC20Mock', await tokenAsset.erc20()) usdc = await ethers.getContractAt('USDCMock', await usdcAsset.erc20()) - cTokenVault = ( - await ethers.getContractAt('CTokenWrapperMock', await cTokenAsset.erc20()) - ) + cToken = await ethers.getContractAt('CTokenMock', await cTokenAsset.erc20()) // Deploy DFacadeWriteLib lib const facadeWriteLib = await (await ethers.getContractFactory('FacadeWriteLib')).deploy() @@ -567,7 +565,7 @@ describe('FacadeWrite contract', () => { // Check new state - backing updated expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) tokens = await facade.basketTokens(rToken.address) - expect(tokens).to.eql([token.address, cTokenVault.address]) + expect(tokens).to.eql([token.address, cToken.address]) }) it('Should setup roles correctly', async () => { diff --git a/test/Furnace.test.ts b/test/Furnace.test.ts index 84d16f32c7..5883101e4b 100644 --- a/test/Furnace.test.ts +++ b/test/Furnace.test.ts @@ -6,7 +6,7 @@ import hre, { ethers, upgrades } from 'hardhat' import { IConfig, MAX_RATIO } from '../common/configuration' import { bn, fp } from '../common/numbers' import { - CTokenWrapperMock, + CTokenMock, ERC20Mock, StaticATokenMock, TestIFurnace, @@ -52,7 +52,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { let token0: ERC20Mock let token1: ERC20Mock let token2: StaticATokenMock - let token3: CTokenWrapperMock + let token3: CTokenMock let collateral0: Collateral let collateral1: Collateral @@ -117,9 +117,7 @@ describe(`FurnaceP${IMPLEMENTATION} contract`, () => { token2 = ( await ethers.getContractAt('StaticATokenMock', await collateral2.erc20()) ) - token3 = ( - await ethers.getContractAt('CTokenWrapperMock', await collateral3.erc20()) - ) + token3 = await ethers.getContractAt('CTokenMock', await collateral3.erc20()) // Mint Tokens await mintCollaterals(owner, [addr1, addr2], initialBal, basket) diff --git a/test/Main.test.ts b/test/Main.test.ts index 877bd961d3..4b2ca20eac 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -37,7 +37,7 @@ import { BasketHandlerP1, CTokenFiatCollateral, DutchTrade, - CTokenWrapperMock, + CTokenMock, ERC20Mock, FacadeRead, FacadeTest, @@ -120,7 +120,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { let token0: ERC20Mock let token1: USDCMock let token2: StaticATokenMock - let token3: CTokenWrapperMock + let token3: CTokenMock let backupToken1: ERC20Mock let backupToken2: ERC20Mock let collateral0: FiatCollateral @@ -185,7 +185,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { token0 = erc20s[collateral.indexOf(basket[0])] token1 = erc20s[collateral.indexOf(basket[1])] token2 = erc20s[collateral.indexOf(basket[2])] - token3 = erc20s[collateral.indexOf(basket[3])] + token3 = erc20s[collateral.indexOf(basket[3])] backupToken1 = erc20s[2] // USDT backupCollateral1 = collateral[2] diff --git a/test/RToken.test.ts b/test/RToken.test.ts index a65730a057..a2e61bcfdb 100644 --- a/test/RToken.test.ts +++ b/test/RToken.test.ts @@ -23,7 +23,7 @@ import { TestIMain, TestIRToken, USDCMock, - CTokenWrapperMock, + CTokenMock, } from '../typechain' import { whileImpersonating } from './utils/impersonation' import snapshotGasCost from './utils/snapshotGasCost' @@ -62,7 +62,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { let token0: ERC20Mock let token1: USDCMock let token2: StaticATokenMock - let token3: CTokenWrapperMock + let token3: CTokenMock let tokens: ERC20Mock[] let collateral0: Collateral @@ -109,9 +109,7 @@ describe(`RTokenP${IMPLEMENTATION} contract`, () => { token2 = ( await ethers.getContractAt('StaticATokenMock', await collateral2.erc20()) ) - token3 = ( - await ethers.getContractAt('CTokenWrapperMock', await collateral3.erc20()) - ) + token3 = await ethers.getContractAt('CTokenMock', await collateral3.erc20()) tokens = [token0, token1, token2, token3] // Mint initial balances diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index af71ae59d7..1e2d952ffe 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -19,7 +19,6 @@ import { ATokenFiatCollateral, CTokenMock, DutchTrade, - CTokenWrapperMock, ERC20Mock, FacadeRead, FacadeTest, @@ -88,7 +87,6 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { let token0: ERC20Mock let token1: USDCMock let token2: StaticATokenMock - let token3Vault: CTokenWrapperMock let token3: CTokenMock let backupToken1: ERC20Mock let backupToken2: ERC20Mock @@ -180,10 +178,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { token0 = erc20s[collateral.indexOf(basket[0])] token1 = erc20s[collateral.indexOf(basket[1])] token2 = erc20s[collateral.indexOf(basket[2])] - token3Vault = ( - await ethers.getContractAt('CTokenWrapperMock', await basket[3].erc20()) - ) - token3 = await ethers.getContractAt('CTokenMock', await token3Vault.underlying()) + token3 = await ethers.getContractAt('CTokenMock', await basket[3].erc20()) // Set Aave revenue token await token2.setAaveToken(aaveToken.address) @@ -246,7 +241,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await token0.connect(addr1).approve(rToken.address, initialBal) await token1.connect(addr1).approve(rToken.address, initialBal) await token2.connect(addr1).approve(rToken.address, initialBal) - await token3Vault.connect(addr1).approve(rToken.address, initialBal) + await token3.connect(addr1).approve(rToken.address, initialBal) await backupToken1.connect(addr1).approve(rToken.address, initialBal) await backupToken2.connect(addr1).approve(rToken.address, initialBal) @@ -472,7 +467,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('USD'), bn(2), [ token0.address, - token3Vault.address, + token3.address, ]) // Check initial state @@ -1160,7 +1155,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { ) // Nothing occurs if we attempt to settle for a token that is not being traded - await expect(backingManager.settleTrade(token3Vault.address)).to.not.emit + await expect(backingManager.settleTrade(token3.address)).to.not.emit // Advance time till auction ended await advanceTime(config.batchAuctionLength.add(100).toString()) @@ -3449,7 +3444,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await token0.connect(addr1).approve(rToken.address, initialBal) await token1.connect(addr1).approve(rToken.address, initialBal) await token2.connect(addr1).approve(rToken.address, initialBal) - await token3Vault.connect(addr1).approve(rToken.address, initialBal) + await token3.connect(addr1).approve(rToken.address, initialBal) await backupToken1.connect(addr1).approve(rToken.address, initialBal) await backupToken2.connect(addr1).approve(rToken.address, initialBal) @@ -3798,9 +3793,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - All balance will be redeemed const sellAmt0: BigNumber = await token0.balanceOf(backingManager.address) const sellAmt2: BigNumber = await token2.balanceOf(backingManager.address) - const sellAmt3: BigNumber = (await token3Vault.balanceOf(backingManager.address)).mul( - pow10(10) - ) // convert to 18 decimals for simplification + const sellAmt3: BigNumber = (await token3.balanceOf(backingManager.address)).mul(pow10(10)) // convert to 18 decimals for simplification const minBuyAmt0 = await toMinBuyAmt(sellAmt0, fp('0.8'), fp('1')) // Run auctions - Will start with token0 @@ -3910,7 +3903,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { name: 'TradeStarted', args: [ anyValue, - token3Vault.address, + token3.address, backupToken1.address, toBNDecimals(sellAmt3, 8), minBuyAmt3, @@ -3924,7 +3917,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Check new auction // Token3 -> Backup Token 1 Auction await expectTrade(backingManager, { - sell: token3Vault.address, + sell: token3.address, buy: backupToken1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('2'), @@ -3966,7 +3959,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { name: 'TradeSettled', args: [ anyValue, - token3Vault.address, + token3.address, backupToken1.address, toBNDecimals(sellAmt3, 8), minBuyAmt3, @@ -4296,7 +4289,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Advance time till auction ended await advanceTime(config.batchAuctionLength.add(100).toString()) - // Run auctions - will end current and open a new auction for token3Vault + // Run auctions - will end current and open a new auction for token3 // We only need now about 11.8 tokens for Token0 to be fully collateralized // Will check values later in the test to ensure they are in this range await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ @@ -4318,14 +4311,14 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Check new auction // Token3 -> Token0 Auction await expectTrade(backingManager, { - sell: token3Vault.address, + sell: token3.address, buy: token0.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('2'), }) // Get Trade - const t3 = await getTrade(backingManager, token3Vault.address) + const t3 = await getTrade(backingManager, token3.address) const sellAmt3 = (await t3.initBal()).mul(pow10(10)) // convert to 18 decimals let minBuyAmt3 = await toMinBuyAmt(sellAmt3, fp('1').div(50), fp('1')) expect(minBuyAmt3).to.be.closeTo(fp('11.28'), fp('0.01')) @@ -4361,13 +4354,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { { contract: backingManager, name: 'TradeSettled', - args: [ - anyValue, - token3Vault.address, - token0.address, - toBNDecimals(sellAmt3, 8), - minBuyAmt3, - ], + args: [anyValue, token3.address, token0.address, toBNDecimals(sellAmt3, 8), minBuyAmt3], emitted: true, }, { @@ -4483,9 +4470,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Running auctions will trigger recollateralization - All balance will be redeemed const sellAmt0: BigNumber = await token0.balanceOf(backingManager.address) const sellAmt2: BigNumber = await token2.balanceOf(backingManager.address) - const sellAmt3: BigNumber = (await token3Vault.balanceOf(backingManager.address)).mul( - pow10(10) - ) // convert to 18 decimals for simplification + const sellAmt3: BigNumber = (await token3.balanceOf(backingManager.address)).mul(pow10(10)) // convert to 18 decimals for simplification // Run auctions - will start with token0 and backuptoken1 const minBuyAmt = await toMinBuyAmt(sellAmt0, fp('0.5'), fp('1')) @@ -4602,7 +4587,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { name: 'TradeStarted', args: [ anyValue, - token3Vault.address, + token3.address, backupToken1.address, toBNDecimals(sellAmt3, 8), minBuyAmt3, @@ -4616,7 +4601,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Check new auction // Token3 -> Backup Token 1 Auction await expectTrade(backingManager, { - sell: token3Vault.address, + sell: token3.address, buy: backupToken1.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('2'), @@ -4663,7 +4648,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { name: 'TradeSettled', args: [ anyValue, - token3Vault.address, + token3.address, backupToken1.address, toBNDecimals(sellAmt3, 8), sellAmt3.div(50).div(2), @@ -5001,7 +4986,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { await token0.connect(addr1).approve(rToken.address, initialBal) await token1.connect(addr1).approve(rToken.address, initialBal) await token2.connect(addr1).approve(rToken.address, initialBal) - await token3Vault.connect(addr1).approve(rToken.address, initialBal) + await token3.connect(addr1).approve(rToken.address, initialBal) await backupToken1.connect(addr1).approve(rToken.address, initialBal) await backupToken2.connect(addr1).approve(rToken.address, initialBal) diff --git a/test/Revenues.test.ts b/test/Revenues.test.ts index 8887b4ee28..554315f0e7 100644 --- a/test/Revenues.test.ts +++ b/test/Revenues.test.ts @@ -23,7 +23,7 @@ import { ATokenFiatCollateral, Asset, CTokenFiatCollateral, - CTokenWrapperMock, + CTokenMock, ComptrollerMock, ERC20Mock, FacadeTest, @@ -97,7 +97,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { let token0: ERC20Mock let token1: USDCMock let token2: StaticATokenMock - let token3: CTokenWrapperMock + let token3: CTokenMock let collateral0: FiatCollateral let collateral1: FiatCollateral let collateral2: ATokenFiatCollateral @@ -206,9 +206,7 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { token2 = ( await ethers.getContractAt('StaticATokenMock', await collateral2.erc20()) ) - token3 = ( - await ethers.getContractAt('CTokenWrapperMock', await collateral3.erc20()) - ) + token3 = await ethers.getContractAt('CTokenMock', await collateral3.erc20()) // Mint initial balances initialBal = bn('1000000e18') @@ -979,13 +977,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, rewardAmountCOMP], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, bn(0)], emitted: true, @@ -1243,13 +1241,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -1360,13 +1358,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Can also claim through Facade await expectEvents(facadeTest.claimRewards(rToken.address), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -1520,13 +1518,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await token2.setRewards(backingManager.address, rewardAmountAAVE) await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -1725,13 +1723,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -1926,13 +1924,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -2232,13 +2230,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, rewardAmountCOMP], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, bn(0)], emitted: true, @@ -2382,13 +2380,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, rewardAmountCOMP], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, bn(0)], emitted: true, @@ -2506,13 +2504,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -2569,13 +2567,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(facadeTest.claimRewards(rToken.address), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -2834,13 +2832,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(facadeTest.claimRewards(rToken.address), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -2949,13 +2947,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(facadeTest.claimRewards(rToken.address), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -3047,13 +3045,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Claim rewards await expectEvents(facadeTest.claimRewards(rToken.address), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -3101,13 +3099,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -3157,13 +3155,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -3298,13 +3296,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Collect revenue await expectEvents(rsrTrader.claimRewards(), [ { - contract: token3, + contract: rsrTrader, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: rsrTrader, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -3339,13 +3337,13 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // Claim and sweep rewards await expectEvents(backingManager.claimRewards(), [ { - contract: token3, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, }, { - contract: token2, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, rewardAmountAAVE], emitted: true, @@ -3364,14 +3362,12 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { ) }) - it('Should not revert on invalid claim logic', async () => { - // Here the aToken is going to have an invalid claimRewards on its asset, - // while the cToken will have it on the ERC20 + it('Should be able to claimRewardsSingle to escape reverting claimRewards()', async () => { + // Here the aToken is going to have an invalid claimRewards on its asset // cToken rewardAmountCOMP = bn('0.5e18') await compoundMock.setRewards(backingManager.address, rewardAmountCOMP) - await token3.setRevertClaimRewards(true) // Setup a new aToken with invalid claim data const ATokenCollateralFactory = await ethers.getContractFactory( @@ -3412,8 +3408,14 @@ describe(`Revenues - P${IMPLEMENTATION}`, () => { // AAVE Rewards await token2.setRewards(backingManager.address, rewardAmountAAVE) - // Claim and sweep rewards -- should succeed - await expect(backingManager.claimRewards()).not.to.be.reverted + // Claim and sweep rewards -- fails + await expect(backingManager.claimRewards()).to.be.reverted + + // But can claimRewardsSingle + await expect(backingManager.claimRewardsSingle(token3.address)).to.emit( + backingManager, + 'RewardsClaimed' + ) }) context('DutchTrade', () => { diff --git a/test/ZTradingExtremes.test.ts b/test/ZTradingExtremes.test.ts index de63aea75b..111faaefd4 100644 --- a/test/ZTradingExtremes.test.ts +++ b/test/ZTradingExtremes.test.ts @@ -11,7 +11,7 @@ import { ATokenFiatCollateral, ComptrollerMock, CTokenFiatCollateral, - CTokenWrapperMock, + CTokenMock, ERC20Mock, FacadeTest, FiatCollateral, @@ -76,7 +76,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, let ERC20Mock: ContractFactory let ATokenMockFactory: ContractFactory - let CTokenWrapperMockFactory: ContractFactory + let CTokenMockFactory: ContractFactory let ATokenCollateralFactory: ContractFactory let CTokenCollateralFactory: ContractFactory @@ -110,7 +110,7 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, ERC20Mock = await ethers.getContractFactory('ERC20Mock') ATokenMockFactory = await ethers.getContractFactory('StaticATokenMock') - CTokenWrapperMockFactory = await ethers.getContractFactory('CTokenWrapperMock') + CTokenMockFactory = await ethers.getContractFactory('CTokenMock') ATokenCollateralFactory = await ethers.getContractFactory('ATokenFiatCollateral') CTokenCollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') @@ -157,16 +157,15 @@ describeExtreme(`Trading Extreme Values (${SLOW ? 'slow mode' : 'fast mode'})`, return erc20 } - const prepCToken = async (index: number): Promise => { + const prepCToken = async (index: number): Promise => { const underlying: ERC20Mock = ( await ERC20Mock.deploy(`ERC20_NAME:${index}`, `ERC20_SYM:${index}`) ) - const erc20: CTokenWrapperMock = ( - await CTokenWrapperMockFactory.deploy( + const erc20: CTokenMock = ( + await CTokenMockFactory.deploy( `CToken_NAME:${index}`, `CToken_SYM:${index}`, underlying.address, - compToken.address, compoundMock.address ) ) diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 81629b3426..483a611372 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -22,7 +22,7 @@ import { TestIMain, TestIRToken, TestIStRSR, - CTokenWrapperMock, + CTokenMock, } from '../typechain' import { IConfig, MAX_RATIO, MAX_UNSTAKING_DELAY } from '../common/configuration' import { CollateralStatus, MAX_UINT256, ONE_PERIOD, ZERO_ADDRESS } from '../common/constants' @@ -80,7 +80,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { let token0: ERC20Mock let token1: ERC20Mock let token2: StaticATokenMock - let token3: CTokenWrapperMock + let token3: CTokenMock let collateral0: Collateral let collateral1: Collateral let collateral2: Collateral @@ -179,9 +179,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { token2 = ( await ethers.getContractAt('StaticATokenMock', await collateral2.erc20()) ) - token3 = ( - await ethers.getContractAt('CTokenWrapperMock', await collateral3.erc20()) - ) + token3 = await ethers.getContractAt('CTokenMock', await collateral3.erc20()) }) describe('Deployment #fast', () => { diff --git a/test/fixtures.ts b/test/fixtures.ts index 07e8ce3a15..7120255963 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -29,7 +29,7 @@ import { ComptrollerMock, CTokenFiatCollateral, CTokenSelfReferentialCollateral, - CTokenWrapperMock, + CTokenMock, ERC20Mock, DeployerP0, DeployerP1, @@ -165,7 +165,6 @@ async function gnosisFixture(): Promise { } async function collateralFixture( - compToken: ERC20Mock, comptroller: ComptrollerMock, aaveToken: ERC20Mock, config: IConfig @@ -173,9 +172,7 @@ async function collateralFixture( const ERC20: ContractFactory = await ethers.getContractFactory('ERC20Mock') const USDC: ContractFactory = await ethers.getContractFactory('USDCMock') const ATokenMockFactory: ContractFactory = await ethers.getContractFactory('StaticATokenMock') - const CTokenWrapperMockFactory: ContractFactory = await ethers.getContractFactory( - 'CTokenWrapperMock' - ) + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory('FiatCollateral') const ATokenCollateralFactory = await ethers.getContractFactory('ATokenFiatCollateral') const CTokenCollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') @@ -248,15 +245,13 @@ async function collateralFixture( const makeCTokenCollateral = async ( symbol: string, referenceERC20: ERC20Mock, - chainlinkAddr: string, - compToken: ERC20Mock - ): Promise<[CTokenWrapperMock, CTokenFiatCollateral]> => { - const erc20: CTokenWrapperMock = ( - await CTokenWrapperMockFactory.deploy( + chainlinkAddr: string + ): Promise<[CTokenMock, CTokenFiatCollateral]> => { + const erc20: CTokenMock = ( + await CTokenMockFactory.deploy( symbol + ' Token', symbol, referenceERC20.address, - compToken.address, comptroller.address ) ) @@ -311,19 +306,9 @@ async function collateralFixture( const usdc = await makeSixDecimalCollateral('USDC') const usdt = await makeVanillaCollateral('USDT') const busd = await makeVanillaCollateral('BUSD') - const cdai = await makeCTokenCollateral('cDAI', dai[0], await dai[1].chainlinkFeed(), compToken) - const cusdc = await makeCTokenCollateral( - 'cUSDC', - usdc[0], - await usdc[1].chainlinkFeed(), - compToken - ) - const cusdt = await makeCTokenCollateral( - 'cUSDT', - usdt[0], - await usdt[1].chainlinkFeed(), - compToken - ) + const cdai = await makeCTokenCollateral('cDAI', dai[0], await dai[1].chainlinkFeed()) + const cusdc = await makeCTokenCollateral('cUSDC', usdc[0], await usdc[1].chainlinkFeed()) + const cusdt = await makeCTokenCollateral('cUSDT', usdt[0], await usdt[1].chainlinkFeed()) const adai = await makeATokenCollateral('aDAI', dai[0], await dai[1].chainlinkFeed(), aaveToken) const ausdc = await makeATokenCollateral( 'aUSDC', @@ -708,7 +693,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = // Deploy collateral for Main const { erc20s, collateral, basket, basketsNeededAmts, bySymbol } = await collateralFixture( - compToken, compoundMock, aaveToken, config diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index cab2fd3fb5..6ac871ad97 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -55,7 +55,6 @@ import { TestIRToken, USDCMock, WETH9, - CTokenWrapper, } from '../../typechain' import { useEnv } from '#/utils/env' @@ -119,20 +118,14 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, let stataUsdp: StaticATokenLM let cDai: CTokenMock - let cDaiVault: CTokenWrapper let cUsdc: CTokenMock - let cUsdcVault: CTokenWrapper let cUsdt: CTokenMock - let cUsdtVault: CTokenWrapper let cUsdp: CTokenMock - let cUsdpVault: CTokenWrapper let wbtc: ERC20Mock let cWBTC: CTokenMock - let cWBTCVault: CTokenWrapper let weth: ERC20Mock let cETH: CTokenMock - let cETHVault: CTokenWrapper let eurt: ERC20Mock let daiCollateral: FiatCollateral @@ -237,25 +230,19 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, busd = erc20s[3] // BUSD usdp = erc20s[4] // USDP tusd = erc20s[5] // TUSD - cDaiVault = erc20s[6] // cDAI - cDai = await ethers.getContractAt('CTokenMock', await cDaiVault.underlying()) // cDAI - cUsdcVault = erc20s[7] // cUSDC - cUsdc = await ethers.getContractAt('CTokenMock', await cUsdcVault.underlying()) // cUSDC - cUsdtVault = erc20s[8] // cUSDT - cUsdt = await ethers.getContractAt('CTokenMock', await cUsdtVault.underlying()) // cUSDT - cUsdpVault = erc20s[9] // cUSDT - cUsdp = await ethers.getContractAt('CTokenMock', await cUsdpVault.underlying()) // cUSDT + cDai = erc20s[6] // cDAI + cUsdc = erc20s[7] // cUSDC + cUsdt = erc20s[8] // cUSDT + cUsdp = erc20s[9] // cUSDT stataDai = erc20s[10] // static aDAI stataUsdc = erc20s[11] // static aUSDC stataUsdt = erc20s[12] // static aUSDT stataBusd = erc20s[13] // static aBUSD stataUsdp = erc20s[14] // static aUSDP wbtc = erc20s[15] // wBTC - cWBTCVault = erc20s[16] // cWBTC - cWBTC = await ethers.getContractAt('CTokenMock', await cWBTCVault.underlying()) // cWBTC + cWBTC = erc20s[16] // cWBTC weth = erc20s[17] // wETH - cETHVault = erc20s[18] // cETH - cETH = await ethers.getContractAt('CTokenMock', await cETHVault.underlying()) // cETH + cETH = erc20s[18] // cETH eurt = erc20s[19] // eurt // Get plain aTokens @@ -347,8 +334,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // cDAI await whileImpersonating(holderCDAI, async (cdaiSigner) => { await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) - await cDai.connect(addr1).approve(cDaiVault.address, toBNDecimals(initialBal, 8).mul(100)) - await cDaiVault.connect(addr1).deposit(toBNDecimals(initialBal, 8).mul(100), addr1.address) }) // Setup balances for USDT @@ -368,12 +353,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await cWBTC .connect(cwbtcSigner) .transfer(addr1.address, toBNDecimals(initialBalBtcEth, 8).mul(1000)) - await cWBTC - .connect(addr1) - .approve(cWBTCVault.address, toBNDecimals(initialBalBtcEth, 8).mul(1000)) - await cWBTCVault - .connect(addr1) - .deposit(toBNDecimals(initialBalBtcEth, 8).mul(1000), addr1.address) }) // WETH @@ -386,12 +365,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await cETH .connect(cethSigner) .transfer(addr1.address, toBNDecimals(initialBalBtcEth, 8).mul(1000)) - await cETH - .connect(addr1) - .approve(cETHVault.address, toBNDecimals(initialBalBtcEth, 8).mul(1000)) - await cETHVault - .connect(addr1) - .deposit(toBNDecimals(initialBalBtcEth, 8).mul(1000), addr1.address) }) //EURT @@ -412,7 +385,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await basketHandler .connect(owner) .setPrimeBasket( - [dai.address, stataDai.address, cDaiVault.address], + [dai.address, stataDai.address, cDai.address], [fp('0.25'), fp('0.25'), fp('0.5')] ) await basketHandler.connect(owner).refreshBasket() @@ -540,7 +513,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: ERC20Mock tokenAddress: string cToken: CTokenMock - cTokenVault: CTokenWrapper cTokenAddress: string cTokenCollateral: CTokenFiatCollateral pegPrice: BigNumber @@ -553,7 +525,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: dai, tokenAddress: networkConfig[chainId].tokens.DAI || '', cToken: cDai, - cTokenVault: cDaiVault, cTokenAddress: networkConfig[chainId].tokens.cDAI || '', cTokenCollateral: cDaiCollateral, pegPrice: fp('1'), @@ -563,7 +534,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: usdc, tokenAddress: networkConfig[chainId].tokens.USDC || '', cToken: cUsdc, - cTokenVault: cUsdcVault, cTokenAddress: networkConfig[chainId].tokens.cUSDC || '', cTokenCollateral: cUsdcCollateral, pegPrice: fp('1.0003994'), @@ -573,7 +543,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: usdt, tokenAddress: networkConfig[chainId].tokens.USDT || '', cToken: cUsdt, - cTokenVault: cUsdtVault, cTokenAddress: networkConfig[chainId].tokens.cUSDT || '', cTokenCollateral: cUsdtCollateral, pegPrice: fp('0.99934692'), @@ -583,7 +552,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: usdp, tokenAddress: networkConfig[chainId].tokens.USDP || '', cToken: cUsdp, - cTokenVault: cUsdpVault, cTokenAddress: networkConfig[chainId].tokens.cUSDP || '', cTokenCollateral: cUsdpCollateral, pegPrice: fp('0.99995491'), @@ -598,10 +566,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await ctkInf.cTokenCollateral.referenceERC20Decimals()).to.equal( await ctkInf.token.decimals() ) - expect(await ctkInf.cTokenCollateral.erc20()).to.equal(ctkInf.cTokenVault.address) - expect(await ctkInf.cTokenVault.underlying()).to.equal(ctkInf.cTokenAddress) expect(await ctkInf.cToken.decimals()).to.equal(8) - expect(await ctkInf.cTokenVault.decimals()).to.equal(8) + expect(await ctkInf.cTokenCollateral.erc20()).to.equal(ctkInf.cToken.address) expect(await ctkInf.cTokenCollateral.targetName()).to.equal( ethers.utils.formatBytes32String('USD') ) @@ -622,13 +588,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, bn('1e4') ) - // TODO: deprecate await expect(ctkInf.cTokenCollateral.claimRewards()) - .to.emit(ctkInf.cTokenVault, 'RewardsClaimed') - .withArgs(compToken.address, 0) - - await expect(ctkInf.cTokenVault.claimRewards()) - .to.emit(ctkInf.cTokenVault, 'RewardsClaimed') + .to.emit(ctkInf.cTokenCollateral, 'RewardsClaimed') .withArgs(compToken.address, 0) expect(await ctkInf.cTokenCollateral.maxTradeVolume()).to.equal( @@ -729,15 +690,10 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, bn('1e5') ) - // TODO: deprecate await expect(atkInf.aTokenCollateral.claimRewards()) .to.emit(atkInf.stataToken, 'RewardsClaimed') .withArgs(aaveToken.address, 0) - await expect(atkInf.stataToken['claimRewards()']()) - .to.emit(atkInf.stataToken, 'RewardsClaimed') - .withArgs(aaveToken.address, 0) - // Check StaticAToken expect(await atkInf.stataToken.name()).to.equal( 'Static Aave interest bearing ' + (await atkInf.token.symbol()) @@ -829,7 +785,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: ERC20Mock tokenAddress: string cToken: CTokenMock - cTokenVault: CTokenWrapper cTokenAddress: string cTokenCollateral: CTokenNonFiatCollateral targetPrice: BigNumber @@ -844,7 +799,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: wbtc, tokenAddress: networkConfig[chainId].tokens.WBTC || '', cToken: cWBTC, - cTokenVault: cWBTCVault, cTokenAddress: networkConfig[chainId].tokens.cWBTC || '', cTokenCollateral: cWBTCCollateral, targetPrice: fp('31311.5'), // approx price June 6, 2022 @@ -861,10 +815,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await ctkInf.cTokenCollateral.referenceERC20Decimals()).to.equal( await ctkInf.token.decimals() ) - expect(await ctkInf.cTokenCollateral.erc20()).to.equal(ctkInf.cTokenVault.address) - expect(await ctkInf.cTokenVault.underlying()).to.equal(ctkInf.cTokenAddress) + expect(await ctkInf.cTokenCollateral.erc20()).to.equal(ctkInf.cTokenAddress) expect(await ctkInf.cToken.decimals()).to.equal(8) - expect(await ctkInf.cTokenVault.decimals()).to.equal(8) expect(await ctkInf.cTokenCollateral.targetName()).to.equal( ethers.utils.formatBytes32String(ctkInf.targetName) ) @@ -889,13 +841,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, true ) - // TODO: deprecate await expect(ctkInf.cTokenCollateral.claimRewards()) - .to.emit(ctkInf.cTokenVault, 'RewardsClaimed') - .withArgs(compToken.address, 0) - - await expect(ctkInf.cTokenVault.claimRewards()) - .to.emit(ctkInf.cTokenVault, 'RewardsClaimed') + .to.emit(ctkInf.cTokenCollateral, 'RewardsClaimed') .withArgs(compToken.address, 0) expect(await ctkInf.cTokenCollateral.maxTradeVolume()).to.equal( @@ -960,7 +907,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: ERC20Mock tokenAddress: string cToken: CTokenMock - cTokenVault: CTokenWrapper cTokenAddress: string cTokenCollateral: CTokenSelfReferentialCollateral price: BigNumber @@ -974,7 +920,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, token: weth, tokenAddress: networkConfig[chainId].tokens.WETH || '', cToken: cETH, - cTokenVault: cETHVault, cTokenAddress: networkConfig[chainId].tokens.cETH || '', cTokenCollateral: cETHCollateral, price: fp('1859.17'), // approx price June 6, 2022 @@ -990,10 +935,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await ctkInf.cTokenCollateral.referenceERC20Decimals()).to.equal( await ctkInf.token.decimals() ) - expect(await ctkInf.cTokenCollateral.erc20()).to.equal(ctkInf.cTokenVault.address) - expect(await ctkInf.cTokenVault.underlying()).to.equal(ctkInf.cTokenAddress) + expect(await ctkInf.cTokenCollateral.erc20()).to.equal(ctkInf.cTokenAddress) expect(await ctkInf.cToken.decimals()).to.equal(8) - expect(await ctkInf.cTokenVault.decimals()).to.equal(8) expect(await ctkInf.cTokenCollateral.targetName()).to.equal( ethers.utils.formatBytes32String(ctkInf.targetName) ) @@ -1015,13 +958,8 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, bn('1e5') ) - // TODO: deprecate await expect(ctkInf.cTokenCollateral.claimRewards()) - .to.emit(ctkInf.cTokenVault, 'RewardsClaimed') - .withArgs(compToken.address, 0) - - await expect(ctkInf.cTokenVault.claimRewards()) - .to.emit(ctkInf.cTokenVault, 'RewardsClaimed') + .to.emit(ctkInf.cTokenCollateral, 'RewardsClaimed') .withArgs(compToken.address, 0) expect(await ctkInf.cTokenCollateral.maxTradeVolume()).to.equal( @@ -1263,7 +1201,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -1287,7 +1225,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -1505,7 +1443,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, oracleError: ORACLE_ERROR, - erc20: cWBTCVault.address, + erc20: cWBTC.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1534,7 +1472,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: cWBTCVault.address, + erc20: cWBTC.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1662,7 +1600,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, oracleError: ORACLE_ERROR, - erc20: cETHVault.address, + erc20: cETH.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: MAX_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), @@ -1692,7 +1630,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: cETHVault.address, + erc20: cETH.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('ETH'), @@ -1845,7 +1783,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const backing = await facade.basketTokens(rToken.address) expect(backing[0]).to.equal(dai.address) expect(backing[1]).to.equal(stataDai.address) - expect(backing[2]).to.equal(cDaiVault.address) + expect(backing[2]).to.equal(cDai.address) expect(backing.length).to.equal(3) @@ -1859,9 +1797,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, const issueAmount: BigNumber = bn('10000e18') await dai.connect(addr1).approve(rToken.address, issueAmount) await stataDai.connect(addr1).approve(rToken.address, issueAmount) - await cDaiVault - .connect(addr1) - .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) await expect(rToken.connect(addr1).issue(issueAmount)).to.emit(rToken, 'Issuance') await expectRTokenPrice( @@ -1880,22 +1816,18 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Check balances before expect(await dai.balanceOf(backingManager.address)).to.equal(0) expect(await stataDai.balanceOf(backingManager.address)).to.equal(0) - expect(await cDaiVault.balanceOf(backingManager.address)).to.equal(0) + expect(await cDai.balanceOf(backingManager.address)).to.equal(0) expect(await dai.balanceOf(addr1.address)).to.equal(initialBal) // Balance for Static a Token is about 18641.55e18, about 93.21% of the provided amount (20K) const initialBalAToken = initialBal.mul(9321).div(10000) expect(await stataDai.balanceOf(addr1.address)).to.be.closeTo(initialBalAToken, fp('1.5')) - expect(await cDaiVault.balanceOf(addr1.address)).to.equal( - toBNDecimals(initialBal, 8).mul(100) - ) + expect(await cDai.balanceOf(addr1.address)).to.equal(toBNDecimals(initialBal, 8).mul(100)) // Provide approvals await dai.connect(addr1).approve(rToken.address, issueAmount) await stataDai.connect(addr1).approve(rToken.address, issueAmount) - await cDaiVault - .connect(addr1) - .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) // Check rToken balance expect(await rToken.balanceOf(addr1.address)).to.equal(0) @@ -1913,7 +1845,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, fp('1') ) const requiredCTokens: BigNumber = bn('227116e8') // approx 227K needed (~5K, 50% of basket) - Price: ~0.022 - expect(await cDaiVault.balanceOf(backingManager.address)).to.be.closeTo( + expect(await cDai.balanceOf(backingManager.address)).to.be.closeTo( requiredCTokens, bn('1e8') ) @@ -1924,7 +1856,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, initialBalAToken.sub(issueAmtAToken), fp('1.5') ) - expect(await cDaiVault.balanceOf(addr1.address)).to.be.closeTo( + expect(await cDai.balanceOf(addr1.address)).to.be.closeTo( toBNDecimals(initialBal, 8).mul(100).sub(requiredCTokens), bn('1e8') ) @@ -1949,12 +1881,12 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Check balances after - Backing Manager is empty expect(await dai.balanceOf(backingManager.address)).to.equal(0) expect(await stataDai.balanceOf(backingManager.address)).to.be.closeTo(bn(0), fp('0.01')) - expect(await cDaiVault.balanceOf(backingManager.address)).to.be.closeTo(bn(0), bn('1e15')) + expect(await cDai.balanceOf(backingManager.address)).to.be.closeTo(bn(0), bn('1e15')) // Check funds returned to user expect(await dai.balanceOf(addr1.address)).to.equal(initialBal) expect(await stataDai.balanceOf(addr1.address)).to.be.closeTo(initialBalAToken, fp('1.5')) - expect(await cDaiVault.balanceOf(addr1.address)).to.be.closeTo( + expect(await cDai.balanceOf(addr1.address)).to.be.closeTo( toBNDecimals(initialBal, 8).mul(100), bn('1e16') ) @@ -1973,9 +1905,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Provide approvals for issuances await dai.connect(addr1).approve(rToken.address, issueAmount) await stataDai.connect(addr1).approve(rToken.address, issueAmount) - await cDaiVault - .connect(addr1) - .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) // Issue rTokens await expect(rToken.connect(addr1).issue(issueAmount)).to.emit(rToken, 'Issuance') @@ -1986,7 +1916,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Store Balances after issuance const balanceAddr1Dai: BigNumber = await dai.balanceOf(addr1.address) const balanceAddr1aDai: BigNumber = await stataDai.balanceOf(addr1.address) - const balanceAddr1cDai: BigNumber = await cDaiVault.balanceOf(addr1.address) + const balanceAddr1cDai: BigNumber = await cDai.balanceOf(addr1.address) // Check rates and prices const [aDaiPriceLow1, aDaiPriceHigh1] = await aDaiCollateral.price() // ~1.07546 @@ -2118,7 +2048,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Check balances - Fewer ATokens and cTokens should have been sent to the user const newBalanceAddr1Dai: BigNumber = await dai.balanceOf(addr1.address) const newBalanceAddr1aDai: BigNumber = await stataDai.balanceOf(addr1.address) - const newBalanceAddr1cDai: BigNumber = await cDaiVault.balanceOf(addr1.address) + const newBalanceAddr1cDai: BigNumber = await cDai.balanceOf(addr1.address) // Check received tokens represent ~10K in value at current prices expect(newBalanceAddr1Dai.sub(balanceAddr1Dai)).to.equal(issueAmount.div(4)) // = 2.5K (25% of basket) @@ -2131,7 +2061,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, fp('219.64'), // ~= 260 usd in value fp('0.01') ) - expect(await cDaiVault.balanceOf(backingManager.address)).to.be.closeTo( + expect(await cDai.balanceOf(backingManager.address)).to.be.closeTo( bn('75331e8'), bn('5e16') ) // ~= 2481 usd in value @@ -2169,9 +2099,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Provide approvals await dai.connect(addr1).approve(rToken.address, issueAmount) await stataDai.connect(addr1).approve(rToken.address, issueAmount) - await cDaiVault - .connect(addr1) - .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) // Check rToken balance expect(await rToken.balanceOf(addr1.address)).to.equal(0) @@ -2222,13 +2150,9 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Approve all balances for user await wbtc.connect(addr1).approve(rToken.address, await wbtc.balanceOf(addr1.address)) - await cWBTCVault - .connect(addr1) - .approve(rToken.address, await cWBTCVault.balanceOf(addr1.address)) + await cWBTC.connect(addr1).approve(rToken.address, await cWBTC.balanceOf(addr1.address)) await weth.connect(addr1).approve(rToken.address, await weth.balanceOf(addr1.address)) - await cETHVault - .connect(addr1) - .approve(rToken.address, await cETHVault.balanceOf(addr1.address)) + await cETH.connect(addr1).approve(rToken.address, await cETH.balanceOf(addr1.address)) await eurt.connect(addr1).approve(rToken.address, await eurt.balanceOf(addr1.address)) }) @@ -2268,9 +2192,9 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, expect(await basketHandler.fullyCollateralized()).to.equal(true) const backing = await facade.basketTokens(rToken.address) expect(backing[0]).to.equal(wbtc.address) - expect(backing[1]).to.equal(cWBTCVault.address) + expect(backing[1]).to.equal(cWBTC.address) expect(backing[2]).to.equal(weth.address) - expect(backing[3]).to.equal(cETHVault.address) + expect(backing[3]).to.equal(cETH.address) expect(backing[4]).to.equal(eurt.address) expect(backing.length).to.equal(5) @@ -2294,17 +2218,17 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Check balances before expect(await wbtc.balanceOf(backingManager.address)).to.equal(0) - expect(await cWBTCVault.balanceOf(backingManager.address)).to.equal(0) + expect(await cWBTC.balanceOf(backingManager.address)).to.equal(0) expect(await weth.balanceOf(backingManager.address)).to.equal(0) - expect(await cETHVault.balanceOf(backingManager.address)).to.equal(0) + expect(await cETH.balanceOf(backingManager.address)).to.equal(0) expect(await eurt.balanceOf(backingManager.address)).to.equal(0) expect(await wbtc.balanceOf(addr1.address)).to.equal(toBNDecimals(initialBalBtcEth, 8)) - expect(await cWBTCVault.balanceOf(addr1.address)).to.equal( + expect(await cWBTC.balanceOf(addr1.address)).to.equal( toBNDecimals(initialBalBtcEth, 8).mul(1000) ) expect(await weth.balanceOf(addr1.address)).to.equal(initialBalBtcEth) - expect(await cETHVault.balanceOf(addr1.address)).to.equal( + expect(await cETH.balanceOf(addr1.address)).to.equal( toBNDecimals(initialBalBtcEth, 8).mul(1000) ) expect(await eurt.balanceOf(addr1.address)).to.equal( @@ -2318,13 +2242,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Check Balances after expect(await wbtc.balanceOf(backingManager.address)).to.equal(toBNDecimals(issueAmount, 8)) //1 full units const requiredCWBTC: BigNumber = toBNDecimals(fp('49.85'), 8) // approx 49.5 cWBTC needed (~1 wbtc / 0.02006) - expect(await cWBTCVault.balanceOf(backingManager.address)).to.be.closeTo( + expect(await cWBTC.balanceOf(backingManager.address)).to.be.closeTo( requiredCWBTC, point1Pct(requiredCWBTC) ) expect(await weth.balanceOf(backingManager.address)).to.equal(issueAmount) //1 full units const requiredCETH: BigNumber = toBNDecimals(fp('49.8'), 8) // approx 49.8 cETH needed (~1 weth / 0.02020) - expect(await cETHVault.balanceOf(backingManager.address)).to.be.closeTo( + expect(await cETH.balanceOf(backingManager.address)).to.be.closeTo( requiredCETH, point1Pct(requiredCETH) ) @@ -2335,13 +2259,13 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, toBNDecimals(initialBalBtcEth.sub(issueAmount), 8) ) const expectedcWBTCBalance = toBNDecimals(initialBalBtcEth, 8).mul(1000).sub(requiredCWBTC) - expect(await cWBTCVault.balanceOf(addr1.address)).to.be.closeTo( + expect(await cWBTC.balanceOf(addr1.address)).to.be.closeTo( expectedcWBTCBalance, point1Pct(expectedcWBTCBalance) ) expect(await weth.balanceOf(addr1.address)).to.equal(initialBalBtcEth.sub(issueAmount)) const expectedcETHBalance = toBNDecimals(initialBalBtcEth, 8).mul(1000).sub(requiredCETH) - expect(await cWBTCVault.balanceOf(addr1.address)).to.be.closeTo( + expect(await cWBTC.balanceOf(addr1.address)).to.be.closeTo( expectedcETHBalance, point1Pct(expectedcETHBalance) ) @@ -2369,19 +2293,19 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Check balances after - Backing Manager is empty expect(await wbtc.balanceOf(backingManager.address)).to.equal(0) - expect(await cWBTCVault.balanceOf(backingManager.address)).to.be.closeTo(bn(0), bn('10e9')) + expect(await cWBTC.balanceOf(backingManager.address)).to.be.closeTo(bn(0), bn('10e9')) expect(await weth.balanceOf(backingManager.address)).to.equal(0) - expect(await cETHVault.balanceOf(backingManager.address)).to.be.closeTo(bn(0), bn('10e9')) + expect(await cETH.balanceOf(backingManager.address)).to.be.closeTo(bn(0), bn('10e9')) expect(await eurt.balanceOf(backingManager.address)).to.equal(0) // Check funds returned to user expect(await wbtc.balanceOf(addr1.address)).to.equal(toBNDecimals(initialBalBtcEth, 8)) - expect(await cWBTCVault.balanceOf(addr1.address)).to.be.closeTo( + expect(await cWBTC.balanceOf(addr1.address)).to.be.closeTo( toBNDecimals(initialBalBtcEth, 8).mul(1000), bn('10e9') ) expect(await weth.balanceOf(addr1.address)).to.equal(initialBalBtcEth) - expect(await cETHVault.balanceOf(addr1.address)).to.be.closeTo( + expect(await cETH.balanceOf(addr1.address)).to.be.closeTo( toBNDecimals(initialBalBtcEth, 8).mul(1000), bn('10e9') ) @@ -2402,7 +2326,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await expectEvents(backingManager.claimRewards(), [ { - contract: cWBTCVault, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, bn(0)], emitted: true, @@ -2426,7 +2350,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await advanceTime(8000) // Claim rewards - await expect(backingManager.claimRewards()).to.emit(cWBTCVault, 'RewardsClaimed') + await expect(backingManager.claimRewards()).to.emit(backingManager, 'RewardsClaimed') // Check rewards both in COMP const rewardsCOMP1: BigNumber = await compToken.balanceOf(backingManager.address) @@ -2436,7 +2360,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, await advanceTime(3600) // Get additional rewards - await expect(backingManager.claimRewards()).to.emit(cWBTCVault, 'RewardsClaimed') + await expect(backingManager.claimRewards()).to.emit(backingManager, 'RewardsClaimed') const rewardsCOMP2: BigNumber = await compToken.balanceOf(backingManager.address) expect(rewardsCOMP2.sub(rewardsCOMP1)).to.be.gt(0) @@ -2604,10 +2528,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, stataDai = ( await ethers.getContractAt('StaticATokenLM', await aDaiCollateral.erc20()) ) - cDaiVault = ( - await ethers.getContractAt('CTokenWrapper', await cDaiCollateral.erc20()) - ) - cDai = await ethers.getContractAt('CTokenMock', await cDaiVault.underlying()) + cDai = await ethers.getContractAt('CTokenMock', await cDaiCollateral.erc20()) // Get plain aToken aDai = ( @@ -2633,8 +2554,6 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // cDAI await whileImpersonating(holderCDAI, async (cdaiSigner) => { await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) - await cDai.connect(addr1).approve(cDaiVault.address, toBNDecimals(initialBal, 8).mul(100)) - await cDaiVault.connect(addr1).deposit(toBNDecimals(initialBal, 8).mul(100), addr1.address) }) }) @@ -2668,7 +2587,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Provide approvals for issuances await dai.connect(addr1).approve(rToken.address, issueAmount) await stataDai.connect(addr1).approve(rToken.address, issueAmount) - await cDaiVault.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) // Issue rTokens await expect(rToken.connect(addr1).issue(issueAmount)).to.emit(rToken, 'Issuance') diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index 6311deabc1..ee0c183d6a 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -154,7 +154,6 @@ interface CollateralFixture { } export async function collateralFixture( - comptroller: ComptrollerMock, aaveLendingPool: AaveLendingPoolMock, config: IConfig ): Promise { @@ -163,8 +162,6 @@ export async function collateralFixture( throw new Error(`Missing network configuration for ${hre.network.name}`) } - const CTokenWrapperFactory = await ethers.getContractFactory('CTokenWrapper') - const StaticATokenFactory: ContractFactory = await ethers.getContractFactory('StaticATokenLM') const FiatCollateralFactory: ContractFactory = await ethers.getContractFactory('FiatCollateral') const ATokenCollateralFactory = await ethers.getContractFactory('ATokenFiatCollateral') @@ -213,18 +210,12 @@ export async function collateralFixture( const erc20: IERC20Metadata = ( await ethers.getContractAt('CTokenMock', tokenAddress) ) - const vault = await CTokenWrapperFactory.deploy( - erc20.address, - `${await erc20.name()} Vault`, - `${await erc20.symbol()}-VAULT`, - comptroller.address - ) const coll = await CTokenCollateralFactory.deploy( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: chainlinkAddr, oracleError: ORACLE_ERROR, - erc20: vault.address, + erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -234,7 +225,7 @@ export async function collateralFixture( REVENUE_HIDING ) await coll.refresh() - return [vault, coll] + return [erc20, coll] } const makeATokenCollateral = async ( @@ -309,18 +300,12 @@ export async function collateralFixture( const erc20: IERC20Metadata = ( await ethers.getContractAt('CTokenMock', tokenAddress) ) - const vault = await CTokenWrapperFactory.deploy( - erc20.address, - `${await erc20.name()} Vault`, - `${await erc20.symbol()}-VAULT`, - comptroller.address - ) const coll = await CTokenNonFiatCollateralFactory.deploy( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracleAddr, oracleError: ORACLE_ERROR, - erc20: vault.address, + erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), @@ -332,7 +317,7 @@ export async function collateralFixture( REVENUE_HIDING ) await coll.refresh() - return [vault, coll] + return [erc20, coll] } const makeSelfReferentialCollateral = async ( @@ -365,19 +350,13 @@ export async function collateralFixture( const erc20: IERC20Metadata = ( await ethers.getContractAt('CTokenMock', tokenAddress) ) - const vault = await CTokenWrapperFactory.deploy( - erc20.address, - `${await erc20.name()} Vault`, - `${await erc20.symbol()}-VAULT`, - comptroller.address - ) const coll = ( await CTokenSelfReferentialCollateralFactory.deploy( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: chainlinkAddr, oracleError: ORACLE_ERROR, - erc20: vault.address, + erc20: erc20.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String(targetName), @@ -389,7 +368,7 @@ export async function collateralFixture( ) ) await coll.refresh() - return [vault, coll] + return [erc20, coll] } const makeEURFiatCollateral = async ( @@ -876,7 +855,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = // Deploy collateral for Main const { erc20s, collateral, basket, basketsNeededAmts } = await collateralFixture( - compoundMock, aaveMock, config ) diff --git a/test/monitor/FacadeMonitor.test.ts b/test/monitor/FacadeMonitor.test.ts index 45b7bf1d22..c8a7632e99 100644 --- a/test/monitor/FacadeMonitor.test.ts +++ b/test/monitor/FacadeMonitor.test.ts @@ -35,7 +35,6 @@ import { TestICToken, TestIRToken, USDCMock, - CTokenWrapper, StaticATokenV3LM, CusdcV3Wrapper, CometInterface, @@ -89,7 +88,6 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, let fUsdc: TestICToken let weth: IWETH let cDai: TestICToken - let cDaiVault: CTokenWrapper let cusdcV3: CometInterface let daiCollateral: FiatCollateral let aDaiCollateral: ATokenFiatCollateral @@ -153,8 +151,6 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Get tokens dai = erc20s[0] // DAI - cDaiVault = erc20s[6] // cDAI - cDai = await ethers.getContractAt('TestICToken', await cDaiVault.underlying()) // cDAI stataDai = erc20s[10] // static aDAI // Get plain aTokens @@ -198,6 +194,10 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await ethers.getContractAt('CometInterface', networkConfig[chainId].tokens.cUSDCv3 || '') ) + cDai = ( + await ethers.getContractAt('TestICToken', networkConfig[chainId].tokens.cDAI || '') + ) + sUsdc = ( await ethers.getContractAt('IStargatePool', networkConfig[chainId].tokens.sUSDC || '') ) @@ -229,8 +229,6 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, // Fund user with cDAI await whileImpersonating(holderCDAI, async (cdaiSigner) => { await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8).mul(100)) - await cDai.connect(addr1).approve(cDaiVault.address, toBNDecimals(initialBal, 8).mul(100)) - await cDaiVault.connect(addr1).deposit(toBNDecimals(initialBal, 8).mul(100), addr1.address) }) // Fund user with cUSDCV3 @@ -676,14 +674,12 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, beforeEach(async () => { // Setup basket - await basketHandler.connect(owner).setPrimeBasket([cDaiVault.address], [fp('1')]) + await basketHandler.connect(owner).setPrimeBasket([cDai.address], [fp('1')]) await basketHandler.connect(owner).refreshBasket() await advanceTime(Number(config.warmupPeriod) + 1) // Provide approvals - await cDaiVault - .connect(addr1) - .approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) // Advance time significantly - Recharge throttle await advanceTime(100000) @@ -724,17 +720,16 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await facadeMonitor.backingReedemable( rToken.address, CollPluginType.COMPOUND_V2, - cDaiVault.address + cDai.address ) ).to.equal(fp('1')) // Confirm all can be redeemed expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + const bmBalanceAmt = await cDai.balanceOf(backingManager.address) await whileImpersonating(backingManager.address, async (bmSigner) => { - await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + await cDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) }) - await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.not.be.reverted @@ -748,7 +743,7 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await facadeMonitor.backingReedemable( rToken.address, CollPluginType.COMPOUND_V2, - cDaiVault.address + cDai.address ) ).to.equal(fp('1')) @@ -760,7 +755,7 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await facadeMonitor.backingReedemable( rToken.address, CollPluginType.COMPOUND_V2, - cDaiVault.address + cDai.address ) ).to.be.closeTo(fp('0.80'), fp('0.01')) @@ -773,17 +768,16 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await facadeMonitor.backingReedemable( rToken.address, CollPluginType.COMPOUND_V2, - cDaiVault.address + cDai.address ) ).to.be.closeTo(fp('0.40'), fp('0.01')) // Confirm we cannot redeem full balance expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + const bmBalanceAmt = await cDai.balanceOf(backingManager.address) await whileImpersonating(backingManager.address, async (bmSigner) => { - await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + await cDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) }) - await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) await expect(cDai.connect(addr2).redeem(bmBalanceAmt)).to.be.reverted expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) @@ -797,7 +791,7 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await facadeMonitor.backingReedemable( rToken.address, CollPluginType.COMPOUND_V2, - cDaiVault.address + cDai.address ) ).to.equal(fp('1')) @@ -808,17 +802,16 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, await facadeMonitor.backingReedemable( rToken.address, CollPluginType.COMPOUND_V2, - cDaiVault.address + cDai.address ) ).to.be.closeTo(fp('0'), fp('0.01')) // Confirm we cannot redeem anything, not even 1% expect(await dai.balanceOf(addr2.address)).to.equal(bn(0)) - const bmBalanceAmt = await cDaiVault.balanceOf(backingManager.address) + const bmBalanceAmt = await cDai.balanceOf(backingManager.address) await whileImpersonating(backingManager.address, async (bmSigner) => { - await cDaiVault.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) + await cDai.connect(bmSigner).transfer(addr2.address, bmBalanceAmt) }) - await cDaiVault.connect(addr2).withdraw(bmBalanceAmt, addr2.address) expect(await cDai.balanceOf(addr2.address)).to.equal(bmBalanceAmt) await expect(cDai.connect(addr2).redeem((await cDai.balanceOf(addr2.address)).div(100))).to @@ -1205,7 +1198,6 @@ describeFork(`FacadeMonitor - Integration - Mainnet Forking P${IMPLEMENTATION}`, maUSDC = await MorphoTokenisedDepositFactory.deploy({ morphoController: networkConfig[chainId].MORPHO_AAVE_CONTROLLER!, morphoLens: networkConfig[chainId].MORPHO_AAVE_LENS!, - rewardsDistributor: networkConfig[chainId].MORPHO_REWARDS_DISTRIBUTOR!, underlyingERC20: networkConfig[chainId].tokens.USDC!, poolToken: networkConfig[chainId].tokens.aUSDC!, rewardToken: networkConfig[chainId].tokens.MORPHO!, diff --git a/test/plugins/Asset.test.ts b/test/plugins/Asset.test.ts index 029a34a683..120ad63acc 100644 --- a/test/plugins/Asset.test.ts +++ b/test/plugins/Asset.test.ts @@ -26,7 +26,7 @@ import { Asset, ATokenFiatCollateral, CTokenFiatCollateral, - CTokenWrapperMock, + CTokenMock, ERC20Mock, FiatCollateral, GnosisMock, @@ -72,7 +72,7 @@ describe('Assets contracts #fast', () => { let token: ERC20Mock let usdc: USDCMock let aToken: StaticATokenMock - let cToken: CTokenWrapperMock + let cToken: CTokenMock // Assets let collateral0: FiatCollateral @@ -140,9 +140,7 @@ describe('Assets contracts #fast', () => { aToken = ( await ethers.getContractAt('StaticATokenMock', await collateral2.erc20()) ) - cToken = ( - await ethers.getContractAt('CTokenWrapperMock', await collateral3.erc20()) - ) + cToken = await ethers.getContractAt('CTokenMock', await collateral3.erc20()) await rsr.connect(wallet).mint(wallet.address, amt) await compToken.connect(wallet).mint(wallet.address, amt) diff --git a/test/plugins/Collateral.test.ts b/test/plugins/Collateral.test.ts index 29e37b53f4..4933986b24 100644 --- a/test/plugins/Collateral.test.ts +++ b/test/plugins/Collateral.test.ts @@ -12,7 +12,6 @@ import { CTokenFiatCollateral, CTokenNonFiatCollateral, CTokenMock, - CTokenWrapperMock, CTokenSelfReferentialCollateral, ERC20Mock, EURFiatCollateral, @@ -72,7 +71,7 @@ describe('Collateral contracts', () => { let token: ERC20Mock let usdc: USDCMock let aToken: StaticATokenMock - let cToken: CTokenWrapperMock + let cToken: CTokenMock let aaveToken: ERC20Mock let compToken: ERC20Mock @@ -133,9 +132,7 @@ describe('Collateral contracts', () => { aToken = ( await ethers.getContractAt('StaticATokenMock', await aTokenCollateral.erc20()) ) - cToken = ( - await ethers.getContractAt('CTokenWrapperMock', await cTokenCollateral.erc20()) - ) + cToken = await ethers.getContractAt('CTokenMock', await cTokenCollateral.erc20()) await token.connect(owner).mint(owner.address, amt) await usdc.connect(owner).mint(owner.address, amt.div(bn('1e12'))) @@ -241,7 +238,7 @@ describe('Collateral contracts', () => { ) await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) await expect(cTokenCollateral.claimRewards()) - .to.emit(cToken, 'RewardsClaimed') + .to.emit(cTokenCollateral, 'RewardsClaimed') .withArgs(compToken.address, 0) }) }) @@ -1021,10 +1018,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenCollateral.address, fp('0.02'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cToken.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenCollateral.refresh()) @@ -1445,7 +1439,7 @@ describe('Collateral contracts', () => { let CTokenNonFiatFactory: ContractFactory let cTokenNonFiatCollateral: CTokenNonFiatCollateral let nonFiatToken: ERC20Mock - let cNonFiatTokenVault: CTokenWrapperMock + let cNonFiatToken: CTokenMock let targetUnitOracle: MockV3Aggregator let referenceUnitOracle: MockV3Aggregator @@ -1461,15 +1455,9 @@ describe('Collateral contracts', () => { await (await ethers.getContractFactory('MockV3Aggregator')).deploy(8, bn('1e8')) // 1 WBTC/BTC ) // cToken - cNonFiatTokenVault = await ( - await ethers.getContractFactory('CTokenWrapperMock') - ).deploy( - 'cWBTC Token', - 'cWBTC', - nonFiatToken.address, - compToken.address, - compoundMock.address - ) + cNonFiatToken = await ( + await ethers.getContractFactory('CTokenMock') + ).deploy('cWBTC Token', 'cWBTC', nonFiatToken.address, compoundMock.address) CTokenNonFiatFactory = await ethers.getContractFactory('CTokenNonFiatCollateral') @@ -1478,7 +1466,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1492,7 +1480,7 @@ describe('Collateral contracts', () => { await cTokenNonFiatCollateral.refresh() // Mint some tokens - await cNonFiatTokenVault.connect(owner).mint(owner.address, amt.div(bn('1e10'))) + await cNonFiatToken.connect(owner).mint(owner.address, amt.div(bn('1e10'))) }) it('Should not allow missing delayUntilDefault', async () => { @@ -1502,7 +1490,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1523,7 +1511,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1544,7 +1532,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: ZERO_ADDRESS, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1565,7 +1553,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1586,7 +1574,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1607,7 +1595,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1629,8 +1617,8 @@ describe('Collateral contracts', () => { ) expect(await cTokenNonFiatCollateral.chainlinkFeed()).to.equal(referenceUnitOracle.address) expect(await cTokenNonFiatCollateral.referenceERC20Decimals()).to.equal(18) - expect(await cTokenNonFiatCollateral.erc20()).to.equal(cNonFiatTokenVault.address) - expect(await cNonFiatTokenVault.decimals()).to.equal(8) + expect(await cTokenNonFiatCollateral.erc20()).to.equal(cNonFiatToken.address) + expect(await cNonFiatToken.decimals()).to.equal(8) expect(await cTokenNonFiatCollateral.targetName()).to.equal( ethers.utils.formatBytes32String('BTC') ) @@ -1654,7 +1642,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) // 0.02 of 20k await expect(cTokenNonFiatCollateral.claimRewards()) - .to.emit(cNonFiatTokenVault, 'RewardsClaimed') + .to.emit(cTokenNonFiatCollateral, 'RewardsClaimed') .withArgs(compToken.address, 0) }) @@ -1664,7 +1652,7 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.refPerTok()).to.equal(fp('0.02')) // Increase rate to double - await cNonFiatTokenVault.setExchangeRate(fp(2)) + await cNonFiatToken.setExchangeRate(fp(2)) await cTokenNonFiatCollateral.refresh() // RefPerTok also doubles in this case @@ -1720,17 +1708,14 @@ describe('Collateral contracts', () => { }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatTokenVault.exchangeRateStored() + const currRate = await cNonFiatToken.exchangeRateStored() const [currLow, currHigh] = await cTokenNonFiatCollateral.price() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cNonFiatToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenNonFiatCollateral.refresh()) @@ -1742,7 +1727,7 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) // Exchange rate stored is still accessible - expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + expect(await cNonFiatToken.exchangeRateStored()).to.equal(currRate) // Price remains the same await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) @@ -1752,17 +1737,14 @@ describe('Collateral contracts', () => { }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatTokenVault.exchangeRateStored() + const currRate = await cNonFiatToken.exchangeRateStored() const [currLow, currHigh] = await cTokenNonFiatCollateral.price() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cNonFiatToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenNonFiatCollateral.refresh()) @@ -1774,7 +1756,7 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) // Exchange rate stored is still accessible - expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + expect(await cNonFiatToken.exchangeRateStored()).to.equal(currRate) // Price remains the same await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) @@ -1784,17 +1766,14 @@ describe('Collateral contracts', () => { }) it('Enters DISABLED state when exchangeRateCurrent() reverts', async () => { - const currRate = await cNonFiatTokenVault.exchangeRateStored() + const currRate = await cNonFiatToken.exchangeRateStored() const [currLow, currHigh] = await cTokenNonFiatCollateral.price() expect(await cTokenNonFiatCollateral.status()).to.equal(CollateralStatus.SOUND) await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cNonFiatTokenVault.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cNonFiatToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenNonFiatCollateral.refresh()) @@ -1806,7 +1785,7 @@ describe('Collateral contracts', () => { expect(await cTokenNonFiatCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) // Exchange rate stored is still accessible - expect(await cNonFiatTokenVault.exchangeRateStored()).to.equal(currRate) + expect(await cNonFiatToken.exchangeRateStored()).to.equal(currRate) // Price remains the same await expectPrice(cTokenNonFiatCollateral.address, fp('400'), ORACLE_ERROR, true) @@ -1826,7 +1805,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: invalidChainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -1855,7 +1834,7 @@ describe('Collateral contracts', () => { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: referenceUnitOracle.address, oracleError: ORACLE_ERROR, - erc20: cNonFiatTokenVault.address, + erc20: cNonFiatToken.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('BTC'), @@ -2028,7 +2007,7 @@ describe('Collateral contracts', () => { let CTokenSelfReferentialFactory: ContractFactory let cTokenSelfReferentialCollateral: CTokenSelfReferentialCollateral let selfRefToken: WETH9 - let cSelfRefToken: CTokenWrapperMock + let cSelfRefToken: CTokenMock let chainlinkFeed: MockV3Aggregator beforeEach(async () => { @@ -2039,8 +2018,8 @@ describe('Collateral contracts', () => { // cToken Self Ref cSelfRefToken = await ( - await ethers.getContractFactory('CTokenWrapperMock') - ).deploy('cETH Token', 'cETH', selfRefToken.address, compToken.address, compoundMock.address) + await ethers.getContractFactory('CTokenMock') + ).deploy('cETH Token', 'cETH', selfRefToken.address, compoundMock.address) CTokenSelfReferentialFactory = await ethers.getContractFactory( 'CTokenSelfReferentialCollateral' @@ -2156,7 +2135,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) await expect(cTokenSelfReferentialCollateral.claimRewards()) - .to.emit(cSelfRefToken, 'RewardsClaimed') + .to.emit(cTokenSelfReferentialCollateral, 'RewardsClaimed') .withArgs(compToken.address, 0) }) @@ -2212,10 +2191,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cSelfRefToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenSelfReferentialCollateral.refresh()) @@ -2244,10 +2220,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cSelfRefToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenSelfReferentialCollateral.refresh()) @@ -2276,10 +2249,7 @@ describe('Collateral contracts', () => { await expectPrice(cTokenSelfReferentialCollateral.address, fp('0.02'), ORACLE_ERROR, true) // Make cToken revert on exchangeRateCurrent() - const cTokenErc20Mock = ( - await ethers.getContractAt('CTokenMock', await cSelfRefToken.underlying()) - ) - await cTokenErc20Mock.setRevertExchangeRate(true) + await cSelfRefToken.setRevertExchangeRate(true) // Refresh - should not revert - Sets DISABLED await expect(cTokenSelfReferentialCollateral.refresh()) diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 2575586520..925e4ad850 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -373,7 +373,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi .withArgs(stkAave.address, anyValue) await expect(aDaiCollateral.claimRewards()) - .to.emit(staticAToken, 'RewardsClaimed') + .to.emit(aDaiCollateral, 'RewardsClaimed') .withArgs(stkAave.address, anyValue) expect(await aDaiCollateral.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) @@ -630,7 +630,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await expectEvents(backingManager.claimRewards(), [ { - contract: staticAToken, + contract: backingManager, name: 'RewardsClaimed', args: [stkAave.address, anyValue], emitted: true, @@ -660,7 +660,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceBlocks(1000) // Claim rewards - await expect(backingManager.claimRewards()).to.emit(staticAToken, 'RewardsClaimed') + await expect(backingManager.claimRewards()).to.emit(backingManager, 'RewardsClaimed') // Check rewards both in stkAAVE and stkAAVE const rewardsstkAAVE1: BigNumber = await stkAave.balanceOf(backingManager.address) @@ -671,7 +671,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime(3600) // Get additional rewards - await expect(backingManager.claimRewards()).to.emit(staticAToken, 'RewardsClaimed') + await expect(backingManager.claimRewards()).to.emit(backingManager, 'RewardsClaimed') const rewardsstkAAVE2: BigNumber = await stkAave.balanceOf(backingManager.address) diff --git a/test/plugins/individual-collateral/collateralTests.ts b/test/plugins/individual-collateral/collateralTests.ts index 9768c5abf5..e870e2038d 100644 --- a/test/plugins/individual-collateral/collateralTests.ts +++ b/test/plugins/individual-collateral/collateralTests.ts @@ -186,8 +186,6 @@ export default function fn( }) describe('rewards', () => { - // TODO: these tests will be deprecated along with the claimRewards() - // function on collateral plugins (4/18/23) beforeEach(async () => { await beforeEachRewardsTest(ctx) }) @@ -211,21 +209,6 @@ export default function fn( ) expect(balAfter).gt(balBefore) }) - - itClaimsRewards('claims rewards (via erc20.claimRewards())', async () => { - const rewardable = await ethers.getContractAt('IRewardable', ctx.tok.address) - - const amount = bn('20').mul(bn(10).pow(await ctx.tok.decimals())) - await mintCollateralTo(ctx, amount, alice, alice.address) - - await advanceBlocks(1000) - await setNextBlockTimestamp((await getLatestBlockTimestamp()) + 12000) - - const balBefore = await (ctx.rewardToken as IERC20Metadata).balanceOf(alice.address) - await expect(rewardable.connect(alice).claimRewards()).to.emit(ctx.tok, 'RewardsClaimed') - const balAfter = await (ctx.rewardToken as IERC20Metadata).balanceOf(alice.address) - expect(balAfter).gt(balBefore) - }) }) describe('prices', () => { diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index 26e2b7c212..c46ac0b874 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -55,8 +55,6 @@ import { ComptrollerMock, CTokenFiatCollateral, CTokenMock, - CTokenWrapper, - CTokenWrapperMock, ERC20Mock, FacadeRead, FacadeTest, @@ -108,7 +106,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Tokens/Assets let dai: ERC20Mock let cDai: CTokenMock - let cDaiVault: CTokenWrapper let cDaiCollateral: CTokenFiatCollateral let compToken: ERC20Mock let compAsset: Asset @@ -159,6 +156,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi amtRate: fp('1e6'), // 1M RToken pctRate: fp('0.05'), // 5% }, + reweightable: false, } const defaultThreshold = fp('0.01') // 1% @@ -222,16 +220,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ) ) - const cDaiVaultFactory: ContractFactory = await ethers.getContractFactory('CTokenWrapper') - cDaiVault = ( - await cDaiVaultFactory.deploy( - cDai.address, - 'cDAI RToken Vault', - 'rv_cDAI', - comptroller.address - ) - ) - // Deploy cDai collateral plugin CTokenCollateralFactory = await ethers.getContractFactory('CTokenFiatCollateral') cDaiCollateral = await CTokenCollateralFactory.deploy( @@ -239,7 +227,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -256,11 +244,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await cDai.connect(cdaiSigner).transfer(addr1.address, toBNDecimals(initialBal, 8)) }) - const initialBalcDai = await cDai.balanceOf(addr1.address) - - await cDai.connect(addr1).approve(cDaiVault.address, initialBalcDai) - await cDaiVault.connect(addr1).deposit(initialBalcDai, addr1.address) - // Set parameters const rTokenConfig: IRTokenConfig = { name: 'RTKN RToken', @@ -341,9 +324,8 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // cDAI (CTokenFiatCollateral) expect(await cDaiCollateral.isCollateral()).to.equal(true) expect(await cDaiCollateral.referenceERC20Decimals()).to.equal(await dai.decimals()) - expect(await cDaiCollateral.erc20()).to.equal(cDaiVault.address) + expect(await cDaiCollateral.erc20()).to.equal(cDai.address) expect(await cDai.decimals()).to.equal(8) - expect(await cDaiVault.decimals()).to.equal(8) expect(await cDaiCollateral.targetName()).to.equal(ethers.utils.formatBytes32String('USD')) expect(await cDaiCollateral.refPerTok()).to.be.closeTo(fp('0.022'), fp('0.001')) expect(await cDaiCollateral.targetPerRef()).to.equal(fp('1')) @@ -359,18 +341,14 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ) // close to $0.022 cents // Check claim data - await expect(cDaiVault.claimRewards()) - .to.emit(cDaiVault, 'RewardsClaimed') - .withArgs(compToken.address, anyValue) - await expect(cDaiCollateral.claimRewards()) - .to.emit(cDaiVault, 'RewardsClaimed') + .to.emit(cDaiCollateral, 'RewardsClaimed') .withArgs(compToken.address, anyValue) expect(await cDaiCollateral.maxTradeVolume()).to.equal(config.rTokenMaxTradeVolume) // Exchange rate - await cDaiVault.exchangeRateCurrent() - expect(await cDaiVault.exchangeRateStored()).to.equal(await cDaiVault.exchangeRateStored()) + await cDai.exchangeRateCurrent() + expect(await cDai.exchangeRateStored()).to.equal(await cDai.exchangeRateStored()) // Should setup contracts expect(main.address).to.not.equal(ZERO_ADDRESS) @@ -383,7 +361,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(ERC20s[0]).to.equal(rToken.address) expect(ERC20s[1]).to.equal(rsr.address) expect(ERC20s[2]).to.equal(compToken.address) - expect(ERC20s[3]).to.equal(cDaiVault.address) + expect(ERC20s[3]).to.equal(cDai.address) expect(ERC20s.length).to.eql(4) // Assets @@ -401,7 +379,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Basket expect(await basketHandler.fullyCollateralized()).to.equal(true) const backing = await facade.basketTokens(rToken.address) - expect(backing[0]).to.equal(cDaiVault.address) + expect(backing[0]).to.equal(cDai.address) expect(backing.length).to.equal(1) // Check other values @@ -412,7 +390,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Check RToken price const issueAmount: BigNumber = bn('10000e18') - await cDaiVault.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) await advanceTime(3600) await expect(rToken.connect(addr1).issue(issueAmount)).to.emit(rToken, 'Issuance') await expectRTokenPrice( @@ -427,7 +405,6 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi // Validate constructor arguments // Note: Adapt it to your plugin constructor validations it('Should validate constructor arguments correctly', async () => { - // Comptroller await expect( CTokenCollateralFactory.deploy( { @@ -451,15 +428,12 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi ).deploy('Bad ERC20', 'BERC20') await token0decimals.setDecimals(0) - const CTokenWrapperMockFactory: ContractFactory = await ethers.getContractFactory( - 'CTokenWrapperMock' - ) - const vault: CTokenWrapperMock = ( - await CTokenWrapperMockFactory.deploy( + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') + const vault: CTokenMock = ( + await CTokenMockFactory.deploy( '0 Decimal Token', '0 Decimal Token', token0decimals.address, - compToken.address, comptroller.address ) ) @@ -488,7 +462,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: networkConfig[chainId].chainlinkFeeds.DAI as string, oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -509,7 +483,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi const issueAmount: BigNumber = MIN_ISSUANCE_PER_BLOCK // instant issuance // Provide approvals for issuances - await cDaiVault.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) await advanceTime(3600) @@ -520,7 +494,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await rToken.balanceOf(addr1.address)).to.equal(issueAmount) // Store Balances after issuance - const balanceAddr1cDai: BigNumber = await cDaiVault.balanceOf(addr1.address) + const balanceAddr1cDai: BigNumber = await cDai.balanceOf(addr1.address) // Check rates and prices const [cDaiPriceLow1, cDaiPriceHigh1] = await cDaiCollateral.price() // ~ 0.022015 cents @@ -614,16 +588,13 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await rToken.totalSupply()).to.equal(0) // Check balances - Fewer cTokens should have been sent to the user - const newBalanceAddr1cDai: BigNumber = await cDaiVault.balanceOf(addr1.address) + const newBalanceAddr1cDai: BigNumber = await cDai.balanceOf(addr1.address) // Check received tokens represent ~10K in value at current prices expect(newBalanceAddr1cDai.sub(balanceAddr1cDai)).to.be.closeTo(bn('303570e8'), bn('8e7')) // ~0.03294 * 303571 ~= 10K (100% of basket) // Check remainders in Backing Manager - expect(await cDaiVault.balanceOf(backingManager.address)).to.be.closeTo( - bn('150663e8'), - bn('5e7') - ) // ~= 4962.8 usd in value + expect(await cDai.balanceOf(backingManager.address)).to.be.closeTo(bn('150663e8'), bn('5e7')) // ~= 4962.8 usd in value // Check total asset value (remainder) expect(await facadeTest.callStatic.totalAssetValue(rToken.address)).to.be.closeTo( @@ -645,7 +616,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await expectEvents(backingManager.claimRewards(), [ { - contract: cDaiVault, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, anyValue], emitted: true, @@ -656,7 +627,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await compToken.balanceOf(backingManager.address)).to.equal(0) // Provide approvals for issuances - await cDaiVault.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) + await cDai.connect(addr1).approve(rToken.address, toBNDecimals(issueAmount, 8).mul(100)) await advanceTime(3600) @@ -673,7 +644,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime(8000) // Claim rewards - await expect(backingManager.claimRewards()).to.emit(cDaiVault, 'RewardsClaimed') + await expect(backingManager.claimRewards()).to.emit(backingManager, 'RewardsClaimed') // Check rewards both in COMP and stkAAVE const rewardsCOMP1: BigNumber = await compToken.balanceOf(backingManager.address) @@ -684,7 +655,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await advanceTime(3600) // Get additional rewards - await expect(backingManager.claimRewards()).to.emit(cDaiVault, 'RewardsClaimed') + await expect(backingManager.claimRewards()).to.emit(backingManager, 'RewardsClaimed') const rewardsCOMP2: BigNumber = await compToken.balanceOf(backingManager.address) @@ -716,7 +687,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: NO_PRICE_DATA_FEED, oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -741,7 +712,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: mockChainlinkFeed.address, oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDai.address, maxTradeVolume: config.rTokenMaxTradeVolume, oracleTimeout: ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), @@ -835,21 +806,11 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') const symbol = await cDai.symbol() const cDaiMock: CTokenMock = ( - await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address) + await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address, comptroller.address) ) // Set initial exchange rate to the new cDai Mock await cDaiMock.setExchangeRate(fp('0.02')) - const cDaiVaultFactory: ContractFactory = await ethers.getContractFactory('CTokenWrapper') - const cDaiMockVault = ( - await cDaiVaultFactory.deploy( - cDaiMock.address, - 'cDAI Mock RToken Vault', - 'rv_mock_cDAI', - comptroller.address - ) - ) - // Redeploy plugin using the new cDai mock const newCDaiCollateral: CTokenFiatCollateral = await ( await ethers.getContractFactory('CTokenFiatCollateral') @@ -858,7 +819,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: await cDaiCollateral.chainlinkFeed(), oracleError: ORACLE_ERROR, - erc20: cDaiMockVault.address, + erc20: cDaiMock.address, maxTradeVolume: await cDaiCollateral.maxTradeVolume(), oracleTimeout: await cDaiCollateral.oracleTimeout(), targetName: await cDaiCollateral.targetName(), @@ -891,17 +852,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') const symbol = await cDai.symbol() const cDaiMock: CTokenMock = ( - await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address) - ) - - const cDaiVaultFactory: ContractFactory = await ethers.getContractFactory('CTokenWrapper') - const cDaiMockVault = ( - await cDaiVaultFactory.deploy( - cDaiMock.address, - 'cDAI Mock RToken Vault', - 'rv_mock_cDAI', - comptroller.address - ) + await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address, comptroller.address) ) // Redeploy plugin using the new cDai mock @@ -912,7 +863,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: await cDaiCollateral.chainlinkFeed(), oracleError: ORACLE_ERROR, - erc20: cDaiMockVault.address, + erc20: cDaiMock.address, maxTradeVolume: await cDaiCollateral.maxTradeVolume(), oracleTimeout: await cDaiCollateral.oracleTimeout(), targetName: await cDaiCollateral.targetName(), @@ -928,7 +879,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await newCDaiCollateral.whenDefault()).to.equal(MAX_UINT48) await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) const [currLow, currHigh] = await newCDaiCollateral.price() - const currRate = await cDaiMockVault.exchangeRateStored() + const currRate = await cDaiMock.exchangeRateStored() // Make exchangeRateCurrent() revert await cDaiMock.setRevertExchangeRate(true) @@ -943,7 +894,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi expect(await newCDaiCollateral.whenDefault()).to.equal(expectedDefaultTimestamp) // Exchange rate stored is still accessible - expect(await cDaiMockVault.exchangeRateStored()).to.equal(currRate) + expect(await cDaiMock.exchangeRateStored()).to.equal(currRate) // Price remains the same await expectPrice(newCDaiCollateral.address, fp('0.02'), ORACLE_ERROR, true) @@ -1108,20 +1059,15 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') const symbol = await cDai.symbol() const cDaiMock: CTokenMock = ( - await CTokenMockFactory.deploy(symbol + ' Token', symbol, dai.address) - ) - // Set initial exchange rate to the new cDai Mock - await cDaiMock.setExchangeRate(fp('0.02')) - - const cDaiVaultFactory: ContractFactory = await ethers.getContractFactory('CTokenWrapper') - cDaiVault = ( - await cDaiVaultFactory.deploy( - cDaiMock.address, - 'cDAI RToken Vault', - 'rv_cDAI', + await CTokenMockFactory.deploy( + symbol + ' Token', + symbol, + dai.address, comptroller.address ) ) + // Set initial exchange rate to the new cDai Mock + await cDaiMock.setExchangeRate(fp('0.02')) // Redeploy plugin using the new cDai mock const newCDaiCollateral: CTokenFiatCollateral = await ( @@ -1131,7 +1077,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi priceTimeout: PRICE_TIMEOUT, chainlinkFeed: await cDaiCollateral.chainlinkFeed(), oracleError: ORACLE_ERROR, - erc20: cDaiVault.address, + erc20: cDaiMock.address, maxTradeVolume: await cDaiCollateral.maxTradeVolume(), oracleTimeout: await cDaiCollateral.oracleTimeout(), targetName: await cDaiCollateral.targetName(), @@ -1148,12 +1094,5 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi await snapshotGasCost(newCDaiCollateral.refresh()) // 2nd refresh can be different than 1st }) }) - - context('ERC20', () => { - it('transfer', async () => { - await snapshotGasCost(cDaiVault.connect(addr1).transfer(cDaiCollateral.address, bn('1'))) - await snapshotGasCost(cDaiVault.connect(addr1).transfer(cDaiCollateral.address, bn('1'))) - }) - }) }) }) diff --git a/test/plugins/individual-collateral/curve/collateralTests.ts b/test/plugins/individual-collateral/curve/collateralTests.ts index 77b1602c3e..86ea3c0eab 100644 --- a/test/plugins/individual-collateral/curve/collateralTests.ts +++ b/test/plugins/individual-collateral/curve/collateralTests.ts @@ -706,7 +706,7 @@ export default function fn( expect(await ctx.collateral.whenDefault()).to.equal(MAX_UINT48) // Few more quanta of decrease results in default - await ctx.curvePool.setVirtualPrice(newVirtualPrice.sub(4)) // sub 4 to compenstate for rounding + await ctx.curvePool.setVirtualPrice(newVirtualPrice.sub(4)) // sub 4 to compensate for rounding await expect(ctx.collateral.refresh()).to.emit(ctx.collateral, 'CollateralStatusChanged') expect(await ctx.collateral.status()).to.equal(CollateralStatus.DISABLED) expect(await ctx.collateral.whenDefault()).to.equal(await getLatestBlockTimestamp()) @@ -849,6 +849,7 @@ export default function fn( amtRate: fp('1e6'), // 1M RToken pctRate: fp('0.05'), // 5% }, + reweightable: false, } interface IntegrationFixture { diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 9dd384a82c..2c5cb19f5b 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -9,7 +9,7 @@ import { bn, fp, pow10, toBNDecimals } from '../../common/numbers' import { Asset, ComptrollerMock, - CTokenWrapperMock, + CTokenMock, ERC20Mock, FacadeRead, FacadeTest, @@ -83,11 +83,11 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { let usdToken: ERC20Mock let eurToken: ERC20Mock - let cUSDTokenVault: CTokenWrapperMock + let cUSDToken: CTokenMock let aUSDToken: StaticATokenMock let wbtc: ERC20Mock - let cWBTCVault: CTokenWrapperMock - let cETHVault: CTokenWrapperMock + let cWBTC: CTokenMock + let cETH: CTokenMock let weth: WETH9 @@ -156,7 +156,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Setup Factories const ERC20: ContractFactory = await ethers.getContractFactory('ERC20Mock') const WETH: ContractFactory = await ethers.getContractFactory('WETH9') - const CToken: ContractFactory = await ethers.getContractFactory('CTokenWrapperMock') + const CToken: ContractFactory = await ethers.getContractFactory('CTokenMock') const MockV3AggregatorFactory: ContractFactory = await ethers.getContractFactory( 'MockV3Aggregator' ) @@ -184,9 +184,9 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // 2. CTokenFiatCollateral against USD // 3. ATokenFiatCollateral against USD // 4. NonFiatCollateral WBTC against BTC - // 5. CTokenNonFiatCollateral cWBTCVault against BTC + // 5. CTokenNonFiatCollateral cWBTC against BTC // 6. SelfReferentialCollateral WETH against ETH - // 7. CTokenSelfReferentialCollateral cETHVault against ETH + // 7. CTokenSelfReferentialCollateral cETH against ETH primeBasketERC20s = [] targetPricesInUoA = [] @@ -241,12 +241,12 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { collateral.push(await ethers.getContractAt('EURFiatCollateral', fiatEUR)) // 3. CTokenFiatCollateral against USD - cUSDTokenVault = erc20s[4] // cDAI Token + cUSDToken = erc20s[4] // cDAI Token const { collateral: cUSDCollateral } = await hre.run('deploy-ctoken-fiat-collateral', { priceTimeout: PRICE_TIMEOUT.toString(), priceFeed: usdFeed.address, oracleError: ORACLE_ERROR.toString(), - cToken: cUSDTokenVault.address, + cToken: cUSDToken.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('USD'), @@ -257,7 +257,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { }) await assetRegistry.swapRegistered(cUSDCollateral) - primeBasketERC20s.push(cUSDTokenVault.address) + primeBasketERC20s.push(cUSDToken.address) targetPricesInUoA.push(fp('1')) // USD Target collateral.push(await ethers.getContractAt('CTokenFiatCollateral', cUSDCollateral)) @@ -306,22 +306,16 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { targetPricesInUoA.push(fp('20000')) // BTC Target collateral.push(await ethers.getContractAt('NonFiatCollateral', wBTCCollateral)) - // 6. CTokenNonFiatCollateral cWBTCVault against BTC - cWBTCVault = ( - await CToken.deploy( - 'cWBTCVault Token', - 'cWBTCVault', - wbtc.address, - compToken.address, - compoundMock.address - ) + // 6. CTokenNonFiatCollateral cWBTC against BTC + cWBTC = ( + await CToken.deploy('cWBTC Token', 'cWBTC', wbtc.address, compoundMock.address) ) - const { collateral: cWBTCVaultCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { + const { collateral: cWBTCCollateral } = await hre.run('deploy-ctoken-nonfiat-collateral', { priceTimeout: PRICE_TIMEOUT.toString(), referenceUnitFeed: referenceUnitFeed.address, targetUnitFeed: targetUnitFeed.address, combinedOracleError: ORACLE_ERROR.toString(), - cToken: cWBTCVault.address, + cToken: cWBTC.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), oracleTimeout: ORACLE_TIMEOUT.toString(), targetUnitOracleTimeout: ORACLE_TIMEOUT.toString(), @@ -332,11 +326,11 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { noOutput: true, }) - await assetRegistry.register(cWBTCVaultCollateral) - primeBasketERC20s.push(cWBTCVault.address) + await assetRegistry.register(cWBTCCollateral) + primeBasketERC20s.push(cWBTC.address) targetPricesInUoA.push(fp('20000')) // BTC Target collateral.push( - await ethers.getContractAt('CTokenNonFiatCollateral', cWBTCVaultCollateral) + await ethers.getContractAt('CTokenNonFiatCollateral', cWBTCCollateral) ) // 7. SelfReferentialCollateral WETH against ETH @@ -361,24 +355,16 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { await ethers.getContractAt('SelfReferentialCollateral', wETHCollateral) ) - // 8. CTokenSelfReferentialCollateral cETHVault against ETH + // 8. CTokenSelfReferentialCollateral cETH against ETH // Give higher maxTradeVolume: MAX_TRADE_VOLUME.toString(), - cETHVault = ( - await CToken.deploy( - 'cETHVault Token', - 'cETHVault', - weth.address, - compToken.address, - compoundMock.address - ) - ) - const { collateral: cETHVaultCollateral } = await hre.run( + cETH = await CToken.deploy('cETH Token', 'cETH', weth.address, compoundMock.address) + const { collateral: cETHCollateral } = await hre.run( 'deploy-ctoken-selfreferential-collateral', { priceTimeout: PRICE_TIMEOUT.toString(), priceFeed: ethFeed.address, oracleError: ORACLE_ERROR.toString(), - cToken: cETHVault.address, + cToken: cETH.address, maxTradeVolume: MAX_TRADE_VOLUME.toString(), oracleTimeout: ORACLE_TIMEOUT.toString(), targetName: hre.ethers.utils.formatBytes32String('ETH'), @@ -387,11 +373,11 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { noOutput: true, } ) - await assetRegistry.register(cETHVaultCollateral) - primeBasketERC20s.push(cETHVault.address) + await assetRegistry.register(cETHCollateral) + primeBasketERC20s.push(cETH.address) targetPricesInUoA.push(fp('1200')) // ETH Target collateral.push( - await ethers.getContractAt('CTokenSelfReferentialCollateral', cETHVaultCollateral) + await ethers.getContractAt('CTokenSelfReferentialCollateral', cETHCollateral) ) targetAmts = [] @@ -475,8 +461,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await eurToken.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn1)) expect(expectedTkn1).to.equal(quotes[1]) - expect(await cUSDTokenVault.balanceOf(backingManager.address)).to.equal(expectedTkn2) - expect(await cUSDTokenVault.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn2)) + expect(await cUSDToken.balanceOf(backingManager.address)).to.equal(expectedTkn2) + expect(await cUSDToken.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn2)) expect(expectedTkn2).to.equal(quotes[2]) expect(await aUSDToken.balanceOf(backingManager.address)).to.equal(expectedTkn3) @@ -487,16 +473,16 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await wbtc.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn4)) expect(expectedTkn4).to.equal(quotes[4]) - expect(await cWBTCVault.balanceOf(backingManager.address)).to.equal(expectedTkn5) - expect(await cWBTCVault.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn5)) + expect(await cWBTC.balanceOf(backingManager.address)).to.equal(expectedTkn5) + expect(await cWBTC.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn5)) expect(expectedTkn5).to.equal(quotes[5]) expect(await weth.balanceOf(backingManager.address)).to.equal(expectedTkn6) expect(await weth.balanceOf(addr1.address)).to.equal(wethDepositAmt.sub(expectedTkn6)) expect(expectedTkn6).to.equal(quotes[6]) - expect(await cETHVault.balanceOf(backingManager.address)).to.equal(expectedTkn7) - expect(await cETHVault.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn7)) + expect(await cETH.balanceOf(backingManager.address)).to.equal(expectedTkn7) + expect(await cETH.balanceOf(addr1.address)).to.equal(initialBal.sub(expectedTkn7)) expect(expectedTkn7).to.equal(quotes[7]) // Redeem @@ -511,8 +497,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await eurToken.balanceOf(backingManager.address)).to.equal(0) expect(await eurToken.balanceOf(addr1.address)).to.equal(initialBal) - expect(await cUSDTokenVault.balanceOf(backingManager.address)).to.equal(0) - expect(await cUSDTokenVault.balanceOf(addr1.address)).to.equal(initialBal) + expect(await cUSDToken.balanceOf(backingManager.address)).to.equal(0) + expect(await cUSDToken.balanceOf(addr1.address)).to.equal(initialBal) expect(await aUSDToken.balanceOf(backingManager.address)).to.equal(0) expect(await aUSDToken.balanceOf(addr1.address)).to.equal(initialBal) @@ -520,14 +506,14 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await wbtc.balanceOf(backingManager.address)).to.equal(0) expect(await wbtc.balanceOf(addr1.address)).to.equal(initialBal) - expect(await cWBTCVault.balanceOf(backingManager.address)).to.equal(0) - expect(await cWBTCVault.balanceOf(addr1.address)).to.equal(initialBal) + expect(await cWBTC.balanceOf(backingManager.address)).to.equal(0) + expect(await cWBTC.balanceOf(addr1.address)).to.equal(initialBal) expect(await weth.balanceOf(backingManager.address)).to.equal(0) expect(await weth.balanceOf(addr1.address)).to.equal(wethDepositAmt) - expect(await cETHVault.balanceOf(backingManager.address)).to.equal(0) - expect(await cETHVault.balanceOf(addr1.address)).to.equal(initialBal) + expect(await cETH.balanceOf(backingManager.address)).to.equal(0) + expect(await cETH.balanceOf(addr1.address)).to.equal(initialBal) }) it('Should claim COMP rewards correctly - All RSR', async () => { @@ -577,13 +563,13 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { await expectEvents(backingManager.claimRewards(), [ { - contract: cUSDTokenVault, + contract: backingManager, name: 'RewardsClaimed', args: [compToken.address, rewardAmount], emitted: true, }, { - contract: aUSDToken, + contract: backingManager, name: 'RewardsClaimed', args: [aaveToken.address, bn(0)], emitted: true, @@ -677,9 +663,9 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Requires 200 cDAI (at $0.02 = $4 USD) expect(quotes[2]).to.equal(bn(200e8)) - // Requires 1600 cWBTCVault (at $400 = $640K USD) - matches 32 BTC @ 20K + // Requires 1600 cWBTC (at $400 = $640K USD) - matches 32 BTC @ 20K expect(quotes[5]).to.equal(bn(1600e8)) - // Requires 6400 cETHVault (at $24 = $153,600 K USD) - matches 128 ETH @ 1200 + // Requires 6400 cETH (at $24 = $153,600 K USD) - matches 128 ETH @ 1200 expect(quotes[7]).to.equal(bn(6400e8)) // Issue 1 RToken @@ -701,19 +687,19 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await rToken.totalSupply()).to.equal(issueAmount) // Increase redemption rate for cUSD to double - await cUSDTokenVault.setExchangeRate(fp('2')) + await cUSDToken.setExchangeRate(fp('2')) - // Increase redemption rate for cWBTCVault 25% - await cWBTCVault.setExchangeRate(fp('1.25')) + // Increase redemption rate for cWBTC 25% + await cWBTC.setExchangeRate(fp('1.25')) - // Increase redemption rate for cETHVault 5% - await cETHVault.setExchangeRate(fp('1.05')) + // Increase redemption rate for cETH 5% + await cETH.setExchangeRate(fp('1.05')) // Get updated quotes // Should now require: // Token2: 100 cDAI @ 0.004 = 4 USD - // Token5: 1280 cWBTCVault @ 500 = 640K USD - // Token7: 6095.23 cETHVault @ 25.2 = $153,600 USD + // Token5: 1280 cWBTC @ 500 = 640K USD + // Token7: 6095.23 cETH @ 25.2 = $153,600 USD const [, newQuotes] = await facade.connect(addr1).callStatic.issue(rToken.address, issueAmount) await assetRegistry.refresh() // refresh to update refPerTok() @@ -727,14 +713,14 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { const expectedTkn5: BigNumber = toBNDecimals( issueAmount.mul(targetAmts[5]).div(await collateral[5].refPerTok()), 8 - ) // cWBTCVault + ) // cWBTC expect(expectedTkn5).to.be.closeTo(newQuotes[5], point5Pct(newQuotes[5])) expect(newQuotes[5]).to.equal(bn(1280e8)) const expectedTkn7: BigNumber = toBNDecimals( issueAmount.mul(targetAmts[7]).div(await collateral[7].refPerTok()), 8 - ) // cETHVault + ) // cETH expect(expectedTkn7).to.be.closeTo(newQuotes[7], point5Pct(newQuotes[7])) expect(newQuotes[7]).to.be.closeTo(bn(6095e8), point5Pct(bn(6095e8))) @@ -751,7 +737,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(excessValueLow2).to.be.lt(fp('4')) expect(excessValueHigh2).to.be.gt(fp('4')) - // Excess cWBTCVault = 320 - valued at 320 * 500 = 160K usd (25%) + // Excess cWBTC = 320 - valued at 320 * 500 = 160K usd (25%) const excessQuantity5: BigNumber = quotes[5].sub(newQuotes[5]).mul(pow10(10)) // Convert to 18 decimals for simplification const [lowPrice5, highPrice5] = await collateral[5].price() const excessValueLow5: BigNumber = excessQuantity5.mul(lowPrice5).div(BN_SCALE_FACTOR) @@ -762,7 +748,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(excessValueLow5).to.be.lt(fp('160000')) expect(excessValueHigh5).to.be.gt(fp('160000')) - // Excess cETHVault = 304.7619- valued at 25.2 = 7679.999 usd (5%) + // Excess cETH = 304.7619- valued at 25.2 = 7679.999 usd (5%) const excessQuantity7: BigNumber = quotes[7].sub(newQuotes[7]).mul(pow10(10)) // Convert to 18 decimals for simplification const [lowPrice7, highPrice7] = await collateral[7].price() const excessValueLow7: BigNumber = excessQuantity7.mul(lowPrice7).div(BN_SCALE_FACTOR) @@ -804,14 +790,14 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(expectedToFurnace2).to.equal(bn(40e8)) // Token5- CWBTC - const expectedToTrader5 = toBNDecimals(excessQuantity5.mul(60).div(100), 8) // 60% of 320 tokens = 192 cWBTCVault - const expectedToFurnace5 = toBNDecimals(excessQuantity5, 8).sub(expectedToTrader5) // Remainder = 128 cWBTCVault + const expectedToTrader5 = toBNDecimals(excessQuantity5.mul(60).div(100), 8) // 60% of 320 tokens = 192 cWBTC + const expectedToFurnace5 = toBNDecimals(excessQuantity5, 8).sub(expectedToTrader5) // Remainder = 128 cWBTC expect(expectedToTrader5).to.equal(bn(192e8)) expect(expectedToFurnace5).to.equal(bn(128e8)) // Token7- CETH - const expectedToTrader7 = toBNDecimals(excessQuantity7.mul(60).div(100), 8) // 60% of 304.7619 = 182.85 cETHVault - const expectedToFurnace7 = toBNDecimals(excessQuantity7, 8).sub(expectedToTrader7) // Remainder = 121.9 cETHVault + const expectedToTrader7 = toBNDecimals(excessQuantity7.mul(60).div(100), 8) // 60% of 304.7619 = 182.85 cETH + const expectedToFurnace7 = toBNDecimals(excessQuantity7, 8).sub(expectedToTrader7) // Remainder = 121.9 cETH expect(expectedToTrader7).to.be.closeTo(bn('182.85e8'), point5Pct(bn('182.85e8'))) expect(expectedToFurnace7).to.be.closeTo(bn('121.9e8'), point5Pct(bn('121.9e8'))) @@ -866,14 +852,14 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // Check auctions registered // cUSD -> RSR Auction await expectTrade(rsrTrader, { - sell: cUSDTokenVault.address, + sell: cUSDToken.address, buy: rsr.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('0'), }) // Check trades - let trade = await getTrade(rsrTrader, cUSDTokenVault.address) + let trade = await getTrade(rsrTrader, cUSDToken.address) let auctionId = await trade.auctionId() const [, , , auctionSellAmt2, auctionbuyAmt2] = await gnosis.auctions(auctionId) expect(sellAmt2).to.be.closeTo(auctionSellAmt2, point5Pct(auctionSellAmt2)) @@ -881,13 +867,13 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { // cUSD -> RToken Auction await expectTrade(rTokenTrader, { - sell: cUSDTokenVault.address, + sell: cUSDToken.address, buy: rToken.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('3'), }) - trade = await getTrade(rTokenTrader, cUSDTokenVault.address) + trade = await getTrade(rTokenTrader, cUSDToken.address) auctionId = await trade.auctionId() const [, , , auctionSellAmtRToken2, auctionbuyAmtRToken2] = await gnosis.auctions(auctionId) expect(sellAmtRToken2).to.be.closeTo(auctionSellAmtRToken2, point5Pct(auctionSellAmtRToken2)) @@ -913,15 +899,13 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await rToken.balanceOf(furnace.address)).to.equal(0) // Check funds in Market and Traders - expect(await cUSDTokenVault.balanceOf(gnosis.address)).to.be.closeTo( + expect(await cUSDToken.balanceOf(gnosis.address)).to.be.closeTo( sellAmt2.add(sellAmtRToken2), point5Pct(sellAmt2.add(sellAmtRToken2)) ) - expect(await cUSDTokenVault.balanceOf(rsrTrader.address)).to.equal( - expectedToTrader2.sub(sellAmt2) - ) - expect(await cUSDTokenVault.balanceOf(rTokenTrader.address)).to.equal( + expect(await cUSDToken.balanceOf(rsrTrader.address)).to.equal(expectedToTrader2.sub(sellAmt2)) + expect(await cUSDToken.balanceOf(rTokenTrader.address)).to.equal( expectedToFurnace2.sub(sellAmtRToken2) ) @@ -942,7 +926,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { buyAmount: auctionbuyAmtRToken2, }) - // Closing auction will create new auction for cWBTCVault + // Closing auction will create new auction for cWBTC // Set expected values const sellAmt5: BigNumber = expectedToTrader5 // everything is auctioned, below max auction const minBuyAmt5 = toMinBuyAmt( @@ -971,7 +955,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeSettled', - args: [anyValue, cUSDTokenVault.address, rsr.address, auctionSellAmt2, auctionbuyAmt2], + args: [anyValue, cUSDToken.address, rsr.address, auctionSellAmt2, auctionbuyAmt2], emitted: true, }, { @@ -979,7 +963,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { name: 'TradeSettled', args: [ anyValue, - cUSDTokenVault.address, + cUSDToken.address, rToken.address, auctionSellAmtRToken2, auctionbuyAmtRToken2, @@ -1020,51 +1004,51 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) // Check no more funds in Market and Traders - expect(await cUSDTokenVault.balanceOf(gnosis.address)).to.equal(0) - expect(await cUSDTokenVault.balanceOf(rsrTrader.address)).to.equal(0) - expect(await cUSDTokenVault.balanceOf(rTokenTrader.address)).to.equal(0) + expect(await cUSDToken.balanceOf(gnosis.address)).to.equal(0) + expect(await cUSDToken.balanceOf(rsrTrader.address)).to.equal(0) + expect(await cUSDToken.balanceOf(rTokenTrader.address)).to.equal(0) - // Check new auctions created for cWBTCVault + // Check new auctions created for cWBTC auctionTimestamp = await getLatestBlockTimestamp() // Check auctions registered - // cWBTCVault -> RSR Auction + // cWBTC -> RSR Auction await expectTrade(rsrTrader, { - sell: cWBTCVault.address, + sell: cWBTC.address, buy: rsr.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('6'), }) // Check trades - trade = await getTrade(rsrTrader, cWBTCVault.address) + trade = await getTrade(rsrTrader, cWBTC.address) auctionId = await trade.auctionId() const [, , , auctionSellAmt5, auctionbuyAmt5] = await gnosis.auctions(auctionId) expect(sellAmt5).to.be.closeTo(auctionSellAmt5, point5Pct(auctionSellAmt5)) expect(minBuyAmt5).to.be.closeTo(auctionbuyAmt5, point5Pct(auctionbuyAmt5)) - // cWBTCVault -> RToken Auction + // cWBTC -> RToken Auction await expectTrade(rTokenTrader, { - sell: cWBTCVault.address, + sell: cWBTC.address, buy: rToken.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('8'), }) - trade = await getTrade(rTokenTrader, cWBTCVault.address) + trade = await getTrade(rTokenTrader, cWBTC.address) auctionId = await trade.auctionId() const [, , , auctionSellAmtRToken5, auctionbuyAmtRToken5] = await gnosis.auctions(auctionId) expect(sellAmtRToken5).to.be.closeTo(auctionSellAmtRToken5, point5Pct(auctionSellAmtRToken5)) expect(minBuyAmtRToken5).to.be.closeTo(auctionbuyAmtRToken5, point5Pct(auctionbuyAmtRToken5)) // Check funds in Market and Traders - expect(await cWBTCVault.balanceOf(gnosis.address)).to.be.closeTo( + expect(await cWBTC.balanceOf(gnosis.address)).to.be.closeTo( sellAmt5.add(sellAmtRToken5), point5Pct(sellAmt5.add(sellAmtRToken5)) ) - expect(await cWBTCVault.balanceOf(rsrTrader.address)).to.equal(expectedToTrader5.sub(sellAmt5)) - expect(await cWBTCVault.balanceOf(rTokenTrader.address)).to.equal( + expect(await cWBTC.balanceOf(rsrTrader.address)).to.equal(expectedToTrader5.sub(sellAmt5)) + expect(await cWBTC.balanceOf(rTokenTrader.address)).to.equal( expectedToFurnace5.sub(sellAmtRToken5) ) @@ -1085,7 +1069,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { buyAmount: auctionbuyAmtRToken5, }) - // Closing auction will create new auction for cETHVault + // Closing auction will create new auction for cETH // Set expected values const sellAmt7: BigNumber = expectedToTrader7 // everything is auctioned, below max auction const minBuyAmt7 = toMinBuyAmt( @@ -1114,7 +1098,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeSettled', - args: [anyValue, cWBTCVault.address, rsr.address, auctionSellAmt5, auctionbuyAmt5], + args: [anyValue, cWBTC.address, rsr.address, auctionSellAmt5, auctionbuyAmt5], emitted: true, }, { @@ -1122,7 +1106,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { name: 'TradeSettled', args: [ anyValue, - cWBTCVault.address, + cWBTC.address, rToken.address, auctionSellAmtRToken5, auctionbuyAmtRToken5, @@ -1170,51 +1154,51 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) // Check no more funds in Market and Traders - expect(await cWBTCVault.balanceOf(gnosis.address)).to.equal(0) - expect(await cWBTCVault.balanceOf(rsrTrader.address)).to.equal(0) - expect(await cWBTCVault.balanceOf(rTokenTrader.address)).to.equal(0) + expect(await cWBTC.balanceOf(gnosis.address)).to.equal(0) + expect(await cWBTC.balanceOf(rsrTrader.address)).to.equal(0) + expect(await cWBTC.balanceOf(rTokenTrader.address)).to.equal(0) - // Check new auctions created for cWBTCVault + // Check new auctions created for cWBTC auctionTimestamp = await getLatestBlockTimestamp() // Check auctions registered - // cETHVault -> RSR Auction + // cETH -> RSR Auction await expectTrade(rsrTrader, { - sell: cETHVault.address, + sell: cETH.address, buy: rsr.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('10'), }) // Check trades - trade = await getTrade(rsrTrader, cETHVault.address) + trade = await getTrade(rsrTrader, cETH.address) auctionId = await trade.auctionId() const [, , , auctionSellAmt7, auctionbuyAmt7] = await gnosis.auctions(auctionId) expect(sellAmt7).to.be.closeTo(auctionSellAmt7, point5Pct(auctionSellAmt7)) expect(minBuyAmt7).to.be.closeTo(auctionbuyAmt7, point5Pct(auctionbuyAmt7)) - // cETHVault -> RToken Auction + // cETH -> RToken Auction await expectTrade(rTokenTrader, { - sell: cETHVault.address, + sell: cETH.address, buy: rToken.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('11'), }) - trade = await getTrade(rTokenTrader, cETHVault.address) + trade = await getTrade(rTokenTrader, cETH.address) auctionId = await trade.auctionId() const [, , , auctionSellAmtRToken7, auctionbuyAmtRToken7] = await gnosis.auctions(auctionId) expect(sellAmtRToken7).to.be.closeTo(auctionSellAmtRToken7, point5Pct(auctionSellAmtRToken7)) expect(minBuyAmtRToken7).to.be.closeTo(auctionbuyAmtRToken7, point5Pct(auctionbuyAmtRToken7)) // Check funds in Market and Traders - expect(await cETHVault.balanceOf(gnosis.address)).to.be.closeTo( + expect(await cETH.balanceOf(gnosis.address)).to.be.closeTo( sellAmt7.add(sellAmtRToken7), point5Pct(sellAmt7.add(sellAmtRToken7)) ) - expect(await cETHVault.balanceOf(rsrTrader.address)).to.equal(expectedToTrader7.sub(sellAmt7)) - expect(await cETHVault.balanceOf(rTokenTrader.address)).to.equal( + expect(await cETH.balanceOf(rsrTrader.address)).to.equal(expectedToTrader7.sub(sellAmt7)) + expect(await cETH.balanceOf(rTokenTrader.address)).to.equal( expectedToFurnace7.sub(sellAmtRToken7) ) @@ -1240,19 +1224,13 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: rsrTrader, name: 'TradeSettled', - args: [anyValue, cETHVault.address, rsr.address, auctionSellAmt7, auctionbuyAmt7], + args: [anyValue, cETH.address, rsr.address, auctionSellAmt7, auctionbuyAmt7], emitted: true, }, { contract: rTokenTrader, name: 'TradeSettled', - args: [ - anyValue, - cETHVault.address, - rToken.address, - auctionSellAmtRToken7, - auctionbuyAmtRToken7, - ], + args: [anyValue, cETH.address, rToken.address, auctionSellAmtRToken7, auctionbuyAmtRToken7], emitted: true, }, { @@ -1296,12 +1274,12 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) // Check no more funds in Market and Traders - expect(await cETHVault.balanceOf(gnosis.address)).to.equal(0) - expect(await cETHVault.balanceOf(rsrTrader.address)).to.equal(0) - expect(await cETHVault.balanceOf(rTokenTrader.address)).to.equal(0) + expect(await cETH.balanceOf(gnosis.address)).to.equal(0) + expect(await cETH.balanceOf(rsrTrader.address)).to.equal(0) + expect(await cETH.balanceOf(rTokenTrader.address)).to.equal(0) }) - it('Should recollateralize basket correctly - cWBTCVault', async () => { + it('Should recollateralize basket correctly - cWBTC', async () => { // Set RSR price to 25 cts for less auctions const rsrPrice = fp('0.25') // 0.25 usd await setOraclePrice(rsrAsset.address, toBNDecimals(rsrPrice, 8)) @@ -1329,24 +1307,24 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) // cToken expect(quotes[4]).to.equal(fp('16')) // wBTC Target: 16 BTC expect(expectedTkn4).to.equal(quotes[4]) - expect(quotes[5]).to.equal(bn(1600e8)) // cWBTCVault Target: 32 BTC (1600 cWBTCVault @ 400 usd) + expect(quotes[5]).to.equal(bn(1600e8)) // cWBTC Target: 32 BTC (1600 cWBTC @ 400 usd) expect(expectedTkn5).to.equal(quotes[5]) - const cWBTCVaultCollateral = collateral[5] // cWBTCVault + const cWBTCCollateral = collateral[5] // cWBTC - // Set Backup for cWBTCVault to BTC + // Set Backup for cWBTC to BTC await basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('BTC'), bn(1), [wbtc.address]) - // Basket Swapping - Default cWBTCVault - should be replaced by BTC + // Basket Swapping - Default cWBTC - should be replaced by BTC // Decrease rate to cause default in Ctoken - await cWBTCVault.setExchangeRate(fp('0.8')) + await cWBTC.setExchangeRate(fp('0.8')) // Mark Collateral as Defaulted - await cWBTCVaultCollateral.refresh() + await cWBTCCollateral.refresh() - expect(await cWBTCVaultCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await cWBTCCollateral.status()).to.equal(CollateralStatus.DISABLED) // Ensure valid basket await basketHandler.refreshBasket() @@ -1368,8 +1346,8 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) // Running auctions will trigger recollateralization - All balance of invalid tokens will be redeemed - const sellAmt: BigNumber = await cWBTCVault.balanceOf(backingManager.address) - // For cWBTCVault = price fo $400 (20k / 50), rate 0.8 = $320 + const sellAmt: BigNumber = await cWBTC.balanceOf(backingManager.address) + // For cWBTC = price fo $400 (20k / 50), rate 0.8 = $320 const minBuyAmt = toMinBuyAmt( sellAmt.mul(pow10(10)), fp('320'), @@ -1382,36 +1360,36 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: backingManager, name: 'TradeStarted', - args: [anyValue, cWBTCVault.address, wbtc.address, sellAmt, minBuyAmt], + args: [anyValue, cWBTC.address, wbtc.address, sellAmt, minBuyAmt], emitted: true, }, ]) let auctionTimestamp = await getLatestBlockTimestamp() - // cWBTCVault (Defaulted) -> wBTC (only valid backup token for that target) + // cWBTC (Defaulted) -> wBTC (only valid backup token for that target) await expectTrade(backingManager, { - sell: cWBTCVault.address, + sell: cWBTC.address, buy: wbtc.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('0'), }) // Check trade - let trade = await getTrade(backingManager, cWBTCVault.address) + let trade = await getTrade(backingManager, cWBTC.address) let auctionId = await trade.auctionId() const [, , , auctionSellAmt] = await gnosis.auctions(auctionId) expect(sellAmt).to.be.closeTo(auctionSellAmt, point5Pct(auctionSellAmt)) // Check funds in Market and Traders - expect(await cWBTCVault.balanceOf(gnosis.address)).to.be.closeTo(sellAmt, point5Pct(sellAmt)) - expect(await cWBTCVault.balanceOf(backingManager.address)).to.equal(bn(0)) + expect(await cWBTC.balanceOf(gnosis.address)).to.be.closeTo(sellAmt, point5Pct(sellAmt)) + expect(await cWBTC.balanceOf(backingManager.address)).to.equal(bn(0)) // Advance time till auction ended await advanceTime(config.batchAuctionLength.add(100).toString()) // Mock auction - Get 80% of value - // 1600 cWTBC -> 80% = 1280 cWBTCVault @ 400 = 512K = 25 BTC + // 1600 cWTBC -> 80% = 1280 cWBTC @ 400 = 512K = 25 BTC const auctionbuyAmt = fp('25') await wbtc.connect(addr1).approve(gnosis.address, auctionbuyAmt) await gnosis.placeBid(0, { @@ -1435,7 +1413,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: backingManager, name: 'TradeSettled', - args: [anyValue, cWBTCVault.address, wbtc.address, auctionSellAmt, auctionbuyAmt], + args: [anyValue, cWBTC.address, wbtc.address, auctionSellAmt, auctionbuyAmt], emitted: true, }, { @@ -1529,7 +1507,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) }) - it('Should recollateralize basket correctly - cETHVault, multiple auctions', async () => { + it('Should recollateralize basket correctly - cETH, multiple auctions', async () => { // Set RSR price to 100 usd const rsrPrice = fp('100') // 100 usd for less auctions await setOraclePrice(rsrAsset.address, toBNDecimals(rsrPrice, 8)) @@ -1557,24 +1535,24 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) expect(quotes[6]).to.equal(fp('12800')) // wETH Target: 64 ETH * 200 expect(expectedTkn6).to.equal(quotes[6]) - expect(quotes[7]).to.equal(bn(1280000e8)) // cETHVault Target: 128 ETH * 200 (6400 * 200 cETHVault @ 24 usd) + expect(quotes[7]).to.equal(bn(1280000e8)) // cETH Target: 128 ETH * 200 (6400 * 200 cETH @ 24 usd) expect(expectedTkn7).to.equal(quotes[7]) - const cETHVaultCollateral = collateral[7] // cETHVault + const cETHCollateral = collateral[7] // cETH - // Set Backup for cETHVault to wETH + // Set Backup for cETH to wETH await basketHandler .connect(owner) .setBackupConfig(ethers.utils.formatBytes32String('ETH'), bn(1), [weth.address]) - // Basket Swapping - Default cETHVault - should be replaced by ETH + // Basket Swapping - Default cETH - should be replaced by ETH // Decrease rate to cause default in Ctoken - await cETHVault.setExchangeRate(fp('0.5')) + await cETH.setExchangeRate(fp('0.5')) // Mark Collateral as Defaulted - await cETHVaultCollateral.refresh() + await cETHCollateral.refresh() - expect(await cETHVaultCollateral.status()).to.equal(CollateralStatus.DISABLED) + expect(await cETHCollateral.status()).to.equal(CollateralStatus.DISABLED) // Ensure valid basket await basketHandler.refreshBasket() @@ -1595,14 +1573,14 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { expect(newBacking.length).to.equal(7) // One less token expect(await basketHandler.status()).to.equal(CollateralStatus.SOUND) - // Running auctions will trigger recollateralization - cETHVault partial sale for weth - // Will sell about 841K of cETHVault, expect to receive 8167 wETH (minimum) - // We would still have about 438K to sell of cETHVault - let [low] = await cETHVaultCollateral.price() + // Running auctions will trigger recollateralization - cETH partial sale for weth + // Will sell about 841K of cETH, expect to receive 8167 wETH (minimum) + // We would still have about 438K to sell of cETH + let [low] = await cETHCollateral.price() const sellAmtUnscaled = MAX_TRADE_VOLUME.mul(BN_SCALE_FACTOR).div(low) const sellAmt = toBNDecimals(sellAmtUnscaled, 8) - const sellAmtRemainder = (await cETHVault.balanceOf(backingManager.address)).sub(sellAmt) - // Price for cETHVault = 1200 / 50 = $24 at rate 50% = $12 + const sellAmtRemainder = (await cETH.balanceOf(backingManager.address)).sub(sellAmt) + // Price for cETH = 1200 / 50 = $24 at rate 50% = $12 const minBuyAmt = toMinBuyAmt( sellAmtUnscaled, fp('12'), @@ -1615,36 +1593,30 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { { contract: backingManager, name: 'TradeStarted', - args: [ - anyValue, - cETHVault.address, - weth.address, - withinQuad(sellAmt), - withinQuad(minBuyAmt), - ], + args: [anyValue, cETH.address, weth.address, withinQuad(sellAmt), withinQuad(minBuyAmt)], emitted: true, }, ]) let auctionTimestamp = await getLatestBlockTimestamp() - // cETHVault (Defaulted) -> wETH (only valid backup token for that target) + // cETH (Defaulted) -> wETH (only valid backup token for that target) await expectTrade(backingManager, { - sell: cETHVault.address, + sell: cETH.address, buy: weth.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('0'), }) // Check trade - let trade = await getTrade(backingManager, cETHVault.address) + let trade = await getTrade(backingManager, cETH.address) let auctionId = await trade.auctionId() const [, , , auctionSellAmt] = await gnosis.auctions(auctionId) expect(sellAmt).to.be.closeTo(auctionSellAmt, point5Pct(auctionSellAmt)) // Check funds in Market and Traders - expect(await cETHVault.balanceOf(gnosis.address)).to.be.closeTo(sellAmt, point5Pct(sellAmt)) - expect(await cETHVault.balanceOf(backingManager.address)).to.be.closeTo( + expect(await cETH.balanceOf(gnosis.address)).to.be.closeTo(sellAmt, point5Pct(sellAmt)) + expect(await cETH.balanceOf(backingManager.address)).to.be.closeTo( sellAmtRemainder, point5Pct(sellAmtRemainder) ) @@ -1669,12 +1641,12 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { config.maxTradeSlippage ) // Run auctions again for remainder - // We will sell the remaining 438K of cETHVault, expecting about 4253 WETH + // We will sell the remaining 438K of cETH, expecting about 4253 WETH await expectEvents(facadeTest.runAuctionsForAllTraders(rToken.address), [ { contract: backingManager, name: 'TradeSettled', - args: [anyValue, cETHVault.address, weth.address, auctionSellAmt, auctionbuyAmt], + args: [anyValue, cETH.address, weth.address, auctionSellAmt, auctionbuyAmt], emitted: true, }, { @@ -1682,7 +1654,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { name: 'TradeStarted', args: [ anyValue, - cETHVault.address, + cETH.address, weth.address, withinQuad(sellAmtRemainder), withinQuad(minBuyAmtRemainder), @@ -1693,16 +1665,16 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { auctionTimestamp = await getLatestBlockTimestamp() - // cETHVault (Defaulted) -> wETH (only valid backup token for that target) + // cETH (Defaulted) -> wETH (only valid backup token for that target) await expectTrade(backingManager, { - sell: cETHVault.address, + sell: cETH.address, buy: weth.address, endTime: auctionTimestamp + Number(config.batchAuctionLength), externalId: bn('1'), }) // Check trade - trade = await getTrade(backingManager, cETHVault.address) + trade = await getTrade(backingManager, cETH.address) auctionId = await trade.auctionId() const [, , , auctionSellAmtRemainder] = await gnosis.auctions(auctionId) expect(sellAmtRemainder).to.be.closeTo( @@ -1711,17 +1683,17 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { ) // Check funds in Market and Traders - expect(await cETHVault.balanceOf(gnosis.address)).to.be.closeTo( + expect(await cETH.balanceOf(gnosis.address)).to.be.closeTo( sellAmtRemainder, point5Pct(sellAmtRemainder) ) - expect(await cETHVault.balanceOf(backingManager.address)).to.equal(bn(0)) + expect(await cETH.balanceOf(backingManager.address)).to.equal(bn(0)) // Advance time till auction ended await advanceTime(config.batchAuctionLength.add(100).toString()) // Mock auction - // 438,000 cETHVault @ 12 = 5.25 M = approx 4255 ETH - Get 4400 WETH + // 438,000 cETH @ 12 = 5.25 M = approx 4255 ETH - Get 4400 WETH const auctionbuyAmtRemainder = toMinBuyAmt( auctionSellAmtRemainder, fp('12'), @@ -1761,7 +1733,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { name: 'TradeSettled', args: [ anyValue, - cETHVault.address, + cETH.address, weth.address, auctionSellAmtRemainder, auctionbuyAmtRemainder, diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index a3ab632140..ba0275e738 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -10,7 +10,7 @@ import { ATokenFiatCollateral, ComptrollerMock, CTokenFiatCollateral, - CTokenWrapperMock, + CTokenMock, ERC20Mock, FacadeRead, FacadeTest, @@ -211,11 +211,9 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { return atoken } - const makeCToken = async (tokenName: string): Promise => { + const makeCToken = async (tokenName: string): Promise => { const ERC20MockFactory: ContractFactory = await ethers.getContractFactory('ERC20Mock') - const CTokenWrapperMockFactory: ContractFactory = await ethers.getContractFactory( - 'CTokenWrapperMock' - ) + const CTokenMockFactory: ContractFactory = await ethers.getContractFactory('CTokenMock') const CTokenCollateralFactory: ContractFactory = await ethers.getContractFactory( 'CTokenFiatCollateral' ) @@ -224,12 +222,11 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { await ERC20MockFactory.deploy(tokenName, `${tokenName} symbol`) ) - const ctoken: CTokenWrapperMock = ( - await CTokenWrapperMockFactory.deploy( + const ctoken: CTokenMock = ( + await CTokenMockFactory.deploy( 'c' + tokenName, `${'c' + tokenName} symbol`, erc20.address, - compToken.address, compoundMock.address ) ) @@ -491,7 +488,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { await assetRegistry.toColl(backing[0]) ) for (let i = maxBasketSize - tokensToDefault; i < backing.length; i++) { - const erc20 = await ethers.getContractAt('CTokenWrapperMock', backing[i]) + const erc20 = await ethers.getContractAt('CTokenMock', backing[i]) // Decrease rate to cause default in Ctoken await erc20.setExchangeRate(fp('0.8')) diff --git a/test/scenario/RevenueHiding.test.ts b/test/scenario/RevenueHiding.test.ts index 8b1cfa00fb..32b26a024e 100644 --- a/test/scenario/RevenueHiding.test.ts +++ b/test/scenario/RevenueHiding.test.ts @@ -7,7 +7,7 @@ import { bn, fp, divCeil } from '../../common/numbers' import { IConfig } from '../../common/configuration' import { CollateralStatus, TradeKind } from '../../common/constants' import { - CTokenWrapperMock, + CTokenMock, CTokenFiatCollateral, ERC20Mock, IAssetRegistry, @@ -44,7 +44,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME // Tokens and Assets let dai: ERC20Mock let daiCollateral: SelfReferentialCollateral - let cDAI: CTokenWrapperMock + let cDAI: CTokenMock let cDAICollateral: CTokenFiatCollateral // Config values @@ -106,7 +106,7 @@ describe(`RevenueHiding basket collateral (/w CTokenFiatCollateral) - P${IMPLEME // Main ERC20 dai = erc20s[0] daiCollateral = collateral[0] - cDAI = erc20s[4] + cDAI = erc20s[4] cDAICollateral = await ( await ethers.getContractFactory('CTokenFiatCollateral') ).deploy( diff --git a/test/scenario/cETH.test.ts b/test/scenario/cETH.test.ts index 5c8b5cd2b5..590623d245 100644 --- a/test/scenario/cETH.test.ts +++ b/test/scenario/cETH.test.ts @@ -21,7 +21,6 @@ import { TestIRevenueTrader, TestIRToken, WETH9, - CTokenWrapperMock, } from '../../typechain' import { advanceTime } from '../utils/time' import { getTrade } from '../utils/trades' @@ -47,13 +46,12 @@ describe(`CToken of self-referential collateral (eg cETH) - P${IMPLEMENTATION}`, let collateral: Collateral[] // Non-backing assets - let compToken: ERC20Mock let compoundMock: ComptrollerMock // Tokens and Assets let weth: WETH9 let wethCollateral: SelfReferentialCollateral - let cETH: CTokenWrapperMock + let cETH: CTokenMock let cETHCollateral: CTokenSelfReferentialCollateral let token0: CTokenMock let collateral0: Collateral @@ -84,7 +82,6 @@ describe(`CToken of self-referential collateral (eg cETH) - P${IMPLEMENTATION}`, ;({ rsr, stRSR, - compToken, compoundMock, erc20s, collateral, @@ -123,8 +120,8 @@ describe(`CToken of self-referential collateral (eg cETH) - P${IMPLEMENTATION}`, // cETH cETH = await ( - await ethers.getContractFactory('CTokenWrapperMock') - ).deploy('cETH Token', 'cETH', weth.address, compToken.address, compoundMock.address) + await ethers.getContractFactory('CTokenMock') + ).deploy('cETH Token', 'cETH', weth.address, compoundMock.address) cETHCollateral = await ( await ethers.getContractFactory('CTokenSelfReferentialCollateral') diff --git a/test/scenario/cWBTC.test.ts b/test/scenario/cWBTC.test.ts index f145299065..df5478210c 100644 --- a/test/scenario/cWBTC.test.ts +++ b/test/scenario/cWBTC.test.ts @@ -8,7 +8,7 @@ import { advanceTime } from '../utils/time' import { IConfig } from '../../common/configuration' import { CollateralStatus, TradeKind } from '../../common/constants' import { - CTokenWrapperMock, + CTokenMock, CTokenNonFiatCollateral, ComptrollerMock, ERC20Mock, @@ -46,15 +46,14 @@ describe(`CToken of non-fiat collateral (eg cWBTC) - P${IMPLEMENTATION}`, () => let collateral: Collateral[] // Non-backing assets - let compToken: ERC20Mock let compoundMock: ComptrollerMock // Tokens and Assets let wbtc: ERC20Mock let wBTCCollateral: SelfReferentialCollateral - let cWBTC: CTokenWrapperMock + let cWBTC: CTokenMock let cWBTCCollateral: CTokenNonFiatCollateral - let token0: CTokenWrapperMock + let token0: CTokenMock let collateral0: Collateral let backupToken: ERC20Mock let backupCollateral: Collateral @@ -86,7 +85,6 @@ describe(`CToken of non-fiat collateral (eg cWBTC) - P${IMPLEMENTATION}`, () => ;({ rsr, stRSR, - compToken, compoundMock, erc20s, collateral, @@ -101,7 +99,7 @@ describe(`CToken of non-fiat collateral (eg cWBTC) - P${IMPLEMENTATION}`, () => } = await loadFixture(defaultFixtureNoBasket)) // Main ERC20 - token0 = erc20s[4] // cDai + token0 = erc20s[4] // cDai collateral0 = collateral[4] wbtc = await (await ethers.getContractFactory('ERC20Mock')).deploy('WBTC Token', 'WBTC') @@ -131,8 +129,8 @@ describe(`CToken of non-fiat collateral (eg cWBTC) - P${IMPLEMENTATION}`, () => // cWBTC cWBTC = await ( - await ethers.getContractFactory('CTokenWrapperMock') - ).deploy('cWBTC Token', 'cWBTC', wbtc.address, compToken.address, compoundMock.address) + await ethers.getContractFactory('CTokenMock') + ).deploy('cWBTC Token', 'cWBTC', wbtc.address, compoundMock.address) cWBTCCollateral = await ( await ethers.getContractFactory('CTokenNonFiatCollateral') ).deploy( diff --git a/test/utils/tokens.ts b/test/utils/tokens.ts index 3ceebb8626..da6c94d2ca 100644 --- a/test/utils/tokens.ts +++ b/test/utils/tokens.ts @@ -1,5 +1,5 @@ import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { CTokenWrapperMock } from '@typechain/CTokenWrapperMock' +import { CTokenMock } from '@typechain/CTokenMock' import { ERC20Mock } from '@typechain/ERC20Mock' import { StaticATokenMock } from '@typechain/StaticATokenMock' import { USDCMock } from '@typechain/USDCMock' @@ -18,9 +18,7 @@ export const mintCollaterals = async ( const token2 = ( await ethers.getContractAt('StaticATokenMock', await basket[2].erc20()) ) - const token3 = ( - await ethers.getContractAt('CTokenWrapperMock', await basket[3].erc20()) - ) + const token3 = await ethers.getContractAt('CTokenMock', await basket[3].erc20()) for (const recipient of recipients) { await token0.connect(owner).mint(recipient.address, amount) From 841ae3bae17698f1a2051eb8427fb36ca019215b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Tue, 20 Feb 2024 11:34:19 -0500 Subject: [PATCH 217/450] Replace use of frxETH/ETH EMA with frxETH/WETH EMA (#1075) --- common/configuration.ts | 8 ++++---- test/plugins/individual-collateral/frax-eth/constants.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/configuration.ts b/common/configuration.ts index c05602867d..c795fd40f5 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -126,7 +126,7 @@ interface INetworkConfig { AAVE_V3_INCENTIVES_CONTROLLER?: string AAVE_V3_POOL?: string STARGATE_STAKING_CONTRACT?: string - CURVE_POOL_ETH_FRXETH?: string + CURVE_POOL_WETH_FRXETH?: string } export const networkConfig: { [key: string]: INetworkConfig } = { @@ -244,7 +244,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', + CURVE_POOL_WETH_FRXETH: '0x9c3b46c0ceb5b9e304fcd6d88fc50f7dd24b31bc', }, '1': { name: 'mainnet', @@ -350,7 +350,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', + CURVE_POOL_WETH_FRXETH: '0x9c3b46c0ceb5b9e304fcd6d88fc50f7dd24b31bc', }, '3': { name: 'tenderly', @@ -451,7 +451,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_ETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', + CURVE_POOL_WETH_FRXETH: '0xa1F8A6807c402E4A15ef4EBa36528A3FED24E577', }, '5': { name: 'goerli', diff --git a/test/plugins/individual-collateral/frax-eth/constants.ts b/test/plugins/individual-collateral/frax-eth/constants.ts index 0a03a3b9ca..03c26377ac 100644 --- a/test/plugins/individual-collateral/frax-eth/constants.ts +++ b/test/plugins/individual-collateral/frax-eth/constants.ts @@ -8,7 +8,7 @@ export const SFRX_ETH = networkConfig['31337'].tokens.sfrxETH as string export const WETH = networkConfig['31337'].tokens.WETH as string export const FRX_ETH_MINTER = '0xbAFA44EFE7901E04E39Dad13167D089C559c1138' export const CURVE_POOL_EMA_PRICE_ORACLE_ADDRESS = networkConfig['31337'] - .CURVE_POOL_ETH_FRXETH as string + .CURVE_POOL_WETH_FRXETH as string export const PRICE_TIMEOUT = bn('604800') // 1 week export const ORACLE_TIMEOUT = bn(86400) // 24 hours in seconds From 78513be5d9a434dc65e99a10cfc7494f155374b4 Mon Sep 17 00:00:00 2001 From: "Julian M. Rodriguez" <56316686+julianmrodri@users.noreply.github.com> Date: Tue, 20 Feb 2024 13:35:05 -0300 Subject: [PATCH 218/450] remove console logs (#1076) --- .../plugins/mocks/DutchTradeCallbackReentrantTest.sol | 4 ---- .../morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts | 8 -------- .../yearnv2/YearnV2CurveFiatCollateral.test.ts | 2 -- 3 files changed, 14 deletions(-) diff --git a/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol b/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol index ebf3707347..0191078830 100644 --- a/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol +++ b/contracts/plugins/mocks/DutchTradeCallbackReentrantTest.sol @@ -5,8 +5,6 @@ import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.s import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import { IDutchTradeCallee, TradeStatus, DutchTrade, ITrading } from "../trading/DutchTrade.sol"; -import "hardhat/console.sol"; - contract DutchTradeCallbackReentrantTest is IDutchTradeCallee { using SafeERC20 for IERC20; @@ -27,8 +25,6 @@ contract DutchTradeCallbackReentrantTest is IDutchTradeCallee { IERC20(buyToken).safeTransfer(msg.sender, buyAmount); - console.log("canSettle", _currentTrade.canSettle()); - _trader.settleTrade(_currentTrade.sell()); // _currentTrade.canSettle(); diff --git a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts index ffd7c00be2..a23666dfd6 100644 --- a/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts +++ b/test/plugins/individual-collateral/morpho-aave/MorphoAaveV2TokenisedDeposit.test.ts @@ -432,14 +432,6 @@ const execTestForToken = ({ await advanceTime(hre, 24 * 60 * 60 - 1) await methods.claimRewards(bob) - // console.log( - // 'MORPHO:', - // formatUnits( - // await instances.morpho.balanceOf(await bob.getAddress()), - // await instances.morpho.decimals() - // ) - // ) - expect(await instances.morpho.balanceOf(await bob.getAddress())).to.be.closeTo( BigNumber.from(i + 1) .mul(100) diff --git a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts index f3636270c0..22017205a9 100644 --- a/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/yearnv2/YearnV2CurveFiatCollateral.test.ts @@ -240,8 +240,6 @@ tests.forEach((test: CurveFiatTest) => { BigNumber.from(slotValue).mul(101).div(100).toHexString() // increase debt by 1% ) - await ethers.provider.getStorageAt(await collateral.erc20(), 0x28).then(console.log) - await collateral.refresh() const refPerTokAfter = await collateral.refPerTok() From b8db9690d02ecf923e02af90540948894d94c04b Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Wed, 21 Feb 2024 11:37:40 -0500 Subject: [PATCH 219/450] Deploy base wstETH (#1078) --- .../addresses/base-3.2.0/8453-tmp-assets-collateral.json | 8 ++++++++ .../collaterals/deploy_lido_wsteth_collateral.ts | 4 ++-- scripts/verification/collateral-plugins/verify_wsteth.ts | 4 ++-- .../lido/L2LidoStakedEthTestSuite.test.ts | 4 ++-- 4 files changed, 14 insertions(+), 6 deletions(-) create mode 100644 scripts/addresses/base-3.2.0/8453-tmp-assets-collateral.json diff --git a/scripts/addresses/base-3.2.0/8453-tmp-assets-collateral.json b/scripts/addresses/base-3.2.0/8453-tmp-assets-collateral.json new file mode 100644 index 0000000000..1441a2782f --- /dev/null +++ b/scripts/addresses/base-3.2.0/8453-tmp-assets-collateral.json @@ -0,0 +1,8 @@ +{ + "collateral": { + "wstETH": "0x02Ee6862cF431D7CEaa78112D635D2Be7DdFC178" + }, + "erc20s": { + "wstETH": "0xc1CBa3fCea344f92D9239c08C0568f6F2F0ee452" + } +} diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts index 5318329d88..fb153f60a4 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_lido_wsteth_collateral.ts @@ -108,11 +108,11 @@ async function main() { ).deploy( { priceTimeout: priceTimeout.toString(), - chainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, // ignored + chainlinkFeed: BASE_PRICE_FEEDS.stETH_ETH, // ignored oracleError: BASE_ORACLE_ERROR.toString(), // 0.5% & 0.5% & 0.15% erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('5e5').toString(), // $500k - oracleTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, // 86400, ignored + oracleTimeout: BASE_FEEDS_TIMEOUT.stETH_ETH, // 86400, ignored targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError delayUntilDefault: bn('86400').toString(), // 24h diff --git a/scripts/verification/collateral-plugins/verify_wsteth.ts b/scripts/verification/collateral-plugins/verify_wsteth.ts index 14140cf4ac..3b2a016201 100644 --- a/scripts/verification/collateral-plugins/verify_wsteth.ts +++ b/scripts/verification/collateral-plugins/verify_wsteth.ts @@ -62,11 +62,11 @@ async function main() { [ { priceTimeout: priceTimeout.toString(), - chainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, // ignored + chainlinkFeed: BASE_PRICE_FEEDS.stETH_ETH, // ignored oracleError: BASE_ORACLE_ERROR.toString(), // 0.5% & 0.5% & 0.15% erc20: networkConfig[chainId].tokens.wstETH, maxTradeVolume: fp('5e5').toString(), // $500k - oracleTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, // 86400, ignored + oracleTimeout: BASE_FEEDS_TIMEOUT.stETH_ETH, // 86400, ignored targetName: hre.ethers.utils.formatBytes32String('ETH'), defaultThreshold: fp('0.025').toString(), // 2.5% = 2% + 0.5% stethEth feed oracleError delayUntilDefault: bn('86400').toString(), // 24h diff --git a/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts b/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts index bc1a466734..184b1090aa 100644 --- a/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts +++ b/test/plugins/individual-collateral/lido/L2LidoStakedEthTestSuite.test.ts @@ -57,8 +57,8 @@ export const defaultWSTETHCollateralOpts: WSTETHCollateralOpts = { targetName: ethers.utils.formatBytes32String('ETH'), rewardERC20: ZERO_ADDRESS, priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: BASE_PRICE_FEEDS.ETH_USD, // ignored - oracleTimeout: BASE_FEEDS_TIMEOUT.ETH_USD, // ignored + chainlinkFeed: BASE_PRICE_FEEDS.stETH_ETH, // ignored + oracleTimeout: BASE_FEEDS_TIMEOUT.stETH_ETH, // ignored oracleError: BASE_ORACLE_ERROR, maxTradeVolume: MAX_TRADE_VOL, defaultThreshold: DEFAULT_THRESHOLD, From 6e6a97ae56cce430c308bd085995d5c796f888b9 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 22 Feb 2024 11:46:16 -0500 Subject: [PATCH 220/450] Singleton Facade (#1073) --- common/configuration.ts | 1 - contracts/facade/Facade.sol | 52 ++++++ .../{FacadeAct.sol => facets/ActFacet.sol} | 41 +++-- .../{FacadeRead.sol => facets/ReadFacet.sol} | 27 +-- .../{IFacadeAct.sol => IActFacet.sol} | 12 +- contracts/interfaces/IFacade.sol | 19 +++ .../{IFacadeRead.sol => IReadFacet.sol} | 4 +- contracts/p1/BasketHandler.sol | 2 +- .../plugins/mocks/RevertingFacetMock.sol | 10 ++ hardhat.config.ts | 4 - scripts/deploy.ts | 24 ++- scripts/deployment/common.ts | 9 +- .../0_setup_deployments.ts | 7 +- .../1_deploy_libraries.ts | 0 .../2_deploy_implementations.ts | 0 .../3_deploy_rsrAsset.ts | 4 +- .../4_deploy_facade.ts | 14 +- .../5_deploy_deployer.ts | 4 +- .../6_deploy_facadeWrite.ts | 0 .../1_deploy_readFacet.ts} | 43 +++-- .../phase1-facade/2_deploy_actFacet.ts | 65 ++++++++ scripts/deployment/utils.ts | 5 +- scripts/verification/4_verify_facade.ts | 13 +- test/Deployer.test.ts | 4 +- test/Facade.test.ts | 154 +++++++++--------- test/FacadeWrite.test.ts | 4 +- test/Main.test.ts | 4 +- test/Recollateralization.test.ts | 4 +- test/ZZStRSR.test.ts | 4 +- test/fixtures.ts | 41 +++-- test/integration/AssetPlugins.test.ts | 4 +- test/integration/fixtures.ts | 33 ++-- .../mainnet-test/FacadeActVersion.test.ts | 26 +-- .../aave/ATokenFiatCollateral.test.ts | 5 +- .../compoundv2/CTokenFiatCollateral.test.ts | 4 +- .../plugins/individual-collateral/fixtures.ts | 33 ++-- test/scenario/ComplexBasket.test.ts | 4 +- test/scenario/MaxBasketSize.test.ts | 4 +- test/utils/issue.ts | 4 +- 39 files changed, 448 insertions(+), 244 deletions(-) create mode 100644 contracts/facade/Facade.sol rename contracts/facade/{FacadeAct.sol => facets/ActFacet.sol} (89%) rename contracts/facade/{FacadeRead.sol => facets/ReadFacet.sol} (96%) rename contracts/interfaces/{IFacadeAct.sol => IActFacet.sol} (90%) create mode 100644 contracts/interfaces/IFacade.sol rename contracts/interfaces/{IFacadeRead.sol => IReadFacet.sol} (99%) create mode 100644 contracts/plugins/mocks/RevertingFacetMock.sol rename scripts/deployment/{phase1-common => phase1-core}/0_setup_deployments.ts (97%) rename scripts/deployment/{phase1-common => phase1-core}/1_deploy_libraries.ts (100%) rename scripts/deployment/{phase1-common => phase1-core}/2_deploy_implementations.ts (100%) rename scripts/deployment/{phase1-common => phase1-core}/3_deploy_rsrAsset.ts (94%) rename scripts/deployment/{phase1-common => phase1-core}/4_deploy_facade.ts (82%) rename scripts/deployment/{phase1-common => phase1-core}/5_deploy_deployer.ts (95%) rename scripts/deployment/{phase1-common => phase1-core}/6_deploy_facadeWrite.ts (100%) rename scripts/deployment/{phase1-common/7_deploy_facadeAct.ts => phase1-facade/1_deploy_readFacet.ts} (54%) create mode 100644 scripts/deployment/phase1-facade/2_deploy_actFacet.ts diff --git a/common/configuration.ts b/common/configuration.ts index ac18ca70ec..9a5ff02b9f 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -435,7 +435,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', diff --git a/contracts/facade/Facade.sol b/contracts/facade/Facade.sol new file mode 100644 index 0000000000..b2657bb4ff --- /dev/null +++ b/contracts/facade/Facade.sol @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "@openzeppelin/contracts/access/Ownable.sol"; +import "../interfaces/IFacade.sol"; + +/* + * @title Facade + * @notice A Facade delegates execution to facets (implementions) as a function of selector. + * IMPORTANT: The functions should be stateless! They cannot rely on storage. + */ +// slither-disable-start +contract Facade is IFacade, Ownable { + mapping(bytes4 => address) public facets; + + // solhint-disable-next-line no-empty-blocks + constructor() Ownable() {} + + // Save new facets to the Facade, forcefully + function save(address facet, bytes4[] memory selectors) external onlyOwner { + require(facet != address(0), "zero address"); + for (uint256 i = 0; i < selectors.length; i++) { + facets[selectors[i]] = facet; + emit SelectorSaved(facet, selectors[i]); + } + } + + // Find the facet for function that is called and execute the + // function if a facet is found and return any value. + fallback() external { + address facet = facets[msg.sig]; + require(facet != address(0), "facet does not exist"); + + // Execute external function from facet using delegatecall and return any value. + assembly { + // copy function selector and any arguments + calldatacopy(0, 0, calldatasize()) + // execute function call using the facet + let result := delegatecall(gas(), facet, 0, calldatasize(), 0, 0) + // get any return value + returndatacopy(0, 0, returndatasize()) + // return any return value or error back to the caller + switch result + case 0 { + revert(0, returndatasize()) + } + default { + return(0, returndatasize()) + } + } + } +} diff --git a/contracts/facade/FacadeAct.sol b/contracts/facade/facets/ActFacet.sol similarity index 89% rename from contracts/facade/FacadeAct.sol rename to contracts/facade/facets/ActFacet.sol index 45f32b4f7c..bbcf1cfec9 100644 --- a/contracts/facade/FacadeAct.sol +++ b/contracts/facade/facets/ActFacet.sol @@ -4,24 +4,25 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; import "@openzeppelin/contracts/utils/Address.sol"; import "@openzeppelin/contracts/utils/Multicall.sol"; -import "../plugins/trading/DutchTrade.sol"; -import "../plugins/trading/GnosisTrade.sol"; -import "../interfaces/IBackingManager.sol"; -import "../interfaces/IFacadeAct.sol"; -import "../interfaces/IFacadeRead.sol"; +import "../../plugins/trading/DutchTrade.sol"; +import "../../plugins/trading/GnosisTrade.sol"; +import "../../interfaces/IActFacet.sol"; +import "../../interfaces/IBackingManager.sol"; /** - * @title Facade - * @notice A Facade to help batch compound actions that cannot be done from an EOA, solely. + * @title ActFacet + * @notice + * Facet to help batch compound actions that cannot be done from an EOA, solely. * Compatible with both 2.1.0 and ^3.0.0 RTokens. + * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start -contract FacadeAct is IFacadeAct, Multicall { +contract ActFacet is IActFacet, Multicall { using Address for address; using SafeERC20 for IERC20; using FixLib for uint192; - function claimRewards(IRToken rToken) public { + function claimRewards(IRToken rToken) external { IMain main = rToken.main(); main.backingManager().claimRewards(); main.rTokenTrader().claimRewards(); @@ -36,7 +37,6 @@ contract FacadeAct is IFacadeAct, Multicall { /// For each ERC20 in `toSettle`: /// - Settle any open ERC20 trades /// Then: - /// - Transfer any revenue for that ERC20 from the backingManager to revenueTrader /// - Call `revenueTrader.manageTokens(ERC20)` to start an auction function runRevenueAuctions( IRevenueTrader revenueTrader, @@ -51,10 +51,7 @@ contract FacadeAct is IFacadeAct, Multicall { // if 2.1.0, distribute tokenToBuy bytes1 majorVersion = bytes(revenueTrader.version())[0]; - if ( - toSettle.length > 0 && - (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) - ) { + if (toSettle.length > 0 && (majorVersion == bytes1("2") || majorVersion == bytes1("1"))) { address(revenueTrader).functionCall( abi.encodeWithSignature("manageToken(address)", revenueTrader.tokenToBuy()) ); @@ -218,10 +215,10 @@ contract FacadeAct is IFacadeAct, Multicall { function _settleTrade(ITrading trader, IERC20 toSettle) private { bytes1 majorVersion = bytes(trader.version())[0]; - if (majorVersion == MAJOR_VERSION_3) { + if (majorVersion == bytes1("3")) { // Settle auctions trader.settleTrade(toSettle); - } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { + } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { address(trader).functionCall(abi.encodeWithSignature("settleTrade(address)", toSettle)); } else { _revertUnrecognizedVersion(); @@ -231,10 +228,10 @@ contract FacadeAct is IFacadeAct, Multicall { function _forwardRevenue(IBackingManager bm, IERC20[] memory toStart) private { bytes1 majorVersion = bytes(bm.version())[0]; // Need to use try-catch here in order to still show revenueOverview when basket not ready - if (majorVersion == MAJOR_VERSION_3) { + if (majorVersion == bytes1("3")) { // solhint-disable-next-line no-empty-blocks try bm.forwardRevenue(toStart) {} catch {} - } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { + } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { // solhint-disable-next-line avoid-low-level-calls (bool success, ) = address(bm).call{ value: 0 }( abi.encodeWithSignature("manageTokens(address[])", toStart) @@ -252,9 +249,9 @@ contract FacadeAct is IFacadeAct, Multicall { ) private { bytes1 majorVersion = bytes(revenueTrader.version())[0]; - if (majorVersion == MAJOR_VERSION_3) { + if (majorVersion == bytes1("3")) { revenueTrader.manageTokens(toStart, kinds); - } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { + } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { for (uint256 i = 0; i < toStart.length; ++i) { address(revenueTrader).functionCall( abi.encodeWithSignature("manageToken(address)", toStart[i]) @@ -268,10 +265,10 @@ contract FacadeAct is IFacadeAct, Multicall { function _rebalance(IBackingManager bm, TradeKind kind) private { bytes1 majorVersion = bytes(bm.version())[0]; - if (majorVersion == MAJOR_VERSION_3) { + if (majorVersion == bytes1("3")) { // solhint-disable-next-line no-empty-blocks try bm.rebalance(kind) {} catch {} - } else if (majorVersion == MAJOR_VERSION_2 || majorVersion == MAJOR_VERSION_1) { + } else if (majorVersion == bytes1("2") || majorVersion == bytes1("1")) { IERC20[] memory emptyERC20s = new IERC20[](0); // solhint-disable-next-line avoid-low-level-calls (bool success, ) = address(bm).call{ value: 0 }( diff --git a/contracts/facade/FacadeRead.sol b/contracts/facade/facets/ReadFacet.sol similarity index 96% rename from contracts/facade/FacadeRead.sol rename to contracts/facade/facets/ReadFacet.sol index 62f2cfc2f8..41b755bc3f 100644 --- a/contracts/facade/FacadeRead.sol +++ b/contracts/facade/facets/ReadFacet.sol @@ -2,25 +2,26 @@ pragma solidity 0.8.19; import "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import "../plugins/trading/DutchTrade.sol"; -import "../interfaces/IAsset.sol"; -import "../interfaces/IAssetRegistry.sol"; -import "../interfaces/IFacadeRead.sol"; -import "../interfaces/IRToken.sol"; -import "../interfaces/IStRSR.sol"; -import "../libraries/Fixed.sol"; -import "../p1/BasketHandler.sol"; -import "../p1/RToken.sol"; -import "../p1/StRSRVotes.sol"; +import "../../plugins/trading/DutchTrade.sol"; +import "../../interfaces/IAsset.sol"; +import "../../interfaces/IAssetRegistry.sol"; +import "../../interfaces/IReadFacet.sol"; +import "../../interfaces/IRToken.sol"; +import "../../interfaces/IStRSR.sol"; +import "../../libraries/Fixed.sol"; +import "../../p1/BasketHandler.sol"; +import "../../p1/RToken.sol"; +import "../../p1/StRSRVotes.sol"; /** - * @title Facade - * @notice A UX-friendly layer for reading out the state of a ^3.0.0 RToken in summary views. + * @title ReadFacet + * @notice + * Facet for reading out the state of a ^3.0.0 RToken in summary views. * Backwards-compatible with 2.1.0 RTokens with the exception of `redeemCustom()`. * @custom:static-call - Use ethers callStatic() to get result after update; do not execute */ // slither-disable-start -contract FacadeRead is IFacadeRead { +contract ReadFacet is IReadFacet { using FixLib for uint192; // === Static Calls === diff --git a/contracts/interfaces/IFacadeAct.sol b/contracts/interfaces/IActFacet.sol similarity index 90% rename from contracts/interfaces/IFacadeAct.sol rename to contracts/interfaces/IActFacet.sol index eef569af4f..7cf5b00274 100644 --- a/contracts/interfaces/IFacadeAct.sol +++ b/contracts/interfaces/IActFacet.sol @@ -6,21 +6,17 @@ import "../interfaces/IStRSRVotes.sol"; import "../interfaces/IRevenueTrader.sol"; import "../interfaces/IRToken.sol"; -bytes1 constant MAJOR_VERSION_1 = bytes1("1"); -bytes1 constant MAJOR_VERSION_2 = bytes1("2"); -bytes1 constant MAJOR_VERSION_3 = bytes1("3"); - /** - * @title IFacadeAct + * @title IActFacet * @notice A Facade to help batch compound actions that cannot be done from an EOA, solely. v */ -interface IFacadeAct { +interface IActFacet { /// Claims rewards from all places they can accrue. function claimRewards(IRToken rToken) external; /// To use this, first call: - /// - FacadeRead.auctionsSettleable(revenueTrader) - /// - FacadeRead.revenueOverview(revenueTrader) + /// - IReadFacet.auctionsSettleable(revenueTrader) + /// - IReadFacet.revenueOverview(revenueTrader) /// If either arrays returned are non-empty, then can execute this function productively. /// Logic: /// For each ERC20 in `toSettle`: diff --git a/contracts/interfaces/IFacade.sol b/contracts/interfaces/IFacade.sol new file mode 100644 index 0000000000..afd227acd3 --- /dev/null +++ b/contracts/interfaces/IFacade.sol @@ -0,0 +1,19 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +import "./IActFacet.sol"; +import "./IReadFacet.sol"; + +interface IFacade { + event SelectorSaved(address indexed facet, bytes4 indexed selector); + + // Save new facet to the Facade, forcefully + function save(address facet, bytes4[] memory selectors) external; + + function facets(bytes4 selector) external view returns (address); +} + +// solhint-disable-next-line no-empty-blocks +interface TestIFacade is IFacade, IActFacet, IReadFacet { + +} diff --git a/contracts/interfaces/IFacadeRead.sol b/contracts/interfaces/IReadFacet.sol similarity index 99% rename from contracts/interfaces/IFacadeRead.sol rename to contracts/interfaces/IReadFacet.sol index 5471a1ebb3..19a904ea2d 100644 --- a/contracts/interfaces/IFacadeRead.sol +++ b/contracts/interfaces/IReadFacet.sol @@ -6,12 +6,12 @@ import "./IRToken.sol"; import "./IStRSR.sol"; /** - * @title IFacadeRead + * @title IReadFacet * @notice A UX-friendly layer for read operations, especially those that first require refresh() * * - @custom:static-call - Use ethers callStatic() in order to get result after update v */ -interface IFacadeRead { +interface IReadFacet { // === Static Calls === /// @return How many RToken `account` can issue given current holdings diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 13c1729d88..10df94999e 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -632,7 +632,7 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { require(ArrayLib.allUnique(erc20s), "contains duplicates"); } - // ==== FacadeRead views ==== + // ==== ReadFacet views ==== // Not used in-protocol; helpful for reconstructing state /// Get a reference basket in today's collateral tokens, by nonce diff --git a/contracts/plugins/mocks/RevertingFacetMock.sol b/contracts/plugins/mocks/RevertingFacetMock.sol new file mode 100644 index 0000000000..772f6fbdb6 --- /dev/null +++ b/contracts/plugins/mocks/RevertingFacetMock.sol @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: BlueOak-1.0.0 +pragma solidity 0.8.19; + +contract RevertingFacetMock { + constructor() {} + + fallback() external { + revert("RevertingFacetMock"); + } +} diff --git a/hardhat.config.ts b/hardhat.config.ts index 7e6ea11aa2..24f7b49b97 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -111,10 +111,6 @@ const config: HardhatUserConfig = { version: '0.6.12', settings: { optimizer: { enabled: true, runs: 1 } }, // contract over-size }, - 'contracts/facade/FacadeRead.sol': { - version: '0.8.19', - settings: { optimizer: { enabled: true, runs: 1 } }, // contract over-size - }, }, }, diff --git a/scripts/deploy.ts b/scripts/deploy.ts index 93be6125db..a469020c97 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -25,20 +25,26 @@ async function main() { // Part 1/3 of the *overall* deployment process: Deploy all contracts // See `confirm.ts` for part 2 - // Phase 1- Implementations + // Phase 1 -- Implementations const scripts = [ - 'phase1-common/0_setup_deployments.ts', - 'phase1-common/1_deploy_libraries.ts', - 'phase1-common/2_deploy_implementations.ts', - 'phase1-common/3_deploy_rsrAsset.ts', - 'phase1-common/4_deploy_facade.ts', - 'phase1-common/5_deploy_deployer.ts', - 'phase1-common/6_deploy_facadeWrite.ts', - 'phase1-common/7_deploy_facadeAct.ts', + 'phase1-core/0_setup_deployments.ts', + 'phase1-core/1_deploy_libraries.ts', + 'phase1-core/2_deploy_implementations.ts', + 'phase1-core/3_deploy_rsrAsset.ts', + 'phase1-core/4_deploy_facade.ts', // comment this out before deployment to keep old Facade + 'phase1-core/5_deploy_deployer.ts', + 'phase1-core/6_deploy_facadeWrite.ts', ] // ============================================= + // Phase 1.5 -- Facets + // To update the existing Facade, add new facets to the below list + + scripts.push('phase1-facade/1_deploy_readFacet.ts', 'phase1-facade/2_deploy_actFacet.ts') + + // ============================================= + // Phase 2 - Assets/Collateral if (!baseL2Chains.includes(hre.network.name)) { scripts.push( diff --git a/scripts/deployment/common.ts b/scripts/deployment/common.ts index a67b131915..a4fba21eb4 100644 --- a/scripts/deployment/common.ts +++ b/scripts/deployment/common.ts @@ -9,15 +9,20 @@ export interface IPrerequisites { GNOSIS_EASY_AUCTION: string } +export interface IFacets { + actFacet: string + readFacet: string +} + export interface IDeployments { prerequisites: IPrerequisites tradingLib: string basketLib: string - facadeRead: string + facade: string + facets: IFacets facadeWriteLib: string cvxMiningLib: string facadeWrite: string - facadeAct: string deployer: string rsrAsset: string implementations: IImplementations diff --git a/scripts/deployment/phase1-common/0_setup_deployments.ts b/scripts/deployment/phase1-core/0_setup_deployments.ts similarity index 97% rename from scripts/deployment/phase1-common/0_setup_deployments.ts rename to scripts/deployment/phase1-core/0_setup_deployments.ts index d9c71ff769..9cddc68e88 100644 --- a/scripts/deployment/phase1-common/0_setup_deployments.ts +++ b/scripts/deployment/phase1-core/0_setup_deployments.ts @@ -55,8 +55,11 @@ async function main() { }, tradingLib: '', cvxMiningLib: '', - facadeRead: '', - facadeAct: '', + facade: '', + facets: { + actFacet: '', + readFacet: '', + }, facadeWriteLib: '', basketLib: '', facadeWrite: '', diff --git a/scripts/deployment/phase1-common/1_deploy_libraries.ts b/scripts/deployment/phase1-core/1_deploy_libraries.ts similarity index 100% rename from scripts/deployment/phase1-common/1_deploy_libraries.ts rename to scripts/deployment/phase1-core/1_deploy_libraries.ts diff --git a/scripts/deployment/phase1-common/2_deploy_implementations.ts b/scripts/deployment/phase1-core/2_deploy_implementations.ts similarity index 100% rename from scripts/deployment/phase1-common/2_deploy_implementations.ts rename to scripts/deployment/phase1-core/2_deploy_implementations.ts diff --git a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts b/scripts/deployment/phase1-core/3_deploy_rsrAsset.ts similarity index 94% rename from scripts/deployment/phase1-common/3_deploy_rsrAsset.ts rename to scripts/deployment/phase1-core/3_deploy_rsrAsset.ts index f33da05e81..5d749afa10 100644 --- a/scripts/deployment/phase1-common/3_deploy_rsrAsset.ts +++ b/scripts/deployment/phase1-core/3_deploy_rsrAsset.ts @@ -5,8 +5,8 @@ import { getChainId } from '../../../common/blockchain-utils' import { networkConfig } from '../../../common/configuration' import { ZERO_ADDRESS } from '../../../common/constants' import { fp } from '../../../common/numbers' -import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../../deployment/common' -import { priceTimeout, validateImplementations } from '../../deployment/utils' +import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' +import { priceTimeout, validateImplementations } from '../utils' import { Asset } from '../../../typechain' let rsrAsset: Asset diff --git a/scripts/deployment/phase1-common/4_deploy_facade.ts b/scripts/deployment/phase1-core/4_deploy_facade.ts similarity index 82% rename from scripts/deployment/phase1-common/4_deploy_facade.ts rename to scripts/deployment/phase1-core/4_deploy_facade.ts index 249012bfc5..c23b86c665 100644 --- a/scripts/deployment/phase1-common/4_deploy_facade.ts +++ b/scripts/deployment/phase1-core/4_deploy_facade.ts @@ -5,9 +5,9 @@ import { getChainId, isValidContract } from '../../../common/blockchain-utils' import { networkConfig } from '../../../common/configuration' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' import { validateImplementations } from '../utils' -import { FacadeRead } from '../../../typechain' +import { Facade } from '../../../typechain' -let facadeRead: FacadeRead +let facade: Facade async function main() { // ==== Read Configuration ==== @@ -35,16 +35,16 @@ async function main() { // ******************** Deploy Facade ****************************************/ - const FacadeFactory = await ethers.getContractFactory('FacadeRead') - facadeRead = await FacadeFactory.connect(burner).deploy() - await facadeRead.deployed() + const FacadeFactory = await ethers.getContractFactory('Facade') + facade = await FacadeFactory.connect(burner).deploy() + await facade.deployed() // Write temporary deployments file - deployments.facadeRead = facadeRead.address + deployments.facade = facade.address fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) console.log(`Deployed to ${hre.network.name} (${chainId}) - Facade: ${facadeRead.address} + Facade: ${facade.address} Deployment file: ${deploymentFilename}`) } diff --git a/scripts/deployment/phase1-common/5_deploy_deployer.ts b/scripts/deployment/phase1-core/5_deploy_deployer.ts similarity index 95% rename from scripts/deployment/phase1-common/5_deploy_deployer.ts rename to scripts/deployment/phase1-core/5_deploy_deployer.ts index af17f2dad2..63448e2539 100644 --- a/scripts/deployment/phase1-common/5_deploy_deployer.ts +++ b/scripts/deployment/phase1-core/5_deploy_deployer.ts @@ -29,9 +29,9 @@ async function main() { await validateImplementations(deployments) // Check previous step executed - if (!deployments.facadeRead) { + if (!deployments.facade) { throw new Error(`Missing deployed contracts in network ${hre.network.name}`) - } else if (!(await isValidContract(hre, deployments.facadeRead))) { + } else if (!(await isValidContract(hre, deployments.facade))) { throw new Error(`Facade contract not found in network ${hre.network.name}`) } diff --git a/scripts/deployment/phase1-common/6_deploy_facadeWrite.ts b/scripts/deployment/phase1-core/6_deploy_facadeWrite.ts similarity index 100% rename from scripts/deployment/phase1-common/6_deploy_facadeWrite.ts rename to scripts/deployment/phase1-core/6_deploy_facadeWrite.ts diff --git a/scripts/deployment/phase1-common/7_deploy_facadeAct.ts b/scripts/deployment/phase1-facade/1_deploy_readFacet.ts similarity index 54% rename from scripts/deployment/phase1-common/7_deploy_facadeAct.ts rename to scripts/deployment/phase1-facade/1_deploy_readFacet.ts index 51adf6a105..04e5ec5e53 100644 --- a/scripts/deployment/phase1-common/7_deploy_facadeAct.ts +++ b/scripts/deployment/phase1-facade/1_deploy_readFacet.ts @@ -4,10 +4,9 @@ import hre, { ethers } from 'hardhat' import { getChainId, isValidContract } from '../../../common/blockchain-utils' import { networkConfig } from '../../../common/configuration' import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' -import { validateImplementations } from '../utils' -import { FacadeAct } from '../../../typechain' +import { ReadFacet } from '../../../typechain' -let facadeAct: FacadeAct +let readFacet: ReadFacet async function main() { // ==== Read Configuration ==== @@ -24,30 +23,40 @@ async function main() { const deploymentFilename = getDeploymentFilename(chainId) const deployments = getDeploymentFile(deploymentFilename) - await validateImplementations(deployments) - - // Check previous step executed - if (!deployments.rsrAsset) { + // Check facade exists + if (!deployments.facade) { throw new Error(`Missing deployed contracts in network ${hre.network.name}`) - } else if (!(await isValidContract(hre, deployments.rsrAsset))) { - throw new Error(`RSR Asset contract not found in network ${hre.network.name}`) + } else if (!(await isValidContract(hre, deployments.facade))) { + throw new Error(`Facade contract not found in network ${hre.network.name}`) } - // ******************** Deploy FacadeAct ****************************************/ - - // Deploy FacadeAct - const FacadeActFactory = await ethers.getContractFactory('FacadeAct') + // ******************** Deploy ReadFacet ****************************************/ - facadeAct = await FacadeActFactory.connect(burner).deploy() - await facadeAct.deployed() + // Deploy ReadFacet + const ReadFacetFactory = await ethers.getContractFactory('ReadFacet') + readFacet = await ReadFacetFactory.connect(burner).deploy() + await readFacet.deployed() // Write temporary deployments file - deployments.facadeAct = facadeAct.address + deployments.facets.readFacet = readFacet.address fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) console.log(`Deployed to ${hre.network.name} (${chainId}) - FacadeAct: ${facadeAct.address} + ReadFacet: ${readFacet.address} Deployment file: ${deploymentFilename}`) + + // ******************** Save to Facade ****************************************/ + + console.log('Configuring with Facade...') + + // Save ReadFacet to Facade + const facade = await ethers.getContractAt('Facade', deployments.facade) + await facade.save( + readFacet.address, + Object.entries(readFacet.functions).map(([fn]) => readFacet.interface.getSighash(fn)) + ) + + console.log('Finished saving to Facade') } main().catch((error) => { diff --git a/scripts/deployment/phase1-facade/2_deploy_actFacet.ts b/scripts/deployment/phase1-facade/2_deploy_actFacet.ts new file mode 100644 index 0000000000..97ee29342a --- /dev/null +++ b/scripts/deployment/phase1-facade/2_deploy_actFacet.ts @@ -0,0 +1,65 @@ +import fs from 'fs' +import hre, { ethers } from 'hardhat' + +import { getChainId, isValidContract } from '../../../common/blockchain-utils' +import { networkConfig } from '../../../common/configuration' +import { getDeploymentFile, getDeploymentFilename, IDeployments } from '../common' +import { ActFacet } from '../../../typechain' + +let actFacet: ActFacet + +async function main() { + // ==== Read Configuration ==== + const [burner] = await hre.ethers.getSigners() + const chainId = await getChainId(hre) + + console.log(`Deploying Facade to network ${hre.network.name} (${chainId}) + with burner account: ${burner.address}`) + + if (!networkConfig[chainId]) { + throw new Error(`Missing network configuration for ${hre.network.name}`) + } + + const deploymentFilename = getDeploymentFilename(chainId) + const deployments = getDeploymentFile(deploymentFilename) + + // Check facade exists + if (!deployments.facade) { + throw new Error(`Missing deployed contracts in network ${hre.network.name}`) + } else if (!(await isValidContract(hre, deployments.facade))) { + throw new Error(`Facade contract not found in network ${hre.network.name}`) + } + + // ******************** Deploy ActFacet ****************************************/ + + // Deploy ActFacet + const ActFacetFactory = await ethers.getContractFactory('ActFacet') + actFacet = await ActFacetFactory.connect(burner).deploy() + await actFacet.deployed() + + // Write temporary deployments file + deployments.facets.actFacet = actFacet.address + fs.writeFileSync(deploymentFilename, JSON.stringify(deployments, null, 2)) + + console.log(`Deployed to ${hre.network.name} (${chainId}) + ActFacet: ${actFacet.address} + Deployment file: ${deploymentFilename}`) + + // ******************** Save to Facade ****************************************/ + + console.log('Configuring with Facade...') + + // Save ReadFacet to Facade + const facade = await ethers.getContractAt('Facade', deployments.facade) + await facade.save( + actFacet.address, + Object.entries(actFacet.functions).map(([fn]) => actFacet.interface.getSighash(fn)) + ) + + console.log('Finished saving to Facade') +} + +main().catch((error) => { + console.error(error) + process.exitCode = 1 +}) diff --git a/scripts/deployment/utils.ts b/scripts/deployment/utils.ts index a8c2083e09..0ce4e3bf46 100644 --- a/scripts/deployment/utils.ts +++ b/scripts/deployment/utils.ts @@ -180,11 +180,12 @@ export const getEmptyDeployment = (): IDeployments => { }, tradingLib: '', basketLib: '', - facadeRead: '', + actFacet: '', + readFacet: '', + facade: '', facadeWriteLib: '', cvxMiningLib: '', facadeWrite: '', - facadeAct: '', deployer: '', rsrAsset: '', implementations: { diff --git a/scripts/verification/4_verify_facade.ts b/scripts/verification/4_verify_facade.ts index b75b623a3f..c66c2cfd66 100644 --- a/scripts/verification/4_verify_facade.ts +++ b/scripts/verification/4_verify_facade.ts @@ -21,19 +21,22 @@ async function main() { deployments = getDeploymentFile(getDeploymentFilename(chainId)) /** ******************** Verify FacadeRead ****************************************/ + await verifyContract(chainId, deployments.facade, [], 'contracts/facade/Facade.sol:Facade') + + /** ******************** Verify ReadFacet ****************************************/ await verifyContract( chainId, - deployments.facadeRead, + deployments.facets.readFacet, [], - 'contracts/facade/FacadeRead.sol:FacadeRead' + 'contracts/facade/facets/ReadFacet.sol:ReadFacet' ) - /** ******************** Verify FacadeAct ****************************************/ + /** ******************** Verify ActFacet ****************************************/ await verifyContract( chainId, - deployments.facadeAct, + deployments.facets.actFacet, [], - 'contracts/facade/FacadeAct.sol:FacadeAct' + 'contracts/facade/facets/ActFacet.sol:ActFacet' ) } diff --git a/test/Deployer.test.ts b/test/Deployer.test.ts index 39a2ecf8de..1b9e4ed390 100644 --- a/test/Deployer.test.ts +++ b/test/Deployer.test.ts @@ -9,7 +9,6 @@ import { bn } from '../common/numbers' import { Asset, ERC20Mock, - FacadeRead, GnosisMock, IAssetRegistry, RTokenAsset, @@ -18,6 +17,7 @@ import { TestIBroker, TestIDeployer, TestIDistributor, + TestIFacade, TestIFurnace, TestIMain, TestIRevenueTrader, @@ -48,7 +48,7 @@ describe(`DeployerP${IMPLEMENTATION} contract #fast`, () => { // Market / Facade let gnosis: GnosisMock let broker: TestIBroker - let facade: FacadeRead + let facade: TestIFacade // Core contracts let rToken: TestIRToken diff --git a/test/Facade.test.ts b/test/Facade.test.ts index f863d38d69..7a3891405a 100644 --- a/test/Facade.test.ts +++ b/test/Facade.test.ts @@ -11,6 +11,7 @@ import { setOraclePrice } from './utils/oracles' import { disableBatchTrade, disableDutchTrade } from './utils/trades' import { whileImpersonating } from './utils/impersonation' import { + ActFacet, Asset, BackingManagerP1, BackingMgrCompatibleV1, @@ -19,13 +20,13 @@ import { ComptrollerMock, CTokenMock, ERC20Mock, - FacadeAct, FacadeMonitor, FacadeMonitorV2, - FacadeRead, FacadeTest, MockV3Aggregator, + ReadFacet, RecollateralizationLibP1, + RevertingFacetMock, RevenueTraderCompatibleV1, RevenueTraderCompatibleV2, RevenueTraderInvalidVersion, @@ -36,6 +37,7 @@ import { IBasketHandler, TestIBackingManager, TestIBroker, + TestIFacade, TestIRevenueTrader, TestIMain, TestIStRSR, @@ -67,7 +69,7 @@ const describeP1 = IMPLEMENTATION == Implementation.P1 ? describe : describe.ski const itP1 = IMPLEMENTATION == Implementation.P1 ? it : it.skip -describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { +describe('Facade + FacadeMonitor contracts', () => { let owner: SignerWithAddress let addr1: SignerWithAddress let addr2: SignerWithAddress @@ -92,10 +94,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { let cTokenAsset: Collateral // Facade - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest - let facadeAct: FacadeAct let facadeMonitor: FacadeMonitor + let readFacet: ReadFacet // Main let rToken: TestIRToken @@ -136,7 +138,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { basket, config, facade, - facadeAct, + readFacet, facadeTest, facadeMonitor, rToken, @@ -191,7 +193,28 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) }) - describe('FacadeRead + interactions with FacadeAct', () => { + describe('Facade', () => { + let selector: string + let revertingFacet: RevertingFacetMock + + beforeEach(async () => { + selector = readFacet.interface.getSighash('backingOverview(address)') + const factory = await ethers.getContractFactory('RevertingFacetMock') + revertingFacet = await factory.deploy() + }) + + it('Cannot save zero addr facets', async () => { + await expect(facade.save(ZERO_ADDRESS, [selector])).to.be.revertedWith('zero address') + }) + it('Can overwrite an entry', async () => { + await expect(facade.save(revertingFacet.address, [selector])) + .to.emit(facade, 'SelectorSaved') + .withArgs(revertingFacet.address, selector) + await expect(facade.backingOverview(rToken.address)).to.be.revertedWith('RevertingFacetMock') + }) + }) + + describe('ReadFacet + ActFacet', () => { let issueAmount: BigNumber const expectValidBasketBreakdown = async (rToken: TestIRToken) => { @@ -567,7 +590,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { } }) - it('Should return revenue + chain into FacadeAct.runRevenueAuctions', async () => { + it('Should return revenue + chain into ActFacet.runRevenueAuctions', async () => { // Set low to 0 == revenueOverview() should not revert const minTradeVolume = await rsrTrader.minTradeVolume() const auctionLength = await broker.dutchAuctionLength() @@ -584,8 +607,9 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(low).to.equal(0) // revenue - let [erc20s, canStart, surpluses, minTradeAmounts] = - await facadeAct.callStatic.revenueOverview(rsrTrader.address) + let [erc20s, canStart, surpluses, minTradeAmounts] = await facade.callStatic.revenueOverview( + rsrTrader.address + ) expect(erc20s.length).to.equal(8) // should be full set of registered ERC20s const erc20sToStart = [] @@ -612,10 +636,11 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { [rsrTrader.address, [], erc20sToStart, [TradeKind.DUTCH_AUCTION]] ) const data = funcSig.substring(0, 10) + args.slice(2) - await expect(facadeAct.multicall([data])).to.emit(rsrTrader, 'TradeStarted') + const facadeAsActFacet = await ethers.getContractAt('ActFacet', facade.address) + await expect(facadeAsActFacet.multicall([data])).to.emit(rsrTrader, 'TradeStarted') // Another call to revenueOverview should not propose any auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facade.callStatic.revenueOverview( rsrTrader.address ) expect(canStart).to.eql(Array(8).fill(false)) @@ -632,7 +657,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { expect(settleable[0]).to.equal(token.address) // Another call to revenueOverview should settle and propose new auction - ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facade.callStatic.revenueOverview( rsrTrader.address ) @@ -648,7 +673,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { } // Settle and start new auction - await facadeAct.runRevenueAuctions(rsrTrader.address, erc20sToStart, erc20sToStart, [ + await facade.runRevenueAuctions(rsrTrader.address, erc20sToStart, erc20sToStart, [ TradeKind.DUTCH_AUCTION, ]) @@ -656,7 +681,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) // Call revenueOverview, cannot open new auctions - ;[erc20s, canStart, surpluses, minTradeAmounts] = await facadeAct.callStatic.revenueOverview( + ;[erc20s, canStart, surpluses, minTradeAmounts] = await facade.callStatic.revenueOverview( rsrTrader.address ) expect(canStart).to.eql(Array(8).fill(false)) @@ -673,11 +698,11 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await BackingMgrInvalidVerImplFactory.deploy() ) - await expect(facadeAct.callStatic.revenueOverview(rsrTrader.address)).not.to.be.reverted + await expect(facade.callStatic.revenueOverview(rsrTrader.address)).not.to.be.reverted await backingManager.connect(owner).upgradeTo(bckMgrInvalidVer.address) // Reverts due to invalid version when forwarding revenue - await expect(facadeAct.callStatic.revenueOverview(rsrTrader.address)).to.be.revertedWith( + await expect(facade.callStatic.revenueOverview(rsrTrader.address)).to.be.revertedWith( 'unrecognized version' ) }) @@ -685,7 +710,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { it('Should return nextRecollateralizationAuction', async () => { // Confirm no auction to run yet - should not revert let [canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( + await facade.callStatic.nextRecollateralizationAuction( backingManager.address, TradeKind.DUTCH_AUCTION ) @@ -703,11 +728,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { const sellAmt: BigNumber = await token.balanceOf(backingManager.address) // Confirm nextRecollateralizationAuction is true - ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address, - TradeKind.DUTCH_AUCTION - ) + ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -728,11 +752,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) // nextRecollateralizationAuction should return false (trade open) - ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address, - TradeKind.DUTCH_AUCTION - ) + ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(false) expect(sell).to.equal(ZERO_ADDRESS) expect(buy).to.equal(ZERO_ADDRESS) @@ -743,11 +766,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // nextRecollateralizationAuction should return the next trade // In this case it will retry the same auction - ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address, - TradeKind.DUTCH_AUCTION - ) + ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.DUTCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -777,7 +799,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Confirm no auction to run yet - should not revert let [canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( + await facade.callStatic.nextRecollateralizationAuction( backingManager.address, TradeKind.BATCH_AUCTION ) @@ -795,11 +817,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { const sellAmt: BigNumber = await token.balanceOf(backingManager.address) // Confirm nextRecollateralizationAuction is true - ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address, - TradeKind.BATCH_AUCTION - ) + ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -823,11 +844,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await backingManager.connect(owner).upgradeTo(backingManagerV1.address) // nextRecollateralizationAuction should return false (trade open) - ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address, - TradeKind.BATCH_AUCTION - ) + ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(false) expect(sell).to.equal(ZERO_ADDRESS) expect(buy).to.equal(ZERO_ADDRESS) @@ -838,11 +858,10 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // nextRecollateralizationAuction should return the next trade // In this case it will retry the same auction - ;[canStart, sell, buy, sellAmount] = - await facadeAct.callStatic.nextRecollateralizationAuction( - backingManager.address, - TradeKind.BATCH_AUCTION - ) + ;[canStart, sell, buy, sellAmount] = await facade.callStatic.nextRecollateralizationAuction( + backingManager.address, + TradeKind.BATCH_AUCTION + ) expect(canStart).to.equal(true) expect(sell).to.equal(token.address) expect(buy).to.equal(usdc.address) @@ -852,7 +871,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await backingManager.connect(owner).upgradeTo(backingManagerInvalidVer.address) await expect( - facadeAct.callStatic.nextRecollateralizationAuction( + facade.callStatic.nextRecollateralizationAuction( backingManager.address, TradeKind.BATCH_AUCTION ) @@ -882,7 +901,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Attempt to trigger recollateralization await expect( - facadeAct.callStatic.nextRecollateralizationAuction( + facade.callStatic.nextRecollateralizationAuction( backingManager.address, TradeKind.BATCH_AUCTION ) @@ -1406,7 +1425,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { }) // P1 only - describeP1('FacadeAct', () => { + describeP1('ActFacet on P1', () => { let issueAmount: BigNumber beforeEach(async () => { @@ -1463,7 +1482,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await compoundMock.setRewards(rsrTrader.address, rewardAmountCOMP) // Via Facade, claim rewards from backingManager - await expectEvents(facadeAct.claimRewards(rToken.address), [ + await expectEvents(facade.claimRewards(rToken.address), [ { contract: aToken, name: 'RewardsClaimed', @@ -1496,12 +1515,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Run revenue auctions await expect( - facadeAct.runRevenueAuctions( - rsrTrader.address, - [], - [token.address], - [TradeKind.DUTCH_AUCTION] - ) + facade.runRevenueAuctions(rsrTrader.address, [], [token.address], [TradeKind.DUTCH_AUCTION]) ) .to.emit(rsrTrader, 'TradeStarted') .withArgs(anyValue, token.address, rsr.address, anyValue, anyValue) @@ -1514,7 +1528,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Settle and start new auction - Will retry await expectEvents( - facadeAct.runRevenueAuctions( + facade.runRevenueAuctions( rsrTrader.address, [token.address], [token.address], @@ -1560,7 +1574,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Run revenue auctions await expect( - facadeAct.runRevenueAuctions( + facade.runRevenueAuctions( rTokenTrader.address, [], [token.address], @@ -1582,7 +1596,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Settle and start new auction - Will retry await expectEvents( - facadeAct.runRevenueAuctions( + facade.runRevenueAuctions( rTokenTrader.address, [token.address], [token.address], @@ -1613,7 +1627,7 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { // Settle and start new auction - Will retry again await expectEvents( - facadeAct.runRevenueAuctions( + facade.runRevenueAuctions( rTokenTrader.address, [token.address], [token.address], @@ -1652,24 +1666,14 @@ describe('FacadeRead + FacadeAct + FacadeMonitor contracts', () => { await token.connect(addr1).transfer(rsrTrader.address, tokenSurplus) await expect( - facadeAct.runRevenueAuctions( - rsrTrader.address, - [], - [token.address], - [TradeKind.DUTCH_AUCTION] - ) + facade.runRevenueAuctions(rsrTrader.address, [], [token.address], [TradeKind.DUTCH_AUCTION]) ).to.be.revertedWith('unrecognized version') // Also set BackingManager to invalid version await backingManager.connect(owner).upgradeTo(backingManagerInvalidVer.address) await expect( - facadeAct.runRevenueAuctions( - rsrTrader.address, - [], - [token.address], - [TradeKind.DUTCH_AUCTION] - ) + facade.runRevenueAuctions(rsrTrader.address, [], [token.address], [TradeKind.DUTCH_AUCTION]) ).to.be.revertedWith('unrecognized version') }) }) diff --git a/test/FacadeWrite.test.ts b/test/FacadeWrite.test.ts index c19f200e23..0175c1c45c 100644 --- a/test/FacadeWrite.test.ts +++ b/test/FacadeWrite.test.ts @@ -31,7 +31,6 @@ import { CTokenFiatCollateral, CTokenMock, ERC20Mock, - FacadeRead, FacadeTest, FacadeWrite, FiatCollateral, @@ -43,6 +42,7 @@ import { TestIBroker, TestIDeployer, TestIDistributor, + TestIFacade, TestIFurnace, TestIMain, TestIRevenueTrader, @@ -103,7 +103,7 @@ describe('FacadeWrite contract', () => { let timelock: TimelockController // Facade - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let facadeWriteLibAddr: string diff --git a/test/Main.test.ts b/test/Main.test.ts index 4b2ca20eac..35fee796a0 100644 --- a/test/Main.test.ts +++ b/test/Main.test.ts @@ -39,7 +39,6 @@ import { DutchTrade, CTokenMock, ERC20Mock, - FacadeRead, FacadeTest, FiatCollateral, GnosisMock, @@ -56,6 +55,7 @@ import { TestIBroker, TestIDeployer, TestIDistributor, + TestIFacade, TestIFurnace, TestIMain, TestIRevenueTrader, @@ -141,7 +141,7 @@ describe(`MainP${IMPLEMENTATION} contract`, () => { let stRSR: TestIStRSR let furnace: TestIFurnace let main: TestIMain - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager diff --git a/test/Recollateralization.test.ts b/test/Recollateralization.test.ts index 1e2d952ffe..4db75baf5c 100644 --- a/test/Recollateralization.test.ts +++ b/test/Recollateralization.test.ts @@ -20,7 +20,6 @@ import { CTokenMock, DutchTrade, ERC20Mock, - FacadeRead, FacadeTest, FiatCollateral, GnosisMock, @@ -31,6 +30,7 @@ import { TestIBackingManager, TestIBasketHandler, TestIBroker, + TestIFacade, TestIMain, TestIRToken, TestIStRSR, @@ -104,7 +104,7 @@ describe(`Recollateralization - P${IMPLEMENTATION}`, () => { // Contracts to retrieve after deploy let rToken: TestIRToken let stRSR: TestIStRSR - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager diff --git a/test/ZZStRSR.test.ts b/test/ZZStRSR.test.ts index 483a611372..7ee2f4d048 100644 --- a/test/ZZStRSR.test.ts +++ b/test/ZZStRSR.test.ts @@ -12,13 +12,13 @@ import { expectEvents } from '../common/events' import { ERC20Mock, ERC1271Mock, - FacadeRead, StRSRP0, StRSRP1Votes, StaticATokenMock, IAssetRegistry, TestIBackingManager, TestIBasketHandler, + TestIFacade, TestIMain, TestIRToken, TestIStRSR, @@ -70,7 +70,7 @@ describe(`StRSRP${IMPLEMENTATION} contract`, () => { let backingManager: TestIBackingManager let basketHandler: TestIBasketHandler let rToken: TestIRToken - let facade: FacadeRead + let facade: TestIFacade let assetRegistry: IAssetRegistry // StRSR diff --git a/test/fixtures.ts b/test/fixtures.ts index 7120255963..4b09c6457c 100644 --- a/test/fixtures.ts +++ b/test/fixtures.ts @@ -34,8 +34,8 @@ import { DeployerP0, DeployerP1, DutchTrade, - FacadeRead, - FacadeAct, + ReadFacet, + ActFacet, FacadeMonitor, FacadeTest, DistributorP1, @@ -58,6 +58,7 @@ import { TestIBroker, TestIDeployer, TestIDistributor, + TestIFacade, TestIFurnace, TestIMain, TestIRevenueTrader, @@ -407,8 +408,9 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt rTokenAsset: RTokenAsset furnace: TestIFurnace stRSR: TestIStRSR - facade: FacadeRead - facadeAct: FacadeAct + facade: TestIFacade + readFacet: ReadFacet + actFacet: ActFacet facadeTest: FacadeTest facadeMonitor: FacadeMonitor broker: TestIBroker @@ -477,14 +479,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = const TradingLibFactory: ContractFactory = await ethers.getContractFactory('TradingLibP0') const tradingLib: TradingLibP0 = await TradingLibFactory.deploy() - // Deploy FacadeRead - const FacadeReadFactory: ContractFactory = await ethers.getContractFactory('FacadeRead') - const facade = await FacadeReadFactory.deploy() - - // Deploy FacadeAct - const FacadeActFactory: ContractFactory = await ethers.getContractFactory('FacadeAct') - const facadeAct = await FacadeActFactory.deploy() - // Deploy FacadeTest const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') const facadeTest = await FacadeTestFactory.deploy() @@ -737,6 +731,26 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = await main.connect(owner).grantRole(SHORT_FREEZER, owner.address) await main.connect(owner).grantRole(LONG_FREEZER, owner.address) + // Deploy Facade + const FacadeFactory: ContractFactory = await ethers.getContractFactory('Facade') + const facade = await ethers.getContractAt('TestIFacade', (await FacadeFactory.deploy()).address) + + // Save ReadFacet to Facade + const ReadFacetFactory: ContractFactory = await ethers.getContractFactory('ReadFacet') + const readFacet = await ReadFacetFactory.deploy() + await facade.save( + readFacet.address, + Object.entries(readFacet.functions).map(([fn]) => readFacet.interface.getSighash(fn)) + ) + + // Save ActFacet to Facade + const ActFacetFactory: ContractFactory = await ethers.getContractFactory('ActFacet') + const actFacet = await ActFacetFactory.deploy() + await facade.save( + actFacet.address, + Object.entries(actFacet.functions).map(([fn]) => actFacet.interface.getSighash(fn)) + ) + return { rsr, rsrAsset, @@ -766,7 +780,8 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = gnosis, easyAuction, facade, - facadeAct, + readFacet, + actFacet, facadeTest, facadeMonitor, rsrTrader, diff --git a/test/integration/AssetPlugins.test.ts b/test/integration/AssetPlugins.test.ts index 6ac871ad97..91cea90b07 100644 --- a/test/integration/AssetPlugins.test.ts +++ b/test/integration/AssetPlugins.test.ts @@ -38,7 +38,6 @@ import { CTokenSelfReferentialCollateral, ERC20Mock, EURFiatCollateral, - FacadeRead, FacadeTest, FiatCollateral, IAToken, @@ -51,6 +50,7 @@ import { StaticATokenLM, TestIBackingManager, TestIBasketHandler, + TestIFacade, TestIMain, TestIRToken, USDCMock, @@ -156,7 +156,7 @@ describeFork(`Asset Plugins - Integration - Mainnet Forking P${IMPLEMENTATION}`, let rToken: TestIRToken let rTokenAsset: RTokenAsset let main: TestIMain - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let assetRegistry: IAssetRegistry let backingManager: TestIBackingManager diff --git a/test/integration/fixtures.ts b/test/integration/fixtures.ts index ee0c183d6a..8ba38a3e62 100644 --- a/test/integration/fixtures.ts +++ b/test/integration/fixtures.ts @@ -14,6 +14,7 @@ import { advanceTime } from '../utils/time' import { bn, fp } from '../../common/numbers' import { AaveLendingPoolMock, + ActFacet, Asset, AssetRegistryP1, ATokenFiatCollateral, @@ -33,8 +34,6 @@ import { EasyAuction, ERC20Mock, EURFiatCollateral, - FacadeRead, - FacadeAct, FacadeTest, FiatCollateral, FurnaceP1, @@ -43,6 +42,7 @@ import { IERC20Metadata, MainP1, NonFiatCollateral, + ReadFacet, RevenueTraderP1, RTokenAsset, RTokenP1, @@ -54,6 +54,7 @@ import { TestIBroker, TestIDeployer, TestIDistributor, + TestIFacade, TestIFurnace, TestIMain, TestIRevenueTrader, @@ -587,8 +588,7 @@ export interface DefaultFixture extends RSRAndCompAaveAndCollateralAndModuleFixt rTokenAsset: RTokenAsset furnace: TestIFurnace stRSR: TestIStRSR - facade: FacadeRead - facadeAct: FacadeAct + facade: TestIFacade facadeTest: FacadeTest facadeMonitor: FacadeMonitor broker: TestIBroker @@ -657,13 +657,25 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = AAVE_V2_DATA_PROVIDER_ADDR: networkConfig[chainId].AAVE_DATA_PROVIDER ?? ZERO_ADDRESS, } - // Deploy FacadeRead - const FacadeReadFactory: ContractFactory = await ethers.getContractFactory('FacadeRead') - const facade = await FacadeReadFactory.deploy() + // Deploy Facade + const FacadeFactory: ContractFactory = await ethers.getContractFactory('Facade') + const facade = await ethers.getContractAt('TestIFacade', (await FacadeFactory.deploy()).address) - // Deploy FacadeAct - const FacadeActFactory: ContractFactory = await ethers.getContractFactory('FacadeAct') - const facadeAct = await FacadeActFactory.deploy() + // Save ReadFacet to Facade + const ReadFacetFactory: ContractFactory = await ethers.getContractFactory('ReadFacet') + const readFacet = await ReadFacetFactory.deploy() + await facade.save( + readFacet.address, + Object.entries(readFacet.functions).map(([fn]) => readFacet.interface.getSighash(fn)) + ) + + // Save ActFacet to Facade + const ActFacetFactory: ContractFactory = await ethers.getContractFactory('ActFacet') + const actFacet = await ActFacetFactory.deploy() + await facade.save( + actFacet.address, + Object.entries(actFacet.functions).map(([fn]) => actFacet.interface.getSighash(fn)) + ) // Deploy FacadeTest const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') @@ -925,7 +937,6 @@ const makeDefaultFixture = async (setBasket: boolean): Promise = broker, easyAuction, facade, - facadeAct, facadeTest, facadeMonitor, rsrTrader, diff --git a/test/integration/mainnet-test/FacadeActVersion.test.ts b/test/integration/mainnet-test/FacadeActVersion.test.ts index 0fadf15743..1ff6300e68 100644 --- a/test/integration/mainnet-test/FacadeActVersion.test.ts +++ b/test/integration/mainnet-test/FacadeActVersion.test.ts @@ -6,7 +6,7 @@ import { IMPLEMENTATION } from '../../fixtures' import { getChainId } from '../../../common/blockchain-utils' import { networkConfig } from '../../../common/configuration' import forkBlockNumber from '../fork-block-numbers' -import { FacadeAct, RevenueTraderP1 } from '../../../typechain' +import { ActFacet, RevenueTraderP1 } from '../../../typechain' import { useEnv } from '#/utils/env' import { getLatestBlockTimestamp, setNextBlockTimestamp } from '../../utils/time' import { ONE_PERIOD } from '#/common/constants' @@ -18,10 +18,10 @@ const FACADE_ACT_ADDR = '0xeaCaF85eA2df99e56053FD0250330C148D582547' // V3 const SELL_TOKEN_ADDR = '0x60C384e226b120d93f3e0F4C502957b2B9C32B15' // aUSDC describeFork( - `FacadeAct - Settle Auctions - Mainnet Check - Mainnet Forking P${IMPLEMENTATION}`, + `ActFacet - Settle Auctions - Mainnet Check - Mainnet Forking P${IMPLEMENTATION}`, function () { - let facadeAct: FacadeAct - let newFacadeAct: FacadeAct + let facadeAct: ActFacet + let newFacadeAct: ActFacet let revenueTrader: RevenueTraderP1 let chainId: number @@ -43,7 +43,7 @@ describeFork( }) } - describe('FacadeAct', () => { + describe('ActFacet', () => { before(async () => { await setup(forkBlockNumber['mainnet-2.0']) @@ -60,7 +60,7 @@ describeFork( snap = await evmSnapshot() // Get contracts - facadeAct = await ethers.getContractAt('FacadeAct', FACADE_ACT_ADDR) + facadeAct = await ethers.getContractAt('ActFacet', FACADE_ACT_ADDR) revenueTrader = ( await ethers.getContractAt('RevenueTraderP1', REVENUE_TRADER_ADDR) ) @@ -76,7 +76,7 @@ describeFork( expect(await revenueTrader.tradesOpen()).to.equal(0) }) - it('Should fail with deployed FacadeAct', async () => { + it('Should fail with deployed ActFacet', async () => { expect(await revenueTrader.tradesOpen()).to.equal(1) await expect( facadeAct.runRevenueAuctions(revenueTrader.address, [SELL_TOKEN_ADDR], [], [1]) @@ -84,10 +84,10 @@ describeFork( expect(await revenueTrader.tradesOpen()).to.equal(1) }) - it('Should work with fixed FacadeAct', async () => { + it('Should work with fixed ActFacet', async () => { expect(await revenueTrader.tradesOpen()).to.equal(1) - const FacadeActFactory = await ethers.getContractFactory('FacadeAct') + const FacadeActFactory = await ethers.getContractFactory('ActFacet') newFacadeAct = await FacadeActFactory.deploy() await newFacadeAct.runRevenueAuctions(revenueTrader.address, [SELL_TOKEN_ADDR], [], [1]) @@ -95,8 +95,8 @@ describeFork( expect(await revenueTrader.tradesOpen()).to.equal(0) }) - it('Fixed FacadeAct should return right revenueOverview', async () => { - const FacadeActFactory = await ethers.getContractFactory('FacadeAct') + it('Fixed ActFacet should return right revenueOverview', async () => { + const FacadeActFactory = await ethers.getContractFactory('ActFacet') await setNextBlockTimestamp(Number(await getLatestBlockTimestamp()) + Number(ONE_PERIOD)) newFacadeAct = await FacadeActFactory.deploy() @@ -142,8 +142,8 @@ describeFork( } }) - it('Fixed FacadeAct should run revenue auctions', async () => { - const FacadeActFactory = await ethers.getContractFactory('FacadeAct') + it('Fixed ActFacet should run revenue auctions', async () => { + const FacadeActFactory = await ethers.getContractFactory('ActFacet') newFacadeAct = await FacadeActFactory.deploy() expect(await revenueTrader.tradesOpen()).to.equal(1) diff --git a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts index 925e4ad850..7b0bed849e 100644 --- a/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave/ATokenFiatCollateral.test.ts @@ -53,7 +53,6 @@ import { Asset, ATokenFiatCollateral, ERC20Mock, - FacadeRead, FacadeTest, FacadeWrite, IAssetRegistry, @@ -63,6 +62,7 @@ import { RTokenAsset, TestIBackingManager, TestIDeployer, + TestIFacade, TestIMain, TestIRToken, IAToken, @@ -124,7 +124,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi let chainlinkFeed: AggregatorInterface let deployer: TestIDeployer - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let facadeWrite: FacadeWrite let govParams: IGovParams @@ -158,6 +158,7 @@ describeFork(`ATokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi pctRate: fp('0.05'), // 5% }, warmupPeriod: bn('60'), + reweightable: false, } const defaultThreshold = fp('0.01') // 1% diff --git a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts index c46ac0b874..262bb2f8a9 100644 --- a/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts +++ b/test/plugins/individual-collateral/compoundv2/CTokenFiatCollateral.test.ts @@ -56,7 +56,6 @@ import { CTokenFiatCollateral, CTokenMock, ERC20Mock, - FacadeRead, FacadeTest, FacadeWrite, IAssetRegistry, @@ -66,6 +65,7 @@ import { TestIBackingManager, TestIBasketHandler, TestIDeployer, + TestIFacade, TestIMain, TestIRToken, } from '../../../../typechain' @@ -122,7 +122,7 @@ describeFork(`CTokenFiatCollateral - Mainnet Forking P${IMPLEMENTATION}`, functi let basketHandler: TestIBasketHandler let deployer: TestIDeployer - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let facadeWrite: FacadeWrite let govParams: IGovParams diff --git a/test/plugins/individual-collateral/fixtures.ts b/test/plugins/individual-collateral/fixtures.ts index 463bf9de1b..a250450b38 100644 --- a/test/plugins/individual-collateral/fixtures.ts +++ b/test/plugins/individual-collateral/fixtures.ts @@ -6,6 +6,7 @@ import { bn, fp } from '../../../common/numbers' import { useEnv } from '#/utils/env' import { Implementation, IMPLEMENTATION, ORACLE_ERROR, PRICE_TIMEOUT } from '../../fixtures' import { + ActFacet, Asset, AssetRegistryP1, BackingManagerP1, @@ -17,18 +18,18 @@ import { DistributorP1, DutchTrade, ERC20Mock, - FacadeRead, - FacadeAct, FacadeTest, FacadeWrite, FurnaceP1, GnosisTrade, IGnosis, MainP1, + ReadFacet, RevenueTraderP1, RTokenP1, StRSRP1Votes, TestIDeployer, + TestIFacade, RecollateralizationLibP1, } from '../../../typechain' @@ -67,8 +68,7 @@ export interface DefaultFixture extends RSRAndModuleFixture { salt: string deployer: TestIDeployer rsrAsset: Asset - facade: FacadeRead - facadeAct: FacadeAct + facade: TestIFacade facadeTest: FacadeTest facadeWrite: FacadeWrite govParams: IGovParams @@ -84,13 +84,25 @@ export const getDefaultFixture = async function (salt: string) { throw new Error(`Missing network configuration for ${hre.network.name}`) } - // Deploy FacadeRead - const FacadeReadFactory: ContractFactory = await ethers.getContractFactory('FacadeRead') - const facade = await FacadeReadFactory.deploy() + // Deploy Facade + const FacadeFactory: ContractFactory = await ethers.getContractFactory('Facade') + const facade = await ethers.getContractAt('TestIFacade', (await FacadeFactory.deploy()).address) + + // Save ReadFacet to Facade + const ReadFacetFactory: ContractFactory = await ethers.getContractFactory('ReadFacet') + const readFacet = await ReadFacetFactory.deploy() + await facade.save( + readFacet.address, + Object.entries(readFacet.functions).map(([fn]) => readFacet.interface.getSighash(fn)) + ) - // Deploy FacadeAct - const FacadeActFactory: ContractFactory = await ethers.getContractFactory('FacadeAct') - const facadeAct = await FacadeActFactory.deploy() + // Save ActFacet to Facade + const ActFacetFactory: ContractFactory = await ethers.getContractFactory('ActFacet') + const actFacet = await ActFacetFactory.deploy() + await facade.save( + actFacet.address, + Object.entries(actFacet.functions).map(([fn]) => actFacet.interface.getSighash(fn)) + ) // Deploy FacadeTest const FacadeTestFactory: ContractFactory = await ethers.getContractFactory('FacadeTest') @@ -231,7 +243,6 @@ export const getDefaultFixture = async function (salt: string) { deployer, gnosis, facade, - facadeAct, facadeTest, facadeWrite, govParams, diff --git a/test/scenario/ComplexBasket.test.ts b/test/scenario/ComplexBasket.test.ts index 2c5cb19f5b..2a27078d8f 100644 --- a/test/scenario/ComplexBasket.test.ts +++ b/test/scenario/ComplexBasket.test.ts @@ -11,7 +11,6 @@ import { ComptrollerMock, CTokenMock, ERC20Mock, - FacadeRead, FacadeTest, GnosisMock, IAssetRegistry, @@ -20,6 +19,7 @@ import { StaticATokenMock, TestIBackingManager, TestIBasketHandler, + TestIFacade, TestIRevenueTrader, TestIRToken, WETH9, @@ -101,7 +101,7 @@ describe(`Complex Basket - P${IMPLEMENTATION}`, () => { let stRSR: TestIStRSR let assetRegistry: IAssetRegistry let basketHandler: TestIBasketHandler - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let backingManager: TestIBackingManager diff --git a/test/scenario/MaxBasketSize.test.ts b/test/scenario/MaxBasketSize.test.ts index ba0275e738..f78b3434cf 100644 --- a/test/scenario/MaxBasketSize.test.ts +++ b/test/scenario/MaxBasketSize.test.ts @@ -12,10 +12,10 @@ import { CTokenFiatCollateral, CTokenMock, ERC20Mock, - FacadeRead, FacadeTest, FiatCollateral, IAssetRegistry, + TestIFacade, TestIStRSR, MockV3Aggregator, StaticATokenMock, @@ -65,7 +65,7 @@ describe(`Max Basket Size - P${IMPLEMENTATION}`, () => { let stRSR: TestIStRSR let assetRegistry: IAssetRegistry let basketHandler: TestIBasketHandler - let facade: FacadeRead + let facade: TestIFacade let facadeTest: FacadeTest let backingManager: TestIBackingManager diff --git a/test/utils/issue.ts b/test/utils/issue.ts index 5ef8d289e1..4d852022fd 100644 --- a/test/utils/issue.ts +++ b/test/utils/issue.ts @@ -4,7 +4,7 @@ import { BigNumber } from 'ethers' import { ethers } from 'hardhat' import { bn, fp } from '../../common/numbers' -import { FacadeRead, TestIRToken } from '../../typechain' +import { TestIFacade, TestIRToken } from '../../typechain' import { IMPLEMENTATION, Implementation } from '../fixtures' import { advanceBlocks } from './time' @@ -14,7 +14,7 @@ import { advanceBlocks } from './time' // blocks, we do this more cleverly than just one big issuance... // This presumes that user has already granted allowances of basket tokens! export async function issueMany( - facade: FacadeRead, + facade: TestIFacade, rToken: TestIRToken, toIssue: BigNumber, user: SignerWithAddress From 6e7d9dc524a63ea55510a96b1f9ceb7b88e0e87c Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 22 Feb 2024 19:33:49 -0500 Subject: [PATCH 221/450] deprecate TUSD and EURT collateral (#1081) --- docs/plugin-addresses.md | 2 - .../phase2-assets/2_deploy_collateral.ts | 55 ------------------- tasks/testing/upgrade-checker-utils/logs.ts | 4 +- 3 files changed, 1 insertion(+), 60 deletions(-) diff --git a/docs/plugin-addresses.md b/docs/plugin-addresses.md index 15c2b973f5..9d697e3cec 100644 --- a/docs/plugin-addresses.md +++ b/docs/plugin-addresses.md @@ -19,7 +19,6 @@ Following are the addresses and configuration parameters of collateral plugins d | [USDC](https://etherscan.io/address/0xBE9D23040fe22E8Bd8A88BF5101061557355cA04) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48](https://etherscan.io/address/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48) | | [USDT](https://etherscan.io/address/0x58D7bF13D3572b08dE5d96373b8097d94B1325ad) | 1.25% | 24 | [0x3E7d1eAB13ad0104d2750B8863b489D65364e32D](https://etherscan.io/address/0x3E7d1eAB13ad0104d2750B8863b489D65364e32D) | [0xdAC17F958D2ee523a2206206994597C13D831ec7](https://etherscan.io/address/0xdAC17F958D2ee523a2206206994597C13D831ec7) | | [USDP](https://etherscan.io/address/0x2f98bA77a8ca1c630255c4517b1b3878f6e60C89) | 2.0% | 24 | [0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3](https://etherscan.io/address/0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3) | [0x8E870D67F660D95d5be530380D0eC0bd388289E1](https://etherscan.io/address/0x8E870D67F660D95d5be530380D0eC0bd388289E1) | -| [TUSD](https://etherscan.io/address/0x7F9999B2C9D310a5f48dfD070eb5129e1e8565E2) | 1.3% | 24 | [0xec746eCF986E2927Abd291a2A1716c940100f8Ba](https://etherscan.io/address/0xec746eCF986E2927Abd291a2A1716c940100f8Ba) | [0x0000000000085d4780B73119b644AE5ecd22b376](https://etherscan.io/address/0x0000000000085d4780B73119b644AE5ecd22b376) | | [BUSD](https://etherscan.io/address/0xCBcd605088D5A5Da9ceEb3618bc01BFB87387423) | 1.5% | 24 | [0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A](https://etherscan.io/address/0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A) | [0x4Fabb145d64652a948d72533023f6E7A623C7C53](https://etherscan.io/address/0x4Fabb145d64652a948d72533023f6E7A623C7C53) | | [aDAI](https://etherscan.io/address/0x256b89658bD831CC40283F42e85B1fa8973Db0c9) | 1.25% | 24 | [0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9](https://etherscan.io/address/0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9) | [0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985](https://etherscan.io/address/0xafd16aFdE22D42038223A6FfDF00ee49c8fDa985) | | [aUSDC](https://etherscan.io/address/0x7cd9ca6401f743b38b3b16ea314bbab8e9c1ac51) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x60C384e226b120d93f3e0F4C502957b2B9C32B15](https://etherscan.io/address/0x60C384e226b120d93f3e0F4C502957b2B9C32B15) | @@ -34,7 +33,6 @@ Following are the addresses and configuration parameters of collateral plugins d | [cETH](https://etherscan.io/address/0x357d4dB0c2179886334cC33B8528048F7E1D3Fe3) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F](https://etherscan.io/address/0xbF6E8F64547Bdec55bc3FBb0664722465FCC2F0F) | | [WBTC](https://etherscan.io/address/0x87A959e0377C68A50b08a91ae5ab3aFA7F41ACA4) | 3.51% | 24 | [0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23](https://etherscan.io/address/0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23) | [0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599](https://etherscan.io/address/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599) | | [WETH](https://etherscan.io/address/0x6B87142C7e6cA80aa3E6ead0351673C45c8990e3) | 0.0% | 0 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2](https://etherscan.io/address/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2) | -| [EURT](https://etherscan.io/address/0xEBD07CE38e2f46031c982136012472A4D24AE070) | 3.0% | 24 | [0x01D391A48f4F7339aC64CA2c83a07C22F95F587a](https://etherscan.io/address/0x01D391A48f4F7339aC64CA2c83a07C22F95F587a) | [0xC581b735A1688071A1746c968e0798D642EDE491](https://etherscan.io/address/0xC581b735A1688071A1746c968e0798D642EDE491) | | [wstETH](https://etherscan.io/address/0x29F2EB4A0D3dC211BB488E9aBe12740cafBCc49C) | 2.5% | 24 | [0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8](https://etherscan.io/address/0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8) | [0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0](https://etherscan.io/address/0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0) | | [rETH](https://etherscan.io/address/0x1103851D1FCDD3f88096fbed812c8FF01949cF9d) | 4.51% | 24 | [0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419](https://etherscan.io/address/0x5f4eC3Df9cbd43714FE2740f5E3616155c5b8419) | [0xae78736Cd615f374D3085123A210448E74Fc6393](https://etherscan.io/address/0xae78736Cd615f374D3085123A210448E74Fc6393) | | [fUSDC](https://etherscan.io/address/0x1FFA5955D64Ee32cB1BF7104167b81bb085b0c8d) | 1.25% | 24 | [0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6](https://etherscan.io/address/0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6) | [0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9](https://etherscan.io/address/0x6D05CB2CB647B58189FA16f81784C05B4bcd4fe9) | diff --git a/scripts/deployment/phase2-assets/2_deploy_collateral.ts b/scripts/deployment/phase2-assets/2_deploy_collateral.ts index d16a1e6168..98f69a75ef 100644 --- a/scripts/deployment/phase2-assets/2_deploy_collateral.ts +++ b/scripts/deployment/phase2-assets/2_deploy_collateral.ts @@ -148,29 +148,6 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - /******** Deploy Fiat Collateral - TUSD **************************/ - if (networkConfig[chainId].tokens.TUSD && networkConfig[chainId].chainlinkFeeds.TUSD) { - const { collateral: tusdCollateral } = await hre.run('deploy-fiat-collateral', { - priceTimeout: priceTimeout.toString(), - priceFeed: networkConfig[chainId].chainlinkFeeds.TUSD, - oracleError: fp('0.003').toString(), // 0.3% - tokenAddress: networkConfig[chainId].tokens.TUSD, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetName: hre.ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.013').toString(), // 1.3% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', tusdCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.TUSD = tusdCollateral - assetCollDeployments.erc20s.TUSD = networkConfig[chainId].tokens.TUSD - deployedCollateral.push(tusdCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - } /******** Deploy Fiat Collateral - BUSD **************************/ if (networkConfig[chainId].tokens.BUSD && networkConfig[chainId].chainlinkFeeds.BUSD) { const { collateral: busdCollateral } = await hre.run('deploy-fiat-collateral', { @@ -645,38 +622,6 @@ async function main() { fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) } - /******** Deploy EUR Fiat Collateral - EURT **************************/ - const eurtError = fp('0.02') // 2% - - if ( - networkConfig[chainId].tokens.EURT && - networkConfig[chainId].chainlinkFeeds.EUR && - networkConfig[chainId].chainlinkFeeds.EURT - ) { - const { collateral: eurtCollateral } = await hre.run('deploy-eurfiat-collateral', { - priceTimeout: priceTimeout.toString(), - referenceUnitFeed: networkConfig[chainId].chainlinkFeeds.EURT, - targetUnitFeed: networkConfig[chainId].chainlinkFeeds.EUR, - oracleError: eurtError.toString(), // 2% - tokenAddress: networkConfig[chainId].tokens.EURT, - maxTradeVolume: fp('1e6').toString(), // $1m, - oracleTimeout: '86400', // 24 hr - targetUnitOracleTimeout: '86400', // 24 hr - targetName: ethers.utils.formatBytes32String('EUR'), - defaultThreshold: fp('0.03').toString(), // 3% - delayUntilDefault: bn('86400').toString(), // 24h - }) - collateral = await ethers.getContractAt('ICollateral', eurtCollateral) - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - assetCollDeployments.collateral.EURT = eurtCollateral - assetCollDeployments.erc20s.EURT = networkConfig[chainId].tokens.EURT - deployedCollateral.push(eurtCollateral.toString()) - - fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) - } - console.log(`Deployed collateral to ${hre.network.name} (${chainId}) New deployments: ${deployedCollateral} Deployment file: ${assetCollDeploymentFilename}`) diff --git a/tasks/testing/upgrade-checker-utils/logs.ts b/tasks/testing/upgrade-checker-utils/logs.ts index a601fdf2b3..1cfe509bcf 100644 --- a/tasks/testing/upgrade-checker-utils/logs.ts +++ b/tasks/testing/upgrade-checker-utils/logs.ts @@ -1,10 +1,9 @@ -import { ITokens, networkConfig } from '#/common/configuration' +import { networkConfig } from '#/common/configuration' const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.USDC!.toLowerCase()]: 'USDC', [networkConfig['1'].tokens.USDT!.toLowerCase()]: 'USDT', [networkConfig['1'].tokens.USDP!.toLowerCase()]: 'USDP', - [networkConfig['1'].tokens.TUSD!.toLowerCase()]: 'TUSD', [networkConfig['1'].tokens.BUSD!.toLowerCase()]: 'BUSD', [networkConfig['1'].tokens.FRAX!.toLowerCase()]: 'FRAX', [networkConfig['1'].tokens.MIM!.toLowerCase()]: 'MIM', @@ -30,7 +29,6 @@ const tokens: { [key: string]: string } = { [networkConfig['1'].tokens.COMP!.toLowerCase()]: 'COMP', [networkConfig['1'].tokens.WETH!.toLowerCase()]: 'WETH', [networkConfig['1'].tokens.WBTC!.toLowerCase()]: 'WBTC', - [networkConfig['1'].tokens.EURT!.toLowerCase()]: 'EURT', [networkConfig['1'].tokens.RSR!.toLowerCase()]: 'RSR', [networkConfig['1'].tokens.CRV!.toLowerCase()]: 'CRV', [networkConfig['1'].tokens.CVX!.toLowerCase()]: 'CVX', From c1ce34f0c3852ab420286ac5b7f742a2e434f2fa Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Thu, 22 Feb 2024 21:11:41 -0500 Subject: [PATCH 222/450] deploy DutchTrade --- .../mainnet-3.2.0/1-tmp-deployments.json | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 scripts/addresses/mainnet-3.2.0/1-tmp-deployments.json diff --git a/scripts/addresses/mainnet-3.2.0/1-tmp-deployments.json b/scripts/addresses/mainnet-3.2.0/1-tmp-deployments.json new file mode 100644 index 0000000000..7d22b3f729 --- /dev/null +++ b/scripts/addresses/mainnet-3.2.0/1-tmp-deployments.json @@ -0,0 +1,34 @@ +{ + "prerequisites": { + "RSR": "0x320623b8e4ff03373931769a31fc52a4e78b5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "", + "basketLib": "", + "facadeRead": "", + "facadeAct": "", + "facadeWriteLib": "", + "facadeWrite": "", + "deployer": "", + "rsrAsset": "", + "implementations": { + "main": "", + "trading": { + "gnosisTrade": "", + "dutchTrade": "0xa3f994235a3b42f71e5F8Aba9A4190e47cd34eE8" + }, + "components": { + "assetRegistry": "", + "backingManager": "", + "basketHandler": "", + "broker": "", + "distributor": "", + "furnace": "", + "rsrTrader": "", + "rTokenTrader": "", + "rToken": "", + "stRSR": "" + } + } +} From cb3aa6b3f12dd0ab169dc3f0a670e6bec2b3512a Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Fri, 23 Feb 2024 07:50:50 +0530 Subject: [PATCH 223/450] Add pyUSD to Aave V3 (#1079) Co-authored-by: Taylor Brent --- common/configuration.ts | 10 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 299 +++++------------- .../individual-collateral/aave-v3/common.ts | 221 +++++++++++++ .../aave-v3/constants.ts | 32 -- .../individual-collateral/aave-v3/helpers.ts | 4 - 5 files changed, 307 insertions(+), 259 deletions(-) create mode 100644 test/plugins/individual-collateral/aave-v3/common.ts delete mode 100644 test/plugins/individual-collateral/aave-v3/constants.ts delete mode 100644 test/plugins/individual-collateral/aave-v3/helpers.ts diff --git a/common/configuration.ts b/common/configuration.ts index 9a5ff02b9f..10156e3395 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -28,7 +28,7 @@ export interface ITokens { aWBTC?: string aCRV?: string aEthUSDC?: string - aBasUSDbC?: string + aBasUSDC?: string aWETHv3?: string acbETHv3?: string cDAI?: string @@ -74,6 +74,9 @@ export interface ITokens { yvCurveUSDPcrvUSD?: string yvCurveUSDCcrvUSD?: string + pyUSD?: string + aEthPyUSD?: string + // Morpho Aave maUSDC?: string maUSDT?: string @@ -307,6 +310,8 @@ export const networkConfig: { [key: string]: INetworkConfig } = { MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', yvCurveUSDPcrvUSD: '0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469', yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', + pyUSD: '0x6c3ea9036406852006290770bedfcaba0e23a0e8', + aEthPyUSD: '0x0C0d01AbF3e6aDfcA0989eBbA9d6e85dD58EaB1E', }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', @@ -334,6 +339,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH + pyUSD: '0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1', }, AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', @@ -552,7 +558,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { WETH: '0x4200000000000000000000000000000000000006', cbETH: '0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22', cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', - aBasUSDbC: '0x0a1d576f3eFeF75b330424287a95A366e8281D54', + aBasUSDC: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB', aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index b2628df278..32a390c9ec 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -1,228 +1,85 @@ -import collateralTests from '../collateralTests' -import { CollateralFixtureContext, MintCollateralFunc } from '../pluginTestTypes' import { ethers } from 'hardhat' -import { BigNumberish, BigNumber } from 'ethers' -import { - TestICollateral, - AaveV3FiatCollateral__factory, - IERC20Metadata, - MockStaticATokenV3LM, -} from '@typechain/index' import { bn, fp } from '#/common/numbers' -import { expect } from 'chai' -import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' -import { noop } from 'lodash' import { PRICE_TIMEOUT } from '#/test/fixtures' -import { resetFork } from './helpers' -import { whileImpersonating } from '#/test/utils/impersonation' -import { pushOracleForward } from '../../../utils/oracles' -import { - forkNetwork, - AUSDC_V3, - AAVE_V3_USDC_POOL, - AAVE_V3_INCENTIVES_CONTROLLER, - USDC_USD_PRICE_FEED, - USDC_HOLDER, -} from './constants' - -interface AaveV3FiatCollateralFixtureContext extends CollateralFixtureContext { - staticWrapper: MockStaticATokenV3LM - baseToken: IERC20Metadata -} +import { makeTests } from './common' +import { networkConfig } from '#/common/configuration' /* - Define deployment functions -*/ - -type CollateralParams = Parameters[0] & { - revenueHiding?: BigNumberish -} - -// This defines options for the Aave V3 USDC Market -export const defaultCollateralOpts: CollateralParams = { - priceTimeout: PRICE_TIMEOUT, - chainlinkFeed: USDC_USD_PRICE_FEED, - oracleError: fp('0.0025'), - erc20: '', // to be set - maxTradeVolume: fp('1e6'), - oracleTimeout: bn('86400'), - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125'), - delayUntilDefault: bn('86400'), -} - -export const deployCollateral = async (opts: Partial = {}) => { - const combinedOpts = { ...defaultCollateralOpts, ...opts } - const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') - - if (!combinedOpts.erc20 || combinedOpts.erc20 === '') { - const V3LMFactory = await ethers.getContractFactory('MockStaticATokenV3LM') - const staticWrapper = await V3LMFactory.deploy(AAVE_V3_USDC_POOL, AAVE_V3_INCENTIVES_CONTROLLER) - await staticWrapper.deployed() - await staticWrapper.initialize(AUSDC_V3, 'Static Aave Ethereum USDC', 'saEthUSDC') - - combinedOpts.erc20 = staticWrapper.address + ** Static AToken Factory for Aave V3 + ** Mainnet: 0x411D79b8cC43384FDE66CaBf9b6a17180c842511 + ** --> https://github.com/bgd-labs/aave-address-book/blob/main/src/AaveV3Ethereum.sol#L86 + ** Base: 0x940F9a5d5F9ED264990D0eaee1F3DD60B4Cb9A22 + ** --> https://github.com/bgd-labs/aave-address-book/blob/main/src/AaveV3Base.sol#L78 + */ + +// Mainnet - USDC +makeTests( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[1].chainlinkFeeds['USDC']!, + oracleError: fp('0.0025'), + erc20: '', // to be set + maxTradeVolume: fp('1e6'), + oracleTimeout: bn('86400'), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125'), + delayUntilDefault: bn('86400'), + }, + { + testName: 'USDC - Mainnet', + aaveIncentivesController: networkConfig[1].AAVE_V3_INCENTIVES_CONTROLLER!, + aavePool: networkConfig[1].AAVE_V3_POOL!, + aToken: networkConfig[1].tokens['aEthUSDC']!, + whaleTokenHolder: '0x0A59649758aa4d66E25f08Dd01271e891fe52199', + forkBlock: 18000000, + targetNetwork: 'mainnet', } - - const collateral = await CollateralFactory.deploy( - combinedOpts, - opts.revenueHiding ?? fp('0'), // change this to test with revenueHiding - { - gasLimit: 30000000, - } - ) - await collateral.deployed() - - // Push forward chainlink feed - await pushOracleForward(combinedOpts.chainlinkFeed!) - - // sometimes we are trying to test a negative test case and we want this to fail silently - // fortunately this syntax fails silently because our tools are terrible - await expect(collateral.refresh()) - - // our tools really suck don't they - return collateral as unknown as TestICollateral -} - -type Fixture = () => Promise - -const makeCollateralFixtureContext = ( - alice: SignerWithAddress, - opts = {} -): Fixture => { - const collateralOpts = { ...defaultCollateralOpts, ...opts } - - const makeCollateralFixtureContext = async () => { - const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') - const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) - - const collateral = await deployCollateral({ - ...collateralOpts, - chainlinkFeed: chainlinkFeed.address, - }) - - const staticWrapper = await ethers.getContractAt( - 'MockStaticATokenV3LM', - await collateral.erc20() - ) - - return { - collateral, - staticWrapper, - chainlinkFeed, - tok: await ethers.getContractAt('IERC20Metadata', await collateral.erc20()), - baseToken: await ethers.getContractAt('IERC20Metadata', await staticWrapper.asset()), - } +) + +// Base - USDC +makeTests( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[8453].chainlinkFeeds['USDC']!, + oracleError: fp('0.003'), + erc20: '', // to be set + maxTradeVolume: fp('0.5e6'), + oracleTimeout: bn('86400'), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125'), + delayUntilDefault: bn('86400'), + }, + { + testName: 'USDC - Base', + aaveIncentivesController: networkConfig[8453].AAVE_V3_INCENTIVES_CONTROLLER!, + aavePool: networkConfig[8453].AAVE_V3_POOL!, + aToken: networkConfig[8453].tokens['aBasUSDC']!, + whaleTokenHolder: '0x20fe51a9229eef2cf8ad9e89d91cab9312cf3b7a', + forkBlock: 8200000, + targetNetwork: 'base', } - - return makeCollateralFixtureContext -} - -/* - Define helper functions -*/ - -const mintCollateralTo: MintCollateralFunc = async ( - ctx: AaveV3FiatCollateralFixtureContext, - amount: BigNumberish, - user: SignerWithAddress, - recipient: string -) => { - const requiredCollat = await ctx.staticWrapper.previewMint(amount) - - // Impersonate holder - await whileImpersonating(USDC_HOLDER, async (signer) => { - await ctx.baseToken - .connect(signer) - .approve(ctx.staticWrapper.address, ethers.constants.MaxUint256) - await ctx.staticWrapper - .connect(signer) - ['deposit(uint256,address,uint16,bool)'](requiredCollat, recipient, 0, true) - }) -} - -const modifyRefPerTok = async (ctx: AaveV3FiatCollateralFixtureContext, changeFactor = 100) => { - const staticWrapper = ctx.staticWrapper - const currentRate = await staticWrapper.rate() - - await staticWrapper.mockSetCustomRate(currentRate.mul(changeFactor).div(100)) -} - -const reduceRefPerTok = async ( - ctx: AaveV3FiatCollateralFixtureContext, - pctDecrease: BigNumberish -) => { - await modifyRefPerTok(ctx, 100 - Number(pctDecrease.toString())) -} - -const increaseRefPerTok = async ( - ctx: AaveV3FiatCollateralFixtureContext, - pctIncrease: BigNumberish -) => { - await modifyRefPerTok(ctx, 100 + Number(pctIncrease.toString())) -} - -const getExpectedPrice = async (ctx: AaveV3FiatCollateralFixtureContext): Promise => { - const initRefPerTok = await ctx.collateral.refPerTok() - const decimals = await ctx.chainlinkFeed.decimals() - - const initData = await ctx.chainlinkFeed.latestRoundData() - return initData.answer - .mul(bn(10).pow(18 - decimals)) - .mul(initRefPerTok) - .div(fp('1')) -} - -const reduceTargetPerRef = async ( - ctx: AaveV3FiatCollateralFixtureContext, - pctDecrease: BigNumberish -) => { - const lastRound = await ctx.chainlinkFeed.latestRoundData() - const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) - - await ctx.chainlinkFeed.updateAnswer(nextAnswer) -} - -const increaseTargetPerRef = async ( - ctx: AaveV3FiatCollateralFixtureContext, - pctIncrease: BigNumberish -) => { - const lastRound = await ctx.chainlinkFeed.latestRoundData() - const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) - - await ctx.chainlinkFeed.updateAnswer(nextAnswer) -} - -/* - Run the test suite -*/ - -export const stableOpts = { - deployCollateral, - collateralSpecificConstructorTests: noop, - collateralSpecificStatusTests: noop, - beforeEachRewardsTest: noop, - makeCollateralFixtureContext, - mintCollateralTo, - reduceRefPerTok, - increaseRefPerTok, - resetFork, - collateralName: 'Aave V3 Fiat Collateral (USDC)', - reduceTargetPerRef, - increaseTargetPerRef, - itClaimsRewards: it.skip, // untested: very complicated to get Aave to handout rewards, and none are live currently. - // The StaticATokenV3LM contract is formally verified and the function we added for claimRewards() is pretty obviously correct. - itChecksTargetPerRefDefault: it, - itChecksTargetPerRefDefaultUp: it, - itChecksRefPerTokDefault: it, - itHasRevenueHiding: it, - itChecksNonZeroDefaultThreshold: it, - itIsPricedByPeg: true, - chainlinkDefaultAnswer: 1e8, - itChecksPriceChanges: it, - getExpectedPrice, - toleranceDivisor: bn('1e9'), // 1e15 adjusted for ((x + 1)/x) timestamp precision - targetNetwork: forkNetwork, -} - -collateralTests(stableOpts) +) + +// Mainnet - pyUSD +makeTests( + { + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: networkConfig[1].chainlinkFeeds['pyUSD']!, + oracleError: fp('0.003'), + erc20: '', // to be set + maxTradeVolume: fp('0.5e6'), + oracleTimeout: bn('86400'), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.0125'), + delayUntilDefault: bn('86400'), + }, + { + testName: 'pyUSD - Mainnet', + aaveIncentivesController: networkConfig[1].AAVE_V3_INCENTIVES_CONTROLLER!, + aavePool: networkConfig[1].AAVE_V3_POOL!, + aToken: networkConfig[1].tokens['aEthPyUSD']!, + whaleTokenHolder: '0xCFFAd3200574698b78f32232aa9D63eABD290703', + forkBlock: 19270000, + targetNetwork: 'mainnet', + } +) diff --git a/test/plugins/individual-collateral/aave-v3/common.ts b/test/plugins/individual-collateral/aave-v3/common.ts new file mode 100644 index 0000000000..c728a5479b --- /dev/null +++ b/test/plugins/individual-collateral/aave-v3/common.ts @@ -0,0 +1,221 @@ +import collateralTests from '../collateralTests' +import { CollateralFixtureContext, MintCollateralFunc } from '../pluginTestTypes' +import { ethers } from 'hardhat' +import { BigNumberish, BigNumber } from 'ethers' +import { + TestICollateral, + AaveV3FiatCollateral__factory, + IERC20Metadata, + MockStaticATokenV3LM, +} from '@typechain/index' +import { bn, fp } from '#/common/numbers' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { noop } from 'lodash' +import { whileImpersonating } from '#/test/utils/impersonation' +import { pushOracleForward } from '../../../utils/oracles' +import { getResetFork } from '../helpers' + +interface AaveV3FiatCollateralFixtureContext extends CollateralFixtureContext { + staticWrapper: MockStaticATokenV3LM + baseToken: IERC20Metadata +} + +/* + Define deployment functions +*/ + +type CollateralParams = Parameters[0] & { + revenueHiding?: BigNumberish +} + +type AltParams = { + testName: string + aavePool: string + aaveIncentivesController: string + aToken: string + whaleTokenHolder: string + forkBlock: number + targetNetwork: 'mainnet' | 'base' +} + +export const makeTests = (defaultCollateralOpts: CollateralParams, altParams: AltParams) => { + const deployCollateral = async (opts: Partial = {}) => { + const combinedOpts = { ...defaultCollateralOpts, ...opts } + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + + if (!combinedOpts.erc20 || combinedOpts.erc20 === '') { + const V3LMFactory = await ethers.getContractFactory('MockStaticATokenV3LM') + const staticWrapper = await V3LMFactory.deploy( + altParams.aavePool, + altParams.aaveIncentivesController + ) + await staticWrapper.deployed() + await staticWrapper.initialize(altParams.aToken, 'Static Token', 'saToken') // doesn't really matter. + + combinedOpts.erc20 = staticWrapper.address + } + + const collateral = await CollateralFactory.deploy( + combinedOpts, + opts.revenueHiding ?? fp('0'), // change this to test with revenueHiding + { + gasLimit: 30000000, + } + ) + await collateral.deployed() + + // Push forward chainlink feed + await pushOracleForward(combinedOpts.chainlinkFeed!) + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + // our tools really suck don't they + return collateral as unknown as TestICollateral + } + + type Fixture = () => Promise + + const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts = {} + ): Fixture => { + const collateralOpts = { ...defaultCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = await ethers.getContractFactory('MockV3Aggregator') + const chainlinkFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const collateral = await deployCollateral({ + ...collateralOpts, + chainlinkFeed: chainlinkFeed.address, + }) + + const staticWrapper = await ethers.getContractAt( + 'MockStaticATokenV3LM', + await collateral.erc20() + ) + + return { + collateral, + staticWrapper, + chainlinkFeed, + tok: await ethers.getContractAt('IERC20Metadata', await collateral.erc20()), + baseToken: await ethers.getContractAt('IERC20Metadata', await staticWrapper.asset()), + } + } + + return makeCollateralFixtureContext + } + + /* + Define helper functions + */ + + const mintCollateralTo: MintCollateralFunc = async ( + ctx: AaveV3FiatCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string + ) => { + const requiredCollat = await ctx.staticWrapper.previewMint(amount) + + // Impersonate holder + await whileImpersonating(altParams.whaleTokenHolder, async (signer) => { + await ctx.baseToken + .connect(signer) + .approve(ctx.staticWrapper.address, ethers.constants.MaxUint256) + await ctx.staticWrapper + .connect(signer) + ['deposit(uint256,address,uint16,bool)'](requiredCollat, recipient, 0, true) + }) + } + + const modifyRefPerTok = async (ctx: AaveV3FiatCollateralFixtureContext, changeFactor = 100) => { + const staticWrapper = ctx.staticWrapper + const currentRate = await staticWrapper.rate() + + await staticWrapper.mockSetCustomRate(currentRate.mul(changeFactor).div(100)) + } + + const reduceRefPerTok = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctDecrease: BigNumberish + ) => { + await modifyRefPerTok(ctx, 100 - Number(pctDecrease.toString())) + } + + const increaseRefPerTok = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctIncrease: BigNumberish + ) => { + await modifyRefPerTok(ctx, 100 + Number(pctIncrease.toString())) + } + + const getExpectedPrice = async (ctx: AaveV3FiatCollateralFixtureContext): Promise => { + const initRefPerTok = await ctx.collateral.refPerTok() + const decimals = await ctx.chainlinkFeed.decimals() + + const initData = await ctx.chainlinkFeed.latestRoundData() + return initData.answer + .mul(bn(10).pow(18 - decimals)) + .mul(initRefPerTok) + .div(fp('1')) + } + + const reduceTargetPerRef = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctDecrease: BigNumberish + ) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.sub(lastRound.answer.mul(pctDecrease).div(100)) + + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + const increaseTargetPerRef = async ( + ctx: AaveV3FiatCollateralFixtureContext, + pctIncrease: BigNumberish + ) => { + const lastRound = await ctx.chainlinkFeed.latestRoundData() + const nextAnswer = lastRound.answer.add(lastRound.answer.mul(pctIncrease).div(100)) + + await ctx.chainlinkFeed.updateAnswer(nextAnswer) + } + + /* + Run the test suite + */ + + const stableOpts = { + deployCollateral, + collateralSpecificConstructorTests: noop, + collateralSpecificStatusTests: noop, + beforeEachRewardsTest: noop, + makeCollateralFixtureContext, + mintCollateralTo, + reduceRefPerTok, + increaseRefPerTok, + resetFork: getResetFork(altParams.forkBlock), + collateralName: `Aave V3 Fiat Collateral (${altParams.testName})`, + reduceTargetPerRef, + increaseTargetPerRef, + itClaimsRewards: it.skip, // untested: very complicated to get Aave to handout rewards, and none are live currently. + // The StaticATokenV3LM contract is formally verified and the function we added for claimRewards() is pretty obviously correct. + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itHasRevenueHiding: it, + itChecksNonZeroDefaultThreshold: it, + itIsPricedByPeg: true, + chainlinkDefaultAnswer: 1e8, + itChecksPriceChanges: it, + getExpectedPrice, + toleranceDivisor: bn('1e9'), // 1e15 adjusted for ((x + 1)/x) timestamp precision + targetNetwork: altParams.targetNetwork, + } + + return collateralTests(stableOpts) +} diff --git a/test/plugins/individual-collateral/aave-v3/constants.ts b/test/plugins/individual-collateral/aave-v3/constants.ts deleted file mode 100644 index 0de2aef4f6..0000000000 --- a/test/plugins/individual-collateral/aave-v3/constants.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { networkConfig } from '../../../../common/configuration' -import { useEnv } from '#/utils/env' - -export const forkNetwork = useEnv('FORK_NETWORK') ?? 'mainnet' -let chainId - -switch (forkNetwork) { - case 'mainnet': - chainId = '1' - break - case 'base': - chainId = '8453' - break - default: - chainId = '1' - break -} - -const aUSDC_NAME = chainId == '8453' ? 'aBasUSDbC' : 'aEthUSDC' - -export const AUSDC_V3 = networkConfig[chainId].tokens[aUSDC_NAME]! -export const USDC_USD_PRICE_FEED = networkConfig[chainId].chainlinkFeeds['USDC']! // currently same key for USDC and USDbC - -export const USDC_HOLDER = - chainId == '8453' - ? '0x4c80E24119CFB836cdF0a6b53dc23F04F7e652CA' - : '0x0A59649758aa4d66E25f08Dd01271e891fe52199' - -export const AAVE_V3_USDC_POOL = networkConfig[chainId].AAVE_V3_POOL! -export const AAVE_V3_INCENTIVES_CONTROLLER = networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! - -export const FORK_BLOCK = chainId == '8453' ? 4446300 : 18000000 diff --git a/test/plugins/individual-collateral/aave-v3/helpers.ts b/test/plugins/individual-collateral/aave-v3/helpers.ts deleted file mode 100644 index c6c430bc8a..0000000000 --- a/test/plugins/individual-collateral/aave-v3/helpers.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { getResetFork } from '../helpers' -import { FORK_BLOCK } from './constants' - -export const resetFork = getResetFork(FORK_BLOCK) From 8639c8c4e9be9949bfc6dce7b68c44722f720d33 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 23 Feb 2024 16:27:56 -0500 Subject: [PATCH 224/450] deploy + init facade --- .../mainnet-3.3.0/1-tmp-deployments.json | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json diff --git a/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json b/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json new file mode 100644 index 0000000000..fe1fcc889e --- /dev/null +++ b/scripts/addresses/mainnet-3.3.0/1-tmp-deployments.json @@ -0,0 +1,37 @@ +{ + "prerequisites": { + "RSR": "0x320623b8e4ff03373931769a31fc52a4e78b5d70", + "RSR_FEED": "0x759bBC1be8F90eE6457C44abc7d443842a976d02", + "GNOSIS_EASY_AUCTION": "0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101" + }, + "tradingLib": "", + "basketLib": "", + "facadeWriteLib": "", + "facadeWrite": "", + "facade": "0x2C7ca56342177343A2954C250702Fd464f4d0613", + "facets": { + "actFacet": "0xCAB3D3d0d5544145A6BCB47e58F61368BCcAe2dB", + "readFacet": "0x823110a13eB26cB09c4Bb118DBfE4ff5f96D5526" + }, + "deployer": "", + "rsrAsset": "", + "implementations": { + "main": "", + "trading": { + "gnosisTrade": "", + "dutchTrade": "" + }, + "components": { + "assetRegistry": "", + "backingManager": "", + "basketHandler": "", + "broker": "", + "distributor": "", + "furnace": "", + "rsrTrader": "", + "rTokenTrader": "", + "rToken": "", + "stRSR": "" + } + } +} \ No newline at end of file From 2e08fa110df6c73fae30f343154178e2c4417234 Mon Sep 17 00:00:00 2001 From: Taylor Brent Date: Fri, 23 Feb 2024 21:36:56 -0500 Subject: [PATCH 225/450] pyUSD deployment scripts (#1080) Co-authored-by: Akshat Mittal --- CHANGELOG.md | 5 +- common/configuration.ts | 130 ++---------------- scripts/deploy.ts | 3 +- ...ve_v3_usdbc.ts => deploy_aave_v3_pyusd.ts} | 53 +++---- .../collaterals/deploy_aave_v3_usdc.ts | 110 ++++++++------- .../verify_aave_v3_usdbc.ts | 71 ---------- .../collateral-plugins/verify_aave_v3_usdc.ts | 39 +++--- scripts/verify_etherscan.ts | 2 +- test/integration/fork-block-numbers.ts | 2 +- .../aave-v3/AaveV3FiatCollateral.test.ts | 35 +++-- .../aave-v3/constants.ts | 13 ++ 11 files changed, 149 insertions(+), 314 deletions(-) rename scripts/deployment/phase2-assets/collaterals/{deploy_aave_v3_usdbc.ts => deploy_aave_v3_pyusd.ts} (66%) delete mode 100644 scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts create mode 100644 test/plugins/individual-collateral/aave-v3/constants.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 8c49254397..72612319be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ This release improves how collateral plugins price LP tokens and moves reward cl Swapout all collateral plugins with appreciation. -All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be traded out for the raw underlying CToken. +All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be traded out for the raw underlying CToken, as well as aave-v3 USDC/USDCbC for canonical wrappers. ### Core Protocol Contracts @@ -19,6 +19,9 @@ All collateral plugins should be upgraded. The compound-v2 ERC20 wrapper will be ### Assets +- aave-v3 + - On mainnet: switch from one-off USDC wrapper to canonical USDC wrapper + - On base: switch from one-off USDbC wrapper to canonical USDC wrapper - compound-v2 - Remove `CTokenWrapper` - Add reward claiming logic to `claimRewards()` diff --git a/common/configuration.ts b/common/configuration.ts index 1a11724316..17fb6521ce 100644 --- a/common/configuration.ts +++ b/common/configuration.ts @@ -28,7 +28,9 @@ export interface ITokens { aWBTC?: string aCRV?: string aEthUSDC?: string + saEthUSDC?: string aBasUSDC?: string + saBasUSDC?: string aWETHv3?: string acbETHv3?: string cDAI?: string @@ -76,6 +78,7 @@ export interface ITokens { pyUSD?: string aEthPyUSD?: string + saEthPyUSD?: string // Morpho Aave maUSDC?: string @@ -138,117 +141,6 @@ export const networkConfig: { [key: string]: INetworkConfig } = { tokens: {}, chainlinkFeeds: {}, }, - // Config used for Mainnet forking -- Mirrors mainnet - '31337': { - name: 'localhost', - tokens: { - DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', - USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', - USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', - BUSD: '0x4Fabb145d64652a948d72533023f6E7A623C7C53', - USDP: '0x8E870D67F660D95d5be530380D0eC0bd388289E1', - TUSD: '0x0000000000085d4780B73119b644AE5ecd22b376', - sUSD: '0x57Ab1ec28D129707052df4dF418D58a2D46d5f51', - FRAX: '0x853d955aCEf822Db058eb8505911ED77F175b99e', - MIM: '0x99d8a9c45b2eca8864373a26d1459e3dff1e17f3', - crvUSD: '0xf939E0A03FB07F59A73314E73794Be0E57ac1b4E', - eUSD: '0xA0d69E286B938e21CBf7E51D71F6A4c8918f482F', - aDAI: '0x028171bCA77440897B824Ca71D1c56caC55b68A3', - aUSDC: '0xBcca60bB61934080951369a648Fb03DF4F96263C', - aUSDT: '0x3Ed3B47Dd13EC9a98b44e6204A523E766B225811', - aBUSD: '0xA361718326c15715591c299427c62086F69923D9', - aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', - aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', - aWBTC: '0x9ff58f4ffb29fa2266ab25e75e2a8b3503311656', - aCRV: '0x8dae6cb04688c62d939ed9b68d32bc62e49970b1', - aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', - cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', - cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', - cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', - cUSDP: '0x041171993284df560249B57358F931D9eB7b925D', - cETH: '0x4Ddc2D193948926D02f9B1fE9e1daa0718270ED5', - cWBTC: '0xccF4429DB6322D5C611ee964527D42E5d685DD6a', - fUSDC: '0x465a5a630482f3abD6d3b84B39B29b07214d19e5', - fUSDT: '0x81994b9607e06ab3d5cF3AffF9a67374f05F27d7', - fFRAX: '0x1C9A2d6b33B4826757273D47ebEe0e2DddcD978B', - fDAI: '0xe2bA8693cE7474900A045757fe0efCa900F6530b', - AAVE: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9', - stkAAVE: '0x4da27a545c0c5B758a6BA100e3a049001de870f5', - COMP: '0xc00e94Cb662C3520282E6f5717214004A7f26888', - WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', - WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', - EURT: '0xC581b735A1688071A1746c968e0798D642EDE491', - RSR: '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', - CRV: '0xD533a949740bb3306d119CC777fa900bA034cd52', - CVX: '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B', - ankrETH: '0xE95A203B1a91a908F9B9CE46459d101078c2c3cb', - frxETH: '0x5E8422345238F34275888049021821E8E08CAa1f', - sfrxETH: '0xac3E018457B222d93114458476f3E3416Abbe38F', - stETH: '0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84', - wstETH: '0x7f39C581F595B53c5cb19bD0b3f8dA6c935E2Ca0', - rETH: '0xae78736Cd615f374D3085123A210448E74Fc6393', - cUSDCv3: '0xc3d688B66703497DAA19211EEdff47f25384cdc3', - ONDO: '0xfAbA6f8e4a5E8Ab82F62fe7C39859FA577269BE3', - sFRAX: '0xA663B02CF0a4b149d2aD41910CB81e23e1c41c32', - sDAI: '0x83f20f44975d03b1b09e64809b757c47f942beea', - cbETH: '0xBe9895146f7AF43049ca1c1AE358B0541Ea49704', - STG: '0xAf5191B0De278C7286d6C7CC6ab6BB8A73bA2Cd6', - sUSDC: '0xdf0770dF86a8034b3EFEf0A1Bb3c889B8332FF56', - sUSDT: '0x38EA452219524Bb87e18dE1C24D3bB59510BD783', - sETH: '0x101816545F6bd2b1076434B54383a1E633390A2E', - MORPHO: '0x9994e35db50125e0df82e4c2dde62496ce330999', - astETH: '0x1982b2F5814301d4e9a8b0201555376e62F82428', - yvCurveUSDPcrvUSD: '0xF56fB6cc29F0666BDD1662FEaAE2A3C935ee3469', - yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', - }, - chainlinkFeeds: { - RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', - AAVE: '0x547a514d5e3769680Ce22B2361c10Ea13619e8a9', - COMP: '0xdbd020CAeF83eFd542f4De03e3cF0C28A4428bd5', - DAI: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9', - USDC: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6', - USDT: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D', - BUSD: '0x833D8Eb16D306ed1FbB5D7A2E019e106B960965A', - USDP: '0x09023c0DA49Aaf8fc3fA3ADF34C6A7016D38D5e3', - TUSD: '0xec746eCF986E2927Abd291a2A1716c940100f8Ba', - sUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', - FRAX: '0xB9E1E3A9feFf48998E45Fa90847ed4D467E8BcfD', - MIM: '0x7A364e8770418566e3eb2001A96116E6138Eb32F', - crvUSD: '0xEEf0C605546958c1f899b6fB336C20671f9cD49F', - ETH: '0x5f4ec3df9cbd43714fe2740f5e3616155c5b8419', - WBTC: '0xfdFD9C85aD200c506Cf9e21F1FD8dd01932FBB23', - BTC: '0xF4030086522a5bEEa4988F8cA5B36dbC97BeE88c', - EURT: '0x01D391A48f4F7339aC64CA2c83a07C22F95F587a', - EUR: '0xb49f677943BC038e9857d61E7d053CaA2C1734C1', - CVX: '0xd962fC30A72A84cE50161031391756Bf2876Af5D', - CRV: '0xCd627aA160A6fA45Eb793D19Ef54f5062F20f33f', - stETHETH: '0x86392dc19c0b719886221c78ab11eb8cf5c52812', // stETH/ETH - stETHUSD: '0xCfE54B5cD566aB89272946F602D76Ea879CAb4a8', // stETH/USD - rETH: '0x536218f9E9Eb48863970252233c8F271f554C2d0', // rETH/ETH - cbETH: '0xf017fcb346a1885194689ba23eff2fe6fa5c483b', // cbETH/ETH - frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH - }, - AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', - AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', - AAVE_EMISSIONS_MGR: '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5', - AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', - AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', - FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', - COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', - GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', - EASY_AUCTION_OWNER: '0x0da0c3e52c977ed3cbc641ff02dd271c3ed55afe', - MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', - MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', - MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', - COMET_REWARDS: '0x1B0e765F6224C21223AeA2af16c1C46E38885a40', - COMET_CONFIGURATOR: '0x316f9708bB98af7dA9c68C1C3b5e79039cD336E3', - COMET_PROXY_ADMIN: '0x1EC63B5883C3481134FD50D5DAebc83Ecd2E8779', - COMET_EXT: '0x285617313887d43256F852cAE0Ee4de4b68D45B0', - AAVE_V3_POOL: '0x87870Bca3F3fD6335C3F4ce8392D69350B4fA4E2', - AAVE_V3_INCENTIVES_CONTROLLER: '0x8164Cc65827dcFe994AB23944CBC90e0aa80bFcb', - STARGATE_STAKING_CONTRACT: '0xB0D502E938ed5f4df2E681fE6E419ff29631d62b', - CURVE_POOL_WETH_FRXETH: '0x9c3b46c0ceb5b9e304fcd6d88fc50f7dd24b31bc', - }, '1': { name: 'mainnet', tokens: { @@ -270,6 +162,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aUSDP: '0x2e8F4bdbE3d47d7d7DE490437AeA9915D930F1A3', aWETH: '0x030bA81f1c18d280636F32af80b9AAd02Cf0854e', aEthUSDC: '0x98c23e9d8f34fefb1b7bd6a91b7ff122f4e16f5c', + saEthUSDC: '0x73edDFa87C71ADdC275c2b9890f5c3a8480bC9E6', // canonical wrapper cDAI: '0x5d3a536E4D6DbD6114cc1Ead35777bAB948E3643', cUSDC: '0x39AA39c021dfbaE8faC545936693aC917d5E7563', cUSDT: '0xf650C3d88D12dB855b8bf7D11Be6C55A4e07dCC9', @@ -288,7 +181,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { aCRV: '0x8dae6cb04688c62d939ed9b68d32bc62e49970b1', WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', EURT: '0xC581b735A1688071A1746c968e0798D642EDE491', - RSR: '0x320623b8e4ff03373931769a31fc52a4e78b5d70', + RSR: '0x320623b8E4fF03373931769A31Fc52A4E78B5d70', CRV: '0xD533a949740bb3306d119CC777fa900bA034cd52', CVX: '0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B', ankrETH: '0xE95A203B1a91a908F9B9CE46459d101078c2c3cb', @@ -312,6 +205,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { yvCurveUSDCcrvUSD: '0x7cA00559B978CFde81297849be6151d3ccB408A9', pyUSD: '0x6c3ea9036406852006290770bedfcaba0e23a0e8', aEthPyUSD: '0x0C0d01AbF3e6aDfcA0989eBbA9d6e85dD58EaB1E', + saEthPyUSD: '0x00F2a835758B33f3aC53516Ebd69f3dc77B0D152', // canonical wrapper }, chainlinkFeeds: { RSR: '0x759bBC1be8F90eE6457C44abc7d443842a976d02', @@ -341,12 +235,15 @@ export const networkConfig: { [key: string]: INetworkConfig } = { frxETH: '0xc58f3385fbc1c8ad2c0c9a061d7c13b141d7a5df', // frxETH/ETH pyUSD: '0x8f1dF6D7F2db73eECE86a18b4381F4707b918FB1', }, + AAVE_INCENTIVES: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', + AAVE_EMISSIONS_MGR: '0xEE56e2B3D491590B5b31738cC34d5232F378a8D5', AAVE_LENDING_POOL: '0x7d2768dE32b0b80b7a3454c06BdAc94A69DDc7A9', AAVE_RESERVE_TREASURY: '0x464C71f6c2F760DdA6093dCB91C24c39e5d6e18c', AAVE_DATA_PROVIDER: '0x057835Ad21a177dbdd3090bB1CAE03EaCF78Fc6d', FLUX_FINANCE_COMPTROLLER: '0x95Af143a021DF745bc78e845b54591C53a8B3A51', COMPTROLLER: '0x3d9819210A31b4961b30EF54bE2aeD79B9c9Cd3B', GNOSIS_EASY_AUCTION: '0x0b7fFc1f4AD541A4Ed16b40D8c37f0929158D101', + EASY_AUCTION_OWNER: '0x0da0c3e52c977ed3cbc641ff02dd271c3ed55afe', MORPHO_AAVE_LENS: '0x507fA343d0A90786d86C7cd885f5C49263A91FF4', MORPHO_AAVE_CONTROLLER: '0x777777c9898D384F785Ee44Acfe945efDFf5f3E0', MORPHO_REWARDS_DISTRIBUTOR: '0x3b14e5c73e0a56d607a8688098326fd4b4292135', @@ -559,6 +456,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { cbETH: '0x2ae3f1ec7f1f5012cfeab0185bfc7aa3cf0dec22', cUSDbCv3: '0x9c4ec768c28520B50860ea7a15bd7213a9fF58bf', aBasUSDC: '0x4e65fE4DbA92790696d040ac24Aa414708F5c0AB', + saBasUSDC: '0x4EA71A20e655794051D1eE8b6e4A3269B13ccaCc', // canonical wrapper aWETHv3: '0xD4a0e0b9149BCee3C920d2E00b5dE09138fd8bb7', acbETHv3: '0xcf3D55c10DB69f28fD1A75Bd73f3D8A2d9c595ad', sUSDbC: '0x4c80e24119cfb836cdf0a6b53dc23f04f7e652ca', @@ -591,13 +489,7 @@ export const networkConfig: { [key: string]: INetworkConfig } = { STARGATE_STAKING_CONTRACT: '0x06Eb48763f117c7Be887296CDcdfad2E4092739C', }, } - -export const getNetworkConfig = (chainId: string) => { - if (!networkConfig[chainId]) { - throw new Error(`Configuration for network ${chainId} not available`) - } - return networkConfig[chainId] -} +networkConfig['31337'] = networkConfig['1'] export const developmentChains = ['hardhat', 'localhost'] diff --git a/scripts/deploy.ts b/scripts/deploy.ts index a469020c97..8153e175a4 100644 --- a/scripts/deploy.ts +++ b/scripts/deploy.ts @@ -67,6 +67,7 @@ async function main() { 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_morpho_aavev2_plugin.ts', 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', + 'phase2-assets/collaterals/deploy_aave_v3_pyusd.ts', 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdc.ts', 'phase2-assets/collaterals/deploy_yearn_v2_curve_usdp.ts', 'phase2-assets/collaterals/deploy_sfrax.ts' @@ -79,7 +80,7 @@ async function main() { 'phase2-assets/2_deploy_collateral.ts', 'phase2-assets/collaterals/deploy_cbeth_collateral.ts', 'phase2-assets/collaterals/deploy_ctokenv3_usdbc_collateral.ts', - 'phase2-assets/collaterals/deploy_aave_v3_usdbc.ts', + 'phase2-assets/collaterals/deploy_aave_v3_usdc.ts', 'phase2-assets/collaterals/deploy_stargate_usdc_collateral.ts', 'phase2-assets/assets/deploy_stg.ts' ) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts similarity index 66% rename from scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts rename to scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts index f930201a21..c78f0f6681 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdbc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_pyusd.ts @@ -14,8 +14,13 @@ import { import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' import { priceTimeout, revenueHiding } from '../../utils' +import { + PYUSD_MAX_TRADE_VOLUME, + PYUSD_ORACLE_TIMEOUT, + PYUSD_ORACLE_ERROR, +} from '../../../../test/plugins/individual-collateral/aave-v3/constants' -// This file specifically deploys Aave V3 USDC collateral +// This file specifically deploys Aave V3 pyUSD collateral on Mainnet async function main() { // ==== Read Configuration ==== @@ -30,9 +35,9 @@ async function main() { throw new Error(`Missing network configuration for ${hre.network.name}`) } - // Only exists on Base L2 - if (!baseL2Chains.includes(hre.network.name)) { - throw new Error(`Invalid network ${hre.network.name} - only available on Base`) + // Only exists on Mainnet + if (baseL2Chains.includes(hre.network.name)) { + throw new Error(`Invalid network ${hre.network.name} - only available on Mainnet`) } // Get phase1 deployment @@ -47,54 +52,32 @@ async function main() { const deployedCollateral: string[] = [] - /******** Deploy Aave V3 USDbC wrapper **************************/ - - const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') - const erc20 = await StaticATokenFactory.deploy( - networkConfig[chainId].AAVE_V3_POOL!, - networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! - ) - await erc20.deployed() - await ( - await erc20.initialize( - networkConfig[chainId].tokens.aBasUSDbC!, - 'Static Aave Base USDbC', - 'saBasUSDbC' - ) - ).wait() - - console.log( - `Deployed wrapper for Aave V3 USDbC on ${hre.network.name} (${chainId}): ${erc20.address} ` - ) - - /******** Deploy Aave V3 USDbC collateral plugin **************************/ + /******** Deploy Aave V3 pyUSD collateral plugin **************************/ const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') const collateral = await CollateralFactory.connect(deployer).deploy( { priceTimeout: priceTimeout, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: fp('0.003'), // 3% - erc20: erc20.address, - maxTradeVolume: fp('1e6'), - oracleTimeout: '86400', // 24 hr + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.pyUSD!, + oracleError: PYUSD_ORACLE_ERROR, + erc20: networkConfig[chainId].tokens.saEthPyUSD!, + maxTradeVolume: PYUSD_MAX_TRADE_VOLUME, + oracleTimeout: PYUSD_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.013'), + defaultThreshold: fp('0.01').add(PYUSD_ORACLE_ERROR), delayUntilDefault: bn('86400'), }, revenueHiding ) - await collateral.deployed() await (await collateral.refresh()).wait() expect(await collateral.status()).to.equal(CollateralStatus.SOUND) console.log( - `Deployed Aave V3 USDbC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + `Deployed Aave V3 pyUSD collateral to ${hre.network.name} (${chainId}): ${collateral.address}` ) - assetCollDeployments.collateral.aBasUSDbC = collateral.address - assetCollDeployments.erc20s.aBasUSDbC = erc20.address + assetCollDeployments.collateral.saEthPyUSD = collateral.address deployedCollateral.push(collateral.address.toString()) fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) diff --git a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts index 2d4eb8112d..7a9efc9b14 100644 --- a/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts +++ b/scripts/deployment/phase2-assets/collaterals/deploy_aave_v3_usdc.ts @@ -14,6 +14,14 @@ import { import { bn, fp } from '#/common/numbers' import { AaveV3FiatCollateral } from '../../../../typechain' import { priceTimeout, revenueHiding } from '../../utils' +import { + USDC_MAINNET_MAX_TRADE_VOLUME, + USDC_MAINNET_ORACLE_TIMEOUT, + USDC_MAINNET_ORACLE_ERROR, + USDC_BASE_MAX_TRADE_VOLUME, + USDC_BASE_ORACLE_TIMEOUT, + USDC_BASE_ORACLE_ERROR, +} from '../../../../test/plugins/individual-collateral/aave-v3/constants' // This file specifically deploys Aave V3 USDC collateral @@ -30,11 +38,6 @@ async function main() { throw new Error(`Missing network configuration for ${hre.network.name}`) } - // Only exists on Mainnet - if (baseL2Chains.includes(hre.network.name)) { - throw new Error(`Invalid network ${hre.network.name} - only available on Mainnet`) - } - // Get phase1 deployment const phase1File = getDeploymentFilename(chainId) if (!fileExists(phase1File)) { @@ -47,57 +50,62 @@ async function main() { const deployedCollateral: string[] = [] - /******** Deploy Aave V3 USDC wrapper **************************/ - - const StaticATokenFactory = await hre.ethers.getContractFactory('StaticATokenV3LM') - const erc20 = await StaticATokenFactory.deploy( - networkConfig[chainId].AAVE_V3_POOL!, - networkConfig[chainId].AAVE_V3_INCENTIVES_CONTROLLER! - ) - await erc20.deployed() - await ( - await erc20.initialize( - networkConfig[chainId].tokens.aEthUSDC!, - 'Static Aave Ethereum USDC', - 'saEthUSDC' + /******** Deploy Aave V3 USDC collateral plugin **************************/ + + const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') + + // Mainnet + if (!baseL2Chains.includes(hre.network.name)) { + const collateral = await CollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: USDC_MAINNET_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.saEthUSDC!, + maxTradeVolume: USDC_MAINNET_MAX_TRADE_VOLUME.toString(), + oracleTimeout: USDC_MAINNET_ORACLE_TIMEOUT.toString(), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(USDC_MAINNET_ORACLE_ERROR).toString(), + delayUntilDefault: bn('86400').toString(), + }, + revenueHiding.toString() ) - ).wait() + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - console.log( - `Deployed wrapper for Aave V3 USDC on ${hre.network.name} (${chainId}): ${erc20.address} ` - ) + console.log( + `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) - /******** Deploy Aave V3 USDC collateral plugin **************************/ - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + assetCollDeployments.collateral.saEthUSDC = collateral.address + deployedCollateral.push(collateral.address.toString()) + } else { + const collateral = await CollateralFactory.connect(deployer).deploy( + { + priceTimeout: priceTimeout, + chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, + oracleError: USDC_BASE_ORACLE_ERROR.toString(), + erc20: networkConfig[chainId].tokens.saBasUSDC!, + maxTradeVolume: USDC_BASE_MAX_TRADE_VOLUME.toString(), + oracleTimeout: USDC_BASE_ORACLE_TIMEOUT.toString(), + targetName: ethers.utils.formatBytes32String('USD'), + defaultThreshold: fp('0.01').add(USDC_BASE_ORACLE_ERROR).toString(), + delayUntilDefault: bn('86400').toString(), + }, + revenueHiding.toString() + ) + await collateral.deployed() + await (await collateral.refresh()).wait() + expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - const CollateralFactory = await ethers.getContractFactory('AaveV3FiatCollateral') - const collateral = await CollateralFactory.connect(deployer).deploy( - { - priceTimeout: priceTimeout, - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: usdcOracleError, - erc20: erc20.address, - maxTradeVolume: fp('1e6'), - oracleTimeout: usdcOracleTimeout, - targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.01').add(usdcOracleError), - delayUntilDefault: bn('86400'), - }, - revenueHiding - ) - await collateral.deployed() - await (await collateral.refresh()).wait() - expect(await collateral.status()).to.equal(CollateralStatus.SOUND) - - console.log( - `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` - ) - - assetCollDeployments.collateral.aEthUSDC = collateral.address - assetCollDeployments.erc20s.aEthUSDC = erc20.address - deployedCollateral.push(collateral.address.toString()) + console.log( + `Deployed Aave V3 USDC collateral to ${hre.network.name} (${chainId}): ${collateral.address}` + ) + assetCollDeployments.collateral.saBasUSDC = collateral.address + deployedCollateral.push(collateral.address.toString()) + } fs.writeFileSync(assetCollDeploymentFilename, JSON.stringify(assetCollDeployments, null, 2)) console.log(`Deployed collateral to ${hre.network.name} (${chainId}) diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts deleted file mode 100644 index 3a373573dc..0000000000 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdbc.ts +++ /dev/null @@ -1,71 +0,0 @@ -import hre, { ethers } from 'hardhat' -import { getChainId } from '../../../common/blockchain-utils' -import { baseL2Chains, developmentChains, networkConfig } from '../../../common/configuration' -import { - getDeploymentFile, - getAssetCollDeploymentFilename, - IAssetCollDeployments, -} from '../../deployment/common' -import { fp, bn } from '../../../common/numbers' -import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' - -let deployments: IAssetCollDeployments - -async function main() { - // ********** Read config ********** - const chainId = await getChainId(hre) - if (!networkConfig[chainId]) { - throw new Error(`Missing network configuration for ${hre.network.name}`) - } - - if (developmentChains.includes(hre.network.name)) { - throw new Error(`Cannot verify contracts for development chain ${hre.network.name}`) - } - - // Only exists on Base L2 - if (!baseL2Chains.includes(hre.network.name)) { - throw new Error(`Invalid network ${hre.network.name} - only available on Base`) - } - - const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) - deployments = getDeploymentFile(assetCollDeploymentFilename) - - /******** Verify Wrapper **************************/ - const erc20 = await ethers.getContractAt( - 'StaticATokenV3LM', - deployments.erc20s.aBasUSDbC as string - ) - - await verifyContract( - chainId, - deployments.erc20s.aBasUSDbC, - [await erc20.POOL(), await erc20.INCENTIVES_CONTROLLER()], - 'contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol:StaticATokenV3LM' - ) - - /******** Verify Aave V3 USDbC plugin **************************/ - await verifyContract( - chainId, - deployments.collateral.aBasUSDbC, - [ - { - erc20: erc20.address, - targetName: ethers.utils.formatBytes32String('USD'), - priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: fp('0.003').toString(), // 3% - oracleTimeout: '86400', // 24 hr - maxTradeVolume: fp('1e6').toString(), - defaultThreshold: fp('0.013').toString(), - delayUntilDefault: bn('86400').toString(), - }, - revenueHiding.toString(), - ], - 'contracts/plugins/assets/aave-v3/AaveV3FiatCollateral.sol:AaveV3FiatCollateral' - ) -} - -main().catch((error) => { - console.error(error) - process.exitCode = 1 -}) diff --git a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts index 3ffce9a0a5..8076f727f4 100644 --- a/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts +++ b/scripts/verification/collateral-plugins/verify_aave_v3_usdc.ts @@ -6,7 +6,7 @@ import { getAssetCollDeploymentFilename, IAssetCollDeployments, } from '../../deployment/common' -import { fp, bn } from '../../../common/numbers' +import { fp } from '../../../common/numbers' import { priceTimeout, verifyContract, revenueHiding } from '../../deployment/utils' let deployments: IAssetCollDeployments @@ -25,37 +25,32 @@ async function main() { const assetCollDeploymentFilename = getAssetCollDeploymentFilename(chainId) deployments = getDeploymentFile(assetCollDeploymentFilename) - /******** Verify Wrapper **************************/ - const erc20 = await ethers.getContractAt( - 'StaticATokenV3LM', - deployments.erc20s.aEthUSDC as string - ) - - await verifyContract( - chainId, - deployments.erc20s.aEthUSDC, - [await erc20.POOL(), await erc20.INCENTIVES_CONTROLLER()], - 'contracts/plugins/assets/aave-v3/vendor/StaticATokenV3LM.sol:StaticATokenV3LM' + const collateral = await ethers.getContractAt( + 'AaveV3FiatCollateral', + baseL2Chains.includes(hre.network.name) + ? deployments.collateral.saBasUSDC! + : deployments.collateral.saEthUSDC! ) /******** Verify Aave V3 USDC plugin **************************/ - const usdcOracleTimeout = '86400' // 24 hr - const usdcOracleError = baseL2Chains.includes(hre.network.name) ? fp('0.003') : fp('0.0025') // 0.3% (Base) or 0.25% + // Works for both Mainnet and Base await verifyContract( chainId, - deployments.collateral.aEthUSDC, + collateral.address, [ { - erc20: erc20.address, + erc20: await collateral.erc20(), targetName: ethers.utils.formatBytes32String('USD'), priceTimeout: priceTimeout.toString(), - chainlinkFeed: networkConfig[chainId].chainlinkFeeds.USDC!, - oracleError: usdcOracleError.toString(), - oracleTimeout: usdcOracleTimeout, // 24 hr - maxTradeVolume: fp('1e6').toString(), - defaultThreshold: fp('0.01').add(usdcOracleError).toString(), - delayUntilDefault: bn('86400').toString(), + chainlinkFeed: await collateral.chainlinkFeed(), + oracleError: await collateral.oracleError(), + oracleTimeout: await collateral.oracleTimeout(), + maxTradeVolume: await collateral.maxTradeVolume(), + defaultThreshold: fp('0.01') + .add(await collateral.oracleError()) + .toString(), + delayUntilDefault: await collateral.delayUntilDefault(), }, revenueHiding.toString(), ], diff --git a/scripts/verify_etherscan.ts b/scripts/verify_etherscan.ts index dd200b6248..2cbb12b754 100644 --- a/scripts/verify_etherscan.ts +++ b/scripts/verify_etherscan.ts @@ -71,7 +71,7 @@ async function main() { scripts.push( 'collateral-plugins/verify_cbeth.ts', 'collateral-plugins/verify_cusdbcv3.ts', - 'collateral-plugins/verify_aave_v3_usdbc', + 'collateral-plugins/verify_aave_v3_usdc.ts', 'collateral-plugins/verify_stargate_usdc', 'assets/verify_stg.ts' ) diff --git a/test/integration/fork-block-numbers.ts b/test/integration/fork-block-numbers.ts index f5b5dff068..0a5c8a0c73 100644 --- a/test/integration/fork-block-numbers.ts +++ b/test/integration/fork-block-numbers.ts @@ -6,7 +6,7 @@ const forkBlockNumber = { 'flux-finance': 16836855, // Ethereum 'mainnet-2.0': 17522362, // Ethereum 'facade-monitor': 18742016, // Ethereum - default: 18522901, // Ethereum + default: 19275770, // Ethereum } export default forkBlockNumber diff --git a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts index 32a390c9ec..6e1df0f318 100644 --- a/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts +++ b/test/plugins/individual-collateral/aave-v3/AaveV3FiatCollateral.test.ts @@ -3,6 +3,17 @@ import { bn, fp } from '#/common/numbers' import { PRICE_TIMEOUT } from '#/test/fixtures' import { makeTests } from './common' import { networkConfig } from '#/common/configuration' +import { + PYUSD_MAX_TRADE_VOLUME, + PYUSD_ORACLE_TIMEOUT, + PYUSD_ORACLE_ERROR, + USDC_MAINNET_MAX_TRADE_VOLUME, + USDC_MAINNET_ORACLE_TIMEOUT, + USDC_MAINNET_ORACLE_ERROR, + USDC_BASE_MAX_TRADE_VOLUME, + USDC_BASE_ORACLE_TIMEOUT, + USDC_BASE_ORACLE_ERROR, +} from './constants' /* ** Static AToken Factory for Aave V3 @@ -17,12 +28,12 @@ makeTests( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: networkConfig[1].chainlinkFeeds['USDC']!, - oracleError: fp('0.0025'), + oracleError: USDC_MAINNET_ORACLE_ERROR, erc20: '', // to be set - maxTradeVolume: fp('1e6'), - oracleTimeout: bn('86400'), + maxTradeVolume: USDC_MAINNET_MAX_TRADE_VOLUME, + oracleTimeout: USDC_MAINNET_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125'), + defaultThreshold: fp('0.01').add(USDC_MAINNET_ORACLE_TIMEOUT), delayUntilDefault: bn('86400'), }, { @@ -41,12 +52,12 @@ makeTests( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: networkConfig[8453].chainlinkFeeds['USDC']!, - oracleError: fp('0.003'), + oracleError: USDC_BASE_ORACLE_ERROR, erc20: '', // to be set - maxTradeVolume: fp('0.5e6'), - oracleTimeout: bn('86400'), + maxTradeVolume: USDC_BASE_MAX_TRADE_VOLUME, + oracleTimeout: USDC_BASE_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125'), + defaultThreshold: fp('0.01').add(USDC_BASE_ORACLE_TIMEOUT), delayUntilDefault: bn('86400'), }, { @@ -65,12 +76,12 @@ makeTests( { priceTimeout: PRICE_TIMEOUT, chainlinkFeed: networkConfig[1].chainlinkFeeds['pyUSD']!, - oracleError: fp('0.003'), + oracleError: PYUSD_ORACLE_ERROR, erc20: '', // to be set - maxTradeVolume: fp('0.5e6'), - oracleTimeout: bn('86400'), + maxTradeVolume: PYUSD_MAX_TRADE_VOLUME, + oracleTimeout: PYUSD_ORACLE_TIMEOUT, targetName: ethers.utils.formatBytes32String('USD'), - defaultThreshold: fp('0.0125'), + defaultThreshold: fp('0.01').add(PYUSD_ORACLE_ERROR), delayUntilDefault: bn('86400'), }, { diff --git a/test/plugins/individual-collateral/aave-v3/constants.ts b/test/plugins/individual-collateral/aave-v3/constants.ts new file mode 100644 index 0000000000..00fcaea36f --- /dev/null +++ b/test/plugins/individual-collateral/aave-v3/constants.ts @@ -0,0 +1,13 @@ +import { bn, fp } from '#/common/numbers' + +export const PYUSD_MAX_TRADE_VOLUME = fp('0.5e6') +export const PYUSD_ORACLE_TIMEOUT = bn('86400') +export const PYUSD_ORACLE_ERROR = fp('0.003') + +export const USDC_MAINNET_MAX_TRADE_VOLUME = fp('1e6') +export const USDC_MAINNET_ORACLE_TIMEOUT = bn('86400') +export const USDC_MAINNET_ORACLE_ERROR = fp('0.0025') + +export const USDC_BASE_MAX_TRADE_VOLUME = fp('0.5e6') +export const USDC_BASE_ORACLE_TIMEOUT = bn('86400') +export const USDC_BASE_ORACLE_ERROR = fp('0.003') From 9339fcb08526dd38770700e3f52e436a9298b971 Mon Sep 17 00:00:00 2001 From: Akshat Mittal Date: Mon, 26 Feb 2024 22:03:51 +0530 Subject: [PATCH 226/450] Convex crvUSD/USDC (#1082) Co-authored-by: Taylor Brent --- .../individual-collateral/curve/constants.ts | 56 +++-- .../CvxStableTestSuite_crvUSD-USDC.test.ts | 221 ++++++++++++++++++ .../curve/cvx/helpers.ts | 4 +- 3 files changed, 257 insertions(+), 24 deletions(-) create mode 100644 test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts diff --git a/test/plugins/individual-collateral/curve/constants.ts b/test/plugins/individual-collateral/curve/constants.ts index 9e68a63d9e..d561340a90 100644 --- a/test/plugins/individual-collateral/curve/constants.ts +++ b/test/plugins/individual-collateral/curve/constants.ts @@ -4,63 +4,69 @@ import { networkConfig } from '../../../../common/configuration' // Mainnet Addresses // DAI -export const DAI_USD_FEED = networkConfig['1'].chainlinkFeeds.DAI as string +export const DAI_USD_FEED = networkConfig['1'].chainlinkFeeds.DAI! export const DAI_ORACLE_TIMEOUT = bn('86400') export const DAI_ORACLE_ERROR = fp('0.0025') // USDC -export const USDC_USD_FEED = networkConfig['1'].chainlinkFeeds.USDC as string +export const USDC_USD_FEED = networkConfig['1'].chainlinkFeeds.USDC! export const USDC_ORACLE_TIMEOUT = bn('86400') export const USDC_ORACLE_ERROR = fp('0.0025') // USDT -export const USDT_USD_FEED = networkConfig['1'].chainlinkFeeds.USDT as string +export const USDT_USD_FEED = networkConfig['1'].chainlinkFeeds.USDT! export const USDT_ORACLE_TIMEOUT = bn('86400') export const USDT_ORACLE_ERROR = fp('0.0025') // SUSD -export const SUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.sUSD as string +export const SUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.sUSD! export const SUSD_ORACLE_TIMEOUT = bn('86400') export const SUSD_ORACLE_ERROR = fp('0.0025') // FRAX -export const FRAX_USD_FEED = networkConfig['1'].chainlinkFeeds.FRAX as string +export const FRAX_USD_FEED = networkConfig['1'].chainlinkFeeds.FRAX! export const FRAX_ORACLE_TIMEOUT = bn('3600') export const FRAX_ORACLE_ERROR = fp('0.01') // WBTC -export const WBTC_BTC_FEED = networkConfig['1'].chainlinkFeeds.WBTC as string -export const BTC_USD_FEED = networkConfig['1'].chainlinkFeeds.BTC as string +export const WBTC_BTC_FEED = networkConfig['1'].chainlinkFeeds.WBTC! +export const BTC_USD_FEED = networkConfig['1'].chainlinkFeeds.BTC! export const WBTC_ORACLE_TIMEOUT = bn('86400') export const BTC_ORACLE_TIMEOUT = bn('3600') export const WBTC_BTC_ORACLE_ERROR = fp('0.02') export const BTC_USD_ORACLE_ERROR = fp('0.005') // WETH -export const WETH_USD_FEED = networkConfig['1'].chainlinkFeeds.ETH as string +export const WETH_USD_FEED = networkConfig['1'].chainlinkFeeds.ETH! export const WETH_ORACLE_TIMEOUT = bn('86400') export const WETH_ORACLE_ERROR = fp('0.005') // MIM -export const MIM_USD_FEED = networkConfig['1'].chainlinkFeeds.MIM as string +export const MIM_USD_FEED = networkConfig['1'].chainlinkFeeds.MIM! export const MIM_ORACLE_TIMEOUT = bn('86400') export const MIM_ORACLE_ERROR = fp('0.005') // 0.5% export const MIM_DEFAULT_THRESHOLD = fp('0.055') // 5.5% +// crvUSD +export const crvUSD_USD_FEED = networkConfig['1'].chainlinkFeeds.crvUSD! +export const crvUSD_ORACLE_TIMEOUT = bn('86400') +export const crvUSD_ORACLE_ERROR = fp('0.005') + // Tokens -export const DAI = networkConfig['1'].tokens.DAI as string -export const USDC = networkConfig['1'].tokens.USDC as string -export const USDT = networkConfig['1'].tokens.USDT as string -export const SUSD = networkConfig['1'].tokens.sUSD as string -export const FRAX = networkConfig['1'].tokens.FRAX as string -export const MIM = networkConfig['1'].tokens.MIM as string -export const eUSD = networkConfig['1'].tokens.eUSD as string -export const WETH = networkConfig['1'].tokens.WETH as string -export const WBTC = networkConfig['1'].tokens.WBTC as string - -export const RSR = networkConfig['1'].tokens.RSR as string -export const CRV = networkConfig['1'].tokens.CRV as string -export const CVX = networkConfig['1'].tokens.CVX as string +export const DAI = networkConfig['1'].tokens.DAI! +export const USDC = networkConfig['1'].tokens.USDC! +export const USDT = networkConfig['1'].tokens.USDT! +export const SUSD = networkConfig['1'].tokens.sUSD! +export const FRAX = networkConfig['1'].tokens.FRAX! +export const MIM = networkConfig['1'].tokens.MIM! +export const eUSD = networkConfig['1'].tokens.eUSD! +export const WETH = networkConfig['1'].tokens.WETH! +export const WBTC = networkConfig['1'].tokens.WBTC! +export const crvUSD = networkConfig['1'].tokens.crvUSD! + +export const RSR = networkConfig['1'].tokens.RSR! +export const CRV = networkConfig['1'].tokens.CRV! +export const CVX = networkConfig['1'].tokens.CVX! // 3pool - USDC, USDT, DAI export const THREE_POOL = '0xbebc44782c7db0a1a60cb6fe97d0b483032ff1c7' @@ -100,6 +106,12 @@ export const MIM_THREE_POOL_POOL_ID = 40 export const MIM_THREE_POOL_HOLDER = '0x66C90baCE2B68955C875FdA89Ba2c5A94e672440' export const MIM_THREE_POOL_GAUGE = '0xd8b712d29381748db89c36bca0138d7c75866ddf' +// crvUSD/USDC +export const crvUSD_USDC = '0x4dece678ceceb27446b35c672dc7d61f30bad69e' +export const crvUSD_USDC_POOL_ID = 182 +export const crvUSD_USDC_HOLDER = '0x95f00391cB5EebCd190EB58728B4CE23DbFa6ac1' +export const crvUSD_USDC_GAUGE = '0x95f00391cB5EebCd190EB58728B4CE23DbFa6ac1' + // Curve-specific export const CURVE_MINTER = '0xd061d61a4d941c39e5453435b6345dc261c2fce0' diff --git a/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts new file mode 100644 index 0000000000..d142c1ac7e --- /dev/null +++ b/test/plugins/individual-collateral/curve/cvx/CvxStableTestSuite_crvUSD-USDC.test.ts @@ -0,0 +1,221 @@ +import collateralTests from '../collateralTests' +import { + CurveCollateralFixtureContext, + CurveCollateralOpts, + MintCurveCollateralFunc, +} from '../pluginTestTypes' +import { mintWPool } from './helpers' +import { ethers } from 'hardhat' +import { ContractFactory, BigNumberish } from 'ethers' +import { + CurvePoolMock, + ERC20Mock, + MockV3Aggregator, + MockV3Aggregator__factory, + TestICollateral, +} from '../../../../../typechain' +import { bn } from '../../../../../common/numbers' +import { ZERO_ADDRESS } from '../../../../../common/constants' +import { expect } from 'chai' +import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers' +import { + PRICE_TIMEOUT, + CRV, + CVX, + USDC_USD_FEED, + USDC_ORACLE_TIMEOUT, + USDC_ORACLE_ERROR, + MAX_TRADE_VOL, + DEFAULT_THRESHOLD, + DELAY_UNTIL_DEFAULT, + CurvePoolType, + crvUSD_USD_FEED, + crvUSD_USDC, + crvUSD_ORACLE_TIMEOUT, + crvUSD_ORACLE_ERROR, + crvUSD_USDC_HOLDER, + crvUSD_USDC_POOL_ID, + USDC, + crvUSD, +} from '../constants' +import { getResetFork } from '../../helpers' + +type Fixture = () => Promise + +export const defaultCvxStableCollateralOpts: CurveCollateralOpts = { + erc20: ZERO_ADDRESS, + targetName: ethers.utils.formatBytes32String('USD'), + priceTimeout: PRICE_TIMEOUT, + chainlinkFeed: crvUSD_USD_FEED, // unused but cannot be zero + oracleTimeout: USDC_ORACLE_TIMEOUT, // max of oracleTimeouts + oracleError: bn('1'), // unused but cannot be zero + maxTradeVolume: MAX_TRADE_VOL, + defaultThreshold: DEFAULT_THRESHOLD, + delayUntilDefault: DELAY_UNTIL_DEFAULT, + revenueHiding: bn('0'), + nTokens: 2, + curvePool: crvUSD_USDC, + lpToken: crvUSD_USDC, + poolType: CurvePoolType.Plain, + feeds: [[USDC_USD_FEED], [crvUSD_USD_FEED]], + oracleTimeouts: [[USDC_ORACLE_TIMEOUT], [crvUSD_ORACLE_TIMEOUT]], + oracleErrors: [[USDC_ORACLE_ERROR], [crvUSD_ORACLE_ERROR]], +} + +export const deployCollateral = async ( + opts: CurveCollateralOpts = {} +): Promise<[TestICollateral, CurveCollateralOpts]> => { + if (!opts.erc20 && !opts.feeds) { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapper = await wrapperFactory.deploy() + await wrapper.initialize(crvUSD_USDC_POOL_ID) + + opts.feeds = [[usdcFeed.address], [crvUSDFeed.address]] + opts.erc20 = wrapper.address + } + + opts = { ...defaultCvxStableCollateralOpts, ...opts } + + const CvxStableCollateralFactory: ContractFactory = await ethers.getContractFactory( + 'CurveStableCollateral' + ) + + const collateral = await CvxStableCollateralFactory.deploy( + { + erc20: opts.erc20, + targetName: opts.targetName, + priceTimeout: opts.priceTimeout, + chainlinkFeed: opts.chainlinkFeed, + oracleError: opts.oracleError, + oracleTimeout: opts.oracleTimeout, + maxTradeVolume: opts.maxTradeVolume, + defaultThreshold: opts.defaultThreshold, + delayUntilDefault: opts.delayUntilDefault, + }, + opts.revenueHiding, + { + nTokens: opts.nTokens, + curvePool: opts.curvePool, + poolType: opts.poolType, + feeds: opts.feeds, + oracleTimeouts: opts.oracleTimeouts, + oracleErrors: opts.oracleErrors, + lpToken: opts.lpToken, + } + ) + await collateral.deployed() + + // sometimes we are trying to test a negative test case and we want this to fail silently + // fortunately this syntax fails silently because our tools are terrible + await expect(collateral.refresh()) + + return [collateral, opts] +} + +const makeCollateralFixtureContext = ( + alice: SignerWithAddress, + opts: CurveCollateralOpts = {} +): Fixture => { + const collateralOpts = { ...defaultCvxStableCollateralOpts, ...opts } + + const makeCollateralFixtureContext = async () => { + const MockV3AggregatorFactory = ( + await ethers.getContractFactory('MockV3Aggregator') + ) + + // Substitute feeds + const usdcFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + const crvUSDFeed = await MockV3AggregatorFactory.deploy(8, bn('1e8')) + collateralOpts.feeds = [[usdcFeed.address], [crvUSDFeed.address]] + + // Use mock curvePool seeded with initial balances + const CurvePoolMockFactory = await ethers.getContractFactory('CurvePoolMock') + const realCurvePool = await ethers.getContractAt('CurvePoolMock', crvUSD_USDC) + const curvePool = ( + await CurvePoolMockFactory.deploy( + [await realCurvePool.balances(0), await realCurvePool.balances(1)], + [await realCurvePool.coins(0), await realCurvePool.coins(1)] + ) + ) + await curvePool.setVirtualPrice(await realCurvePool.get_virtual_price()) + + // Deploy Wrapper + const wrapperFactory = await ethers.getContractFactory('ConvexStakingWrapper') + const wrapper = await wrapperFactory.deploy() + await wrapper.initialize(crvUSD_USDC_POOL_ID) + + collateralOpts.erc20 = wrapper.address + collateralOpts.curvePool = curvePool.address + const collateral = ((await deployCollateral(collateralOpts))[0] as unknown) + const cvx = await ethers.getContractAt('ERC20Mock', CVX) + const crv = await ethers.getContractAt('ERC20Mock', CRV) + + return { + alice, + collateral, + curvePool: curvePool, + wrapper: wrapper, + rewardTokens: [cvx, crv], + poolTokens: [ + await ethers.getContractAt('ERC20Mock', USDC), + await ethers.getContractAt('ERC20Mock', crvUSD), + ], + feeds: [usdcFeed, crvUSDFeed], + } + } + + return makeCollateralFixtureContext +} + +/* + Define helper functions +*/ + +const mintCollateralTo: MintCurveCollateralFunc = async ( + ctx: CurveCollateralFixtureContext, + amount: BigNumberish, + user: SignerWithAddress, + recipient: string +) => { + await mintWPool(ctx, amount, user, recipient, crvUSD_USDC_HOLDER) +} + +/* + Define collateral-specific tests +*/ + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificConstructorTests = () => {} + +// eslint-disable-next-line @typescript-eslint/no-empty-function +const collateralSpecificStatusTests = () => {} + +/* + Run the test suite +*/ + +const opts = { + deployCollateral, + collateralSpecificConstructorTests, + collateralSpecificStatusTests, + makeCollateralFixtureContext, + mintCollateralTo, + itChecksTargetPerRefDefault: it, + itChecksTargetPerRefDefaultUp: it, + itChecksRefPerTokDefault: it, + itHasRevenueHiding: it, + itClaimsRewards: it, + isMetapool: false, + resetFork: getResetFork(19287000), + collateralName: 'CurveStableCollateral - ConvexStakingWrapper (crvUSD/USDC)', +} + +collateralTests(opts) diff --git a/test/plugins/individual-collateral/curve/cvx/helpers.ts b/test/plugins/individual-collateral/curve/cvx/helpers.ts index a3bfbb93dc..ab06cdc726 100644 --- a/test/plugins/individual-collateral/curve/cvx/helpers.ts +++ b/test/plugins/individual-collateral/curve/cvx/helpers.ts @@ -183,8 +183,8 @@ export const mintWPool = async ( await lpToken.connect(signer).transfer(user.address, amount) }) - await lpToken.connect(user).approve(ctx.wrapper.address, amount) - await ctx.wrapper.connect(user).deposit(amount, recipient) + await lpToken.connect(user).approve(cvxWrapper.address, amount) + await cvxWrapper.connect(user).deposit(amount, recipient) } export const resetFork = getResetFork(FORK_BLOCK) From ea4e922e72278772067e21bba3daa6f29d7f79bd Mon Sep 17 00:00:00 2001 From: pmckelvy1 Date: Mon, 26 Feb 2024 11:42:25 -0500 Subject: [PATCH 227/450] Revert "TRST-QA-3: Gap Sizes" (#1074) Co-authored-by: Taylor Brent --- .gitignore | 1 - contracts/p1/AssetRegistry.sol | 4 +++- contracts/p1/BasketHandler.sol | 4 +++- contracts/p1/Distributor.sol | 4 +++- contracts/p1/RToken.sol | 4 +++- contracts/p1/StRSR.sol | 2 -- hardhat.config.ts | 5 ++--- package.json | 1 - yarn.lock | 28 ---------------------------- 9 files changed, 14 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 69f2a05a17..13c0e37712 100644 --- a/.gitignore +++ b/.gitignore @@ -29,7 +29,6 @@ scripts/addresses/31337* *.orig .idea -output.txt # Scripts for local/test interactions scripts/test.ts diff --git a/contracts/p1/AssetRegistry.sol b/contracts/p1/AssetRegistry.sol index 2d606999f4..1379d8d00d 100644 --- a/contracts/p1/AssetRegistry.sol +++ b/contracts/p1/AssetRegistry.sol @@ -231,6 +231,8 @@ contract AssetRegistryP1 is ComponentP1, IAssetRegistry { * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + * + * AssetRegistry uses 52 slots, not 50. */ - uint256[44] private __gap; + uint256[46] private __gap; } diff --git a/contracts/p1/BasketHandler.sol b/contracts/p1/BasketHandler.sol index 13c1729d88..4160714745 100644 --- a/contracts/p1/BasketHandler.sol +++ b/contracts/p1/BasketHandler.sol @@ -716,6 +716,8 @@ contract BasketHandlerP1 is ComponentP1, IBasketHandler { * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + * + * BasketHandler uses 58 slots, not 50. */ - uint256[28] private __gap; + uint256[36] private __gap; } diff --git a/contracts/p1/Distributor.sol b/contracts/p1/Distributor.sol index ff81d32773..f8a15e4c63 100644 --- a/contracts/p1/Distributor.sol +++ b/contracts/p1/Distributor.sol @@ -215,6 +215,8 @@ contract DistributorP1 is ComponentP1, IDistributor { * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + * + * Distributor uses 53 slots, not 50. */ - uint256[41] private __gap; + uint256[44] private __gap; } diff --git a/contracts/p1/RToken.sol b/contracts/p1/RToken.sol index 2d27b3c7d3..b91b9ba296 100644 --- a/contracts/p1/RToken.sol +++ b/contracts/p1/RToken.sol @@ -529,6 +529,8 @@ contract RTokenP1 is ComponentP1, ERC20PermitUpgradeable, IRToken { * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps + * + * RToken uses 56 slots, not 50. */ - uint256[36] private __gap; + uint256[42] private __gap; } diff --git a/contracts/p1/StRSR.sol b/contracts/p1/StRSR.sol index 791cedf8a6..faff182759 100644 --- a/contracts/p1/StRSR.sol +++ b/contracts/p1/StRSR.sol @@ -1002,8 +1002,6 @@ abstract contract StRSRP1 is Initializable, ComponentP1, IStRSR, EIP712Upgradeab * @dev This empty reserved space is put in place to allow future versions to add new * variables without shifting down storage in the inheritance chain. * See https://docs.openzeppelin.com/contracts/4.x/upgradeable#storage_gaps - * - * StRSRP1 uses 53 total slots, not 50. */ uint256[28] private __gap; } diff --git a/hardhat.config.ts b/hardhat.config.ts index 7e6ea11aa2..61bac4e916 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -8,7 +8,6 @@ import '@typechain/hardhat' import 'hardhat-contract-sizer' import 'hardhat-gas-reporter' import 'solidity-coverage' -import 'hardhat-storage-layout' import * as tenderly from '@tenderly/hardhat-tenderly' import { useEnv } from '#/utils/env' @@ -45,7 +44,7 @@ const config: HardhatUserConfig = { : undefined, gas: 0x1ffffffff, blockGasLimit: 0x1fffffffffffff, - allowUnlimitedContractSize: true, + allowUnlimitedContractSize: true }, localhost: { // network for long-lived mainnet forks @@ -140,7 +139,7 @@ const config: HardhatUserConfig = { etherscan: { apiKey: { mainnet: useEnv('ETHERSCAN_API_KEY'), - base: useEnv('BASESCAN_API_KEY'), + base: useEnv('BASESCAN_API_KEY') }, customChains: [ { diff --git a/package.json b/package.json index d04258b90b..ba1f2ec495 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,6 @@ "hardhat": "^2.12.3", "hardhat-contract-sizer": "^2.4.0", "hardhat-gas-reporter": "^1.0.8", - "hardhat-storage-layout": "^0.1.7", "husky": "^7.0.0", "lodash": "^4.17.21", "lodash.get": "^4.4.2", diff --git a/yarn.lock b/yarn.lock index 57bfb84089..7b7e7a4873 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3689,15 +3689,6 @@ __metadata: languageName: node linkType: hard -"console-table-printer@npm:^2.9.0": - version: 2.12.0 - resolution: "console-table-printer@npm:2.12.0" - dependencies: - simple-wcswidth: ^1.0.1 - checksum: 2cd826da503186e939f760d4f821a967944c2d111d73aec36d252e99af0f0b17c1e2722782278508deff83b77207ab872b9400fa5c524ed273586ac32762b318 - languageName: node - linkType: hard - "content-disposition@npm:0.5.4": version: 0.5.4 resolution: "content-disposition@npm:0.5.4" @@ -5939,17 +5930,6 @@ __metadata: languageName: node linkType: hard -"hardhat-storage-layout@npm:^0.1.7": - version: 0.1.7 - resolution: "hardhat-storage-layout@npm:0.1.7" - dependencies: - console-table-printer: ^2.9.0 - peerDependencies: - hardhat: ^2.0.3 - checksum: 8d27d6b16c1ebdffa032ba6b99c61996df4601dcbaf7d770c474806b492a56de9d21b4190086ab40f50a3a1f2e9851cc81034a9cfd2e21368941977324f96fd4 - languageName: node - linkType: hard - "hardhat@npm:^2.12.3": version: 2.17.0 resolution: "hardhat@npm:2.17.0" @@ -8899,7 +8879,6 @@ __metadata: hardhat: ^2.12.3 hardhat-contract-sizer: ^2.4.0 hardhat-gas-reporter: ^1.0.8 - hardhat-storage-layout: ^0.1.7 husky: ^7.0.0 isomorphic-fetch: ^3.0.0 lodash: ^4.17.21 @@ -9408,13 +9387,6 @@ __metadata: languageName: node linkType: hard -"simple-wcswidth@npm:^1.0.1": - version: 1.0.1 - resolution: "simple-wcswidth@npm:1.0.1" - checksum: dc5bf4cb131d9c386825d1355add2b1ecc408b37dc2c2334edd7a1a4c9f527e6b594dedcdbf6d949bce2740c3a332e39af1183072a2d068e40d9e9146067a37f - languageName: node - linkType: hard - "sisteransi@npm:^1.0.5": version: 1.0.5 resolution: "sisteransi@npm:1.0.5" From a3de420f71f748a8d1da55dd6bc02ce60859baac Mon Sep 17 00:00:00 2001 From: Patrick McKelvy Date: Wed, 28 Feb 2024 09:02:23 -0700 Subject: [PATCH 228/450] add trust 3.2.0 report. --- ... Security - Reserve Audit Report 3_1_0.pdf} | Bin ...t Security - Reserve Audit Report 3_2_0.pdf | Bin 0 -> 606780 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename audits/{Reserve Audit Report 3_1_0 - Trust Security.pdf => Trust Security - Reserve Audit Report 3_1_0.pdf} (100%) create mode 100644 audits/Trust Security - Reserve Audit Report 3_2_0.pdf diff --git a/audits/Reserve Audit Report 3_1_0 - Trust Security.pdf b/audits/Trust Security - Reserve Audit Report 3_1_0.pdf similarity index 100% rename from audits/Reserve Audit Report 3_1_0 - Trust Security.pdf rename to audits/Trust Security - Reserve Audit Report 3_1_0.pdf diff --git a/audits/Trust Security - Reserve Audit Report 3_2_0.pdf b/audits/Trust Security - Reserve Audit Report 3_2_0.pdf new file mode 100644 index 0000000000000000000000000000000000000000..a76a94f904fb66e0f051c168f36ac58b917fd84f GIT binary patch literal 606780 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 z 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 z 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